diff --git a/app-crypt/clevis/metadata.xml b/app-crypt/clevis/metadata.xml
index 4130b42713..47804fd7a1 100644
--- a/app-crypt/clevis/metadata.xml
+++ b/app-crypt/clevis/metadata.xml
@@ -5,6 +5,9 @@
 		<email>julien@jroy.ca</email>
 		<name>Julien Roy</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">latchset/clevis</remote-id>
+	</upstream>
 	<use>
 		<flag name="luks">Enable LUKS support</flag>
 		<flag name="tpm">Enable TPM support</flag>
diff --git a/app-crypt/tang/metadata.xml b/app-crypt/tang/metadata.xml
index 97ba7c28bb..89293a302d 100644
--- a/app-crypt/tang/metadata.xml
+++ b/app-crypt/tang/metadata.xml
@@ -5,4 +5,7 @@
 		<email>julien@jroy.ca</email>
 		<name>Julien Roy</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">latchset/tang</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-emulation/waydroid/waydroid-1.3.4-r2.ebuild b/app-emulation/waydroid/waydroid-1.3.4-r2.ebuild
deleted file mode 100644
index dfecb4019e..0000000000
--- a/app-emulation/waydroid/waydroid-1.3.4-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-#Relaismatrix/ Messung Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit linux-info python-single-r1
-
-DESCRIPTION="Container-based approach to boot a full Android system on Linux systems"
-HOMEPAGE="https://waydro.id"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="systemd"
-
-DEPEND="|| ( virtual/linux-sources virtual/dist-kernel )"
-RDEPEND="
-	systemd? ( sys-apps/systemd )
-	app-containers/lxc[systemd?]
-	$(python_gen_cond_dep '
-		dev-python/pygobject[${PYTHON_USEDEP}]
-		>=dev-python/gbinder-1.1.1[${PYTHON_USEDEP}]
-		>=dev-libs/gbinder-1.1.21
-	')
-	net-firewall/nftables[modern-kernel]
-	net-dns/dnsmasq
-	>=dev-libs/libglibutil-1.0.67
-	${PYTHON_DEPS}
-"
-
-CONFIG_CHECK="
-	~ANDROID_BINDER_IPC
-	~ANDROID_BINDERFS
-	~MEMFD_CREATE
-"
-ERROR_ANDROID_BINDERFS="CONFIG_ANDROID_BINDERFS: need for creating Android-specific binder IPC channels"
-ERROR_ANDROID_BINDER_IPC="CONFIG_ANDROID_BINDER_IPC: need for creating Android-specific binder IPC channels"
-ERROR_MEMFD_CREATE="CONFIG_MEMFD_CREATE: it completely replaced deprecated ISHMEM drivers, therefore it's vital for android-specific memory management"
-
-src_install() {
-	python_fix_shebang waydroid.py
-	emake install DESTDIR="${D}" USE_NFTABLES=1 USE_SYSTEMD=$(usex systemd 1 0)
-}
diff --git a/app-emulation/waydroid/waydroid-1.3.4-r5.ebuild b/app-emulation/waydroid/waydroid-1.3.4-r5.ebuild
new file mode 100644
index 0000000000..df767cedce
--- /dev/null
+++ b/app-emulation/waydroid/waydroid-1.3.4-r5.ebuild
@@ -0,0 +1,72 @@
+#Relaismatrix/ Messung Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit linux-info xdg-utils python-single-r1
+
+DESCRIPTION="Container-based approach to boot a full Android system on Linux systems"
+HOMEPAGE="https://waydro.id"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="systemd apparmor"
+
+DEPEND="|| ( virtual/linux-sources virtual/dist-kernel )"
+RDEPEND="
+	systemd? ( sys-apps/systemd )
+	app-containers/lxc[systemd?,apparmor?,seccomp]
+	$(python_gen_cond_dep '
+		dev-python/pygobject[${PYTHON_USEDEP}]
+		>=dev-python/gbinder-1.1.1[${PYTHON_USEDEP}]
+		>=dev-python/pyclip-0.7.0[wayland,${PYTHON_USEDEP}]
+	')
+	net-firewall/nftables[modern-kernel]
+	net-dns/dnsmasq
+	>=dev-libs/libglibutil-1.0.67
+	>=dev-libs/gbinder-1.1.21
+	${PYTHON_DEPS}
+"
+
+CONFIG_CHECK="
+	~ANDROID_BINDER_IPC
+	~ANDROID_BINDERFS
+	~MEMFD_CREATE
+"
+ERROR_ANDROID_BINDERFS="CONFIG_ANDROID_BINDERFS: need for creating Android-specific binder IPC channels"
+ERROR_ANDROID_BINDER_IPC="CONFIG_ANDROID_BINDER_IPC: need for creating Android-specific binder IPC channels"
+ERROR_MEMFD_CREATE="CONFIG_MEMFD_CREATE: it completely replaced deprecated ISHMEM drivers,
+	therefore it's vital for android-specific memory management"
+
+src_install() {
+	python_fix_shebang waydroid.py
+	emake install DESTDIR="${D}" USE_NFTABLES=1 USE_SYSTEMD=$(usex systemd 1 0)
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	if not use apparmor; then
+		ewarn "If you use app-containers/lxc without apparmor, make sure you deleted or commented out in waydroid LXC config"
+		ewarn "(generated after waydroid init) in /var/lib/waydroid/lxc/waydroid/config the following string:"
+		ewarn "lxc.apparmor.profile = unconfined"
+		ewarn "or waydroid experiences crash during launch"
+		ewarn "See also https://github.com/waydroid/waydroid/issues/652"
+	else
+		ewarn "Apparmor support has not been tested by package maintainer yet"
+	fi
+	ewarn "Make sure you have NFTABLES up and running in your kernel. See"
+	ewarn "https://wiki.gentoo.org/wiki/Nftables for how-to details"
+	einfo "Contact https://docs.waydro.id/usage/install-on-desktops for how-to guides"
+	einfo "(does not cover Gentoo-specific things sadly)"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-libs/gbinder/files/gbinder-1.1.30-respect-env.patch b/dev-libs/gbinder/files/gbinder-1.1.30-respect-env.patch
new file mode 100644
index 0000000000..62358758b0
--- /dev/null
+++ b/dev-libs/gbinder/files/gbinder-1.1.30-respect-env.patch
@@ -0,0 +1,49 @@
+diff --git a/Makefile b/Makefile
+index e838b7e..adb886f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -140,15 +140,15 @@ DEBUG_FLAGS = -g
+ RELEASE_FLAGS =
+ COVERAGE_FLAGS = -g
+ 
+-KEEP_SYMBOLS ?= 0
+-ifneq ($(KEEP_SYMBOLS),0)
+-RELEASE_FLAGS += -g
+-endif
++#KEEP_SYMBOLS ?= 0
++#ifneq ($(KEEP_SYMBOLS),0)
++#RELEASE_FLAGS += -g
++#endif
+ 
+ DEBUG_LDFLAGS = $(FULL_LDFLAGS) $(DEBUG_LIBS) $(DEBUG_FLAGS)
+ RELEASE_LDFLAGS = $(FULL_LDFLAGS) $(RELEASE_LIBS) $(RELEASE_FLAGS)
+ DEBUG_CFLAGS = $(FULL_CFLAGS) $(DEBUG_FLAGS) -DDEBUG
+-RELEASE_CFLAGS = $(FULL_CFLAGS) $(RELEASE_FLAGS) -O2
++RELEASE_CFLAGS = $(FULL_CFLAGS) $(RELEASE_FLAGS)
+ COVERAGE_CFLAGS = $(FULL_CFLAGS) $(COVERAGE_FLAGS) --coverage
+ 
+ #
+@@ -274,17 +274,17 @@ $(DEBUG_SO): $(DEBUG_OBJS)
+ 
+ $(RELEASE_SO): $(RELEASE_OBJS)
+ 	$(LD) $(RELEASE_OBJS) $(RELEASE_LDFLAGS) -o $@
+-ifeq ($(KEEP_SYMBOLS),0)
+-	$(STRIP) $@
+-endif
++#ifeq ($(KEEP_SYMBOLS),0)
++#	$(STRIP) $@
++#endif
+ 
+ $(DEBUG_LIB): $(DEBUG_OBJS)
+ 	$(AR) rc $@ $?
+ 	ranlib $@
+ 
+-$(RELEASE_LIB): $(RELEASE_OBJS)
+-	$(AR) rc $@ $?
+-	ranlib $@
++$(RELEASE_LIB): $(RELEASE_OBJS)
++	$(AR) rc $@ $?
++	ranlib $@
+ 
+ $(DEBUG_LINK):
+ 	ln -sf $(LIB_SO) $@
diff --git a/dev-libs/gbinder/gbinder-1.1.30-r1.ebuild b/dev-libs/gbinder/gbinder-1.1.30-r2.ebuild
similarity index 64%
rename from dev-libs/gbinder/gbinder-1.1.30-r1.ebuild
rename to dev-libs/gbinder/gbinder-1.1.30-r2.ebuild
index 8caa9ed802..cd97f3663a 100644
--- a/dev-libs/gbinder/gbinder-1.1.30-r1.ebuild
+++ b/dev-libs/gbinder/gbinder-1.1.30-r2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit toolchain-funcs
+
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/mer-hybris/libgbinder.git"
@@ -18,15 +20,31 @@ DESCRIPTION="GLib-style interface to binder"
 HOMEPAGE="https://github.com/mer-hybris/libgbinder"
 LICENSE="BSD"
 SLOT="0"
+IUSE=""
 
 DEPEND="dev-libs/libglibutil"
 RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig
+	sys-apps/sed"
+
+PATCHES=(
+	"${FILESDIR}/gbinder-1.1.30-respect-env.patch"
+)
+src_prepare() {
+	default
+	sed -i -e "s|ranlib|$(tc-getRANLIB)|" \
+	Makefile \
+	|| die
+}
 
 src_compile() {
-	emake KEEP_SYMBOLS=1 ABS_LIBDIR="/usr/$(get_libdir)" LIBDIR="/usr/$(get_libdir)"
+	emake LIBDIR="/usr/$(get_libdir)"
 }
 
 src_install() {
-	emake DESTDIR="${D}" ABS_LIBDIR="/usr/$(get_libdir)" LIBDIR="/usr/$(get_libdir)" install-dev
+	emake DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" install-dev
+}
+
+src_test() {
+	emake test
 }
diff --git a/dev-libs/gbinder/metadata.xml b/dev-libs/gbinder/metadata.xml
index 2161ec3cb8..39cfa268e2 100644
--- a/dev-libs/gbinder/metadata.xml
+++ b/dev-libs/gbinder/metadata.xml
@@ -7,8 +7,6 @@
 		<description>rarogcmex</description>
 	</maintainer>
 	<longdescription lang="en">
-		GLib-style interface to binder (Android IPC mechanism)
-
 		Key features:
 
 		1. Integration with GLib event loop
diff --git a/dev-libs/jose/metadata.xml b/dev-libs/jose/metadata.xml
index 97ba7c28bb..bfb2fba0b9 100644
--- a/dev-libs/jose/metadata.xml
+++ b/dev-libs/jose/metadata.xml
@@ -5,4 +5,7 @@
 		<email>julien@jroy.ca</email>
 		<name>Julien Roy</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">latchset/jose</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libglibutil/files/libglibutil-1.0.67-respect-env.patch b/dev-libs/libglibutil/files/libglibutil-1.0.67-respect-env.patch
new file mode 100644
index 0000000000..a68dbdb1aa
--- /dev/null
+++ b/dev-libs/libglibutil/files/libglibutil-1.0.67-respect-env.patch
@@ -0,0 +1,38 @@
+diff --git a/Makefile b/Makefile
+index 3e9aa23..252bf2c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -84,15 +84,15 @@ DEBUG_FLAGS = -g
+ RELEASE_FLAGS =
+ COVERAGE_FLAGS = -g
+ 
+-KEEP_SYMBOLS ?= 0
+-ifneq ($(KEEP_SYMBOLS),0)
+-RELEASE_FLAGS += -g
+-endif
++#KEEP_SYMBOLS ?= 0
++#ifneq ($(KEEP_SYMBOLS),0)
++#RELEASE_FLAGS += -g
++#endif
+ 
+ DEBUG_LDFLAGS = $(FULL_LDFLAGS) $(DEBUG_FLAGS)
+ RELEASE_LDFLAGS = $(FULL_LDFLAGS) $(RELEASE_FLAGS)
+ DEBUG_CFLAGS = $(FULL_CFLAGS) $(DEBUG_FLAGS) -DDEBUG
+-RELEASE_CFLAGS = $(FULL_CFLAGS) $(RELEASE_FLAGS) -O2
++RELEASE_CFLAGS = $(FULL_CFLAGS) $(RELEASE_FLAGS)
+ COVERAGE_CFLAGS = $(FULL_CFLAGS) $(COVERAGE_FLAGS) --coverage
+ 
+ #
+@@ -190,9 +190,9 @@ $(DEBUG_LIB): $(DEBUG_OBJS)
+ 
+ $(RELEASE_LIB): $(RELEASE_OBJS)
+ 	$(LD) $(RELEASE_OBJS) $(RELEASE_LDFLAGS) -o $@
+-ifeq ($(KEEP_SYMBOLS),0)
+-	$(STRIP) $@
+-endif
++#ifeq ($(KEEP_SYMBOLS),0)
++#	$(STRIP) $@
++#endif
+ 
+ $(DEBUG_LINK): $(DEBUG_LIB)
+ 	ln -sf $(LIB) $@
diff --git a/dev-libs/libglibutil/libglibutil-1.0.67-r1.ebuild b/dev-libs/libglibutil/libglibutil-1.0.67-r2.ebuild
similarity index 75%
rename from dev-libs/libglibutil/libglibutil-1.0.67-r1.ebuild
rename to dev-libs/libglibutil/libglibutil-1.0.67-r2.ebuild
index 68582392a1..543c4438ad 100644
--- a/dev-libs/libglibutil/libglibutil-1.0.67-r1.ebuild
+++ b/dev-libs/libglibutil/libglibutil-1.0.67-r2.ebuild
@@ -11,7 +11,7 @@ else
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
-DESCRIPTION="Library of glib utilities"
+DESCRIPTION="Library of glib utilities from sailfishos project"
 HOMEPAGE="https://github.com/sailfishos/libglibutil"
 LICENSE="BSD"
 SLOT="0"
@@ -19,11 +19,18 @@ SLOT="0"
 DEPEND="dev-libs/glib"
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
+PATCHES=(
+	"${FILESDIR}/libglibutil-1.0.67-respect-env.patch"
+)
 
 src_compile() {
-	emake KEEP_SYMBOLS=1 LIBDIR="/usr/$(get_libdir)"
+	emake LIBDIR="/usr/$(get_libdir)"
 }
 
 src_install() {
 	emake DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" install-dev
 }
+
+src_test() {
+	emake test
+}
diff --git a/dev-libs/luksmeta/metadata.xml b/dev-libs/luksmeta/metadata.xml
index 97ba7c28bb..4a0695b777 100644
--- a/dev-libs/luksmeta/metadata.xml
+++ b/dev-libs/luksmeta/metadata.xml
@@ -5,4 +5,7 @@
 		<email>julien@jroy.ca</email>
 		<name>Julien Roy</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">latchset/luksmeta</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/polyseed/Manifest b/dev-libs/polyseed/Manifest
new file mode 100644
index 0000000000..8283c5e231
--- /dev/null
+++ b/dev-libs/polyseed/Manifest
@@ -0,0 +1 @@
+DIST polyseed-1.0.0.tar.gz 105268 BLAKE2B ed3214816d3d0421c7fed8345bf8c66f0b6d7da47d7cc2c499cf7899817d2acf7951e1c439e80bb8e012a5b4ba5ca88795ab1fc0de688a90632b567924e7cc78 SHA512 fdb85173b71aa6da8ee032ef97c4a1dc07b1517b75c694b33d59c5e7cd2f69ba1d591c82b2227ce4e5ea88c4ec0b10fa4fb6487f6ced1eb7aef48c069d5a7a93
diff --git a/dev-libs/polyseed/polyseed-1.0.0.ebuild b/dev-libs/polyseed/polyseed-1.0.0.ebuild
new file mode 100644
index 0000000000..34fd633979
--- /dev/null
+++ b/dev-libs/polyseed/polyseed-1.0.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Mnemonic seed library for Monero and other CryptoNote-based currencies."
+HOMEPAGE="https://github.com/tevador/polyseed"
+SRC_URI="https://github.com/tevador/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="" #todo: make test executible an optiona; USE flag
+BDEPEND="virtual/pkgconfig"
diff --git a/dev-libs/polyseed/polyseed-9999.ebuild b/dev-libs/polyseed/polyseed-9999.ebuild
new file mode 100644
index 0000000000..007b9bebc9
--- /dev/null
+++ b/dev-libs/polyseed/polyseed-9999.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake git-r3
+
+DESCRIPTION="Mnemonic seed library for Monero and other CryptoNote-based currencies."
+HOMEPAGE="https://github.com/tevador/polyseed"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/tevador/polyseed.git"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="" #todo: make test executible an optional USE flag
+BDEPEND="virtual/pkgconfig"
diff --git a/dev-nim/npeg/Manifest b/dev-nim/npeg/Manifest
index 8002e7fb55..4f3c73f433 100644
--- a/dev-nim/npeg/Manifest
+++ b/dev-nim/npeg/Manifest
@@ -1,2 +1,3 @@
+DIST npeg-0.27.0.tar.gz 8455883 BLAKE2B 958ed4714f550127e5c24c9ecdd17672b0d5f7ffdd5c126a8485e67ed399e9faec92b497350695689908520f72d161e1b1e4a5c8392b7aa48ab30e9e1be16c32 SHA512 db5f9ad87aa4ab6d592aaffab5613d4c9a1ec25bc916d4ca491cfb44726dc901a852e8d6fbc2bca7edf0a769b78bafb1f8593ffecb48682ebca090dd56dcb26d
 DIST npeg-1.0.0.tar.gz 7103606 BLAKE2B 46dba587469afc85967cacbcad2b43c042e95492b46febeea1f61d26b61fcdecf0353d3a48e291e7c6305526759437cef3ad6edf96c3236abce1fd37c59a38cb SHA512 cf8003a8034c06c22ce12d85f5f7fdd7d1e79e026a0aca54d8d15d56751d0cef2a634c1b1fad9b5f840f372bba04e2456843db1efdbc721129c592d82ef0d3d4
 DIST npeg-1.0.1.tar.gz 7663620 BLAKE2B 4ad9c4a878cadcdb1e47b88bac37f455a14a4f5c3292cca8e78b30d940ab64d9b2110194c85157d2369545485249a3079aacbfcb4ba0e75d2dfe6e23cb82c1d6 SHA512 e328e94db7b7592b2807ce6cec0b6efeddb0b14b26b4a705ffcd4ad70d01cc6109d33f0986013dc8fea2aa49b0f60a15b16912b58708891439476400d82963a6
diff --git a/dev-nim/npeg/npeg-0.27.0.ebuild b/dev-nim/npeg/npeg-0.27.0.ebuild
new file mode 100644
index 0000000000..ece40d508c
--- /dev/null
+++ b/dev-nim/npeg/npeg-0.27.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit nimble
+
+DESCRIPTION="a PEG library for Nim"
+HOMEPAGE="https://github.com/zevv/npeg https://nimble.directory/pkg/npeg"
+SRC_URI="https://github.com/zevv/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS="~amd64"
+
+DOCS=( {Changelog,INTERNALS,README}.md )
+
+set_package_url "https://github.com/zevv/npeg"
+
+src_test() {
+	nimble_build testc
+}
diff --git a/dev-python/hypercorn/Manifest b/dev-python/hypercorn/Manifest
deleted file mode 100644
index 08d4946041..0000000000
--- a/dev-python/hypercorn/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hypercorn-0.13.2.gh.tar.gz 151984 BLAKE2B b0176016819409cb6958a758041bfe710a008d141a52348ce545deb285cb9e6fc0a4c05321d021bfae5b9de96149db9302f9ce40d01b57c3176d6ad9aef61402 SHA512 c7f12c173b2e9da6108388b2a66b2abca7e26e0d2952e9f3828e94d37b9e3df6076395afd8438aaaa7e328f9a4b085d62f6efd28e2503c4db9bc1f430795048e
diff --git a/dev-python/hypercorn/files/hypercorn-0.11.2-no-coverage.patch b/dev-python/hypercorn/files/hypercorn-0.11.2-no-coverage.patch
deleted file mode 100644
index 8c3f4210a6..0000000000
--- a/dev-python/hypercorn/files/hypercorn-0.11.2-no-coverage.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -43,5 +43,5 @@
- ignore_missing_imports = True
- 
- [tool:pytest]
--addopts = --no-cov-on-fail --showlocals
-+addopts = --showlocals
- testpaths = tests
diff --git a/dev-python/hypercorn/files/hypercorn-0.13.2-no-coverage.patch b/dev-python/hypercorn/files/hypercorn-0.13.2-no-coverage.patch
deleted file mode 100644
index 78609bd739..0000000000
--- a/dev-python/hypercorn/files/hypercorn-0.13.2-no-coverage.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -88,7 +88,7 @@
- ignore_missing_imports = true
- 
- [tool.pytest.ini_options]
--addopts = "--no-cov-on-fail --showlocals --strict-markers"
-+addopts = "--showlocals --strict-markers"
- testpaths = ["tests"]
- 
- [build-system]
diff --git a/dev-python/hypercorn/hypercorn-0.13.2.ebuild b/dev-python/hypercorn/hypercorn-0.13.2.ebuild
deleted file mode 100644
index 24053ec783..0000000000
--- a/dev-python/hypercorn/hypercorn-0.13.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="ASGI Server based on Hyper libraries and inspired by Gunicorn"
-HOMEPAGE="
-	https://pgjones.gitlab.io/hypercorn
-	https://gitlab.com/pgjones/hypercorn
-	https://github.com/pgjones/hypercorn
-	https://pypi.org/project/hypercorn/
-"
-SRC_URI="
-	https://github.com/pgjones/hypercorn/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/h11[${PYTHON_USEDEP}]
-	>=dev-python/h2-3.1.0[${PYTHON_USEDEP}]
-	dev-python/priority[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/wsproto-0.14.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		>=dev-python/mock-4[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}/${P}-no-coverage.patch" )
-
-distutils_enable_tests pytest
-
-distutils_enable_sphinx docs \
-	dev-python/pydata-sphinx-theme
diff --git a/dev-python/hypercorn/metadata.xml b/dev-python/hypercorn/metadata.xml
deleted file mode 100644
index f39c424104..0000000000
--- a/dev-python/hypercorn/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
-<pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@gmail.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <longdescription lang="en">
-Hypercorn is an ASGI web server based on the sans-io hyper, h11, h2, and wsproto libraries 
-and inspired by Gunicorn. Hypercorn supports HTTP/1, HTTP/2, WebSockets (over HTTP/1 and 
-HTTP/2), ASGI/2, and ASGI/3 specifications. Hypercorn can utilise asyncio, uvloop, or trio 
-worker types.
-
-Hypercorn can optionally serve the current draft of the HTTP/3 specification 
-using the aioquic library. To enable this install the h3 optional extra, pip install 
-hypercorn[h3] and then choose a quic binding e.g. hypercorn --quic-bind localhost:4433 
-
-Hypercorn was initially part of Quart before being separated out into a
-standalone ASGI server. Hypercorn forked from version 0.5.0 of Quart.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">pgjones/hypercorn</remote-id>
-    <remote-id type="gitlab">pgjones/hypercorn</remote-id>
-    <remote-id type="pypi">hypercorn</remote-id>
-  </upstream>
-</pkgmetadata>
-
diff --git a/dev-python/pyclip/Manifest b/dev-python/pyclip/Manifest
index 0d27b94a5b..c965fff813 100644
--- a/dev-python/pyclip/Manifest
+++ b/dev-python/pyclip/Manifest
@@ -1,2 +1,3 @@
 DIST pyclip-0.5.4.tar.gz 17056 BLAKE2B e1c29dda7496086cca4782d13fbca4dff7157ef0fdb467e7472ee1e531e53d5d1b1577bfbc3cea30f80d88def20ed34ac71b7a90e2f1728e2cdd9937ce4f2528 SHA512 c0ec789ac7b13e34d9ad91006b3b6369d552d0b79b8fc7de93f4817b0540ca889238a4bbb8ee0ac0b573d644822982f99a3ca2562dc3091440441e8d9c2361dc
 DIST pyclip-0.6.0.tar.gz 17148 BLAKE2B eb67f5f832f80d69ac985a9c16fd1e01edf016c278fc48329af81aa48a98f634835ba018a4d1a278a4117e9550f9d09a2776c353d7a37c77dc3d1f146a7d3af2 SHA512 3666d187fd2a0d107197c4bc9fab9e8e248cdd8607945470b622f1ebeaba7deaf3b30dd2570b36ef82fd5fd729aebbd73da85bc51f1696652ed3ef091e96368f
+DIST pyclip-0.7.0.tar.gz 17555 BLAKE2B 281a2dacd82d7501e01750134d82fc0b66ac1d41a631b9573160262c94cfb97ad463036e8ec523674580fdfb71849175e58836530d761462a72ba9ba3f2fd618 SHA512 64849befe020b0ac38aa8ed93ceb7fb275112aa49ae527fc54916ea591e09ce5a1a669d8f68083b098112a90fd36f71d2abeef6c3a8908e6cde20f04b0273877
diff --git a/dev-python/pyclip/pyclip-0.7.0.ebuild b/dev-python/pyclip/pyclip-0.7.0.ebuild
new file mode 100644
index 0000000000..bdc064f8e1
--- /dev/null
+++ b/dev-python/pyclip/pyclip-0.7.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+DISTUTILS_USE_PEP517="setuptools"
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/spyoungtech/pyclip.git"
+else
+	SRC_URI="https://github.com/spyoungtech/pyclip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Python clipboard module"
+HOMEPAGE="https://pypi.org/project/pyclip/"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="wayland X"
+RESTRICT="test"
+DOCS="${S}/docs/README.md"
+REQUIRED_USE="|| ( wayland X )"
+
+DEPEND=""
+RDEPEND="
+	wayland? ( gui-apps/wl-clipboard )
+	X? ( x11-misc/xclip )
+"
+BDEPEND=""
diff --git a/dev-python/pyclip/pyclip-9999.ebuild b/dev-python/pyclip/pyclip-9999.ebuild
index 8eb8b2e965..bdc064f8e1 100644
--- a/dev-python/pyclip/pyclip-9999.ebuild
+++ b/dev-python/pyclip/pyclip-9999.ebuild
@@ -4,7 +4,8 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+
+DISTUTILS_USE_PEP517="setuptools"
 
 inherit distutils-r1
 
@@ -13,19 +14,21 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/spyoungtech/pyclip.git"
 else
 	SRC_URI="https://github.com/spyoungtech/pyclip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="Python clipboard module"
 HOMEPAGE="https://pypi.org/project/pyclip/"
 LICENSE="Apache-2.0"
 SLOT="0"
+IUSE="wayland X"
 RESTRICT="test"
 DOCS="${S}/docs/README.md"
+REQUIRED_USE="|| ( wayland X )"
 
 DEPEND=""
 RDEPEND="
-	gui-apps/wl-clipboard
-	x11-misc/xclip
+	wayland? ( gui-apps/wl-clipboard )
+	X? ( x11-misc/xclip )
 "
 BDEPEND=""
diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 05423ff8b1..051b2b8229 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.ebuild
@@ -8,7 +8,7 @@ inherit cmake git-r3 toolchain-funcs xdg
 DESCRIPTION="An emulator for Nintendo Switch"
 HOMEPAGE="https://yuzu-emu.org"
 EGIT_REPO_URI="https://github.com/yuzu-emu/yuzu-mainline"
-EGIT_SUBMODULES=( '-*' 'dynarmic' 'xbyak' )
+EGIT_SUBMODULES=( '-*' 'dynarmic' 'sirit' 'xbyak' )
 # Dynarmic is not intended to be generic, it is tweaked to fit emulated processor
 # TODO wait 'xbyak' waiting version bump. see #860816
 
@@ -27,7 +27,6 @@ RDEPEND="
 	>=net-libs/enet-1.3
 	app-arch/lz4:=
 	dev-libs/boost:=[context]
-	dev-libs/sirit
 	media-libs/opus
 	sys-libs/zlib
 	virtual/libusb:1
@@ -93,9 +92,8 @@ src_prepare() {
 	rm .gitmodules || die
 
 	# Unbundle inih
-	sed -i -e '/inih/d' externals/CMakeLists.txt || die
-	sed -i -e '1afind_package(PkgConfig REQUIRED)\npkg_check_modules(INIH REQUIRED INIReader)' \
-		-e '/target_link_libraries/s/inih/${INIH_LIBRARIES}/' src/yuzu_cmd/CMakeLists.txt || die
+	sed -i -e '/^if.*inih/,/^endif()/d' externals/CMakeLists.txt || die
+	sed -i -e '1afind_package(PkgConfig REQUIRED)\npkg_check_modules(INIH REQUIRED INIReader)' src/yuzu_cmd/CMakeLists.txt || die
 	sed -i -e 's:inih/cpp/::' src/yuzu_cmd/config.cpp || die
 
 	if use system-vulkan; then # Unbundle vulkan headers
@@ -115,7 +113,7 @@ src_prepare() {
 		src/common/scm_rev.cpp.in || die
 
 	if ! use discord; then
-		sed -i -e '/discord-rpc/d' externals/CMakeLists.txt || die
+		sed -i -e '/^if.*discord-rpc/,/^endif()/d' externals/CMakeLists.txt || die
 	else
 		# Unbundle discord rapidjson
 		sed -i '/NOT RAPIDJSONTEST/,/endif(NOT RAPIDJSONTEST)/d;/find_file(RAPIDJSON/d;s:\${RAPIDJSON}:"/usr/include/rapidjson":' \
@@ -124,21 +122,20 @@ src_prepare() {
 
 	# Unbundle cubeb
 	use cubeb && sed -i '$afind_package(Threads REQUIRED)' CMakeLists.txt || die
-	sed -i '/cubeb/d' externals/CMakeLists.txt || die
-
-	# Unbundle sirit
-	sed -i '/sirit/d' externals/CMakeLists.txt || die
+	sed -i '/^if.*cubeb/,/^endif()/d' externals/CMakeLists.txt || die
 
 	# Unbundle cpp-httplib
 	sed -i -e '/^	# httplib/,/^	endif()/d' externals/CMakeLists.txt || die
 
 	# Unbundle enet
-	sed -i -e '/enet/d' externals/CMakeLists.txt || die
+	sed -i -e '/^if.*enet/,/^endif()/d' externals/CMakeLists.txt || die
 	sed -i -e '/enet\/enet\.h/{s/"/</;s/"/>/}' src/network/network.cpp || die
 
 	# LZ4 temporary fix: https://github.com/yuzu-emu/yuzu/pull/9054/commits/a8021f5a18bc5251aef54468fa6033366c6b92d9
 	sed -i 's/lz4::lz4/lz4/' src/common/CMakeLists.txt || die
 
+	# libfmt >= 9
+	sed -i '/fmt.*REQUIRED/d' CMakeLists.txt || die
 	cmake_src_prepare
 }
 
@@ -146,16 +143,15 @@ src_configure() {
 	local -a mycmakeargs=(
 		# Libraries are private and rely on circular dependency resolution.
 		-DBUILD_SHARED_LIBS=OFF # dynarmic
-		-DDYNARMIC_NO_BUNDLED_ROBIN_MAP=ON
 		-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=$(usex compatibility-list)
 		-DENABLE_CUBEB=$(usex cubeb)
 		-DENABLE_QT=$(usex qt5)
 		-DENABLE_QT_TRANSLATION=$(usex qt5)
 		-DENABLE_SDL2=$(usex sdl)
 		-DENABLE_WEB_SERVICE=$(usex webservice)
+		-DSIRIT_USE_SYSTEM_SPIRV_HEADERS=ON
 		-DUSE_DISCORD_PRESENCE=$(usex discord)
 		-DYUZU_TESTS=$(usex test)
-		-DYUZU_USE_BUNDLED_OPUS=OFF
 		-DYUZU_USE_EXTERNAL_SDL2=OFF
 		-DYUZU_USE_QT_WEB_ENGINE=$(usex webengine)
 	)
diff --git a/gui-apps/yambar/yambar-1.9.0.ebuild b/gui-apps/yambar/yambar-1.9.0.ebuild
index 1c24b420d4..d1ef8f4ae1 100644
--- a/gui-apps/yambar/yambar-1.9.0.ebuild
+++ b/gui-apps/yambar/yambar-1.9.0.ebuild
@@ -5,12 +5,13 @@ EAPI=8
 
 inherit meson
 
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://codeberg.org/dnkl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}"
-else
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://codeberg.org/dnkl/${PN}.git"
+else
+	SRC_URI="https://codeberg.org/dnkl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="Simplistic and highly configurable status panel for X and Wayland"
diff --git a/gui-apps/yambar/yambar-9999.ebuild b/gui-apps/yambar/yambar-9999.ebuild
index 94cf9bebbf..a269aa2d42 100644
--- a/gui-apps/yambar/yambar-9999.ebuild
+++ b/gui-apps/yambar/yambar-9999.ebuild
@@ -5,12 +5,13 @@ EAPI=8
 
 inherit meson
 
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://codeberg.org/dnkl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}"
-else
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://codeberg.org/dnkl/${PN}.git"
+else
+	SRC_URI="https://codeberg.org/dnkl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="Simplistic and highly configurable status panel for X and Wayland"
diff --git a/net-p2p/feather/Manifest b/net-p2p/feather/Manifest
index 61e6b8cc9b..0bf1725e74 100644
--- a/net-p2p/feather/Manifest
+++ b/net-p2p/feather/Manifest
@@ -4,6 +4,5 @@ DIST feather-2.1.0-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e4244
 DIST feather-2.1.0-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
 DIST feather-2.1.0-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
 DIST feather-2.1.0-monero.tar.gz 11616189 BLAKE2B 704c7455d4ff1483d9b58078997d4371a9736bfacc63bc976ce65fdd966f51727f0cd656223c62f9f7baf95b475af34ac9d9e174fdf32a17d32872c46b7ad4d2 SHA512 44dfe24f4b844d9f1a14160fcf34007e735321f7beb9f6ae94ace46d67ced3e26efdfde82723ab2407c09a38da4a9aef2d52778620317051a3e780f0c0795edf
-DIST feather-2.1.0-polyseed.tar.gz 105576 BLAKE2B 445a3e5d04e53dad2c2add37af13b2d1a1a8eb4d2204fcdfea77f9909dd5939d828e6f759269ebee1ec9a550f4f46768c54b234a836a22b0eaaa230791925cef SHA512 40e0ec78690ec9955d5ac70ccfc68c5bc7f56f11adafaec0d7a13fd02a02c50189f329e346c668e3737b856c916b322a5e4a97c483bfe0ce1b9f033c3857285b
 DIST feather-2.1.0-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
 DIST feather-2.1.0.tar.gz 2005604 BLAKE2B 3e3cbd8334dd0b1b1d233b30f9fbe815a51f3f773ed73873fab316e9e22e616baa0e42112fc9b2450988915d16d7755cf79fa1e1672cb1001b8a50aeca96e102 SHA512 32697bfe80fb2e6fca00d29e78cfb9dae342f47fd47e0d49e03bc2baa18dff8d33f8b69f8658bb5bf5359ffa520a509af2c4e3e72aa80eb08d6967b26cc1870b
diff --git a/net-p2p/feather/feather-2.1.0.ebuild b/net-p2p/feather/feather-2.1.0.ebuild
index 5f4e35ba0c..fab406b814 100644
--- a/net-p2p/feather/feather-2.1.0.ebuild
+++ b/net-p2p/feather/feather-2.1.0.ebuild
@@ -5,10 +5,6 @@ EAPI=8
 
 inherit cmake desktop xdg
 
-#Note: this is like a tree, with dependencies-of-dependencies
-#You need to update all of these recursively every version bump.
-#But at least they are distfiles if github goes down. ¯\_(ツ)_/¯
-POLYSEED_DIST_COMIT="e38516561c647522e2e2608f13eabdeab61d9a5d"
 SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b"
 MONERO_DIST_COMIT="b45c66e9c62d7e8f24abbcb447f408e618bfd450"
 	MINIUPNP_DIST_COMIT="544e6fcc73c5ad9af48a8985c94f0f1d742ef2e0"
@@ -19,10 +15,8 @@ MONERO_DIST_COMIT="b45c66e9c62d7e8f24abbcb447f408e618bfd450"
 
 DESCRIPTION="A free, open-source Monero wallet"
 HOMEPAGE="https://featherwallet.org"
-SRC_URI="https://github.com/feather-wallet/feather/archive/refs/tags/${PVR}.tar.gz -> \
+SRC_URI="https://github.com/feather-wallet/feather/archive/refs/tags/${PV}.tar.gz -> \
 ${P}.tar.gz
-	https://github.com/tevador/polyseed/archive/${POLYSEED_DIST_COMIT}.tar.gz -> \
-${P}-polyseed.tar.gz
 	https://github.com/itay-grudev/SingleApplication/archive/${SINGLEAPPLICATION_DIST_COMIT}.tar.gz -> \
 ${P}-singleapplication.tar.gz
 	https://github.com/feather-wallet/monero/archive/${MONERO_DIST_COMIT}.tar.gz -> \
@@ -44,27 +38,29 @@ ${P}-monero-trezorcommon.tar.gz
 LICENSE="BSD MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="qrcode xmrig"
+IUSE="qrcode xmrig localmonero"
 
 DEPEND="
-	dev-libs/boost:=[nls]
-	dev-libs/libgcrypt:=
 	dev-libs/libsodium:=
+	media-gfx/qrencode:=
+	media-gfx/zbar:=[v4l]
+	>=dev-libs/polyseed-1.0.0
 	dev-libs/libzip:=
-	dev-libs/openssl:=
+	dev-libs/boost:=[nls]
 	>=dev-qt/qtcore-5.15:5
+	>=dev-qt/qtwidgets-5.15:5
 	>=dev-qt/qtgui-5.15:5
-	>=dev-qt/qtmultimedia-5.15:5[widgets]
 	>=dev-qt/qtnetwork-5.15:5
 	>=dev-qt/qtsvg-5.15:5
-	>=dev-qt/qtwebsockets-5.15:5
-	>=dev-qt/qtwidgets-5.15:5
-	>=dev-qt/qtconcurrent-5.15:5
 	>=dev-qt/qtxml-5.15:5
-	media-gfx/qrencode:=
+	>=dev-qt/qtwebsockets-5.15:5
+	>=dev-qt/qtmultimedia-5.15:5[widgets]
+	>=dev-qt/qtconcurrent-5.15:5
+	dev-libs/libgcrypt:=
+	sys-libs/zlib
+	dev-libs/openssl:=
 	net-dns/unbound:=[threads]
 	net-libs/czmq:=
-	media-gfx/zbar:=[v4l]
 "
 RDEPEND="
 	${DEPEND}
@@ -75,7 +71,6 @@ BDEPEND="virtual/pkgconfig"
 
 src_unpack() {
 	unpack ${P}.tar.gz \
-		${P}-polyseed.tar.gz \
 		${P}-singleapplication.tar.gz \
 		${P}-monero.tar.gz \
 		${P}-monero-miniupnp.tar.gz \
@@ -83,8 +78,6 @@ src_unpack() {
 		${P}-monero-rapidjson.tar.gz \
 		${P}-monero-supercop.tar.gz \
 		${P}-monero-trezorcommon.tar.gz
-	mv -T "${WORKDIR}"/polyseed-${POLYSEED_DIST_COMIT} \
-		"${WORKDIR}"/${P}/src/third-party/polyseed || die
 	mv -T "${WORKDIR}"/SingleApplication-${SINGLEAPPLICATION_DIST_COMIT} \
 		"${WORKDIR}"/${P}/src/third-party/singleapplication || die
 	mv -T "${WORKDIR}"/monero-${MONERO_DIST_COMIT} \
@@ -110,18 +103,19 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPE=Release
+		-DBUILD_SHARED_LIBS=OFF
 		-DARCH=x86-64
-		-DBUILD_64=ON
 		-DBUILD_TAG="linux-x64"
-		-DDONATE_BEG=OFF
-		-DMANUAL_SUBMODULES=1
-		-DSTATIC=OFF
+		-DBUILD_64=ON
 		-DSELF_CONTAINED=OFF
-		-DUSE_DEVICE_TREZOR=OFF
+		-DLOCALMONERO=$(usex localmonero)
 		-DXMRIG=$(usex xmrig)
+		-DCHECK_UPDATES=OFF
+		-DPLATFORM_INSTALLER=OFF
+		-DUSE_DEVICE_TREZOR=OFF
+		-DDONATE_BEG=OFF
 		-DWITH_SCANNER=$(usex qrcode)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON #disables fetching/checking git submodules
-		-DVERSION_IS_RELEASE=true
 	)
 
 	cmake_src_configure
diff --git a/net-p2p/feather/feather-9999.ebuild b/net-p2p/feather/feather-9999.ebuild
index c8d4d36b4f..a3931f296d 100644
--- a/net-p2p/feather/feather-9999.ebuild
+++ b/net-p2p/feather/feather-9999.ebuild
@@ -15,27 +15,29 @@ EGIT_REPO_URI="https://github.com/feather-wallet/feather.git"
 LICENSE="BSD MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="qrcode xmrig"
+IUSE="qrcode xmrig localmonero"
 
 DEPEND="
-	dev-libs/boost:=[nls]
-	dev-libs/libgcrypt:=
 	dev-libs/libsodium:=
+	media-gfx/qrencode:=
+	media-gfx/zbar:=[v4l]
+	>=dev-libs/polyseed-1.0.0
 	dev-libs/libzip:=
-	dev-libs/openssl:=
+	dev-libs/boost:=[nls]
 	>=dev-qt/qtcore-5.15:5
+	>=dev-qt/qtwidgets-5.15:5
 	>=dev-qt/qtgui-5.15:5
-	>=dev-qt/qtmultimedia-5.15:5[widgets]
 	>=dev-qt/qtnetwork-5.15:5
 	>=dev-qt/qtsvg-5.15:5
-	>=dev-qt/qtwebsockets-5.15:5
-	>=dev-qt/qtwidgets-5.15:5
-	>=dev-qt/qtconcurrent-5.15:5
 	>=dev-qt/qtxml-5.15:5
-	media-gfx/qrencode:=
+	>=dev-qt/qtwebsockets-5.15:5
+	>=dev-qt/qtmultimedia-5.15:5[widgets]
+	>=dev-qt/qtconcurrent-5.15:5
+	dev-libs/libgcrypt:=
+	sys-libs/zlib
+	dev-libs/openssl:=
 	net-dns/unbound:=[threads]
 	net-libs/czmq:=
-	media-gfx/zbar:=[v4l]
 "
 RDEPEND="
 	${DEPEND}
@@ -46,17 +48,19 @@ BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPE=Release
+		-DBUILD_SHARED_LIBS=OFF
 		-DARCH=x86-64
-		-DBUILD_64=ON
 		-DBUILD_TAG="linux-x64"
-		-DDONATE_BEG=OFF
-		-DMANUAL_SUBMODULES=1
-		-DSTATIC=OFF
+		-DBUILD_64=ON
 		-DSELF_CONTAINED=OFF
-		-DUSE_DEVICE_TREZOR=OFF
+		-DLOCALMONERO=$(usex localmonero)
 		-DXMRIG=$(usex xmrig)
+		-DCHECK_UPDATES=OFF
+		-DPLATFORM_INSTALLER=OFF
+		-DUSE_DEVICE_TREZOR=OFF
+		-DDONATE_BEG=OFF
 		-DWITH_SCANNER=$(usex qrcode)
-		-DVERSION_IS_RELEASE=true
 	)
 
 	cmake_src_configure
diff --git a/net-p2p/feather/metadata.xml b/net-p2p/feather/metadata.xml
index 916a96588d..4f6ad6740c 100644
--- a/net-p2p/feather/metadata.xml
+++ b/net-p2p/feather/metadata.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>adam.pimentel46@gmail.com</email>
+		<name>Adam Pimentel</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">feather-wallet/feather</remote-id>
+	</upstream>
 	<longdescription lang="en">
 	Feather is a free, open-source Monero wallet for Linux, Tails,
 	Windows and macOS. It is:
@@ -21,5 +27,8 @@
 		<flag name="xmrig">
 			Enable mining support using a user specified xmrig binary
 		</flag>
+		<flag name="localmonero">
+			Enable LocalMonero.com support
+		</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r3.ebuild b/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r3.ebuild
index 1265bf3b52..60d502db66 100644
--- a/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r3.ebuild
+++ b/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r3.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 		dev-libs/boost:=[threads(+)]
 		dev-libs/gmp
 		dev-libs/mpfr
-		sci-mathematics/cgal[shared(-)]
+		sci-mathematics/cgal
 		sys-cluster/synapse
 	)
 "
diff --git a/sys-kernel/usermode-kernel/metadata.xml b/sys-kernel/usermode-kernel/metadata.xml
new file mode 100644
index 0000000000..5c6167cb3d
--- /dev/null
+++ b/sys-kernel/usermode-kernel/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">projg2/gentoo-kernel-config</remote-id>
+	</upstream>
+	<use>
+		<flag name="hardened">Use selection of hardening options recommended by Kernel Self Protection Project</flag>
+		<flag name="initramfs">Build initramfs along with the kernel.</flag>
+		<flag name="hostfs">Enable CONFIG_HOSTFS</flag>
+		<flag name="iomem">Enable CONFIG_MMAPPER</flag>
+		<flag name="pic">Enable the use of position independent code</flag>
+	</use>
+</pkgmetadata>
diff --git a/sys-kernel/usermode-kernel/usermode-kernel-6.0.12.ebuild b/sys-kernel/usermode-kernel/usermode-kernel-6.0.12.ebuild
index e6ca2dbdea..f9abf9deb7 100644
--- a/sys-kernel/usermode-kernel/usermode-kernel-6.0.12.ebuild
+++ b/sys-kernel/usermode-kernel/usermode-kernel-6.0.12.ebuild
@@ -40,7 +40,7 @@ SRC_URI+="
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="debug hardened pic static +hostfs +iomem"
 REQUIRED_USE="arm? ( savedconfig )
 	hppa? ( savedconfig )