gentoo auto-resync : 10:08:2022 - 14:18:00

200 files changed, 3429 insertions, 579 deletions

diff --git a/Manifest b/Manifest
index 477a1a3b876b..8a4b4fe9a82f 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29634 BLAKE2B 6203ae41b77ffc32823e6144f775d247c22c0275e014d4684c210930ea993f2828aab72792d1f01f8c166685d7c07210d669aaccafd70e5244c36ba4f1a85579 SHA512 970e58af45f7c0cfa079ce472b6b89ef6d600cd1988861aa3ef938ffe9059848b3d024c91205fa2a06dac050d33551308f8b66726915b299a517590e498d3782
-TIMESTAMP 2022-08-10T06:40:02Z
+MANIFEST Manifest.files.gz 29643 BLAKE2B 5a1b8d79367f1be452683ad4038da2b070dfe6ab8697df3521f9b51d9c997bbfc4b48e6ebae5b29ec100d4748a60fb080d02893b364a38e3940d84d6214a9fd4 SHA512 479f4891d1175e0ab9d64bc5ef7b8501ede705dee34c59ac18a7f10b51056d361fa11e1cc9be5ccb383ccd60ee60dad0768e583b9ad308c0e899c70ba6e297e5
+TIMESTAMP 2022-08-10T12:39:58Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLzUsJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLzpx5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCH4g//TyyqtY+PaHbH0FRZrpK/kyfOZYYedzuAWbxdbeyGshOgnvCuXa715kRk
-Y5hGg5QDVruL/xjVYxmdxmZDoUu8nFmc/CqVmEpJ26fAWASj3YlFbM7rJPm5e8NY
-0bLNijU79bbeEpEWQ4hE9NkeHld/GwZv9X5XYj3smBAHOSHp3yb5e3aq3re53HXp
-Fpk6cZM8LLkjrCM9eTQFR9dqZ+4Na0NGtA6l8H0djXP4ZLnkh2LAQUZJ9kzhA+6Z
-e25gZMCcJPEjPbx3UjGEHnVQepghqZImSTdbnc55EJPCNgBwHuhoapOGqfWMgq7g
-WP1Z9VgcWI50RltBemo5ZSvZhCulJqEglJpnQKbKGM8+GUTbFW78bB3612ygTZJC
-d4R2+f2bb3/RYsYaJb2aIEt8uJ0dZLikNUBOcsV8ZaF4gkAD4YufJMFGXBBZ1RYW
-ylNl/3ZhzN0jHBvy4OjUdc7d8B3r0mLm1ajJdSnW0b+EtNM1cj8aHWURYy5OpZal
-yDWCrVxMzR9rfmo69bbiH1mEFd+4Irs27BGFwdbG2UXXUs5M72Ho/r5kmk9uGHWW
-tzQaqegGIsLektFSpQLn6qOYFGVyZloCDwfENngN3rR7IGvZthWG8ZLmiFDNmE54
-AlBFcwh2Q6F2CI3BEiAhCJ550rLHmpLi1afU/GcQIkZ7jo2ITfA=
-=0W8Q
+klCvMg//fDwUekHcC0VxSrBDiqs3iaq/hdjYUYsDbSSkwaBM90Zbo/eSREf/XPBw
++RUeMqSt21L1TeoF8f8YMLtSsTgI3VBzcPxe6uno4Q0TdYh5D20gjRnbVYvKT8Lt
+RMPvWPWTiRB+p9iQrYaPWP6sPUroafCFZUbjXMEyqF0/Lq/lgaLpknBBGLFJSYQc
+974qXV6WC1lOS8VmM6a9/C5WI1QjCGrgvN1nymmPpS307Qn1HweHh9d08OwQw/mL
+0GRZbGYTmOQV1tOJCICnARmXifXX5i1218t7myplP5BKI5tBlsFBptNR6K2t2WWu
+MN0ARWZHTASNACDBWzpO6ZRZUwZocUEbjsjGm29eUnqHGYiR1QZIbBiNAiDv6Ebs
+XMZrZn9Ob46YfsOf81HeAn5hxPYiLflahiLwZmp+G0Rzi2m/rL0Qnx14zYwaZZcU
+dgUTOc0mP7whWjQ3pJpbXMTd4aqLsnH5WKZcx13bUXgV03Vdc4TDPHRSBjFMPAFC
+8SLDH+Tl7casFwJBqLVtyNYUIfdaYXTtVCmMjZFqpZ010SYm4ooeGXC2kRvtDX4U
+r39zRN/JVHARan60zMqHglD80Vq10DunTV0oUyXDAD/cZARmhS//RZXrQ2OFrulr
+ddJoO0KLidIu2c2ZMWtFECimSwt6j5HD0YokrLL/YJmRHkNY4ic=
+=3gKa
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 5bfee5c19994..592b80165e30 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index eac354ce9a74..9f30e6b2c9b1 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index 4298ac3fdb41..39985be3fb6b 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -1,5 +1,7 @@
 DIST dar-2.7.5.tar.gz 2404076 BLAKE2B 2887629cecf069cfb5063132299279b8be985785485c6f04a8389dfd4930f00b073b421fbb17915d69f5efd46ebb4c3d371c10d3936bfb16d82a191218af350d SHA512 a4e01dce8a078ba81b3032a1910d75f0f59a23511246f570a50ade135f49f11e522ed8916a947aece1799dcd1d37308ba6e4a009313b80d6a1561698c3d5623a
 DIST dar-2.7.6.tar.gz 2410200 BLAKE2B 925b4854c66fec9287e0f42d213f94f208b5248d09eb6abe4e36a41df1fc57641d7a6b41e1f8aaa202e6f74ad04399c70a8cb74dc63685985a5671ba54efdf93 SHA512 517fa06a5b8caa53ad111e4287446583f328ee2027169db067610877e05291e63179c1bdd92312a6885d1c7eba0566a86301e974d1d48df56f0fce9ccfdb3a19
+DIST dar-2.7.7.tar.gz 2410835 BLAKE2B c2b1cff205a7af0b714808bbb952677ffdfa8d62289d412e4e3056db16f5c204a2eecc8f770ff57d18839218ff1babcb5c56c9729e03316d698a351dacf47e25 SHA512 984328cff1ed3338707858aced83a6a18e950581f02dd686a2a01668f6c374d0af2d98ba49068a61624641fcfbb139ae893d02e5b5f303b8b26d8e05fcb6a229
 EBUILD dar-2.7.5.ebuild 2226 BLAKE2B 305c99ac9f516c706032ec066f7e22d6c85690bc6e7c29cfe8eecd54fbb0a4ca2e2db17fd58edbd0d6de98c3f89af13500e48369a62036f6816880b6f116b3fb SHA512 c43754f566d0ff4772ba9bc8062ac2c121c2d9f9bf7bd85bf1153301b5c06b8e75200e1cbb75708abc19c283c07b40917de85658a42c46bbcedff96155b27092
-EBUILD dar-2.7.6.ebuild 2229 BLAKE2B 99607c20ed3ea2faac8c4b99ca0cd13e84d9518e43e6838225d336754f312a3512605ee1933e29dcac6a15e098da21babfec7ff76f866f0ff7d37521a3979290 SHA512 d988d0b34c957729ddb070299e41ca70e60f0fdafdd23b5366499a54dc354fded62f910c838191cbb5e4a9901fd20a67c2b491727059dff4f88d1ab22f055ea2
+EBUILD dar-2.7.6.ebuild 2227 BLAKE2B e0d301f76a7e4901e204732eaa8690e461cda568ba02026ebb1ed772d2f985a9caeccbf8a6570f48fcdd22e8a01912141c028ee7e7c0b076ce213aa5b513578f SHA512 656ae177934759b0b44ebabf8b6de4a332e98290277aa08d32d90bdb9164a1de5512f0ba89bcb372bb0488b4711aed530ed80b9b97fc5a4beb2c63d47c036860
+EBUILD dar-2.7.7.ebuild 2318 BLAKE2B 4041bc8ed85f878faac8e541cbd02813f345e3757b7ffb2059a7614d2413517e40d5f784ec4ea7c522198e720dc27aba994cbe60e1766c48c0eaebc834784697 SHA512 ff2a873c907d92468abc4e27dce106986ab8d860ea91da6ed295b770424b913aaa028afcd1e368fddfc2ecee761a30e6529536a78761d23c55dffea44bc70937
 MISC metadata.xml 1284 BLAKE2B b70f06ea13076c3de9470fa1b65d9a17de048db8f52ade94246c62241828be74f308dcc39067b27ed99ff963c3554e371611aba0bb04ed6d57d14d4f7fd7f9dc SHA512 5cbbbff7e0652a85f717f2eb6a574d6fe52d478e049fa81e1c25b1bbe034086d433558952be1bc56ea4492c9c43f6da1e0968cc9132d18e7342890434c0a19d6
diff --git a/app-backup/dar/dar-2.7.6.ebuild b/app-backup/dar/dar-2.7.6.ebuild
index e38b345ee35d..efe67752937a 100644
--- a/app-backup/dar/dar-2.7.6.ebuild
+++ b/app-backup/dar/dar-2.7.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~ppc sparc x86 ~amd64-linux"
 IUSE="argon2 curl dar32 dar64 doc gcrypt gpg lz4 lzo nls rsync threads xattr"
 
 REQUIRED_USE="?? ( dar32 dar64 )
diff --git a/app-backup/dar/dar-2.7.7.ebuild b/app-backup/dar/dar-2.7.7.ebuild
new file mode 100644
index 000000000000..81fa3cd32f1d
--- /dev/null
+++ b/app-backup/dar/dar-2.7.7.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="A full featured backup tool, aimed for disks"
+HOMEPAGE="http://dar.linux.free.fr/"
+SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
+IUSE="argon2 curl dar32 dar64 doc gcrypt gpg lz4 lzo nls rsync threads xattr"
+
+REQUIRED_USE="?? ( dar32 dar64 )
+		gpg? ( gcrypt )"
+
+RESTRICT="test" # need to be run as root
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils
+	app-arch/zstd:=
+	sys-libs/libcap
+	>=sys-libs/zlib-1.2.3:=
+	argon2? ( app-crypt/argon2:= )
+	curl? ( net-misc/curl )
+	gcrypt? (
+		dev-libs/libgcrypt:0=
+		dev-libs/libgpg-error
+	)
+	gpg? ( app-crypt/gpgme:= )
+	lz4? ( app-arch/lz4:= )
+	lzo? ( dev-libs/lzo:2 )
+	nls? ( virtual/libintl )
+	rsync? ( net-libs/librsync:= )
+	threads? ( dev-libs/libthreadar )
+	xattr? ( sys-apps/attr )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )
+"
+
+QA_PKGCONFIG_VERSION=""	#862025 - upstream has a different numbering scheme for libdar
+
+src_configure() {
+	# configure.ac is totally funked up regarding the AC_ARG_ENABLE
+	# logic.
+	# For example "--enable-dar-static" causes configure to DISABLE
+	# static builds of dar.
+	# Do _not_ use $(use_enable) until you have verified that the
+	# logic has been fixed by upstream.
+	local myconf=(
+		--disable-dar-static
+		--disable-python-binding
+		--disable-upx
+		$(usev !argon2 --disable-libargon2-linking)
+		$(usev !curl --disable-libcurl-linking)
+		$(usev dar32 --enable-mode=32)
+		$(usev dar64 --enable-mode=64)
+		$(usev !doc --disable-build-html)
+		$(usev !gcrypt --disable-libgcrypt-linking)
+		$(usev !gpg --disable-gpgme-linking)
+		$(usev !lz4 --disable-liblz4-linking)
+		$(usev !lzo --disable-liblzo2-linking)
+		$(usev !nls --disable-nls)
+		$(usev !rsync --disable-librsync-linking)
+		$(usev !threads --disable-threadar)
+		$(usev !xattr --disable-ea-support)
+	)
+
+	# Bug 103741
+	filter-flags -fomit-frame-pointer
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
+
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+
+	# Bug 729150
+	rm "${ED}/usr/share/doc/${PF}/html/samples/MyBackup.sh.tar.gz" || die
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 96d25d6ce7a3..37d1abda9d91 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 076b68b27e8f..82a2c2139c96 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -24,6 +24,6 @@ EBUILD emacs-28.1-r2.ebuild 14934 BLAKE2B 0d81ef8eddbc2aeeace9071b7ce9214f539dd7
 EBUILD emacs-28.1.90-r2.ebuild 14940 BLAKE2B b6bb7cf14803f2649554168191d2533a2912212d399a31c1095c1b463356a7284ce135d648b1378042f20ae780cadac6b848efacecc1cda5c190fa2f925fb7aa SHA512 b7d7852e3f7367f18500132317ab0c95a076ace63080cfa805ed638266cbd7171ddd6814911bed3532f0c5740300689f2773790744e9cccbc426ac7d1867c2af
 EBUILD emacs-28.1.91.ebuild 14940 BLAKE2B b6bb7cf14803f2649554168191d2533a2912212d399a31c1095c1b463356a7284ce135d648b1378042f20ae780cadac6b848efacecc1cda5c190fa2f925fb7aa SHA512 b7d7852e3f7367f18500132317ab0c95a076ace63080cfa805ed638266cbd7171ddd6814911bed3532f0c5740300689f2773790744e9cccbc426ac7d1867c2af
 EBUILD emacs-28.1.9999.ebuild 15037 BLAKE2B 61cbff92ed83808be6868a4451f6e7f4064474da368f7e93295a3b23ff8a9f3a6ceb6c78ebc3955a3aa506ccf01e096b6a906b0ae4225c532b649b7492c865dd SHA512 37e7756db860b4564557b7f93c6a46e3b390dd899568802296ea2416cf9b23c408843192e5f9793a2968eff9bf622138c09858210efb85f16da0f006a912693d
-EBUILD emacs-28.1.ebuild 14790 BLAKE2B 9555b8b3d692fd33b9575e5666a63345369070187799e1a33556565c15a4f1c07b91197223e9db311911ca9ee4e797e9840b525fe8a2e8a9255f153c1bb541a5 SHA512 22757ca82108d2a47ee187119e82460a33c1df1d7b6cfd543a7bedd87e22aaff63083b2dffe47bcbb795430fa40e0a43477d0ef415a0de6e8b6bc5aaae425670
+EBUILD emacs-28.1.ebuild 14789 BLAKE2B a34823f4e5f862663981f580fff6b3a66e8b0b6c605cb584fb5bed3c5f2aeca0ae266668c31c0d302855fcfdffb1790c7193bf7a5d77596438bf7c0530d300af SHA512 b752b2befed614b341ea8688f6e66ef752dc026015906b77a32ef1828fb7f115de4a7c45e21be09081f72b631a5ea2bf6cddb98a0b0a84a681ffdebf2cea4dcf
 EBUILD emacs-29.0.9999.ebuild 16519 BLAKE2B ad8023a343f5b3809ac1a1b361c6213921931c2afa9eeca1d57d77b925f56c319ca10880ab7d70a33488e44c35969475b14442989c50147b7722e3d9cf44ee03 SHA512 50c3e8308f7627dd0da511104fcf3dc93e6095ad8334fa425de17b597e44e6feba58e0851cf15a8e1deb280b4957fce2ae173688f519b5e27bd4be25c42ffcb7
 MISC metadata.xml 3130 BLAKE2B 162f49aa253a87b89e80dcbc961cacf659220c16c5b9d83e96b1eb90c40f828b87830173a80fb24cbfae50efb2ddfe51aed3e334c8c0f8e5cd30b63569e991cb SHA512 71a1b4b298ae915a33c7876a20892799c3c7b39f913b7b2606c18e6c14a4169b60f17c41742cdaab870cb60bceee14c0d10ea6f345739b1e9c3d07a14d9d60ee
diff --git a/app-editors/emacs/emacs-28.1.ebuild b/app-editors/emacs/emacs-28.1.ebuild
index 69b2645dfb9b..87fef3ceb3c2 100644
--- a/app-editors/emacs/emacs-28.1.ebuild
+++ b/app-editors/emacs/emacs-28.1.ebuild
@@ -33,7 +33,7 @@ else
 	fi
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 1cd6636d2867..3891e4656256 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/transifex-client/Manifest b/app-i18n/transifex-client/Manifest
index fbaed0d57823..fd4705afaad7 100644
--- a/app-i18n/transifex-client/Manifest
+++ b/app-i18n/transifex-client/Manifest
@@ -1,7 +1,7 @@
 DIST transifex-client-1.1-deps.tar.xz 227565760 BLAKE2B d976f8e778abd2bab54306f53afa02f450be3564d427ac3624849e17d2e1adc109c0ec344bfb052a59e5a8060dd0d7313919efbf9883243f27aa82b25df0d5fb SHA512 d244fc394db334478593b69069b61b2795607ed3fdf719b6083eebcb50e128e33c8513e35660490005f2716892d98886f990a0850a15f91c3f75e9569341005a
 DIST transifex-client-1.1.0.tar.gz 83035 BLAKE2B fafee6b554116c8525409b2ad581f4b9c46faf58332b885afc74468e73f50936af743e9fefca29f773a8126fd5e91f0fd902b3542c1d2bb0e41ff6475d3bcddb SHA512 315208498ad18a6008c16b8e7cf6c25c227b4c28f1c54ced7fc31d082da3eb54859230acd67ad293405770be444c96687a1879792b6385c3ca6cf5f221ed9450
-DIST transifex-client-1.2.0-deps.tar.bz 241369348 BLAKE2B 4e7dce98ece36658b1ae6bc6e66f9cb60ba80504ed13c42f1766662a08a6a6faf89cd7a184b1840c838b361aa1b33c853b2a7af64df250377687ea23136975d5 SHA512 9f7efb88ac716726693dc242bc9752787d7115f159dda517401f1e5b0ffcfcb6828d9fffc35457e91282572ef221ea2cd84247ffd183b811ad07ca9d7993088b
-DIST transifex-client-1.2.0.tar.gz 84681 BLAKE2B 920f5a3257c31da6a076f48b9549fd9c40e1d0b8d0815808bb914ed5ecc88bb0d7a83ea40173c16e2985315d5c17aa8e1da6869fd325509579d9004f17d12c34 SHA512 6bf8b4341be77a81aad267c5efe923351797c02b666ed4fc8baec09a267d6c2ad84de38eb50061c33d4694c7b5198063f84b411007ebc79294b35a78a480d72a
+DIST transifex-client-1.3.0-deps.tar.bz 241930614 BLAKE2B 7855172504f3fe1208556e0030bcaec7dac4b21ed948926368b0b91c1984cb73e6d0bda0110bdd592cf3be7835f847fe54009f2c5c41fd14899b7b5d37932937 SHA512 5eb88614b354aeac0acd02cfe416c884adb8070614946dd71de512030e410a20ca7eb6b426876c218ef9b6ec1d4faf9eb557e2daf84cf9895cce04c33a937655
+DIST transifex-client-1.3.0.tar.gz 87395 BLAKE2B 90da67d49e1b2e09d509b0ff373f0403eddc5c29a63ca64f747006ed3cb95c51add58e442a139e7e17d28b44e700aed249d0e5ca563f6af832578640f8f7164d SHA512 6e81d94e95157322d0fc74386d7e6f218f589bb81ce36b0967c09ca9199d641b13953f491373d9e7ec9f6ddc50c243801a24da985a2e577b733bf364623e3d75
 EBUILD transifex-client-1.1.0.ebuild 831 BLAKE2B 8d9a148f65b3e626c04a5cb8c827a5fe6be5f6c23a0651f2107d795a27c156eb6975faf92c767bbc24f4410cda03a0ab224244e7bbc5da5ea5e3b8855d85d8cb SHA512 460bb2bdd8508aed891819f23dc4484c2faec4f78e134c2dbb81933e2c36db1ca385af89888c5c2e356c4dab673095df2a05e30a072d0629a27d8a9ff345e74e
-EBUILD transifex-client-1.2.0.ebuild 828 BLAKE2B c51a8c2e057ffa0b2fa3e5d47ccdb615c255ebaf5832761f816545182e3772dab95227906cc294af53415f15571fee66434b52c4daa962a76c7c42a1872ee000 SHA512 7aa398b9b13a0eda42c424ad8213dccd7160d82658ec020d20a3a17d2823b4330a7578a581721feb2fe08e594c237a921afb1827a5a7732b963f7003571e1d0a
+EBUILD transifex-client-1.3.0.ebuild 828 BLAKE2B c51a8c2e057ffa0b2fa3e5d47ccdb615c255ebaf5832761f816545182e3772dab95227906cc294af53415f15571fee66434b52c4daa962a76c7c42a1872ee000 SHA512 7aa398b9b13a0eda42c424ad8213dccd7160d82658ec020d20a3a17d2823b4330a7578a581721feb2fe08e594c237a921afb1827a5a7732b963f7003571e1d0a
 MISC metadata.xml 542 BLAKE2B c848737ba110443b53155e2e499f0b55f25fe1f6eb0fe35009eac80a42e34b45a00e56d40d9eea42e94129ef87ba446dbf19a1a3469a46801ab0c5c981c05c2d SHA512 a19b2e39fb736dca1c05c21097e9e75baad16ce4632767582dc634f41280fc9b41ee1ed3beca01f6992a1217b3abe63f36ac638dcb29e06ee8b2b76de338b7c9
diff --git a/app-i18n/transifex-client/transifex-client-1.2.0.ebuild b/app-i18n/transifex-client/transifex-client-1.3.0.ebuild
index 9a033bd17757..9a033bd17757 100644
--- a/app-i18n/transifex-client/transifex-client-1.2.0.ebuild
+++ b/app-i18n/transifex-client/transifex-client-1.3.0.ebuild
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 9b0c814cfa0f..9a588a2d07ed 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 97dcdbf9efe5..5e11d52fd034 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -18,5 +18,5 @@ DIST mupdf-1.20.0-source.tar.gz 88455853 BLAKE2B 686d8b02972fc6cb7fa4541e4f0561c
 EBUILD mupdf-1.18.0-r4.ebuild 4358 BLAKE2B 67d3b045314556eb3e81a668015e36115e7729436a91bfebededdf316bce062bac229c64b63f0aebae7553b8a5595fa0d4db53bb7a7a9b452a087967cd04547c SHA512 90dd0ae5d0376dafbce8b19d711d92ab9debceb467578f0e529881b219e8b3166fe5ec1f0b535036300a1e4a60d9969ba21450ca54b6f7e18f8631b035b8a4b8
 EBUILD mupdf-1.19.0.ebuild 4465 BLAKE2B 28283005cf1c4c688cf24544bedc20683d2e043221c74a3922e3f86b6affddbf8a0e62c8d79f8805bc5c5a508e999a57c4d212f6ec3f4b88036b512ea0251017 SHA512 ba83c50f6bca1cfcaabc7410f4fcfc842cdf8e4381ed7763af895cac78861f0f585069fd8b92d50bdc1e22baf30b56533a00b4ebfd8d0cb7515450c5f19eaf5b
 EBUILD mupdf-1.19.1.ebuild 4490 BLAKE2B cf556d6ba654118ccd0316fb75f2f970cb96990f254bf3c51aee44405ad2bab8bd3f5245f5d04fd4d713d8befd8a84b62632a757ae69396e5291ac6c8cb6b57b SHA512 b1ee92e6e10373980739bed7bffb1bd658d9b3830f82fcc2b3153c5296828a50b487164e686a69de31df6ea25aa6e0925b5ff5c997ec91a6cef1851a7bff76af
-EBUILD mupdf-1.20.0.ebuild 4756 BLAKE2B 81587e6f15b4183e46c01d95d424dff3bec6c18e53dd8b4b3138f620adf8b598fb773219d88fca3c968e70bcaa2055832b896af3165a6a9be7845ac459d4be56 SHA512 b837b64b10ca880527cf09fd91726ebd0a791ef312c2fb268e45272390720780e85ecacf479d1f80d5dba09de8845b7f2e3e0076c519b1d86f8e993157a29887
+EBUILD mupdf-1.20.0.ebuild 4750 BLAKE2B 9675a86e5f8bbf05933f49d422adb3d3d246953c7abe80eab58d75946265b4e5b4b17ed3e64098bc4fa5b1b0537884263ce50a084bf4f9109bd8f217212a2541 SHA512 591df3401dee953bb51499fb754e13127e32737dcbde3d924b02d713b1de8a7736e2c1bc123c24e5fb31a530a49c7a7eab0fc47ae8b9a22aea1206bb8df07989
 MISC metadata.xml 405 BLAKE2B 8b71db6f16bfb481e524a331eac615661b267d2d2fddde3aa6c9244b75026eacada167e2ed2ad6e7611bad234b53c0b073063925ae6745832585771d5342c913 SHA512 23f707e5ed833c5901d482e0d9cedbae751434311d8c67e7b300b452faabd958eb0c12a5b1c48a3c6d4773891cf3c7426d60a85eecd4b3ceb3358f68f4c8ad87
diff --git a/app-text/mupdf/mupdf-1.20.0.ebuild b/app-text/mupdf/mupdf-1.20.0.ebuild
index 447778adb9d5..c541f96f9cd6 100644
--- a/app-text/mupdf/mupdf-1.20.0.ebuild
+++ b/app-text/mupdf/mupdf-1.20.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86"
 IUSE="+javascript opengl ssl X"
 REQUIRED_USE="opengl? ( javascript )"
 
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 728507cdba40..6a8f5bf725d7 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/highway/Manifest b/dev-cpp/highway/Manifest
index 3f86f110b672..702c5c0d57dc 100644
--- a/dev-cpp/highway/Manifest
+++ b/dev-cpp/highway/Manifest
@@ -1,7 +1,9 @@
 AUX highway-0.16.0-fix-AVX512-detection-on-IceLakeClient.patch 569 BLAKE2B 89915c3fc3e934415026bbc8e19bd8d50b6e3e438f1942b0345832ae6067f7ffaf714d3b99efd3876c6774966cb0cdee05f1dc87788b37c072199d5c714cb937 SHA512 99333059c069f09c59281a7f464805eb41cc6da627dd11ac7dcc565fd688532f162776897ebf506c50e58f17dc7a9486214cc1ec683cb8b2c7efa8b767574410
 DIST highway-0.16.0.tar.gz 1639388 BLAKE2B 660b0079b25a12a2e982b4ba16147b923d167989a7dc1c0cb65ebe5219577f2f02c8774a554fd3fe9e1c10ef7b1cf5db747500bd8acf454e26952722f7b5ac9e SHA512 c08e66f43d9d0b307737b016cfa6c3d3a1df9bd528de435d193388104f34c264866c5ff0da633fc0a6f8c50f21df1ac653e9dd3f6fbfaf227d636411ac14cd47
 DIST highway-0.17.0.tar.gz 1694290 BLAKE2B 23ab48e11e8a79eb0469bb4fef7f32148ef6d2a266779a151345fc072213521f46828c2efcb4ab75823f977c619c7727fb064f05d6b3e0aa341698074e6b0e6a SHA512 7e55724c844a09a07cb981a7d8e913dcc5491e07d14ff3e7783a69060b0c470e7d5adc4f5dbeea526b3e109eea8cc9e80605d6b8d2da1b794382e56fd534ba06
+DIST highway-1.0.0.tar.gz 1723558 BLAKE2B f6580ca846aa659c80548e61daec0560dce335cd9c6c449df148398c97c0bafdf86e656a592903494d30de5ced8dcdf4be570b6009a2a5a5457b07f62e770e75 SHA512 19371a4771f4fcba82a125ed09544e2bbbd0d32af103881c8cfa41908a4fb4d6d5c536e1dcfb82628434622f31113a650259582c543275b704b45703805dc101
 EBUILD highway-0.16.0-r1.ebuild 935 BLAKE2B 8484a40941728da18999caf18af1726b9c40af9a4795e11964dcf2f3cd1a5c7bcea340154fc60cc52d9a5ce2ae0531e464b88a975542156b2e351f035e370918 SHA512 ef056830cc78222567662012d922833b027df578a557bfe64fb076cde91605a0a41b4a9fd08c11f87afcd19512471bada855841bd37ed794a7b5fd1d11fc00b2
 EBUILD highway-0.17.0.ebuild 862 BLAKE2B a0e9cef824f94f9f639d54ef4aa3ccb6a7369a74b3e8725df941a4688ecba172224ee7ea35aaf248bef8cce4d62e7688c1c245ccbf6989f7555adb1a76666d15 SHA512 8aedd21bb7bc30652a47eef5ba74ae467fe4c1d50227d5c366e254adb7b754a77a9c27e7b6ae696605ff96d3c0dbd5acf42dfddeed5eca401c7f0a182e3a7122
+EBUILD highway-1.0.0.ebuild 865 BLAKE2B bcfacafc475dd05cb21bc1f757cde7f83798be0e0836987ec5289aa8628c0588363de2117b4bd86c816bc5f948c416d767a1660b297e1b86c49c9f3de6b715c7 SHA512 b020595afa836c92fe12549746cbaed9952f6ee485f521d85bb7276088d651cc8d89acb8bcb6181077a0913329e6cc07560f3fb5dcfd1fc88c6fc44174d04b2d
 EBUILD highway-9999.ebuild 865 BLAKE2B bcfacafc475dd05cb21bc1f757cde7f83798be0e0836987ec5289aa8628c0588363de2117b4bd86c816bc5f948c416d767a1660b297e1b86c49c9f3de6b715c7 SHA512 b020595afa836c92fe12549746cbaed9952f6ee485f521d85bb7276088d651cc8d89acb8bcb6181077a0913329e6cc07560f3fb5dcfd1fc88c6fc44174d04b2d
 MISC metadata.xml 617 BLAKE2B 85392a8a226aa984039fed26796d0baf6bdb38da7084932e59ec6dcf882ba11863066adff2caffcb34b2b9f337b539c64498cf48c4eea43364ebf2522ea9971f SHA512 5ec72623048e7c940af745ca256671402dc2126004b2be29e01891619c119f847ba1ed72b99f66ee44b8076510833444f5c733a9724e1b9eb13bc58a125e16e4
diff --git a/dev-cpp/highway/highway-1.0.0.ebuild b/dev-cpp/highway/highway-1.0.0.ebuild
new file mode 100644
index 000000000000..89b07a85a587
--- /dev/null
+++ b/dev-cpp/highway/highway-1.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Performance-portable, length-agnostic SIMD with runtime dispatch"
+HOMEPAGE="https://github.com/google/highway"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/google/highway.git"
+else
+	SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
+
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DHWY_WARNINGS_ARE_ERRORS=OFF
+	)
+
+	use test && mycmakeargs+=( "-DHWY_SYSTEM_GTEST=ON" )
+
+	cmake_src_configure
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 12fd2d16ef8b..7da535a3bcd2 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest
index 1c9ee68dbf50..a44978ff5a44 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -3,6 +3,6 @@ AUX mysql-connector-c-8.0.22-always-build-decompress-utilities.patch 534 BLAKE2B
 AUX mysql-connector-c-8.0.27-add-OpenSSL-3.0.0-support.patch 11508 BLAKE2B 1fe2341c938ce580611bb1f2ded279d02d4f1130b719c43d0c70942e9954214cc4392b86a18dfd0f88082c6b72fdf270e076647dd1600d7ebb8eb437ca10bb64 SHA512 1b7b1bf471ad6cab6c86dbfb7f6ffe506e3d20a51efcc1df503a9d65976fedb8dbcd67993897241fc0dd9e1f7356670bf3ec80c5b7f66c9246a44b4aa3eee3cc
 AUX mysql-connector-c-8.0.27-res_n.patch 1635 BLAKE2B f75811958a6415bf45aa571a8da14c371500216a197602dec19b8b565bc219f98e8feb9bc660d81e32c4af7f39abb626af405d33a7f478617c8ee96c5b4453b8 SHA512 bb6315f0ac540d0723dffd9f8c2bdad9b9b1c0a3d706f80fd3bbdc9c7f276a8dda2754df94f6cb4ffecb0c3b0e65edc96c90b171eb0a4e5032fe6583e56ade85
 DIST mysql-boost-8.0.27.tar.gz 292184025 BLAKE2B 177209f3c62b0326ca9d021c751a701dec84c1b15c946ab0a68b1b4cf0620468eb3a1df77a918284007a0fde1aaa6a9767d0baed57936612813ef583df51c35e SHA512 6ef2426c0bee46bdf8e2fa5cb159d5ae19f0bed4f7c9bea9b33e0dd922b568c3c68ca063dcbcd7ea6904aaea31877c10064ea10b4bc63fb40d9f31778e3a7891
-EBUILD mysql-connector-c-8.0.27-r1.ebuild 3269 BLAKE2B 7dd57e4dfd1136904170b50ce3310063ca8283cb2b188d9b4a3025bd449d62f59db76d8f3f143c51c7882b2affce51b15caa2907d4d058ae3fdb9708bf05ff25 SHA512 a54b8fe93d921a2e67efcf638014584eb33ffe234ec6ea7164d59ec2dc575e08e18c40536561705121c7467c9f26a45933cd5d0fdfa4a102ef2287ea7ba375d8
+EBUILD mysql-connector-c-8.0.27-r1.ebuild 3266 BLAKE2B 34dc236b5a08f9baea91c131460b6dedee196baea60acf07b607fc70888c186869a4c839e6905b1f9a46da0b9543117d7a3314affa758e8f34098ceccdadfb6e SHA512 24a66ad5b675b283da39d7c87b7d2741a4781d8b1c33b1d6ac8e549e07d896ab3da6bacdadb9dc6af2401c6f8989f01b7f9664792f787c94d5ecb1245fc2606c
 EBUILD mysql-connector-c-8.0.27.ebuild 3222 BLAKE2B 3b8888fe231a27fd07f29ebe1fddabc215ccd9337af0b7f7b30cfab64f2c98b3af06d4840b19fb7a8dbe47fb3699bbfd7a2be39bf8d39ca9eb8d704e92eedc51 SHA512 60c9a2f43d481b51d1334dc92dc9f2f056efb8217f381503b8253ad8b54e570dda98f5b79c0b2ceb272a1b4de84157bbb14a99da3998bed428dce8196734d924
 MISC metadata.xml 240 BLAKE2B cc93ae4da8408b221c296e092d9db6ae3879754ade669d81c1218d53a5f007c6b7717bda6f92dbb0af38ff9b5e45f44e91503b12d3603d9955ec7d5a2a67399b SHA512 0f41c32ce3d736e061302252f14913d7425bc97e19d0c2f3b80c50637ab3521aa6cfc67f82e5f70f91174cddb36bb5622837dc18fd9db3bf75eb860359aade27
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild
index 7058ba6c50ed..14e1bb92ef6b 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 	S="${WORKDIR}/mysql-${PV}"
 fi
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index f045f046dfe8..b5d99c4b3311 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest
index 40ebca6945aa..8885b4e3a780 100644
--- a/dev-java/byte-buddy/Manifest
+++ b/dev-java/byte-buddy/Manifest
@@ -1,5 +1,7 @@
 DIST byte-buddy-1.12.10-sources.jar 1331398 BLAKE2B 8732ac81514de40d3d2ffd67ddca05ab9b8a5d0a7f240ee4591fd02b41f410f9e834f389aa898829fbae6082e14a090f87052f537b2b6293c7f8f98d4a5d0583 SHA512 15cb4330598d9259afa29aac0317f8e0e003eb76fb26052bba0714ad30453db721938be7d46fcc6a0c7bbe124bffe68dfee6fcf11a3e4030e99ef01d0ae3d461
 DIST byte-buddy-1.12.12.tar.gz 149937318 BLAKE2B 1a1bd0de97b47ace4c64649da3ae80dcb421a4d46e9b4f66e121accad94a99a2b81fa9aeaca99ae14cf1ef56feff5248d5700d6b056d490563bbc7ae9f07ace9 SHA512 bd8dc5b86ce456d5a907dd23643233bb001c15df5419aeed177d3b4f8054ab172d13244d0b3fef734e8232dfdd9339745d8112fa69e0be566b62459c198bf67a
+DIST byte-buddy-1.12.13.tar.gz 1721038 BLAKE2B 60aadbbb3b56e5ac2ecc2bb162653b769f4d4b913bd675457ce2fbf12a5777addc4beb2bb2e347d5956dbf1fbe6a6dfce078a29c53b1f1e2a60585670897d4ee SHA512 88c221d0dccb248683069070e498c5d4320f4fce059c45f460e04fbd86c2c596c18a4c7f4e9b3a0480eaf96d93593d1f1af87d894a7c4b3d73511e88a95f4e92
 EBUILD byte-buddy-1.12.10.ebuild 1375 BLAKE2B 3d215a54ae80086b7e1a3f1a523546131c3a24db57106d13ef3d7f010a78e6a316bd01e10619c3b00c5a8fea84cad6cd942bca132b5e5fee9716d4645655fb0f SHA512 8e299b9c4ca17244c695e69ea50e7e40dbe6ef3eae116363c080ca4c3d4cae01411a1af9eb253973be3b50c1d51d78eb33d2ecc5c518a6a93ff21b93ac8c7d22
 EBUILD byte-buddy-1.12.12.ebuild 6645 BLAKE2B 1c791641004695ae56721b0b34d190477fbb08bb0eadb2d5688d495f2f57bcf2ccb1d9ebba6d77a0efcd252bb00ae875f3b3398f047bd678e00c49e63f0360be SHA512 a47a9b13cc084e550255fa6cd5afe34f2c8ce6ad5312419d90fa917596e5ee61e99d4e5c9697b762683e2987a02e19eb99e5de2f44afc069a25a22b353ab6a02
+EBUILD byte-buddy-1.12.13.ebuild 4579 BLAKE2B a9b851edb04f778f5085c998900fd48480d239096e593f36808c0513f764df9fbf3c0f992115beba81abf4a97da9b82d3b5afed870da6ba98f2cf61c03a21468 SHA512 7edd44092b056245708a072c19207480a63234f6670a1241fc1d19d43499db42f99c696247ae16a489ffd5a6c09d6107c7039911490b326eb2bff20cccfd3eb5
 MISC metadata.xml 440 BLAKE2B ef73e69de33dc6bbea38c81b8744fad5ce4764644d9cc6168d7c0f175856e30c3a577ffc597f25f8caf26bacfd80663b55eddde047a346fcb582d883269233b9 SHA512 b27c92e768c2783c90c8b4693c3265a9533a09abe76b2b3bd54e3865d270eed91414fcd89513bc30feb0243ea21f63d354b907b74eb18e98f899811101a6c956
diff --git a/dev-java/byte-buddy/byte-buddy-1.12.13.ebuild b/dev-java/byte-buddy/byte-buddy-1.12.13.ebuild
new file mode 100644
index 000000000000..c5c66b0dfca9
--- /dev/null
+++ b/dev-java/byte-buddy/byte-buddy-1.12.13.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/raphw/byte-buddy/archive/byte-buddy-1.12.13.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-1.12.13.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="net.bytebuddy:byte-buddy-agent:1.12.13"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Offers convenience for attaching an agent to the local or a remote VM"
+HOMEPAGE="https://bytebuddy.net"
+SRC_URI="https://github.com/raphw/${PN}/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	dev-java/asm:9
+	dev-java/findbugs-annotations:0
+	dev-java/jna:4
+	dev-java/jsr305:0
+	test? (
+		dev-java/mockito:4
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_CLASSPATH_EXTRA="
+	asm-9
+	findbugs-annotations
+	jsr305
+	jna-4
+"
+
+src_prepare() {
+	default
+	# https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.12/byte-buddy-agent/pom.xml#L132-L165
+	cat > byte-buddy-agent/src/main/java/module-info.java <<-EOF
+		module net.bytebuddy.agent {
+			requires java.instrument;
+			requires static jdk.attach;
+			requires static com.sun.jna;
+			requires static com.sun.jna.platform;
+			requires java.base;
+			exports net.bytebuddy.agent;
+			exports net.bytebuddy.agent.utility.nullability;
+		}
+	EOF
+
+	sed \
+		-e 's:verifyZeroInteractions:verifyNoInteractions:g' \
+		-i byte-buddy-dep/src/test/java/net/bytebuddy/*.java \
+		-i byte-buddy-dep/src/test/java/net/bytebuddy/*/*Test.java \
+		-i byte-buddy-dep/src/test/java/net/bytebuddy/*/*/*Test.java \
+		-i byte-buddy-dep/src/test/java/net/bytebuddy/*/*/*/*Test.java \
+		-i byte-buddy-dep/src/test/java/net/bytebuddy/*/*/*/*/*Test.java \
+		|| die
+}
+
+src_compile() {
+	einfo "Compiling byte-buddy-agent.jar"
+	JAVA_SRC_DIR="byte-buddy-agent/src/main/java"
+	JAVA_RESOURCE_DIRS="byte-buddy-agent/src/main/resources"
+	JAVA_JAR_FILENAME="byte-buddy-agent.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-agent.jar"
+	rm -r target || die
+
+# For pkgdiff to compare the content of module-info.class
+#	mkdir -p META-INF/versions/9 || die
+#	cp target/classes/module-info.class META-INF/versions/9/ || die
+#	jar -uf byte-buddy.jar -C . META-INF/versions/9/module-info.class || die
+
+	einfo "Compiling byte-buddy-dep.jar"
+	JAVA_SRC_DIR="byte-buddy-dep/src/main/java"
+	JAVA_RESOURCE_DIRS=()
+	JAVA_JAR_FILENAME="byte-buddy-dep.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-dep.jar"
+	rm -r target || die
+
+	if use doc; then
+		einfo "Compiling javadocs"
+		JAVA_SRC_DIR=(
+			"byte-buddy-agent/src/main/java"
+			"byte-buddy-dep/src/main/java"
+		)
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_test() {
+	JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4"
+
+	# einfo "Setting -Djava.library.path"
+	# This would work only after manually adding libjnidispatch.so to /usr/share/jna-4/lib/jna.jar,
+	# done with ( jar -uf /usr/share/jna-4/lib/jna.jar -C . com/sun/jna/linux-x86-64/libjnidispatch )
+#	JAVA_TEST_EXTRA_ARGS=( -Djava.library.path+="$(java-config -i jna-4)" com.sun.jna.Native )
+	# Otherwise fails with:
+	# Exception in thread "main" java.lang.UnsatisfiedLinkError: Native library (com/sun/jna/linux-x86-64/libjnidispatch.so) not found in resource path
+
+	einfo "Testing byte-buddy-agent"
+	JAVA_TEST_SRC_DIR="byte-buddy-agent/src/test/java"
+	# Native library (com/sun/jna/linux-x86-64/libjnidispatch.so) not found in resource path
+	JAVA_TEST_EXCLUDES=(
+		net.bytebuddy.agent.VirtualMachineAttachmentTest
+	)
+	java-pkg-simple_src_test
+
+	einfo "Testing byte-buddy-dep"
+	JAVA_TEST_SRC_DIR="byte-buddy-dep/src/test/java"
+	JAVA_TEST_RESOURCE_DIRS=(
+		byte-buddy-dep/src/test/resources
+		byte-buddy-dep/src/test/precompiled*
+	)
+
+	# what "mvn test" does with java 17 is:
+	# Tests run: 9855, Failures: 0, Errors: 0, Skipped: 0
+	JAVA_TEST_EXCLUDES+=(
+		net.bytebuddy.pool.TypePoolDefaultMethodDescriptionTest	# 39 tests
+		# v1.12.13
+		net.bytebuddy.build.CachedReturnPluginTest	# 44 tests
+		net.bytebuddy.build.CachedReturnPluginOtherTest	# 4 tests 
+	)
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg_dojar "byte-buddy-agent.jar"
+	java-pkg_dojar "byte-buddy-dep.jar"
+
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+
+	if use source; then
+		java-pkg_dosrc "byte-buddy-agent/src/main/java/*"
+		java-pkg_dosrc "byte-buddy-dep/src/main/java/*"
+	fi
+}
diff --git a/dev-java/istack-commons-runtime/Manifest b/dev-java/istack-commons-runtime/Manifest
index 89c32c71ac35..bb87b5450c9d 100644
--- a/dev-java/istack-commons-runtime/Manifest
+++ b/dev-java/istack-commons-runtime/Manifest
@@ -1,3 +1,3 @@
 DIST jaxb-istack-commons-istack-commons-runtime-4.1.1.tar.gz 66161 BLAKE2B 07103ec616d23e14a5f61c4bb7ef9dce042f0df678db44f035b48c74eb7930f251d8b7fd8ce36c9bae7a7ef8ce213c62587dad2547518ba4638faf102ef651cd SHA512 b119b2c3582f5cbbd5793e0eb0a00c199c93119f3c18e34c57f8753b3a7008b9b93de58fd62df94d6cbedd698488616a80c334fda3d5038078e3858229f995cf
-EBUILD istack-commons-runtime-4.1.1-r1.ebuild 1572 BLAKE2B 56da8777f570ae2123101ea25869c161a6d3377ac34c10b1cd6586b473b8ef14e2e7de2e60304ceb74e83ffe949b83a37e0522b809d4688fd7a496d41fc132ca SHA512 c9db560d0b377c85f44a5b95cd225841f598102085a28ff5b6c5c82e12033197c1926b5086b9381df0a67c1a0363e4ee32006643ab1cae4ee6dd30a2452c0371
+EBUILD istack-commons-runtime-4.1.1-r1.ebuild 1570 BLAKE2B 529ef72f480b1aef3ef2b6fc9f935d868d6bdb4ba2031df34dc143123dc8f99a48a1a03fec90233e8f521c9ffd6edbb686a8c8f32749030cfd17df67ba5ee3e1 SHA512 1992e5db9ac255019bdb0337953706c0825230d1dd098339e914388e7846f4cb702ac4e3cc04b18bdbb76f33b6b050505a06ad10b69945cfdde02c4c86cb43da
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.ebuild b/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.ebuild
index 0d9371ac7cea..b0afba4a1024 100644
--- a/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.ebuild
+++ b/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jaxb-istack-commons/archive/${PV}.tar.g
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
 
 # Compile dependencies
 # POM: runtime/pom.xml
diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest
index 43c0d5b2f560..f51595f56524 100644
--- a/dev-java/java-service-wrapper/Manifest
+++ b/dev-java/java-service-wrapper/Manifest
@@ -4,5 +4,5 @@ AUX java-service-wrapper-3.5.25-testsuite.patch 463 BLAKE2B aa5f7e4e298265afd227
 DIST wrapper_3.5.25_src.tar.gz 556678 BLAKE2B bead95eb2feebe0c22f8c66ca948185c320a979e498fb5156de576d443ba6e3375efb6244a66db6af101fa7dc459d983b51631fc237ad4578505be47059cf2c7 SHA512 4ce8ab5dc7acc4d78e7b902a61bb1e3785b5455f81438aa61a877107647e88ade595075ff0b8d5db0ff2b33bb94d70c2b1331561d6d282e497998eea9494c6f4
 DIST wrapper_3.5.50_src.tar.gz 779253 BLAKE2B 64863e408c2147014946f869bbd98775d1d23d4cd63ef562167f40191febf87cc72697a55fe2ec6a5d085f3df4897cc4485f4ed88a3ee3a7f7930215448972f7 SHA512 403deec1bcc70a93ce0b0749bf2d5bc27a4a540d07785bc3ac83b38257cc5e8247a784f646770c96ac318f22d30c463dafb2f002720041b93443b292d6669c09
 EBUILD java-service-wrapper-3.5.25-r2.ebuild 1407 BLAKE2B e05a6930c0ee852a43df15a7cadc1011663ab8db7849e45461a3d0fd1db43b379e254f1fcae482451a85c067eed0c851fe923c7dbd0c6785cb3adce9d92b9953 SHA512 60b08f6ce759bb8a724b1c50d5dd1e5aa8ca76ce95602dfae7c21d6567d9ff9719d5528e0d715842158f2f2f7c4f3147b7f646247cd4538e42eb0954ae98c705
-EBUILD java-service-wrapper-3.5.50.ebuild 2104 BLAKE2B ead9a776dd653f65c14088739a3e57e39cf442a785106ece1b021d53c5a58e8ee732b5d204897c157656d136dd2bb50e56795d8b309122bb1ff10f103c3829bf SHA512 92555ad47e803b6fd34f3a7de0f1e6bc8bbddb904f8615f64a7f0209fc14bbed43ed3a34a906b2678cbb696140d158053fc6146e8c1c07ae3049d9b8f0f8f75a
+EBUILD java-service-wrapper-3.5.50.ebuild 2303 BLAKE2B 2e76891b2b8e64ea7ed6d4a0b62a255c8ba85082ff3a16c825e201d7fc8a26cff16e0efee0488684e51b9839a89ddd9af118dc57805e8b17eedb14160d49c6d8 SHA512 d2ba915f2f835d66be165f6abf786ab00e4f7afca6408faa1bde38ec2ca29912ac14abbfc877db09fca5a3b454b2db6cea382af023951efd88aaaa03a15ff4aa
 MISC metadata.xml 640 BLAKE2B 1ced5abe1a0ff9b141f3a6020cd6352b02cf228524b694f36bedb7ef91a892ee471235b36e81e03fbe98eee6f28f680821b15501447b58c8788129eaf8e6b39a SHA512 4d9eb54f0328aa00380b40a0ead3fc43e552b71e8d4b5279341d5249a9615c3c161ca19295d6f586c43708f9e29aaf3799799243dd277c8822b95d7c1f82afd1
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
index 149e25fdc514..40ab4cf7bcbd 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
@@ -47,7 +47,11 @@ src_prepare() {
 	cp "${S}/src/c/Makefile-linux-armel-32.make" "${S}/src/c/Makefile-linux-arm-32.make"
 	java-pkg-2_src_prepare
 
-	# enable tests on all platforms
+	# disable tests by default (they are only enabled by default on amd64)
+	sed -e "s/\(all: init wrapper libwrapper.so\) testsuite/\1/g" \
+		-i src/c/Makefile-linux-x86-64.make || die
+
+	# re-enable tests on all platforms if requested
 	if use test; then
 		grep "testsuite_SOURCE" "src/c/Makefile-linux-x86-64.make" | tee -a src/c/Makefile-*.make
 		assert
diff --git a/dev-java/log4j-core/Manifest b/dev-java/log4j-core/Manifest
index 0434fe7d4e31..08e41750cf4d 100644
--- a/dev-java/log4j-core/Manifest
+++ b/dev-java/log4j-core/Manifest
@@ -1,5 +1,6 @@
 DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176
 DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b
 EBUILD log4j-core-2.17.2-r1.ebuild 8550 BLAKE2B d60dca70b9c62de3320543df7313ae3f1c523107f60e0a99ffaa48872058fe79054b2486936a394b665915af52464c77c83226159d7acdc42f7f703473745938 SHA512 5edfa502777e147684afc7b804b77ab7ba3c602ced5b04f501e8ce0b86f7cdb873821cff64eebdddbf44485d6c7c1d112b73a16bd0f26829bab50c06844d20b2
+EBUILD log4j-core-2.18.0-r1.ebuild 8531 BLAKE2B 9ca4ab440893e5658918c44f3c619764ccaeb9d1a5242a0a4670d0e2c4ba526b2e3793c11f59de34232b155f31d40d7e7f13530e37240beb51209b7a79d62911 SHA512 1ee8e743329fe801a4a927c3d334c30e2cb55dbbd85f2794084daf078895c0eb2a4bc5f659f2cd312752b2578f07125680f1a9381bf43040be04a46a7e854f3f
 EBUILD log4j-core-2.18.0.ebuild 8536 BLAKE2B 63be3499494c1a1066db363605a3fb4c8172c0ff9bc94cddc2275769649045c1c4dbed2994a3a8ff979bdb3186d1aecfd26fc70b40d04c1769e08c7e8a826a72 SHA512 792238501eb6d61e348701180a3d7f3d25487a2546967a315bb1d10856f102359ef9ab62e1955a88295b91f265ad078e181c368badc21a3b3246047d466a722f
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-core/log4j-core-2.18.0-r1.ebuild b/dev-java/log4j-core/log4j-core-2.18.0-r1.ebuild
new file mode 100644
index 000000000000..139a53d77109
--- /dev/null
+++ b/dev-java/log4j-core/log4j-core-2.18.0-r1.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom log4j-core/pom.xml --download-uri mirror://apache/logging/log4j/2.18.0/apache-log4j-2.18.0-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-core-2.18.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.logging.log4j:log4j-core:2.18.0"
+# JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The Apache Log4j Implementation"
+HOMEPAGE="https://logging.apache.org/log4j/2.x/"
+SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# We don't have junit-vintage and junit-jupiter
+RESTRICT="test"
+
+# Common dependencies
+# POM: ${PN}/pom.xml
+# com.conversantmedia:disruptor:1.2.15 -> >=dev-java/conversant-disruptor-1.2.19:0
+# com.fasterxml.jackson.core:jackson-core:2.13.3 -> >=dev-java/jackson-core-2.13.3:0
+# com.fasterxml.jackson.core:jackson-databind:2.13.3 -> >=dev-java/jackson-databind-2.13.3:0
+# com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.3 -> >=dev-java/jackson-dataformat-xml-2.13.3:0
+# com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.3 -> >=dev-java/jackson-dataformat-yaml-2.13.3:0
+# com.fasterxml.woodstox:woodstox-core:6.2.8 -> >=dev-java/woodstox-core-6.2.8:0
+# com.lmax:disruptor:3.4.4 -> >=dev-java/lmax-disruptor-3.4.4:0
+# org.apache.commons:commons-compress:1.21 -> >=dev-java/commons-compress-1.21:0
+# org.apache.commons:commons-csv:1.9.0 -> >=dev-java/commons-csv-1.9.0:0
+# org.apache.kafka:kafka-clients:1.1.1 -> >=dev-java/kafka-clients-1.1.1:0
+# org.apache.logging.log4j:log4j-api:2.18.0 -> >=dev-java/log4j-api-2.18.0:2
+# org.fusesource.jansi:jansi:2.4.0 -> >=dev-java/jansi-2.4.0:2
+# org.jctools:jctools-core:3.3.0 -> !!!suitable-mavenVersion-not-found!!!
+# org.slf4j:slf4j-api:1.7.36 -> >=dev-java/slf4j-api-1.7.36:0
+# org.zeromq:jeromq:0.5.2 -> >=dev-java/jeromq-0.5.2:0
+
+CP_DEPEND="
+	dev-java/commons-compress:0
+	dev-java/commons-csv:0
+	dev-java/conversant-disruptor:0
+	dev-java/jackson-core:0
+	dev-java/jackson-databind:0
+	dev-java/jackson-dataformat-xml:0
+	dev-java/jackson-dataformat-yaml:0
+	dev-java/jansi:2
+	dev-java/javax-mail:0
+	dev-java/jctools-core:3
+	dev-java/jeromq:0
+	dev-java/kafka-clients:0
+	dev-java/lmax-disruptor:0
+	~dev-java/log4j-api-${PV}:2
+	dev-java/slf4j-api:0
+	dev-java/woodstox-core:0
+"
+
+# Compile dependencies
+# POM: ${PN}/pom.xml
+# javax.activation:javax.activation-api:1.2.0 -> !!!groupId-not-found!!!
+# javax.jms:javax.jms-api:2.0.1 -> !!!groupId-not-found!!!
+# javax.mail:javax.mail-api:1.6.2 -> !!!groupId-not-found!!!
+# org.osgi:org.osgi.core:6.0.0 -> >=dev-java/osgi-core-8.0.0:0
+# POM: ${PN}/pom.xml
+# test? ch.qos.logback:logback-classic:1.2.11 -> >=dev-java/logback-classic-1.2.11:0
+# test? ch.qos.logback:logback-core:1.2.11 -> >=dev-java/logback-core-1.2.11:0
+# test? com.github.tomakehurst:wiremock:2.26.3 -> !!!groupId-not-found!!!
+# test? com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0 -> !!!groupId-not-found!!!
+# test? com.h2database:h2:2.1.214 -> !!!groupId-not-found!!!
+# test? commons-codec:commons-codec:1.15 -> >=dev-java/commons-codec-1.15:0
+# test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
+# test? commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
+# test? net.javacrumbs.json-unit:json-unit:2.32.0 -> !!!groupId-not-found!!!
+# test? org.apache-extras.beanshell:bsh:2.0b6 -> >=dev-java/bsh-2.0_beta6:0
+# test? org.apache.activemq:activemq-broker:5.17.1 -> !!!groupId-not-found!!!
+# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
+# test? org.apache.felix:org.apache.felix.framework:7.0.5 -> !!!groupId-not-found!!!
+# test? org.apache.logging.log4j:log4j-api:2.18.0 -> >=dev-java/log4j-api-2.18.0:2
+# test? org.apache.maven:maven-core:3.8.5 -> !!!groupId-not-found!!!
+# test? org.awaitility:awaitility:4.2.0 -> !!!groupId-not-found!!!
+# test? org.codehaus.groovy:groovy-dateutil:3.0.10 -> !!!groupId-not-found!!!
+# test? org.codehaus.groovy:groovy-jsr223:3.0.10 -> !!!groupId-not-found!!!
+# test? org.codehaus.plexus:plexus-utils:3.4.2 -> !!!groupId-not-found!!!
+# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
+# test? org.hamcrest:hamcrest:2.2 -> >=dev-java/hamcrest-2.2:0
+# test? org.hsqldb:hsqldb:2.5.2 -> !!!groupId-not-found!!!
+# test? org.jmdns:jmdns:3.5.7 -> !!!groupId-not-found!!!
+# test? org.junit-pioneer:junit-pioneer:1.6.2 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-params:5.8.2 -> !!!groupId-not-found!!!
+# test? org.junit.platform:junit-platform-commons:1.8.2 -> !!!groupId-not-found!!!
+# test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!!
+# test? org.mockito:mockito-core:4.4.0 -> >=dev-java/mockito-4.4.0:4
+# test? org.mockito:mockito-junit-jupiter:4.4.0 -> !!!artifactId-not-found!!!
+# test? org.slf4j:slf4j-ext:1.7.36 -> >=dev-java/slf4j-ext-1.7.36:0
+# test? org.springframework:spring-test:5.3.20 -> !!!groupId-not-found!!!
+# test? org.tukaani:xz:1.9 -> >=dev-java/xz-java-1.9:0
+# test? org.xmlunit:xmlunit-core:2.9.0 -> !!!groupId-not-found!!!
+# test? org.xmlunit:xmlunit-matchers:2.9.0 -> !!!groupId-not-found!!!
+# test? org.zapodot:embedded-ldap-junit:0.8.1 -> !!!groupId-not-found!!!
+
+DEPEND="${CP_DEPEND}
+	dev-java/jakarta-activation-api:1
+	dev-java/jakarta-mail-api:0
+	dev-java/javax-jms-api:0
+	dev-java/osgi-core:0
+	>=virtual/jdk-1.8:*"
+#	test? (
+#		!!!artifactId-not-found!!!
+#		!!!groupId-not-found!!!
+#		>=dev-java/bsh-2.0_beta6:0
+#		>=dev-java/commons-codec-1.15:0
+#		>=dev-java/commons-io-2.11.0:1
+#		>=dev-java/commons-lang-3.12.0:3.6
+#		>=dev-java/commons-logging-1.2:0
+#		>=dev-java/hamcrest-2.2:0
+#		>=dev-java/log4j-api-2.18.0:2
+#		>=dev-java/logback-classic-1.2.11:0
+#		>=dev-java/logback-core-1.2.11:0
+#		>=dev-java/mockito-4.4.0:4
+#		>=dev-java/slf4j-ext-1.7.36:0
+#		>=dev-java/xz-java-1.9:0
+#	)
+#"
+
+# Runtime dependencies
+# POM: ${PN}/pom.xml
+# com.sun.mail:javax.mail:1.6.2 -> !!!artifactId-not-found!!!
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md )
+
+S="${WORKDIR}/apache-log4j-${PV}-src"
+
+JAVA_CLASSPATH_EXTRA="jakarta-activation-api-1,jakarta-mail-api,javax-jms-api,osgi-core"
+JAVA_SRC_DIR="${PN}/src/main/java"
+JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
+
+#JAVA_TEST_GENTOO_CLASSPATH="logback-classic,logback-core,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,commons-codec,commons-io-1,commons-logging,!!!groupId-not-found!!!,bsh,!!!groupId-not-found!!!,commons-lang-3.6,!!!groupId-not-found!!!,log4j-api-2,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,hamcrest,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,mockito-4,!!!artifactId-not-found!!!,slf4j-ext,!!!groupId-not-found!!!,xz-java,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
+#JAVA_TEST_SRC_DIR="${PN}/src/test/java"
+#JAVA_TEST_RESOURCE_DIRS=(
+#	"${PN}/src/test/resources"
+#)
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	# Process the @Plugin annotation used on Log4j 2 built-in plugins
+	# to generate a serialized plugin listing file
+	# https://logging.apache.org/log4j/2.x/manual/plugins.html
+	local processor="org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor"
+	local classes="target/classes"
+	local classpath="${JAVA_JAR_FILENAME}:$(\
+		java-pkg_getjars --build-only --with-dependencies \
+		"${JAVA_GENTOO_CLASSPATH},${JAVA_CLASSPATH_EXTRA}")"
+	# Just in case java-pkg-simple.eclass changes the path in the future
+	mkdir -p "${classes}" || die "Failed to create directory for classes"
+	local sources_list_file="${T}/sources.lst"
+	find "${JAVA_SRC_DIR}" -type f -name "*.java" > "${sources_list_file}" || die
+	ejavac -d "${classes}" -cp "${classpath}" \
+		-proc:only -processor "${processor}" \
+		@"${sources_list_file}"
+	# Update the JAR to include the serialized plugin listing file
+	local jar="$(java-config -j)"
+	"${jar}" -uf "${JAVA_JAR_FILENAME}" -C "${classes}" . ||
+		die "Failed to update JAR"
+}
diff --git a/dev-java/snappy/Manifest b/dev-java/snappy/Manifest
index bd6d8353499c..2ed62ab87ca0 100644
--- a/dev-java/snappy/Manifest
+++ b/dev-java/snappy/Manifest
@@ -5,5 +5,6 @@ AUX 1.1.7.8-unbundle-bitshuffle.patch 1006 BLAKE2B 99b88fd2af02ff6d95d90ec2e3025
 AUX 1.1.7.8-unbundle-snappy.patch 1820 BLAKE2B ec2f5724675cef1a796678f5b12ccd4b49c2415fcfd98e2a3f9214bb63477bfd9bed93999c2f12b2f0e8b5aedb705299bf37e52a16833797a745bf4e1eeecdd9 SHA512 408c09f01cb65dcf17b7ecd5542cd622b6296ab6d433be79ff2a8d03dc4e8f8b9c48165d95afa0b865c8ab196c4470e93f5b07e9eeded1f492d1ef2d8d91fa82
 AUX 1.x-build.xml 8496 BLAKE2B 0ab98a4149d0d7b294efec29374c59af8599362fa40d04737d50d1106157d8e604e17ce06c9180c2d9ca2b612cb5d025a111fe620739f7109a0c384ae940d4dc SHA512 ed47379879bab5cbaa4111616c3cca526725e4fa3d8d42da72d19a21738cc42826e37756a181e6d541f27aa4abe7f2353be90c51f4d89d04413501e6ccdb4cb0
 DIST snappy-java-1.1.7.8.tar.gz 3558859 BLAKE2B 871f4190212399c5bd34a72766d7f3abca9a09608d9acddc126905bcdafc723613aa33d0cdb59419e6bfba46ff27e91f5ca5382073dd895d5601f6d84929ef96 SHA512 8129d4ae2abd78f967c07e7f13df8cb9043cc34bd8346be28625a3d2bea06674ce6dd09b521af2b7053b25d0132a0e822b78c06e09bacd0067ba8178bd167691
+EBUILD snappy-1.1.7.8-r1.ebuild 2565 BLAKE2B 331d3ad9a56c7991efb5d839a6f4f84d60c4e1d9ca8e6a092012fee5f05ee5aa30e60580161c966e09e21c897326e2252857cf976d99d2678c235af59b576352 SHA512 19d5edc0d2ca972c3b3f865a155e38b676d06a827174ea94ea9c4dc1ff603d153671f6700b685b4dc89c28d44c9a5097c3226cd268da776a9e67717833ab96e0
 EBUILD snappy-1.1.7.8.ebuild 2569 BLAKE2B 5744632d7f2d1931790e0b5ef481444653eb3711e4311688f6cda071b9b2f339d2743e8f0a2cd299ba93164e8c1e135110c315256f3b6b0330ce721dd2964b89 SHA512 f274294167f77a7f9c96868117c4ee75f1e0fa062bbab9027f12bf98333fcb0bf6ae7bb0e5692bfba0193ce423598674bc6b982bbb700e3255ce557d4c7c6572
 MISC metadata.xml 320 BLAKE2B 5e3039edeec0b66e6b896158777909fdfed881f06def61b5e3424baeb51ea898cb3cb273e6ddc939b7efea88860a945b5f29da513be22ee6b601551a6e02170a SHA512 c2e9282ce950b419588d080145e85e63e6491500edce141678a4aaae65a43d945694ad992dd4d485c94748e26ac225e58177fcff11db3430035b837741ec45af
diff --git a/dev-java/snappy/snappy-1.1.7.8-r1.ebuild b/dev-java/snappy/snappy-1.1.7.8-r1.ebuild
new file mode 100644
index 000000000000..a0190bc964ba
--- /dev/null
+++ b/dev-java/snappy/snappy-1.1.7.8-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.xerial.snappy:snappy-java:1.1.7.8"
+
+inherit java-pkg-2 java-ant-2 toolchain-funcs
+
+MY_PN="${PN}-java"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Snappy compressor/decompressor for Java"
+HOMEPAGE="https://github.com/xerial/snappy-java/"
+SRC_URI="https://github.com/xerial/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Tests require org.apache.hadoop:hadoop-common:2.7.*, which is yet to be
+# packaged.  Some extra steps are required before running the tests:
+# 1. Download hadoop-common 2.7.x from https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-common
+# 2. Set EANT_GENTOO_CLASSPATH_EXTRA to the path to hadoop-common-2.7.*.jar
+# 3. Set ALLOW_TEST="all"
+RESTRICT="test"
+
+CDEPEND="dev-java/osgi-core:0
+	app-arch/snappy
+	dev-libs/bitshuffle"
+
+DEPEND=">=virtual/jdk-1.8:*
+	${CDEPEND}
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/commons-io:1
+		dev-java/commons-lang:2.1
+		dev-java/plexus-classworlds:0
+		dev-java/xerial-core:0
+	)"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
+EANT_GENTOO_CLASSPATH="osgi-core"
+EANT_TEST_GENTOO_CLASSPATH="
+	${EANT_GENTOO_CLASSPATH}
+	commons-io-1
+	commons-lang-2.1
+	plexus-classworlds
+	xerial-core
+"
+
+src_prepare() {
+	cp "${FILESDIR}/1.x-build.xml" build.xml || die
+	rm -r src/main/resources/org/xerial/snappy/native || die
+	eapply "${FILESDIR}/${PV}-java-version-target.patch"
+	eapply "${FILESDIR}/${PV}-remove-perl-usage.patch"
+	eapply "${FILESDIR}/${PV}-unbundle-snappy.patch"
+	eapply "${FILESDIR}/${PV}-unbundle-bitshuffle.patch"
+	eapply "${FILESDIR}/${PV}-gentoo.patch"
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	emake \
+		CXX="$(tc-getCXX)" \
+		JAVA_SOURCE="$(java-pkg_get-source)" \
+		JAVA_TARGET="$(java-pkg_get-target)"
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	cp -r src/test/resources/org/xerial/snappy/* \
+		src/test/java/org/xerial/snappy || die
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local jniext=.so
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		jniext=.jnilib
+		# avoid install_name check failure
+		install_name_tool -id "@loader_path/libsnappyjava${jniext}" \
+			"target/libsnappyjava${jniext}"
+	fi
+	java-pkg_doso "target/libsnappyjava${jniext}"
+	java-pkg_dojar "target/${PN}.jar"
+
+	use source && java-pkg_dosrc src/main/java/*
+	use doc && java-pkg_dojavadoc target/site/apidocs
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 6deb5cdc4fd5..22f3237a0ec7 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 6cfa87dfcf6e..25734ec7c140 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -20,26 +20,32 @@ DIST python-gentoo-patches-2.7.18_p15.tar.xz 34956 BLAKE2B d173f276dd9c0ce31004d
 DIST python-gentoo-patches-3.10.5.tar.xz 8584 BLAKE2B d4a812a33e485b1eae5629e519dca4dc6625b743b07c7f7bbc62562f345d87723ba499893702310b1e96e443d2946e27a8d4971f32ca1125d4827d0d594ccaa6 SHA512 77f0478f7d0491e103857a83a97d6e04a9ec68740a7f9357cbbdd316462e7d98ea8236bd05a30e7556457ece5fbcfa4a7a78a25d4eb12779455ce2bb5b6f30d0
 DIST python-gentoo-patches-3.10.6.tar.xz 8580 BLAKE2B 4ff3839be2f6bf172acdca22bbded702804809d6334e088190cee4ae4c61e25580a3bdc105bfe27b7f3c3b5f219d363cdca21ef895a3e91f13515afb348a77a0 SHA512 c58a85f7c48a4e822527411a6e0618be5408e1a82fe72b21a254dac77b4e5d4b01ac24cf70dc277cd16ccdc8499a9fa53b7cebae3b9f8facc9c978adcc8a2876
 DIST python-gentoo-patches-3.10.6_p1.tar.xz 10592 BLAKE2B 0b0f54faf93e3b6a3ba5ae5fef01ff4adbb1560e3d5c0c8e7d69d80e2e10b15e7fc7f5471f82d5322c86a1eec762f10cda6e8ea650c993481342cda06a47a863 SHA512 c4a2ff7d16042729f5a23222d154bc0832f51b7ab5b1dafe4a6c6bd40b037c85a6d40d07516c1207cd0bc9a233865700d7cca4b01ed27a1f21516392992bc6eb
+DIST python-gentoo-patches-3.10.6_p2.tar.xz 12040 BLAKE2B 75c93fab19137a966b3775308bc20142f4d3648bbb9364e82c4eaffae93beda54011192881c52b85d2e2493a06cfe2a90f50675609908c3d5ebdb0103fe41644 SHA512 7e451a8a18a62592c2cd7b2db71065b77256960f43e172a0d7856b22b69138dcb1552f53b39bec14585a761cfe729c81613551c1b616fe1ec8d2b59856b11453
 DIST python-gentoo-patches-3.11.0b4.tar.xz 4388 BLAKE2B 16b112f1ecdce86022ed64d7c7007fb323b7bd4497b5802a48bb0a86667c282d1a9150d744f44cefbe9321af4916d35941707c1259a0cf175c0161c8e1b17e97 SHA512 f9c8c7180da20e839a0862571b9077b2702dbee8a1acd55ebb11329912cf9f81862ba615be484b92d39461c3eb6c38890f8d58bcbce2c4722418a967faedc1f5
 DIST python-gentoo-patches-3.11.0b5.tar.xz 4384 BLAKE2B b036e9103f8315d6e2bb6e85a2db12ec60f8e05ccff083183f24c0b4ba16c807a2eb1fa43b88f8d7a253d5bbeef0880b31d60e13b449f7de992156319753ef33 SHA512 af6315f97b0f2463d6c0f18a99a5ff5f96c3d18567ae0d73461f0fc82ca2173a8f6c3fedc2fada2b9460547a457d4264bc2acb90f1906599229afe85bcc2afde
 DIST python-gentoo-patches-3.11.0rc1.tar.xz 4384 BLAKE2B 31bcdc055bfaf3434dbb02543aaf66910eaccd01808d9a0e57bf7cb3b097fc0046c00ac44737d9c37e3b6d074c524f4dd3ab439a741e66d74a0425889ecaead5 SHA512 05b044e2d8f881c471528600ee300bfd9cf5160609dfb3d7cbdb8e43f47b681542582a85de97e28e6a3b89a3fb6c8d7398e029d31e20cea9c5a2a71700382d4e
 DIST python-gentoo-patches-3.8.13_p2.tar.xz 18816 BLAKE2B 8612ca33e5569319c5d1a5a3fb1a81e860bd515bfde656b79f087ccf7020923fbd06b315178bef8630e4c36bb22c27299fe439aadc6a161f1ec93be8778314ee SHA512 be5668a0a4be0a03e61466436973125a3be4f33a61524e4a5c8d86745727cfcae59e5048477887c9f6bfc09727f3aef3652ad47a13a6bf0f1452d3172f1c34dc
 DIST python-gentoo-patches-3.8.13_p4.tar.xz 23084 BLAKE2B 44be6b19275189bd04c9dcd3c4be4f4b8f92a0003710a12a12d60c0ab182942993a76d8d7f26b289cd0a4226eeeb9a39723822dfb896307fd6e75d6980c3898e SHA512 b78a39a15d361aed4ce887b4726c7967c09c0ee3add614f1dbca24b6f301bd20660fe074c03a58b325f8720ad853c109b334e41102de0b6cc362c467fb669feb
 DIST python-gentoo-patches-3.8.13_p5.tar.xz 26620 BLAKE2B 24d05e3f46acf339d2e1d0d86efdb6b61719c09aba08879397df6ed40ce41a5bae892f3677bbafe694b4ced5b469a81c27c4002c1de271565a6cd413e627ae7c SHA512 d18d4e6a5fc10990e9ce1cdda311016e9486d6aa90ad73bcd6e306ffe89ca180ae81a905b3b8d94569e0834103e77d5fffea34238b7aeaec8aeeeaf04fb2f72b
+DIST python-gentoo-patches-3.8.13_p6.tar.xz 27968 BLAKE2B 0cafbdfed47e0d58a9798c1e090abb17428472f769ebe4125cf1210218b90bcfd2ad8790fafbfdc1daccc51078a6bf5e068157f05151c2283eb80d5fe128d85c SHA512 b23d51478cc126a6f7f3d1d6d2302a13f3e873a3fac19c7b2b86b79f4b25bd421b60e5ecbe9bb606ee0eedc0e6871d20c0befd1b6596b525bf6ef79a19230ae2
 DIST python-gentoo-patches-3.9.13.tar.xz 12836 BLAKE2B ba687a3d6e00baf4d9640ab78a29c3e21bf1872b5019198991521cf37bb0780f592db742ee4fdfe6bfb1cab1c1f6587889dfdb024cae72766b6c83c2ffe319be SHA512 e393992ff92625771c6ffeb500637862f0163c689c685fd245a6e5bbdd3128154ce439ecab56eaf1359e67ea0d173dfb19f65a4098ea2266922bfb43aba517dc
 DIST python-gentoo-patches-3.9.13_p1.tar.xz 17036 BLAKE2B baf534d002c610426f9f183f53b935d83a4cf084834d3946986baa5d983e8197719b1d3e8568cc7f78a6aaa95b084dd8796e8539169415e19f2d9eb8f296242a SHA512 c7eb503defcc5e91d5de39eed84aeba748f96ef28f0d9ae3b3a98f111543d09311f51ae4fe321ec5f397c5f46dc8c715ecc401124f4e4a94c9fe8e2a6db9e052
 DIST python-gentoo-patches-3.9.13_p2.tar.xz 20708 BLAKE2B e86a80405683228211ea763523e71aa130f716a19d4e343ec46d1d428804cd59d07cdad0efea09b09d92139bdec93f40f7667db20240b89ed3a7a6bb46b0981f SHA512 1e9f84d0cde9a251e191b3784ec551a307572e779350e7d20ace0164f6cbc47b883632ebc32638a8f5f16f9c0d618a13d9105ef471657a9745bc6a09bf1d13d9
+DIST python-gentoo-patches-3.9.13_p4.tar.xz 22072 BLAKE2B a0e084eff35d075d2255b139d0db114d282cb6c9c0c2ea51a8ecb7f5f1dc8096d6578ae5f804b7583a2b7842152b5723ad802ca816d46813c40aaa756118afc8 SHA512 cdf8d43fd5263c4956be234f36c0767215ab2495705d4f2a060b32ecbfbe159e618e31693b0538a1b970f7b27ebe4953063f585930d074dcaf59f2f61486e6b6
 EBUILD python-2.7.18_p15.ebuild 9827 BLAKE2B 77ebeacfa236e518ec0c0a791e0da60f8158d369e870c88ce69d1eef25cdc99e658903abf313452b849254e97b4c9f583e0edb75ec845faf5b47fb2fc3173ce4 SHA512 19219cd43391d8d53838c9b0e15b30f8ccb5d5a23503a213cc961ff2fa545cd17a5ecc6ce253e2a01534db3bc931be212969c40885c2e99f203c23a5ecb689a1
 EBUILD python-3.10.5.ebuild 11701 BLAKE2B e83015ffd3bdcbceab4271ed82f6ee54d8b79494458a51ff46221ecfd1f39319fd00ad4d27471c73ef2fab3a3468b587138f9dd3d431ebf8192f31789c9d58f0 SHA512 fe2a00f53699a0ea809d891b66e0c1973402e8a504dc45bb67f57d1549b3809c2f894cb27264d8d8f35071c5fc967cb43c6250382e2627ec4197635d7f91a023
 EBUILD python-3.10.6.ebuild 11189 BLAKE2B b50f71bbb9b5a72724f52193aa114fc7ec4ceef3559649964899f9aec4911726503ab24ec4c07b53d2f15ba498844913d3618832763e9b3728d8f9303a97a3ea SHA512 2a09997fa8f451ab873bd039f47a7f4c1a146befb43c8b56467ea9fd93f61e7d55a90ef289804aa6d15c9e5ebc5fded62879eec8dccd528ab25e4df8d39e63a8
 EBUILD python-3.10.6_p1.ebuild 11189 BLAKE2B b50f71bbb9b5a72724f52193aa114fc7ec4ceef3559649964899f9aec4911726503ab24ec4c07b53d2f15ba498844913d3618832763e9b3728d8f9303a97a3ea SHA512 2a09997fa8f451ab873bd039f47a7f4c1a146befb43c8b56467ea9fd93f61e7d55a90ef289804aa6d15c9e5ebc5fded62879eec8dccd528ab25e4df8d39e63a8
+EBUILD python-3.10.6_p2.ebuild 11189 BLAKE2B b50f71bbb9b5a72724f52193aa114fc7ec4ceef3559649964899f9aec4911726503ab24ec4c07b53d2f15ba498844913d3618832763e9b3728d8f9303a97a3ea SHA512 2a09997fa8f451ab873bd039f47a7f4c1a146befb43c8b56467ea9fd93f61e7d55a90ef289804aa6d15c9e5ebc5fded62879eec8dccd528ab25e4df8d39e63a8
 EBUILD python-3.11.0_beta4-r2.ebuild 13637 BLAKE2B 230701d089c7e42f80b0666a1ac6c5d48ff6fe8a5b7822ee3d4cd41adfe6e50143ecde143e228416f97cc0886910b22bc0fbb83ffad3ad19006aebcc382516fc SHA512 ec7a302106654abefb0672e25e1f189506d35111be4a983ae5b51281bd195a452fe1fb7170b77f8048c880563664f8b9b3624c434594a4f3b36306a203e299e9
 EBUILD python-3.11.0_beta5-r1.ebuild 13385 BLAKE2B 00d7c1d17bd8ad3acebfde6907fc27f77abc91a25f3d3e576bb6895c46f7cae88a8cd6dcf883dc3d91d0fba36349f3b209a512fff70cf4ff950a7f52d3e7d548 SHA512 56442b0cd0b7789c30d180b07e2e77b3203720e66084340cc85923410d54ca2ff40ce9096af844cde217f44bbd4e95ed4f8e69f192130de45bf14883d5127982
 EBUILD python-3.11.0_rc1.ebuild 13384 BLAKE2B 7ac3f74190fafd1321f2ae9b478cb1b7381f13ce88d1839bbe2eea12a9abb0f14286f3e6036ca65c2d37ca6b07b62c14f557a7af080f6f05f119e7bbd77764cc SHA512 3b94a9e45017c0ec3d2bb2ca346d423a0e31d3b1f2c1fa098aa2c4f0af58e49f3626688dacde9740b2c1f44c63f143bf43ec305d0ce69c3e68de3ff6ae0a88c3
 EBUILD python-3.8.13_p2.ebuild 10219 BLAKE2B c736d7417d2f7c8f8a6ee61182e1b2b9e22873343594a3779c83fc1af03103ae71f440f856d7dae7a661dc7190e70afa7c478dd7d8531d28637897c1ebd4106f SHA512 89f482e716b308565f41c4c6ce1db32f9a4023a41570070ddad4ac9d156f802d79f8ad7d2971b9ed02487482c50d8e4de64d212df092dd907d2c94838e6af921
 EBUILD python-3.8.13_p4.ebuild 9739 BLAKE2B 7baa8adde29baaea89a9f126a3090fba2186bcb2734ca737705c97d1b3f8d3036341ab2b626dc6e4cd5ab7630e386ef7f3444bb5847b79abf41806e2607715a6 SHA512 80ee67adf3b1c7461edb6b3ba60f5f825d93d89cc68f4a11b1de2bf84f4cb428718cee8079e68b074044a8e7f00d2423c97fc0cc3bfaa0848b6154b9abc3d6c7
 EBUILD python-3.8.13_p5.ebuild 9739 BLAKE2B 7baa8adde29baaea89a9f126a3090fba2186bcb2734ca737705c97d1b3f8d3036341ab2b626dc6e4cd5ab7630e386ef7f3444bb5847b79abf41806e2607715a6 SHA512 80ee67adf3b1c7461edb6b3ba60f5f825d93d89cc68f4a11b1de2bf84f4cb428718cee8079e68b074044a8e7f00d2423c97fc0cc3bfaa0848b6154b9abc3d6c7
+EBUILD python-3.8.13_p6.ebuild 9738 BLAKE2B 7103f430ad54633b7b30b82fd8c26d7b39f0accf9704ea781217888b8dbc910da9663a774075727d05097818c733b9cbc722d7a2292c2d010927f4272070e08f SHA512 3bd7ce3dae452f66f001ade710eec475fef26fcf02504964dfc08663263d2de43e93fcaa4e88efaf00ab92eef26a791ff774fcf463c3e1caa46bccdde54d71f0
 EBUILD python-3.9.13.ebuild 11462 BLAKE2B cfa217f58ee03528ce5dd467daa9023c67f89d4673def5a183eb7a0c2db6fe40527a78067803f7edcdcf32eef5dc72179b9be9d9a04f5766258945a4a16e3991 SHA512 4a7fbd6f6e7ae1fc1726a170879e26a6f7e74fe4fc2b52efacf5608350bd967ee52d63df4fb8d52aebe881bc003285e29d55fca5aedf74182cdb5f8b120ca8c4
 EBUILD python-3.9.13_p1.ebuild 10992 BLAKE2B 95d62e2bb7b6c3005020827484360929c7782563a545a914c61d0f54257525856bd5298273a39f73280036e738f532bba28abf6e9116f6c18a49725fd3f97d7a SHA512 fac82f66b21097cb564fc943a09bb61a834b4e51255bd5b2c8850b209eb5c20bdabad5028ee262fb0508672d1cc711394c217d48e0c2bb7427ffa670a25aa4d9
 EBUILD python-3.9.13_p2.ebuild 10992 BLAKE2B 95d62e2bb7b6c3005020827484360929c7782563a545a914c61d0f54257525856bd5298273a39f73280036e738f532bba28abf6e9116f6c18a49725fd3f97d7a SHA512 fac82f66b21097cb564fc943a09bb61a834b4e51255bd5b2c8850b209eb5c20bdabad5028ee262fb0508672d1cc711394c217d48e0c2bb7427ffa670a25aa4d9
+EBUILD python-3.9.13_p4.ebuild 10992 BLAKE2B 95d62e2bb7b6c3005020827484360929c7782563a545a914c61d0f54257525856bd5298273a39f73280036e738f532bba28abf6e9116f6c18a49725fd3f97d7a SHA512 fac82f66b21097cb564fc943a09bb61a834b4e51255bd5b2c8850b209eb5c20bdabad5028ee262fb0508672d1cc711394c217d48e0c2bb7427ffa670a25aa4d9
 MISC metadata.xml 1068 BLAKE2B 3c3511739ae8251d11bde32aa3a21225fd3468f2b1f31c459de956c5bb7dbc2de4103a288dd29b26d1023e40bac62631fa953d1515513e934f5c3962d9c715a7 SHA512 0f7d3f9305cc539619568aea7e54cdb9a3319579e811108cf03d7c66290e4f21080a87ca02f1a62264d4ecd41a243c91f0a639e6c064ccf2b24b460508c848b8
diff --git a/dev-lang/python/python-3.10.6_p2.ebuild b/dev-lang/python/python-3.10.6_p2.ebuild
new file mode 100644
index 000000000000..5d9861331971
--- /dev/null
+++ b/dev-lang/python/python-3.10.6_p2.ebuild
@@ -0,0 +1,408 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
+inherit python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="
+	https://www.python.org/
+	https://github.com/python/cpython/
+"
+SRC_URI="
+	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="
+	bluetooth build +ensurepip examples gdbm hardened libedit lto
+	+ncurses pgo +readline +sqlite +ssl test tk +xml
+"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	dev-lang/python-exec[python_targets_python3_10(-)]
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	ensurepip? ( dev-python/ensurepip-wheels )
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? (
+		!libedit? ( >=sys-libs/readline-4.1:= )
+		libedit? ( dev-libs/libedit:= )
+	)
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:= )
+	!!<sys-apps/sandbox-2.21
+"
+# bluetooth requires headers from bluez
+DEPEND="
+	${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )
+"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/awk
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-python )
+	!sys-devel/gcc[libffi(-)]
+"
+RDEPEND+="
+	!build? ( app-misc/mime-types )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+QA_PKGCONFIG_VERSION=${PYVER}
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat and libffi are not used.
+	rm -r Modules/expat || die
+	rm -r Modules/_ctypes/libffi* || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	# https://bugs.gentoo.org/850151
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
+
+	# force the correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs)
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# disable automagic bluetooth headers detection
+	if ! use bluetooth; then
+		local -x ac_cv_header_bluetooth_bluetooth_h=no
+	fi
+	local disable
+	use gdbm      || disable+=" gdbm"
+	use ncurses   || disable+=" _curses _curses_panel"
+	use readline  || disable+=" readline"
+	use sqlite    || disable+=" _sqlite3"
+	use ssl       || export PYTHON_DISABLE_SSL="1"
+	use tk        || disable+=" _tkinter"
+	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	append-flags -fwrapv
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	# PKG_CONFIG needed for cross.
+	tc-export CXX PKG_CONFIG
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	if use ncurses; then
+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+	fi
+
+	local dbmliborder=
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	if use pgo; then
+		local profile_task_flags=(
+			-m test
+			"-j$(makeopts_jobs)"
+			--pgo-extended
+			-x test_gdb
+			-u-network
+
+			# All of these seem to occasionally hang for PGO inconsistently
+			# They'll even hang here but be fine in src_test sometimes.
+			# bug #828535 (and related: bug #788022)
+			-x test_asyncio
+			-x test_httpservers
+			-x test_logging
+			-x test_multiprocessing_fork
+			-x test_socket
+			-x test_xmlrpc
+		)
+
+		if has_version "app-arch/rpm" ; then
+			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
+			profile_task_flags+=(
+				-x test_distutils
+			)
+		fi
+		local -x PROFILE_TASK="${profile_task_flags[*]}"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--without-static-libpython
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
+
+		$(use_with lto)
+		$(use_enable pgo optimizations)
+		$(use_with readline readline "$(usex libedit editline readline)")
+	)
+
+	# disable implicit optimization/debugging flags
+	local -x OPT=
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+
+	# install epython.py as part of stdlib
+	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	# Prevent using distutils bundled by setuptools.
+	# https://bugs.gentoo.org/823728
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
+	# end up writing bytecode & violating sandbox.
+	# bug #831897
+	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict /usr/lib/python3.10/site-packages
+	fi
+
+	# also need to clear the flags explicitly here or they end up
+	# in _sysconfigdata*
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Restore saved value from above.
+	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	local test_opts=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite /usr/lib/python3.10/site-packages
+
+	emake test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty || die "emake test failed"
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	rm -r "${libdir}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${libdir}"/ensurepip || die
+	fi
+	if ! use sqlite; then
+		rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}/usr/bin/idle${PYVER}" || die
+		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+	fi
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(
+		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
+		emake --no-print-directory -s -f - 2>/dev/null
+	)
+	newins Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local EPYTHON=python${PYVER}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/python/python-3.8.13_p6.ebuild b/dev-lang/python/python-3.8.13_p6.ebuild
new file mode 100644
index 000000000000..97f49aad0b1a
--- /dev/null
+++ b/dev-lang/python/python-3.8.13_p6.ebuild
@@ -0,0 +1,349 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools flag-o-matic multiprocessing pax-utils
+inherit python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="
+	https://www.python.org/
+	https://github.com/python/cpython/
+"
+SRC_URI="
+	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="
+	bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
+	+readline +sqlite +ssl test tk wininst +xml
+"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	dev-lang/python-exec[python_targets_python3_8(-)]
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	ensurepip? ( dev-python/ensurepip-wheels )
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? ( >=sys-libs/readline-4.1:= )
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:= )
+"
+# bluetooth requires headers from bluez
+DEPEND="
+	${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )
+"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/awk
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-python )
+	!sys-devel/gcc[libffi(-)]
+"
+RDEPEND+="
+	!build? ( app-misc/mime-types )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+QA_PKGCONFIG_VERSION=${PYVER}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat and libffi are not used.
+	rm -r Modules/expat || die
+	rm -r Modules/_ctypes/libffi* || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	# https://bugs.gentoo.org/850151
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
+
+	# force the correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs)
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# disable automagic bluetooth headers detection
+	if ! use bluetooth; then
+		local -x ac_cv_header_bluetooth_bluetooth_h=no
+	fi
+	local disable
+	use gdbm      || disable+=" gdbm"
+	use ncurses   || disable+=" _curses _curses_panel"
+	use readline  || disable+=" readline"
+	use sqlite    || disable+=" _sqlite3"
+	use ssl       || export PYTHON_DISABLE_SSL="1"
+	use tk        || disable+=" _tkinter"
+	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	append-flags -fwrapv
+
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	# PKG_CONFIG needed for cross.
+	tc-export CXX PKG_CONFIG
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	if use ncurses; then
+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+	fi
+
+	local dbmliborder=
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
+	)
+
+	# disable implicit optimization/debugging flags
+	local -x OPT=
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+
+	# install epython.py as part of stdlib
+	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	# Prevent using distutils bundled by setuptools.
+	# https://bugs.gentoo.org/823728
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	# also need to clear the flags explicitly here or they end up
+	# in _sysconfigdata*
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	local test_opts=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	emake test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty || die "emake test failed"
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	# Remove static library
+	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	rm -r "${libdir}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${libdir}"/ensurepip || die
+	fi
+	if ! use sqlite; then
+		rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}/usr/bin/idle${PYVER}" || die
+		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+	fi
+	if ! use wininst; then
+		rm "${libdir}/distutils/command/"wininst-*.exe || die
+	fi
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(
+		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
+		emake --no-print-directory -s -f - 2>/dev/null
+	)
+	newins Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local EPYTHON=python${PYVER}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/python/python-3.9.13_p4.ebuild b/dev-lang/python/python-3.9.13_p4.ebuild
new file mode 100644
index 000000000000..c3fe846a9d19
--- /dev/null
+++ b/dev-lang/python/python-3.9.13_p4.ebuild
@@ -0,0 +1,403 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
+inherit python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="
+	https://www.python.org/
+	https://github.com/python/cpython/
+"
+SRC_URI="
+	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="
+	bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
+	+readline +sqlite +ssl test tk +xml
+"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	dev-lang/python-exec[python_targets_python3_9(-)]
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	ensurepip? ( dev-python/ensurepip-wheels )
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? ( >=sys-libs/readline-4.1:= )
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:= )
+"
+# bluetooth requires headers from bluez
+DEPEND="
+	${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )
+"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/awk
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-python )
+	!sys-devel/gcc[libffi(-)]
+"
+RDEPEND+="
+	!build? ( app-misc/mime-types )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+QA_PKGCONFIG_VERSION=${PYVER}
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat and libffi are not used.
+	rm -r Modules/expat || die
+	rm -r Modules/_ctypes/libffi* || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	# https://bugs.gentoo.org/850151
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
+
+	# force the correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs)
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# disable automagic bluetooth headers detection
+	if ! use bluetooth; then
+		local -x ac_cv_header_bluetooth_bluetooth_h=no
+	fi
+	local disable
+	use gdbm      || disable+=" gdbm"
+	use ncurses   || disable+=" _curses _curses_panel"
+	use readline  || disable+=" readline"
+	use sqlite    || disable+=" _sqlite3"
+	use ssl       || export PYTHON_DISABLE_SSL="1"
+	use tk        || disable+=" _tkinter"
+	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	append-flags -fwrapv
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	# PKG_CONFIG needed for cross.
+	tc-export CXX PKG_CONFIG
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	if use ncurses; then
+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+	fi
+
+	local dbmliborder=
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	if use pgo; then
+		local profile_task_flags=(
+			-m test
+			"-j$(makeopts_jobs)"
+			--pgo-extended
+			-x test_gdb
+			-u-network
+
+			# All of these seem to occasionally hang for PGO inconsistently
+			# They'll even hang here but be fine in src_test sometimes.
+			# bug #828535 (and related: bug #788022)
+			-x test_asyncio
+			-x test_httpservers
+			-x test_logging
+			-x test_multiprocessing_fork
+			-x test_socket
+			-x test_xmlrpc
+		)
+
+		if has_version "app-arch/rpm" ; then
+			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
+			profile_task_flags+=(
+				-x test_distutils
+			)
+		fi
+		local -x PROFILE_TASK="${profile_task_flags[*]}"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
+
+		$(use_with lto)
+		$(use_enable pgo optimizations)
+	)
+
+	# disable implicit optimization/debugging flags
+	local -x OPT=
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+
+	# install epython.py as part of stdlib
+	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	# Prevent using distutils bundled by setuptools.
+	# https://bugs.gentoo.org/823728
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
+	# end up writing bytecode & violating sandbox.
+	# bug #831897
+	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict /usr/lib/python3.9/site-packages
+	fi
+
+	# also need to clear the flags explicitly here or they end up
+	# in _sysconfigdata*
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Restore saved value from above.
+	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	local test_opts=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	emake test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty || die "emake test failed"
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	# Remove static library
+	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	rm -r "${libdir}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${libdir}"/ensurepip || die
+	fi
+	if ! use sqlite; then
+		rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}/usr/bin/idle${PYVER}" || die
+		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+	fi
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(
+		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
+		emake --no-print-directory -s -f - 2>/dev/null
+	)
+	newins Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local EPYTHON=python${PYVER}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 0d0d797d3bf9..bcf2c2a9e53f 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,10 +1,8 @@
-AUX spidermonkey-1.8.5-LTO.patch 1886 BLAKE2B 28559662306681570ed7b910190da9042a7724a5d9fda0960ebe36039e994b56b65f103095381a8838db54e2ebdd5b8bc3f0f7d500f338907624ca448695a2f1 SHA512 8c44683370f7a919a930dc505278240164b1bea35cd0408ce7d880f56603abde9799aea3bf35f05bd080b214d5d0b944dd004ef5e157607bbb3e679f3ff2c574
 AUX spidermonkey-60.5.2-ia64-fix-virtual-address-length.patch 2554 BLAKE2B d5759da22c521e389b8633aa2aa75e0a300af76f431a53c0bd445781002b0b7dd93543657cdf53afb12d87e4be1464584d5c3ccb30a2c9acc608aaeb1b2eb34f SHA512 d767cb00988772a0e5789d5b27aaaf0c0cc0124f4dd78ba67d2c4b4587c26346b01fc5b3d29f346e931dcd037ecefc8cec0d5c48510726a1841a6b6396c5507c
 AUX spidermonkey-60.5.2-ia64-support.patch 1615 BLAKE2B bd2ae36194bdb6a17638ec500e5211abb9700f2b7c5056b5be51e8e54d59326a5c9f0cb6d2d6fa56dd946dba264635e6d75e9b4ed52103c7904df19d33257c7d SHA512 71f2a0f27910ae086910f6599985a32ad2fdedeffc9c4c6baa446f4856dee74051fa158cc0552a3f21210098e0d006a0b5d781437fded80969e1edf23c04b9e0
 AUX spidermonkey-68.0-add-riscv-support.patch 4328 BLAKE2B 64ef005bff60ce3cc3e698a65494ef97441b9f27493bcbc7576286f6e06ce754dbcbcc8d9088ca88f6aa1a1ea7f008565922b5a4baf54019c64d8040c5b509f1 SHA512 70aad64600221f805f0fcd485b63c5383e9f160889b001963f5b6196d57672257c8ce02e75ad384bd2a0eeb9eeae0f7fc4820f1abcec3677f736cd60391f7d6f
 AUX spidermonkey-68.0-loong-support.patch 4156 BLAKE2B ed86f74240c1c7df0ae5012e80d3c4daec1083cdb48d3a985bdc4be287e591e536195ecc38a30f42bfa8d39ba3f46f2bef235ea2691687f7f33ba5f6052438b9 SHA512 0b8554b7afd35738ce9e2d2c71ea6658a680523160f5b05a7734ebdaccd6cdd288aa3168fd0a97318da88b2f149e6a4662b6069da1e805564b5320f674438e66
 AUX spidermonkey-91-known-test-failures.txt 8778 BLAKE2B e429909a6aa90dc6127ba957045d119d894f50fed508ee5ef47bdd163585987510c5cc0898f0d8af608a7ec3f8425a3b8d1073b6cfc1fda5196a81a1c255d885 SHA512 b2cb12abd942ecdfca641dcc63ac652574fbb010b78e4661c29e669d3beb2217f60904d61d5a574cf8d70040c2290672fbb410234f78f665b6bb63fefa0090ed
-AUX spidermonkey-perl-defined-array-check.patch 341 BLAKE2B e11a74cc2afbea5e39ec5f3fb4c108278a8b71b57ce71644184bc4e19188059f6cb9c164ab87877605028241ed0b68a1447414f1aa0f5453fa26a603ecd4f6a6 SHA512 5d178b68cf0744da874624da79cd31555bd882aed205e697a3f0bfc3cb91a149d74da79b7af5883ea5a23e1d1692753ebfda0d83e7a25ac000105849db5c1548
 DIST firefox-68.0-patches-15.tar.xz 16060 BLAKE2B f9e6cd58ea51bed1af90a9d30fd551dc7e939afcd1b4d00de1271bd4bda94021c6f1799fd9945962c14ffa1fd0b6a6429369c4e45efc2000f179b9b2e46971e7 SHA512 9cb2479637dd8b84e0ab68dc0fe144acd2dc74feca282fd3c4b485ca6f0de8190244587622713a5421b243ccda153f738e9a8f463e87e15e93e9b725d943e128
 DIST firefox-68.12.0esr.source.tar.xz 313856956 BLAKE2B eeaa4acc9fabf15ec1b313170a30cee8e1fc10a8b08512b915b83b7d6a81c09b365733ed94638bd434864fd7b0cb8cbf1bc2e43441be69e31117e8e6a099234c SHA512 839b02422e4c87bdb12e0995cd35ca8c1996f3fba00bbb46b419e46b67df5ec48a264cb14632db777ce29166ee4fdcb06e2ee3ce847e64328c58c9a2f9129f4c
 DIST firefox-78.15.0esr.source.tar.xz 330819568 BLAKE2B dc8785613c2f72c55d484642c89c2545765a9efbd609bc7c2cf57b4a3a06a2ea22e6959e42b5b8af867db782e8b2097a67dec858796b744e47008a8e575e2316 SHA512 ac3de735b246ce4f0e1619cd2664321ffa374240ce6843e785d79a350dc30c967996bbcc5e3b301cb3d822ca981cbea116758fc4122f1738d75ddfd1165b6378
@@ -12,14 +10,11 @@ DIST firefox-78esr-patches-19.tar.xz 88424 BLAKE2B fdc7bf8f28b3e799551a70f1cec7a
 DIST firefox-91.11.0esr.source.tar.xz 384459848 BLAKE2B cff327378a1712d0dfb99e1a67bd63e958987e3147279af5f98ee9318fe91f42823bbc9afb0308638e42de789451b04ea895320a8c674cc221e0d4b0b1d80f38 SHA512 bff3a399c03bd1cdaaec0b6963b1558aa35b6338b6c02042ffd65fec0aedd344d01718692e881332f5f352c32da15ba09a20a09ee072200b47ae840bc0585a96
 DIST firefox-91.12.0esr.source.tar.xz 379877004 BLAKE2B c00e5cc219c59d8347a69e5236a4a4f439d9caae6ab7dabc3ed8c8f9a096ded26ec1ffb53b015b86481f1d43ec4f263bb8acbd841ebf36e8a741d73e12a0a914 SHA512 323fb752488b45872b40f0b0ee1d8c1dffa16874dbff2afde19a54286c824ef48177233e029faeafa5946184e71c31c6bc5ba7ec17a571e21af64fc5f7334042
 DIST firefox-91esr-patches-10j.tar.xz 18320 BLAKE2B ec882411eed19bafab8676e3d79f4ae43947bb97c44571c1497bb93a44fcfec99de06ebacbdf8c4944dcecdf949e4f684908d7ce4226cdcec60241e62e75810e SHA512 670a14d852bb74b9074c3fef9310650f71ce1c56314109c49aea02a7a69acc836af60a8beab11da53e21b10a8e6da341fcfa18b68a1dfd33b26978dd63758e9c
-DIST js185-1.0.0.tar.gz 6164605 BLAKE2B 76a37f0ceae05d3475853875bd0ce4be6e525e4114816f8f281ea6fc6b60a71060975a0fa1cb843f57ad1e2f842dfb26b24244fa0fd6c20f6ae2ebbe430f70be SHA512 2af7122a7c7007fd7b6668776fe1222515a810b3e43bbf0f76b8f94e1ef406ffd3fb5ccec393021b00274c05b38a77235bc8d6886994c56762fcaf0aa7cf6718
 DIST mozjs-60.5.2.tar.bz2 32816585 BLAKE2B 45ac4c9646e1275faf60eeedbf486f802cd106583eb7f640fe2243adc7cbb811dced5cefa94426cceca63468b0112be84078ffcef24cb2b8c1a7b6c8173c0d45 SHA512 5fb73330e7803bdd524fbe7cfdf4e6b72e85d4b22b0c827400317b5d052d1088d36e558ceac376393089e9d03e658b24e69262851fc04a66bbcda47135423dc0
 DIST spidermonkey-60.0-patches-04.tar.xz 4428 BLAKE2B af78049cd9b3ee6a9b689e6253486c4670fd3b506faade7d745dafaa7af329c0bd15cd35e95528a4c96688230f4803130967fb09b97aae2bda0ce0f73acaaf3e SHA512 fb1326a81512146ba98773d4f7e0c4bc1bff0f076897c13f576fcf63b56f6965efeff633eea9160bca9f9bc4546505901084eabc33bc955de0b7ab3d6334387a
 DIST spidermonkey-68.6.0-patches-04.tar.xz 5956 BLAKE2B b1250391a5173e676272d5926b710c06b0e9de1ff03b130a57fdac30f2deefbee3fa92250b37e28087572fe5cce73eb112ef4e1fb0c0401d6ecdb22ab9868998 SHA512 94575b11b4f006c6ee0c8d64b315734a173cecb68e9128ca61ba1a28177e3c149b8cf1f3b3c47a7a263fad8da6196fc0101df87392f016686a827e0cd24fdc74
 DIST spidermonkey-78-patches-04.tar.xz 3408 BLAKE2B f2fdd4882e1e4de1908c458dc8dfedd5665ef7118f19704dabf2b2a80e2fae48813e9bc3d0c3410287e32c21e3f9d09233d8e5d15917f53aa2f60e6190cd9cdb SHA512 87ac83c0ccc05f482913b1fbf043db1878536f935f934362a47283809c0cbfdeff040206a9c18c687384b606ba8a7bd9a7c1fc3c0bcfdd620987990a33ca1fe2
 DIST spidermonkey-91-patches-04j.tar.xz 4624 BLAKE2B d9cf47b39a165e8434d4f2f20ae3a9734c1bb81c32ddb75360e5edfa6817d6343be89aff0f8ec381485772cad80b00a069789decbc462129161afc3d4acfcb53 SHA512 bd574fee600cb4c6a262893b7d992d85c4059d512b829cd2f226aff86d8a6a83c2bdab466704e22f64bf6d29f90901037a34f9e90a42251952ba1cdbc0cab968
-DIST spidermonkey-slot0-patches-02.tar.xz 10952 BLAKE2B fb7bf5cdac6c821a48d407ff172fe0ec7297e047d3b3bab952f226f413b83ea70325175b41c1680725ff588111b424efc97a0c66e392989da510c43d38528ff1 SHA512 cd62890c4b58658d99fc1b52f05ccb35c07da835b168bb9d5e6b219de5021122c199cc2255c5b0be01ef582f53dd51c9975921e6bde9f14e9b43536e2bee85f2
-EBUILD spidermonkey-1.8.5-r10.ebuild 3998 BLAKE2B c54b791025b3416f96068a20e8f5526d15223aa4f5d4b5dedc5451ea711f5376d26ff9823226a7617dc53e4beece4ef48dc608a5f6fd02c03221e46c69be3add SHA512 8a33566ef0d15caf811d79d17862ccaaa708c9c6a4171bfc3889bc3f3268e6bcfc61090ebff1014b5369f469c0b9e516a340ab32930888a07cce1ac95faf6fb3
 EBUILD spidermonkey-60.5.2_p0-r6.ebuild 4080 BLAKE2B 7269a944ab109fa27ee80016d44c4c71d91c0f230fbea9704ba468bff06d62c2740af3cce4ce7c39179dca6be7c74b3eb62b877e7f7db2c7a6e7314e0361401c SHA512 971cbfaad2aabaf43b6f528bc67f5bb207bf53bc4d9bd19d8d21948ad6e055a8f3aa0f059028db13c95740fef3ebc9257a1ab2813131180dfb5c7b2306b66e2b
 EBUILD spidermonkey-68.12.0-r1.ebuild 7834 BLAKE2B 35252f841078dc8b0f06c2c2dab0d0a17abbfa23f025c3b2534232a82951298722a7ee5c3c7bcd56055879c5a886961a8ac34bb325fca7a466dc7d59f7b391ec SHA512 4ecbf27cddb67cdef15aa2c93cb4acfb4851973a07b7b9040186555027f5bc4d7126351b5bb1646640d0493afa78e63151d39b0bf37a6899c87ff20a7ea22198
 EBUILD spidermonkey-78.15.0.ebuild 13041 BLAKE2B aef027a6499b02cc44e1fc1eda7d60b74542590513147ff47978786f14ac8afbf636f8ebb86fcbd0ac0d6f30130d5ff679df7342215bf0126c21db343591c905 SHA512 bcce7f25a9791a0bafcb1f9ecbca883a96dd677ab6c184370f791b1463c3eba6bf57be17e5f1bbcb6b52814600ffe18d3d0d7453eeb18f1cd96087925b2aca02
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-LTO.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-LTO.patch
deleted file mode 100644
index 7c36b5525b04..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-LTO.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 6ff7ad09daf98e5b804cf73c066c382a76e74e8c Mon Sep 17 00:00:00 2001
-From: Alexander Miller <alex.miller@gmx.de>
-Date: Wed, 12 Jun 2019 00:29:23 -0500
-Subject: [PATCH] Fix breakage with lto builds
-
-<artificial>:(.text+0x7a): undefined reference to `PopActiveVMFrame'
-collect2: error: ld returned 1 exit status
-
-Signed-off-by: Alexander Miller <alex.miller@gmx.de>
----
- js/src/methodjit/InvokeHelpers.cpp | 2 +-
- js/src/methodjit/MethodJIT.cpp     | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/js/src/methodjit/InvokeHelpers.cpp b/js/src/methodjit/InvokeHelpers.cpp
-index d017c2a..abde396 100644
---- a/js/src/methodjit/InvokeHelpers.cpp
-+++ b/js/src/methodjit/InvokeHelpers.cpp
-@@ -500,7 +500,7 @@ stubs::PutActivationObjects(VMFrame &f)
-     js::PutActivationObjects(f.cx, f.fp());
- }
- 
--extern "C" void *
-+extern "C" void * __attribute__((used))
- js_InternalThrow(VMFrame &f)
- {
-     JSContext *cx = f.cx;
-diff --git a/js/src/methodjit/MethodJIT.cpp b/js/src/methodjit/MethodJIT.cpp
-index 4feefbc..66099e6 100644
---- a/js/src/methodjit/MethodJIT.cpp
-+++ b/js/src/methodjit/MethodJIT.cpp
-@@ -120,20 +120,20 @@ static uint32 StubCallsForOp[STUB_CALLS_FOR_OP_COUNT];
- 
- extern "C" void JaegerTrampolineReturn();
- 
--extern "C" void JS_FASTCALL
-+extern "C" void JS_FASTCALL __attribute__((used))
- PushActiveVMFrame(VMFrame &f)
- {
-     f.entryfp->script()->compartment->jaegerCompartment->pushActiveFrame(&f);
-     f.regs.fp->setNativeReturnAddress(JS_FUNC_TO_DATA_PTR(void*, JaegerTrampolineReturn));
- }
- 
--extern "C" void JS_FASTCALL
-+extern "C" void JS_FASTCALL __attribute__((used))
- PopActiveVMFrame(VMFrame &f)
- {
-     f.entryfp->script()->compartment->jaegerCompartment->popActiveFrame();
- }
- 
--extern "C" void JS_FASTCALL
-+extern "C" void JS_FASTCALL __attribute__((used))
- SetVMFrameRegs(VMFrame &f)
- {
-     f.cx->setCurrentRegs(&f.regs);
--- 
-2.22.0
-
diff --git a/dev-lang/spidermonkey/files/spidermonkey-perl-defined-array-check.patch b/dev-lang/spidermonkey/files/spidermonkey-perl-defined-array-check.patch
deleted file mode 100644
index c3996ae82bb3..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-perl-defined-array-check.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/js/src/config/milestone.pl	2013-02-11 17:33:22.000000000 -0500
-+++ b/js/src/config/milestone.pl	2015-07-15 10:44:31.676153600 -0400
-@@ -55,7 +55,7 @@
- #
- my $milestone = Moz::Milestone::getOfficialMilestone($MILESTONE_FILE);
- 
--if (defined(@TEMPLATE_FILE)) {
-+if (@TEMPLATE_FILE) {
-   my $TFILE;
- 
-   foreach $TFILE (@TEMPLATE_FILE) {
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r10.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r10.ebuild
deleted file mode 100644
index 99ebd7b97664..000000000000
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r10.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WANT_AUTOCONF="2.1"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-inherit autotools toolchain-funcs multilib python-any-r1 versionator pax-utils
-
-MY_PN="js"
-TARBALL_PV="$(replace_all_version_separators '' $(get_version_component_range 1-3))"
-MY_P="${MY_PN}-${PV}"
-TARBALL_P="${MY_PN}${TARBALL_PV}-1.0.0"
-DESCRIPTION="Stand-alone JavaScript C library"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
-SRC_URI="https://archive.mozilla.org/pub/js/${TARBALL_P}.tar.gz
-	https://dev.gentoo.org/~axs/distfiles/${PN}-slot0-patches-02.tar.xz
-	"
-
-LICENSE="NPL-1.1"
-SLOT="0/mozjs185"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~x64-macos"
-IUSE="debug minimal static-libs test"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-BUILDDIR="${S}/js/src"
-
-RDEPEND=">=dev-libs/nspr-4.7.0
-	sys-libs/readline:0=
-	x64-macos? ( dev-libs/jemalloc )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-arch/zip
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${WORKDIR}"/sm0/${P}-fix-install-symlinks.patch
-	"${WORKDIR}"/sm0/${P}-fix-ppc64.patch
-	"${WORKDIR}"/sm0/${P}-arm_respect_cflags-3.patch
-	"${WORKDIR}"/sm0/${PN}-1.8.7-freebsd-pthreads.patch
-	"${WORKDIR}"/sm0/${P}-perf_event-check.patch
-	"${WORKDIR}"/sm0/${P}-symbol-versions.patch
-	"${WORKDIR}"/sm0/${P}-ia64-fix.patch
-	"${WORKDIR}"/sm0/${P}-ia64-static-strings.patch
-	"${WORKDIR}"/sm0/${P}-isfinite.patch
-	"${FILESDIR}"/${PN}-perl-defined-array-check.patch
-	"${WORKDIR}"/sm0/${PN}-1.8.7-x32.patch
-	"${WORKDIR}"/sm0/${P}-gcc6.patch
-	"${WORKDIR}"/sm0/${P}-drop-asm-volatile-toplevel.patch
-	"${FILESDIR}"/${P}-LTO.patch
-)
-
-DOCS=( "${S}"/README )
-HTML_DOCS=( "${BUILDDIR}"/README.html )
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		export LC_ALL="C"
-	fi
-}
-
-src_prepare() {
-	pwd
-
-	default
-
-	cd "${BUILDDIR}" || die
-	eautoconf
-
-	# remove options that are not correct from js-config
-	sed '/lib-filenames/d' -i "${BUILDDIR}"/js-config.in || die "failed to remove invalid option from js-config"
-}
-
-src_configure() {
-	cd "${BUILDDIR}" || die
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-	AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-	LD="$(tc-getLD)" \
-	ac_cv_lib_dnet_dnet_ntoa=no \
-	ac_cv_lib_dnet_stub_dnet_ntoa=no \
-	econf \
-		${myopts} \
-		--enable-jemalloc \
-		--enable-readline \
-		--enable-threadsafe \
-		--with-system-nspr \
-		--disable-optimize \
-		--disable-profile-guided-optimization \
-		$(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests)
-}
-
-cross_make() {
-	emake \
-		CFLAGS="${BUILD_CFLAGS}" \
-		CXXFLAGS="${BUILD_CXXFLAGS}" \
-		AR="${BUILD_AR}" \
-		CC="${BUILD_CC}" \
-		CXX="${BUILD_CXX}" \
-		RANLIB="${BUILD_RANLIB}" \
-		"$@"
-}
-src_compile() {
-	cd "${BUILDDIR}" || die
-	if tc-is-cross-compiler; then
-		tc-export_build_env BUILD_{AR,CC,CXX,RANLIB}
-		cross_make jscpucfg host_jsoplengen host_jskwgen
-		cross_make -C config nsinstall
-		mv {,native-}jscpucfg || die
-		mv {,native-}host_jskwgen || die
-		mv {,native-}host_jsoplengen || die
-		mv config/{,native-}nsinstall || die
-		sed -i \
-			-e 's@./jscpucfg@./native-jscpucfg@' \
-			-e 's@./host_jskwgen@./native-host_jskwgen@' \
-			-e 's@./host_jsoplengen@./native-host_jsoplengen@' \
-			Makefile || die
-		sed -i -e 's@/nsinstall@/native-nsinstall@' config/config.mk || die
-		rm -f config/host_nsinstall.o \
-			config/host_pathsub.o \
-			host_jskwgen.o \
-			host_jsoplengen.o || die
-	fi
-	emake
-}
-
-src_test() {
-	cd "${BUILDDIR}/jsapi-tests" || die
-	# for bug 415791
-	pax-mark mr jsapi-tests
-	emake check
-}
-
-src_install() {
-	cd "${BUILDDIR}" || die
-	emake DESTDIR="${D}" install
-	# bug 437520 , exclude js shell for small systems
-	if ! use minimal ; then
-		dobin shell/js
-		pax-mark m "${ED}/usr/bin/js"
-	fi
-	einstalldocs
-
-	if ! use static-libs; then
-		# We can't actually disable building of static libraries
-		# They're used by the tests and in a few other places
-		find "${D}" -iname '*.a' -delete || die
-	fi
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 7b1b2407995c..9b3a1acf785c 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/foma/Manifest b/dev-libs/foma/Manifest
index 11def9123269..3e4c11394600 100644
--- a/dev-libs/foma/Manifest
+++ b/dev-libs/foma/Manifest
@@ -1,4 +1,6 @@
 AUX foma-0.9.18-clean-makefile.patch 1349 BLAKE2B 7f0dfb37d72ab9db835eff35dd5b79dca40c02c305cba23d89e2495c34592e5e4033b091763dcdb1eb64b7d4845868bf58c4754609e19a2f7ce2cef1ce7b749d SHA512 513ca1681e50c9ca7763364a510a28d86196f0685fc98842078a0b258d72cfbf4fb702e681d1433f242d7079ff4a78541a0765e261a12d7b7c2868fc15c3a7a3
+DIST foma-0.10.0_p20220612.tar.gz 179778 BLAKE2B f96bf46404ead44725b609953a01a3966506af98d82e925e981cef65b3f0dc7ae3414ad96df911e380f1f565f9c11ea3f85e93fa5962cc52db5e451d2f39d37c SHA512 4539c937bd20f74dee5274126cc3a950873a87364d0fcbf02e674eca5ef049badb1b2774c2975ec7969f7f24ccffb7dd17842840e3a818b1503957374ceff048
 DIST foma-0.9.18.tar.gz 337134 BLAKE2B b7f1eeaeaa21096f8077f0e81f3c57c49bbba30afe8db280089c40ed6cf475df33a6899fd2b6929d3f58fe8b3660a92566ae41f2bd5d8a46dacc073b48caf030 SHA512 17df4c070d1460855804aa63f97cc4a0d9568755e93de0de80821625faab7a3994a260650c5e8f43f80b5a0702dadb0cfe57136ab50eb2a9946f118991205b1a
+EBUILD foma-0.10.0_p20220612.ebuild 664 BLAKE2B 918090da7c53cb4673da318cf826f6fee4c2c920a8400862839fccf8511d4938cc88aa73bf1863a886946e41485d07122eae050cc47a213c58bbdeaaa46f14de SHA512 7e0b97cb8eb83cac8d046518f57043872b0f0e1fa9a5b2df6a4c9bf5a1b788b92eda43a313bd1323b61d6037184f4ae78998c59d88b7f785c1aa0985c4fd8058
 EBUILD foma-0.9.18-r1.ebuild 1043 BLAKE2B b7ae4ba2f23b105dc836063083df247d1c2501b78222782c60d1f3a48d9e2eb99ae70800c9b93898e97f22616c7d7c2bc946cf46db879c6501bbaaaca90de170 SHA512 47652a80ca89e70e776b539969b5b55b1f26cebd024c30d682a268fb14f563c51b0f41f168d9ec948de6fbf9eb12cdbc2a7e14ddfb8321a709fc01f353b2ed37
 MISC metadata.xml 255 BLAKE2B 6fe10a1f843a8b2494606052a69206e32fdd5edf3ca6bdfb661cf6f8e39c0e16fb652acb8697d339770f3559c56a4ba964a0e959b3e0bb456d09ee7570f0d9e9 SHA512 235170971553178916cc484a07e1c665c94cd0a7ec442d2190d3608f7a3441dd2fe08fea666ca23d151077c10c908bc1da0e57355fab43be02711be35531b362
diff --git a/dev-libs/foma/foma-0.10.0_p20220612.ebuild b/dev-libs/foma/foma-0.10.0_p20220612.ebuild
new file mode 100644
index 000000000000..eeada44575e2
--- /dev/null
+++ b/dev-libs/foma/foma-0.10.0_p20220612.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_COMMIT="9e8c3df573015a26c84e113ba710ef3d57c8e777"
+
+DESCRIPTION="Multi-purpose finite-state toolkit"
+HOMEPAGE="https://fomafst.github.io/ https://github.com/mhulden/foma"
+SRC_URI="https://github.com/mhulden/foma/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/0.10"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="sys-devel/bison
+	sys-devel/flex"
+DEPEND="sys-libs/readline:=
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/foma-${MY_COMMIT}/foma"
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+}
diff --git a/dev-libs/libstrophe/Manifest b/dev-libs/libstrophe/Manifest
index 03accaa4c801..6b7837786b4a 100644
--- a/dev-libs/libstrophe/Manifest
+++ b/dev-libs/libstrophe/Manifest
@@ -1,5 +1,7 @@
 DIST libstrophe-0.12.0.tar.xz 397120 BLAKE2B 6ac32e317e14a8641b1d092026772264682b7b0980158757a82036f3db2643a6429e5553d9173b578111d5b8b503e9a98a4e140f98f8ac03866758624a1cec67 SHA512 dd0fc54840bb5626859f91c7bbe5204ea89332856392a5a33c50cf7f66c8aaa7b0d7c24bd737e8473d63f2c9d7683a75dcb9465a19634d14e54c9f8f20580884
 DIST libstrophe-0.12.1.tar.xz 398492 BLAKE2B 9f0e06952603d51a0697366a83d6fa80af09161858d87bee8cfd95786944a58ad1551155b8b7a982646f775a695432822f33b36c6e52161db145dca98050689e SHA512 54e255f756a6705dc554ce75dd6b4ea889822774ca38042548480ea026a7f4d411b4ba30f3aaf88776a0d8437f51eb07fb3675ddbfb0afd661d5f965b280dd52
-EBUILD libstrophe-0.12.0.ebuild 1251 BLAKE2B 98d7083591a20d015b84e5b27a8f338a8ac0c4e10f2fee56f4da13f84f40c965c69851473abf0b3341f4004254ff4fa2c1c539086ef098d12e364a11e623a4ad SHA512 cbbdcfc9e5fe30ba3374e85460d206c754278552b1bb50eb087d60a3541b0043ff77ef8751828c995afdef804bc339ff71b97ffa0b87314a5138ccb3df074571
-EBUILD libstrophe-0.12.1.ebuild 1231 BLAKE2B 98d52c2c1dbdbf6134814b683be8ca553620419612b1b28c0f3c8701fe3e846c5a78a9b59242f9e0468c2f1cab0fc80edc217f3d0bb5c473fe2e75fe677981af SHA512 a48e29ef06a4f22094c74bc55efc9f919a68524edb79de096e8c155d7de559bc4c88e2e93684dd2a3ac4d15a734241b89cbb7c5d3cd670e79ba1d444ef336627
+DIST libstrophe-0.12.2.tar.xz 400092 BLAKE2B 28b655e4bf3a279f837fd26e7c7ba34cd32053ad16be660c04d1c07b5335d805e9745cd24af584ed62f8ae44caebd8bda48473872163c122ecbcd57f042fc3db SHA512 1026f57b107a0ff8f088a5c7f1d88b3b5a35d0e6bfefb4f6eb56de37fe9fd2f554f547663a41353b7c6b01a2aa47f6cab4a9f7a7c87ba8c0c7708d7b2b4c2086
+EBUILD libstrophe-0.12.0.ebuild 1098 BLAKE2B 26ddb67d356153b17703001dde23cb867421a8d0aece702c614c3109a2e0ad67b56faf83d5cb81c2d44964d077a79319a365915aa9aae967914bdba0b906d91c SHA512 7870002f1358c72bf8404f897398eced26ae070a496bd341d3b9185d377d375f254a49df5009b8f35d27880f11f761d6abd4c0fa1bdf61b33cc87faa8e9802b3
+EBUILD libstrophe-0.12.1.ebuild 1077 BLAKE2B 2101b4722ecb56a4b44c996ea117101ac2bb5210b5e9c2985f5e4313786529167e6d18f08af512970548c0f5abdb06f023a8ed9d0f57f4f412fe5c4a01138648 SHA512 d393ebdac2d807007ae611cc00f459409cec134f1b870b5c2de06d7302eb8f5ac2f85b4ecee9e4d34631c4ffa0ab256782a91b3af099d29963280b8854d4d6ee
+EBUILD libstrophe-0.12.2.ebuild 1078 BLAKE2B 458b0073edc90736f2752d386ddd79497b40061452011a1fe1ad09b9931ba96d3aff9bb78e0a8ce74900b7e242affb226301d02c1a73bebcad76585a478954d6 SHA512 6d0e08338357ea7027cb238bfc83fcb54b90042f4e17d643e931eab3d93bbe9e76383d053ff7f378278b721d013c83c4cd76373488c370a7c19ae715175d9c8e
 MISC metadata.xml 711 BLAKE2B 0fc95d72ff0d9dbf1765e8b2ddf7182d6543cecdd275798e79ad8bdf8bc494234f6fcd8acc76c6d3e87f6f4159d4b0ea0e70706932628173b1b75bed6c788701 SHA512 d8eb8fcbadee45ff2d411d766e3fba2afb18b2516eb4172ff2b072ef9b5469d7a92c32a4b70e989fd0b56eeaaad39d5f187748f7aedc6dca32493b1f2d0ca817
diff --git a/dev-libs/libstrophe/libstrophe-0.12.0.ebuild b/dev-libs/libstrophe/libstrophe-0.12.0.ebuild
index fb98239a890e..e883a03f6c63 100644
--- a/dev-libs/libstrophe/libstrophe-0.12.0.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.12.0.ebuild
@@ -48,9 +48,3 @@ src_install() {
 	use doc && dodoc -r examples
 	find "${D}" -type f \( -name '*.la' -o -name '*.a' \) -delete || die
 }
-
-# Explicit src_test is there to document that the test suite is integrated and
-# is expected to pass. Please do not remove.
-src_test() {
-	emake check
-}
diff --git a/dev-libs/libstrophe/libstrophe-0.12.1.ebuild b/dev-libs/libstrophe/libstrophe-0.12.1.ebuild
index a070ad9748ba..a491acaf81f5 100644
--- a/dev-libs/libstrophe/libstrophe-0.12.1.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.12.1.ebuild
@@ -8,7 +8,7 @@ SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.xz"
 LICENSE="|| ( MIT GPL-3 )"
 # Subslot: ${SONAME}.1 to differentiate from previous versions without SONAME
 SLOT="0/0.1"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc expat gnutls"
 
 RDEPEND="
@@ -47,9 +47,3 @@ src_install() {
 	use doc && dodoc -r examples
 	find "${D}" -type f \( -name '*.la' -o -name '*.a' \) -delete || die
 }
-
-# Explicit src_test is there to document that the test suite is integrated and
-# is expected to pass. Please do not remove.
-src_test() {
-	emake check
-}
diff --git a/dev-libs/libstrophe/libstrophe-0.12.2.ebuild b/dev-libs/libstrophe/libstrophe-0.12.2.ebuild
new file mode 100644
index 000000000000..77bb69760d4a
--- /dev/null
+++ b/dev-libs/libstrophe/libstrophe-0.12.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DESCRIPTION="A simple, lightweight C library for writing XMPP clients"
+HOMEPAGE="http://strophe.im/libstrophe/"
+SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.xz"
+LICENSE="|| ( MIT GPL-3 )"
+# Subslot: ${SONAME}.1 to differentiate from previous versions without SONAME
+SLOT="0/0.1"
+KEYWORDS="~amd64"
+IUSE="doc expat gnutls"
+
+RDEPEND="
+	expat? ( dev-libs/expat )
+	!expat? ( dev-libs/libxml2:2 )
+	gnutls? ( net-libs/gnutls:0= )
+	!gnutls? ( dev-libs/openssl:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+DOCS=( ChangeLog )
+
+src_configure() {
+	# shellcheck disable=SC2207
+	local myeconf=(
+		--enable-tls
+		$(use_with !expat libxml2)
+		$(use_with gnutls)
+	)
+	econf "${myeconf[@]}"
+}
+src_compile() {
+	default
+	if use doc; then
+		doxygen || die
+		HTML_DOCS=( docs/html/* )
+	fi
+}
+
+src_install() {
+	default
+	use doc && dodoc -r examples
+	find "${D}" -type f \( -name '*.la' -o -name '*.a' \) -delete || die
+}
diff --git a/dev-libs/voikko-fi/Manifest b/dev-libs/voikko-fi/Manifest
index 116e3c93e959..e48df4aef2a4 100644
--- a/dev-libs/voikko-fi/Manifest
+++ b/dev-libs/voikko-fi/Manifest
@@ -1,4 +1,4 @@
 DIST voikko-fi-2.5.tar.gz 703898 BLAKE2B 596425311bcdbbf8af97bc32cd69c59cdfa56300afbce22501f084b138ffbd7a915f08628e40a832110e9d366d128747d7e7a0ebdfa38a7734c4f1c1cb303997 SHA512 6de3c6c13a9fb05a463a55177dc1707d5e4ca01c7ccf08e0f8ab73cb3a353ee4935adc23a1b5f6c5da568dbb075c081a700d8d46eb99b6bcbed0efb4d977f59a
 DIST voikko-fi-2.5.tar.gz.asc 833 BLAKE2B 329d442064adee3967b703e19edcdfb20a03e3337751282129e2816f265fcd4ada9c2ce82c146bcde8a644e47b462404ce9abf99f5bc6d2fe2f986f83b73d1e1 SHA512 ccdaa4e76b81f8ee8fcc20c1d870200a1255f9aa84c8dae139f343e8b2cc9ecefb38a16af8653e9c94a1e5cba25c850b8309d406e3d5b323864c8c0ad38979eb
-EBUILD voikko-fi-2.5.ebuild 871 BLAKE2B 99b3b6a84fac386874178d02d491dc024f06167fba19bfce81f2789743b83f7ce1faf9afe3bc408f7af5dfd246db07175ca1cb372cb3ef7e1e504c759903b187 SHA512 4a42ae789bea826b95e546f9a1ecb6eb3ccaad270462cc00434c2c2b374b1211b94b721665dc3c2c497e4e0e26f3dde49ae31e0fe7035861457793b6c8a98031
+EBUILD voikko-fi-2.5-r1.ebuild 873 BLAKE2B 20b00457c190b968097b3a183865c91c0d11c3ffc5d573bac8114cf0f0a8d16794cb4218822dde7c1bc25d877ea0b25dfb517b2653cb30f88c961e2dc6111680 SHA512 c56d6dea1f4ed8f6f4f27bfb6964dbdc385acaeff614ff48fa88a5e0d6705e1a32241d411f3b2184a5a2ee5131d5285b5b91c85fb0c353ac1aeb52006222cee9
 MISC metadata.xml 255 BLAKE2B 6fe10a1f843a8b2494606052a69206e32fdd5edf3ca6bdfb661cf6f8e39c0e16fb652acb8697d339770f3559c56a4ba964a0e959b3e0bb456d09ee7570f0d9e9 SHA512 235170971553178916cc484a07e1c665c94cd0a7ec442d2190d3608f7a3441dd2fe08fea666ca23d151077c10c908bc1da0e57355fab43be02711be35531b362
diff --git a/dev-libs/voikko-fi/voikko-fi-2.5.ebuild b/dev-libs/voikko-fi/voikko-fi-2.5-r1.ebuild
index 24cce961816d..71c2acd08a57 100644
--- a/dev-libs/voikko-fi/voikko-fi-2.5.ebuild
+++ b/dev-libs/voikko-fi/voikko-fi-2.5-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-DEPEND="dev-libs/foma
+DEPEND="dev-libs/foma:=
 	dev-libs/libvoikko"
 RDEPEND="${DEPEND}"
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index ad00f1a9c970..c32b6762537d 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/debugpy/Manifest b/dev-python/debugpy/Manifest
index 41c7a9c89dc9..f075d11646e2 100644
--- a/dev-python/debugpy/Manifest
+++ b/dev-python/debugpy/Manifest
@@ -3,5 +3,5 @@ AUX debugpy-1.6.1-unbundle-pydevd.patch 2908 BLAKE2B 2c9ef22ce4e00f8a7bafa4097bf
 DIST debugpy-1.6.0.gh.tar.gz 6366079 BLAKE2B 134d2adcae6ec926dcdb7161f0874b830a1d0e3c55abb991f4861fa5a58045437ee4f4cb4c9572b902e3e33634bc3f9970ae055985b983d89d0ef1d99561bda8 SHA512 fe245d4ff751a6c2ef0e75a5249f99661b78075ac62c931c20e3ccbc9389d39a08dc2fda44a33eb23a0a76e5ee339edae439b0004d130cdfe421048f3cc83962
 DIST debugpy-1.6.2.gh.tar.gz 6684477 BLAKE2B ab1bdf394d3447ba347db149e5c4c36820df6df24c5d0984fe862419a490cea21b240322d76644bc9ebadbdf9a6d6c8709ae28452828d42b45d65edd2d2e58cb SHA512 64ecd9f8290588358abcff538f2c68025f14efc38ac5b406f32cd40a580aab90e0b2f145de90ca81943872c70969d6294ac51b3151bc4e03f18370ddfbb9ac6c
 EBUILD debugpy-1.6.0.ebuild 1102 BLAKE2B 7d06281e8ef9398df0abec8a4f80343164406d12309612b11c2427354cbc10c7ad87eb6c2b69cda51238d3747d7f67abe70a6112feba12571316e5521f56fe2c SHA512 bdc106ee170b4d9b72a7e85da442ea64d5dc25b668fad251c4d9ad494d09b40c6fe58e047dc4707aa3439bfeb90ef98d6a78838c56aee06504ea2eef94a9f27f
-EBUILD debugpy-1.6.2.ebuild 1135 BLAKE2B 2f0cd31012fc4def9763ae604213bbf2c08b9324ba1c68fe7ac4617a2bd216956e93e062b2f40840d3dd29e1a214a7859a2e95b44efb1f8da7eaa56c44daad6d SHA512 e3b1d6ce37fafbee44ea0562ceeb52f81f300695cb0c0a1ba02ca3b70fe02e582fb3adaacf0cd2448aba20b9e18ffb8df04c17a517cac88532a41121d4d401a5
+EBUILD debugpy-1.6.2.ebuild 1133 BLAKE2B ff127e82e58d473b9f33d7d801c650c30632629383082e4a410d3a2a77a570fa8f782313edc99a7c2c2bd51a77323a88813ce8936bd9c4eccb52cbe26f31586e SHA512 652f6c52e02ddfdfcf78c663e02ee7b3f3232ffa3134c065713f46378d87133d6b18d4de99d8868d3a47536b195c888a5494eb8ba040297b571b72fee7f0d842
 MISC metadata.xml 451 BLAKE2B 671153316362e0394ae59824e67f5ea897615d3853552aa92fb273d4a41a88916cfe03650ab42248ffee557cb95149b21160395e0fcb2f1fd69bb3bc2c97ea55 SHA512 393d4898c3555b425c34dad5f540f42fc8e281f6299360d1192d099e73486467c92ed16ca710e34d2868aec63fca2eab4775b86e95e6dea79b8721ff70e1db87
diff --git a/dev-python/debugpy/debugpy-1.6.2.ebuild b/dev-python/debugpy/debugpy-1.6.2.ebuild
index 307130ce5da2..f1590800df08 100644
--- a/dev-python/debugpy/debugpy-1.6.2.ebuild
+++ b/dev-python/debugpy/debugpy-1.6.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 # This is completely broken
 RESTRICT="test"
diff --git a/dev-python/ensurepip-wheels/Manifest b/dev-python/ensurepip-wheels/Manifest
index 5af914d9f5d6..522eb69fa01d 100644
--- a/dev-python/ensurepip-wheels/Manifest
+++ b/dev-python/ensurepip-wheels/Manifest
@@ -1,9 +1,4 @@
-DIST pip-22.2.1-py3-none-any.whl 2044666 BLAKE2B 702699d059273182f248acb48f6f6c9ec287e2edb3de2c84c05402b4fc82da23c14f76e2d3ed8cc1c281e3c8d8fd1a467963d3b9ab6fa384c16d5057fce1561d SHA512 dad2ce78544502a3ec4492a57acc5c1cf6f34ee1d3200a46cf19246f7eda701524d745237909b154317c3d6be6d4e61b086be9562d31d54b60268ca573692638
 DIST pip-22.2.2-py3-none-any.whl 2044706 BLAKE2B 254427e593e44d9f1ce48276fd40f214e8ca9d27b6c31b7a6ed5fa4566df6b1f723215c6a1766a534ce18174f2363c383dbff19368d1b89f1519a53bebd34215 SHA512 142d3144c14b692c645613d98bf35dd91193128d5e21b61a8a702548f1247fac662499d6e39b65c0aa9a0444d2d92983fd8c410439796626485a4e1be99a102f
-DIST setuptools-63.3.0-py3-none-any.whl 1228351 BLAKE2B 5a7a8d864b5fc992952a4c7f0230c3ebb6f33c7b4fc965ca8bfa4cf3b57948e8353f59074f7374e3d002866333d3ad5fd072ccd479f8470cbfcd14aa635efc54 SHA512 f2df66493fb9520b50e3e93560b17e5aa6f01e5fde27028a550249beb54f3ea6b2d8f0a2bcc57afaff193e38d5b217544c0623b254ac300652aed444abf06a14
-DIST setuptools-63.4.1-py3-none-any.whl 1228875 BLAKE2B 8f5a91764f509311f217d9cec6030c8318138d2d60bf8e8cf8ab0d7e9a9d578c1f644aaf30988846c4f22b962b10fa47c2e92cf63ffe0186acaf697c8eb96cc9 SHA512 c73f075f80a97d77906ed9acc1850ab4e458c1d4423a3f9a4b71bd677d7bd0e3ea291683942cd2cc9a91d454e905ea9732e169711c5218a8047997049e0c5536
 DIST setuptools-63.4.2-py3-none-any.whl 1230330 BLAKE2B 8190129907edb6a5a3607fc8caae995070d5740c849cd31510efa43271fddd58c5c21cb1d60a4647473b10ba90a6220e06db92413847cbf71e11e43571def2ab SHA512 8b2a56c840220c616a13ec19b424981b9767f4e39b98a3ba0b99904beb63f4d6d6c28ada37a25d482c1838063ccd09d260b12cc7d00aeca78b95cde49928211e
-EBUILD ensurepip-wheels-63.3.0.22.2.1.ebuild 848 BLAKE2B 2d4062dcde645e944dcc73a9fe8150ded2473bdeb0656832223cc1071b8fbc9b99522eff3eef11778ac9f12e97a85a8c99bdd78a4fd85b7b87b6711439d5e0c4 SHA512 cd12ffe723070c282e9f92ce6c0b125ba0f336e73d063c68f49ad4c91e29dba542ed877dcfe1afd5913c71cfc1f0cc8333d0cb8f7f9ee36050e8f42610a3498d
-EBUILD ensurepip-wheels-63.4.1.22.2.2.ebuild 848 BLAKE2B 2d4062dcde645e944dcc73a9fe8150ded2473bdeb0656832223cc1071b8fbc9b99522eff3eef11778ac9f12e97a85a8c99bdd78a4fd85b7b87b6711439d5e0c4 SHA512 cd12ffe723070c282e9f92ce6c0b125ba0f336e73d063c68f49ad4c91e29dba542ed877dcfe1afd5913c71cfc1f0cc8333d0cb8f7f9ee36050e8f42610a3498d
-EBUILD ensurepip-wheels-63.4.2.22.2.2.ebuild 848 BLAKE2B 2d4062dcde645e944dcc73a9fe8150ded2473bdeb0656832223cc1071b8fbc9b99522eff3eef11778ac9f12e97a85a8c99bdd78a4fd85b7b87b6711439d5e0c4 SHA512 cd12ffe723070c282e9f92ce6c0b125ba0f336e73d063c68f49ad4c91e29dba542ed877dcfe1afd5913c71cfc1f0cc8333d0cb8f7f9ee36050e8f42610a3498d
-MISC metadata.xml 333 BLAKE2B 800dafc25b6f76bebd9f1d47d42e3427c7024ea0114c00201a766fd33d2cd2a466587da9e1cb22b2cd6e45637e8b8f93af7b6a52afd5fbbd460bea880f55a2e8 SHA512 40ee1087f3b5575c3a86368a5ee56c606442e8ace9396eb409bcfda734cc480e781f75d861253772cf9ef113d3cc4a05687b76df45ad5ecff984460ce54583e7
+EBUILD ensurepip-wheels-63.4.2.22.2.2.ebuild 840 BLAKE2B 1243e37a93ffdd939c1aa55cb0926e111e6fd5b6e6011e81b3006734c0f73d35d6f4c1274995a4227cc8868f334eb30b8faab03d69fb2f8b25af0c6f60c80a38 SHA512 564fbb4336c4e46dbd0472801653c53c6af54aa72cf047f72a04ed7379474eefa49975d1e5ee231e3d0832bf22b65ad169acfea125abcc8dbc6ca7e4802a7e30
+MISC metadata.xml 357 BLAKE2B 2275bcbbf65269212f67a4524163fd07ae84c50ec48533b758e600c3d9e8e54db416d5e5a6d0b08f05a82b9c6adcf7df5ccb1ad3c760f79a615136c13235f7ed SHA512 0c30429f2ee7956f92537dcea88ed5e3598575a4b9b64935de0f437791e88ae3c9991c5759e670e7a1cba478a87be7675c4864a707d6a51d9b25540074f14963
diff --git a/dev-python/ensurepip-wheels/ensurepip-wheels-63.3.0.22.2.1.ebuild b/dev-python/ensurepip-wheels/ensurepip-wheels-63.3.0.22.2.1.ebuild
deleted file mode 100644
index 691136b4b5bb..000000000000
--- a/dev-python/ensurepip-wheels/ensurepip-wheels-63.3.0.22.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SETUPTOOLS_WHL=setuptools-$(ver_cut 1-3)-py3-none-any.whl
-PIP_WHL=pip-$(ver_cut 4-)-py3-none-any.whl
-
-DESCRIPTION="Shared wheels for ensurepip Python module"
-HOMEPAGE="
-	https://pypi.org/project/pip/
-	https://pypi.org/project/setuptools/
-"
-SRC_URI="
-	https://files.pythonhosted.org/packages/py3/p/pip/${PIP_WHL}
-	https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-"
-S=${DISTDIR}
-
-# combined license of setuptools and pip (with its bundled deps)
-LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${PIP_WHL}" "${SETUPTOOLS_WHL}"
-}
diff --git a/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.1.22.2.2.ebuild b/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.1.22.2.2.ebuild
deleted file mode 100644
index 691136b4b5bb..000000000000
--- a/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.1.22.2.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SETUPTOOLS_WHL=setuptools-$(ver_cut 1-3)-py3-none-any.whl
-PIP_WHL=pip-$(ver_cut 4-)-py3-none-any.whl
-
-DESCRIPTION="Shared wheels for ensurepip Python module"
-HOMEPAGE="
-	https://pypi.org/project/pip/
-	https://pypi.org/project/setuptools/
-"
-SRC_URI="
-	https://files.pythonhosted.org/packages/py3/p/pip/${PIP_WHL}
-	https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-"
-S=${DISTDIR}
-
-# combined license of setuptools and pip (with its bundled deps)
-LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${PIP_WHL}" "${SETUPTOOLS_WHL}"
-}
diff --git a/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.2.22.2.2.ebuild b/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.2.22.2.2.ebuild
index 691136b4b5bb..adfa2e2b013d 100644
--- a/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.2.22.2.2.ebuild
+++ b/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.2.22.2.2.ebuild
@@ -20,7 +20,7 @@ S=${DISTDIR}
 # combined license of setuptools and pip (with its bundled deps)
 LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 src_install() {
 	insinto /usr/lib/python/ensurepip
diff --git a/dev-python/ensurepip-wheels/metadata.xml b/dev-python/ensurepip-wheels/metadata.xml
index 0c63c4e2b6a7..406eacd7f9fb 100644
--- a/dev-python/ensurepip-wheels/metadata.xml
+++ b/dev-python/ensurepip-wheels/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pip</remote-id>
 		<remote-id type="pypi">setuptools</remote-id>
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 044b19315f30..6dfc724cda01 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,5 +1,3 @@
-DIST ipykernel-6.15.0.tar.gz 134691 BLAKE2B ba3eefde9f1023ccf83c63a35dd99fdfebc0bda0d4f73e6477a098564c0a9fb7c0082413ae31dc8cf423339c3e44887bcf5253355c13630619f44b18d19e9913 SHA512 a6533f094d18d32a02e8de5638fdabb9f647edc9a512e609de3bb1d80f5592acef4e930d879bf79bde7a0ca23945d9eb112d841f2305204fac9f4c672b5315ac
 DIST ipykernel-6.15.1.tar.gz 133140 BLAKE2B 7d63b55f2b8d883234258106b8239cf77031336ce6e7e38234490a031fc4a56861788210fdb2acd0f895e4df43257b0339ef1592e12d33b441e4ba9061acbd08 SHA512 10f2390a4edafea89fcc049d5e07ef542418a3a7b076efec1f02bc0a787e01280624cc543bb60604478cae63b58a86d031b549a6f872c7a8530043d670dbdc0e
-EBUILD ipykernel-6.15.0.ebuild 2059 BLAKE2B 7f50716baf152faeda1bf42ac76e3078ccee939c10632e4b7b55193c745e209a79fca5babc4c680806a533f2380679afc8c4de5671c1b3ad317f1ce59b9c13e2 SHA512 e6c775f4b47cc3802a43ab8b35c08ca7b4c8f76dc84a4797d5d77ad6438779f10020987bc447eb40e8fd9aeec448c7a6b2e33a120aab5e720e93d089bf305ddd
-EBUILD ipykernel-6.15.1.ebuild 2067 BLAKE2B ed9a3b3a53035fdfa4847f57c5ee5dd4098ec24d967bed912eb4e7b9604f840d6fa901f0f08ae4c4b8faf77e63ff2457ed29fbfc1de527156c078e58b3f49dfb SHA512 945e1122d13b7b94b541d07252ba037d321379c1232f0c464fe31a775d0570249d46054a5a3a15970ae1db4e21fde7cc7543549058ee46ae106df00eefd4e76d
+EBUILD ipykernel-6.15.1.ebuild 2059 BLAKE2B 7f50716baf152faeda1bf42ac76e3078ccee939c10632e4b7b55193c745e209a79fca5babc4c680806a533f2380679afc8c4de5671c1b3ad317f1ce59b9c13e2 SHA512 e6c775f4b47cc3802a43ab8b35c08ca7b4c8f76dc84a4797d5d77ad6438779f10020987bc447eb40e8fd9aeec448c7a6b2e33a120aab5e720e93d089bf305ddd
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.15.0.ebuild b/dev-python/ipykernel/ipykernel-6.15.0.ebuild
deleted file mode 100644
index 01c1b618e4b0..000000000000
--- a/dev-python/ipykernel/ipykernel-6.15.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="https://github.com/ipython/ipykernel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
-"
-# RDEPEND seems specifically needed in BDEPEND, at least jupyter
-# bug #816486
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	ipykernel/inprocess/tests/test_kernel.py::InProcessKernelTestCase::test_pylab
-	ipykernel/tests/test_debugger.py::test_attach_debug
-	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
-	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_set_breakpoints
-	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
-)
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
-}
diff --git a/dev-python/ipykernel/ipykernel-6.15.1.ebuild b/dev-python/ipykernel/ipykernel-6.15.1.ebuild
index 5526cde6276c..01c1b618e4b0 100644
--- a/dev-python/ipykernel/ipykernel-6.15.1.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.15.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 57808cd9e3e7..f5cbff2f4a59 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -2,9 +2,11 @@ DIST pypy3.9-gentoo-patches-7.3.9_p1.tar.xz 3952 BLAKE2B 20ff145749d24f15214c0c7
 DIST pypy3.9-gentoo-patches-7.3.9_p2.tar.xz 4548 BLAKE2B 9acdd315d98b5147a21e9affcf4f4be86385cfe7e96a59a4aee1edb478c3c23990c7c846d7a1b268b616491d57346c939ddf02d4284f3b92f0f050e223eb85ba SHA512 28bc05b249f9f98501cb92354eabcdcd27987bfb6f4867bdda40752384db5ecf2204913c792785ce5a0e6ce588ef0044a179a3932da23205e8706cad065d95e2
 DIST pypy3.9-gentoo-patches-7.3.9_p3.tar.xz 5296 BLAKE2B 2422e7d74c563d7328e5bc5c131d13f0cb41f133e06a514e56ad89d2cc8e0b9c57d4379d0e8810486e5e34ec2807a74e9553768a493ffe54fc27d404977097d3 SHA512 3470efdd50ba10e2137b4661c940a3aa807b804ef582a5201507227573637171981bd597b3b40faa3606890f3f51fb8c43ff70628de924a67e2c1226beda9269
 DIST pypy3.9-gentoo-patches-7.3.9_p4.tar.xz 8664 BLAKE2B cccb62bb7957ee21f45eb65a307f255f61ba097cf9313517743bd0c4471d4b4e7c4c2bf2509fffd7584be6efbb467b39aeaec5e70b597844ddd40bd2184f65e8 SHA512 cf9722c5ada7544608b95cb94da4d119fa5371def760c52baaffe57ee0128c729e41a78bbcbcce6677eb88ad063d3f0572667ab8889cf68ee8be7e578ca420c7
+DIST pypy3.9-gentoo-patches-7.3.9_p5.tar.xz 13044 BLAKE2B 0a6119c3393a8b2d599659cee2a57b2a06b18c8dbe0f04fcdbcdde98098c1f19f51c2f387b20fd8db48c6e9dc52f08baeea5f722caf751c0a13078df00538450 SHA512 7965425e107058231657d94e923d132368f11fbc1451f5ae93379f4fc8f8ea62f9e22786b1a97b37a8b4bdb8a295fc5517f07143d04e21b4990f653c0e5f1f05
 DIST pypy3.9-v7.3.9-src.tar.bz2 26976726 BLAKE2B bf1ed21c575901abac020120aaff07ab57f1404713211b19cbd1eb4d6ffc675b7933be8c6fffc2b69ab467963d6598534cd5aa90c02feddad596611d2a6b6581 SHA512 83f8a6a2da351c190d2d224242cbc35e35529c7a8e8d842eaf5c945cbce2e172b02a340f32af3d49df8d5288370d794d5bc95fc12dd4a13d817c925abf06198a
 EBUILD pypy3-7.3.9_p1.ebuild 5459 BLAKE2B cecd4e9ef25bfa9c5c26e444d74eaccfe3a6f588c33af1f64ab0419cdf8944a5b6d78134fadcae6ca682edbe48197df765c830f9cc22a80fb2fa3e5a220fb61c SHA512 30c1a6315502c2fa6d219567c4ec827244257a4f4bdde204fbd0374fd0c1320cbf87097db029ef3822173fa2cd999799b7b79b51df3d1447f67140bee26ecc65
 EBUILD pypy3-7.3.9_p2.ebuild 5461 BLAKE2B 4086916df9196af0dfbc8cf9e2ca0bd4cd6d4d7b927d4d157abae2ff7f7460492d3c30ba4525d1140e4eee8f7f87067bcf6981a0982936cc3f60cd49f332e2fd SHA512 3a24f51744b66a511152a0c52c4d5bb4a41330e452b6d6d67abe87e74a6ffdc8eeb989b8657226c41bd18cdb600eca7ab924cd16839c0e0e6ac49db6a2e8ba9d
 EBUILD pypy3-7.3.9_p3.ebuild 5579 BLAKE2B 6b30c40b01e3e4e6ffa6eaa2095df5e061079bb5ea2e858564aa1fb9c03ac54b1bf5422b722a3ae6bc0d166e4a3f4a302862cbdf908034682d3d61930bb055b4 SHA512 a357b3c6fe57074821a5b7b95851e5dc22cda8135f1828dd9250715394d43a96369b43273bacff38865b5b2d3aeb29eadc0fb84b1d8746e5235a73cefc3d4c14
 EBUILD pypy3-7.3.9_p4.ebuild 5773 BLAKE2B 2f9fac9ca77b85d68f81f965324d7a58d87e2fd546653e9b72217a1cd7b716c49e94a482ed7ccfa907fcf8e936746879791a50d197709f80dceddc92bf430502 SHA512 6126c4b7e711930a039e4825396fcdfa784d2f4c54817a799b2f28e82a2cde9864fba17aa0cfddcfeee1828f4a0dc9eeccb9571693aee802295b4504e40bf355
+EBUILD pypy3-7.3.9_p5.ebuild 5773 BLAKE2B 2f9fac9ca77b85d68f81f965324d7a58d87e2fd546653e9b72217a1cd7b716c49e94a482ed7ccfa907fcf8e936746879791a50d197709f80dceddc92bf430502 SHA512 6126c4b7e711930a039e4825396fcdfa784d2f4c54817a799b2f28e82a2cde9864fba17aa0cfddcfeee1828f4a0dc9eeccb9571693aee802295b4504e40bf355
 MISC metadata.xml 455 BLAKE2B 568930d8cb9c6efa7e41d2285fa487ab7aee2344c11fe5cc325d24d6dbcd1184daffcad3b262351b39a45cdf7994ed301b61946eafa1be901b7419636d2eebd9 SHA512 357104cf9ac21d9c7fa5d843cfa7e2c5883d2f11e0bc15ac0fa8ab36a9595194ac05165f5aee94c3eb98ad370f0bf16f4488819311f8f077e9f2a79586f711f0
diff --git a/dev-python/pypy3/pypy3-7.3.9_p5.ebuild b/dev-python/pypy3/pypy3-7.3.9_p5.ebuild
new file mode 100644
index 000000000000..62da106fee36
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.3.9_p5.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python2_7 )
+inherit pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy3.9-v${PYPY_PV/_rc/rc}
+PATCHSET="pypy3.9-gentoo-patches-${PV/_rc/rc}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.9) language"
+HOMEPAGE="
+	https://www.pypy.org/
+	https://foss.heptapod.net/pypy/pypy/
+"
+SRC_URI="
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
+SLOT="0/pypy39-pp73-336"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 +ensurepip gdbm +jit ncurses sqlite test tk"
+# many tests are failing upstream
+# see https://buildbot.pypy.org/summary?branch=py3.9
+RESTRICT="test"
+
+RDEPEND="
+	|| (
+		>=dev-python/pypy3-exe-${PYPY_PV}_p3:3.9-${PYPY_PV}[bzip2?,ncurses?]
+		>=dev-python/pypy3-exe-bin-${PYPY_PV}_p3:3.9-${PYPY_PV}
+	)
+	dev-lang/python-exec[python_targets_pypy3(-)]
+	dev-libs/openssl:0=
+	ensurepip? ( dev-python/ensurepip-wheels )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy3-bin-7.3.0:0
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		!!dev-python/pytest-forked
+	)
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+
+	eapply_user
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	mkdir bin || die
+	# switch to the layout expected for cffi module builds
+	mkdir include/pypy3.9 || die
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/bin/pypy3.9-c-${PYPY_PV} pypy3.9-c || die
+	cp -p "${BROOT}"/usr/include/pypy3.9/${PYPY_PV}/* include/pypy3.9/ || die
+	# (not installed by pypy-exe)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/pypy3.9/ || die
+	mv pypy/module/cpyext/parse/*.h include/pypy3.9/ || die
+	pax-mark m pypy3.9-c
+
+	# verify the subslot
+	local soabi=$(
+		./pypy3.9-c - <<-EOF
+			import importlib.util
+			import sysconfig
+			soabi = sysconfig.get_config_var("SOABI")
+			magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff
+			print(f"{soabi}-{magic}")
+		EOF
+	)
+	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
+
+	# Add epython.py to the distribution
+	echo "EPYTHON='${EPYTHON}'" > lib-python/3/epython.py || die
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy3.9-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
+		import lib2to3.pygram
+		import lib2to3.patcomp
+		lib2to3.patcomp.PatternCompiler()
+	EOF
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+	# (NB: we build CFFI modules first to avoid error log when importing
+	# build_cffi_imports).
+	cffi_targets=( pypy_util blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma posixshmem )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy3.9-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Verify that CFFI module list is up-to-date
+	local expected_cksum=63d4659f
+	local local_cksum=$(
+		../pypy3.9-c - <<-EOF
+			import binascii
+			import json
+			from pypy_tools.build_cffi_imports import cffi_build_scripts as x
+			print("%08x" % (binascii.crc32(json.dumps(x).encode()),))
+		EOF
+	)
+	if [[ ${local_cksum} != ${expected_cksum} ]]; then
+		die "Please verify cffi_targets and update checksum to ${local_cksum}"
+	fi
+
+	# Cleanup temporary objects
+	find -name "*_cffi.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	# Test runner requires Python 2 too. However, it spawns PyPy3
+	# internally so that we end up testing the correct interpreter.
+	# (--deselect for failing doctests)
+	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3.9-c -vv lib-python || die
+}
+
+src_install() {
+	einfo "Installing PyPy ..."
+	dodir /usr/bin
+	dosym pypy3.9-c-${PYPY_PV} /usr/bin/pypy3.9
+	dosym pypy3.9 /usr/bin/pypy3
+	insinto /usr/lib/pypy3.9
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r lib-python/3/. lib_pypy/.
+	insinto /usr/include
+	doins -r include/pypy3.9
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/include/pypy3.9/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy3.9/${x##*/}"
+	done
+
+	dodoc README.rst
+
+	local dest=/usr/lib/pypy3.9
+	rm -r "${ED}${dest}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${ED}${dest}"/ensurepip || die
+	fi
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/sqlite3 \
+			"${ED}${dest}"/_sqlite3* \
+			"${ED}${dest}"/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/{idlelib,tkinter} \
+			"${ED}${dest}"/_tkinter \
+			"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x EPYTHON=pypy3
+	local -x PYTHON=${ED}/usr/bin/pypy3.9-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}/usr/bin/pypy3.9-c-${PYPY_PV}" "${PYTHON}" || die
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index cdacb86b974a..e01f004cdf94 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,6 +1,6 @@
 DIST python-ldap-3.4.0_p20220420.tar.gz 377780 BLAKE2B 433178138587dc09bfe1e6a8e894c001baf6e07c76266ca9d7c56b279f9e9ca5a642528a5869a837a9ee5576a2cf17afdeea313b4a8bc930926397738d6a5daf SHA512 0dfe8ff4737a630a08c7cd4d94f30c78fd1e0558ffc0609439d95ef064b72aef9d4ec4cdc0d40aaf1fc46396bdc0cbbdf0bf3cf6bb5e94bf8a9e3083b9ba1bf4
 DIST python-ldap-3.4.2.gh.tar.gz 377981 BLAKE2B 6efa768dd035f8867abacfd9cc1b9ceca1a468c79550d2529130bd8eaf7546e4474d5798cf9090a9a74f05286ca30a33b8e54821292b8aa2e27358f93d72cb7b SHA512 3a68dd2c160d7d74061d9c9eb060be6faeec1f607f3853722f969d7d1dc76c7da160aa20a4c139feb4d2eba6dbf2e2cfb02551cabd6fbf413654f32f73e94c15
 EBUILD python-ldap-3.4.0_p20220420.ebuild 2339 BLAKE2B 643b27187a5fc5892a6c7301bacb58fbf57a31f6de6a704e7871e6a9dfc693d9c6c3980137cfc41cf745d6fe52ebf94f0e98fa33094237e9dc0ee5407c0ae2d8 SHA512 2dcf1c028bd92213eedf22b099b9f4518b7a5add89d73b3aaec0958b20276ea18311145ac0ceb902f8ed9ea72eb1dfb5367e7404933acc309a0e5cf400d5aae3
-EBUILD python-ldap-3.4.2.ebuild 1706 BLAKE2B 4baf713276892bd69df2c593e65f4f859c422d3ac492d66b10957332d789fdeaa7a33f99d504f59f1dbebfda84b8e54ed74b919b7eb680fb539d76188d942724 SHA512 464b830763c8f4787e814fbf118d04106c58f085439bf2c3cfb911b2e8b1fbc4ce43dc268fc6f860f7bc3773ef131724092adc2da1838548cc13c6a7e07204bb
+EBUILD python-ldap-3.4.2.ebuild 1705 BLAKE2B 59f1e35298f5fc8269f06f66809d01b6d1d681431cb9587c5ecee1ea2e5ce1ac4db80829d2f9e7f0b94e440782c89f70951b56881d1701b3b11883132381d26c SHA512 cfd0d58b00104521cfe67bedd122e3a8c8cb30646da1fe334db76c97f312a4894cfaf0eb7be795616f33870181222ad4c489cce6c88ddb4e520ddd17c94a4b81
 EBUILD python-ldap-9999.ebuild 2000 BLAKE2B 1340f010714318a6a8e90ffa228a3c0799909ee1f70af5ec5cbd73449d6982a18df35353a3d356d559a89c43be1c44f097698236a6118ad66fac5630a75d57c8 SHA512 c58a4c82d5e18bb29b62024a826b063f0f47ee3f9e4a798251175b4115a31f5a5803962ec597c12d8855faba83c259f559083a6499524f41197d2ecfd0d3a9fb
 MISC metadata.xml 449 BLAKE2B 14ffa18ca09eb663d3ef4ff5bd0ebc8511fa408a4e96c93885ba2beaccdf3bb82a9733a01149e088c8b66d6cb938f94fc3940c0c0cca5685599191e772443cb6 SHA512 2f5c014e55f838b84abf6ba630b000620a01e2fca6d1f1bd1b30db309f820df50c2ef7feddc17c69ee0188c3cbc91a388933b4bccfc8d2ea0cb18c6dae85cda6
diff --git a/dev-python/python-ldap/python-ldap-3.4.2.ebuild b/dev-python/python-ldap/python-ldap-3.4.2.ebuild
index f749ed1579f1..b3b4226b9246 100644
--- a/dev-python/python-ldap/python-ldap-3.4.2.ebuild
+++ b/dev-python/python-ldap/python-ldap-3.4.2.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="MIT PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86 ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86 ~x86-solaris"
 IUSE="examples sasl ssl"
 
 RDEPEND="
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 2c7013bf3c40..ac30a539dbbf 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -7,5 +7,5 @@ DIST regex-2022.7.9.tar.gz 383431 BLAKE2B 9773b3e5c516d79ec6b37d288addb063801671
 EBUILD regex-2022.6.2.ebuild 889 BLAKE2B 2f4739ef643cd8ce3dce81e94160c6943bfb5f5309f62306bad54dbdf0ff0035fdac591d776c5da341060b4da89d12396b54e2436855bb85e4e449c454e6552d SHA512 e95dc22617b73dcd0e01504dd8e974f09260c79f0935fe9cc9d6a2842640556ed1f34d619fdf31917ae2d466dda860ed02fb9539178c5700ed26ec1132c738b0
 EBUILD regex-2022.7.24.ebuild 897 BLAKE2B 409dbb1b548b25d5ac390fdd799e88f54255462fe43a054bb079396a58d2124f06b619c9f97bd95e09a84fec93ed76f0904ace13a81f40ba34ab54fedc885e30 SHA512 0c57dc92862339020b9caf9e727f75f577fbcc3710dfbc8657ba403d7791e2a7a42e0866d6fe82640b2d674167c60ac51e259dd03ed2acf8260435f0b352fbfd
 EBUILD regex-2022.7.25.ebuild 897 BLAKE2B 409dbb1b548b25d5ac390fdd799e88f54255462fe43a054bb079396a58d2124f06b619c9f97bd95e09a84fec93ed76f0904ace13a81f40ba34ab54fedc885e30 SHA512 0c57dc92862339020b9caf9e727f75f577fbcc3710dfbc8657ba403d7791e2a7a42e0866d6fe82640b2d674167c60ac51e259dd03ed2acf8260435f0b352fbfd
-EBUILD regex-2022.7.9.ebuild 892 BLAKE2B da7db5f44160677d8d0039e18f57192b2bbf9180c7e1d52c2ccaa58c2d5e2bdc6378302543931ec6348d0837aeaa6e8860ea9beae76359f7ce89853f9b64a6f3 SHA512 005f45d4b297327eed9a928e1ba4f4ff296517f0658a0666c9c48a668871f5a13a33a86d0c16b5b9467a6f1fc38c905feb1a6f0a87683afbba19000baf627ea6
+EBUILD regex-2022.7.9.ebuild 890 BLAKE2B f296e36dd12abd066d236d045d084498c1b4f34b87de0e2594f581b2af032fe9ac29e36102f486c22fc96557b4fe107cc5f7ab9203d8855d001d44aad30da173 SHA512 2dbe6ce417cca1309ae4fc63e73377a51d4020ad25c339ef84fd75d833b7d4c26a27d55f95a86cc6282c61a3318d010b58c7685f8246e28741a0a3dc1e5d4604
 MISC metadata.xml 385 BLAKE2B 90c9075dcf3be9bd447746b249c438f50bc84a7c6c63051e808c5feb19b2c6208f85a681e449a025fe43cd0d5b2ab541752966b04b787052d78b92d5230d8e62 SHA512 f554035e72bcfff83e693f3651198f09fd354babfbadd5fef26dca3015ef8cc00c47072648794123c69bbd12c637eeaf9e9471680bab847ec701da2146462817
diff --git a/dev-python/regex/regex-2022.7.9.ebuild b/dev-python/regex/regex-2022.7.9.ebuild
index fd4fab4dd011..dd9fb7628614 100644
--- a/dev-python/regex/regex-2022.7.9.ebuild
+++ b/dev-python/regex/regex-2022.7.9.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/setuptools-rust/Manifest b/dev-python/setuptools-rust/Manifest
index dd6633900015..45bd85bdc67b 100644
--- a/dev-python/setuptools-rust/Manifest
+++ b/dev-python/setuptools-rust/Manifest
@@ -79,5 +79,5 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD setuptools-rust-1.3.0.ebuild 3145 BLAKE2B 89fcd32448cef2c1c9a68b3abcdcae256b22e3ebffd389efe37f6a8af0fbbf714d01c1c18143860b3baa94e65d38c23d94f2030d88e2fdb43810cb287475a081 SHA512 69a2570e8d7e6ecf833202b63196fc99d606a60aae02dcb369ba61a514fc6c16cfbd619a542ac10b0d567fa077f71314b592a2be8f20d9209d30b5fbf642135a
-EBUILD setuptools-rust-1.4.1.ebuild 3227 BLAKE2B 751bb0460f9a76f5f6ea698145d86f878b882f17a8b5b111af74e92da289736aae91da8365b8ced2fbf70ddc3b591914a73096110e65325c66ae1c114c4fbb7a SHA512 b63c1a672fb551a6593121d29d80c5796fb3233c25437a7f036ae13c5a3f897c1b53221eb6d7d95b5b30f1c2622e39e683c89df7cdebdad5d42c83a45c77615a
+EBUILD setuptools-rust-1.4.1.ebuild 3225 BLAKE2B 23ad7f4ef4aa5c5228593a9c3a829c67758de44365e055f6db844b96ad3ba8e8baea8e4234ab916134bea245d15eef4e7b0a4884f35b85f2362df010ca0eca3e SHA512 abde9ddb9101263a8b0504105c587deacc92f876473cfe73f287ae21517c624f93bc00fb0e1871e21dc446d868c59ba73e52ae56520da3a9110c8f2d6e5ebc1a
 MISC metadata.xml 476 BLAKE2B c8f0ef0779f0a4412a7d9b97e1bb03e3bfb3c031209f489a100b30402d99224014e379712989afd0cb76c85be301dcf9a51e21e8f9195262c5920dd1db0703d1 SHA512 af74755e9e8fb61cbded2dc3e63cd20f95393ef2650bed9f81e299f7759ae79c63b45df8048cd0fe25397ec7db10156be681fa5278606a20481f78d5279b815b
diff --git a/dev-python/setuptools-rust/setuptools-rust-1.4.1.ebuild b/dev-python/setuptools-rust/setuptools-rust-1.4.1.ebuild
index 692cddff5b19..099a4bf3dfc2 100644
--- a/dev-python/setuptools-rust/setuptools-rust-1.4.1.ebuild
+++ b/dev-python/setuptools-rust/setuptools-rust-1.4.1.ebuild
@@ -97,7 +97,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index ac785502c974..3229c8dea142 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index ffc72da59cf7..2e1e50e95e41 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -2,6 +2,6 @@ AUX ninja-cflags.patch 738 BLAKE2B ec025836197d41d96cfcab0a7363ab3bda50cb7fc3f91
 DIST ninja-1.10.2.tar.gz 213959 BLAKE2B b8160ca6d58cfa0edb93d16b7dfb9776d290c42e54b33b78cd925f167c80f8794e4cc30af984a526b8263c7904a734cf0770d3c27283d21d02f18d3e2eb70032 SHA512 895412ae1cbc83c656e92f282602a29300e08274e9dea0da4464202ae556e7a1ab03bec057f23da4756bbd91bd2d744cd7a64b336740fd2782bb4db5c3b7b496
 DIST ninja-1.11.0.tar.gz 229475 BLAKE2B 71c8b6cf9524bdc11cf73f7e761f0d7deef2498a970c1439c10cc7d361e31fed1e3b54bcb185f3c7ed041f15704851a96e42560058af61b8a5df6e918d52ebf3 SHA512 9b9c8dae2251f9ddba50680911271b8504c292994fd90a0da94902f64c69a9edc72212217df5c651ddfc2f79c2ae03e84c99b805497dcd7497c53a1617de83e7
 EBUILD ninja-1.10.2-r1.ebuild 2798 BLAKE2B fae8cb33fbd559d68120a8501fa99e7a6299227c590c9902a1cc402798e892d92718ca1e6248d22f41059e2a1a98ca92bdfb534a33ebc34cadd88615974fe565 SHA512 c26741a21ef5155ef518d219b377fbe70139406b533ff64c2a2f1cf626848f76a2172052f5b2584a7c4a50e3017c7d4ba4ea656141e8925bf8bdb4a9a06b301f
-EBUILD ninja-1.11.0.ebuild 2668 BLAKE2B 1ebdeb5f36dad792201dc119d4e9c82c16c4e64e2a134f36e4562dfb05379015d86cf1aa3c775fd972ea0c86f287a85c11deba92fa44d9eb830c0c4a866852b3 SHA512 b0fa5498451e5f062140684cdcbc7d486e28406468d858c0a4c41b349337bcc899584ae53f26821cab9b523526518f23d19570dee7cfa2e16dc746408d9357a0
+EBUILD ninja-1.11.0.ebuild 2666 BLAKE2B aeb622704dfd0d63da4e6be5806ba158e5fdd48384413104cfc735655775036bc1c5b4a6a5bb700de6791a2e683061f526370cc6dceaa66f9eca0cd1990cc627 SHA512 963e5d9fe6dfe2aa7542ba1d34344018aa399336e1ffcea9fba3630777fcd1bb24a79d9785dfb00d68ce41d9a40968a4b11f85c8fc56e5883cb78883e9900e5a
 EBUILD ninja-9999.ebuild 2672 BLAKE2B 62774b99edc98754f307c8a5576e148534cc21eed8fc0b0e42ac2653b27943f8b86b3368b856743011884a034601e221bcac1da81c45bede2c249b7e42b6783c SHA512 014bc565791220ba3794563973162e38237a5f5cb7247c79fbbd6ef811944d2decf9f67c8f29df2f0a39920f9077f1550625bbb4bbdbac3d2f0f4f642ec2577f
 MISC metadata.xml 345 BLAKE2B 62344dee3d109b90fe9cdc68f581d3dddd9ffee182af72e82509180d9382b6765ecac373680f0c3fc3e1b5c4e9641a689bb036ee877a2117d335ae4e1608718b SHA512 20d5ee6f6448835b6cdcb3ac1f6760d5bc452aa44a1c72de2241cd47432967498c30099c79a5b59a53796cbe1c373291bb62a5d48914996fa20c9e22569d68eb
diff --git a/dev-util/ninja/ninja-1.11.0.ebuild b/dev-util/ninja/ninja-1.11.0.ebuild
index d382bc336382..6dd95b7345e5 100644
--- a/dev-util/ninja/ninja-1.11.0.ebuild
+++ b/dev-util/ninja/ninja-1.11.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
 else
 	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index dc2b7e462d2a..b45b51fc7a1d 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 05091a34ea99..b5eaa17fc5ab 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -2,5 +2,5 @@ AUX fontforge-doc-no-warn-error.patch 834 BLAKE2B c8bd1cfcf320b7831cc64d67d8de52
 DIST fontforge-20201107.tar.xz 14163424 BLAKE2B 8ce9148eef6e5b7206ab5c70310ff36fac67c392117e3c0b28060803a54306bf21c179b62b98734e11253739eac29e2ea8bcf3014c09432bb3a0b2b0f3ec631a SHA512 cf9666395405ab02943f0160959f04251bd2a80e279a8f60431089ad19a4c5a232efd42097050ed9f6c1fb39d01488176262949fd81f5f0960fe853b497437dc
 DIST fontforge-20220308.tar.xz 13719032 BLAKE2B 66939a77014b086b95ea21c3af2a2c910c19ebba000d50e514000667a6b193f5a90fc55b6046793811cac3a7330c479973746ac09041f21b0237047105f4d305 SHA512 9975cffec8aa47bcb8c22405bea544cd263dc939b253e8fba2fbaa3b90a60e05b98eaf58365db8ae854d1fff8e641866a7e2e027003ae03a77104d6650dafb6c
 EBUILD fontforge-20201107.ebuild 2863 BLAKE2B 1c6ca7f18f00c3f09f145593d391f074d9d76d6aec893fe4f871b554b053bbfa870901c49b182ef4c34176e5a2e793f88369746794ecdd94b0096378722a0ec5 SHA512 8f5baa9a193d1cd047fc33e6d9848f1cb4bb0be16a351c838ad0a0be0cae3a77c534f7638b4e6e93cfb2d7def79692e1222f91fd122f54950a1a07fe0454b645
-EBUILD fontforge-20220308.ebuild 2780 BLAKE2B fa71375144bb5102cb2670a2a9781fc70194d5378a620cf1c1210cd4f8dae94cdbc28a84e780602a00677a6e09e634ad2fe4fa6feddefc75e33becde5895d94e SHA512 d3c0f8904616b6fa3348206e6e638515a984a39857bee949e87c42a18dbbdd68da43b479237297bdb2ea1dd67495a5ddbcfb08caa8dda433d0d204c0af441712
+EBUILD fontforge-20220308.ebuild 2779 BLAKE2B 5271351893f2e2c3d53f1fad4b3ab521b7325ecd1ab4e264b063af354e2da10347994976f6dcc694501925faf80e68ab4a664f0bed082643d001e9a329497240 SHA512 2604e269fad1a91ad7b07d0dd1acc81b8b97436175da2157593f26a40c26c9b397960c8ec8defbf2ad5590f1cad36b877fadeac2e143a09c7ccb2f1e093e10b5
 MISC metadata.xml 863 BLAKE2B 6a87762712128bf3d57122277839008c4ef057491ae1c1680a166194037ed00e66816f2c0c09be8a17909843ad49b807c06405b95332684dbee3b8d60d30d7ae SHA512 8f33c7d38f031fbf85c82b9743db80c2a3c85ddddeb4deb631fbb911a8e6c2e97b43560b82539ac93df0c577abe74ef743fd4ca1a3e2e2f978b7edfd94cba280
diff --git a/media-gfx/fontforge/fontforge-20220308.ebuild b/media-gfx/fontforge/fontforge-20220308.ebuild
index c34da438b9d1..bafa7a5fa7cb 100644
--- a/media-gfx/fontforge/fontforge-20220308.ebuild
+++ b/media-gfx/fontforge/fontforge-20220308.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforg
 
 LICENSE="BSD GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg woff2 X"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index e30b936619ff..48e4848fa0dd 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index eeadf6939d5d..c1df1ddde933 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -7,6 +7,6 @@ DIST freetype-doc-2.12.1.tar.xz 2038632 BLAKE2B 81225caf1a2c586a8a282a22eaaf2341
 DIST ft2demos-2.12.0.tar.xz 263612 BLAKE2B d0cc154084a28a965798ba34c00368d70163d748f52fe360a6bd920bc9b6b962492efe05b7206b9bc4c4fd4770aa7db4279a287d6ba65a81daf7fc2b7a679a96 SHA512 70176ad89eab0121e9f5610f777da7e2f8478e24fbe9aded7f7fc3d7685019d40a0d0d6b586f3499f8589a2923082e3a9bc8ddc66482b8898642230bff5eaae2
 DIST ft2demos-2.12.1.tar.xz 263656 BLAKE2B fd48dc68bd832e7532e9fae869a19699ab3337e599118bb9f1b76c3bcdcecec3cd3f55f7387508d29baf85b8de4a549aaa0e8af34d988743b1737458e255bdcf SHA512 cd9356152a64d807c75b797d005ca1dd0bde69cc2fadedec101d125cb54b2aaff1f7afa2f20839caba7db66325df7c11ed4883b7e906110356b28d9900caaae7
 EBUILD freetype-2.12.0-r1.ebuild 7567 BLAKE2B 4754c8239a201e8ed1fb307887c6ac513aae84521b2632a99a176e43d16596a1d2ddfb260a598ae11a935d512e9f09dbae652f95f0bb06b49ea411dd26266fe5 SHA512 0dd511f51361c3d6aef8dd4da09d2ca53c704bdd7dd57e91191f884f7e1f5af681c0237a7da8ee1c792a979978104f7f6653cd08897fd43ebd079413efc041a8
-EBUILD freetype-2.12.1.ebuild 7443 BLAKE2B 81c8ac3926228c2a231511b3450304e1813938763ca18f186d773f757e3313b38164b3634008723f1678dc314302efe487f876dbeacc950ef7bf0de4efce743a SHA512 d93ee93d382dc9264cc7cf5d343603c0d018621100fc2b9328e4c7f46468b91a98b4c8708bcf160ce0f6f48c4d7629cd34653fc4b46b5b9e2bfae36af7bc529e
+EBUILD freetype-2.12.1.ebuild 7442 BLAKE2B a98c832f2d55564272429366df968204991d050c3f81795a9ff456fdb5137d6ea50b3d8e9143e43287a4d8abe7a273f393dd2c376046d472cd0f6e855b6d4c97 SHA512 297d15eb967909935af0c4a3902174a76770e77110807c62fe63fbdc4e473e3e92d3e8e9b8fae4c25ed3d5070046904359865c2175d5e02366b9445c1ce3d17b
 EBUILD freetype-9999.ebuild 7107 BLAKE2B 49c7d1ac429480f097baceba37ba0953b0a7a81a68636a9facee191643e8dce6c794f96e2250e5a17a72972bc8fcc400c24bb7f88f34162176490ab251d8076a SHA512 c4ecfed508b10a050c4d5957583d5fb370110f06753b1d439feedea1f859d11520a6dd2b7c26a0b3d0513ec2d6b6dd40dd13cf143531c548d9f533aa72384730
 MISC metadata.xml 1306 BLAKE2B db0f9487a62f002883a1850bbf90f5df4007215ce432440023a9c637ec79333576db4ebe4d3275f088a9225848eb508ef1b409c4c67ade051663d822ad5cb9ec SHA512 464c6f6810572f9f9194adba7b85ed8dfbe1c1b3dccafd5370fb555547b7a708768e2f302baa437cd5ab06a9da34a00d5aec7a48bc2903b24b8dab9f42aaa493
diff --git a/media-libs/freetype/freetype-2.12.1.ebuild b/media-libs/freetype/freetype-2.12.1.ebuild
index de3944e757a2..ec80b6fe47c6 100644
--- a/media-libs/freetype/freetype-2.12.1.ebuild
+++ b/media-libs/freetype/freetype-2.12.1.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
-	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit git-r3
diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index 5eecb6688ff0..c85fb43aa277 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -2,5 +2,5 @@ DIST libjxl-0.7.0_pre20220329.tar.gz 21282311 BLAKE2B 8ced9811adba47e5ccac4d55cb
 DIST libjxl-0.7.0_pre20220511.tar.gz 1488860 BLAKE2B 63cc0d8161eb83efbae9c4ef238ec7300a8354ee7e030fafb96efca9c50216edfaf45bf276403df41a1bf4add533cb7031074c62faafc2f8d2e499290525f332 SHA512 605299cd4294c524b703bd163c083cb04c1f247aab5a6756d2e68482dab98c8d9585f248c03290e67c6cadf8692ead0c00abce7162d8dd7bf26b2cd4bfd1f736
 EBUILD libjxl-0.7.0_pre20220329.ebuild 1966 BLAKE2B 471819d39ffda2fde94c3e9567df095a60fde5c6bd7fe8da6c7f37f5a187abf2da900c2def6560049d8728d375aef98708c1ae53725fd45f5e0531a60cf68fa0 SHA512 e5b77fe41bfe6ae7063fcbe2cba6b2cde3147e9ebc266a597df9807af47dc5afb2ff9821fb0235a2e1f423a48c1013e2b29b2a4366c3231cd0c54b4c495ac276
 EBUILD libjxl-0.7.0_pre20220511.ebuild 1818 BLAKE2B 82d7db772a702fdedad0a1c7c009273082b8211df5a1bd7c821d0992429b33780d13134665caabba1f744fb2420abd6c108ae793d9d43ddcbed699f461bc57ee SHA512 554e7ffaffd6394ebad6bb5cf57c269a8bbdb95e03fb51b2fc8529963bd0e16d39d6c53136957f0d88d678725e94535c507d4e01f351bf39bd8aa5a98179fd22
-EBUILD libjxl-9999.ebuild 1826 BLAKE2B 1a0f9655b2fe44f61c8bb277dc96b4412855051dd53284815f04a577bb73c5c106b004d69648cb370c7bbb179da82df63f788317624656f76c91a0bc7443e556 SHA512 19af8aef31c90e326162425509b652be0c0f1be81750d090dff2ce1407dcf302cfcae2034ff6bf57d4f1d9b50330d97ff7c87cc1fc14254c20bae70342e69130
+EBUILD libjxl-9999.ebuild 1825 BLAKE2B f25b4b4c41b7c2bd1f97bfbba975a6e9a61a4550c4e02425354e39c125dd1dc07d5c65814655e6525704c556757949c0295a4e47766cd95c82b44e56e0b0b936 SHA512 92a8a2918fdb31b73603e3ec17fd8c4b30555457969e4c0820fad7b3ab1800611c1d90abb626d70b8a2c62c50dd5e69fb7aa1125fdf4c6acb8aa8514e90afc15
 MISC metadata.xml 737 BLAKE2B c6d720ad6e51168ebab6cc33b8c3af44149f19a8331f1b834fcf4e33f9b90050fae96bdd03202a83960ec7d01d9427e6eaf0be51d47efa736533b8bb5affaac5 SHA512 6b461b43818da3626a59c7d040c7f3cf470624b6205001445a0ede4ceffa4f1ad6233ea85cf3616dd4bfd7cbbd50ce28e0f509e13ec06b64ba4b724e2a90d602
diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild
index 88ff53d84586..a2269bfc62ec 100644
--- a/media-libs/libjxl/libjxl-9999.ebuild
+++ b/media-libs/libjxl/libjxl-9999.ebuild
@@ -17,7 +17,7 @@ IUSE="gdk-pixbuf gimp210 openexr"
 
 DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
 	dev-cpp/gflags:=[${MULTILIB_USEDEP}]
-	>=dev-cpp/highway-0.16.0[${MULTILIB_USEDEP}]
+	>=dev-cpp/highway-1.0.0[${MULTILIB_USEDEP}]
 	media-libs/giflib:=[${MULTILIB_USEDEP}]
 	media-libs/libpng:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index c8e6e01d5740..f5e8314d833a 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -3,5 +3,5 @@ AUX rubberband-3.0.0-build.patch 6150 BLAKE2B 2548de747697e04988e55483f08afd1c8e
 DIST rubberband-2.0.2.tar.bz2 178974 BLAKE2B 602d7eb76791d431a65bd5ef0d53ea0c2672e67aaa566594b3b2bb026cdf1b8879380818c3626a2c6d51cd6366bd47a52c69c110da566aa234fb7b37b19f027b SHA512 87dc5d59995bf949c35b885bb2eced067d84775bab76692da1202ae7554cb1b8404ca7371c264363e6d55c8978762ed32b446535746061f09e90cfc599adc0a0
 DIST rubberband-3.0.0.tar.bz2 213089 BLAKE2B 74afdf1f7c3360b711b365d73e12fe84afa5abc8ddb6a10a3d31392a621e9fca67e8b4c0292238b0e5726c56242438e1b2ef1d7d6ea6979a360cc7ecab45de75 SHA512 d8ce300a2cca7e35c548f9cd9f2f77f9b730b0e9427214d4a825b32ea9c90769e229f91db5846b90ff11a1513e8f68447fb598aa2684f67f10b4b9414b9ad748
 EBUILD rubberband-2.0.2.ebuild 1580 BLAKE2B 63d0645884bbbf9b033c42c257477c57b794f95a6dad529e707db3c4319b6ff9be4b62a42f17f2fd8528ffcf3998653bae2b3eaa72a2448d1fcbbda30b3b2438 SHA512 708a74df246ca65f6ea0f384ada9870b88c4db42d92d03758daf232d7f2bb6d35de6c50b3291ac4a5bbfb1aac82ecce38d33c0785d6a5df5e107479cd39093a6
-EBUILD rubberband-3.0.0.ebuild 1576 BLAKE2B 51cc98632c8385d4e1c87f1d455eb9885eec7ff700179320becc4c044a31faa172295d20a7d37652e054f865d5b7cfd60f0c64717e4e9f63f4f5aaea54878899 SHA512 9092b516cf33c59591fea47cfa1f790fce89d58749ef4e19d1ba4f14ca233fd8b3c3d2799f47deefcda2f0f4f39c1088f884e6ec76449ecee4fc7f272754b699
+EBUILD rubberband-3.0.0.ebuild 1574 BLAKE2B 51dc0b8bd83226eda15a5d35c5f1f589f0a009664c01ebd697febd75ea8e1a2a5997deee7c4f20950f2b3eb74ae8a5d22aba90abfb6bb3580636ee91abf5478c SHA512 640cf1c42eabfa6a6f5dc153d0e028bd9a3c74f36cd8b7dd0496627f0da4e4b6fe193118443c98aa6f84181b8bf29169e16ebe541cfc944ece5aa58b1880e3d9
 MISC metadata.xml 491 BLAKE2B bda0db771d95de138274eb35f4c135f3bd9fb3a1b75ce60a8c57ad71e0c0a894924bb52060c8ca87e689f2a0f581213639de2ca5615a134dfecfa4f008698b2a SHA512 c549bcf465808927153a79f145b222379270d2813e150606382dcb1c15980a37a89d7f0178d3fee2fd3eb7216dd6ad989efe0a24e398f67af95872f6c92d570a
diff --git a/media-libs/rubberband/rubberband-3.0.0.ebuild b/media-libs/rubberband/rubberband-3.0.0.ebuild
index 60f6b4ff34a5..ca9a1e974112 100644
--- a/media-libs/rubberband/rubberband-3.0.0.ebuild
+++ b/media-libs/rubberband/rubberband-3.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="ladspa jni static-libs +programs vamp"
 
 BDEPEND="
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index f817e3c310e4..03195d068e7b 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index c2587c6905b6..2a110c91e4ec 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -1,4 +1,6 @@
 AUX flrig-1.4.4-musl.patch 618 BLAKE2B e03367cea46747325ab98a9a9b2a7bb2b977e21e430d648e4ad2c8dd95665fc78d98b0d3fd3253953c9e714f5edc80031f5a236435e5b4ff5472e700809086fa SHA512 9d46857614b82053f64153ecf17e2d5ce89c419972d233d17ae5d237b0e7a2fa0756602adbf80bfc9a990978fbff5fbaeb56f186904490499055684a980e3d86
 DIST flrig-1.4.5.tar.gz 995774 BLAKE2B 7853c38521c880cd0b1622dae339f6e5120ca9679e7f661e9b0aacc9b3bb12708c3c9a8b1204db0ebe69358bf0dd0daa0a5989163cc304b43c6906cc1872da4d SHA512 f4bd283900975f59b82208e21d9258b25901ed893e339cfc80eb27ce464439eb9df7b04af855a2c87b73cc477d327f965fd48d89589539bdf0da907078f765d3
+DIST flrig-1.4.7.tar.gz 1042848 BLAKE2B a1cb9ccd57466dc1d2b387dd8a4e9784f937a2f0227a0e394b10a25b40d06c4c9566dff2b4e5f7b09b5564b13b8fa604a0618f7909b992053f8d7ec6f0aa4c7c SHA512 6d213e15e0a81808491509e10c84e6f90b5f22483a9a327a4a1a56fdd1b773f2ddfa615470e5e5458747bf4d7a2087f2753951b25e6d2169dcf26aed7f50d87d
 EBUILD flrig-1.4.5.ebuild 580 BLAKE2B 736959be898c2c019f981b73efeb1959855e77dc69b7be94d78010395e7b863140744df973509a677f3753c484e652246ff603ff5eaeade68f71f3d639334d5b SHA512 ae7ad3a79af61d473426a6f28a6677ed42c7563584cc8c95a575d7a799beabdf83f64363be6b7bcd133b8d80a9835bc27c96b0b377dd0fafdc9b734666013fd3
+EBUILD flrig-1.4.7.ebuild 582 BLAKE2B b09dfce22f77aa2d6d5a6438c17ef42e0bddb9789c32abf5adf457af92008637f3ccc2d567aa4b4ebb4961cfcad3362619c69f0408f347f97259a32a6c1fec77 SHA512 f3a0722ae497b9d4c28d35ff26b77294de34cd131b01ee2a5118023638996b4f93e5de661fe4b2bd5b11c1a0938ea47918a0b26cb57ca8888e932ec85ec94816
 MISC metadata.xml 326 BLAKE2B fb57e943fa61222b3967939ff95da7bb17aae2651e55d960a9c405e6d5965843ed0ec9e6fadd0df1f41602c0f3c90c78c6ca2ab12ea72b515484f7c2ec34ec68 SHA512 e48dc185e9eaa074ed92d1ed27920e41b72760cd3e878fd40583efdca0a6997598a7d82221a33c7987fb19dea090f92eee070b9e89ea452ddce028d88db7bf9c
diff --git a/media-radio/flrig/flrig-1.4.7.ebuild b/media-radio/flrig/flrig-1.4.7.ebuild
new file mode 100644
index 000000000000..fa8591685185
--- /dev/null
+++ b/media-radio/flrig/flrig-1.4.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Transceiver control program for Amateur Radio use"
+HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
+SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+DOCS=(AUTHORS ChangeLog README)
+
+RDEPEND="x11-libs/libX11
+	x11-libs/fltk:1
+	x11-misc/xdg-utils"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+PATCHES=( "${FILESDIR}/${PN}-1.4.4-musl.patch" )
+
+src_prepare() {
+	eapply ${PATCHES[@]}
+	eapply_user
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 58900185a190..91ec475dab39 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 99791d15f290..392db5f2dbea 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,5 +1,5 @@
 DIST fluidsynth-2.2.7.tar.gz 1748897 BLAKE2B fd53603947ddf5a76676cfc3d77b1d904146ec7c30ab6e54a2c32cae0e76ec4b66397506072cac277febdd1b799801d5b13c7b37cc0ea4a545fae26077a1d881 SHA512 62709f96fa07bbafb9b907438da7376abdf1a4e679cd2b105c5bca257f1ff62c18bd4c646ef2ccba64ca5273604da996fb2caaf61eeee44686bf45fef1ed83a7
 DIST fluidsynth-2.2.8.tar.gz 1751615 BLAKE2B 7eaee4cc1c2f49e464cda2852890ec8e96bd86c258a39246ec5c84ea3e57c9869d1e88963daecc3fa8957df1d55ff6c6633a4900de3d6fc0a1adf830865adda0 SHA512 8173f2d368a214cf1eb7faae2f6326db43fb094ec9c83e652f953290c3f29c34ebd0b92cbb439bea8d814d3a7e4f9dc0c18c648df1d414989d5d8b4700c79535
 EBUILD fluidsynth-2.2.7.ebuild 3411 BLAKE2B cf562d000e5f356f19726938c25725b46fafb5e89cf38284f06b22698c8b862223d36a50aca668442646883ec9f276233388c6ead9bd1e4552960e7f1297c8c3 SHA512 005178c5da24a8d97d75743235db5ea4dd6c7f08896b06af3dca8ee14f0b8acd05009ba28f0a5fa7c40a0507d7b9bb164117b92ceb00d3574eb8345ccab33dfc
-EBUILD fluidsynth-2.2.8.ebuild 3418 BLAKE2B d06ccfb0efd1626bf3ad273d7b743fc549a1a4d7d8f1bfb24dfbb303e2141370510d9326b34912995bd5604c4824fb7293919e98faeae7a57af69caf29e731c1 SHA512 c401e9ab73e94457be436e4adf6a0c438000743da19a57e299e5e6844ec1bea8ef294f9a4428186601b5c1b33be9b245d0a851055d4d41f1699d3a1214026ee2
+EBUILD fluidsynth-2.2.8.ebuild 3413 BLAKE2B 0b37909e267fcb08c8726e5b6012f01b2d5987d2ac6046e36f2df77bfe21783b3f696d064df171251ac09b4f3be55c56d493a6eb2d22706efbb26ae83171ed28 SHA512 5bead39e2f8a80de14bc4b18dd240709816227649f19dd3dea8b4bc2c3d3e7c044a960dd63416c57bb757f37bf76f2804842e4a30610fb0b06568936ce19efb3
 MISC metadata.xml 431 BLAKE2B f739f538274e2e63b1977673b0766a594db59982ab71d6552d1e841434c4040bb7af29d441b1d9e8ce61385dbdb8e522b5591f6826a4c52f085bf004f9fe8426 SHA512 c8085e7652a504610fb841e302ee380de58a67a16a9b874447c00ee20c2d56119254eed954704e8bd4cf8e574980da2dd2f90baa5c99e59cd534e26245af67bb
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.8.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.8.ebuild
index 51908c546139..29d582572fd6 100644
--- a/media-sound/fluidsynth/fluidsynth-2.2.8.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.2.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc ~x86"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
 BDEPEND="
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index b81b8980f746..b1631f3cf859 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index a03a3a561952..a99aae6b36a4 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 10 Aug 2022 06:39:56 +0000
+Wed, 10 Aug 2022 12:39:53 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 3b31a2898f90..ea775c2d5b64 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 520976 BLAKE2B 7dfaf17999dad5e80e78ca82a3453bad0d1dd93080c368421ff47c3671435b97874f1120a4f79883a4be6eef4c4ca625a2780e2baa63a836f2c65b64d721932b SHA512 b7a8242e7f468835252f7166256d06fc326a7b57876a83546b977c0010c88282d7526387515ddfdc846408f5965fd794a2d8be4351a3422ce499e998eaf2eb90
-TIMESTAMP 2022-08-10T06:40:01Z
+TIMESTAMP 2022-08-10T12:39:58Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKSBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLzUsFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLzpx5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAf8A/2Ll3bnLdG5rVjUf4BFHaJkwKD/N2oLkaqHSN/P5FwCjuxkIXoR8Ufn8an
-OniZ9kPpyNNTDXYljRdRvlC+P8NjATTM/omp3Zsc2/P9R/KtqF4a/3c6/P5tkN+p
-vNcvrEfUvXx6i9hoYW3Y3nGrN21OuIP6jqvfNPguOxs1zPMnknouvb9MW0w1jsiy
-WpBGUtq9ciIINICrqNex1fxbhpl41CyggdE8wQsNBHj/2ae+KI7sfh+5mj34y5gs
-MyB0vMyU3uutRWk5NoHUJlZ1KHr0p48+d/lfRF3GIdjqC98YkdyEan72BbWauo03
-vOIToOHK70HiE1FxMgEGvemNe+4UFDGPVYsEQ6TEcJ6evMWwId8FqtdzY4uIsGv4
-+P6uzYV8Gm2QMYXLtorrvRf9yV9kHFwdfS7JJtQEWU8kl/a6ypj38L7LSQ275cLl
-L7YHEdgD0urIuzK/zyT0FF2p5t6PhrtmFPczwjkaYBkBy1PJJCH8o5pcy8YKkK8Y
-ckA9nvVLkjn5uzNlfKL4p9gRspu1a1J4hhBZZ2LlMlXcgWMOUgKIBAg/nsf739Hj
-zMwZykwhhAOaqODZBnxKgJnodRa8ZioXtO8VXG/JpevsC5W+BZ9dZhv3ilzgIDob
-SHv4qhyFLaO2/ZsUr1WJKrRqxtVKhAAMKZvfwvTJZKQ74oSU/w==
-=sz+k
+klCYqA//aBFc+UlLgwzDp4tqpsiHaD0ZXio3v6Vg738dI+T1uV6guDUQRqAYpCfS
+Ji3Zj7ogowKiIM0BRu/RXRyb52cLJGEBEiP87YylD+bZT/W8ydXCt3ToEVgyp/6t
++AmeR6oiOgdXa2Fo5acvS/ltAYACpPw9yNUazjt606R9d6YtsLV/0fVDBKP6uhKG
+kaZMiPRwFwNge3bfXceEgdGJc/RK8SYHIJSGvTHycetEPClRk5oBaG2MAkFinRaJ
+pLau/2RsZsMWzEMpzP9cEOUDYBkOCP+ezZE3lBO8/9z6no+ime7siha2/TpNempw
+TSUfA31x8LZEuzfsfN5ZhLaIkaOTDX3gOcrKhLa+LtwKci82Pi3y+3/ROrOlaFtr
+DkZDbSw75lgdDM3ioemntgxrW/suE9T5edvS6ctlhK6kwepgpMNL6YPN5ZC5mOV8
+E9UPUHiVAJidqvdrL0ZKbL6TODGAUrbKCUr83tReQNScmdCyGHZhdP5xju75mOdg
+x9fkTOWeaxk+DtltfB4z09pczYJww5OrolkcRsxY0oC6C6dt/f+H5STTcn5PM9q3
+Q+YikrmbbwgdBw6tOutG7Eq3vhbQwRGBzUREW05fQ5PZWD8BnEHnA0tFwB0ceS0G
+CtDnm6Unpb6wg8GgzreZwX7SPeBXTDDjGt+7RVylvePR3Omn5Ao=
+=98QC
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index a03a3a561952..a99aae6b36a4 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 10 Aug 2022 06:39:56 +0000
+Wed, 10 Aug 2022 12:39:53 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index da37b3e8e479..e3c8963119c6 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 797e21019b3b..a55ef3a7a62b 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/dar-2.7.6 b/metadata/md5-cache/app-backup/dar-2.7.6
index f6e421d41213..c9729cab065d 100644
--- a/metadata/md5-cache/app-backup/dar-2.7.6
+++ b/metadata/md5-cache/app-backup/dar-2.7.6
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://dar.linux.free.fr/
 INHERIT=flag-o-matic
 IUSE=argon2 curl dar32 dar64 doc gcrypt gpg lz4 lzo nls rsync threads xattr
-KEYWORDS=~amd64 ~ppc sparc ~x86 ~amd64-linux
+KEYWORDS=amd64 ~ppc sparc x86 ~amd64-linux
 LICENSE=GPL-2+
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils app-arch/zstd:= sys-libs/libcap >=sys-libs/zlib-1.2.3:= argon2? ( app-crypt/argon2:= ) curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gpg? ( app-crypt/gpgme:= ) lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:2 ) nls? ( virtual/libintl ) rsync? ( net-libs/librsync:= ) threads? ( dev-libs/libthreadar ) xattr? ( sys-apps/attr )
 REQUIRED_USE=?? ( dar32 dar64 ) gpg? ( gcrypt )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/dar/dar-2.7.6.tar.gz
 _eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0e1a7a58bb669254a44a5198e1951cec
+_md5_=c073d76280e50a6e37c9a7e440054e26
diff --git a/metadata/md5-cache/app-backup/dar-2.7.7 b/metadata/md5-cache/app-backup/dar-2.7.7
new file mode 100644
index 000000000000..01d7244a8903
--- /dev/null
+++ b/metadata/md5-cache/app-backup/dar-2.7.7
@@ -0,0 +1,17 @@
+BDEPEND=doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure install
+DEPEND=app-arch/bzip2:= app-arch/xz-utils app-arch/zstd:= sys-libs/libcap >=sys-libs/zlib-1.2.3:= argon2? ( app-crypt/argon2:= ) curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gpg? ( app-crypt/gpgme:= ) lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:2 ) nls? ( virtual/libintl ) rsync? ( net-libs/librsync:= ) threads? ( dev-libs/libthreadar ) xattr? ( sys-apps/attr )
+DESCRIPTION=A full featured backup tool, aimed for disks
+EAPI=8
+HOMEPAGE=http://dar.linux.free.fr/
+INHERIT=flag-o-matic
+IUSE=argon2 curl dar32 dar64 doc gcrypt gpg lz4 lzo nls rsync threads xattr
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2+
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils app-arch/zstd:= sys-libs/libcap >=sys-libs/zlib-1.2.3:= argon2? ( app-crypt/argon2:= ) curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gpg? ( app-crypt/gpgme:= ) lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:2 ) nls? ( virtual/libintl ) rsync? ( net-libs/librsync:= ) threads? ( dev-libs/libthreadar ) xattr? ( sys-apps/attr )
+REQUIRED_USE=?? ( dar32 dar64 ) gpg? ( gcrypt )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/dar/dar-2.7.7.tar.gz
+_eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=b9ccde0a68b1ece262bd3986ef4e39b6
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index f46bb932899d..cb8635835da7 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/emacs-28.1 b/metadata/md5-cache/app-editors/emacs-28.1
index ed110d3eae3b..d3b3aaca0c4a 100644
--- a/metadata/md5-cache/app-editors/emacs-28.1
+++ b/metadata/md5-cache/app-editors/emacs-28.1
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
 INHERIT=elisp-common readme.gentoo-r1 toolchain-funcs
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
 RESTRICT=test
 SLOT=28
 SRC_URI=mirror://gnu/emacs/emacs-28.1.tar.xz
 _eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ab0202a4d97e1defb431d9a9b2670637
+_md5_=75777fff271eb748565a54c6280baeac
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 87e1c16072ea..442a55221fae 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/transifex-client-1.2.0 b/metadata/md5-cache/app-i18n/transifex-client-1.3.0
index e5aa12e18924..4ad4612c1cce 100644
--- a/metadata/md5-cache/app-i18n/transifex-client-1.2.0
+++ b/metadata/md5-cache/app-i18n/transifex-client-1.3.0
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=Apache-2.0 BSD BSD-2 ISC LGPL-3 MIT MPL-2.0
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://github.com/transifex/cli/archive/refs/tags/v1.2.0.tar.gz -> transifex-client-1.2.0.tar.gz https://gitlab.com/api/v4/projects/35204985/packages/generic/transifex-client/1.2.0/transifex-client-1.2.0-deps.tar.bz
+SRC_URI=https://github.com/transifex/cli/archive/refs/tags/v1.3.0.tar.gz -> transifex-client-1.3.0.tar.gz https://gitlab.com/api/v4/projects/35204985/packages/generic/transifex-client/1.3.0/transifex-client-1.3.0-deps.tar.bz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
 _md5_=8ff5a1c8c170282d399684f4765874bf
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index b6648790e73b..1396c646931f 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/mupdf-1.20.0 b/metadata/md5-cache/app-text/mupdf-1.20.0
index f46b2191986f..ffe915000bc9 100644
--- a/metadata/md5-cache/app-text/mupdf-1.20.0
+++ b/metadata/md5-cache/app-text/mupdf-1.20.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git
 INHERIT=desktop flag-o-matic toolchain-funcs xdg
 IUSE=+javascript opengl ssl X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86
 LICENSE=AGPL-3
 RDEPEND=dev-libs/gumbo media-libs/freetype:2= media-libs/harfbuzz:=[truetype] media-libs/jbig2dec:= media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= >=media-libs/libjpeg-turbo-1.5.3-r2:0 javascript? ( >=dev-lang/mujs-1.0.7:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) X? ( x11-libs/libX11 x11-libs/libXext )
 REQUIRED_USE=opengl? ( javascript )
 SLOT=0/1.20.0
 SRC_URI=https://mupdf.com/downloads/archive/mupdf-1.20.0-source.tar.gz
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1b34ba9662be2f93ebb7413047e9db1b
+_md5_=4f4f1b09e506fc1bf869b8e997b2db61
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 74c2716562fe..0a9622d5a560 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/highway-1.0.0 b/metadata/md5-cache/dev-cpp/highway-1.0.0
new file mode 100644
index 000000000000..5d8f38722ef8
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/highway-1.0.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-cpp/gtest[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Performance-portable, length-agnostic SIMD with runtime dispatch
+EAPI=8
+HOMEPAGE=https://github.com/google/highway
+INHERIT=cmake-multilib
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/google/highway/archive/refs/tags/1.0.0.tar.gz -> highway-1.0.0.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a236474985a60e719ebe87a8ba649be2
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index cb7641ae6df9..62ea8d957e12 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c-8.0.27-r1 b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.27-r1
index 81aacc084d7a..a7f3a53182a7 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c-8.0.27-r1
+++ b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.27-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://dev.mysql.com/downloads/
 INHERIT=cmake-multilib flag-o-matic
 IUSE=ldap static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-arch/lz4-0_p131:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( dev-libs/cyrus-sasl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<dev-db/mysql-5.6.45-r1 !=dev-db/mysql-5.7.23* !=dev-db/mysql-5.7.24* !=dev-db/mysql-5.7.25* !=dev-db/mysql-5.7.26-r0 !=dev-db/mysql-5.7.27-r0 !<dev-db/percona-server-5.7.26.29-r1
 SLOT=0/21
 SRC_URI=https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-8.0.27.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a257af84439a424da322fa3ccaddb1a3
+_md5_=508102c180e6855484458f9fd83c3f3c
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 55672b3b0e62..8f76e899a551 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/byte-buddy-1.12.13 b/metadata/md5-cache/dev-java/byte-buddy-1.12.13
new file mode 100644
index 000000000000..d8faa879f8c1
--- /dev/null
+++ b/metadata/md5-cache/dev-java/byte-buddy-1.12.13
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* dev-java/asm:9 dev-java/findbugs-annotations:0 dev-java/jna:4 dev-java/jsr305:0 test? ( dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Offers convenience for attaching an agent to the local or a remote VM
+EAPI=8
+HOMEPAGE=https://bytebuddy.net
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/raphw/byte-buddy/archive/byte-buddy-1.12.13.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=f063757109fa2915474066f3f634bdcf
diff --git a/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1 b/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1
index bebff2661794..6838658f1f14 100644
--- a/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1
+++ b/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j/istack-commons/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86
 LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-istack-commons/archive/4.1.1.tar.gz -> jaxb-istack-commons-istack-commons-runtime-4.1.1.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=1c1c306097611f6efc71a12188bff5c2
+_md5_=0ead086a1cf17e6812986ec9d2d793a4
diff --git a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50 b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50
index a8eadee497e4..c36f5fc302e0 100644
--- a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50
+++ b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://download.tanukisoftware.com/wrapper/3.5.50/wrapper_3.5.50_src.tar.gz
 _eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7f36a6435eeb9a3ef08e93c1fc0dcda6
+_md5_=06216ebb0040718c783b75372dfed603
diff --git a/metadata/md5-cache/dev-java/log4j-core-2.18.0-r1 b/metadata/md5-cache/dev-java/log4j-core-2.18.0-r1
new file mode 100644
index 000000000000..4529729015eb
--- /dev/null
+++ b/metadata/md5-cache/dev-java/log4j-core-2.18.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/commons-compress:0 dev-java/commons-csv:0 dev-java/conversant-disruptor:0 dev-java/jackson-core:0 dev-java/jackson-databind:0 dev-java/jackson-dataformat-xml:0 dev-java/jackson-dataformat-yaml:0 dev-java/jansi:2 dev-java/javax-mail:0 dev-java/jctools-core:3 dev-java/jeromq:0 dev-java/kafka-clients:0 dev-java/lmax-disruptor:0 ~dev-java/log4j-api-2.18.0:2 dev-java/slf4j-api:0 dev-java/woodstox-core:0 dev-java/jakarta-activation-api:1 dev-java/jakarta-mail-api:0 dev-java/javax-jms-api:0 dev-java/osgi-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=The Apache Log4j Implementation
+EAPI=8
+HOMEPAGE=https://logging.apache.org/log4j/2.x/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* dev-java/commons-compress:0 dev-java/commons-csv:0 dev-java/conversant-disruptor:0 dev-java/jackson-core:0 dev-java/jackson-databind:0 dev-java/jackson-dataformat-xml:0 dev-java/jackson-dataformat-yaml:0 dev-java/jansi:2 dev-java/javax-mail:0 dev-java/jctools-core:3 dev-java/jeromq:0 dev-java/kafka-clients:0 dev-java/lmax-disruptor:0 ~dev-java/log4j-api-2.18.0:2 dev-java/slf4j-api:0 dev-java/woodstox-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=2
+SRC_URI=mirror://apache/logging/log4j/2.18.0/apache-log4j-2.18.0-src.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=a466561d59ca52ac52c3f36756a5201b
diff --git a/metadata/md5-cache/dev-java/snappy-1.1.7.8-r1 b/metadata/md5-cache/dev-java/snappy-1.1.7.8-r1
new file mode 100644
index 000000000000..a4fd59e93ea3
--- /dev/null
+++ b/metadata/md5-cache/dev-java/snappy-1.1.7.8-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/osgi-core:0 app-arch/snappy dev-libs/bitshuffle test? ( dev-java/ant-junit4:0 dev-java/commons-io:1 dev-java/commons-lang:2.1 dev-java/plexus-classworlds:0 dev-java/xerial-core:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Snappy compressor/decompressor for Java
+EAPI=8
+HOMEPAGE=https://github.com/xerial/snappy-java/
+INHERIT=java-pkg-2 java-ant-2 toolchain-funcs
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* dev-java/osgi-core:0 app-arch/snappy dev-libs/bitshuffle >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=1.1
+SRC_URI=https://github.com/xerial/snappy-java/archive/1.1.7.8.tar.gz -> snappy-java-1.1.7.8.tar.gz
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8d1eee5f4ff7f176979b66360b337ec3
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 00f8ce87a6b6..3bbd7a4ed2b6 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/python-3.10.6_p2 b/metadata/md5-cache/dev-lang/python-3.10.6_p2
new file mode 100644
index 000000000000..e4031c69f7fb
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.10.6_p2
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_10(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
+INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
+IUSE=bluetooth build +ensurepip examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk +xml verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=PSF-2
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_10(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
+SLOT=3.10
+SRC_URI=https://www.python.org/ftp/python/3.10.6/Python-3.10.6.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.6_p2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.6/Python-3.10.6.tar.xz.asc )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=a9ec79b902daca7d9d5b8d094911f0b0
diff --git a/metadata/md5-cache/dev-lang/python-3.8.13_p6 b/metadata/md5-cache/dev-lang/python-3.8.13_p6
new file mode 100644
index 000000000000..6f893e869b98
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.8.13_p6
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_8(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
+INHERIT=autotools flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
+IUSE=bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml verify-sig
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=PSF-2
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_8(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
+SLOT=3.8
+SRC_URI=https://www.python.org/ftp/python/3.8.13/Python-3.8.13.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.13_p6.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.13/Python-3.8.13.tar.xz.asc )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=05b8194fca48583eb817fc10273b79bf
diff --git a/metadata/md5-cache/dev-lang/python-3.9.13_p4 b/metadata/md5-cache/dev-lang/python-3.9.13_p4
new file mode 100644
index 000000000000..632fad2009c5
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.9.13_p4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_9(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
+INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
+IUSE=bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk +xml verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=PSF-2
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_9(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
+SLOT=3.9
+SRC_URI=https://www.python.org/ftp/python/3.9.13/Python-3.9.13.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.13_p4.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.13/Python-3.9.13.tar.xz.asc )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=24db5924ad4febe69c342bea080e6bac
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r10 b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r10
deleted file mode 100644
index 760901ecd1ee..000000000000
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/nspr-4.7.0 sys-libs/readline:0= x64-macos? ( dev-libs/jemalloc ) || ( >=dev-lang/python-2.7.10_p15:2.7[threads(+)] ) app-arch/zip virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4
-DESCRIPTION=Stand-alone JavaScript C library
-EAPI=6
-HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
-INHERIT=autotools toolchain-funcs multilib python-any-r1 versionator pax-utils
-IUSE=debug minimal static-libs test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~x64-macos
-LICENSE=NPL-1.1
-RDEPEND=>=dev-libs/nspr-4.7.0 sys-libs/readline:0= x64-macos? ( dev-libs/jemalloc )
-RESTRICT=!test? ( test )
-SLOT=0/mozjs185
-SRC_URI=https://archive.mozilla.org/pub/js/js185-1.0.0.tar.gz https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot0-patches-02.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a95f5fbc1dd6a693ba3876febdf4526a
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 4df62f51b196..68aa5a8bd4a7 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/foma-0.10.0_p20220612 b/metadata/md5-cache/dev-libs/foma-0.10.0_p20220612
new file mode 100644
index 000000000000..a112027c7165
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/foma-0.10.0_p20220612
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/bison sys-devel/flex >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/readline:= sys-libs/zlib
+DESCRIPTION=Multi-purpose finite-state toolkit
+EAPI=8
+HOMEPAGE=https://fomafst.github.io/ https://github.com/mhulden/foma
+INHERIT=cmake
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=sys-libs/readline:= sys-libs/zlib
+SLOT=0/0.10
+SRC_URI=https://github.com/mhulden/foma/archive/9e8c3df573015a26c84e113ba710ef3d57c8e777.tar.gz -> foma-0.10.0_p20220612.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2abfab5b6117af1f949ef745e90c7ad8
diff --git a/metadata/md5-cache/dev-libs/libstrophe-0.12.0 b/metadata/md5-cache/dev-libs/libstrophe-0.12.0
index e05369393c70..711b03457ddd 100644
--- a/metadata/md5-cache/dev-libs/libstrophe-0.12.0
+++ b/metadata/md5-cache/dev-libs/libstrophe-0.12.0
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
-DEFINED_PHASES=compile configure install test
+DEFINED_PHASES=compile configure install
 DEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= ) dev-libs/openssl:0=
 DESCRIPTION=A simple, lightweight C library for writing XMPP clients
 EAPI=7
@@ -10,4 +10,4 @@ LICENSE=|| ( MIT GPL-3 )
 RDEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= ) dev-libs/openssl:0=
 SLOT=0/0.1
 SRC_URI=https://github.com/strophe/libstrophe/releases/download/0.12.0/libstrophe-0.12.0.tar.xz
-_md5_=7ea1818f22d3162bb2c4b7d2013e7dc9
+_md5_=cd9392a0bc2b08c2eb2850ec6cad0eff
diff --git a/metadata/md5-cache/dev-libs/libstrophe-0.12.1 b/metadata/md5-cache/dev-libs/libstrophe-0.12.1
index 80f7bebb5908..d931ac14fbbb 100644
--- a/metadata/md5-cache/dev-libs/libstrophe-0.12.1
+++ b/metadata/md5-cache/dev-libs/libstrophe-0.12.1
@@ -1,13 +1,13 @@
 BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
-DEFINED_PHASES=compile configure install test
+DEFINED_PHASES=compile configure install
 DEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= )
 DESCRIPTION=A simple, lightweight C library for writing XMPP clients
 EAPI=7
 HOMEPAGE=http://strophe.im/libstrophe/
 IUSE=doc expat gnutls
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( MIT GPL-3 )
 RDEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= )
 SLOT=0/0.1
 SRC_URI=https://github.com/strophe/libstrophe/releases/download/0.12.1/libstrophe-0.12.1.tar.xz
-_md5_=9b5da6bedd71cbe5380f1438f9e84f5f
+_md5_=62a85cbb95e88281d3be05692eaf1a93
diff --git a/metadata/md5-cache/dev-libs/libstrophe-0.12.2 b/metadata/md5-cache/dev-libs/libstrophe-0.12.2
new file mode 100644
index 000000000000..a0ed1922be1e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libstrophe-0.12.2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install
+DEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= )
+DESCRIPTION=A simple, lightweight C library for writing XMPP clients
+EAPI=7
+HOMEPAGE=http://strophe.im/libstrophe/
+IUSE=doc expat gnutls
+KEYWORDS=~amd64
+LICENSE=|| ( MIT GPL-3 )
+RDEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= )
+SLOT=0/0.1
+SRC_URI=https://github.com/strophe/libstrophe/releases/download/0.12.2/libstrophe-0.12.2.tar.xz
+_md5_=384f3aa8d7e2bc756c6c005c7da4fe30
diff --git a/metadata/md5-cache/dev-libs/voikko-fi-2.5 b/metadata/md5-cache/dev-libs/voikko-fi-2.5-r1
index 37840f43dd62..92101432aed9 100644
--- a/metadata/md5-cache/dev-libs/voikko-fi-2.5
+++ b/metadata/md5-cache/dev-libs/voikko-fi-2.5-r1
@@ -1,6 +1,6 @@
 BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) dev-libs/libvoikko verify-sig? ( sec-keys/openpgp-keys-voikko ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile install setup unpack
-DEPEND=dev-libs/foma dev-libs/libvoikko
+DEPEND=dev-libs/foma:= dev-libs/libvoikko
 DESCRIPTION=Finnish dictionary for libvoikko based spell checkers (vvfst format)
 EAPI=8
 HOMEPAGE=https://voikko.puimula.org/
@@ -8,8 +8,8 @@ INHERIT=python-any-r1 verify-sig
 IUSE=verify-sig
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=dev-libs/foma dev-libs/libvoikko
+RDEPEND=dev-libs/foma:= dev-libs/libvoikko
 SLOT=0
 SRC_URI=https://www.puimula.org/voikko-sources/voikko-fi/voikko-fi-2.5.tar.gz verify-sig? ( https://www.puimula.org/voikko-sources/voikko-fi/voikko-fi-2.5.tar.gz.asc )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=fb68fee132f78a7ccaeed65002c5c52e
+_md5_=4cc14508b52012b93c4cf8544c727baa
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index c51d189ec839..3dccc42e45e0 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/debugpy-1.6.2 b/metadata/md5-cache/dev-python/debugpy-1.6.2
index d68a7c069f72..1980ddc8a1a9 100644
--- a/metadata/md5-cache/dev-python/debugpy-1.6.2
+++ b/metadata/md5-cache/dev-python/debugpy-1.6.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/pydevd[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/microsoft/debugpy/archive/v1.6.2.tar.gz -> debugpy-1.6.2.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0ff0edc7e34ba4d747e84f66e66f62f3
+_md5_=2fd59aad2821c6ee503a22e8cc6db616
diff --git a/metadata/md5-cache/dev-python/ensurepip-wheels-63.3.0.22.2.1 b/metadata/md5-cache/dev-python/ensurepip-wheels-63.3.0.22.2.1
deleted file mode 100644
index c91f9c5a6ed9..000000000000
--- a/metadata/md5-cache/dev-python/ensurepip-wheels-63.3.0.22.2.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Shared wheels for ensurepip Python module
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pip/ https://pypi.org/project/setuptools/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/py3/p/pip/pip-22.2.1-py3-none-any.whl https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-63.3.0-py3-none-any.whl
-_md5_=38599eac27c58e664ba46672b8e33827
diff --git a/metadata/md5-cache/dev-python/ensurepip-wheels-63.4.1.22.2.2 b/metadata/md5-cache/dev-python/ensurepip-wheels-63.4.1.22.2.2
deleted file mode 100644
index 3e8f1e713cfc..000000000000
--- a/metadata/md5-cache/dev-python/ensurepip-wheels-63.4.1.22.2.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Shared wheels for ensurepip Python module
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pip/ https://pypi.org/project/setuptools/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/py3/p/pip/pip-22.2.2-py3-none-any.whl https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-63.4.1-py3-none-any.whl
-_md5_=38599eac27c58e664ba46672b8e33827
diff --git a/metadata/md5-cache/dev-python/ensurepip-wheels-63.4.2.22.2.2 b/metadata/md5-cache/dev-python/ensurepip-wheels-63.4.2.22.2.2
index 898a8bc9d9a9..2d5d8da9821e 100644
--- a/metadata/md5-cache/dev-python/ensurepip-wheels-63.4.2.22.2.2
+++ b/metadata/md5-cache/dev-python/ensurepip-wheels-63.4.2.22.2.2
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Shared wheels for ensurepip Python module
 EAPI=8
 HOMEPAGE=https://pypi.org/project/pip/ https://pypi.org/project/setuptools/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/py3/p/pip/pip-22.2.2-py3-none-any.whl https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-63.4.2-py3-none-any.whl
-_md5_=38599eac27c58e664ba46672b8e33827
+_md5_=527f526d64326d70aacfe3c064f894b9
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.15.0 b/metadata/md5-cache/dev-python/ipykernel-6.15.0
deleted file mode 100644
index efd2a07a8c22..000000000000
--- a/metadata/md5-cache/dev-python/ipykernel-6.15.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipyparallel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hatchling-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=IPython Kernel for Jupyter
-EAPI=8
-HOMEPAGE=https://github.com/ipython/ipykernel
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipykernel/ipykernel-6.15.0.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f6438878ef76e477020d5fd7aff04bb1
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.15.1 b/metadata/md5-cache/dev-python/ipykernel-6.15.1
index 54583e32bdd0..f091b130cc6c 100644
--- a/metadata/md5-cache/dev-python/ipykernel-6.15.1
+++ b/metadata/md5-cache/dev-python/ipykernel-6.15.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ipython/ipykernel
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipykernel/ipykernel-6.15.1.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b8dca97c37f5e4527036b5d4729db0fe
+_md5_=f6438878ef76e477020d5fd7aff04bb1
diff --git a/metadata/md5-cache/dev-python/pypy3-7.3.9_p5 b/metadata/md5-cache/dev-python/pypy3-7.3.9_p5
new file mode 100644
index 000000000000..ba6b376270de
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-7.3.9_p5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=|| ( >=dev-python/pypy3-exe-7.3.9_p3:3.9-7.3.9[bzip2?,ncurses?] >=dev-python/pypy3-exe-bin-7.3.9_p3:3.9-7.3.9 ) dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-bin-7.3.0:0 test? ( || ( >=dev-lang/python-2.7.10_p15:2.7 ) !!dev-python/pytest-forked )
+DESCRIPTION=A fast, compliant alternative implementation of the Python (3.9) language
+EAPI=8
+HOMEPAGE=https://www.pypy.org/ https://foss.heptapod.net/pypy/pypy/
+INHERIT=pax-utils python-any-r1 toolchain-funcs
+IUSE=bzip2 +ensurepip gdbm +jit ncurses sqlite test tk
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=|| ( >=dev-python/pypy3-exe-7.3.9_p3:3.9-7.3.9[bzip2?,ncurses?] >=dev-python/pypy3-exe-bin-7.3.9_p3:3.9-7.3.9 ) dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-bin-7.3.0:0
+RESTRICT=test
+SLOT=0/pypy39-pp73-336
+SRC_URI=https://buildbot.pypy.org/pypy/pypy3.9-v7.3.9-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.9-gentoo-patches-7.3.9_p5.tar.xz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8ee5a5e555ecdc3516b4f08a672ddddd
diff --git a/metadata/md5-cache/dev-python/python-ldap-3.4.2 b/metadata/md5-cache/dev-python/python-ldap-3.4.2
index 956d680e5ba3..e04844d829f1 100644
--- a/metadata/md5-cache/dev-python/python-ldap-3.4.2
+++ b/metadata/md5-cache/dev-python/python-ldap-3.4.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.python-ldap.org/en/latest/ https://pypi.org/project/python-ldap/ https://github.com/python-ldap/python-ldap/
 INHERIT=distutils-r1
 IUSE=examples sasl ssl test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86 ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86 ~x86-solaris
 LICENSE=MIT PSF-2
 RDEPEND=>=dev-python/pyasn1-0.3.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-nds/openldap:=[sasl?,ssl?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-ldap/python-ldap/archive/python-ldap-3.4.2.tar.gz -> python-ldap-3.4.2.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ce30e7133a4115baa0718e1294e48dd3
+_md5_=5e8d8af55d8d04c7534979559949ce12
diff --git a/metadata/md5-cache/dev-python/regex-2022.7.9 b/metadata/md5-cache/dev-python/regex-2022.7.9
index 26227c56d464..4961d4676410 100644
--- a/metadata/md5-cache/dev-python/regex-2022.7.9
+++ b/metadata/md5-cache/dev-python/regex-2022.7.9
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex/ https://pypi.org/project/regex/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/regex/regex-2022.7.9.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=662449497a58d2cf1e627e48f52c0d51
+_md5_=36f9f00e649dbb18c9fc9cbea83f4485
diff --git a/metadata/md5-cache/dev-python/setuptools-rust-1.4.1 b/metadata/md5-cache/dev-python/setuptools-rust-1.4.1
index 8726d9748911..35a379c82b20 100644
--- a/metadata/md5-cache/dev-python/setuptools-rust-1.4.1
+++ b/metadata/md5-cache/dev-python/setuptools-rust-1.4.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/PyO3/setuptools-rust/ https://pypi.org/project/setuptools-rust/
 INHERIT=distutils-r1 cargo
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=MIT
 RDEPEND=virtual/rust <dev-python/semantic_version-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/semantic_version-2.8.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.7.4.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools-rust/setuptools-rust-1.4.1.tar.gz test? ( https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/convert_case/0.4.0/download -> convert_case-0.4.0.crate https://crates.io/api/v1/crates/cssparser/0.27.2/download -> cssparser-0.27.2.crate https://crates.io/api/v1/crates/cssparser-macros/0.6.0/download -> cssparser-macros-0.6.0.crate https://crates.io/api/v1/crates/derive_more/0.99.17/download -> derive_more-0.99.17.crate https://crates.io/api/v1/crates/dtoa/0.4.8/download -> dtoa-0.4.8.crate https://crates.io/api/v1/crates/dtoa-short/0.3.3/download -> dtoa-short-0.3.3.crate https://crates.io/api/v1/crates/futf/0.1.5/download -> futf-0.1.5.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/html5ever/0.25.1/download -> html5ever-0.25.1.crate https://crates.io/api/v1/crates/indoc/1.0.4/download -> indoc-1.0.4.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/kuchiki/0.8.1/download -> kuchiki-0.8.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.121/download -> libc-0.2.121.crate https://crates.io/api/v1/crates/lock_api/0.4.6/download -> lock_api-0.4.6.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/mac/0.1.1/download -> mac-0.1.1.crate https://crates.io/api/v1/crates/markup5ever/0.10.1/download -> markup5ever-0.10.1.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/new_debug_unreachable/1.0.4/download -> new_debug_unreachable-1.0.4.crate https://crates.io/api/v1/crates/nodrop/0.1.14/download -> nodrop-0.1.14.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf_codegen/0.8.0/download -> phf_codegen-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_macros/0.8.0/download -> phf_macros-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.10.0/download -> phf_shared-0.10.0.crate https://crates.io/api/v1/crates/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/precomputed-hash/0.1.1/download -> precomputed-hash-0.1.1.crate https://crates.io/api/v1/crates/proc-macro2/1.0.36/download -> proc-macro2-1.0.36.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/pyo3/0.16.5/download -> pyo3-0.16.5.crate https://crates.io/api/v1/crates/pyo3-build-config/0.16.5/download -> pyo3-build-config-0.16.5.crate https://crates.io/api/v1/crates/pyo3-ffi/0.16.5/download -> pyo3-ffi-0.16.5.crate https://crates.io/api/v1/crates/pyo3-macros/0.16.5/download -> pyo3-macros-0.16.5.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.16.5/download -> pyo3-macros-backend-0.16.5.crate https://crates.io/api/v1/crates/quote/1.0.16/download -> quote-1.0.16.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.11/download -> redox_syscall-0.2.11.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/selectors/0.22.0/download -> selectors-0.22.0.crate https://crates.io/api/v1/crates/semver/1.0.6/download -> semver-1.0.6.crate https://crates.io/api/v1/crates/serde/1.0.136/download -> serde-1.0.136.crate https://crates.io/api/v1/crates/servo_arc/0.1.1/download -> servo_arc-0.1.1.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/stable_deref_trait/1.2.0/download -> stable_deref_trait-1.2.0.crate https://crates.io/api/v1/crates/string_cache/0.8.3/download -> string_cache-0.8.3.crate https://crates.io/api/v1/crates/string_cache_codegen/0.5.1/download -> string_cache_codegen-0.5.1.crate https://crates.io/api/v1/crates/syn/1.0.89/download -> syn-1.0.89.crate https://crates.io/api/v1/crates/target-lexicon/0.12.3/download -> target-lexicon-0.12.3.crate https://crates.io/api/v1/crates/tendril/0.4.3/download -> tendril-0.4.3.crate https://crates.io/api/v1/crates/thin-slice/0.1.1/download -> thin-slice-0.1.1.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/unindent/0.1.8/download -> unindent-0.1.8.crate https://crates.io/api/v1/crates/utf-8/0.7.6/download -> utf-8-0.7.6.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate )
 _eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=eae3d73de018080e747bfed53cef2afa
+_md5_=0b62cf0bfcc6dba2c823fdaf47ee818a
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 4a0468d8fd4b..ce9174f14c88 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/ninja-1.11.0 b/metadata/md5-cache/dev-util/ninja-1.11.0
index 8d826e621bc7..1a41f307f649 100644
--- a/metadata/md5-cache/dev-util/ninja-1.11.0
+++ b/metadata/md5-cache/dev-util/ninja-1.11.0
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://ninja-build.org/
 INHERIT=bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 IUSE=doc emacs test vim-syntax
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ninja-build/ninja/archive/v1.11.0.tar.gz -> ninja-1.11.0.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	e7aaa047873789f549ea3df2f04b2145	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6aa9db66b224ce87e604b978d679c361
+_md5_=e1b6d82b25ab67b4bbe8e9095d0e5307
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 6b3c76ed593f..e90505d1fac9 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/fontforge-20220308 b/metadata/md5-cache/media-gfx/fontforge-20220308
index 0f1935bfbef3..bc15354cd17f 100644
--- a/metadata/md5-cache/media-gfx/fontforge-20220308
+++ b/metadata/md5-cache/media-gfx/fontforge-20220308
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://fontforge.org/
 INHERIT=python-single-r1 xdg cmake
 IUSE=doc truetype-debugger gif gtk jpeg png +python readline test tiff svg woff2 X python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD GPL-3+
 RDEPEND=>=dev-libs/glib-2.67:2 dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( >=x11-libs/gtk+-3.10:3 ) !gtk? ( X? ( >=x11-libs/cairo-1.6:0= >=x11-libs/pango-1.10:0=[X] x11-libs/libX11:0= x11-libs/libXi:0= ) ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) readline? ( sys-libs/readline:0= ) woff2? ( media-libs/woff2:0= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fontforge/fontforge/releases/download/20220308/fontforge-20220308.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fd90ad303877e453809275325751f0cb
+_md5_=bdf544b61ad6c9c3df0f071e0aff24b3
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 52e79e09eaa4..362b429e018d 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/freetype-2.12.1 b/metadata/md5-cache/media-libs/freetype-2.12.1
index 6aae37177a3b..1cd74a3da57e 100644
--- a/metadata/md5-cache/media-libs/freetype-2.12.1
+++ b/metadata/md5-cache/media-libs/freetype-2.12.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.freetype.org/
 INHERIT=autotools flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
 IUSE=X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs svg utils doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=|| ( FTL GPL-2+ )
 RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] brotli? ( app-arch/brotli[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( svg? ( >=gnome-base/librsvg-2.46.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=2
 SRC_URI=mirror://sourceforge/freetype/freetype-2.12.1.tar.xz mirror://nongnu/freetype/freetype-2.12.1.tar.xz utils? ( mirror://sourceforge/freetype/ft2demos-2.12.1.tar.xz mirror://nongnu/freetype/ft2demos-2.12.1.tar.xz ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.12.1.tar.xz mirror://nongnu/freetype/freetype-doc-2.12.1.tar.xz )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0181648253643ae2f99b7a2b4ede3153
+_md5_=7714efbabcf77b9d80978019139f36b3
diff --git a/metadata/md5-cache/media-libs/libjxl-9999 b/metadata/md5-cache/media-libs/libjxl-9999
index 83b1fef5f451..a55a28553ebc 100644
--- a/metadata/md5-cache/media-libs/libjxl-9999
+++ b/metadata/md5-cache/media-libs/libjxl-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-cpp/gflags:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-0.16.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-misc/shared-mime-info-2.2 gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) gimp210? ( >=media-gfx/gimp-2.10.28:0/2 ) openexr? ( media-libs/openexr:= )
+DEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-cpp/gflags:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-misc/shared-mime-info-2.2 gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) gimp210? ( >=media-gfx/gimp-2.10.28:0/2 ) openexr? ( media-libs/openexr:= )
 DESCRIPTION=JPEG XL image format reference implementation
 EAPI=8
 HOMEPAGE=https://github.com/libjxl/libjxl
@@ -8,7 +8,7 @@ INHERIT=cmake-multilib git-r3
 IUSE=gdk-pixbuf gimp210 openexr abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-cpp/gflags:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-0.16.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-misc/shared-mime-info-2.2 gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) gimp210? ( >=media-gfx/gimp-2.10.28:0/2 ) openexr? ( media-libs/openexr:= )
+RDEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-cpp/gflags:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-misc/shared-mime-info-2.2 gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) gimp210? ( >=media-gfx/gimp-2.10.28:0/2 ) openexr? ( media-libs/openexr:= )
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=30856d0c2b21a9b500541a5de83b32cd
+_md5_=e6c947438b6aa1de075ac20408c1c381
diff --git a/metadata/md5-cache/media-libs/rubberband-3.0.0 b/metadata/md5-cache/media-libs/rubberband-3.0.0
index c81bb827926f..4257a76fe60e 100644
--- a/metadata/md5-cache/media-libs/rubberband-3.0.0
+++ b/metadata/md5-cache/media-libs/rubberband-3.0.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.breakfastquay.com/rubberband/
 INHERIT=meson-multilib flag-o-matic
 IUSE=ladspa jni static-libs +programs vamp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sci-libs/fftw:3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jni? ( >=virtual/jdk-1.8:* ) ladspa? ( media-libs/ladspa-sdk ) programs? ( media-libs/libsndfile ) vamp? ( media-libs/vamp-plugin-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://breakfastquay.com/files/releases/rubberband-3.0.0.tar.bz2
 _eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a50c2e9482323d069723df1ffc021e1d
+_md5_=46f0a1a204ef8ab31a8dd4a8d821a073
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index b4f946e0d84a..6c7d59559607 100644
--- a/metadata/md5-cache/media-radio/Manifest.gz
+++ b/metadata/md5-cache/media-radio/Manifest.gz
diff --git a/metadata/md5-cache/media-radio/flrig-1.4.7 b/metadata/md5-cache/media-radio/flrig-1.4.7
new file mode 100644
index 000000000000..880c821a4ad2
--- /dev/null
+++ b/metadata/md5-cache/media-radio/flrig-1.4.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare
+DEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils sys-devel/gettext
+DESCRIPTION=Transceiver control program for Amateur Radio use
+EAPI=8
+HOMEPAGE=http://www.w1hkj.com/flrig-help/index.html
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
+SLOT=0
+SRC_URI=mirror://sourceforge/fldigi/flrig-1.4.7.tar.gz
+_md5_=cf9ccd84a683f68505980f614568f9fb
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index a3447ea62875..59f5831fdfba 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/fluidsynth-2.2.8 b/metadata/md5-cache/media-sound/fluidsynth-2.2.8
index 1a92a67d58cf..37e6e89df9ca 100644
--- a/metadata/md5-cache/media-sound/fluidsynth-2.2.8
+++ b/metadata/md5-cache/media-sound/fluidsynth-2.2.8
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.fluidsynth.org
 INHERIT=cmake-multilib systemd toolchain-funcs
 IUSE=alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lash? ( media-sound/lash[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ladspa? ( media-libs/ladspa-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/cmt-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndfile? ( media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/3
 SRC_URI=https://github.com/FluidSynth/fluidsynth/archive/v2.2.8.tar.gz -> fluidsynth-2.2.8.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=70595b818cf478a6a710c0732d9e2f89
+_md5_=a05e46d99f32dbe2862ddcdf6a250878
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index a6728de00b19..757f2e2ea1f3 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/openbsd-netcat-1.195-r1 b/metadata/md5-cache/net-analyzer/openbsd-netcat-1.195-r1
index 15ba5473338b..a27e889afffe 100644
--- a/metadata/md5-cache/net-analyzer/openbsd-netcat-1.195-r1
+++ b/metadata/md5-cache/net-analyzer/openbsd-netcat-1.195-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The OpenBSD network swiss army knife
 EAPI=7
 HOMEPAGE=https://cvsweb.openbsd.org/src/usr.bin/nc/ https://salsa.debian.org/debian/netcat-openbsd
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=~amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=!elibc_Darwin? ( dev-libs/libbsd ) !net-analyzer/netcat !net-analyzer/netcat6
 SLOT=0
 SRC_URI=http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.195.orig.tar.gz http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.195-2.debian.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0bd0f44861cb2c7980b89e723af3bb3d
+_md5_=09d0e47ba9e79d4bda8ceca947af1f52
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 6d3bd4de605b..7ad7cc172692 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-5.51.0 b/metadata/md5-cache/net-im/signal-desktop-bin-5.54.0
index b98e2c7ede3f..e822add8e325 100644
--- a/metadata/md5-cache/net-im/signal-desktop-bin-5.51.0
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-5.54.0
@@ -9,6 +9,6 @@ LICENSE=GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZL
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[X(+)] net-print/cups sys-apps/dbus[X] x11-libs/cairo x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango sound? ( || ( media-sound/pulseaudio media-sound/apulse ) )
 RESTRICT=splitdebug
 SLOT=0
-SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_5.51.0_amd64.deb
+SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_5.54.0_amd64.deb
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=5692b7a96938c8917b278493cd7c031d
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 48c46a8d145f..ffd5718201ac 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.9.7 b/metadata/md5-cache/net-vpn/strongswan-5.9.7
new file mode 100644
index 000000000000..1d75ed5c0a4c
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/strongswan-5.9.7
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst setup
+DEPEND=non-root? ( acct-user/ipsec acct-group/ipsec ) dev-libs/glib:2 gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:= ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap:= ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1:3 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns:= ) virtual/linux-sources sys-kernel/linux-headers
+DESCRIPTION=IPsec-based VPN solution, supporting IKEv1/IKEv2 and MOBIKE
+EAPI=8
+HOMEPAGE=https://www.strongswan.org/
+INHERIT=linux-info systemd
+IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11 +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_kdf strongswan_plugins_addrblock strongswan_plugins_aesni strongswan_plugins_blowfish strongswan_plugins_bypass-lan strongswan_plugins_ccm strongswan_plugins_chapoly strongswan_plugins_ctr strongswan_plugins_error-notify strongswan_plugins_forecast strongswan_plugins_gcm strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_newhope strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_save-keys strongswan_plugins_unbound strongswan_plugins_whitelist strongswan_plugins_xauth-noauth
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 RSA DES
+RDEPEND=non-root? ( acct-user/ipsec acct-group/ipsec ) dev-libs/glib:2 gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:= ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap:= ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1:3 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns:= ) virtual/logger sys-apps/iproute2 !net-vpn/libreswan selinux? ( sec-policy/selinux-ipsec )
+SLOT=0
+SRC_URI=https://download.strongswan.org/strongswan-5.9.7.tar.bz2
+_eclasses_=linux-info	529bb8cd5756c8476d37ba89dd41e635	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8ae0bedfc1f99f534816b4374c47aa3a
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 3636f684c80e..2468554c4558 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/pari-2.13.4-r1 b/metadata/md5-cache/sci-mathematics/pari-2.13.4-r1
index 7954e2d5e23a..a255947d60f7 100644
--- a/metadata/md5-cache/sci-mathematics/pari-2.13.4-r1
+++ b/metadata/md5-cache/sci-mathematics/pari-2.13.4-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://pari.math.u-bordeaux.fr/
 INHERIT=flag-o-matic toolchain-funcs
 IUSE=data doc fltk gmp test threads X
-KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/readline:0= data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-misc/xdg-utils ) ) fltk? ( x11-libs/fltk:1= ) gmp? ( dev-libs/gmp:0= ) X? ( x11-libs/libX11:0= )
 RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.13.4.tar.gz
 _eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=eb9f02afb301d05ef3f1f02d705180db
+_md5_=6cfe571c4f21e50a9a1229c16382f929
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 090cb8b397ea..7164c17eaab9 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/iproute2-5.19.0 b/metadata/md5-cache/sys-apps/iproute2-5.19.0
index ad29c3705374..93f3548bd1c6 100644
--- a/metadata/md5-cache/sys-apps/iproute2-5.19.0
+++ b/metadata/md5-cache/sys-apps/iproute2-5.19.0
@@ -12,4 +12,4 @@ RDEPEND=!net-misc/arpd !minimal? ( net-libs/libmnl:= ) atm? ( net-dialup/linux-a
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-5.19.0.tar.xz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=cdc4f59a084987e2501d7e771d3090f5
+_md5_=1fa2cc910dbcbb1e05506711bd645ab2
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 4928a8b2cdab..514af74ff884 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-41.0 b/metadata/md5-cache/sys-cluster/rdma-core-41.0
index 0592e23edfaa..f8dd8bbbc631 100644
--- a/metadata/md5-cache/sys-cluster/rdma-core-41.0
+++ b/metadata/md5-cache/sys-cluster/rdma-core-41.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/linux-rdma/rdma-core
 INHERIT=cmake python-single-r1 udev systemd
 IUSE=neigh python static-libs systemd valgrind python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )
 RDEPEND=dev-lang/perl virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) !sys-fabric/infiniband-diags !sys-fabric/libibverbs !sys-fabric/librdmacm !sys-fabric/libibumad !sys-fabric/ibacm !sys-fabric/libibmad !sys-fabric/srptools !sys-fabric/infinipath-psm !sys-fabric/libcxgb3 !sys-fabric/libcxgb4 !sys-fabric/libmthca !sys-fabric/libmlx4 !sys-fabric/libmlx5 !sys-fabric/libocrdma !sys-fabric/libnes
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
 SRC_URI=https://github.com/linux-rdma/rdma-core/archive/v41.0.tar.gz -> rdma-core-41.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fafe230bc475edcb3985c8c6b0a7a4ae
+_md5_=4e0f24f9052a0b04e5101f156044a6e2
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 7fcfabd5b2ba..43c588003784 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/gdb-12.1-r2 b/metadata/md5-cache/sys-devel/gdb-12.1-r2
new file mode 100644
index 000000000000..7fcca8028190
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gdb-12.1-r2
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/xz-utils sys-apps/texinfo virtual/yacc nls? ( sys-devel/gettext ) source-highlight? ( virtual/pkgconfig ) test? ( dev-util/dejagnu )
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-libs/mpfr:0= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash )
+DESCRIPTION=GNU debugger
+EAPI=8
+HOMEPAGE=https://sourceware.org/gdb/
+INHERIT=flag-o-matic python-single-r1 strip-linguas toolchain-funcs
+IUSE=cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3+ LGPL-2.1+
+RDEPEND=dev-libs/mpfr:0= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+RESTRICT=ia64? ( test ) !test? ( test ) test
+SLOT=0
+SRC_URI=mirror://gnu/gdb/gdb-12.1.tar.xz ftp://sourceware.org/pub/gdb/releases/gdb-12.1.tar.xz
+_eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=d263a883bfaea7a0538da4e3924d7c35
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index d01f2b73a31a..8aaf719b0fd5 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/binutils-libs-2.39 b/metadata/md5-cache/sys-libs/binutils-libs-2.39
new file mode 100644
index 000000000000..5d4037b28ab6
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/binutils-libs-2.39
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Core binutils libraries (libbfd, libopcodes, libiberty) for external packages
+EAPI=7
+HOMEPAGE=https://sourceware.org/binutils/
+INHERIT=libtool toolchain-funcs multilib-minimal
+IUSE=64-bit-bfd cet multitarget nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=|| ( GPL-3 LGPL-3 )
+RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/binutils-config-5
+SLOT=0/2.39
+SRC_URI=mirror://gnu/binutils/binutils-2.39.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.39.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.39-patches-3.tar.xz
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=44b5ace6e21a638c3587c868fc44ff74
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index bb27377c8237..fdf73e96a307 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/vdpauinfo-1.5 b/metadata/md5-cache/x11-misc/vdpauinfo-1.5-r1
index 0c57dcaa0e32..11e695bb236c 100644
--- a/metadata/md5-cache/x11-misc/vdpauinfo-1.5
+++ b/metadata/md5-cache/x11-misc/vdpauinfo-1.5-r1
@@ -4,11 +4,11 @@ DEPEND=>=x11-libs/libvdpau-1.5 x11-libs/libX11 x11-base/xorg-proto
 DESCRIPTION=Displays info about your card's VDPAU support
 EAPI=8
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/VDPAU
-INHERIT=autotools
+INHERIT=autotools flag-o-matic
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=x11-libs/libvdpau-1.5 x11-libs/libX11
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/vdpau/vdpauinfo/-/archive/1.5/vdpauinfo-1.5.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=89b6e0fd6fa86eb2aa2fd9276dcdb41d
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=165d2195c2300ab792b45cad03ae0b1f
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 1fe1126dcc82..7b7f2ebb13e1 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-08-10T06:40:01Z
+TIMESTAMP 2022-08-10T12:39:58Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLzUsJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLzpx5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBO9A/6Aw0yWKkxGOyDrdUbsHaGWsRaUQQaSvvL8Y6r1h+mPUb+y2KgVfw3KA7G
-NZI7ImEpOZekDERYrudwPhGWhJc5OUoGP35+2dnlbCxLTfMnbcqHnhppEIykhJbg
-v/WPw6Adh+zdzs987CY/908BJFMIQKqeciGZS6rgcWJ9A5fnCJ/olqS05CTxKCaT
-UY04Tdcj6qnPa/AW04GLwKgogRAkXJGlUM63iZOdoNS9fqUcTULXn75remEQb6/L
-BvGxpOn16r+2SDpT0P3cFk4/NSCUIb34zw8t+Rk4ItsldLyMaU26d0TtUshzrsC+
-S5aRpNeow+9Y6EVDadBNOEsIcsXg9IoIUmx3sOn3PURF1EiRWB1hL/pAm79XCaAJ
-TerQ+FE8d35042M7rRVOxQwcz1GstWzo0Cbl7V47tQXnSBEihIgmGz3BADlZQqLi
-SBkGY9WqlTb1tCMeODrT+65oDOaSH6z92R6guBb317Shiy7+9rN2jwNQS/LvSi+4
-Xy3qS4SmOMmXuA7LdhpqfxsoKVSx7clPiHDhflCXLPce4nlLaNpldMmwLUK0y53H
-trCLD298MG9LaO6hugH6zBJaQ6Gi57esGR1dAW8zNp+gEz+roimSZtyB5MfYJum6
-oWT3+duDDcNZ4/xVGrYU+IeEXqMLmQnDCp9ta95oVWoOk/Hapss=
-=pQYu
+klACZg/9GBrPpL7MqKA5rM5RSVTkLGyJ2tH6ZGPNYcKbsl9VdBu1YwwPRuuqm8xw
+rQLQGwK6KG4ODFGVuOTiY6XyAyPMAsaEXJrBJ6DmKLn43rAqLK5fT3vZsRQTizUV
+sr+XITZVNtUeFivakGpBinW9IAtq64Fh8Pf/neSzHvlruQ0nKXBFsIwO9eLl5UmT
+w3f2zCzzYguglD6EQ+LUEG+LdxLUh1sltomlJ68YegRYEGGnJbGsus8/Vs7H4zF6
+dAx6bxe+gJ25Iezj2iUyJ6Pm/5+ehVenGQUZEEFWpPi0T01NPwkv3ymXwsqav5Dn
+yNmtQWiW72nfFNMzNwSbvW6x3iEoE3kgCNfTBcImhbqL9n9IQZk6ZWZvkVXruE/9
+aTpEjNXF9D5bQ35laLsw9HaRG3fFRcVCF0m3EVaRwUTkkMyE66Q/cAcC9cPMuzXt
+JK7MER/me6UoBNXVnv+80/zqqIUv/30nliyR4ddR+7tiWNOvILhVP8C5CUcqAF2q
+QQzN96RxmANDOP9oEITzHuFtXeD73dPliLgxJeNbC95aqLFfODY27du/inpvYdKa
+lfDSDw+6rbZjUxyPTZSnLn5/slK+s7k6VLKD5AbV2y9OyYJ1KUW8bKOdcWnnWX+M
+QCIa4/3I9edy9jTEm4d9TmMSi2g5YkkhYz2FN1BnQezh2Rnx/Zs=
+=iw54
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a03a3a561952..a99aae6b36a4 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 10 Aug 2022 06:39:56 +0000
+Wed, 10 Aug 2022 12:39:53 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 59e932c1c380..293b429383e2 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Aug 10 06:39:56 AM UTC 2022
+Wed Aug 10 12:39:53 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index ab629946f798..e861d7366545 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 10 Aug 2022 06:45:01 +0000
+Wed, 10 Aug 2022 12:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 400695bd14af..cc0542a8780c 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-e793c8eeba9ada4be595b43295e2289b348eb66e 1660112303 2022-08-10T06:18:23+00:00
+0877509414c54a84d3bddbeda4e5b4dc89ccb4ef 1660134587 2022-08-10T12:29:47+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 3a95f5a9645f..0f06506222d4 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1660113601 Wed 10 Aug 2022 06:40:01 AM UTC
+1660135201 Wed 10 Aug 2022 12:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index a03a3a561952..a99aae6b36a4 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 10 Aug 2022 06:39:56 +0000
+Wed, 10 Aug 2022 12:39:53 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index d71e2190d052..234f17a7ebbf 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest
index d735235b6fbd..845dd7daa60a 100644
--- a/net-analyzer/openbsd-netcat/Manifest
+++ b/net-analyzer/openbsd-netcat/Manifest
@@ -7,6 +7,6 @@ DIST netcat-openbsd_1.190.orig.tar.gz 22384 BLAKE2B c3e83106f53a0214f71c805b1dfe
 DIST netcat-openbsd_1.195-2.debian.tar.xz 35984 BLAKE2B eedac24eedc243ad1d58576be76f4f98392e1f455863fa3cdc06bde2714612819b7dfa98dd45c1739a65680469460410f5e4b2f4144f4c24fea04b59dda4d0da SHA512 2a5cc6d04112fdde007be4b9adb3aee44060570c0cb2ae0e33e54af3d37c0b2ff4d6c96edf1f16047365106c7c3720195b38417af3c332226c9be81d49caa552
 DIST netcat-openbsd_1.195.orig.tar.gz 22480 BLAKE2B 53c750c168d7ea5dc2ca653598e42700e2b3ee888d946a09503a22fa3bcbc2c73658f38787314bef628d609ad370223f6889b7019760bf51817f73fc570e1dcc SHA512 ea95cda028f2759835ea8832db0174c178b002d5a917f4c51594445a5377a30d6114ac261071eea98d3d0b60ae1ec72102609db1625dbc5a6e57c67e28d2ff51
 EBUILD openbsd-netcat-1.190.ebuild 1518 BLAKE2B 901b4c5b0f4c58c6b542667e0740d3058a7e22003805a3520555f7f1b843d5e1338a47db60900db527acc47cb91c3b99d292e34a768fa75dcb44a7f3fc229f2b SHA512 1c26caaa2c5978ddb0348e1c6c2e2855736f8df3517020930ee3dfeb6e24edd08b88e665258a80aeb38d845b6aac5bf20c085edea6450e600c1027a1e836ccd7
-EBUILD openbsd-netcat-1.195-r1.ebuild 1730 BLAKE2B 4b9df7b86c4231f3f7b6fe0a87ae7ed2ea0220a60ff64496bd392ed2a78f88ca84ff5d7e4d51a578fbc205619d332c5443885582deaa5c6f32604ebcad007334 SHA512 93d77dc56c65ad792cc963d6c0edf0ca8c2684356a8624231178fde8c5d08e1cdb814c537bccbf8a8b156952c4c2b2bac7ac0ef1f6aca830cd8a394f7fd07158
+EBUILD openbsd-netcat-1.195-r1.ebuild 1728 BLAKE2B a1776606b68c34fce2b374f92249bac99ab522d0b53f166ab3d9480d19dc0e70ab4ef5aad4a40c78c74b1c9ea5756c64c9d0f14dfef1c21842e44fe54a47f3a2 SHA512 eef4cc16181b12f0ec170efd17aee003a75c9edfd1135dc9be879a3eff0abc0185ae73a81d5e11da250a35d518a0762863196d620f8fddf64dad1540e11cd2fe
 EBUILD openbsd-netcat-1.195.ebuild 1524 BLAKE2B e0d11d336a9a2d3ab6bd67c5eb30106a0a58b80f4f0c656853f6f1826167dfc94c62f291b5029a4cf5707ea61547c458916bbfc40f5fbb767ac0f8028bad237e SHA512 2b76e272f75e54a52a30b1debda6aaab7df03be3f054cf3d17234c04bdd881a720c9c74f1c2dde61c1da9c445c2826124d735b909f8d5f2ccb159c6f30b60f3f
 MISC metadata.xml 245 BLAKE2B ac72ef778f5d556deab2ebcf80116f69791bc0590fea00ad21d361df28a3d1b96fb42db2de7f7545ad6f38137b9c26510efa2a2a251ca5646f77476dfb27d339 SHA512 ad4d8a54ad37031eaf3e1f1a06d53b85f504bdeeda433eee0a6101c2ccbc5b8da2d33725c9b0dfd013c3c5ad218171f6010722f443f81124086bc8c54a216b06
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
index 10daf4381959..170292950a45 100644
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
 
 BDEPEND="virtual/pkgconfig"
 RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 35f12c4039f6..f95cd4e8cfd4 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 7636e62308f6..9791c7a1a746 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_5.51.0_amd64.deb 117048710 BLAKE2B 2f1fc0a779608fac7ac345437b703d96dc8bcc090fe6fcfcfdf3447e1192b97a8e3273d8db10498dbb4779b4072063355d2f55d8e5bd0c55c7436e6ff42e66ce SHA512 8ca14b347439968c7e91cc93c1d828ee63308ca2551aa3249624f29462b16c5d41538a8f24c131a8e9d09ceafb277c08ca54dc6b4f39d939951bbf2b5248457b
-EBUILD signal-desktop-bin-5.51.0.ebuild 2404 BLAKE2B 705f2fa98a1ec6e87fd8aec7611662e96827b945a1c00f0d4e31408a6ae67786d8363fbf97655c357b3bfbf3098bbc98043b8289d49b90ffa4724dbe8e2ea148 SHA512 b2530373fab90f2dafc251acdcb502b39291d142fe5c5c2af992a3eea1888a9081581bb95c45b31e1ffef22d62ce6526092e5200a33d0cc8d2651810e13542be
+DIST signal-desktop_5.54.0_amd64.deb 117370322 BLAKE2B ba05b1e51aebaeead237d746ffe908e75fce0dfd0617ed2e594f4ebc55605488bd8e2aac08fcdd532f329beacffa7018a072174660142716ebe149b1ec6e32b8 SHA512 e8a6a60e8f8799aa83c02457576034271c3ee74b9925b218545b50959d9e53dde880883936097296d1a5d80e493b45dd04c303ca7c21a83696dd379ff593518e
+EBUILD signal-desktop-bin-5.54.0.ebuild 2404 BLAKE2B 705f2fa98a1ec6e87fd8aec7611662e96827b945a1c00f0d4e31408a6ae67786d8363fbf97655c357b3bfbf3098bbc98043b8289d49b90ffa4724dbe8e2ea148 SHA512 b2530373fab90f2dafc251acdcb502b39291d142fe5c5c2af992a3eea1888a9081581bb95c45b31e1ffef22d62ce6526092e5200a33d0cc8d2651810e13542be
 MISC metadata.xml 397 BLAKE2B 8b09559d9ab0428415fb6301596386acc0983bb312f099c6c5299492043f59d6b2e1145f29885e9fc429f4e0d28fccac19cdd7afb5c5ed5f70383a9075d0e466 SHA512 8fa1b372993842145229779dc730c574f688411efd3da415b00928d81947a91c1dabb7c53412aa3c413a5e1071d113b182c54b113a933c0d5ddf3de08869267b
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.51.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.54.0.ebuild
index 1104f0041876..1104f0041876 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-5.51.0.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-5.54.0.ebuild
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 89c8f77b653b..43f6fcff1651 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/strongswan/Manifest b/net-vpn/strongswan/Manifest
index 3a1ef7113ac7..e113b6d2aad8 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -4,8 +4,10 @@ DIST strongswan-5.9.2.tar.bz2 4607281 BLAKE2B 84f5457bc970f49c9bc99d0ef41182d815
 DIST strongswan-5.9.4.tar.bz2 4651000 BLAKE2B 071a0a0a144b369a7e4069d92340cecca9eef0c004949d91993c8f1cc0f39f7868749020d6e135fa59d5899d146f39172f87eb32a26ad788cb8a4c160597e328 SHA512 796356c1d5c1ad410f0ed944ab4a131076d26f120ec6fa57796fe4060b0741201199625883ddc9ebd8a7ad299495f073cec76a6780ebd8f375605aae16750cf3
 DIST strongswan-5.9.5.tar.bz2 4722123 BLAKE2B 8b3adc44d5f5eb3824845ce9eda75e7b75f0f7394fbe84f827f4a8177e5299ca7170103ee6cd76e1e18aef85d7f124a43a505ceaf41ec4ed575eb214ebb6af21 SHA512 3b11c4edb1ffccf0ea5b8b843acfe2eb18dcd3857fc2818b8481c4febe7959261e1b2804c3af29068319df469fa0b784682d3ba4d49a3eb580841ff3c34e33a1
 DIST strongswan-5.9.6.tar.bz2 4750894 BLAKE2B 4021a10611e66f9e2e4e432bdfb9de0f94d27ba1be1b7d4e4b8bf3cd797c123658993e60eb3d49c424b479558e9581bb069a345a70f55850d1faf5abaa401246 SHA512 8efb7a55b074485b874e941e42462e97a404b4f84e2f90ed18ef66274731b22d167a571f6fd028dccc1f199f2e591c82616d0a832a5084e1981c6b867fe5bb6a
+DIST strongswan-5.9.7.tar.bz2 4741967 BLAKE2B 062f80431aefabfa4ba03454c3ab80e278772ebbd2bdeb69de98796f6e1bd7fc17d161e23b74bb238378eedc005079ff14e64e9a8967e2bf4f159a076e9f6384 SHA512 6e28a8ae0e4606a55661ae63a61d7bca445e8f62e91b37d32c957f03300d27ba05e099891c1160aae477b1f93ef844b66bb46da6cce5553eb03206c87e5e0d9a
 EBUILD strongswan-5.9.2-r3.ebuild 9206 BLAKE2B 95f105fcce29680c9d8dfcdf645bc00ee84747c83eeb13106b54b216963fc8c8f442f4a45e02507b521db3b1fea54c1020186c6a555f0dfc29173d6d13f25409 SHA512 f34d860ce53c62225ba6c1868f368a920c5164a2fdfb8554ba6e3611ca02b1356bc68f121f9c126131c0381f59c2f1d9d1203c029b1c1513ef0d88257be654e5
 EBUILD strongswan-5.9.4-r2.ebuild 9264 BLAKE2B 7ccb1b346acbbc88f80f0a1b96b28e28955773af78ddc946e72eda3097df2e45f5067e40406520cbbe41360209f406a0ef4ec7acd49edb2591b97effec739183 SHA512 29548972e0463c8dcab82c27e48c43519ddd813a5bf4e05211a83fb2f27ad9ee0a03226d777199972cb02f417263e647eee4561568807ffa9f91d19dfc90f7c4
 EBUILD strongswan-5.9.5-r1.ebuild 9244 BLAKE2B cd9406736089a9fb075974418655203120964a0030a4e761a603100dcc23cb66482d4832e631f2910369021618042d2dc1b9e79960a2d612168aa462f351f8b7 SHA512 d30ef479396196dce01c074f2e23d2f4b50c48f67a6d7c02f61edaa118ef9666ba9959400a38ef93c88b0c918829cc898bfc048ad9c115b2e72ef57006bbe9cf
 EBUILD strongswan-5.9.6-r1.ebuild 9610 BLAKE2B f132b0e96a6321118e936601ad7518a756cd4d739913bae1ac79b5ab32c19541e18d424af8722c4b7d2c9d470dea89a5bf43b163bd07c1db744eccaf37cc7fbf SHA512 a9667f354ee632c03a77c647e57734c0d14813ffbf22eb6af9a85b6692065336ed996155e9916e67b5df6db60b9eac884361654ccf960461918499aca42e0b08
+EBUILD strongswan-5.9.7.ebuild 9557 BLAKE2B 25bfda7f859b6b37bafb5a54f82e03e270cb659daa28bb0ec23fece44ba9de03358d93a491b8244f13c4970df9c72c736e7547b75b15f2ee19eb9b8ab8399b82 SHA512 0be4ea58a6725ec9a5440e24e1732c86624c3923e69555bbf9cdfa1a77eeb2a52f3d4786235f6ad20640af68552ce38e01bf47705eb8fffb82621ebbf3244e89
 MISC metadata.xml 4888 BLAKE2B ffb26d9fec8ad8c5fbb68ae92a92efbf32c40b4a0a4b829d8fd287ebc80d135e3ca95ca50663acb6fc7d629570ed7f4264921a8838e2ff0a8e5dbbadb3f0fc50 SHA512 84491cbd33b325b1d960c32eafb479927d5651244fb13ee9ec8b2abddfff71f1b90b18524e044dd0cc63ccd49ef9bb0c2437ab6cf504994b8ad0a9137cd04fb4
diff --git a/net-vpn/strongswan/strongswan-5.9.7.ebuild b/net-vpn/strongswan/strongswan-5.9.7.ebuild
new file mode 100644
index 000000000000..d5b5767e6d03
--- /dev/null
+++ b/net-vpn/strongswan/strongswan-5.9.7.ebuild
@@ -0,0 +1,318 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+inherit linux-info systemd
+
+DESCRIPTION="IPsec-based VPN solution, supporting IKEv1/IKEv2 and MOBIKE"
+HOMEPAGE="https://www.strongswan.org/"
+SRC_URI="https://download.strongswan.org/${P}.tar.bz2"
+
+LICENSE="GPL-2 RSA DES"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11"
+
+STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
+STRONGSWAN_PLUGINS_OPT_DISABLE="kdf"
+STRONGSWAN_PLUGINS_OPT="addrblock aesni blowfish bypass-lan ccm chapoly ctr error-notify forecast gcm
+ha ipseckey newhope ntru padlock rdrand save-keys unbound whitelist
+xauth-noauth"
+for mod in $STRONGSWAN_PLUGINS_STD; do
+	IUSE="${IUSE} +strongswan_plugins_${mod}"
+done
+
+for mod in $STRONGSWAN_PLUGINS_OPT_DISABLE; do
+	IUSE="${IUSE} strongswan_plugins_${mod}"
+done
+
+for mod in $STRONGSWAN_PLUGINS_OPT; do
+	IUSE="${IUSE} strongswan_plugins_${mod}"
+done
+
+COMMON_DEPEND="non-root? (
+		acct-user/ipsec
+		acct-group/ipsec
+	)
+	dev-libs/glib:2
+	gmp? ( >=dev-libs/gmp-4.1.5:= )
+	gcrypt? ( dev-libs/libgcrypt:= )
+	caps? ( sys-libs/libcap )
+	curl? ( net-misc/curl )
+	ldap? ( net-nds/openldap:= )
+	openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] )
+	mysql? ( dev-db/mysql-connector-c:= )
+	sqlite? ( >=dev-db/sqlite-3.3.1:3 )
+	systemd? ( sys-apps/systemd )
+	networkmanager? ( net-misc/networkmanager )
+	pam? ( sys-libs/pam )
+	strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns:= )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/linux-sources
+	sys-kernel/linux-headers"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/logger
+	sys-apps/iproute2
+	!net-vpn/libreswan
+	selinux? ( sec-policy/selinux-ipsec )"
+
+UGID="ipsec"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	elog "Linux kernel version: ${KV_FULL}"
+
+	if ! kernel_is -ge 2 6 16; then
+		eerror
+		eerror "This ebuild currently only supports ${PN} with the"
+		eerror "native Linux 2.6 IPsec stack on kernels >= 2.6.16."
+		eerror
+	fi
+
+	if kernel_is -lt 2 6 34; then
+		ewarn
+		ewarn "IMPORTANT KERNEL NOTES: Please read carefully..."
+		ewarn
+
+		if kernel_is -lt 2 6 29; then
+			ewarn "[ < 2.6.29 ] Due to a missing kernel feature, you have to"
+			ewarn "include all required IPv6 modules even if you just intend"
+			ewarn "to run on IPv4 only."
+			ewarn
+			ewarn "This has been fixed with kernels >= 2.6.29."
+			ewarn
+		fi
+
+		if kernel_is -lt 2 6 33; then
+			ewarn "[ < 2.6.33 ] Kernels prior to 2.6.33 include a non-standards"
+			ewarn "compliant implementation for SHA-2 HMAC support in ESP and"
+			ewarn "miss SHA384 and SHA512 HMAC support altogether."
+			ewarn
+			ewarn "If you need any of those features, please use kernel >= 2.6.33."
+			ewarn
+		fi
+
+		if kernel_is -lt 2 6 34; then
+			ewarn "[ < 2.6.34 ] Support for the AES-GMAC authentification-only"
+			ewarn "ESP cipher is only included in kernels >= 2.6.34."
+			ewarn
+			ewarn "If you need it, please use kernel >= 2.6.34."
+			ewarn
+		fi
+	fi
+}
+
+src_configure() {
+	local myconf=""
+
+	if use non-root; then
+		myconf="${myconf} --with-user=${UGID} --with-group=${UGID}"
+	fi
+
+	# If a user has already enabled db support, those plugins will
+	# most likely be desired as well. Besides they don't impose new
+	# dependencies and come at no cost (except for space).
+	if use mysql || use sqlite; then
+		myconf="${myconf} --enable-attr-sql --enable-sql"
+	fi
+
+	# strongSwan builds and installs static libs by default which are
+	# useless to the user (and to strongSwan for that matter) because no
+	# header files or alike get installed... so disabling them is safe.
+	if use pam && use eap; then
+		myconf="${myconf} --enable-eap-gtc"
+	else
+		myconf="${myconf} --disable-eap-gtc"
+	fi
+
+	for mod in $STRONGSWAN_PLUGINS_STD; do
+		if use strongswan_plugins_${mod}; then
+			myconf+=" --enable-${mod}"
+		fi
+	done
+
+	for mod in $STRONGSWAN_PLUGINS_OPT_DISABLE; do
+		if ! use strongswan_plugins_${mod}; then
+			myconf+=" --disable-${mod}"
+		fi
+	done
+
+	for mod in $STRONGSWAN_PLUGINS_OPT; do
+		if use strongswan_plugins_${mod}; then
+			myconf+=" --enable-${mod}"
+		fi
+	done
+
+	econf \
+		--disable-static \
+		--enable-ikev1 \
+		--enable-ikev2 \
+		--enable-swanctl \
+		--enable-socket-dynamic \
+		--enable-cmd \
+		$(use_enable curl) \
+		$(use_enable constraints) \
+		$(use_enable ldap) \
+		$(use_enable debug leak-detective) \
+		$(use_enable dhcp) \
+		$(use_enable eap eap-sim) \
+		$(use_enable eap eap-sim-file) \
+		$(use_enable eap eap-simaka-sql) \
+		$(use_enable eap eap-simaka-pseudonym) \
+		$(use_enable eap eap-simaka-reauth) \
+		$(use_enable eap eap-identity) \
+		$(use_enable eap eap-md5) \
+		$(use_enable eap eap-aka) \
+		$(use_enable eap eap-aka-3gpp2) \
+		$(use_enable eap md4) \
+		$(use_enable eap eap-mschapv2) \
+		$(use_enable eap eap-radius) \
+		$(use_enable eap eap-tls) \
+		$(use_enable eap eap-ttls) \
+		$(use_enable eap xauth-eap) \
+		$(use_enable eap eap-dynamic) \
+		$(use_enable farp) \
+		$(use_enable gmp) \
+		$(use_enable gcrypt) \
+		$(use_enable mysql) \
+		$(use_enable networkmanager nm) \
+		$(use_enable openssl) \
+		$(use_enable pam xauth-pam) \
+		$(use_enable pkcs11) \
+		$(use_enable sqlite) \
+		$(use_enable systemd) \
+		$(use_with caps capabilities libcap) \
+		--with-piddir=/run \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if ! use systemd; then
+		rm -rf "${ED}"/lib/systemd || die "Failed removing systemd lib."
+	fi
+
+	doinitd "${FILESDIR}"/ipsec
+
+	local dir_ugid
+	if use non-root; then
+		fowners ${UGID}:${UGID} \
+			/etc/ipsec.conf \
+			/etc/strongswan.conf
+
+		dir_ugid="${UGID}"
+	else
+		dir_ugid="root"
+	fi
+
+	diropts -m 0750 -o ${dir_ugid} -g ${dir_ugid}
+	dodir /etc/ipsec.d \
+		/etc/ipsec.d/aacerts \
+		/etc/ipsec.d/acerts \
+		/etc/ipsec.d/cacerts \
+		/etc/ipsec.d/certs \
+		/etc/ipsec.d/crls \
+		/etc/ipsec.d/ocspcerts \
+		/etc/ipsec.d/private \
+		/etc/ipsec.d/reqs
+
+	dodoc NEWS README TODO
+
+	# shared libs are used only internally and there are no static libs,
+	# so it's safe to get rid of the .la files
+	find "${D}" -name '*.la' -delete || die "Failed to remove .la files."
+}
+
+pkg_preinst() {
+	has_version "<net-vpn/strongswan-4.3.6-r1"
+	upgrade_from_leq_4_3_6=$(( !$? ))
+
+	has_version "<net-vpn/strongswan-4.3.6-r1[-caps]"
+	previous_4_3_6_with_caps=$(( !$? ))
+}
+
+pkg_postinst() {
+	if ! use openssl && ! use gcrypt; then
+		elog
+		elog "${PN} has been compiled without both OpenSSL and libgcrypt support."
+		elog "Please note that this might effect availability and speed of some"
+		elog "cryptographic features. You are advised to enable the OpenSSL plugin."
+	elif ! use openssl; then
+		elog
+		elog "${PN} has been compiled without the OpenSSL plugin. This might effect"
+		elog "availability and speed of some cryptographic features. There will be"
+		elog "no support for Elliptic Curve Cryptography (Diffie-Hellman groups 19-21,"
+		elog "25, 26) and ECDSA."
+	fi
+
+	if [[ $upgrade_from_leq_4_3_6 == 1 ]]; then
+		chmod 0750 "${ROOT}"/etc/ipsec.d \
+			"${ROOT}"/etc/ipsec.d/aacerts \
+			"${ROOT}"/etc/ipsec.d/acerts \
+			"${ROOT}"/etc/ipsec.d/cacerts \
+			"${ROOT}"/etc/ipsec.d/certs \
+			"${ROOT}"/etc/ipsec.d/crls \
+			"${ROOT}"/etc/ipsec.d/ocspcerts \
+			"${ROOT}"/etc/ipsec.d/private \
+			"${ROOT}"/etc/ipsec.d/reqs
+
+		ewarn
+		ewarn "The default permissions for /etc/ipsec.d/* have been tightened for"
+		ewarn "security reasons. Your system installed directories have been"
+		ewarn "updated accordingly. Please check if necessary."
+		ewarn
+
+		if [[ $previous_4_3_6_with_caps == 1 ]]; then
+			if ! use non-root; then
+				ewarn
+				ewarn "IMPORTANT: You previously had ${PN} installed without root"
+				ewarn "privileges because it was implied by the 'caps' USE flag."
+				ewarn "This has been changed. If you want ${PN} with user privileges,"
+				ewarn "you have to re-emerge it with the 'non-root' USE flag enabled."
+				ewarn
+			fi
+		fi
+	fi
+	if ! use caps && ! use non-root; then
+		ewarn
+		ewarn "You have decided to run ${PN} with root privileges and built it"
+		ewarn "without support for POSIX capability dropping. It is generally"
+		ewarn "strongly suggested that you reconsider- especially if you intend"
+		ewarn "to run ${PN} as server with a public ip address."
+		ewarn
+		ewarn "You should re-emerge ${PN} with at least the 'caps' USE flag enabled."
+		ewarn
+	fi
+	if use non-root; then
+		elog
+		elog "${PN} has been installed without superuser privileges (USE=non-root)."
+		elog "This imposes a few limitations mainly to the daemon 'charon' in"
+		elog "regards of the use of iptables."
+		elog
+		elog "Please carefully read: http://wiki.strongswan.org/projects/strongswan/wiki/ReducedPrivileges"
+		elog
+		elog "Thus if you require to specify a custom updown"
+		elog "script to charon which requires superuser privileges, you"
+		elog "can work around this limitation by using sudo to grant the"
+		elog "user \"ipsec\" the appropriate rights."
+		elog "For example (the default case):"
+		elog "/etc/sudoers:"
+		elog "  ipsec ALL=(ALL) NOPASSWD: SETENV: /usr/sbin/ipsec"
+		elog "Under the specific connection block in /etc/ipsec.conf:"
+		elog "  leftupdown=\"sudo -E ipsec _updown iptables\""
+		elog
+	fi
+	elog
+	elog "Make sure you have _all_ required kernel modules available including"
+	elog "the appropriate cryptographic algorithms. A list is available at:"
+	elog "  https://wiki.strongswan.org/projects/strongswan/wiki/KernelModules"
+	elog
+	elog "The up-to-date manual is available online at:"
+	elog "  https://wiki.strongswan.org/"
+	elog
+}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index c795d54d96e4..aebf372056fe 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index 3690fc8b3b06..492ac52e70d5 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -5,6 +5,6 @@ AUX pari-2.9.4-fltk-detection.patch 572 BLAKE2B 1c2e1fa6e52521c7865c3fd011824c83
 AUX pari-2.9.4-ppc.patch 363 BLAKE2B 135e76972e4121362666a25e3da236c4a5b7cffa058bbc25b59ca19ea20ccb0665327f70701adca5239cb936d513976e3ba7b5cda915a3f77c7b2eb28e75eaa0 SHA512 aaf5960010e56722f11234079a20ee7a7f8819dc084e1f6567fd11ad2820e3ae47617608f312941c2f373b5312a8c09c9cd51bfa44e263ffe1e8062c9fd9877d
 AUX pari-2.9.4-strip.patch 323 BLAKE2B 85a2b56f5501b4dafc0bffe48249c1662d6f96e81f8e8260ad52ecf84f053efef2ee6d6be6a6fda47886c372eb338d8bbf4443910df79a0d4e168b2666228c37 SHA512 50624ead82da41819ccfadfbdb746fb6ff414196ae2576c5d6a86e83c67355740b0e6e901a2860cab202db15adb1b00e346aabba338ab303230bc6aee8d33076
 DIST pari-2.13.4.tar.gz 4772735 BLAKE2B 5a3eebd380f1e47f38746b03ddde9a715ed74e7e8e4ed30ef8f2d62cf7289694b800fc8396557150ce9d79245c244fb56cecddac867c6057b438da4df68505e6 SHA512 0eb8c0100d76fb8f29fd29e6a49e9534b9a4d90e1869820dbfddd57fe444f0e83909947331823157a67be31f71a5d26fa1224f72ce3f9e5197db0194c417b9b9
-EBUILD pari-2.13.4-r1.ebuild 3671 BLAKE2B c0e417e506e94cba9c1301594a10d00cd863c82ad9a82fe27ce8292424c15529956a6aefa1901a4d1d44d279f70031c2451a8ae35a137b34566478b2da169a81 SHA512 eec4bf91eb7a152131ed83d74a1f77147ee8fc1468cfa5983ce19d2227be46b73d840659d2c345fedd9c8ae7aaa8a66710cadb2d7c67bf6d7af0e00ccde0109c
+EBUILD pari-2.13.4-r1.ebuild 3669 BLAKE2B 50694a82d37f3d7315e61f804029a6271afc2193a28378e8321cef7d4cedac8f04b4e972547427f58712e3b003eea7371df7a2f21f990eb81e8ec667bca62e06 SHA512 d58c360d15d93cc4131a3f54438e34522ccdb1b42b5298551f73f86e619f8b6219e6472c97e44bb3a3bb22c9bd0b5bc174a85a38e15f3415e89fcda53293debf
 EBUILD pari-2.13.4.ebuild 3420 BLAKE2B 5c30dcb0cc91164956ce0ba5425d591dccbfda71b45991f3620129400a4924934ce857a0bd6758b10a0677ff560ef0295fba04ac3e2536897278ea9a9dec6cc3 SHA512 c18904b5fc26f7d32e8dbc8360f1daeebf2f16ff24760037780512bb85c3470df540d1f56a0b777cf71fa825c2058a8153e3fb5af50c586357fcffa0ee012535
 MISC metadata.xml 1765 BLAKE2B 5d45009ff34f4d7780e70d2cdd94a5c60ebef674c235ba84d0989485dec62e83d15b9be7cbcbd583bf258fc936c5aff3d610ca8ea682323b07430fc2e71ee225 SHA512 32f560edbcfcf283b7f6a907277c584e5e9a33044b334e66818bc3529fb49a8709888aa27332da3f46e8c80971711403f333de3616132a47c34b9a1413237772
diff --git a/sci-mathematics/pari/pari-2.13.4-r1.ebuild b/sci-mathematics/pari/pari-2.13.4-r1.ebuild
index 2c20485a6433..8a3f70f9f496 100644
--- a/sci-mathematics/pari/pari-2.13.4-r1.ebuild
+++ b/sci-mathematics/pari/pari-2.13.4-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 # The subslot is the value of $soname_num obtained from
 # upstream's config/version script.
 SLOT="0/7"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="data doc fltk gmp test threads X"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index f91f18aa33be..734c11c21472 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 7d26ce0d6824..687b6fff74d8 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,12 +1,13 @@
 AUX iproute2-3.1.0-mtu.patch 1649 BLAKE2B cbecd9770391ca7c7f25b860a95bb5b2783073b333084874b18de85f5a9072ab3922e083f726ab1e6f58f0334b515968b1e3651abcd7fc6f603def0492da79cb SHA512 5479c2085b4aca958a89d3e265ebc3763c9e7cb273bd4046d7b7585209739f75ff04cc9b84d8eb9e3afae821ff788f0f0c7ab443260ab07943b6fad6946403e1
 AUX iproute2-4.20.0-no-ipv6.patch 1334 BLAKE2B 612fa64a897fe8c601aca529a09508cc865f2f0fb7cb865ba28f3369748086622b6910f25052047c972f495b5e20014cdf6e9f73b230124f372cfe6301bc0bf2 SHA512 f4b42667d4433225b2e4272b6e629fc43b73ede02ac0e706d2e46d81ffcecd19ca45b8b9789904b4bd6d10d34c82239f9b3c33cfcf3f9e5b309d828a3494c864
 AUX iproute2-5.12.0-configure-nomagic.patch 6967 BLAKE2B 8707ace3766d2bb797901886032bbbfc78b3116b548d317038144307a52ba86a01dc49460fa8b4524f03de3abc5b56f4901a9cb24f1f6cacfbd7a5b92cea7145 SHA512 a6184d1fc150717ab40a278c2a6ce439ea04e9967d55f1d10fecc8162452a1a38a6e11c2f736c5aebfe0ffe726bfa80e154169004ccc571b89dcef9c0dbe1242
+AUX iproute2-5.19.0-musl.patch 1418 BLAKE2B 280fdf5b38652320bde967ff22dbd7a27a5829190396c74ba688ed75643162b7c97e62606c747520c8bd57d6a2437a0c35ff267ffe8a70621e773b7bb5d8df99 SHA512 c94f2ad23054fcb98dda7bab770812570c82ace0e961892383f12a0cc7647e85bd452a29119b70e3829ae659c6e492f82782b9194cfb5b924503b778e5ca3e78
 AUX iproute2-5.7.0-mix-signal.h-include.patch 213 BLAKE2B ad6def6d017ff1d78587d1bfb9d92379983d989d9d4a396e773f02c655ac14c57cc25c5d4e37fbdb0e0d1cb1d35fc94ee70077b81d1285ac2d58cb1b19fa69db SHA512 09a9d450179b06c434a41b7bdd8d4a47b8ca2303de3d08b2b101e8695aec28e5d1e454a8c62e1b71d66b6e776dc6975f2837acc0a0f8a2a3f1e31b1eb56b71e3
 DIST iproute2-5.15.0.tar.xz 858068 BLAKE2B bca20ac53e1b2b3ae06186f655ad5073a0e691ed7b3aab25c4fbc118847b72a8a522175732cd22d8ec27480d1ab142319e80a5c3628434bec21260e585e1591d SHA512 e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22
 DIST iproute2-5.18.0.tar.xz 880456 BLAKE2B 21b15d84b07199d4ddd12cbf14d94806a073f4eda659958a8459ef2ca8becbef8638dac2550cc53893cd147888b6a3b738256dac074307b37ebec8dbb460e600 SHA512 7b43c89741a8ffe8fd529ac4ee19c8eab7dce2f064de494c160c75456ffb960fb5f1e78c868ab98360dafde28d5e2c4d58177135b6d380e80e06eba9e3eaf068
 DIST iproute2-5.19.0.tar.xz 892696 BLAKE2B ee287065d7c33c0fa97f0fc130bb3a4a3ad5ac9417ad74ce8489e64ec146ff97749d79bb6563043c8835eab91a51631576441d450693cb50808ad0d37b2ea648 SHA512 eb0fffb153f7cecc89b5573b7fc211d67fb1c06789fd3b0aec75ba5032521d53c51ccc52db7367e41397993df50244af84763b0b1d5a76d9dfccf013c010131b
 EBUILD iproute2-5.15.0.ebuild 4994 BLAKE2B bc73ac11db47b0d52926149af6546fe81fd94354ca48aad8f452c5fedeebc1629d847ba653175bdb18172a3d74c9e8c6026ffd8f3436130985929e38f4e0dec6 SHA512 5737c4bd54bc283c1c50c9b2f5e7c87f8b40d2665e15d72a05893d890427d1c389d2f6c857bd8ca0db2d38996dadea810b5a11f061e95830347ff7f864bd7f7e
 EBUILD iproute2-5.18.0-r1.ebuild 5803 BLAKE2B 5be3d8f2c91cb5d1e8d6b13d9a736e75d6066922caacaae94881b37e4cb963ed14eb185a68e745e484ec29fbd66c33a0deeccee75065af8fa292bfea945406fd SHA512 e42d7f42d7cab34838b1cc3984083d143ccf2d02743ed0ad14e091ae0fd4a3c4d8c82113cd813a1e517c527dac7915c5908e2503ddf8fedb2f46eb65675bb266
-EBUILD iproute2-5.19.0.ebuild 5790 BLAKE2B a4e4aef64a28dcde07729a71a30ff13b7d4a332dcf364e4aa5e6f32f63273574d4585826718cb15b087561690498efd56a1014233c60e3016a3d6eabdf62da68 SHA512 0277f4ea772b15af385e4bff0b84d751f5db3593c85148bfe7be149eea50514831c7d840b41d2c5ee89e234a056c57bbef33526a7a4c14e21ec9ab90e5ff571e
+EBUILD iproute2-5.19.0.ebuild 5821 BLAKE2B 37c5fc024d9a2976f587cc4410867bbae16f9b2c7c7ad9a429eb4916632588714d7ae9df96afcab0847357afd154dc5f860225c26eb1ad57a28c7af946410c3c SHA512 a2a19df5852566faea4d333edcf59030aea6b419d8489984084ce518b64cb9db324222a45314bd2b644cbf770f4f79789f65581ac2a24b8583df08c54e02883f
 EBUILD iproute2-9999.ebuild 5790 BLAKE2B a4e4aef64a28dcde07729a71a30ff13b7d4a332dcf364e4aa5e6f32f63273574d4585826718cb15b087561690498efd56a1014233c60e3016a3d6eabdf62da68 SHA512 0277f4ea772b15af385e4bff0b84d751f5db3593c85148bfe7be149eea50514831c7d840b41d2c5ee89e234a056c57bbef33526a7a4c14e21ec9ab90e5ff571e
 MISC metadata.xml 898 BLAKE2B f3c281e448846b5fa0e4cabec04767fe7217bd0d77a2baba7c1524ebdc1df4cc4c7d38ff441617959281c3a08b564d3cc6b7a89f846041f2416441b82079318d SHA512 404bd3aa523554bd78da7eb90bd3c53c146f71da92116115c238e1b186e971bf6d49161c33e58d6116af1616688bc00eb7d96f0fa5afb300a703cbdf6fdfe4ed
diff --git a/sys-apps/iproute2/files/iproute2-5.19.0-musl.patch b/sys-apps/iproute2/files/iproute2-5.19.0-musl.patch
new file mode 100644
index 000000000000..e907ba9454bf
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-5.19.0-musl.patch
@@ -0,0 +1,48 @@
+https://bugs.gentoo.org/864771
+https://github.com/shemminger/iproute2/commit/cf6b60c504d4be5e1df2b2745e55d677967831d0
+https://github.com/shemminger/iproute2/commit/28c740473510cd911b97cc5d7d23bd809a0f200b
+
+From cf6b60c504d4be5e1df2b2745e55d677967831d0 Mon Sep 17 00:00:00 2001
+From: Changhyeok Bae <changhyeok.bae@gmail.com>
+Date: Tue, 9 Aug 2022 04:01:05 +0000
+Subject: [PATCH] ipstats: Add param.h for musl
+
+Fix build error for musl
+| /usr/src/debug/iproute2/5.19.0-r0/iproute2-5.19.0/ip/ipstats.c:231: undefined reference to `MIN'
+
+Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com>
+--- a/ip/ipstats.c
++++ b/ip/ipstats.c
+@@ -1,6 +1,7 @@
+ // SPDX-License-Identifier: GPL-2.0+
+ #include <assert.h>
+ #include <errno.h>
++#include <sys/param.h>
+ 
+ #include "list.h"
+ #include "utils.h"
+
+From 28c740473510cd911b97cc5d7d23bd809a0f200b Mon Sep 17 00:00:00 2001
+From: Stephen Hemminger <stephen@networkplumber.org>
+Date: Tue, 9 Aug 2022 13:27:33 -0700
+Subject: [PATCH] ipstats: add missing headers
+
+IWYU reports several headers are not explicitly
+included by ipstats.
+
+Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
+--- a/ip/ipstats.c
++++ b/ip/ipstats.c
+@@ -1,7 +1,11 @@
+ // SPDX-License-Identifier: GPL-2.0+
++#include <alloca.h>
+ #include <assert.h>
+ #include <errno.h>
++#include <stdio.h>
++#include <string.h>
+ #include <sys/param.h>
++#include <sys/socket.h>
+ 
+ #include "list.h"
+ #include "utils.h"
+
diff --git a/sys-apps/iproute2/iproute2-5.19.0.ebuild b/sys-apps/iproute2/iproute2-5.19.0.ebuild
index b3c0b0e984dc..0ad41a520dc0 100644
--- a/sys-apps/iproute2/iproute2-5.19.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.19.0.ebuild
@@ -51,6 +51,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722
 	#"${FILESDIR}"/${PN}-5.1.0-portability.patch
 	"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
+	"${FILESDIR}"/${P}-musl.patch
 )
 
 src_prepare() {
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 28208f86903b..3971c5dd71f3 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/rdma-core/Manifest b/sys-cluster/rdma-core/Manifest
index 28c615fdbb0c..60cb8174af1d 100644
--- a/sys-cluster/rdma-core/Manifest
+++ b/sys-cluster/rdma-core/Manifest
@@ -8,6 +8,6 @@ DIST rdma-core-39.0.tar.gz 1762652 BLAKE2B 7fed2be57624451c660120c6360fedd15ffaf
 DIST rdma-core-41.0.tar.gz 1784540 BLAKE2B 3c153dcc3563427f32fa32d9a31527635c6bb3e63297c201f30de1328a68ac73ecb3af89074dfcc27d92c640d14d8d8ec61c001659d18336a4156cf8ed22996c SHA512 d8c1210ca078ea53879cee42c838cc88bcc98430471ae609d8c4a25218dbfd63a70f5bbd4e9ba6efabdfc467f7d5796ce618ec22013d414f17502d1257601a80
 EBUILD rdma-core-38.0.ebuild 2448 BLAKE2B 090f6b08a69860660d408a992637ca3e169483179cf2a711f85eef36e083b1f3ebf418a3e5ca803068a0405ca9debf5d0248d797af51962d727489c23ea346e4 SHA512 515fda3b404e98e0da4f21496657e8c375b5d22c452504bbe29bf5f0bc40ad125f565184730592d9a423559828906a6bf0038f73c713f81de0ed043a96c9d341
 EBUILD rdma-core-39.0.ebuild 2472 BLAKE2B f055ae93485aebe8fb916849b6d7c91a423fc7145a4ea572a47dce600c5f83dbb0ae27a53c3070f5dacc8bd05927a58b77d36d7963ee5352967a67da9a5f9247 SHA512 152476c57ba02cb370632dbfc388eff32cdb6286c544e41a38a097afef97d5be3a0419b9f887b9c94b8f1f0384bd56f399ef50883c56e9810740f1abc24c5f96
-EBUILD rdma-core-41.0.ebuild 2588 BLAKE2B b7955683867b39d7685bf98836a51bdda982f7404e0e7b2191ddeedf62e6afd528e4ba51fd108fa8833b376be770be8f6e236534db66454ca6784e883a3e1d05 SHA512 a63882336c276a47d778e3eb2633c602c986ee144c6c36309f29927b8976ca715045669cc43335024074ea65dc874ae341e60f904937907f3c59a50fe9a0a8ff
+EBUILD rdma-core-41.0.ebuild 2587 BLAKE2B efb123f796caedae389ddda11419af6d4f54fb704d9b4f2fdb4acf813c3e568a031acdccaab0e56617fb78ef12006cf92ed73bd8ee3dd0830136ea9d6c94f8eb SHA512 a79347a0042b919b65942c13a6353418fa8a74aa2548879b31cf2827a529c743b380941a032f75c30e017fa502ca8ee9ea56ac28b93bcdde5566250a6c2ddfe5
 EBUILD rdma-core-9999.ebuild 2418 BLAKE2B d2fa179a54139bcfd93f0c8bdbd9be1435a9df8df3b0fd7df671397704aa07495128ce32e7526cc76fa63e75cb6efc88906a0e405a2482aec98626027bfaedfe SHA512 98e1deb03db9be7d8cf69426deef07ced89999c84d63a903a6015717ec799d46dfc8207c0e1ced3df1b09b01d42e870df49f1371643ddf758d619013c3aec620
 MISC metadata.xml 560 BLAKE2B f76b4e81668b49b5bb5c3719c2bc2ae9e2d649d827193b60961864924fba1861865d3a55dd14d38f2d58fae0ce49bae8144946600233c63baf4b9a88b2422a06 SHA512 bde881700dedb23708d08b09b0e5317e49729323e8fd4acd2be90c74ddbc837adc228b7831920c8140b8162d494d02b0ccfb8244dfd545aca3cadde418370a6e
diff --git a/sys-cluster/rdma-core/rdma-core-41.0.ebuild b/sys-cluster/rdma-core/rdma-core-41.0.ebuild
index 344d77a450b7..d8d8ff54cdfb 100644
--- a/sys-cluster/rdma-core/rdma-core-41.0.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-41.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core"
 else
 	SRC_URI="https://github.com/linux-rdma/rdma-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 349fc056090b..035a3652f200 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index c2e2f81e09f8..d8baeb70b950 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,10 +1,12 @@
 AUX gdb-11.2-glibc-2.35-fsqrt.patch 2212 BLAKE2B c0b9e6e9f27f791d197691ff5bc1e5083b7acb3197312ce5c9afdad02756b69b47f308f85d2b94d3695e8869db8925298bc808468c36c29ddfb289009fb038c4 SHA512 4b8d9ffcd178c0a028b29d8ba2ecb6eedf7a8d67ea1a8bb39276a5d36582502604d7cb1585671e82169539f6a4317224ce61ca4e95b455221340f70a4f1360e0
+AUX gdb-12.1-core-file-detach.patch 5853 BLAKE2B 4442a9d6357f751f9953236a068ffc5e8a1f57eef1bf9e118d572614164486197db44cb6e5f1ab20906ae97ca1c4805a01ce5c2c3cbd1509bb383c108b6b8b1e SHA512 e044053dec340e6373b4a3546adf36ea121bb63a5277d6a1f24f5551edb0cf408f3f862076d6760b27501d54025063afd4a9375914c3f2321f5410466a89f75b
 AUX gdb-12.1-readline-8.2-build.patch 926 BLAKE2B f483dd1054b019d44dd4731ba22113551d3530a9da1af8c5e83aeae3ba820d96b8a1c2cb7758ecc3fbe8a56cdc7232cdece809d15c30dbfffadc30d81738a7ca SHA512 f865349953181fe3502abbe6042ebab249e2ebbc4c0017ebad756aadfd63e72f57b009fe2e7d036543f326e54518a656101bef572d03a7a7170c9ec305807ed8
 AUX gdb-8.3.1-verbose-build.patch 395 BLAKE2B e2e82307ceae64d16aa9b57a5e639eb5d217c4d977aed0847fdf125bb13ebc004906d9afb8e3f629c41efccca88df0040015e7799c1fd24de5fb50f62f5bbd90 SHA512 c2bb013e4fcabefddcd8042bd3cbb53471f83182cc8769fe0d19eed80ccc4a83bd84d120006fa25b3b7d0310dc2f2ec6b44a6ff74909cd312b7e491f371777a3
 DIST gdb-11.2.tar.xz 22039420 BLAKE2B 66ce7e12c99c33c8b4e6ababa673204aab525e72c90ba54cc34a5fd69948a09dc2a9ef2050764b2464544231b1d1a6431279c2877388551ca6fbf384a3f9b464 SHA512 07e9026423438049b11f4f784d57401ece4e940570f613bd6958b3714fe7fbc2c048470bcce3e7d7d9f93331cdf3881d30dcc964cb113a071143a02b28e5b127
 DIST gdb-12.1.tar.xz 22470332 BLAKE2B 7f6f853d1640908cf2c79932cdc1ba02549a07721c005d9c7ce2946a715761719cc164a4e68235a18664ec8a029afe3a2a0cfb57e1635f280076d6bed91317fd SHA512 425568d2e84672177d0fb87b1ad7daafdde097648d605e30cf0656970f66adc6a82ca2d83375ea4be583e9683a340e5bfdf5819668ddf66728200141ae50ff2d
 EBUILD gdb-11.2.ebuild 7722 BLAKE2B 1bcbff793ff193619bb8a8d0fc066b4feadb66fde7561386b7cee2a4a21a2589e19581beaad9730d2d39542e34e62e030b4dcf0a27f3494963c61e890873e70b SHA512 2ec73b48268062d058757656a76a3b8c8934cf474850c0f580f7e6a0931c775cf649cbfa812aa2a70c707efb0ae74d0fef78c3faa7780499764adb5f04333e59
 EBUILD gdb-12.1-r1.ebuild 8182 BLAKE2B fa5f02ee9d8ca485ec0f3e3c8f59977669cf1bb4ac1317b44dcab292c1a394d826029199d78859206c2e3816af01d3fdcbf077c7bce67a9cd47c8e7e4818e752 SHA512 f2c12426f28e36183009f314ab7164512a6367b4c344f418d00c80279b0a348dacabc1ca6af4c971a4ea949273e9b9e96458a4850a362c1629aa6650f67a4825
+EBUILD gdb-12.1-r2.ebuild 8225 BLAKE2B 3bf43b7d87029a0ec4319c00a177e4df8b4d23a68862b0b1692481e9ed817947ddd9da32d281641772db270d8daee2674696a550be348cde4364d826fc7974a4 SHA512 bd17ae458284a1aca545e4cdb81f0243e942d010d01263bf223a2f542b150bf1ddff90fcb849f00cafad56412910b045d9562785fc64aa1c6819c3a34b420d46
 EBUILD gdb-12.1.ebuild 7708 BLAKE2B 13e0a83a1f30c21d973c8bdaa018406b7a60563fec76e73052ccb388308f88acbd613a3c0e115a02f2fa61ff1c2733d79203750e93c815ef85f5f75bd76b23b4 SHA512 3e9e0fd46b7680daf8c8a67200af8fcfb1d0422d372820e758d5a5e8bc0d674b7ae977e600446e2201d645be7e2a930a2165bcb6a09fce5113088aaa2f7bb2ca
 EBUILD gdb-9999.ebuild 8137 BLAKE2B 5674afcc2ba558478269300ecb18efc14abb528d1d9a9a2175e813b9f110ee29ea63b8a68e10c0e657691b165cc8852b577ed1b504786a0cc651d60edfc5c337 SHA512 d5f2888f77d1f4595d5c2497730ce0900189e02c4b793b4636c607d28f663657a040ba20eb792597bbb8b27d6f39679e5c596b95e62ccfeaaa3b0777449ca3b3
 MISC metadata.xml 1103 BLAKE2B e63ea2e52649ac2f4ac21381cadb7cc76525792e99a4a6581535475480b6c45e654c8222b0b58585435d4c858cf3eef00dcaecf7edecae2b2fd336f1b56e6e56 SHA512 f7f1b4da71b18cb68a2f32aa6faae6251528047069071c9bee1be504267d0baf2cbac4fb928e0cbe9df100e3a681e2c3b6c7be14514a45a2f52d30364a8626f4
diff --git a/sys-devel/gdb/files/gdb-12.1-core-file-detach.patch b/sys-devel/gdb/files/gdb-12.1-core-file-detach.patch
new file mode 100644
index 000000000000..c0f8a8ee0269
--- /dev/null
+++ b/sys-devel/gdb/files/gdb-12.1-core-file-detach.patch
@@ -0,0 +1,155 @@
+https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=0fe74cb9ad35add9c6da4df5c9879f254d918a6a
+
+From: Pedro Alves <pedro@palves.net>
+Date: Wed, 22 Jun 2022 18:44:37 +0100
+Subject: [PATCH] Fix core-file -> detach -> crash (corefiles/29275)
+
+After loading a core file, you're supposed to be able to use "detach"
+to unload the core file.  That unfortunately regressed starting with
+GDB 11, with these commits:
+
+ 1192f124a308 - gdb: generalize commit_resume, avoid commit-resuming when threads have pending statuses
+ 408f66864a1a - detach in all-stop with threads running
+
+resulting in a GDB crash:
+
+ ...
+ Thread 1 "gdb" received signal SIGSEGV, Segmentation fault.
+ 0x0000555555e842bf in maybe_set_commit_resumed_all_targets () at ../../src/gdb/infrun.c:2899
+ 2899          if (proc_target->commit_resumed_state)
+ (top-gdb) bt
+ #0  0x0000555555e842bf in maybe_set_commit_resumed_all_targets () at ../../src/gdb/infrun.c:2899
+ #1  0x0000555555e848bf in scoped_disable_commit_resumed::reset (this=0x7fffffffd440) at ../../src/gdb/infrun.c:3023
+ #2  0x0000555555e84a0c in scoped_disable_commit_resumed::reset_and_commit (this=0x7fffffffd440) at ../../src/gdb/infrun.c:3049
+ #3  0x0000555555e739cd in detach_command (args=0x0, from_tty=1) at ../../src/gdb/infcmd.c:2791
+ #4  0x0000555555c0ba46 in do_simple_func (args=0x0, from_tty=1, c=0x55555662a600) at ../../src/gdb/cli/cli-decode.c:95
+ #5  0x0000555555c112b0 in cmd_func (cmd=0x55555662a600, args=0x0, from_tty=1) at ../../src/gdb/cli/cli-decode.c:2514
+ #6  0x0000555556173b1f in execute_command (p=0x5555565c5916 "", from_tty=1) at ../../src/gdb/top.c:699
+
+The code that crashes looks like:
+
+ static void
+ maybe_set_commit_resumed_all_targets ()
+ {
+   scoped_restore_current_thread restore_thread;
+
+   for (inferior *inf : all_non_exited_inferiors ())
+     {
+       process_stratum_target *proc_target = inf->process_target ();
+
+       if (proc_target->commit_resumed_state)
+           ^^^^^^^^^^^
+
+With 'proc_target' above being null.  all_non_exited_inferiors filters
+out inferiors that have pid==0.  We get here at the end of
+detach_command, after core_target::detach has already run, at which
+point the inferior _should_ have pid==0 and no process target.  It is
+clear it no longer has a process target, but, it still has a pid!=0
+somehow.
+
+The reason the inferior still has pid!=0, is that core_target::detach
+just unpushes, and relies on core_target::close to actually do the
+getting rid of the core and exiting the inferior.  The problem with
+that is that detach_command grabs an extra strong reference to the
+process stratum target, so the unpush_target inside
+core_target::detach doesn't actually result in a call to
+core_target::close.
+
+Fix this my moving the cleaning up the core inferior to a shared
+routine called by both core_target::close and core_target::detach.  We
+still need to cleanup the inferior from within core_file::close
+because there are paths to it that want to get rid of the core without
+going through detach.  E.g., "core-file" -> "run".
+
+This commit includes a new test added to gdb.base/corefile.exp to
+cover the "core-file core" -> "detach" scenario.
+
+Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29275
+
+Change-Id: Ic42bdd03182166b19f598428b0dbc2ce6f67c893
+--- a/gdb/corelow.c
++++ b/gdb/corelow.c
+@@ -120,6 +120,9 @@ public:
+ 
+ private: /* per-core data */
+ 
++  /* Get rid of the core inferior.  */
++  void clear_core ();
++
+   /* The core's section table.  Note that these target sections are
+      *not* mapped in the current address spaces' set of target
+      sections --- those should come only from pure executable or
+@@ -290,10 +293,8 @@ core_target::build_file_mappings ()
+ /* An arbitrary identifier for the core inferior.  */
+ #define CORELOW_PID 1
+ 
+-/* Close the core target.  */
+-
+ void
+-core_target::close ()
++core_target::clear_core ()
+ {
+   if (core_bfd)
+     {
+@@ -307,6 +308,14 @@ core_target::close ()
+ 
+       current_program_space->cbfd.reset (nullptr);
+     }
++}
++
++/* Close the core target.  */
++
++void
++core_target::close ()
++{
++  clear_core ();
+ 
+   /* Core targets are heap-allocated (see core_target_open), so here
+      we delete ourselves.  */
+@@ -592,9 +601,15 @@ core_target_open (const char *arg, int from_tty)
+ void
+ core_target::detach (inferior *inf, int from_tty)
+ {
+-  /* Note that 'this' is dangling after this call.  unpush_target
+-     closes the target, and our close implementation deletes
+-     'this'.  */
++  /* Get rid of the core.  Don't rely on core_target::close doing it,
++     because target_detach may be called with core_target's refcount > 1,
++     meaning core_target::close may not be called yet by the
++     unpush_target call below.  */
++  clear_core ();
++
++  /* Note that 'this' may be dangling after this call.  unpush_target
++     closes the target if the refcount reaches 0, and our close
++     implementation deletes 'this'.  */
+   inf->unpush_target (this);
+ 
+   /* Clear the register cache and the frame cache.  */
+--- a/gdb/testsuite/gdb.base/corefile.exp
++++ b/gdb/testsuite/gdb.base/corefile.exp
+@@ -207,6 +207,16 @@ gdb_test "up" "#\[0-9\]* *\[0-9xa-fH'\]* in .* \\(.*\\).*" "up in corefile.exp (
+ 
+ gdb_test "core" "No core file now."
+ 
++# Test that we can unload the core with the "detach" command.
++
++proc_with_prefix corefile_detach {} {
++    clean_restart $::binfile
++
++    gdb_test "core-file $::corefile" "Core was generated by .*" "load core"
++    gdb_test "detach" "No core file now\\." "detach core"
++}
++
++corefile_detach
+ 
+ # Test a run (start) command will clear any loaded core file.
+ 
+@@ -222,6 +232,8 @@ proc corefile_test_run {} {
+ 	return
+     }
+ 
++    clean_restart $::binfile
++
+     gdb_test "core-file $corefile" "Core was generated by .*" "run: load core again"
+     gdb_test "info files" "\r\nLocal core dump file:\r\n.*" "run: sanity check we see the core file"
+ 
diff --git a/sys-devel/gdb/gdb-12.1-r2.ebuild b/sys-devel/gdb/gdb-12.1-r2.ebuild
new file mode 100644
index 000000000000..9da927c79e77
--- /dev/null
+++ b/sys-devel/gdb/gdb-12.1-r2.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit flag-o-matic python-single-r1 strip-linguas toolchain-funcs
+
+export CTARGET=${CTARGET:-${CHOST}}
+
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+case ${PV} in
+	9999*)
+		# live git tree
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		inherit git-r3
+		SRC_URI=""
+		;;
+	*.*.50.2???????)
+		# weekly snapshots
+		SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
+		;;
+	*)
+		# Normal upstream release
+		SRC_URI="mirror://gnu/gdb/${P}.tar.xz
+			ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
+		;;
+esac
+
+PATCH_VER=""
+PATCH_DEV=""
+DESCRIPTION="GNU debugger"
+HOMEPAGE="https://sourceware.org/gdb/"
+SRC_URI="${SRC_URI}
+	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz}
+	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
+"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+IUSE="cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# In fact, gdb's test suite needs some work to get passing.
+# See e.g. https://sourceware.org/gdb/wiki/TestingGDB.
+# As of 11.2, on amd64: "# of unexpected failures    8600"
+# ia64 kernel crashes when gdb testsuite is running
+# in fact, gdb's test suite needs some work to get passing.
+# See e.g. https://sourceware.org/gdb/wiki/TestingGDB.
+# As of 11.2, on amd64: "# of unexpected failures    8600"
+RESTRICT="
+	ia64? ( test )
+	!test? ( test )
+	test
+"
+
+RDEPEND="
+	dev-libs/mpfr:0=
+	dev-libs/gmp:=
+	>=sys-libs/ncurses-5.2-r2:0=
+	>=sys-libs/readline-7:0=
+	sys-libs/zlib
+	elibc_glibc? ( net-libs/libnsl:= )
+	lzma? ( app-arch/xz-utils )
+	python? ( ${PYTHON_DEPS} )
+	guile? ( >=dev-scheme/guile-2.0 )
+	xml? ( dev-libs/expat )
+	source-highlight? (
+		dev-util/source-highlight
+	)
+	xxhash? (
+		dev-libs/xxhash
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	sys-apps/texinfo
+	virtual/yacc
+	nls? ( sys-devel/gettext )
+	source-highlight? ( virtual/pkgconfig )
+	test? ( dev-util/dejagnu )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
+	"${FILESDIR}"/${P}-readline-8.2-build.patch
+	"${FILESDIR}"/${P}-core-file-detach.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	strip-linguas -u bfd/po opcodes/po
+
+	# Avoid using ancient termcap from host on Prefix systems
+	sed -i -e 's/termcap tinfow/tinfow/g' \
+		gdb/configure{.ac,} || die
+}
+
+gdb_branding() {
+	printf "Gentoo ${PV} "
+
+	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
+		printf "p${PATCH_VER}"
+	else
+		printf "vanilla"
+	fi
+
+	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
+}
+
+src_configure() {
+	strip-unsupported-flags
+
+	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
+	# Avoid really confusing logs from subconfigure spam, makes logs far
+	# more legible.
+	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
+
+	local myconf=(
+		# portage's econf() does not detect presence of --d-d-t
+		# because it greps only top-level ./configure. But not
+		# gnulib's or gdb's configure.
+		--disable-dependency-tracking
+
+		--with-pkgversion="$(gdb_branding)"
+		--with-bugurl='https://bugs.gentoo.org/'
+		--disable-werror
+		# Disable modules that are in a combined binutils/gdb tree. bug #490566
+		--disable-{binutils,etc,gas,gold,gprof,ld}
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
+
+		$(use_enable test unit-tests)
+
+		# Allow user to opt into CET for host libraries.
+		# Ideally we would like automagic-or-disabled here.
+		# But the check does not quite work on i686: bug #760926.
+		$(use_enable cet)
+
+		# We need to set both configure options, --with-sysroot and --libdir,
+		# to fix cross build issues that happen when configuring gmp.
+		# We explicitly need --libdir. Having only --with-sysroot without
+		# --libdir would not fix the build issues.
+		# For some reason, it is not enough to set only --with-sysroot,
+		# also not enough to pass --with-gmp-xxx options.
+		--with-sysroot="${ESYSROOT}"
+		--libdir="${ESYSROOT}/usr/$(get_libdir)"
+	)
+
+	local sysroot="${EPREFIX}/usr/${CTARGET}"
+
+	is_cross && myconf+=(
+		--with-sysroot="${sysroot}"
+		--includedir="${sysroot}/usr/include"
+		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
+	)
+
+	# gdbserver only works for native targets (CHOST==CTARGET).
+	# it also doesn't support all targets, so rather than duplicate
+	# the target list (which changes between versions), use the
+	# "auto" value when things are turned on, which is triggered
+	# whenever no --enable or --disable is given
+	if is_cross || use !server ; then
+		myconf+=( --disable-gdbserver )
+	fi
+
+	myconf+=(
+		--enable-64-bit-bfd
+		--disable-install-libbfd
+		--disable-install-libiberty
+		--enable-obsolete
+		# This only disables building in the readline subdir.
+		# For gdb itself, it'll use the system version.
+		--disable-readline
+		--with-system-readline
+		# This only disables building in the zlib subdir.
+		# For gdb itself, it'll use the system version.
+		--without-zlib
+		--with-system-zlib
+		--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
+		$(use_with xml expat)
+		$(use_with lzma)
+		$(use_enable nls)
+		$(use_enable source-highlight)
+		$(use multitarget && echo --enable-targets=all)
+		$(use_with python python "${EPYTHON}")
+		$(use_with xxhash)
+		$(use_with guile)
+	)
+
+	if use sparc-solaris || use x86-solaris ; then
+		# Disable largefile support
+		# https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html
+		myconf+=( --disable-largefile )
+	fi
+
+	# source-highlight is detected with pkg-config: bug #716558
+	export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)"
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+
+	# ensure proper compiler is detected for Clang builds: bug #831202
+	export GCC_FOR_TARGET="${CC_FOR_TARGET:-$(tc-getCC)}"
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	emake V=1 DESTDIR="${D}" install
+
+	find "${ED}"/usr -name libiberty.a -delete || die
+
+	# Delete translations that conflict with binutils-libs. bug #528088
+	# Note: Should figure out how to store these in an internal gdb dir.
+	if use nls ; then
+		find "${ED}" \
+			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
+			-delete || die
+	fi
+
+	# Don't install docs when building a cross-gdb
+	if [[ ${CTARGET} != ${CHOST} ]] ; then
+		rm -rf "${ED}"/usr/share/{doc,info,locale} || die
+		local f
+		for f in "${ED}"/usr/share/man/*/* ; do
+			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
+				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
+			fi
+		done
+		return 0
+	fi
+
+	# Install it by hand for now:
+	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
+	# Only install if it exists due to the twisted behavior (see
+	# notes in src_configure above).
+	[[ -e gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay
+
+	docinto gdb
+	dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
+		gdb/NEWS gdb/PROBLEMS
+	docinto sim
+	dodoc sim/{MAINTAINERS,README-HACKING}
+
+	if use server ; then
+		docinto gdbserver
+		dodoc gdbserver/README
+	fi
+
+	if [[ -n ${PATCH_VER} ]] ; then
+		dodoc "${WORKDIR}"/extra/gdbinit.sample
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,ctf-spec,standards}.info*
+
+	if use python ; then
+		python_optimize "${ED}"/usr/share/gdb/python/gdb
+	fi
+}
+
+pkg_postinst() {
+	# Portage doesn't unmerge files in /etc
+	rm -vf "${EROOT}"/etc/skel/.gdbinit
+
+	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
+		ewarn "gdb is unable to get a mach task port when installed by Prefix"
+		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
+		ewarn "have to perform the following steps:"
+		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
+		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
+	fi
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 791fb70e6f7f..e00e8cab3fb4 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index a4b6ea46e470..5860d5c590bb 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -10,10 +10,13 @@ DIST binutils-2.37_p1.tar.xz 22992196 BLAKE2B a8aa0f386d03a5b1466166ac7c40989c22
 DIST binutils-2.38-patches-3.tar.xz 189068 BLAKE2B 5b14c90ab7dba253e92ad57b3a702fcbf48739dd0121ce8f739d88331da820ce44c35e16ac4bee394525c3a46bce980e9e1bbf4cbc9ce8a14fc324bc8fa059e7 SHA512 099266a8ef4272fd7f7552071e1892d114ed564a38b700df32e058ed691c6bfcd6f2454f649461f9c36594ea819a35d1e4cd2418609a2407be2a4f8885e500e3
 DIST binutils-2.38-patches-4.tar.xz 193852 BLAKE2B 5a83e20008e58464ed563a6817a367e50684c59d08c47345cc546054269c42463d1651441720f865851e4e182e917df1a095c68e64226e0351b64e975d524096 SHA512 6657e547bb02898632cc45a8f1894be098aa7472b6725b65f95393e621abb127e468b4e50310720bf03f7e8d0a68bc2c47af76fc43aaa8f32b2e4a149c0c6290
 DIST binutils-2.38.tar.xz 23651408 BLAKE2B 19ede396ec97b88e632aded2f69f4684cc5053109e06c3c4a1934944e3f0ceaa9e4a2604528a440189771f778cb5d75edd510163970eeea31afba87fa256feba SHA512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d
+DIST binutils-2.39-patches-3.tar.xz 57332 BLAKE2B 08bdcd35afb6310c5f61e8a93f60c624ff461a612d8b473b2cfc1d8eb94eedb311af0b39b5f8ac425f3676d8e1addd13a4b223983de2f6d579e50daec08d3881 SHA512 f8a1a908866637a39a3ad55d47304f3320ab663d299d8d231a873008a50bb2a09c89a2482394c017a2a73c2cfc48ed944e99b422fd5db19f829e45ff071bb659
+DIST binutils-2.39.tar.xz 25167756 BLAKE2B ac6a5296c6586d53eaadcbffc5c399a6d79edf72450b9bb8b3525ce525129cef3d2eb90c85ef3bb3270b5a03b0e1ffb8f0b705f028158726f9777ebb8685066f SHA512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3
 EBUILD binutils-libs-2.34-r2.ebuild 3678 BLAKE2B 2ecd619f2dd9968a11a3c8c2cf8f65d30d7191163bc6fd5ae1fc7d6dfad4bb30b061e5029fc7d2a23c1b7d0a4ca142532b8175b593d9d0ac408338c39cc02e60 SHA512 3ae489fa333ea206ce758f102a56ebbde7a59fa817720503eb1287c4d1d156598cbe7bc78beb2f0ab85f6f60c32f753d4c66cb0428dcbeb13d873407a4c86335
 EBUILD binutils-libs-2.35.2.ebuild 4100 BLAKE2B 521acb4f160e171efd6500aba598825f50c19b62f77689b208dcca260396aa1a2c769937db49b147a51e7645baa1fd72f13559fa15e5fced7c8bd57088575027 SHA512 628c171049d6fae374538a96ad7cc76463d78e562d16fbd5877ab7b0800b026e9c72f3b346ec2e3e92a9c5836c483e0eec226c5ac2ecc8e71c2c66c6c8c5b844
 EBUILD binutils-libs-2.36.1-r2.ebuild 4053 BLAKE2B 1d2c9609ce0fa3aff3222d89ee237ba73d31515bb0032ffd8d6b6a9a04060aec1df32cb727572a0a20b9ba64834dc43c2260f3401703cb711d0d5516e136a3d1 SHA512 e355a34921f4a260f2f61a222365703b1afc103fc993e255801a8c2deec42409ba1aec8a22d734c38a4440c385b29f81eac52c4584431ee54d0cf0cfe611ff6c
 EBUILD binutils-libs-2.37_p1-r2.ebuild 4126 BLAKE2B 63dcef180b378d47d48f714e095ff2ce98dcd027de0d176c64179fcfe1f48df5f451468fb974176ade21914f4ba731487b91b03223eba11662be17cb3b42c9c1 SHA512 c659774de8238e81669507dfd5b2a565b5deaa8c54fe12ee02f5b3b204a147b2aea5bb9a6707930d0ac3ca10225ce486f294e510402b37c99ee1f6c170c31ecc
 EBUILD binutils-libs-2.38-r1.ebuild 4530 BLAKE2B 6fbf59602ecd890921c795d31d67559da3e36790d1f2976f25a8cfd4a8c644236870cf03e843c82e6ffdd74ba2386d43ee722c7aa5a421058eabbafa3585bc7d SHA512 42253acb4cd37d34c44af701bdd3c7eeba54409601e55ef5267370ff2cd76574046d32ffbf04921b64104df73ccb0a312a282cc4cc7d1d58cfd8d6d89063b951
 EBUILD binutils-libs-2.38-r2.ebuild 4804 BLAKE2B 18f2d2553a1f524cce1133e61f9538349a645e308f0335cdcd5a37081db03b54601ac137961253044051ac0230c25a880490271e85524bbb740b7e248a719900 SHA512 42c6ad9c4b05876d1a33c5c17783cd9f93975f9b673a5e197809f08f248384944eb00d17926f296ce1490887af30df76de63b34628b37dad69b2dd1c4645bb82
+EBUILD binutils-libs-2.39.ebuild 4813 BLAKE2B ccf2083b279e1ef8807117c7d0ef9bda70ca40ec5be92c405fd409830f01cfc3a5053ba023b0eae28db2771a589440dfb01061ed99a700e3823ad6a084bd8f1c SHA512 06b2ef408444b26c030a66441375cb182a3b9de5c8a3d7e63fd093674171ec6659d8a7d7149f3bce16c5cdc6b49492ca0c4bf47b337f8e4faeb78a5ad863b44a
 MISC metadata.xml 612 BLAKE2B ceaafd9fd1421e9f3993e003d0029c92a78054c7a2b90bd78afc05370ad19c931c6a7c150545cfb7d57165168e0fdaf3a00dde1905b328826a91cbc70d9548a8 SHA512 c8d33bb8d1c62c7e95758624ed0febbc9d40e9f141bfd280837b3207bcd771412158d71c0cb5548d60be0b236f6fe103621daf7efa8875191982859b566ffa8d
diff --git a/sys-libs/binutils-libs/binutils-libs-2.39.ebuild b/sys-libs/binutils-libs/binutils-libs-2.39.ebuild
new file mode 100644
index 000000000000..68c12ebf98ac
--- /dev/null
+++ b/sys-libs/binutils-libs/binutils-libs-2.39.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PATCH_VER=3
+PATCH_DEV=dilfridge
+
+inherit libtool toolchain-funcs multilib-minimal
+
+MY_PN="binutils"
+MY_P="${MY_PN}-${PV}"
+PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
+PATCH_DEV=${PATCH_DEV:-dilfridge}
+
+DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages"
+HOMEPAGE="https://sourceware.org/binutils/"
+SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_P}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_PN}-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0/${PV%_p?}"
+IUSE="64-bit-bfd cet multitarget nls static-libs"
+#KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="nls? ( sys-devel/gettext )"
+DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
+# Need a newer binutils-config that'll reset include/lib symlinks for us.
+RDEPEND="${DEPEND}
+	>=sys-devel/binutils-config-5
+"
+
+S="${WORKDIR}/${MY_P%_p?}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/bfd.h
+)
+
+src_prepare() {
+	if [[ -n ${PATCH_VER} ]] ; then
+		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
+		eapply "${WORKDIR}/patch"/*.patch
+	fi
+
+	# Fix cross-compile relinking issue, bug #626402
+	elibtoolize
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# somehow libtool/configure is messed up and (custom patch at
+		# upstream?) and misdetects (basically assumes) nm can be called
+		# with -B arg -- can't run eautoreconf (fails), so patch up
+		# manually, this would break any target that needs -B to nm
+		sed -i -e 's/lt_cv_path_NM="$tmp_nm -B"/lt_cv_path_NM="$tmp_nm"/' \
+			libctf/configure || die
+	fi
+
+	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
+	# Avoid really confusing logs from subconfigure spam, makes logs far
+	# more legible.
+	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
+
+	default
+}
+
+pkgversion() {
+	printf "Gentoo ${PVR}"
+	[[ -n ${PATCHVER} ]] && printf " p${PATCHVER}"
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-obsolete
+		--enable-shared
+		--enable-threads
+		# Newer versions (>=2.24) make this an explicit option. #497268
+		--enable-install-libiberty
+		--disable-werror
+		--with-bugurl="https://bugs.gentoo.org/"
+		--with-pkgversion="$(pkgversion)"
+		$(use_enable static-libs static)
+		# The binutils eclass enables this flag for all bi-arch builds,
+		# but other tools often don't care about that support.  Put it
+		# beyond a flag if people really want it, but otherwise leave
+		# it disabled as it can slow things down on 32bit arches. #438522
+		$(use_enable 64-bit-bfd)
+		# This only disables building in the zlib subdir.
+		# For binutils itself, it'll use the system version. #591516
+		--without-zlib
+		--with-system-zlib
+		# We only care about the libs, so disable programs. #528088
+		--disable-{binutils,etc,ld,gas,gold,gprof,gprofng}
+		# Disable modules that are in a combined binutils/gdb tree. #490566
+		--disable-{gdb,libdecnumber,readline,sim}
+		# Strip out broken static link flags.
+		# https://gcc.gnu.org/PR56750
+		--without-stage1-ldflags
+		# We pull in all USE-flags that change ABI in an incompatible
+		# way. #666100
+		# USE=multitarget change size of global arrays
+		# USE=64-bit-bfd changes data structures of exported API
+		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)-$(usex 64-bit-bfd 64 def)
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
+
+		# Allow user to opt into CET for host libraries.
+		# Ideally we would like automagic-or-disabled here.
+		# But the check does not quite work on i686: bug #760926.
+		$(use_enable cet)
+	)
+
+	# mips can't do hash-style=gnu ...
+	if [[ $(tc-arch) != mips ]] ; then
+		myconf+=( --enable-default-hash-style=gnu )
+	fi
+
+	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
+
+	use nls \
+		&& myconf+=( --without-included-gettext ) \
+		|| myconf+=( --disable-nls )
+
+	if [[ ${CHOST} == *-darwin* ]] && use nls ; then
+		# fix underlinking in opcodes
+		sed -i -e 's/@SHARED_LDFLAGS@/@SHARED_LDFLAGS@ -lintl/' \
+			"${S}"/opcodes/Makefile.in || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	# Prevent makeinfo from running as we don't build docs here.
+	# bug #622652
+	sed -i \
+		-e '/^MAKEINFO/s:=.*:= true:' \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	emake V=1
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install
+
+	# Provide libiberty.h directly.
+	dosym libiberty/libiberty.h /usr/include/libiberty.h
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED}"/usr -name '*.la' -delete
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 016c03af1408..2d9b277dc032 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/vdpauinfo/Manifest b/x11-misc/vdpauinfo/Manifest
index 691960b78cf1..a2014ac2578a 100644
--- a/x11-misc/vdpauinfo/Manifest
+++ b/x11-misc/vdpauinfo/Manifest
@@ -1,3 +1,3 @@
 DIST vdpauinfo-1.5.tar.gz 12246 BLAKE2B 5673eb6d00e501234cab3434ee06ef428495f86cf18304eed628e41dd0b17f8fe25aff8ef3bb896f4f70eefe2121446eae740c638b48b3ae1bc3547de4cb3102 SHA512 f3d359242443de919803ae0b8d89809c71e94d59d8ee9994f8f315036b829ad24030b75d953346989c1d0ddf436107041491e299c3212b013ad1d2b3c0571e59
-EBUILD vdpauinfo-1.5.ebuild 548 BLAKE2B 59392934c2cd5be295e2c944877ef2d648df9bc3d2ff809dc9ea4e898281c7478e2ff3f50ad3b3449bc683f6bd34113ad90d406c2378de4db306d6412c35e090 SHA512 606eb3ee428b6b160377e162875e5738a0ef4b2ec8b0307fe73effba137c8f1ccaf05294183e67622b31cfbd260e6219667c31a81d24c0f17bec18e3c009adf3
+EBUILD vdpauinfo-1.5-r1.ebuild 605 BLAKE2B 85626a6421f67beb30919bd7702497a61297e980b8d4cfe695cd30435d23c515421ff72d8ac83d1ca87d4c164c0240b064ffbedb1db04327c91d7234996c878e SHA512 e7bb71b97809e36961beb753f382a5e176577de3a2d241f93b1997067bbc84c4e0bdcf37cf7c43ed3b317e39b1987b85700cc884a1911d6a8487359aea7d1dae
 MISC metadata.xml 246 BLAKE2B a512e6e8ffd8a998f89ea9dbf8a29dd4bb2d6db435e4ac0ef3182fc23996e04a6e87c1771975d835038ad86d6cb61e4a1aea8b80286666d64ad0b511c9d8f163 SHA512 d827f64596500d61c0f24c9d2a69fa3ca2f8b52e5f5815106d7db2837482172f0518d99677e6332a69fd4c34289ef817203a5047363ea7d2c10372b09f9e0618
diff --git a/x11-misc/vdpauinfo/vdpauinfo-1.5.ebuild b/x11-misc/vdpauinfo/vdpauinfo-1.5-r1.ebuild
index 4969f9251cdf..985ed1288c27 100644
--- a/x11-misc/vdpauinfo/vdpauinfo-1.5.ebuild
+++ b/x11-misc/vdpauinfo/vdpauinfo-1.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools
+inherit autotools flag-o-matic
 
 DESCRIPTION="Displays info about your card's VDPAU support"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU"
@@ -25,4 +25,6 @@ src_prepare() {
 	default
 
 	eautoreconf
+
+	append-flags -fno-strict-aliasing #864755
 }