Paying repoman dues

Requiring lgogdownloader-3.8 or newer
Removed games-util/lgogdownloader as upstream already provides our patch. Due to refusal to also merge our export script, we relegate it to another package which becomes the central piece for gog eclass
2021-11-03 11:19:48 +01:00 · 2021-11-03 03:36:48 +01:00 · 2021-11-03 03:31:34 +01:00
673 changed files with 21380 additions and 9448 deletions
--- a/.gitignore
+++ b/.gitignore
@ -37,6 +37,5 @@
 /eclass/*.5
 /local/
 /metadata/md5-cache
-/metadata/pkg_desc_index
 /packages/
 /profiles/use.local.desc
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -26,33 +26,11 @@ image: registry.gitlab.com/src_prepare/gentoo-repoman-container:latest

 variables:
  GIT_SUBMODULE_STRATEGY: recursive
-  common_pkgcheck_args: '--color 1'

-pkgcheck_full_scan:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-      when: never
-    - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
-      when: manual
-    - allow_failure: true
+stages:
+  - test
+
+test:
+  stage: test
  script:
-    # disable checks that aren't a big deal to have less noise.
-    - pkgcheck ci -k ,-RedundantVersion,-NonexistentDeps,-NonexistentBlocker $common_pkgcheck_args
-
-pkgcheck_strict_scan:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == 'push'
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-      when: never
-    - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
-      when: manual
-  script:
-    # temporarily disable BadDefaultUseFlags
-    - pkgcheck ci -k error,-BadDefaultUseFlags $common_pkgcheck_args
-
-pkgcheck_merge:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-  script:
-    - pkgcheck scan $common_pkgcheck_args --commits $CI_MERGE_REQUEST_DIFF_BASE_SHA..$CI_COMMIT_SHA
-
+    - bash scripts/repomanci
--- a/3rd_party/eclass-to-manpage
+++ b/3rd_party/eclass-to-manpage
@ -1 +1 @@
-Subproject commit 50d153fa1d5b8b0f846fbf0f79c8fea6c4a457e3
+Subproject commit 91680f1056fdd8378a403e1ba6734cf6b3127889
--- a/README.md
+++ b/README.md
@ -51,6 +51,14 @@ The src_prepare project doesn't want to overtake or compete with the GURU projec

 ### Official list

+#### Layman
+
+If you are using [Layman](https://wiki.gentoo.org/wiki/Layman), execute:
+
+``` sh
+layman -a src_prepare-overlay
+```
+
 #### eselect-repository

 If you are using [eselect-repository](https://wiki.gentoo.org/wiki/Eselect/Repository), execute:
@ -63,6 +71,14 @@ eselect repository enable src_prepare-overlay

 If you want to manually add the overlay, see [examples/repos.conf/src_prepare-overlay.conf](examples/repos.conf/src_prepare-overlay.conf).

+#### Layman
+
+If you are using [Layman](https://wiki.gentoo.org/wiki/Layman), execute:
+
+``` sh
+layman -o 'https://gitlab.com/src_prepare/src_prepare-overlay/raw/master/repositories.xml' -f -a src_prepare-overlay
+```
+
 #### eselect-repository

 If you are using [eselect-repository](https://wiki.gentoo.org/wiki/Eselect/Repository), execute:
--- a/acct-group/jellyfin/jellyfin-0.ebuild
+++ b/acct-group/jellyfin/jellyfin-0.ebuild
@ -0,0 +1,14 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+KEYWORDS="~amd64 ~arm64"
+
+DESCRIPTION="Jelyfin program group"
+
+ACCT_GROUP_ID=-1
+
+SLOT="0"
--- a/acct-group/jellyfin/metadata.xml
+++ b/acct-group/jellyfin/metadata.xml
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>
--- a/acct-group/miniflux/metadata.xml
+++ b/acct-group/miniflux/metadata.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>me@concord.sh</email>
+		<name>0xC0ncord</name>
+	</maintainer>
+</pkgmetadata>
+
--- a/acct-group/miniflux/miniflux-0.ebuild
+++ b/acct-group/miniflux/miniflux-0.ebuild
@ -0,0 +1,8 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=-1
--- a/acct-user/jellyfin/jellyfin-0.ebuild
+++ b/acct-user/jellyfin/jellyfin-0.ebuild
@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+KEYWORDS="~amd64 ~arm64"
+
+DESCRIPTION="Jellyfin user"
+
+ACCT_USER_ID=-1
+ACCT_USER_GROUPS=( jellyfin )
+acct-user_add_deps
+
+SLOT="0"
--- a/acct-user/jellyfin/metadata.xml
+++ b/acct-user/jellyfin/metadata.xml
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>
--- a/acct-user/miniflux/Manifest
+++ b/acct-user/miniflux/Manifest
@ -0,0 +1 @@
+EBUILD miniflux-0.ebuild 261 BLAKE2B 4760996434119a69af4cbd770a8a3f27896db52f8c23e8f93fd6835e7bcde84235c1305bca1a2606bfb377dcf98009bd9035d5ce25ef7072cd22564321396ebf SHA512 c4800cdb0a62ddb28433bc3bb4621829dbd0acbe1ab8b5f94ddb8ef7605ab64a47a9e6a62eabaa8845d2cfdda56da7b08b6dcc622a5282319012d96862421ef2
--- a/acct-user/miniflux/metadata.xml
+++ b/acct-user/miniflux/metadata.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>me@concord.sh</email>
+		<name>0xC0ncord</name>
+	</maintainer>
+</pkgmetadata>
+
--- a/acct-user/miniflux/miniflux-0.ebuild
+++ b/acct-user/miniflux/miniflux-0.ebuild
@ -0,0 +1,13 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for www-apps/miniflux"
+ACCT_USER_ID=-1
+ACCT_USER_HOME="/dev/null"
+ACCT_USER_GROUPS=( miniflux )
+
+acct-user_add_deps
--- a/app-admin/cgls/Manifest
+++ b/app-admin/cgls/Manifest
@ -1 +1,2 @@
+DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
 DIST systemd-247.tar.gz 9887080 BLAKE2B b3b9399b0e0258453e1ea0bee1212bca7998d0c762fc2da1a3ee6f239bcdde5aa33cb6b7bab377f5dfcb029205b31b733589dbac463ec75cf0b6d371edc9c20f SHA512 dd11cf46e5d9cbf44beb2d383262e9b13eb80fbb3403d86d011b4c2f9e0a4778c7c9779c856960f5654177581c20d7336c00ce687d35fe35ce069c56924604c2
--- a/app-admin/cgls/cgls-246.ebuild
+++ b/app-admin/cgls/cgls-246.ebuild
@ -0,0 +1,169 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Based on:
+# - https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
+# - https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-boot/systemd-boot/systemd-boot-245.ebuild
+# Difference: Is is possible to install this on a system running systemd.
+
+EAPI=7
+
+MINKV="3.11"
+
+inherit meson
+
+DESCRIPTION="cgls from systemd"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+else
+	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+# No tests for this one (if I mised them let me know)
+RESTRICT="mirror test"
+LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+IUSE="selinux"
+
+BDEPEND="
+	>=dev-util/intltool-0.50
+	>=dev-util/meson-0.46
+	>=sys-apps/coreutils-8.16
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	sys-devel/m4
+	virtual/pkgconfig
+"
+DEPEND="
+	>=sys-apps/util-linux-2.30:0=
+	>=sys-kernel/linux-headers-${MINKV}
+	sys-apps/acl:0=
+	sys-libs/libcap:0=
+	selinux? ( sys-libs/libselinux:0= )
+"
+RDEPEND="
+	${DEPEND}
+"
+
+S="${WORKDIR}/systemd-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/246-${PN}-libshared-static.patch"
+)
+
+src_configure() {
+	local systemd_disable_options=(
+		adm-group
+		analyze
+		apparmor
+		audit
+		backlight
+		binfmt
+		blkid
+		bzip2
+		coredump
+		dbus
+		efi
+		elfutils
+		environment-d
+		fdisk
+		firstboot
+		gcrypt
+		glib
+		gnutls
+		gshadow
+		hibernate
+		hostnamed
+		hwdb
+		idn
+		ima
+		initrd
+		kernel-install
+		kmod
+		ldconfig
+		libcryptsetup
+		libcurl
+		libfido2
+		libidn
+		libidn2
+		libiptc
+		link-networkd-shared
+		link-systemctl-shared
+		link-timesyncd-shared
+		link-udev-shared
+		localed
+		logind
+		lz4
+		machined
+		microhttpd
+		networkd
+		nss-myhostname
+		nss-resolve
+		nss-systemd
+		openssl
+		p11kit
+		pam
+		pcre2
+		polkit
+		portabled
+		pstore
+		pwquality
+		qrencode
+		quotacheck
+		randomseed
+		resolve
+		rfkill
+		seccomp
+		smack
+		sysusers
+		timedated
+		timesyncd
+		tmpfiles
+		tpm
+		userdb
+		utmp
+		vconsole
+		wheel-group
+		xdg-autostart
+		xkbcommon
+		xz
+		zlib
+		zstd
+	)
+	# prepend -D and append =false, e.g. zstd becomes -Dzstd=false
+	systemd_disable_options=( ${systemd_disable_options[@]/#/-D} )
+	systemd_disable_options=( ${systemd_disable_options[@]/%/=false} )
+
+	local emesonargs=(
+		-Dacl=true
+		-Dstandalone-binaries=true
+		-Dstatic-libsystemd=true
+		-Dsysvinit-path=''
+		${systemd_disable_options[@]}
+		$(meson_use selinux)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	local mytargets=(
+		systemd-cgls
+		man/systemd-cgls.1
+	)
+	meson_src_compile "${mytargets[@]}"
+}
+
+src_install() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+
+	newbin systemd-cgls cgls
+	newman man/systemd-cgls.1 cgls.1
+
+	popd >/dev/null || die
+}
--- a/app-admin/cgls/cgls-247.ebuild
+++ b/app-admin/cgls/cgls-247.ebuild
@ -31,6 +31,7 @@ IUSE="selinux"

 BDEPEND="
 	>=dev-util/intltool-0.50
+	>=dev-util/meson-0.46
 	>=sys-apps/coreutils-8.16
 	app-text/docbook-xml-dtd:4.2
 	app-text/docbook-xml-dtd:4.5
--- a/app-admin/cgtop/Manifest
+++ b/app-admin/cgtop/Manifest
@ -1 +1,2 @@
+DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
 DIST systemd-247.tar.gz 9887080 BLAKE2B b3b9399b0e0258453e1ea0bee1212bca7998d0c762fc2da1a3ee6f239bcdde5aa33cb6b7bab377f5dfcb029205b31b733589dbac463ec75cf0b6d371edc9c20f SHA512 dd11cf46e5d9cbf44beb2d383262e9b13eb80fbb3403d86d011b4c2f9e0a4778c7c9779c856960f5654177581c20d7336c00ce687d35fe35ce069c56924604c2
--- a/app-admin/cgtop/cgtop-246.ebuild
+++ b/app-admin/cgtop/cgtop-246.ebuild
@ -0,0 +1,169 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Based on:
+# - https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
+# - https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-boot/systemd-boot/systemd-boot-245.ebuild
+# Difference: Is is possible to install this on a system running systemd.
+
+EAPI=7
+
+MINKV="3.11"
+
+inherit meson
+
+DESCRIPTION="cgtop from systemd"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+else
+	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+# No tests for this one (if I mised them let me know)
+RESTRICT="mirror test"
+LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+IUSE="selinux"
+
+BDEPEND="
+	>=dev-util/intltool-0.50
+	>=dev-util/meson-0.46
+	>=sys-apps/coreutils-8.16
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	sys-devel/m4
+	virtual/pkgconfig
+"
+DEPEND="
+	>=sys-apps/util-linux-2.30:0=
+	>=sys-kernel/linux-headers-${MINKV}
+	sys-apps/acl:0=
+	sys-libs/libcap:0=
+	selinux? ( sys-libs/libselinux:0= )
+"
+RDEPEND="
+	${DEPEND}
+"
+
+S="${WORKDIR}/systemd-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/246-${PN}-libshared-static.patch"
+)
+
+src_configure() {
+	local systemd_disable_options=(
+		adm-group
+		analyze
+		apparmor
+		audit
+		backlight
+		binfmt
+		blkid
+		bzip2
+		coredump
+		dbus
+		efi
+		elfutils
+		environment-d
+		fdisk
+		firstboot
+		gcrypt
+		glib
+		gnutls
+		gshadow
+		hibernate
+		hostnamed
+		hwdb
+		idn
+		ima
+		initrd
+		kernel-install
+		kmod
+		ldconfig
+		libcryptsetup
+		libcurl
+		libfido2
+		libidn
+		libidn2
+		libiptc
+		link-networkd-shared
+		link-systemctl-shared
+		link-timesyncd-shared
+		link-udev-shared
+		localed
+		logind
+		lz4
+		machined
+		microhttpd
+		networkd
+		nss-myhostname
+		nss-resolve
+		nss-systemd
+		openssl
+		p11kit
+		pam
+		pcre2
+		polkit
+		portabled
+		pstore
+		pwquality
+		qrencode
+		quotacheck
+		randomseed
+		resolve
+		rfkill
+		seccomp
+		smack
+		sysusers
+		timedated
+		timesyncd
+		tmpfiles
+		tpm
+		userdb
+		utmp
+		vconsole
+		wheel-group
+		xdg-autostart
+		xkbcommon
+		xz
+		zlib
+		zstd
+	)
+	# prepend -D and append =false, e.g. zstd becomes -Dzstd=false
+	systemd_disable_options=( ${systemd_disable_options[@]/#/-D} )
+	systemd_disable_options=( ${systemd_disable_options[@]/%/=false} )
+
+	local emesonargs=(
+		-Dacl=true
+		-Dstandalone-binaries=true
+		-Dstatic-libsystemd=true
+		-Dsysvinit-path=''
+		${systemd_disable_options[@]}
+		$(meson_use selinux)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	local mytargets=(
+		systemd-cgtop
+		man/systemd-cgtop.1
+	)
+	meson_src_compile "${mytargets[@]}"
+}
+
+src_install() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+
+	newbin systemd-cgtop cgtop
+	newman man/systemd-cgtop.1 cgtop.1
+
+	popd >/dev/null || die
+}
--- a/app-admin/cgtop/cgtop-247.ebuild
+++ b/app-admin/cgtop/cgtop-247.ebuild
@ -31,6 +31,7 @@ IUSE="selinux"

 BDEPEND="
 	>=dev-util/intltool-0.50
+	>=dev-util/meson-0.46
 	>=sys-apps/coreutils-8.16
 	app-text/docbook-xml-dtd:4.2
 	app-text/docbook-xml-dtd:4.5
--- a/app-admin/grub-customizer/Manifest
+++ b/app-admin/grub-customizer/Manifest
@ -0,0 +1 @@
+DIST grub-customizer_5.1.0.tar.gz 578046 BLAKE2B 3d32db2523e70968786bd2d6b620ee3a42a312d0b892e38121b8869a155c23aa5ead9219e56e0a84109c0bcf84a4c1f00130a3565c8d28c77b1e23bbf669a2c4 SHA512 d79c7996afd8486483d4460432207dc19315d7377dcfd2fd6a4594e64c6750bbae36f96c395c4a9748d0ff43c6095399d822fc6a23beedbc8769802818dfa11f
--- a/app-admin/grub-customizer/grub-customizer-5.1.0.ebuild
+++ b/app-admin/grub-customizer/grub-customizer-5.1.0.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg cmake
+
+DESCRIPTION="A graphical grub2 settings manager"
+HOMEPAGE="https://launchpad.net/grub-customizer"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.launchpad.net/${PN}"
+else
+	PB="$(ver_cut 1-2)"
+	SRC_URI="https://launchpad.net/${PN}/${PB}/${PV}/+download/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+RESTRICT="mirror"
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="
+	dev-cpp/gtkmm:3.0
+	x11-themes/hicolor-icon-theme
+	sys-boot/grub:2
+	app-arch/libarchive
+"
+RDEPEND="
+	${DEPEND}
+"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
--- a/app-admin/grub-customizer/grub-customizer-9999.ebuild
+++ b/app-admin/grub-customizer/grub-customizer-9999.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg cmake
+
+DESCRIPTION="A graphical grub2 settings manager"
+HOMEPAGE="https://launchpad.net/grub-customizer"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.launchpad.net/${PN}"
+else
+	PB="$(ver_cut 1-2)"
+	SRC_URI="https://launchpad.net/${PN}/${PB}/${PV}/+download/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+RESTRICT="mirror"
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="
+	dev-cpp/gtkmm:3.0
+	x11-themes/hicolor-icon-theme
+	sys-boot/grub:2
+	app-arch/libarchive
+"
+RDEPEND="
+	${DEPEND}
+"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
--- a/app-admin/grub-customizer/metadata.xml
+++ b/app-admin/grub-customizer/metadata.xml
@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <upstream>
-    <remote-id type="github">8go/matrix-commander</remote-id>
-    <remote-id type="pypi">matrix-commander</remote-id>
+    <remote-id type="launchpad">grub-customizer</remote-id>
  </upstream>
 </pkgmetadata>
--- a/app-backup/restic-browser-bin/Manifest
+++ b/app-backup/restic-browser-bin/Manifest
@ -1,2 +0,0 @@
-DIST restic-browser-bin-0.3.0.zip 3751854 BLAKE2B 80e8aaec9e0b37b59af61d2bb52eeae3c61d099741d3122fd1bf2fe16ece2ea8814d4c516efb95a79a66bbb18be9c661cbacaae576758e705e9d789276b20ef5 SHA512 fc0fad191014ad2bf5e50fb5aecb94adca89c6ffa1a74e22d40dc661e4d5615047d128b59a104291a1a801f23ebc4cbc817151828cac068ad5a1a8bbf737eb91
-DIST restic-browser-bin_icon_39cb5d785a56395f083ff468beaeba4290e7f800.png 103029 BLAKE2B 17b832d77332883d110b47b9fb5f109e3bfc16310053d6544a9e2d90d60309389b3ef630ac0012a82c45cf0d50add063a18b7552cc19c23261dccda09d42c1db SHA512 edf1039abf8b765661aa828f9519be94236b92adae54b3fd894bbadf94704ef933e7958f97486771bc4137f60ac987838316ff9141fac9f91d67e4224e45c3c7
--- a/app-backup/restic-browser-bin/metadata.xml
+++ b/app-backup/restic-browser-bin/metadata.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>sighunter@gmx.de</email>
-		<name>SigHunter</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">emuell/restic-browser</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/app-backup/restic-browser-bin/restic-browser-bin-0.3.0-r1.ebuild
+++ b/app-backup/restic-browser-bin/restic-browser-bin-0.3.0-r1.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop xdg
-
-MY_PN="${PN/-bin/}"
-COMMIT="39cb5d785a56395f083ff468beaeba4290e7f800"
-ICON="${PN}_icon_${COMMIT}.png"
-
-DESCRIPTION="A GUI to browse and restore restic backup repositories"
-HOMEPAGE="https://github.com/emuell/restic-browser"
-SRC_URI="
-	https://github.com/emuell/${MY_PN}/releases/download/v${PV}/${MY_PN}-v${PV}-linux.zip ->  ${P}.zip
-	https://raw.githubusercontent.com/emuell/${MY_PN}/${COMMIT}/src-tauri/icons/icon.png -> ${ICON}
-"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	app-backup/restic
-	net-libs/webkit-gtk:4
-"
-BDEPEND="app-arch/unzip"
-
-QA_PREBUILT="*"
-
-src_unpack() {
-	unpack "${P}.zip"
-	unpack "${WORKDIR}/${MY_PN}.tar"
-}
-
-src_install() {
-	dobin "${MY_PN}"
-	newicon "${DISTDIR}/${ICON}" "${MY_PN}.png"
-	make_desktop_entry "${MY_PN}" Restic-Browser "${MY_PN}"
-}
--- a/app-editors/atom/Manifest
+++ b/app-editors/atom/Manifest
@ -0,0 +1 @@
+DIST atom-1.58.0.tar.gz 203905263 BLAKE2B 95311b625bbee45f64d3e3d44f7870fba0efaa31ca14025e68d587b60e5d618c89e948dae7856348f0e55ea434f80d484f74809f1d244d6609f84023047794e6 SHA512 5e5c456ca745e2e51c4c24a2cba76d59ae9c519639f301b8677b5627ebecc1b8c114fc1942c22318266fe985ca1064618dc89379ecf8cdd935bfee7e605f33f1
--- a/app-editors/atom/atom-1.58.0.ebuild
+++ b/app-editors/atom/atom-1.58.0.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop bintron
+
+DESCRIPTION="A hackable text editor for the 21st Century"
+HOMEPAGE="https://atom.io/"
+SRC_URI="https://github.com/atom/atom/releases/download/v${PV}/atom-amd64.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/atom-${PV}-amd64"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+src_install() {
+	doicon "${S}"/atom.png
+	make_desktop_entry atom Atom atom "TextEditor;Development;IDE;"
+
+	bintron_src_install
+}
--- a/app-editors/atom/metadata.xml
+++ b/app-editors/atom/metadata.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+</pkgmetadata>
--- a/app-editors/notepadnext/Manifest
+++ b/app-editors/notepadnext/Manifest
@ -1,6 +0,0 @@
-DIST QSimpleUpdater-518b873c97688134c2e535e05db6b4b7cebcccdd.tar.gz 298774 BLAKE2B ab2b79a2e7acbfede83407befba74c3c599cd9ef7fbfc773174928a1b932385720a6fad477c1f6f45e4031221549b64885918961aded52b5c2789e2ee2bb282d SHA512 3fd8ab9c1ff18382510c3b5ce4b838228d4577a98c12015ee30f5369d5aedb5b06bf6cff844d393df26ffb481035d54b7eef608be9086615c4f97439723a76c8
-DIST Qt-Advanced-Docking-System-8da0713bf0d964f0c5b62e87a8aa61bcae3fa212.tar.gz 21522017 BLAKE2B a366f66031b379e1c7d4e2fb42ad400c13b72ae902614b54ee811a159b6daeac23b7eda28d161073c2466f6f9114d112bc81105c444ee8bce9e025af5e45cdd6 SHA512 f6d7e411af68821d3fec16be945b700d52a7320c0b9c4d4dad973de343e66d31b8bed0dd6667f27ce1658e6950a928c824286d82d5825b992063a8b459f15c82
-DIST SingleApplication-494772e98cef0aa88124f154feb575cc60b08b38.tar.gz 23324 BLAKE2B eccf28a712e058f2ad997cd0ccd8f2117eec06e34846f87c1d6e51b0ca04ef1da0169fdd20f8f8de80a81ffa280c4045db7a1321691a5cfac8de3e5f60260f5d SHA512 98178e86fa85fcaa3e2f0030ce4e26c70489f364448c79b3e0cae304ad8fe698a4d29c0030810cef0edd32c17ebdaafc2223e32506381ade6705dcf831537221
-DIST editorconfig-core-qt-ee967262db4fdbd735f9971cc0c90cf4f3100d3a.tar.gz 7309 BLAKE2B 09f384d1d2392f64d847793f27ce9fb6ced30b028958182d32453c9367f778e3d1891fb4a6b3759294c9d383091acc8b590e7972214eb0d790347d49d00dafec SHA512 7b965f8528572e9c3b491e4d31599787574394dc7da8e086f61f5a7fb01cff8bfa2405d30acd7d43e628c5d4b9f00da4f0d45dc0e9a4513254c56d2713fd37a9
-DIST notepadnext-0.7_p20240317.tar.gz 5235205 BLAKE2B 66debbe46ecbb60e9c0d7e3a62080673b28c5dd3aca49a43f853a2a9e49ed38a9c393b958f8c5b0c544806e9e643f0c59fe0219fd1864421017de4012fc62785 SHA512 ae91e2c79c9c0dda23546990e017114f218e271cf28da82610c23b18153597b4f50ccda55110fb31c0de867053b634d51d91a2eff8cecf6825bee79e907d030b
-DIST uchardet-edae8e81cfb8092496f94da1a306c4c9f0ce32bb.tar.gz 463130 BLAKE2B 1007657b22439187e40bbbd524818ffdcf4468ae0cbf7ec2708311bf3f9c7daa596bec03f812b2c37fa134df70b024505ce41918d8612154835e4dbe1daea2f7 SHA512 003c5155bbfd6cb1f657338970033e25a97a54aabe30a991696e6e4fc7536e1c2715fcc768a2a8ae3ed3fc9feae523723ea7a3b38dec5efc07b72d86733f1742
--- a/app-editors/notepadnext/metadata.xml
+++ b/app-editors/notepadnext/metadata.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>sighunter@gmx.de</email>
-		<name>SigHunter</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">dail8859/NotepadNext</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/app-editors/notepadnext/notepadnext-0.7_p20240317.ebuild
+++ b/app-editors/notepadnext/notepadnext-0.7_p20240317.ebuild
@ -1,78 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils xdg
-
-MY_PN="NotepadNext"
-COMMIT_NOTEPADNEXT="b6b0ccc0c380efb13663eb00d5bb8bd140b0553d"
-COMMIT_SINGLEAPPLICATION="494772e98cef0aa88124f154feb575cc60b08b38"
-COMMIT_UCHARDET="edae8e81cfb8092496f94da1a306c4c9f0ce32bb"
-COMMIT_EDITORCONFIG="ee967262db4fdbd735f9971cc0c90cf4f3100d3a"
-COMMIT_QADS="8da0713bf0d964f0c5b62e87a8aa61bcae3fa212"
-COMMIT_QSIMPLEUPDATER="518b873c97688134c2e535e05db6b4b7cebcccdd"
-
-DESCRIPTION="A cross-platform reimplementation of Notepad++ based on Qt"
-HOMEPAGE="https://github.com/dail8859/NotepadNext"
-SRC_URI="
-	https://github.com/dail8859/${MY_PN}/archive/${COMMIT_NOTEPADNEXT}.tar.gz
-		-> ${P}.tar.gz
-	https://github.com/itay-grudev/SingleApplication/archive/${COMMIT_SINGLEAPPLICATION}.tar.gz
-		-> SingleApplication-${COMMIT_SINGLEAPPLICATION}.tar.gz
-	https://gitlab.freedesktop.org/uchardet/uchardet/-/archive/${COMMIT_UCHARDET}.tar.gz
-		-> uchardet-${COMMIT_UCHARDET}.tar.gz
-	https://github.com/editorconfig/editorconfig-core-qt/archive/${COMMIT_EDITORCONFIG}.tar.gz
-		-> editorconfig-core-qt-${COMMIT_EDITORCONFIG}.tar.gz
-	https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/archive/${COMMIT_QADS}.tar.gz
-		-> Qt-Advanced-Docking-System-${COMMIT_QADS}.tar.gz
-	https://github.com/alex-spataru/QSimpleUpdater/archive/${COMMIT_QSIMPLEUPDATER}.tar.gz
-		-> QSimpleUpdater-${COMMIT_QSIMPLEUPDATER}.tar.gz
-"
-S="${WORKDIR}/${MY_PN}-${COMMIT_NOTEPADNEXT}"
-
-LICENSE="GPL-3"
-# submodule licenses
-LICENSE+=" MIT LGPL-2.1 MIT-no-machine-learning || ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="qt6"
-
-RDEPEND="
-	x11-libs/libxcb:=
-	!qt6? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-	)
-	qt6? (
-		dev-qt/qtbase:6[gui,network,widgets]
-		dev-qt/qt5compat:6
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	mv -T "${WORKDIR}"/QSimpleUpdater-"${COMMIT_QSIMPLEUPDATER}" "${S}"/src/QSimpleUpdater || die
-	mv -T "${WORKDIR}"/Qt-Advanced-Docking-System-"${COMMIT_QADS}" "${S}"/src/ads || die
-	mv -T "${WORKDIR}"/editorconfig-core-qt-"${COMMIT_EDITORCONFIG}" "${S}"/src/editorconfig-core-qt || die
-	mv -T "${WORKDIR}"/SingleApplication-"${COMMIT_SINGLEAPPLICATION}" "${S}"/src/singleapplication || die
-	mv -T "${WORKDIR}"/uchardet-"${COMMIT_UCHARDET}" "${S}"/src/uchardet || die
-}
-
-src_configure() {
-	if use qt6; then
-		eqmake6 src/NotepadNext.pro
-	else
-		eqmake5 src/NotepadNext.pro
-	fi
-}
-
-src_install() {
-	einstalldocs
-	emake INSTALL_ROOT="${ED}" install
-}
--- a/app-editors/rehex/Manifest
+++ b/app-editors/rehex/Manifest
@ -0,0 +1 @@
+DIST rehex-0.3.0.tar.gz 2658263 BLAKE2B cd46ca89ed2c8c5c47e0e88f8342749634d172a4a8d1ce45f7f94049601f53f9a95d0724c6da6e9e05718daf8ca17ff859f396ff67d922bbcb1a5618d8c63b49 SHA512 f3f580b32e23280a4033c49ac5ba5d09ebcc7de305af4553a745dd53c015e92601d7018f9e07127298051f3435f1e90c21bdf3ba23809a2f90c4995e0a6d0fab
--- a/app-editors/rehex/metadata.xml
+++ b/app-editors/rehex/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>xgqt@protonmail.com</email>
+        <name>Maciej Barć</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">solemnwarning/rehex</remote-id>
+    </upstream>
+</pkgmetadata>
--- a/app-editors/rehex/rehex-0.3.0.ebuild
+++ b/app-editors/rehex/rehex-0.3.0.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit wxwidgets xdg
+
+DESCRIPTION="Reverse Engineers' Hex Editor"
+HOMEPAGE="https://github.com/solemnwarning/rehex"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/solemnwarning/${PN}.git"
+else
+	SRC_URI="https://github.com/solemnwarning/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+RESTRICT="
+	mirror
+	!test? ( test )
+"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-libs/capstone
+	dev-libs/jansson
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-cpp/gtest
+	)
+"
+
+src_configure() {
+	setup-wxwidgets
+}
+
+src_install() {
+	emake prefix="${D}"/usr install
+}
--- a/app-editors/rehex/rehex-9999.ebuild
+++ b/app-editors/rehex/rehex-9999.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit wxwidgets xdg
+
+DESCRIPTION="Reverse Engineers' Hex Editor"
+HOMEPAGE="https://github.com/solemnwarning/rehex"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/solemnwarning/${PN}.git"
+else
+	SRC_URI="https://github.com/solemnwarning/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+RESTRICT="
+	mirror
+	!test? ( test )
+"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-libs/capstone
+	dev-libs/jansson
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-cpp/gtest
+	)
+"
+
+src_configure() {
+	setup-wxwidgets
+}
+
+src_install() {
+	emake prefix="${D}"/usr install
+}
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@ -0,0 +1,3 @@
+DIST vscode-1.61.1-amd64.tar.gz 112707199 BLAKE2B f992466965e6807c000718c90c59e5d45e46192c8ec4a14e843ef71bebeb86bfc281ea2e7c41a5c515a904ecff82c3edc47ae33d769a2a69f154529ae4bf6a25 SHA512 4bc9fa8aa1160573f367c609a175547b12592f07a36d5c49c0d1434a7b22257dbb6ec39ce3bbc40f55177a9de51d49ac8b85e563cae9a5cff520a812f92afd7e
+DIST vscode-1.61.1-arm.tar.gz 94342599 BLAKE2B 98ffc184981197bfd6fb1a0104e8a95ac18df27eee9e44e46fd42bd3986176b0996a8a454414c860a15f6d3679c3e3ab0677cb380de2b4d4f154ba83b939133c SHA512 dd9066ba6d0ad26f1b49cebeeed5d2c45be97a6e749f1a1fe83f259311f89e25ee79d3e305481879504b3e4a99bb6aa61025403265304f82ddc348cb38104140
+DIST vscode-1.61.1-arm64.tar.gz 107928610 BLAKE2B aa88e8784976d02f35c08aee64e25f63d3cf5ab53c2941f1170dc1e5a59000e853cb6f7bb597d6035b61e8421639d60b6cd63b62667d54a7bea1b2e2e7de0515 SHA512 7e561e3d2a79f58062e256cf0d0cf98eb0d16d55b943e8eeeda9e19b00922cfe63f70bb386de0337a83ec852cc83ca770e31fad085f60cf09ec70ac27d2a9b7c
--- a/app-editors/vscode/metadata.xml
+++ b/app-editors/vscode/metadata.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+</pkgmetadata>
--- a/app-editors/vscode/vscode-1.61.1.ebuild
+++ b/app-editors/vscode/vscode-1.61.1.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bintron desktop
+
+DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
+HOMEPAGE="https://code.visualstudio.com"
+SRC_URI="
+	amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
+	arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz )
+	arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz )
+"
+S="${WORKDIR}"
+
+LICENSE="
+	Apache-2.0
+	BSD
+	BSD-1
+	BSD-2
+	BSD-4
+	CC-BY-4.0
+	ISC
+	LGPL-2.1+
+	Microsoft-vscode
+	MIT
+	MPL-2.0
+	openssl
+	PYTHON
+	TextMate-bundle
+	Unlicense
+	UoI-NCSA
+	W3C
+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+
+correct_dir() {
+	if use amd64; then
+		cd "${WORKDIR}/VSCode-linux-x64" || die
+	elif use arm; then
+		cd "${WORKDIR}/VSCode-linux-armhf" || die
+	elif use arm64; then
+		cd "${WORKDIR}/VSCode-linux-arm64" || die
+	else
+		die "Visual Studio Code only supports amd64, arm and arm64"
+	fi
+}
+
+src_prepare() {
+	correct_dir
+	bintron_src_prepare
+}
+
+src_install() {
+	correct_dir
+	bintron_src_install
+
+	newicon ./resources/app/resources/linux/code.png vscode.png
+	make_desktop_entry code VSCode vscode "TextEditor;Development;IDE;"
+}
--- a/app-emacs/ement/Manifest
+++ b/app-emacs/ement/Manifest
@ -1,2 +0,0 @@
-DIST ement-0.14.tar.gz 1091980 BLAKE2B 3d8969968acc47d2141a09894b46b2b1c7b5ac93c8883cff9e56c54e9061e3769d4eded25bf8fb3791d77699b1145d902b14361a4965f636d489ac605b2da515 SHA512 e966c0836e315f60e669775b1eb479cc45151a53ca7142b5a1887606f4e15652fbb9427f98ab1a8b6362f85d87eacb0e40353f6b9e2acc4023799574fe9e776e
-DIST ement-0.15.tar.gz 1109539 BLAKE2B e4566f6b09c0b14369c339d01b184300cd0a76eb62bba8731a720d309e61cb36fcb69a64385138a8d66c18063a89abaeadec39c67ddba56d2d6f5e93a1a6a1ed SHA512 69191ae523cccc5b3fa04105c5340f9368cc3733473cfa4336000aaef0e26a536a479d45a4a7463c30941f3102addf83113998d18ae654e99bbb347298c83ba2
--- a/app-emacs/ement/ement-0.14.ebuild
+++ b/app-emacs/ement/ement-0.14.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-NEED_EMACS="27.1"
-
-inherit elisp
-
-DESCRIPTION="Matrix client for GNU Emacs"
-HOMEPAGE="https://github.com/alphapapa/ement.el"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/alphapapa/ement.el.git"
-else
-	SRC_URI="https://github.com/alphapapa/ement.el/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ement.el-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-DEPEND="
-	>=app-emacs/transient-0.3.7
-	>=app-emacs/persist-0.5
-	>=app-emacs/plz-0.6
-	>=app-emacs/taxy-0.10
-	>=app-emacs/taxy-magit-section-0.13
-	>=app-emacs/svg-lib-0.2.5
-	>=app-emacs/transient-0.3.7
-"
-
-DOCS="README.org"
-
-SITEFILE="50${PN}-gentoo.el"
-
-elisp-enable-tests ert "${S}/tests" -l tests/ement-tests.el
--- a/app-emacs/ement/ement-0.15.ebuild
+++ b/app-emacs/ement/ement-0.15.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-NEED_EMACS="27.1"
-
-inherit elisp
-
-DESCRIPTION="Matrix client for GNU Emacs"
-HOMEPAGE="https://github.com/alphapapa/ement.el"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/alphapapa/ement.el.git"
-else
-	SRC_URI="https://github.com/alphapapa/ement.el/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ement.el-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-DEPEND="
-	>=app-emacs/transient-0.3.7
-	>=app-emacs/persist-0.5
-	>=app-emacs/plz-0.6
-	>=app-emacs/taxy-0.10
-	>=app-emacs/taxy-magit-section-0.13
-	>=app-emacs/svg-lib-0.2.5
-	>=app-emacs/transient-0.3.7
-"
-
-DOCS="README.org"
-
-SITEFILE="50${PN}-gentoo.el"
-
-elisp-enable-tests ert "${S}/tests" -l tests/ement-tests.el
--- a/app-emacs/ement/ement-9999.ebuild
+++ b/app-emacs/ement/ement-9999.ebuild
@ -1,39 +1,63 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
+NEED_EMACS="26.3"

-NEED_EMACS="27.1"
-
-inherit elisp
+inherit elisp git-r3

 DESCRIPTION="Matrix client for GNU Emacs"
 HOMEPAGE="https://github.com/alphapapa/ement.el"

-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/alphapapa/ement.el.git"
-else
-	SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
-	KEYWORDS="~amd64"
-fi
+EGIT_REPO_URI="https://github.com/alphapapa/ement.el.git"
+EGIT_BRANCH="master"
+EGIT_CLONE_TYPE="single"
+
+KEYWORDS="~amd64"

 LICENSE="GPL-3"
 SLOT="0"
-IUSE="e2e"
-
-RESTRICT="test"
-
-DEPEND="
-	>=app-emacs/transient-0.3.7
-	>=app-emacs/persist-0.5
-	>=app-emacs/plz-0.6
-	>=app-emacs/taxy-0.10
-	>=app-emacs/taxy-magit-section-0.12.1
-	>=app-emacs/svg-lib-0.2.5
-	>=app-emacs/transient-0.3.7
-"
+IUSE="e2e extras"

 DOCS="README.org"

+BDEPEND="
+	>=app-emacs/plz-0.1_pre
+	>=app-emacs/ts-0.2
+	e2e? ( net-im/pantalaimon )
+"
+# Pantalaimon's docs are needed at build time to annotate config
+
+RDEPEND="
+	>=app-emacs/plz-0.1_pre
+	>=app-emacs/ts-0.2
+	e2e? ( net-im/pantalaimon )
+	extras? ( app-emacs/ement-extras )
+"
 SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	if use e2e ; then
+		einfo "Annotating suggested pantalaimon config..."
+		cp "${FILESDIR}"/pantalaimon.conf "${S}"
+		"${EMACS}" -Q -batch -l "${FILESDIR}/${PN}"-annotate-conf.el
+	fi
+}
+
+src_install() {
+	if use e2e ; then
+		einfo "Installing suggested pantalaimon config to /etc/${PN}"
+		insinto /etc/"${PN}"
+		doins pantalaimon.conf
+		DOCS+=" ${FILESDIR}/${PN}-gentoo-pantalaimon.org"
+	fi
+	elisp_src_install
+}
+
+pkg_postinst() {
+	if [ ! [ use e2e && use extras ] ] ; then
+		einfo "To start using Matrix from Emacs with E2EE without any manual configuration,"
+		einfo "USE=\"e2e extras\" emerge app-emacs/ement"
+	fi
+}
--- a/app-emacs/ement/metadata.xml
+++ b/app-emacs/ement/metadata.xml
@ -5,10 +5,13 @@
    <email>nuclearspace@gmail.com</email>
    <name>Dima Akater</name>
  </maintainer>
+  <longdescription>Ement.el is a Matrix client for GNU Emacs.  Currently in development but already useful.
+  </longdescription>
  <upstream>
    <remote-id type="github">alphapapa/ement.el</remote-id>
  </upstream>
  <use>
    <flag name="e2e">Enable end to end encryption support via pantalaimon</flag>
+    <flag name="extras">Install extra features (auth-source and proxy support)</flag>
  </use>
 </pkgmetadata>
--- a/app-emacs/taxy-magit-section/files/50taxy-magit-section-gentoo.el
+++ b/app-emacs/taxy-magit-section/files/50taxy-magit-section-gentoo.el
--- a/app-emacs/plz/metadata.xml
+++ b/app-emacs/plz/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>nuclearspace@gmail.com</email>
+    <name>Dima Akater</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">alphapapa/plz.el</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/app-emacs/plz/plz-9999.ebuild
+++ b/app-emacs/plz/plz-9999.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS="26.3"
+
+inherit elisp git-r3
+
+DESCRIPTION="An HTTP library that uses curl as a backend"
+HOMEPAGE="https://github.com/alphapapa/plz.el"
+
+EGIT_REPO_URI="https://github.com/alphapapa/plz.el.git"
+EGIT_BRANCH="master"
+EGIT_CLONE_TYPE="single"
+
+KEYWORDS="~amd64"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+SITEFILE="50${PN}-gentoo.el"
+
+RDEPEND="net-misc/curl"
+
+src_test() {
+	emake test
+}
--- a/app-emacs/taxy-magit-section/Manifest
+++ b/app-emacs/taxy-magit-section/Manifest
@ -1 +0,0 @@
-DIST taxy-magit-section-0.13.tar 81920 BLAKE2B 286fde7e9dc9dffe9985020ffc8739e47ecc4c1cfeb3a8816b6cb4f3eb6c143aeba76942080f9cdbaee55f9f1f3398b04a4a69ebc9cd3eec591aa708e79267a3 SHA512 f01178a5dc26f56eecafd1d366456a3815b890315369763c10f1203ba415e701b81b53714a5b43f297bf5dfdfd365e1fad763f88914a3f5e779db8dbd108a2c5
--- a/app-emacs/taxy-magit-section/metadata.xml
+++ b/app-emacs/taxy-magit-section/metadata.xml
@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <upstream>
-    <remote-id type="github">alphapapa/taxy.el</remote-id>
-  </upstream>
-</pkgmetadata>
--- a/app-emacs/taxy-magit-section/taxy-magit-section-0.13.ebuild
+++ b/app-emacs/taxy-magit-section/taxy-magit-section-0.13.ebuild
@ -1,38 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-NEED_EMACS="26.3"
-
-inherit elisp
-
-DESCRIPTION="Programmable taxonomical hierarchies for arbitrary objects"
-HOMEPAGE="https://github.com/alphapapa/taxy.el"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/alphapapa/taxy.el"
-	EGIT_BRANCH="package/${PN}"
-else
-	SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-RESTRICT="test"
-
-DEPEND="
-	>=app-emacs/magit-3.2.1
-	>=app-emacs/taxy-0.10
-"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_install() {
-	elisp_src_install
-	doinfo ${PN}.info
-}
--- a/app-emacs/taxy-magit-section/taxy-magit-section-9999.ebuild
+++ b/app-emacs/taxy-magit-section/taxy-magit-section-9999.ebuild
@ -1,38 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-NEED_EMACS="26.3"
-
-inherit elisp
-
-DESCRIPTION="Programmable taxonomical hierarchies for arbitrary objects"
-HOMEPAGE="https://github.com/alphapapa/taxy.el"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/alphapapa/taxy.el"
-	EGIT_BRANCH="package/${PN}"
-else
-	SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-RESTRICT="test"
-
-DEPEND="
-	>=app-emacs/magit-3.2.1
-	>=app-emacs/taxy-0.10
-"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_install() {
-	elisp_src_install
-	doinfo ${PN}.info
-}
--- a/app-emacs/taxy/Manifest
+++ b/app-emacs/taxy/Manifest
@ -1 +0,0 @@
-DIST taxy-0.10.1.tar 245760 BLAKE2B 9fabcc2ac7cb727ef8f6bb98d936f8c3f85d0b74fa5535cce748389ac6908bf426b418f57f646ab6c3957412a2565ca49ff32c38ca2e3380ae709325d974e2d7 SHA512 ee2b66ca5d3ae871db19aa0ee65a798fdac6113b048a50d8ca843eb66d966d9432912a178b5322678b5ba504597ad31b41ec839f8dbcb674645b32cee12a4a26
--- a/app-emacs/taxy/files/50taxy-gentoo.el
+++ b/app-emacs/taxy/files/50taxy-gentoo.el
@ -1 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
--- a/app-emacs/taxy/metadata.xml
+++ b/app-emacs/taxy/metadata.xml
@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <upstream>
-    <remote-id type="github">alphapapa/taxy.el</remote-id>
-  </upstream>
-</pkgmetadata>
--- a/app-emacs/taxy/taxy-0.10.1.ebuild
+++ b/app-emacs/taxy/taxy-0.10.1.ebuild
@ -1,31 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-NEED_EMACS="26.3"
-
-inherit elisp
-
-DESCRIPTION="Programmable taxonomical hierarchies for arbitrary objects"
-HOMEPAGE="https://github.com/alphapapa/taxy.el"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/alphapapa/taxy.el"
-else
-	SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-RESTRICT="test"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_install() {
-	elisp_src_install
-	doinfo ${PN}.info
-}
--- a/app-emacs/taxy/taxy-9999.ebuild
+++ b/app-emacs/taxy/taxy-9999.ebuild
@ -1,31 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-NEED_EMACS="26.3"
-
-inherit elisp
-
-DESCRIPTION="Programmable taxonomical hierarchies for arbitrary objects"
-HOMEPAGE="https://github.com/alphapapa/taxy.el"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/alphapapa/taxy.el"
-else
-	SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-RESTRICT="test"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_install() {
-	elisp_src_install
-	doinfo ${PN}.info
-}
--- a/app-emacs/ts/Manifest
+++ b/app-emacs/ts/Manifest
@ -1 +0,0 @@
-DIST ts-0.2.2.tar.gz 41296 BLAKE2B 4238662cb4c726347ab3eb33064363ca1c846c9f99283a82a9724d358547a8651a37f5d72ebb2aeb93447aa07ec1f7c8c329a1be9da7767a5aa34d18493ae4cd SHA512 231d631011cf1d51e62c2f8ce53b3e7141eb0d1127dd8911f6a82feaa074afee2147454479d19901f867548520a988129e0c16be8326386e9de926662dcb535b
--- a/app-emacs/ts/ts-0.2.2.ebuild
+++ b/app-emacs/ts/ts-0.2.2.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-NEED_EMACS="26.1"
-
-inherit elisp
-
-DESCRIPTION="Timestamp and date/time library"
-HOMEPAGE="https://github.com/alphapapa/ts.el"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/alphapapa/ts.el.git"
-else
-	MY_PN="${PN}.el"
-	SRC_URI="https://github.com/alphapapa/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-
-	KEYWORDS="~amd64"
-	RESTRICT="test"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-SITEFILE="50${PN}-gentoo.el"
-
-DEPEND="
-	>=app-emacs/dash-2.14.1
-	>=app-emacs/s-1.12.0
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	emake test
-}
--- a/app-emacs/ts/ts-9999.ebuild
+++ b/app-emacs/ts/ts-9999.ebuild
@ -1,37 +1,30 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
-
 NEED_EMACS="26.1"

-inherit elisp
+inherit elisp git-r3

 DESCRIPTION="Timestamp and date/time library"
 HOMEPAGE="https://github.com/alphapapa/ts.el"

-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/alphapapa/ts.el.git"
-else
-	MY_PN="${PN}.el"
-	SRC_URI="https://github.com/alphapapa/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-
-	KEYWORDS="~amd64"
-	RESTRICT="test"
-fi
+EGIT_REPO_URI="https://github.com/alphapapa/ts.el.git"
+EGIT_BRANCH="master"
+EGIT_CLONE_TYPE="single"
+KEYWORDS="~amd64"

 LICENSE="GPL-3"
 SLOT="0"

 SITEFILE="50${PN}-gentoo.el"

-DEPEND="
+BDEPEND="
 	>=app-emacs/dash-2.14.1
 	>=app-emacs/s-1.12.0
 "
-RDEPEND="${DEPEND}"
+
+RDEPEND="${BDEPEND}"

 src_test() {
 	emake test
--- a/app-emulation/anbox/Manifest
+++ b/app-emulation/anbox/Manifest
@ -0,0 +1,3 @@
+DIST anbox-0_pre20201129.tar.gz 1024707 BLAKE2B 38153bdc3c011b726bbffefeb9ca439398988945a6f19265d2c6ebd424308a37fa321ab0685660cc67bedf7edbc8793c7cb0c179a5b31dd7aa640cc5286442eb SHA512 c4878745b62719c6cbecde047386858bd2ec7a5dbd37462967cab60fd118f31b89c157b4a00412b51bf130c7b46a83a3c3ab5162ee13baa0e789f773649e8745
+DIST anbox-0_pre20210320.tar.gz 1024515 BLAKE2B 7e25e15ee598dafc5fd3918e59bdd7808ca32f0a7546316529b145fe8cf985cf77ecf3a95a735b2885676aa759ba4bd4801322e69cbf32590119ea62ecf7cf73 SHA512 89d31043047c1e25b2789638dddd5ea49d9fd754e0baa573c073c3c454e3a6e6f1e3bea6e4a632d6c3942d3a206741bc62f7db6e435c8be34856915dc4b27464
+DIST cpu_features-b9593c8b395318bb2bc42683a94f962564cc4664.tar.gz 55211 BLAKE2B b49714863cbebfde09e6ab99f31d9aaace367d84df9ecb12989fffc1326c9c60cfa14d917e490332c2a0b2a3fe267b6327b719652afba9bfa1654fc2564408b8 SHA512 8c12b50741e2979a32b69c788934bee0d00811b7662006c8b493e98d5efeada67ed59460be40c234b2d3bafd85671cb1a1d7c1a6ee535a7fc1cc6ac56a754576
--- a/app-emulation/anbox/anbox-0_pre20201129.ebuild
+++ b/app-emulation/anbox/anbox-0_pre20201129.ebuild
@ -0,0 +1,123 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info systemd cmake
+
+DESCRIPTION="Container-based approach to boot a full Android system"
+HOMEPAGE="https://anbox.io/"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/anbox/anbox.git"
+	EGIT_SUBMODULES=( 'external/cpu_features' )
+	EGIT_COMMIT_DATE="${PV}"
+else
+	COMMIT="6c10125a7f13908d2cbe56d2d9ab09872755f265" # 29.11.2020
+	EXTCOMMIT="b9593c8b395318bb2bc42683a94f962564cc4664"
+	SRC_URI="
+		https://github.com/anbox/anbox/archive/"${COMMIT}".tar.gz -> "${P}".tar.gz
+		https://github.com/google/cpu_features/archive/"${EXTCOMMIT}".tar.gz -> cpu_features-"${EXTCOMMIT}".tar.gz
+	"
+	S=""${WORKDIR}"/"${PN}"-"${COMMIT}""
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="X wayland systemd"
+
+DEPEND="
+	>=app-emulation/lxc-3.0.0
+	dev-cpp/properties-cpp
+	dev-cpp/sdbus-cpp
+	dev-cpp/gtest
+	dev-libs/boost[threads]
+	dev-libs/expat
+	dev-libs/protobuf
+	media-libs/libsdl2
+	media-libs/glm
+	media-libs/mesa[egl,gles2]
+	media-libs/sdl2-image
+	sys-apps/dbus
+	sys-fs/fuse:3
+	sys-libs/libcap
+	|| ( sys-apps/systemd sys-auth/elogind )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="
+	~ANDROID_BINDERFS
+	~ANDROID_BINDER_IPC
+	~ASHMEM
+	~BLK_DEV_LOOP
+	~FUSE_FS
+	~SQUASHFS
+	~SQUASHFS_XZ
+	~SQUASHFS_XATTR
+	~TMPFS_XATTR
+"
+
+PATCHES=( ""${FILESDIR}"/no_bundled_sdbus.patch" )
+
+pkg_pretend() {
+	if use !systemd; then
+		# Needed for anbox-bridge.sh
+		CONFIG_CHECK="
+			~NETFILTER_XT_MATCH_COMMENT
+			~NETFILTER_XT_TARGET_CHECKSUM
+		"
+		check_extra_config
+	fi
+	# Check if ANDROID_BINDER_DEVICES has binder string specicied in it
+	linux_config_exists && grep -qE '(CONFIG_ANDROID_BINDER_DEVICES=*[^h][^w]binder)' "${KERNEL_DIR}"/.config || eerror "  CONFIG_ANDROID_BINDER_DEVICES does not contain string 'binder'"
+}
+
+src_prepare() {
+	[[ "${PV}" == "9999" ]] || mv "${WORKDIR}"/cpu_features-"${EXTCOMMIT}"/* "${S}"/external/cpu_features || die
+	use !systemd && eapply "${FILESDIR}"/remove_systemd_dependency.patch
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPE=Release
+		-DENABLE_X11=$(usex X)
+		-DENABLE_WAYLAND=$(usex wayland)
+	)
+	[[ "${PV}" == "9999" ]] || mycmakeargs+=(-DANBOX_VERSION="${PV}")
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	newbin "${FILESDIR}"/anbox-launch.sh anbox-launch
+	if use systemd; then
+		systemd_dounit "${FILESDIR}"/anbox-{{container,session}-manager.service,bridge.net{dev,work}}
+	else
+		exeinto /usr/share/anbox
+		doexe "scripts/anbox-bridge.sh"
+		newinitd "${FILESDIR}"/anbox-container-manager.initd anbox-container-manager
+		newconfd "${FILESDIR}"/anbox.confd anbox
+	fi
+}
+
+pkg_postinst() {
+	einfo "Anbox requires a specially made android image installed to /usr/share/anbox/android.img. "
+	einfo "You can either download it prebuilt from upstream:"
+	einfo " https://build.anbox.io/android-images/"
+	einfo "or to build it manually according to instructions:"
+	einfo " https://github.com/anbox/anbox/blob/master/docs/build-android.md"
+	einfo ""
+	einfo "How to get it running:"
+	einfo "First start the anbox-container-manager daemon"
+	if use systemd; then
+		einfo "# systemctl start anbox-container-manager"
+	else
+		einfo "# rc-service anbox-container-manager start"
+	fi
+	einfo "Then you can access the image"
+	einfo "$ anbox-launch"
+}
--- a/app-emulation/anbox/anbox-0_pre20210320.ebuild
+++ b/app-emulation/anbox/anbox-0_pre20210320.ebuild
@ -0,0 +1,125 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info systemd cmake
+
+DESCRIPTION="Container-based approach to boot a full Android system"
+HOMEPAGE="https://anbox.io/"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/anbox/anbox.git"
+	EGIT_SUBMODULES=( 'external/cpu_features' )
+	EGIT_COMMIT_DATE="${PV}"
+else
+	COMMIT="9de4e87cdd05135e1c71e6eadb68bf82719cebdf" # 20.03.2021
+	EXTCOMMIT="b9593c8b395318bb2bc42683a94f962564cc4664"
+	SRC_URI="
+		https://github.com/anbox/anbox/archive/"${COMMIT}".tar.gz -> "${P}".tar.gz
+		https://github.com/google/cpu_features/archive/"${EXTCOMMIT}".tar.gz -> cpu_features-"${EXTCOMMIT}".tar.gz
+	"
+	S=""${WORKDIR}"/"${PN}"-"${COMMIT}""
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="X wayland systemd"
+
+DEPEND="
+	>=app-emulation/lxc-3.0.0
+	dev-cpp/properties-cpp
+	dev-cpp/sdbus-cpp
+	dev-cpp/gtest
+	dev-libs/boost[threads]
+	dev-libs/expat
+	dev-libs/protobuf
+	media-libs/libsdl2
+	media-libs/glm
+	media-libs/mesa[egl,gles2]
+	media-libs/sdl2-image
+	sys-apps/dbus
+	sys-fs/fuse:3
+	sys-libs/libcap
+	|| ( sys-apps/systemd sys-auth/elogind )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="
+	~ANDROID_BINDERFS
+	~ANDROID_BINDER_IPC
+	~ASHMEM
+	~BLK_DEV_LOOP
+	~FUSE_FS
+	~SQUASHFS
+	~SQUASHFS_XZ
+	~SQUASHFS_XATTR
+	~TMPFS_XATTR
+"
+
+PATCHES=( ""${FILESDIR}"/no_bundled_sdbus-r1.patch" )
+
+pkg_pretend() {
+	if use !systemd; then
+		# Needed for anbox-bridge.sh
+		CONFIG_CHECK="
+			~NETFILTER_XT_MATCH_COMMENT
+			~NETFILTER_XT_TARGET_CHECKSUM
+		"
+		check_extra_config
+	fi
+	# Check if ANDROID_BINDER_DEVICES has binder string specicied in it
+	linux_config_exists && grep -qE '(CONFIG_ANDROID_BINDER_DEVICES=*[^h][^w]binder)' "${KERNEL_DIR}"/.config || eerror "  CONFIG_ANDROID_BINDER_DEVICES does not contain string 'binder'"
+}
+
+src_prepare() {
+	cp "${FILESDIR}"/FindGMock.cmake "${S}"/cmake
+	[[ "${PV}" == "9999" ]] || mv "${WORKDIR}"/cpu_features-"${EXTCOMMIT}"/* "${S}"/external/cpu_features || die
+	use !systemd && eapply "${FILESDIR}"/remove_systemd_dependency.patch
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPE=Release
+		-DENABLE_X11=$(usex X)
+		-DENABLE_WAYLAND=$(usex wayland)
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	[[ "${PV}" == "9999" ]] || mycmakeargs+=(-DANBOX_VERSION="${PV}")
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	newbin "${FILESDIR}"/anbox-launch.sh anbox-launch
+	if use systemd; then
+		systemd_dounit "${FILESDIR}"/anbox-{{container,session}-manager.service,bridge.net{dev,work}}
+	else
+		exeinto /usr/share/anbox
+		doexe "scripts/anbox-bridge.sh"
+		newinitd "${FILESDIR}"/anbox-container-manager.initd anbox-container-manager
+		newconfd "${FILESDIR}"/anbox.confd anbox
+	fi
+}
+
+pkg_postinst() {
+	einfo "Anbox requires a specially made android image installed to /usr/share/anbox/android.img. "
+	einfo "You can either download it prebuilt from upstream:"
+	einfo " https://build.anbox.io/android-images/"
+	einfo "or to build it manually according to instructions:"
+	einfo " https://github.com/anbox/anbox/blob/master/docs/build-android.md"
+	einfo ""
+	einfo "How to get it running:"
+	einfo "First start the anbox-container-manager daemon"
+	if use systemd; then
+		einfo "# systemctl start anbox-container-manager"
+	else
+		einfo "# rc-service anbox-container-manager start"
+	fi
+	einfo "Then you can access the image"
+	einfo "$ anbox-launch"
+}
--- a/app-emulation/anbox/anbox-9999.ebuild
+++ b/app-emulation/anbox/anbox-9999.ebuild
@ -0,0 +1,125 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info systemd cmake
+
+DESCRIPTION="Container-based approach to boot a full Android system"
+HOMEPAGE="https://anbox.io/"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/anbox/anbox.git"
+	EGIT_SUBMODULES=( 'external/cpu_features' )
+	EGIT_COMMIT_DATE="${PV}"
+else
+	COMMIT="9de4e87cdd05135e1c71e6eadb68bf82719cebdf" # 20.03.2021
+	EXTCOMMIT="b9593c8b395318bb2bc42683a94f962564cc4664"
+	SRC_URI="
+		https://github.com/anbox/anbox/archive/"${COMMIT}".tar.gz -> "${P}".tar.gz
+		https://github.com/google/cpu_features/archive/"${EXTCOMMIT}".tar.gz -> cpu_features-"${EXTCOMMIT}".tar.gz
+	"
+	S=""${WORKDIR}"/"${PN}"-"${COMMIT}""
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="X wayland systemd"
+
+DEPEND="
+	>=app-emulation/lxc-3.0.0
+	dev-cpp/properties-cpp
+	dev-cpp/sdbus-cpp
+	dev-cpp/gtest
+	dev-libs/boost[threads]
+	dev-libs/expat
+	dev-libs/protobuf
+	media-libs/libsdl2
+	media-libs/glm
+	media-libs/mesa[egl,gles2]
+	media-libs/sdl2-image
+	sys-apps/dbus
+	sys-fs/fuse:3
+	sys-libs/libcap
+	|| ( sys-apps/systemd sys-auth/elogind )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="
+	~ANDROID_BINDERFS
+	~ANDROID_BINDER_IPC
+	~ASHMEM
+	~BLK_DEV_LOOP
+	~FUSE_FS
+	~SQUASHFS
+	~SQUASHFS_XZ
+	~SQUASHFS_XATTR
+	~TMPFS_XATTR
+"
+
+PATCHES=( ""${FILESDIR}"/no_bundled_sdbus-r1.patch" )
+
+pkg_pretend() {
+	if use !systemd; then
+		# Needed for anbox-bridge.sh
+		CONFIG_CHECK="
+			~NETFILTER_XT_MATCH_COMMENT
+			~NETFILTER_XT_TARGET_CHECKSUM
+		"
+		check_extra_config
+	fi
+	# Check if ANDROID_BINDER_DEVICES has binder string specicied in it
+	linux_config_exists && grep -qE '(CONFIG_ANDROID_BINDER_DEVICES=*[^h][^w]binder)' "${KERNEL_DIR}"/.config || eerror "  CONFIG_ANDROID_BINDER_DEVICES does not contain string 'binder'"
+}
+
+src_prepare() {
+	cp "${FILESDIR}"/FindGMock.cmake "${S}"/cmake
+	[[ "${PV}" == "9999" ]] || mv "${WORKDIR}"/cpu_features-"${EXTCOMMIT}"/* "${S}"/external/cpu_features || die
+	use !systemd && eapply "${FILESDIR}"/remove_systemd_dependency.patch
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPE=Release
+		-DENABLE_X11=$(usex X)
+		-DENABLE_WAYLAND=$(usex wayland)
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	[[ "${PV}" == "9999" ]] || mycmakeargs+=(-DANBOX_VERSION="${PV}")
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	newbin "${FILESDIR}"/anbox-launch.sh anbox-launch
+	if use systemd; then
+		systemd_dounit "${FILESDIR}"/anbox-{{container,session}-manager.service,bridge.net{dev,work}}
+	else
+		exeinto /usr/share/anbox
+		doexe "scripts/anbox-bridge.sh"
+		newinitd "${FILESDIR}"/anbox-container-manager.initd anbox-container-manager
+		newconfd "${FILESDIR}"/anbox.confd anbox
+	fi
+}
+
+pkg_postinst() {
+	einfo "Anbox requires a specially made android image installed to /usr/share/anbox/android.img. "
+	einfo "You can either download it prebuilt from upstream:"
+	einfo " https://build.anbox.io/android-images/"
+	einfo "or to build it manually according to instructions:"
+	einfo " https://github.com/anbox/anbox/blob/master/docs/build-android.md"
+	einfo ""
+	einfo "How to get it running:"
+	einfo "First start the anbox-container-manager daemon"
+	if use systemd; then
+		einfo "# systemctl start anbox-container-manager"
+	else
+		einfo "# rc-service anbox-container-manager start"
+	fi
+	einfo "Then you can access the image"
+	einfo "$ anbox-launch"
+}
--- a/app-emulation/anbox/files/FindGMock.cmake
+++ b/app-emulation/anbox/files/FindGMock.cmake
@ -0,0 +1,102 @@
+# Copyright (C) 2014 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Build with system gmock and embedded gtest
+#
+# Usage:
+#
+# find_package(GMock)
+#
+# ...
+#
+# target_link_libraries(
+#   my-target
+#   ${GTEST_BOTH_LIBRARIES}
+# )
+#
+# NOTE: Due to the way this package finder is implemented, do not attempt
+# to find the GMock package more than once.
+
+find_package(Threads)
+
+pkg_check_modules(GTEST      gtest     )
+pkg_check_modules(GTEST_MAIN gtest_main)
+pkg_check_modules(GMOCK      gmock     )
+pkg_check_modules(GMOCK_MAIN gmock_main)
+
+if (NOT (GTEST_FOUND AND GTEST_MAIN_FOUND AND GMOCK_FOUND AND GMOCK_MAIN_FOUND))
+
+    if (EXISTS "/usr/src/googletest")
+        # As of version 1.8.0
+        set(GMOCK_SOURCE_DIR "/usr/src/googletest/googlemock" CACHE PATH "gmock source directory")
+        set(GMOCK_INCLUDE_DIRS "${GMOCK_SOURCE_DIR}/include" CACHE PATH "gmock source include directory")
+        set(GTEST_INCLUDE_DIRS "/usr/src/googletest/googletest/include" CACHE PATH "gtest source include directory")
+    else()
+        set(GMOCK_SOURCE_DIR "/usr/src/gmock" CACHE PATH "gmock source directory")
+        set(GMOCK_INCLUDE_DIRS "/usr/include" CACHE PATH "gmock source include directory")
+        set(GTEST_INCLUDE_DIRS "/usr/include" CACHE PATH "gtest source include directory")
+    endif()
+
+    # We add -g so we get debug info for the gtest stack frames with gdb.
+    # The warnings are suppressed so we get a noise-free build for gtest and gmock if the caller
+    # has these warnings enabled.
+    set(findgmock_cxx_flags "${CMAKE_CXX_FLAGS} -g -Wno-old-style-cast -Wno-missing-field-initializers -Wno-ctor-dtor-privacy -Wno-switch-default")
+
+    set(findgmock_bin_dir "${CMAKE_CURRENT_BINARY_DIR}/gmock")
+    set(findgmock_gtest_lib "${findgmock_bin_dir}/lib/libgtest.a")
+    set(findgmock_gtest_main_lib "${findgmock_bin_dir}/lib/libgtest_main.a")
+    set(findgmock_gmock_lib "${findgmock_bin_dir}/lib/libgmock.a")
+    set(findgmock_gmock_main_lib "${findgmock_bin_dir}/lib/libgmock_main.a")
+
+    include(ExternalProject)
+    ExternalProject_Add(GMock SOURCE_DIR "${GMOCK_SOURCE_DIR}"
+                              BINARY_DIR "${findgmock_bin_dir}"
+                              BUILD_BYPRODUCTS "${findgmock_gtest_lib}"
+                                               "${findgmock_gtest_main_lib}"
+                                               "${findgmock_gmock_lib}"
+                                               "${findgmock_gmock_main_lib}"
+                              INSTALL_COMMAND ""
+                              CMAKE_ARGS "-DCMAKE_CXX_FLAGS=${findgmock_cxx_flags}")
+
+    add_library(gtest INTERFACE)
+    target_include_directories(gtest INTERFACE ${GTEST_INCLUDE_DIRS})
+    target_link_libraries(gtest INTERFACE ${findgmock_gtest_lib} ${CMAKE_THREAD_LIBS_INIT})
+    add_dependencies(gtest GMock)
+
+    add_library(gtest_main INTERFACE)
+    target_include_directories(gtest_main INTERFACE ${GTEST_INCLUDE_DIRS})
+    target_link_libraries(gtest_main INTERFACE ${findgmock_gtest_main_lib} gtest)
+
+    add_library(gmock INTERFACE)
+    target_include_directories(gmock INTERFACE ${GMOCK_INCLUDE_DIRS})
+    target_link_libraries(gmock INTERFACE ${findgmock_gmock_lib} gtest)
+
+    add_library(gmock_main INTERFACE)
+    target_include_directories(gmock_main INTERFACE ${GMOCK_INCLUDE_DIRS})
+    target_link_libraries(gmock_main INTERFACE ${findgmock_gmock_main_lib} gmock gtest_main)
+
+    set(GTEST_LIBRARIES gtest)
+    set(GTEST_MAIN_LIBRARIES gtest_main)
+    set(GMOCK_LIBRARIES gmock gmock_main)
+
+    unset(findgmock_cxx_flags)
+    unset(findgmock_bin_dir)
+    unset(findgmock_gtest_lib)
+    unset(findgmock_gtest_main_lib)
+    unset(findgmock_gmock_lib)
+    unset(findgmock_gmock_main_lib)
+
+endif()
+
+set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES})
--- a/app-emulation/anbox/files/anbox-bridge.netdev
+++ b/app-emulation/anbox/files/anbox-bridge.netdev
@ -0,0 +1,3 @@
+[NetDev]
+Name=anbox0
+Kind=bridge
--- a/app-emulation/anbox/files/anbox-bridge.network
+++ b/app-emulation/anbox/files/anbox-bridge.network
@ -0,0 +1,7 @@
+[Match]
+Name=anbox0
+Driver=bridge
+
+[Network]
+Address=192.168.250.1/24
+IPMasquerade=yes
--- a/app-emulation/anbox/files/anbox-container-manager.initd
+++ b/app-emulation/anbox/files/anbox-container-manager.initd
@ -0,0 +1,43 @@
+#!/sbin/openrc-run
+
+supervisor=supervise-daemon
+
+name="Anbox container manager"
+command=/usr/bin/anbox
+command_args="container-manager --daemon --privileged --data-path=/var/lib/anbox --android-image=/usr/share/anbox/android.img"
+
+depend() {
+	need localmount sysfs cgroups fuse
+	use net
+	after firewall
+}
+
+start_pre() {
+	# that's all you need to avoid the lxc dependency
+	checkpath --directory /usr/lib/lxc
+	checkpath --directory /usr/lib/lxc/rootfs
+
+	modprobe loop
+	modprobe tun
+
+	if ! [[ -d /dev/binderfs ]]; then
+		mkdir /dev/binderfs
+		mount -t binder binder /dev/binderfs
+	fi
+
+	if ip link show anbox0 >/dev/null 2>&1; then
+		ewarn "anbox0 network interface already exists"
+	else
+		ebegin "Creating anbox0 network interface"
+		/usr/share/anbox/anbox-bridge.sh start
+		eend $?
+	fi
+}
+
+stop_post() {
+	if ip link show anbox0 >/dev/null 2>&1; then
+		ebegin "Removing anbox0 network interface"
+		/usr/share/anbox/anbox-bridge.sh stop
+		eend $?
+	fi
+}
--- a/app-emulation/anbox/files/anbox-container-manager.service
+++ b/app-emulation/anbox/files/anbox-container-manager.service
@ -0,0 +1,8 @@
+[Unit]
+Description=Anbox Container Manager
+
+[Service]
+ExecStart=/usr/bin/anbox container-manager --daemon --privileged --data-path=/var/lib/anbox
+
+[Install]
+WantedBy=multi-user.target
--- a/app-emulation/anbox/files/anbox-launch.sh
+++ b/app-emulation/anbox/files/anbox-launch.sh
@ -0,0 +1,23 @@
+#!/bin/sh
+
+# https://gitlab.com/postmarketOS/pmaports/-/issues/479
+# EGL_PLATFORM=wayland is broken on desktop as
+# Anbox require PBuffer support but Wayland EGL
+# doesn't provide it. Unsetting this value
+# unbreaks Anbox on e.g. Plasma Mobile.
+if [ "$EGL_PLATFORM" = wayland ]; then
+	export EGL_PLATFORM
+	unset EGL_PLATFORM
+fi
+
+# This breaks Anbox display if EGL_PLATFORM is not
+# set to wayland. Since EGL_PLATFORM is never set
+# to wayland, let's unset SDL_VIDEODRIVER if it is.
+if [ "$SDL_VIDEODRIVER" = wayland ]; then
+	export SDL_VIDEODRIVER
+	unset SDL_VIDEODRIVER
+fi
+
+# We let Anbox autostart the session manager as this
+# provides a splash-screen
+anbox launch --package=org.anbox.appmgr --component=org.anbox.appmgr.AppViewActivity
--- a/app-emulation/anbox/files/anbox-session-manager.service
+++ b/app-emulation/anbox/files/anbox-session-manager.service
@ -0,0 +1,8 @@
+[Unit]
+Description=Anbox Session Manager
+
+[Service]
+ExecStart=/usr/bin/anbox session-manager
+
+[Install]
+WantedBy=default.target
--- a/app-emulation/anbox/files/anbox.confd
+++ b/app-emulation/anbox/files/anbox.confd
@ -0,0 +1,8 @@
+# Sample conf.d file for alpine linux
+
+#
+# Specify daemon options here.
+#
+
+sample_opts=""
+sample_user=""
--- a/app-emulation/anbox/files/no_bundled_sdbus-r1.patch
+++ b/app-emulation/anbox/files/no_bundled_sdbus-r1.patch
@ -0,0 +1,50 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 713df49..1e8b462 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -59,6 +59,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ find_package(Boost COMPONENTS filesystem log serialization system thread program_options)
+ find_package(PkgConfig)
+ find_package(Threads)
+find_package(SDBus-C++ REQUIRED)
+ find_package(EGL REQUIRED)
+ find_package(GLESv2 REQUIRED)
+ find_package(Protobuf REQUIRED)
+diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
+index f677aa0..265a2eb 100644
+--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
+@@ -6,12 +6,3 @@ add_subdirectory(backward-cpp)
+ set(BUILD_TESTING OFF)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error")
+ add_subdirectory(cpu_features EXCLUDE_FROM_ALL)
+-include(ExternalProject)
+-ExternalProject_Add(sdbus-cpp
+-  PREFIX sdbus-cpp
+-  SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/sdbus-cpp"
+-  INSTALL_COMMAND ""
+-  CMAKE_CACHE_ARGS
+-        -DBUILD_CODE_GEN:BOOL=ON
+-        -DBUILD_SHARED_LIBS:BOOL=OFF
+-)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 796b881..a19da1b 100644
+--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
+@@ -26,7 +26,6 @@ include_directories(
+   ${CMAKE_SOURCE_DIR}/external/android-emugl/host/libs/renderControl_dec
+   ${CMAKE_BINARY_DIR}/external/android-emugl/host/libs/renderControl_dec
+   ${CMAKE_SOURCE_DIR}/external/cpu_features/include
+-  ${CMAKE_SOURCE_DIR}/external/sdbus-cpp/include
+ )
+ 
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBINDERFS_PATH=\"\\\"${BINDERFS_PATH}\\\"\"")
+@@ -59,7 +58,7 @@ add_library(anbox-protobuf
+ target_link_libraries(anbox-protobuf
+     ${PROTOBUF_LITE_LIBRARIES})
+ 
+-set(XML2CPP ${CMAKE_BINARY_DIR}/external/sdbus-cpp/src/sdbus-cpp-build/tools/sdbus-c++-xml2cpp)
+set(XML2CPP sdbus-c++-xml2cpp)
+ 
+ macro(DBusServer BaseName)
+     add_custom_command(
--- a/app-emulation/anbox/files/no_bundled_sdbus.patch
+++ b/app-emulation/anbox/files/no_bundled_sdbus.patch
@ -0,0 +1,50 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 713df49..1e8b462 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -59,6 +59,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ find_package(Boost COMPONENTS filesystem log serialization system thread program_options)
+ find_package(PkgConfig)
+ find_package(Threads)
+find_package(SDBus-C++ REQUIRED)
+ find_package(EGL REQUIRED)
+ find_package(GLESv2 REQUIRED)
+ find_package(Protobuf REQUIRED)
+diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
+index f677aa0..265a2eb 100644
+--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
+@@ -6,12 +6,3 @@ add_subdirectory(backward-cpp)
+ set(BUILD_TESTING OFF)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error")
+ add_subdirectory(cpu_features)
+-include(ExternalProject)
+-ExternalProject_Add(sdbus-cpp
+-  PREFIX sdbus-cpp
+-  SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/sdbus-cpp"
+-  INSTALL_COMMAND ""
+-  CMAKE_CACHE_ARGS
+-        -DBUILD_CODE_GEN:BOOL=ON
+-        -DBUILD_SHARED_LIBS:BOOL=OFF
+-)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 796b881..a19da1b 100644
+--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
+@@ -26,7 +26,6 @@ include_directories(
+   ${CMAKE_SOURCE_DIR}/external/android-emugl/host/libs/renderControl_dec
+   ${CMAKE_BINARY_DIR}/external/android-emugl/host/libs/renderControl_dec
+   ${CMAKE_SOURCE_DIR}/external/cpu_features/include
+-  ${CMAKE_SOURCE_DIR}/external/sdbus-cpp/include
+ )
+ 
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBINDERFS_PATH=\"\\\"${BINDERFS_PATH}\\\"\"")
+@@ -59,7 +58,7 @@ add_library(anbox-protobuf
+ target_link_libraries(anbox-protobuf
+     ${PROTOBUF_LITE_LIBRARIES})
+ 
+-set(XML2CPP ${CMAKE_BINARY_DIR}/external/sdbus-cpp/src/sdbus-cpp-build/tools/sdbus-c++-xml2cpp)
+set(XML2CPP sdbus-c++-xml2cpp)
+ 
+ macro(DBusServer BaseName)
+     add_custom_command(
--- a/app-emulation/anbox/files/remove_systemd_dependency.patch
+++ b/app-emulation/anbox/files/remove_systemd_dependency.patch
@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 713df49..1e8b462 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -68,7 +69,6 @@ pkg_check_modules(SDL2_IMAGE SDL2_image REQUIRED)
+ pkg_check_modules(DBUS dbus-1 REQUIRED)
+ pkg_check_modules(LXC lxc REQUIRED)
+ pkg_check_modules(PROPERTIES_CPP properties-cpp REQUIRED)
+-pkg_check_modules(LIBSYSTEMD libsystemd REQUIRED)
+ pkg_check_modules(LIBCAP libcap REQUIRED)
+
+ message(STATUS "LXC version: ${LXC_VERSION}")
+diff --git a/src/anbox/dbus/bus.h b/src/anbox/dbus/bus.h
+index 40b3d94..e798b4b 100644
+--- a/src/anbox/dbus/bus.h
+++ b/src/anbox/dbus/bus.h
+@@ -25,7 +25,7 @@
+ #include <mutex>
+ #include <thread>
+ 
+-#include <systemd/sd-bus.h>
+#include <elogind/systemd/sd-bus.h>
+ 
+ namespace anbox::dbus {
+ class Bus : public DoNotCopyOrMove {
--- a/media-libs/olivecore/metadata.xml
+++ b/media-libs/olivecore/metadata.xml
@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
    <email>parona@protonmail.com</email>
    <name>Alfred Wingate</name>
  </maintainer>
  <upstream>
-    <remote-id type="github">olive-editor/core</remote-id>
+    <remote-id type="github">anbox/anbox</remote-id>
  </upstream>
 </pkgmetadata>
--- a/app-emulation/bottles/Manifest
+++ b/app-emulation/bottles/Manifest
@ -1 +1,2 @@
-DIST bottles-51.11.tar.gz 2268391 BLAKE2B 1c97bf73307f6f6325346b73afeaae009b7942527d0bf0cc2ac8de51933ad6021821f63c984130ee37c215acb13e5d929d25078a1574316fdfea1d8f4b4074f1 SHA512 42c503a4910a8e6c408caecd723edf1405aa034558d61313937a69c7d5ffb20ba4675fc9022775491cbbe6ba4a35ffac508b4721f9c971c57cbcb888345d546b
+DIST bottles-2.0.9.7.tar.gz 1133843 BLAKE2B 9ca30c33d40b1101ad6cdee06e8cbaa8215832a3348f72b81d9ce0ee0763a1bfc3d9a36d2f00a8285887c82d0f12044145dc7216150554cdd4d10515bd699ae8 SHA512 305d12fd8626f5eab9cfb64672bbe3ec5c243f0f21e9869704fd04186eb5f0d5656560ab4a66957619577a8f68059d8171b9ad1cc5e4e6ab01ac93089d44784d
+DIST bottles-3.1.15.tar.gz 856553 BLAKE2B 024286e4c296a2833663a48425f89cd1849253cd217dd33e51c65b27e275914d1bd02670419a0aa404133efdcf453e5c654cf0f3f832a7942acac5789478d7f7 SHA512 d7f14f9f612e93905cc7da8203b6bb2752306b8e46721aa324fe300f9fc5a4b1badc0218e375419aabf164cd40a72d1443ddc80c42343123a4276610eae66e9e
--- a/app-emulation/bottles/bottles-2.0.9.7.ebuild
+++ b/app-emulation/bottles/bottles-2.0.9.7.ebuild
@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit python-single-r1 meson gnome2-utils xdg
+
+DESCRIPTION="Easily manage WINE prefixes in a new way"
+HOMEPAGE="
+	https://usebottles.com/
+	https://github.com/bottlesdevs/Bottles
+"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bottlesdevs/${PN^}.git"
+else
+	SRC_URI="https://github.com/bottlesdevs/${PN^}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${P^}"
+fi
+
+RESTRICT="mirror"
+LICENSE="GPL-3"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=x11-libs/gtk+-3.24.10[introspection]
+	dev-libs/appstream-glib[introspection]
+	dev-util/desktop-file-utils
+	$(python_gen_cond_dep '
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+"
+RDEPEND="
+	${DEPEND}
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+
+	# TODO: find a better way to fix the python script
+	echo "#!/usr/bin/${EPYTHON}
+	$(cat ${D}/usr/bin/${PN})" > "${D}/usr/bin/${PN}"
+
+	mv "${D}/usr/share/appdata" "${D}/usr/share/metainfo" || die
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_pkg_postrm
+}
--- a/app-emulation/bottles/bottles-3.1.15.ebuild
+++ b/app-emulation/bottles/bottles-3.1.15.ebuild
@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-single-r1 meson gnome2-utils xdg
+
+DESCRIPTION="Easily manage WINE prefixes in a new way"
+HOMEPAGE="
+	https://usebottles.com/
+	https://github.com/bottlesdevs/Bottles
+"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bottlesdevs/${PN^}.git"
+else
+	SRC_URI="https://github.com/bottlesdevs/${PN^}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${P^}"
+fi
+
+RESTRICT="mirror"
+LICENSE="GPL-3"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=x11-libs/gtk+-3.24.10[introspection]
+	dev-libs/appstream-glib[introspection]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP},cairo]
+	')
+"
+RDEPEND="
+	${DEPEND}
+	gui-libs/libhandy:1[introspection]
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply_user
+	if [[ "${PV}" == *9999* ]]; then
+		local commit version
+		commit=$(git rev-parse HEAD)
+		version=$(cat "${S}/VERSION")
+		echo "${version%%.*}.${commit:0:7}" > "${S}/VERSION"
+	fi
+	sed -i \
+		"s:^\(conf.set('PYTHON',\).*$:\1 '/usr/bin/${EPYTHON}'):" \
+		"${S}/src/meson.build" || die
+
+	# Hard skip network dependant test
+	sed -i \
+		"s:\(if appstream\_util\.found()\):\1 and false:" \
+		"${S}/data/meson.build" || die
+}
+
+src_install() {
+	meson_src_install
+	python_optimize "${D}/usr/share/bottles/"
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_pkg_postrm
+}
--- a/app-emulation/bottles/bottles-51.11.ebuild
+++ b/app-emulation/bottles/bottles-51.11.ebuild
@ -1,151 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit gnome2-utils python-single-r1 meson xdg optfeature
-
-DESCRIPTION="Run Windows software and games on Linux"
-HOMEPAGE="https://usebottles.com/"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/bottlesdevs/Bottles/"
-else
-	SRC_URI="https://github.com/bottlesdevs/Bottles/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Bottles-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-# Very annoying to figure out the deps
-# Script for getting python modules:
-#   https://gitlab.com/Parona/my-scripts/-/blob/master/scripts/python_deps.sh
-# Runtime programs needed can be quickly found with:
-#   grep -r "shutil.which"
-# But look at context to gauge if they are optional or not
-#
-# BDPEPEND dependencies can be thankfully gathered from the meson.build files
-# DEPEND are instrospection files which can be found as such
-#   find . -name "*.blp" -exec grep -Eh "^using " {} + | sed 's/using \([A-Za-z]*\) \([0-9.]*\);/\1-\2.typelib/'
-# And in similar vein find runtime required introspection files, similar deal with getting typelib file as above
-#   grep -r "gi.require_version
-
-# vkbasalt could be optional but vkbasalt-cli isnt
-# It could work without wine but(!) it still requires all the runtime dependencies for wine
-# so easier to depend on wine to get it for free
-
-DEPEND="
-	gui-libs/gtk:4[introspection]
-	gui-libs/libadwaita[introspection]
-"
-RDEPEND="
-	${PYTHON_DEPS}
-	${DEPEND}
-	app-arch/cabextract
-	app-arch/p7zip
-	gui-libs/gtksourceview[introspection]
-	media-gfx/imagemagick
-	>=sys-libs/glibc-2.32
-	x11-apps/xdpyinfo
-	|| (
-		app-emulation/wine-vanilla[X]
-		app-emulation/wine-staging[X]
-		app-emulation/wine-proton[X(+)]
-	)
-	$(python_gen_cond_dep '
-		app-arch/patool[${PYTHON_USEDEP}]
-		dev-python/certifi[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/charset-normalizer[${PYTHON_USEDEP}]
-		dev-python/FVS[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/icoextract[${PYTHON_USEDEP}]
-		dev-python/markdown[${PYTHON_USEDEP}]
-		dev-python/orjson[${PYTHON_USEDEP}]
-		dev-python/pathvalidate[${PYTHON_USEDEP}]
-		dev-python/pefile[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pycurl[${PYTHON_USEDEP}]
-		dev-python/pygobject[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-		dev-python/vkbasalt-cli[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/blueprint-compiler
-	dev-libs/glib:2
-	sys-devel/gettext
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-EPYTEST_DESELECT=(
-	# tests that check execution time are flaky in the right circumstances
-	# (like compiling llvm at the same time type circumstance)
-	"bottles/tests/backend/state/test_events.py::test_set_reset"
-	"bottles/tests/backend/state/test_events.py::test_simple_event"
-	"bottles/tests/backend/state/test_events.py::test_wait_after_done_event"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	if [[ "${PV}" == "9999" ]]; then
-		local emesonargs=(
-			-Ddevel=true
-		)
-	fi
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_optimize "${D}/usr/share/bottles/"
-	python_fix_shebang "${D}/usr/"
-}
-
-src_test() {
-	epytest
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	optfeature "gamemode support" games-util/gamemode
-	optfeature "gamescope support" games-util/gamescope
-	optfeature "vmtouch support" dev-utils/vmtouch
-	#optfeature "MangoHub support" games-util/mangohub
-	#optfeature "obs-vkcapture support" media-video/obs-vkcapture
-
-	if has_version app-emulation/wine-vanilla[llvm-libunwind] || \
-		has_version app-emulation/wine-staging[llvm-libunwind] || \
-		has_version app-emulation/wine-proton[llvm-libunwind]; then
-		ewarn "With llvm-libunwind all the runners downloaded from bottles are most likely broken"
-		ewarn "So when using llvm-libunwind system wide it is recommended to stick to runners compiled by your system"
-		ewarn "More information:"
-		ewarn "https://gitlab.com/src_prepare/src_prepare-overlay/-/issues/49"
-		ewarn "https://gitlab.com/src_prepare/src_prepare-overlay/-/merge_requests/394#note_1735168806"
-	fi
-}
--- a/app-emulation/bottles/bottles-9999.ebuild
+++ b/app-emulation/bottles/bottles-9999.ebuild
@ -1,146 +1,84 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=8
+EAPI=7

-PYTHON_COMPAT=( python3_{10..12} )
-inherit gnome2-utils python-single-r1 meson xdg optfeature
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-single-r1 meson gnome2-utils xdg

-DESCRIPTION="Run Windows software and games on Linux"
-HOMEPAGE="https://usebottles.com/"
+DESCRIPTION="Easily manage WINE prefixes in a new way"
+HOMEPAGE="
+	https://usebottles.com/
+	https://github.com/bottlesdevs/Bottles
+"

-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" == *9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/bottlesdevs/Bottles/"
+	EGIT_REPO_URI="https://github.com/bottlesdevs/${PN^}.git"
 else
-	SRC_URI="https://github.com/bottlesdevs/Bottles/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Bottles-${PV}"
+	SRC_URI="https://github.com/bottlesdevs/${PN^}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
+	S="${WORKDIR}/${P^}"
 fi

+RESTRICT="mirror"
 LICENSE="GPL-3"
 SLOT="0"
-
-IUSE="test llvm-libunwind"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-# Very annoying to figure out the deps
-# Script for getting python modules:
-#   https://gitlab.com/Parona/my-scripts/-/blob/master/scripts/python_deps.sh
-# Runtime programs needed can be quickly found with:
-#   grep -r "shutil.which"
-# But look at context to gauge if they are optional or not
-#
-# BDPEPEND dependencies can be thankfully gathered from the meson.build files
-# DEPEND are instrospection files which can be found as such
-#   find . -name "*.blp" -exec grep -Eh "^using " {} + | sed 's/using \([A-Za-z]*\) \([0-9.]*\);/\1-\2.typelib/'
-# And in similar vein find runtime required introspection files, similar deal with getting typelib file as above
-#   grep -r "gi.require_version
-
-# vkbasalt could be optional but vkbasalt-cli isnt
-# It could work without wine but(!) it still requires all the runtime dependencies for wine
-# so easier to depend on wine to get it for free

 DEPEND="
-	gui-libs/gtk:4[introspection]
-	gui-libs/libadwaita[introspection]
-"
-RDEPEND="
 	${PYTHON_DEPS}
-	${DEPEND}
-	app-arch/cabextract
-	app-arch/p7zip
-	gui-libs/gtksourceview[introspection]
-	media-gfx/imagemagick
-	>=sys-libs/glibc-2.32
-	x11-apps/xdpyinfo
-	|| (
-		app-emulation/wine-vanilla[X,llvm-libunwind=]
-		app-emulation/wine-staging[X,llvm-libunwind=]
-		app-emulation/wine-proton[X(+),llvm-libunwind=]
-	)
+	>=x11-libs/gtk+-3.24.10[introspection]
+	dev-libs/appstream-glib[introspection]
 	$(python_gen_cond_dep '
-		app-arch/patool[${PYTHON_USEDEP}]
-		dev-python/certifi[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/charset-normalizer[${PYTHON_USEDEP}]
-		dev-python/FVS[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/icoextract[${PYTHON_USEDEP}]
-		dev-python/markdown[${PYTHON_USEDEP}]
-		dev-python/orjson[${PYTHON_USEDEP}]
-		dev-python/pathvalidate[${PYTHON_USEDEP}]
-		dev-python/pefile[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pycurl[${PYTHON_USEDEP}]
-		dev-python/pygobject[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-		dev-python/vkbasalt-cli[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP},cairo]
 	')
 "
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/blueprint-compiler
-	dev-libs/glib:2
-	sys-devel/gettext
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)
+RDEPEND="
+	${DEPEND}
+	gui-libs/libhandy:1[introspection]
 "

-EPYTEST_DESELECT=(
-	# tests that check execution time are flaky in the right circumstances
-	# (like compiling llvm at the same time type circumstance)
-	"bottles/tests/backend/state/test_events.py::test_set_reset"
-	"bottles/tests/backend/state/test_events.py::test_simple_event"
-	"bottles/tests/backend/state/test_events.py::test_wait_after_done_event"
-)
-
 pkg_setup() {
 	python-single-r1_pkg_setup
 }

-src_configure() {
-	if [[ "${PV}" == "9999" ]]; then
-		local emesonargs=(
-			-Ddevel=true
-		)
+src_prepare() {
+	eapply_user
+	if [[ "${PV}" == *9999* ]]; then
+		local commit version
+		commit=$(git rev-parse HEAD)
+		version=$(cat "${S}/VERSION")
+		echo "${version%%.*}.${commit:0:7}" > "${S}/VERSION"
 	fi
-	meson_src_configure
+	sed -i \
+		"s:^\(conf.set('PYTHON',\).*$:\1 '/usr/bin/${EPYTHON}'):" \
+		"${S}/src/meson.build" || die
+
+	# Hard skip network dependant test
+	sed -i \
+		"s:\(if appstream\_util\.found()\):\1 and false:" \
+		"${S}/data/meson.build" || die
 }

 src_install() {
 	meson_src_install
 	python_optimize "${D}/usr/share/bottles/"
-	python_fix_shebang "${D}/usr/"
-}
-
-src_test() {
-	epytest
 }

 pkg_preinst() {
-	xdg_pkg_preinst
 	gnome2_schemas_savelist
+	xdg_pkg_preinst
 }

 pkg_postinst() {
-	xdg_pkg_postinst
+	gnome2_gconf_install
 	gnome2_schemas_update
-	optfeature "gamemode support" games-util/gamemode
-	optfeature "gamescope support" games-util/gamescope
-	optfeature "vmtouch support" dev-utils/vmtouch
-	#optfeature "MangoHub support" games-util/mangohub
-	#optfeature "obs-vkcapture support" media-video/obs-vkcapture
-	if use llvm-libunwind; then
-		ewarn "When using llvm-libunwind useflag all the runners downloaded from bottles should be broken"
-		ewarn "So when using llvm-libunwind system wide is recommended to stick only to runners compiled by your system"
-		ewarn "Note: Using LLVM Profile Steam Proton works, so you can try bottles runners"
-	fi
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_pkg_postrm
 }
--- a/app-emulation/dos32a/dos32a-9.1.2.ebuild
+++ b/app-emulation/dos32a/dos32a-9.1.2.ebuild
@ -1,23 +1,36 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=8
+EAPI=7

 DESCRIPTION="Free replacement for DOS4GW."
-HOMEPAGE="https://web.archive.org/web/20210726190857/https://dos32a.narechk.net/index_en.html"
-SRC_URI="
-	https://github.com/grepwood/${PN}/releases/download/${P//.}/${P//.}-bin.zip
-"
-S=${WORKDIR}
+HOMEPAGE="https://dos32a.narechk.net/content/main.html"
+
 LICENSE="Apache-1.1-sans-Apache"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+
+#SRC_URI="http://download.narechk.net/dos32a-912-bin.zip http://download.narechk.net/dos32a-912-src.zip"
+SRC_URI="http://download.narechk.net/dos32a-912-bin.zip"
+
+IUSE="+binary"

 BDEPEND="
 	app-arch/unzip
 "
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}
+
 src_unpack() {
-	unzip -jd . "${DISTDIR}"/dos32a-912-bin.zip binw/*
+	if ! use binary; then
+		die "Building DOS32A from source is not yet supported. Come back when we have an adequate DOS toolchain."
+	else
+		unzip -jd . "${DISTDIR}"/dos32a-912-bin.zip binw/*
+	fi
 }

 src_install() {
--- a/app-emulation/dos32a/metadata.xml
+++ b/app-emulation/dos32a/metadata.xml
@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<upstream>
-		<remote-id type="github">grepwood/dos32a</remote-id>
-	</upstream>
+  <use>
+    <flag name="binary">
+      Fetch binary release instead of compiling the package from source.
+    </flag>
+  </use>
 </pkgmetadata>
--- a/app-emulation/windows95/Manifest
+++ b/app-emulation/windows95/Manifest
@ -1,3 +1 @@
-DIST windows95_3.1.1_amd64.deb 256272160 BLAKE2B b80af926afd7a38f21f83bd1e9f2ba811c39037ea47ec4f3ed44b067ba22ff11ecf8be29a4f0148cde141aa7c335bde21fa163bf4574f63387daaba77759cbc9 SHA512 a2d9c8392cf35df117874998393e2dc824566bbc89b05819893ce7bc1a1f29f13c8e9c47e60dbf508bd919cc652da654108d7e4ad2ffc6bc67a94295c5b12edc
-DIST windows95_3.1.1_arm64.deb 250797112 BLAKE2B 878e07f4edde735c4f757b52de52ef4a2cc6bdf4c338ec4d06a8648bd1d21014783ef7be5374881d1a924ae50a34c3e75501adaef3f632391f6b53f8fcaca021 SHA512 eeecfb449d996dab7f0062cecdce0e5df9ede6b54869b08a4ac2f7e8b86930162cb775174cc383a383272cbaf260307011447e1aa98dbfa8cfa09b8078cdf0a6
-DIST windows95_3.1.1_armhf.deb 248658660 BLAKE2B 439fbef10c70cf79ad58055cd1ce95f6451dd51810936f1237ac5c6b4db073b180a5377fb601d8af10b62f75df3eda4827402245396d7d7eece3a5b36626230c SHA512 0dd862bfe5d26c54df13b95da3f6d74a1882cb5869e05ab0560bdb59332bcb142f6ac535bc6f1208c1eec6d2e8256503e329b8201160cf9b634d1872d9f8b8f7
+DIST windows95_2.3.0_amd64.deb 243307192 BLAKE2B 29050fda1d98a6ee4551f4b4049e800877588041b2df57a81050d78ab87dcf18b26079463b2e10d4ecac01a62f35c00e4fe389078fc8dac6216805c7773298be SHA512 99655bd7829cb6ae0e253d30848d5ddf1012d6d10a1f44fba594f8551f69f7dbfc9aeef1f31a84ff0d7c76009967e5dd6de3ee983bb5f92230366e5d1adfd4e0
--- a/app-emulation/windows95/windows95-2.3.0.ebuild
+++ b/app-emulation/windows95/windows95-2.3.0.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop unpacker bintron
+
+DESCRIPTION="Windows 95, running in an Electron app"
+HOMEPAGE="https://github.com/felixrieseberg/windows95"
+SRC_URI="https://github.com/felixrieseberg/${PN}/releases/download/v${PV}/${PN}_${PV}_amd64.deb"
+S="${WORKDIR}/usr/lib/${PN}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+src_install() {
+	domenu ../../share/applications/${PN}.desktop
+	doicon ../../share/pixmaps/${PN}.png
+
+	bintron_src_install
+}
--- a/app-emulation/windows95/windows95-3.1.1.ebuild
+++ b/app-emulation/windows95/windows95-3.1.1.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHROMIUM_LANGS="
-	af am ar bg bn ca cs da de el en-GB es-419 es et fa fi fil fr gu he hi hr hu id it ja kn ko lt
-	lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv sw ta te th tr uk ur vi zh-CN zh-TW
-"
-
-inherit bintron-r1 unpacker
-
-DESCRIPTION="Windows 95, running in an Electron app"
-HOMEPAGE="https://github.com/felixrieseberg/windows95"
-SRC_URI="
-	amd64? (
-		https://github.com/felixrieseberg/${PN}/releases/download/v${PV}/${PN}_${PV}_amd64.deb
-	)
-	arm64? (
-		https://github.com/felixrieseberg/${PN}/releases/download/v${PV}/${PN}_${PV}_arm64.deb
-	)
-	arm? (
-		https://github.com/felixrieseberg/${PN}/releases/download/v${PV}/${PN}_${PV}_armhf.deb
-	)
-"
-
-S="${WORKDIR}/usr/lib/${PN}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-RDEPEND="
-	dev-libs/wayland
-"
--- a/app-misc/cli-visualizer/Manifest
+++ b/app-misc/cli-visualizer/Manifest
@ -1 +1 @@
-DIST cli-visualizer-1.8_p20220323.tar.gz 58820 BLAKE2B 3369693ed1357ab69b3e591b1e4971484b5d5af76fea22efd3c656052577af3e0f7ec9f98382ab22968726fba854209b44d0aa0332d370b92b29c9cc7a3cc8b8 SHA512 13e0c2699c52d03233cef7f42dccef98945b645d452ac4e897d8a9edcb214e35359969a4b0def513f83a930eeeafdbdffd5a27e24b7bf4e4fa1ac85a99c41634
+DIST cli-visualizer-1.8.tar.gz 55083 BLAKE2B 0179ef2f0f1a4f928b5e1030eda499c706ee9207918b5ead0054472c1ba3bf293418b1a622868855496f483967754a88dd7a0c545e41b045c55466134157a90c SHA512 e64b729818f870896cc1fdbdccb80ee141d00118df4f50696919ff04d90503c913953fa76082bd09db1fca16a047d1255908852e3cfc6b3b5ac5fbb841833415
--- a/app-misc/cli-visualizer/cli-visualizer-1.8.ebuild
+++ b/app-misc/cli-visualizer/cli-visualizer-1.8.ebuild
@ -0,0 +1,23 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="CLI based audio visualizer"
+HOMEPAGE="https://github.com/dpayne/cli-visualizer"
+SRC_URI="https://github.com/dpayne/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}
+	sci-libs/fftw
+	dev-util/cmake"
+BDEPEND=""
+
+src_install(){
+	emake DESTDIR="${D}" install
+}
--- a/app-misc/cli-visualizer/cli-visualizer-1.8_p20220323.ebuild
+++ b/app-misc/cli-visualizer/cli-visualizer-1.8_p20220323.ebuild
@ -1,55 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="CLI based audio visualizer"
-HOMEPAGE="https://github.com/dpayne/cli-visualizer"
-COMMIT="b98068ffbe55210ab4828556d243e13e79ba889d"
-SRC_URI="https://github.com/dpayne/cli-visualizer/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	media-libs/libpulse
-	media-libs/portaudio
-	sci-libs/fftw:3.0=
-	sys-libs/ncurses:=[tinfo]
-	test? (
-		dev-cpp/gtest
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Handle automagic, upstream uses find_program and find_library instead find_package forcing this approach
-	sed -i \
-		-e '/find_program(CCACHE_FOUND ccache)/d' \
-		-e '/find_library(JEMALLOC_FOUND NAMES jemalloc)/d' \
-		-e '/ExternalProject_Add(googletest/,/)$/d' \
-		-e '/if(VIS_WITH_TESTS)/afind_package(GTest REQUIRED)' \
-		-e '/set(GTEST_INCLUDE_DIRS ${EXTERNAL_PROJECTS_INCLUDE_DIR})/,/add_dependencies(${GMOCK_MAIN_LIBRARY} ${GTEST_LIBRARY})/d' \
-		-e 's/target_link_libraries(${PROJECT_TEST_NAME} gtest gmock pthread)/target_link_libraries(${PROJECT_TEST_NAME} GTest::gtest GTest::gmock pthread)/' \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DVIS_WITH_TESTS=$(usex test)
-		-DVIS_WITH_PERF_TESTS=OFF # possible false positive when under heavy load
-		-DVIS_RUN_CLANG_FORMAT=OFF
-		-DVIS_RUN_CLANG_TIDY=OFF
-	)
-
-	cmake_src_configure
-}
--- a/app-misc/spicetify-cli/Manifest
+++ b/app-misc/spicetify-cli/Manifest
@ -1,4 +1,44 @@
-DIST spicetify-cli-2.36.10-deps.tar.xz 5223544 BLAKE2B 8e3f700d6f0228936bce557e46ffaf8fae76d3e3345c6d836e6b0ab06f349038c86ab0ba4d844112237278c4574c31521aaa8485e1e5235498e8c1f1662cd5a0 SHA512 39e1e3d4d1e33e732c175fe68e363731dc3f44c406dc8f0a1f44ad810d8a9043d2bb24a1dae9e8959602df3ad0e65941e89fad083175e9a149dfa1a23e1d299c
-DIST spicetify-cli-2.36.10.tar.gz 2018364 BLAKE2B 7e19088599bfef2acd990e3f34900f3c2cbc079dfeec984b171dad76af8352cae676860f80397ec8c940536fd00bbad241eb8502bf13062934922411eeb9b7c0 SHA512 1751dba60a9ca054bc0bc1dc712d2cef28342ebdce4cee1be3697c393915b4999c19eacbc4ab4c401e1056b91c37f4734dd59a1fd22d077e0d915e40b0846324
-DIST spicetify-cli-2.36.11-deps.tar.xz 5223520 BLAKE2B baca6229ff613537375da05f7d7c25e6c44301f3e2dd7b30d31f11bc77d5c89c9f8b5e8be5201127ad5d8a2f3356b3e701b837b555dfbe52145cfeb4ef7ea0e3 SHA512 167cc92e9f6fe249ac025185e587fd75d0a61b670b65d5496b19a1cc9826c9509858e6b947d7b06d1ed016bc1121ba0b1680e4cc8e6472624dff92dc35891a99
-DIST spicetify-cli-2.36.11.tar.gz 2018637 BLAKE2B 0822e88c915f33bf3cdfb743ff133e3fff94c7ab4c5cbfe5033492601998ad5edf0940e2ec18005d1ca6140616ef40d33e50281ff00ca8499db14c059614ffe5 SHA512 88e8b07be6207a3d2781dbd1a29b504ab424356c22171de4617e4c1fcf1d19c7f68b17289f85f8342fec026d87d86009bb9e8ef2323db6617d89e64ba0058a0b
+DIST github.com%2Fgo-ini%2Fini%2F@v%2Fv1.55.0.mod 29 BLAKE2B ec6988d536e1cfabecc7e1ee6070c6429c88de9bd970b3ecb35bf8e42ac3d2dfa08beefbd3741ef7a039020e6d41332039c6bc0e13d5e79bca84cf669e4f552f SHA512 67077f6e3f3c2571d6df326aa1d6351c3f7950337a23c548ff69e73df265db516eee559ee4afff17868068f2754c7ef272e46bc3dd5ac324ed002b749116794f
+DIST github.com%2Fgo-ini%2Fini%2F@v%2Fv1.55.0.zip 63623 BLAKE2B 30fae1c651777a636d22383323433b28741d82756bca394b3fff40a4ae87f9ff62812ccb70762c6d57126bdeaf3ffc2b90f537411c8a65788cfaf462e06ac6ca SHA512 3d301c0b9861bdb4c226893e84102abdbaadf487e0c332527ee6b0d4274729cdae63b324c0452777aa07dff8a397620caacfc800e0d37e8c53d9580166eb2744
+DIST github.com%2Fgo-ini%2Fini%2F@v%2Fv1.62.0.mod 29 BLAKE2B ec6988d536e1cfabecc7e1ee6070c6429c88de9bd970b3ecb35bf8e42ac3d2dfa08beefbd3741ef7a039020e6d41332039c6bc0e13d5e79bca84cf669e4f552f SHA512 67077f6e3f3c2571d6df326aa1d6351c3f7950337a23c548ff69e73df265db516eee559ee4afff17868068f2754c7ef272e46bc3dd5ac324ed002b749116794f
+DIST github.com%2Fgo-ini%2Fini%2F@v%2Fv1.62.0.zip 67177 BLAKE2B 02f9604fc606677b30f50d4a2e4e4329b7094f697f111d02fefe24269c2fa6d740b6195df53a05965ea936c7be59807dca732cd6f8aa8f0b0f204808cc59c023 SHA512 f2466e7f511bbd4ac912b9234ba6283cf6a2bfc4befe73fdb65660e6a4a25d28dc352948b32d3bc37f51e890fb14c4b8b43669066f80cbd4a5bf73b2f194be03
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip 257755 BLAKE2B 13d505a73dd179828fd3dbcbc1dfb90f6bdf8a888bb7ab160713a566472adf63d45491fa29928853d76725c2ffa5ada33e802cf857376c83cd8085a31acb48b5 SHA512 5bb0e61c8622e09cecc099c80cd97cdefbc497d4ad0e88984b2936e7731991e972883eb639be1cc3f56249a97b4f14c6820cda6b1c08e4a2323aaca22b840dea
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip 9901 BLAKE2B 0c8cf7ad0809f65d91b9ad5b27759cfedc5efc25194f19effd4b19c35c940461a48a57636ef3c707b27ac614b693ea05830bdef6943f11993bf561ef558cb99d SHA512 08b7201a9aa3294a3fc59bec78fee09f0d1bc7507b50b1d1cb1fa29a523c6870d00b633ea9679c9c86df9841739f46e9d5d9bbf0e3ec15b8ad08e57db67eedc0
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip 13586 BLAKE2B 8f8bc0b542920d0effcd6939a66e34609401f564af0c1f6330bff2925abc664add3c36534bdf8602ac176e74ed85ec8c8597f748a7ec82db9e9f86207c563fee SHA512 bd6adb6aaf44c6c59bda2407a05e192d3336154cec35d0a6b6244cc5b93dc5e53509abded7c5999af166821749dd2e55333a8813ce64c310ba5db2df597bc171
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip 13690 BLAKE2B cc3568a99c03ce4ef19e52a8429b485e774eabddc3ab24315a58b149e8168c448bb1fdbaabb8e3eaea918de96cb7411caa000be4585f851edcb26cb0be9f0a7a SHA512 c39ebb2cc99a555054d55ffcefd5680292c66eed23b1ba8a3595259dc24cd42d432b558014066554308f14fc452b7a830f8b10e635d317b5f14ac0e0b24b1528
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip 81760 BLAKE2B a5767557b0e96fa3bbbace46e08d6a2167be2c203a44ffaadcf14079a23e906ee9197c8028fb29bdfc596d4f39e7bdd29993a1a520c36c8b08c5c5b6bd6bd2cc SHA512 e204307d5a06550292a4fb6e44912260aa5a7f9fcce0883d8abb324a53673512218982b1893e7d563eb7d6313ac98a8638072aaf7b5d66d359e82832f2a8bb2f
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip 1521758 BLAKE2B 653e697d76d392b18c09e5c1c96734a737071667345b9d6ff9c9589bbe74e1c50849dcd7fc00b660adc1aaa30366aa9ca93a94d5eb4e605f7897d9714119f926 SHA512 3bdd2bbeaf755618d9fa7f324814497308361cb0f3f93a7ac84b9fc01b79ab346353ff0a022d3d85e74aef57b3773e03ea9279d0a60de317a1c57d5eca2d1507
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.zip 1500722 BLAKE2B 969e10c1df8afd475b39fa2d399c592266794b591f0ee8870b82f5f7942b42ec342dfc552c2d6fca93f9bce062f20c82e962db4211df64dc41015860517c276e SHA512 cde3ca000a27644d022eee1bc0600e28e8cafa7e5df4f7e4cb3a865b163eae0c5fcc6e9ca2786b8ffca7867cf69e046dc6712a0040c30e8ee1b03bb7869d09b1
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.zip 1587056 BLAKE2B b8b8cb2f12231f2e5129646f34a1138b138ea6b38af50ad8baafcaf155e9eb623e320823ec1b7502431df3f95dfa7ea1c8cc21abfee3c8831d913347aead0669 SHA512 0e635def6bc35ca664d28575366161fcce349c9f78386a9ffa3dc700da1e1badd6fbb8440113451ad7c1cb9a18b49f949632734946ec56ff56d894d8d74b56bb
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.zip 1584596 BLAKE2B 2d891f4ee749bbf528b0a44acc8cc71a56432961fc47864ec9dd47543a8a1a97d55399dbb95a0654b0588ca2dc95289ae31746ada83afd9a667662c371b6747d SHA512 8431fd78425186e55e07be9cfdb81d294b517d1695f99da3612477b8275d9a64038b60097658a02f399ed99d2f399197e572f3c307f70fa075b4995943caddb8
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.zip 1913147 BLAKE2B b29c9c32f5141a45284bb17e0236b0650a8bc60da0326e47e153563ba2259b5e30d043db1d1aa5bf98cb80b28f5481483a3b2c33776e8c40ccc6e2955b440dbd SHA512 26e655cb67ad0630e05c176a342135ec67c08eaa396000095f568f0c112810a262c204d7973e16a16539c69b7f543062ba29b6b1c9bc934f7b0783b79dd33b7a
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip 1918660 BLAKE2B 015e9ad74f145cdd7cdeb55d7b2d8949d6e7baedaae36089fa53cb257b4fb49830aeb299ea3a1f782b2f033443a18d009cafcf0211d1709d4d37b4b97d5f3d08 SHA512 24a653028d079c52ba8128d9f43452d2ecabd374c8eba36d44704c3f70cac50761597c7b7bb6524ba50fcde696fbcded57c29f04f35e42c62e23a9790852bb56
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip 1470272 BLAKE2B 9a8bbb988370bedc24428e6c78f42a9ba44dbb852ce91c3d7fc54e83678b72b9177e67c955c49dc8ef7a1e2e214475a2e55c53254469e3426ec271e90ec9e2d5 SHA512 e46ef76fe4a1628def4c6a291003b64cf11185c0214427af9c49b9ff3af99f258488d49e887206a9c8652784228d822665c5841ce87d6ff993e95ea3d0494129
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.zip 1529034 BLAKE2B a30815639bc723fe9c7078c1fc5214e43aa946520c8d2d1efdc2cfb88b53c1faf50054f693d4f3b92461a64c07c8dbb845901c87a8deb86650cfcfc0482aae08 SHA512 113ecd43b0aecd6050a3a7319bbb43d351e62d71f01f9b98af7ab15b179fff616ebbb81920447f3b1192a9230c230c95bb20e9172981d4c8b926804ee92af508
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.62.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.62.0.zip 66745 BLAKE2B acf0c83323e5e7a7444b615ca7bbdfd4c43bc9a5985532fec2cf80679fc49bf23cfa8579468fff501a1ada101b3ce84fd24223408e05a85408235990fffa20ff SHA512 b812663ce5f6668da2265890b0ec9fd0531bb128a69fc6cf3546ca9acda71b4db2d8be782f18d81665b060d0418ce6f92bfb69f6dcb89b18b0d5492df4505cb3
+DIST spicetify-cli-1.1.0.tar.gz 628682 BLAKE2B 64a9e9611c0d73b882137d83ef130288f93795847e96dc65a155cc2f34a453155a39751cd828dbf14ce9f165928e8cdec05b94274bb7cc4abff218949cf00ad5 SHA512 ab385a5974ab5b92108fbf9014aa153023ab6879910cb8ba172d4ec330e2af2256ffc1872a8eecdea04b37e3ec47fcabcd93df9a38403a0538e29728f5daa678
+DIST spicetify-cli-1.2.1.tar.gz 632355 BLAKE2B 4c560af08da4aa8b29eb2af9cef93774faddec3c93c17ca00a4401e76b89d6f6304e2a0a683f06b2ec0b2779373f6b6ad8fc3e6cd072aa9a4e22e91de93a06cd SHA512 8345902e4f038a9cffce9f37845475ca808a289b5040bc8bd85a511d1177d73ef8312a1be96ba2aaef8872cc838b957ea1535c33e0eee07faf5ab177a1afcc59
--- a/app-misc/spicetify-cli/metadata.xml
+++ b/app-misc/spicetify-cli/metadata.xml
@ -6,7 +6,7 @@
 		<name>Alfred Wingate</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">spicetify/spicetify-cli</remote-id>
-		<doc>https://spicetify.app/docs/getting-started/</doc>
+		<remote-id type="github">khanhas/spicetify-cli</remote-id>
+		<doc>https://github.com/khanhas/spicetify-cli/wiki</doc>
 	</upstream>
 </pkgmetadata>
--- a/app-misc/spicetify-cli/spicetify-cli-1.1.0.ebuild
+++ b/app-misc/spicetify-cli/spicetify-cli-1.1.0.ebuild
@ -0,0 +1,67 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+EGO_SUM=(
+	"github.com/go-ini/ini v1.55.0"
+	"github.com/go-ini/ini v1.55.0/go.mod"
+	"github.com/mattn/go-colorable v0.1.6"
+	"github.com/mattn/go-colorable v0.1.6/go.mod"
+	"github.com/mattn/go-isatty v0.0.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/net v0.0.0-20200506145744-7e3656a0809f"
+	"golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/text v0.3.0"
+	"golang.org/x/text v0.3.0/go.mod"
+)
+
+go-module_set_globals
+
+DESCRIPTION="Commandline tool to customize Spotify client."
+HOMEPAGE="https://github.com/khanhas/spicetify-cli"
+SRC_URI="
+	https://github.com/khanhas/spicetify-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}
+"
+
+LICENSE="Apache-2.0 BSD GPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+INSTALLDIR="/opt/${PN}"
+
+src_unpack() {
+	unpack "${DISTDIR}"/golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip
+	go-module_src_unpack
+	default
+}
+
+src_prepare() {
+	# Have to do this as eclass has issues with this for reasons unknown to me
+	mkdir -p "${HOME}"/go/pkg/mod/golang.org/x/
+	cp -r "${WORKDIR}"/golang.org/x/sys\@v0.0.0-20200323222414-85ca7c5b95cd/ "${HOME}"/go/pkg/mod/golang.org/x/sys\@v0.0.0-20200323222414-85ca7c5b95cd
+	default
+}
+
+src_compile() {
+	go build
+}
+
+src_install() {
+	insinto "${INSTALLDIR}"
+	doins -r {CustomApps,Extensions,Themes,jsHelper,spicetify-cli}
+	dobin "${FILESDIR}/spicetify"
+	fperms +x "${INSTALLDIR}/spicetify-cli"
+}
--- a/app-misc/spicetify-cli/spicetify-cli-1.2.1.ebuild
+++ b/app-misc/spicetify-cli/spicetify-cli-1.2.1.ebuild
@ -0,0 +1,100 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+EGO_SUM=(
+	"github.com/go-ini/ini v1.62.0"
+	"github.com/go-ini/ini v1.62.0/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/mattn/go-colorable v0.1.8"
+	"github.com/mattn/go-colorable v0.1.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"gopkg.in/ini.v1 v1.62.0"
+	"gopkg.in/ini.v1 v1.62.0/go.mod"
+)
+
+#EGO_SUM=(
+#	"github.com/go-ini/ini v1.55.0"
+#	"github.com/go-ini/ini v1.55.0/go.mod"
+#	"github.com/mattn/go-colorable v0.1.6"
+#	"github.com/mattn/go-colorable v0.1.6/go.mod"
+#	"github.com/mattn/go-isatty v0.0.12"
+#	"github.com/mattn/go-isatty v0.0.12/go.mod"
+#	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+#	"golang.org/x/net v0.0.0-20200506145744-7e3656a0809f"
+#	"golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod"
+#	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a"
+#	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+#	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42"
+#	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+#	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
+#	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+#	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
+#	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+#	"golang.org/x/text v0.3.0"
+#	"golang.org/x/text v0.3.0/go.mod"
+#)
+
+go-module_set_globals
+
+DESCRIPTION="Commandline tool to customize Spotify client."
+HOMEPAGE="https://github.com/khanhas/spicetify-cli"
+SRC_URI="
+	https://github.com/khanhas/spicetify-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}
+"
+
+LICENSE="Apache-2.0 BSD GPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+INSTALLDIR="/opt/${PN}"
+
+#src_unpack() {
+#	unpack "${DISTDIR}"/golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip
+#	go-module_src_unpack
+#	default
+#}
+
+#src_prepare() {
+	# Have to do this as eclass has issues with this for reasons unknown to me
+#	mkdir -p "${HOME}"/go/pkg/mod/golang.org/x/
+#	cp -r "${WORKDIR}"/golang.org/x/sys\@v0.0.0-20200323222414-85ca7c5b95cd/ "${HOME}"/go/pkg/mod/golang.org/x/sys\@v0.0.0-20200323222414-85ca7c5b95cd
+#	default
+#}
+
+src_compile() {
+	go build
+}
+
+src_install() {
+	insinto "${INSTALLDIR}"
+	doins -r {CustomApps,Extensions,Themes,jsHelper,spicetify-cli}
+	dobin "${FILESDIR}/spicetify"
+	fperms +x "${INSTALLDIR}/spicetify-cli"
+}
--- a/app-misc/spicetify-cli/spicetify-cli-2.36.10.ebuild
+++ b/app-misc/spicetify-cli/spicetify-cli-2.36.10.ebuild
@ -1,99 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-WHITELIST_VERSIONS=(
-	"<> 1.2.8 1.2.36"
-)
-
-whitelist_versions() {
-	local version_spec version1 version2
-	local -a deps
-
-	SPOTIFY_VERSIONS=
-
-	# Iterate in reverse for elog
-	for ((index = $(( ${#WHITELIST_VERSIONS[@]} - 1 )); index >= 0; index--)); do
-		read -r version_spec version1 version2 <<< "${WHITELIST_VERSIONS[${index}]}"
-
-		case ${version_spec} in
-			"<>")
-				deps[$index]="( <=media-sound/spotify-${version2} >=media-sound/spotify-${version1} )"
-				SPOTIFY_VERSIONS+="${version1} -> ${version2}"
-				;;
-			"~")
-				deps[$index]="~media-sound/spotify-${version1}"
-				SPOTIFY_VERSIONS+="${version1}"
-				;;
-			*)
-				die "Invalid version specifier in WHITELIST_VERSIONS"
-				;;
-		esac
-
-		if [[ ${index} == 0 ]]; then
-			SPOTIFY_VERSIONS+=". "
-		elif [[ ${index} == 1 ]]; then
-			SPOTIFY_VERSIONS+=" and "
-		else
-			SPOTIFY_VERSIONS+=", "
-		fi
-	done
-
-	RDEPEND=" || ( ${deps[@]} )"
-}
-whitelist_versions
-
-DESCRIPTION="Commandline tool to customize Spotify client."
-HOMEPAGE="https://spicetify.app/"
-SRC_URI="
-	https://github.com/spicetify/spicetify-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://gitlab.com/api/v4/projects/37881342/packages/generic/${PN}/${PV}/${P}-deps.tar.xz
-"
-
-LICENSE="Apache-2.0 BSD LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# no tests
-RESTRICT="test"
-
-INSTALLDIR="/opt/${PN}"
-
-src_compile() {
-	ego build -ldflags "-X main.version=${PV}"
-}
-
-src_install() {
-	insinto "${INSTALLDIR}"
-	doins -r {CustomApps,Extensions,Themes,jsHelper,spicetify-cli}
-	dobin "${FILESDIR}/spicetify"
-	fperms +x "${INSTALLDIR}/spicetify-cli"
-}
-
-pkg_postinst() {
-	elog "Spicetify requires a Spotify install that it can modify."
-	elog "To give read and write permissions to everyone on the system to run the following commands as root."
-	elog "# chmod a+wr /opt/spotify/spotify-client"
-	elog "# chmod a+wr /opt/spotify/spotify-client/Apps -R"
-	elog ""
-	elog "WARNING: Do not run spicetify as root please"
-	elog ""
-	elog "Spicetify compatibility is limited to the following Spotify versions:"
-	elog " ${SPOTIFY_VERSIONS}"
-	elog ""
-	elog "Otherwise you can install spotify to a user modifiable location like as a flatpak:"
-	elog " https://spicetify.app/docs/advanced-usage/installation#spotify-installed-from-flatpak"
-	elog ""
-	elog "To install themes see:"
-	elog " https://spicetify.app/docs/advanced-usage/themes"
-
-	if $(has_version -r ">=media-sound/spotify-1.2.25"); then
-		elog ""
-		elog "The New Releases custom app no longer works with Spotify 1.2.25 and higher. As an alternative,"
-		elog "please use What's New which was created by Spotify and can be enabled via Experimental Features"
-		elog "if it isn't already enabled."
-	fi
-}
--- a/app-misc/spicetify-cli/spicetify-cli-2.36.11.ebuild
+++ b/app-misc/spicetify-cli/spicetify-cli-2.36.11.ebuild
@ -1,99 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-WHITELIST_VERSIONS=(
-	"<> 1.2.8 1.2.37"
-)
-
-whitelist_versions() {
-	local version_spec version1 version2
-	local -a deps
-
-	SPOTIFY_VERSIONS=
-
-	# Iterate in reverse for elog
-	for ((index = $(( ${#WHITELIST_VERSIONS[@]} - 1 )); index >= 0; index--)); do
-		read -r version_spec version1 version2 <<< "${WHITELIST_VERSIONS[${index}]}"
-
-		case ${version_spec} in
-			"<>")
-				deps[$index]="( <=media-sound/spotify-${version2} >=media-sound/spotify-${version1} )"
-				SPOTIFY_VERSIONS+="${version1} -> ${version2}"
-				;;
-			"~")
-				deps[$index]="~media-sound/spotify-${version1}"
-				SPOTIFY_VERSIONS+="${version1}"
-				;;
-			*)
-				die "Invalid version specifier in WHITELIST_VERSIONS"
-				;;
-		esac
-
-		if [[ ${index} == 0 ]]; then
-			SPOTIFY_VERSIONS+=". "
-		elif [[ ${index} == 1 ]]; then
-			SPOTIFY_VERSIONS+=" and "
-		else
-			SPOTIFY_VERSIONS+=", "
-		fi
-	done
-
-	RDEPEND=" || ( ${deps[@]} )"
-}
-whitelist_versions
-
-DESCRIPTION="Commandline tool to customize Spotify client."
-HOMEPAGE="https://spicetify.app/"
-SRC_URI="
-	https://github.com/spicetify/spicetify-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://gitlab.com/api/v4/projects/37881342/packages/generic/${PN}/${PV}/${P}-deps.tar.xz
-"
-
-LICENSE="Apache-2.0 BSD LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# no tests
-RESTRICT="test"
-
-INSTALLDIR="/opt/${PN}"
-
-src_compile() {
-	ego build -ldflags "-X main.version=${PV}"
-}
-
-src_install() {
-	insinto "${INSTALLDIR}"
-	doins -r {CustomApps,Extensions,Themes,jsHelper,spicetify-cli}
-	dobin "${FILESDIR}/spicetify"
-	fperms +x "${INSTALLDIR}/spicetify-cli"
-}
-
-pkg_postinst() {
-	elog "Spicetify requires a Spotify install that it can modify."
-	elog "To give read and write permissions to everyone on the system to run the following commands as root."
-	elog "# chmod a+wr /opt/spotify/spotify-client"
-	elog "# chmod a+wr /opt/spotify/spotify-client/Apps -R"
-	elog ""
-	elog "WARNING: Do not run spicetify as root please"
-	elog ""
-	elog "Spicetify compatibility is limited to the following Spotify versions:"
-	elog " ${SPOTIFY_VERSIONS}"
-	elog ""
-	elog "Otherwise you can install spotify to a user modifiable location like as a flatpak:"
-	elog " https://spicetify.app/docs/advanced-usage/installation#spotify-installed-from-flatpak"
-	elog ""
-	elog "To install themes see:"
-	elog " https://spicetify.app/docs/advanced-usage/themes"
-
-	if $(has_version -r ">=media-sound/spotify-1.2.25"); then
-		elog ""
-		elog "The New Releases custom app no longer works with Spotify 1.2.25 and higher. As an alternative,"
-		elog "please use What's New which was created by Spotify and can be enabled via Experimental Features"
-		elog "if it isn't already enabled."
-	fi
-}
--- a/app-office/onlyoffice-bin/Manifest
+++ b/app-office/onlyoffice-bin/Manifest
@ -0,0 +1,2 @@
+DIST onlyoffice-bin-6.2.0_amd64.deb 265150658 BLAKE2B 8551377b308185009386d25e99d7178b9043336f73f12d011674eedfe76c9326688999c3ddc3bf7c7637916d4a47f43897ac0cae46b00783364b51b6dbc681c9 SHA512 4906d7d0508073bb58bdb9d854df4c385b5f0605370772e14fea68515ec22f4370d0b8bd7024262c7cd6c6a306b2e1f95ba229d452f0775a5d40f7a16857c609
+DIST onlyoffice-bin-6.3.1_amd64.deb 290378200 BLAKE2B 26fd422c3dd8d859b8c0e865e16a2e2e00912329c9f8ad8b7b3506af14a3e9dcf8e02eeb30fd61ea115fe3fa9cccbb04017bdbc99b9812168c3497daf0a324f7 SHA512 72a46c733fa6eb00752cc164e9ad16d3ca8e9d273a9d62e6899a56e107fd4f3e6d35563fe06c7e5f4fd792b016bc8cb7ec250ed8f1bd5d68bf5043a27462d210
--- a/app-office/onlyoffice-bin/metadata.xml
+++ b/app-office/onlyoffice-bin/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>parona@protonmail.com</email>
+    <name>Alfred Wingate</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ONLYOFFICE/DesktopEditors</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/app-office/onlyoffice-bin/onlyoffice-bin-6.2.0.ebuild
+++ b/app-office/onlyoffice-bin/onlyoffice-bin-6.2.0.ebuild
@ -0,0 +1,176 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop gnome2-utils unpacker multilib xdg
+
+MY_P="ONLYOFFICE-DesktopEditors-"${PV}""
+
+DESCRIPTION="Onlyoffice is an office productivity suite (binary version)"
+HOMEPAGE="https://www.onlyoffice.com/"
+SRC_URI="
+	amd64? (
+		https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v"${PV}"/onlyoffice-desktopeditors_amd64.deb -> "${P}"_amd64.deb
+	)
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror strip"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	app-arch/bzip2
+	!app-office/onlyoffice
+	dev-lang/orc
+	dev-libs/atk
+	dev-libs/double-conversion
+	dev-libs/expat
+	dev-libs/fribidi
+	dev-libs/glib
+	dev-libs/gmp
+	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/libbsd
+	dev-libs/libffi
+	dev-libs/libpcre
+	dev-libs/libpcre2
+	dev-libs/libtasn1
+	dev-libs/libunistring
+	dev-libs/nettle
+	dev-qt/qtdeclarative:5
+	media-gfx/graphite2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/gst-plugins-base
+	media-libs/gstreamer
+	media-libs/harfbuzz
+	media-libs/libepoxy
+	media-libs/libpng
+	net-dns/libidn2
+	net-libs/gnutls
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libxkbcommon
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-libs/pixman
+	x11-libs/xcb-util-image
+"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="
+	opt/onlyoffice/desktopeditors/DesktopEditors
+	opt/onlyoffice/desktopeditors/editors_helper
+	opt/onlyoffice/desktopeditors/libascdocumentscore.so
+	opt/onlyoffice/desktopeditors/libcef.so
+	opt/onlyoffice/desktopeditors/libEGL.so
+	opt/onlyoffice/desktopeditors/libGLESv2.so
+	opt/onlyoffice/desktopeditors/libhunspell.so
+	opt/onlyoffice/desktopeditors/libicudata.so
+	opt/onlyoffice/desktopeditors/libicudata.so.52
+	opt/onlyoffice/desktopeditors/libicudata.so.52.1
+	opt/onlyoffice/desktopeditors/libicui18n.so
+	opt/onlyoffice/desktopeditors/libicui18n.so.52
+	opt/onlyoffice/desktopeditors/libicui18n.so.52.1
+	opt/onlyoffice/desktopeditors/libicuuc.so
+	opt/onlyoffice/desktopeditors/libicuuc.so.52
+	opt/onlyoffice/desktopeditors/libicuuc.so.52.1
+	opt/onlyoffice/desktopeditors/libooxmlsignature.so
+	opt/onlyoffice/desktopeditors/libqgsttools_p.so
+	opt/onlyoffice/desktopeditors/libqgsttools_p.so.1
+	opt/onlyoffice/desktopeditors/libqgsttools_p.so.1.0
+	opt/onlyoffice/desktopeditors/libqgsttools_p.so.1.0.0
+	opt/onlyoffice/desktopeditors/libQt5Core.so.5
+	opt/onlyoffice/desktopeditors/libQt5DBus.so.5
+	opt/onlyoffice/desktopeditors/libQt5Gui.so.5
+	opt/onlyoffice/desktopeditors/libQt5Multimedia.so.5
+	opt/onlyoffice/desktopeditors/libQt5MultimediaWidgets.so.5
+	opt/onlyoffice/desktopeditors/libQt5Network.so.5
+	opt/onlyoffice/desktopeditors/libQt5OpenGL.so.5
+	opt/onlyoffice/desktopeditors/libQt5PrintSupport.so.5
+	opt/onlyoffice/desktopeditors/libQt5Svg.so.5
+	opt/onlyoffice/desktopeditors/libQt5Widgets.so.5
+	opt/onlyoffice/desktopeditors/libQt5X11Extras.so.5
+	opt/onlyoffice/desktopeditors/libQt5XcbQpa.so.5
+	opt/onlyoffice/desktopeditors/libqtascdocumentscore.so
+	opt/onlyoffice/desktopeditors/libvideoplayer.so
+	opt/onlyoffice/desktopeditors/bearer/libqconnmanbearer.so
+	opt/onlyoffice/desktopeditors/bearer/libqgenericbearer.so
+	opt/onlyoffice/desktopeditors/bearer/libqnmbearer.so
+	opt/onlyoffice/desktopeditors/converter/libDjVuFile.so
+	opt/onlyoffice/desktopeditors/converter/libdoctrenderer.so
+	opt/onlyoffice/desktopeditors/converter/libgraphics.so
+	opt/onlyoffice/desktopeditors/converter/libHtmlFile.so
+	opt/onlyoffice/desktopeditors/converter/libHtmlRenderer.so
+	opt/onlyoffice/desktopeditors/converter/libicudata.so.58
+	opt/onlyoffice/desktopeditors/converter/libicuuc.so.58
+	opt/onlyoffice/desktopeditors/converter/libkernel.so
+	opt/onlyoffice/desktopeditors/converter/libPdfReader.so
+	opt/onlyoffice/desktopeditors/converter/libPdfWriter.so
+	opt/onlyoffice/desktopeditors/converter/libUnicodeConverter.so
+	opt/onlyoffice/desktopeditors/converter/libXpsFile.so
+	opt/onlyoffice/desktopeditors/converter/x2t
+	opt/onlyoffice/desktopeditors/iconengines/libqsvgicon.so
+	opt/onlyoffice/desktopeditors/imageformats/libqsvg.so
+	opt/onlyoffice/desktopeditors/imageformats/libqico.so
+	opt/onlyoffice/desktopeditors/imageformats/libqicns.so
+	opt/onlyoffice/desktopeditors/imageformats/libqwbmp.so
+	opt/onlyoffice/desktopeditors/imageformats/libqjpeg.so
+	opt/onlyoffice/desktopeditors/imageformats/libqtiff.so
+	opt/onlyoffice/desktopeditors/imageformats/libqtga.so
+	opt/onlyoffice/desktopeditors/imageformats/libqwebp.so
+	opt/onlyoffice/desktopeditors/imageformats/libqgif.so
+	opt/onlyoffice/desktopeditors/mediaservice/libgstcamerabin.so
+	opt/onlyoffice/desktopeditors/mediaservice/libgstaudiodecoder.so
+	opt/onlyoffice/desktopeditors/mediaservice/libgstmediacapture.so
+	opt/onlyoffice/desktopeditors/mediaservice/libgstmediaplayer.so
+	opt/onlyoffice/desktopeditors/platforminputcontexts/libibusplatforminputcontextplugin.so
+	opt/onlyoffice/desktopeditors/platforminputcontexts/libqtvirtualkeyboardplugin.so
+	opt/onlyoffice/desktopeditors/platforminputcontexts/libcomposeplatforminputcontextplugin.so
+	opt/onlyoffice/desktopeditors/platforms/libqoffscreen.so
+	opt/onlyoffice/desktopeditors/platforms/libqlinuxfb.so
+	opt/onlyoffice/desktopeditors/platforms/libqvnc.so
+	opt/onlyoffice/desktopeditors/platforms/libqxcb.so
+	opt/onlyoffice/desktopeditors/platforms/libqminimal.so
+	opt/onlyoffice/desktopeditors/platformthemes/libqgtk3.so
+	opt/onlyoffice/desktopeditors/playlistformats/libqtmultimedia_m3u.so
+	opt/onlyoffice/desktopeditors/printsupport/libcupsprintersupport.so
+	opt/onlyoffice/desktopeditors/swiftshader/libEGL.so
+	opt/onlyoffice/desktopeditors/swiftshader/libGLESv2.so
+	opt/onlyoffice/desktopeditors/xcbglintegrations/libqxcb-glx-integration.so
+"
+
+src_install() {
+	domenu usr/share/applications/onlyoffice-desktopeditors.desktop
+	dobin usr/bin/desktopeditors usr/bin/onlyoffice-desktopeditors
+	doins -r opt
+	fperms +x /opt/onlyoffice/desktopeditors/{DesktopEditors,editors_helper,converter/x2t}
+}
--- a/app-office/onlyoffice-bin/onlyoffice-bin-6.3.1.ebuild
+++ b/app-office/onlyoffice-bin/onlyoffice-bin-6.3.1.ebuild
@ -0,0 +1,176 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop gnome2-utils unpacker multilib xdg
+
+MY_P="ONLYOFFICE-DesktopEditors-"${PV}""
+
+DESCRIPTION="Onlyoffice is an office productivity suite (binary version)"
+HOMEPAGE="https://www.onlyoffice.com/"
+SRC_URI="
+	amd64? (
+		https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v"${PV}"/onlyoffice-desktopeditors_amd64.deb -> "${P}"_amd64.deb
+	)
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror strip"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	app-arch/bzip2
+	!app-office/onlyoffice
+	dev-lang/orc
+	dev-libs/atk
+	dev-libs/double-conversion
+	dev-libs/expat
+	dev-libs/fribidi
+	dev-libs/glib
+	dev-libs/gmp
+	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/libbsd
+	dev-libs/libffi
+	dev-libs/libpcre
+	dev-libs/libpcre2
+	dev-libs/libtasn1
+	dev-libs/libunistring
+	dev-libs/nettle
+	dev-qt/qtdeclarative:5
+	media-gfx/graphite2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/gst-plugins-base
+	media-libs/gstreamer
+	media-libs/harfbuzz
+	media-libs/libepoxy
+	media-libs/libpng
+	net-dns/libidn2
+	net-libs/gnutls
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libxkbcommon
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-libs/pixman
+	x11-libs/xcb-util-image
+"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="
+	opt/onlyoffice/desktopeditors/DesktopEditors
+	opt/onlyoffice/desktopeditors/editors_helper
+	opt/onlyoffice/desktopeditors/libascdocumentscore.so
+	opt/onlyoffice/desktopeditors/libcef.so
+	opt/onlyoffice/desktopeditors/libEGL.so
+	opt/onlyoffice/desktopeditors/libGLESv2.so
+	opt/onlyoffice/desktopeditors/libhunspell.so
+	opt/onlyoffice/desktopeditors/libicudata.so
+	opt/onlyoffice/desktopeditors/libicudata.so.52
+	opt/onlyoffice/desktopeditors/libicudata.so.52.1
+	opt/onlyoffice/desktopeditors/libicui18n.so
+	opt/onlyoffice/desktopeditors/libicui18n.so.52
+	opt/onlyoffice/desktopeditors/libicui18n.so.52.1
+	opt/onlyoffice/desktopeditors/libicuuc.so
+	opt/onlyoffice/desktopeditors/libicuuc.so.52
+	opt/onlyoffice/desktopeditors/libicuuc.so.52.1
+	opt/onlyoffice/desktopeditors/libooxmlsignature.so
+	opt/onlyoffice/desktopeditors/libqgsttools_p.so
+	opt/onlyoffice/desktopeditors/libqgsttools_p.so.1
+	opt/onlyoffice/desktopeditors/libqgsttools_p.so.1.0
+	opt/onlyoffice/desktopeditors/libqgsttools_p.so.1.0.0
+	opt/onlyoffice/desktopeditors/libQt5Core.so.5
+	opt/onlyoffice/desktopeditors/libQt5DBus.so.5
+	opt/onlyoffice/desktopeditors/libQt5Gui.so.5
+	opt/onlyoffice/desktopeditors/libQt5Multimedia.so.5
+	opt/onlyoffice/desktopeditors/libQt5MultimediaWidgets.so.5
+	opt/onlyoffice/desktopeditors/libQt5Network.so.5
+	opt/onlyoffice/desktopeditors/libQt5OpenGL.so.5
+	opt/onlyoffice/desktopeditors/libQt5PrintSupport.so.5
+	opt/onlyoffice/desktopeditors/libQt5Svg.so.5
+	opt/onlyoffice/desktopeditors/libQt5Widgets.so.5
+	opt/onlyoffice/desktopeditors/libQt5X11Extras.so.5
+	opt/onlyoffice/desktopeditors/libQt5XcbQpa.so.5
+	opt/onlyoffice/desktopeditors/libqtascdocumentscore.so
+	opt/onlyoffice/desktopeditors/libvideoplayer.so
+	opt/onlyoffice/desktopeditors/bearer/libqconnmanbearer.so
+	opt/onlyoffice/desktopeditors/bearer/libqgenericbearer.so
+	opt/onlyoffice/desktopeditors/bearer/libqnmbearer.so
+	opt/onlyoffice/desktopeditors/converter/libDjVuFile.so
+	opt/onlyoffice/desktopeditors/converter/libdoctrenderer.so
+	opt/onlyoffice/desktopeditors/converter/libgraphics.so
+	opt/onlyoffice/desktopeditors/converter/libHtmlFile.so
+	opt/onlyoffice/desktopeditors/converter/libHtmlRenderer.so
+	opt/onlyoffice/desktopeditors/converter/libicudata.so.58
+	opt/onlyoffice/desktopeditors/converter/libicuuc.so.58
+	opt/onlyoffice/desktopeditors/converter/libkernel.so
+	opt/onlyoffice/desktopeditors/converter/libPdfReader.so
+	opt/onlyoffice/desktopeditors/converter/libPdfWriter.so
+	opt/onlyoffice/desktopeditors/converter/libUnicodeConverter.so
+	opt/onlyoffice/desktopeditors/converter/libXpsFile.so
+	opt/onlyoffice/desktopeditors/converter/x2t
+	opt/onlyoffice/desktopeditors/iconengines/libqsvgicon.so
+	opt/onlyoffice/desktopeditors/imageformats/libqsvg.so
+	opt/onlyoffice/desktopeditors/imageformats/libqico.so
+	opt/onlyoffice/desktopeditors/imageformats/libqicns.so
+	opt/onlyoffice/desktopeditors/imageformats/libqwbmp.so
+	opt/onlyoffice/desktopeditors/imageformats/libqjpeg.so
+	opt/onlyoffice/desktopeditors/imageformats/libqtiff.so
+	opt/onlyoffice/desktopeditors/imageformats/libqtga.so
+	opt/onlyoffice/desktopeditors/imageformats/libqwebp.so
+	opt/onlyoffice/desktopeditors/imageformats/libqgif.so
+	opt/onlyoffice/desktopeditors/mediaservice/libgstcamerabin.so
+	opt/onlyoffice/desktopeditors/mediaservice/libgstaudiodecoder.so
+	opt/onlyoffice/desktopeditors/mediaservice/libgstmediacapture.so
+	opt/onlyoffice/desktopeditors/mediaservice/libgstmediaplayer.so
+	opt/onlyoffice/desktopeditors/platforminputcontexts/libibusplatforminputcontextplugin.so
+	opt/onlyoffice/desktopeditors/platforminputcontexts/libqtvirtualkeyboardplugin.so
+	opt/onlyoffice/desktopeditors/platforminputcontexts/libcomposeplatforminputcontextplugin.so
+	opt/onlyoffice/desktopeditors/platforms/libqoffscreen.so
+	opt/onlyoffice/desktopeditors/platforms/libqlinuxfb.so
+	opt/onlyoffice/desktopeditors/platforms/libqvnc.so
+	opt/onlyoffice/desktopeditors/platforms/libqxcb.so
+	opt/onlyoffice/desktopeditors/platforms/libqminimal.so
+	opt/onlyoffice/desktopeditors/platformthemes/libqgtk3.so
+	opt/onlyoffice/desktopeditors/playlistformats/libqtmultimedia_m3u.so
+	opt/onlyoffice/desktopeditors/printsupport/libcupsprintersupport.so
+	opt/onlyoffice/desktopeditors/swiftshader/libEGL.so
+	opt/onlyoffice/desktopeditors/swiftshader/libGLESv2.so
+	opt/onlyoffice/desktopeditors/xcbglintegrations/libqxcb-glx-integration.so
+"
+
+src_install() {
+	domenu usr/share/applications/onlyoffice-desktopeditors.desktop
+	dobin usr/bin/desktopeditors usr/bin/onlyoffice-desktopeditors
+	doins -r opt
+	fperms +x /opt/onlyoffice/desktopeditors/{DesktopEditors,editors_helper,converter/x2t}
+}
--- a/app-portage/euscan-ng/Manifest
+++ b/app-portage/euscan-ng/Manifest
@ -1 +1 @@
-DIST euscan-ng-1.0.1a1.tar.gz 39963 BLAKE2B 023fa5ee14a417a03a756d808cf738d039265cff3cad0462fd93c16b13f63ceb219e1f478d722d71bd3e5845810cd531bd1bf550ed137ba2bcee523c47d96ddf SHA512 e0a3daa9db4aa33fad3b77436094509be302ac5b7eb938a3fecba2a711052dda5207b0c8f6bde3b6d286137a5d3e31b94b97588bba701a76f83da40c4b79a8dc
+DIST euscan-ng-1.0.0.tar.gz 7059426 BLAKE2B e926381049fff7b5053c023d66804121c24dc97713a9cd68ad227e0afffbdb12439362c2a389c0dbd76934a12f1e7aff36a81086b27bc70fec951c3c5cd90106 SHA512 c3519e9db3fcf9b1495c881a0816350a1103785b0ba6d2293747ef5aae3d7ec0802ade4c199c0568a91e2b6a1c7ab242627fb4e31dc8c2fb61b1c4ec6b1daa74
--- a/app-portage/euscan-ng/euscan-ng-1.0.0.ebuild
+++ b/app-portage/euscan-ng/euscan-ng-1.0.0.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Check if a given package has new upstream versions"
+HOMEPAGE="https://gitlab.com/src_prepare/euscan-ng"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="
+		https://gitlab.com/src_prepare/${PN}.git
+		https://github.com/xgqt/${PN}.git
+	"
+else
+	SRC_URI="
+		https://gitlab.com/src_prepare/${PN}/-/archive/${PV}/${PN}-${PV}.tar.gz
+		https://github.com/xgqt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64"
+fi
+
+RESTRICT="mirror"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+# web (
+# 'Django>=1.4',              dev-python/django           OK
+# 'South>=0.7',               None
+# 'ansi2html>=0.9.1',         dev-python/ansi2html        PY
+# 'django-annoying>=0.7.6',   None
+# 'django-auth-ldap>=1.1',    dev-python/django-auth-ldap PY
+# 'django-celery>=3.0.1',     dev-python/celery           PY
+# 'django-piston>=0.2.3',     None
+# 'django-recaptcha>=0.0.4',  None
+# 'django-registration>=0.8', None
+# 'matplotlib>=1.1.0',        dev-python/matplotlib       OK
+# 'python-ldap>=2.4.10',      dev-python/python-ldap      OK
+# )
+
+# Right now euscan-ng and euscan can't be both installed on the same system
+DEPEND="
+	!app-portage/euscan
+	>=dev-python/beautifulsoup4-4.8.2[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
grepwood@sucs.org	386636d694	Paying repoman dues	2021-11-03 11:19:48 +01:00
grepwood@sucs.org	6ec58f2659	Requiring lgogdownloader-3.8 or newer	2021-11-03 03:36:48 +01:00
grepwood@sucs.org	74181d3944	Removed games-util/lgogdownloader as upstream already provides our patch. Due to refusal to also merge our export script, we relegate it to another package which becomes the central piece for gog eclass	2021-11-03 03:31:34 +01:00
				`@ -0,0 +1 @@`
				`EBUILD miniflux-0.ebuild 261 BLAKE2B 4760996434119a69af4cbd770a8a3f27896db52f8c23e8f93fd6835e7bcde84235c1305bca1a2606bfb377dcf98009bd9035d5ce25ef7072cd22564321396ebf SHA512 c4800cdb0a62ddb28433bc3bb4621829dbd0acbe1ab8b5f94ddb8ef7605ab64a47a9e6a62eabaa8845d2cfdda56da7b08b6dcc622a5282319012d96862421ef2`
				`@ -0,0 +1 @@`
				`DIST grub-customizer_5.1.0.tar.gz 578046 BLAKE2B 3d32db2523e70968786bd2d6b620ee3a42a312d0b892e38121b8869a155c23aa5ead9219e56e0a84109c0bcf84a4c1f00130a3565c8d28c77b1e23bbf669a2c4 SHA512 d79c7996afd8486483d4460432207dc19315d7377dcfd2fd6a4594e64c6750bbae36f96c395c4a9748d0ff43c6095399d822fc6a23beedbc8769802818dfa11f`
				`@ -0,0 +1 @@`
				`DIST atom-1.58.0.tar.gz 203905263 BLAKE2B 95311b625bbee45f64d3e3d44f7870fba0efaa31ca14025e68d587b60e5d618c89e948dae7856348f0e55ea434f80d484f74809f1d244d6609f84023047794e6 SHA512 5e5c456ca745e2e51c4c24a2cba76d59ae9c519639f301b8677b5627ebecc1b8c114fc1942c22318266fe985ca1064618dc89379ecf8cdd935bfee7e605f33f1`
				`@ -0,0 +1 @@`
				`DIST rehex-0.3.0.tar.gz 2658263 BLAKE2B cd46ca89ed2c8c5c47e0e88f8342749634d172a4a8d1ce45f7f94049601f53f9a95d0724c6da6e9e05718daf8ca17ff859f396ff67d922bbcb1a5618d8c63b49 SHA512 f3f580b32e23280a4033c49ac5ba5d09ebcc7de305af4553a745dd53c015e92601d7018f9e07127298051f3435f1e90c21bdf3ba23809a2f90c4995e0a6d0fab`
				`@ -1 +0,0 @@`
				`DIST taxy-magit-section-0.13.tar 81920 BLAKE2B 286fde7e9dc9dffe9985020ffc8739e47ecc4c1cfeb3a8816b6cb4f3eb6c143aeba76942080f9cdbaee55f9f1f3398b04a4a69ebc9cd3eec591aa708e79267a3 SHA512 f01178a5dc26f56eecafd1d366456a3815b890315369763c10f1203ba415e701b81b53714a5b43f297bf5dfdfd365e1fad763f88914a3f5e779db8dbd108a2c5`
				`@ -1 +0,0 @@`
				`DIST taxy-0.10.1.tar 245760 BLAKE2B 9fabcc2ac7cb727ef8f6bb98d936f8c3f85d0b74fa5535cce748389ac6908bf426b418f57f646ab6c3957412a2565ca49ff32c38ca2e3380ae709325d974e2d7 SHA512 ee2b66ca5d3ae871db19aa0ee65a798fdac6113b048a50d8ca843eb66d966d9432912a178b5322678b5ba504597ad31b41ec839f8dbcb674645b32cee12a4a26`
				`@ -1 +0,0 @@`
				`DIST ts-0.2.2.tar.gz 41296 BLAKE2B 4238662cb4c726347ab3eb33064363ca1c846c9f99283a82a9724d358547a8651a37f5d72ebb2aeb93447aa07ec1f7c8c329a1be9da7767a5aa34d18493ae4cd SHA512 231d631011cf1d51e62c2f8ce53b3e7141eb0d1127dd8911f6a82feaa074afee2147454479d19901f867548520a988129e0c16be8326386e9de926662dcb535b`