gentoo auto-resync : 15:10:2022 - 01:47:28

author: V3n3RiX <venerix@koprulu.sector> 2022-10-15 01:47:28 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-10-15 01:47:28 +0100
commit: f208e35deefe1ee6fe6722cec9ad8cc12e92e638 (patch)
tree: f63456d14b948e3a902ace235a9961865728faaf
parent: 4392d53af7ce45ccfe6eb14146479ef0e2bd790a (diff)
215 files changed, 3854 insertions, 961 deletions
diff --git a/Manifest b/Manifest
index 5b8654e108c1..1b15efbe9af2 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29635 BLAKE2B 55d53775541c4cdc884f1a2591b205441f843931bf0afe04288895ef0745f1245410b88f4fb3a2bb053530fff078740ba01e92d00dce08c0d27020077a4b9721 SHA512 e128daf8ec48690cb3666f0a1d86f70a04fd5f3fea7a31ab8ec28b62241ffd954034fc25cd72c6d4794faa699c36d53f24349050ddc7bb2339a2b3f9a61e8779
-TIMESTAMP 2022-10-14T17:39:59Z
+MANIFEST Manifest.files.gz 29645 BLAKE2B a59be87821a425423d18a4151ff95f414563bcdfe5021c24060a247be16120952d6a0554501e34bdd47a8cbd3e7ee5c19555c7172ee1e249ae2fc07711eb3d07 SHA512 5fd543e8c4423d6436055e5663d58e1e6de7ed5f188f994449e5e10447b22fb0fa0ceff52092e02c0ea3e3a2a4df8171df5f254e4b8408c6442cc5eb65423cd2
+TIMESTAMP 2022-10-15T00:09:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNJnu9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNJ+lFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDeVw//VNgmuVlK+OLhxmz2qKoIPsai41Nw3BB1+2ljU/ALY33qk0V69y2VdVnx
-TNdOruTkZOgWelliGdio5INs0kw/k7DFVfeOEdoshvex8Uhcds1Ye+DjJHg1LW7b
-RUEg+2cfij9mEneT/ZedrvhovZFvT4tU/rB4+wB+CVnAYc+EA9FDxvOu+RqfnArc
-jl6FA3izIXzh8//oU6RfHknyaTM8mtxVY6loZsLoUw/7Th1yOJW32MYnjvH+41M2
-1D2agG6xfIfrkD7xQNo2Pn0TizqbYSbrbJKsXk+hbhUEB1hfzsiJ6MQoEnoMWYhP
-YFH7Qp8Fo3RKJwNRi8odZHrZsX1AM5BUEU+AJYVmgDIB3daW5QQIUqpi0tna4QEY
-2ULgnacTfVqJpqBFgKjM+2nRbDJ5SO21X7vBxvV27W3z289u7fLtyn/UdKsTEPQo
-DPndE7SigZPi9ugk9JRr4eGOSrL6FrOrRF2/8LPllDM62YNstswIiD9622RIvK9+
-g2BjZeOoyHN0JL6sU9196urzSqDl1obkr7YI2RoW0+RAWp7msV7plepD3qW4xRQ1
-SogXk39jsyYS0RjzSrdkhEppIPjZce43Svm2iYo4lHqJ9pEsHO/+5uwDJjA8S4WH
-125Ysvs7YbxNU4VcXVrIcnoN/sxB3KCcQOW+67nAOPBSc5XKwNY=
-=lumw
+klCSmhAAg9b+GdH+iXqgFZjghUQ5PJfoDA2RsdfIX48lLFSxFYW8YcyuFEE6oIhY
+6VIPj0ji9UyyzWL826HMbT403dmXEl31NtRsSWOypg/nluVab5TAICTxQFFI9b5W
+tORONykIW5xsxlK+h0+bbRSmEEMhQF0Oe+zH5nuHWAZnYNpVlgxknn+J8avgyJIO
+59vUCTKtyNVOgksRasKokMYR61jshl24AFV2ydRSRoGssjTn3B5DWv+VkNd/nCTO
+z+GOaNI6jdfW3PpybUKmPNfD8+5XNTdPfNI95s2IVvImq+PaBbtWN0/ZGI4fSRJL
+8m+CaCfNm7IU09OGvcaZvsyp3ehkkTNYlryOQhBwDsSYK+bRxwPItlbHOTaZacbJ
+JLYCXkDx+5iXQ/vm05U08v0n1FMRp1PrrPvFqGWm0ne8Paq6dOp0hBaSNMfDH9lr
+67FGc75p2b+Qvt8nmKUs2wXdGkfveLN3XHHwtKxuKeBOQQm8qtZYh6/vWRBG4ihB
+9opg4Rccd3HUPSYoITo8b+VoFPs5P68u49rAIvW2frvFmc/O3wngj/Mk4Df72hq1
+jmaNJcZPuOsclCgIw9m6DvZIMVhDWBjhVD23G5D7BvQUSlET03F9550C7Ct0Ys/T
+B5vY833ZMkO2Ohr8N14hud3rnRU7aOithwwnWydgsq60nFUSk/4=
+=lG/U
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 115074879079..673f22eb3fd2 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 51ffe235b2d1..fe1598c8e0bb 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-core/Manifest b/app-admin/ansible-core/Manifest
index 3cd9ff1e3177..0e5a6ca2b5ab 100644
--- a/app-admin/ansible-core/Manifest
+++ b/app-admin/ansible-core/Manifest
@@ -1,12 +1,16 @@
 DIST ansible-core-2.11.7.tar.gz 7108269 BLAKE2B c5080161bfffc34382db86f3940dbbf1c8194a4413b20ef28b3c15503aec905acfffc864041496b4f6b4b77966fee3221b80e90d4b952e38513ba9ce506ee1ae SHA512 f37c925c5302eff30d17f52a04d4a5311e38ee5c1d6db4fbdb32970afa362e0522d6ec3d07bddf40137b2f5ec5fa03a2b72e7e1ed313c28c207f65490e49af92
+DIST ansible-core-2.12.10.tar.gz 7762154 BLAKE2B deffcc42c124a40ce34ce9a26a0c400b1199018cb05478ea8860500e1a507f9f604c1f40f0d006682fc14ad8f0cc3d035b8ffb1307ee37d26191be3c68e33253 SHA512 8b4eb0e923f976680e81ffbe942c4ddc7ddaaaffe83d14c20f78f7c6ab4f548f21920cdfa57b48de2bc24683028e744a92ac4ca45fecc459ea2b042de8c40737
 DIST ansible-core-2.12.8.tar.gz 7760983 BLAKE2B 9050033ca76f7f3bb6d5043d58e7a4b2473ee1eb21b5665654e5a571e8ebe408897661ad0f13c4f4b0d1569c1df904434cc4911e1b561b229d8ab16109127930 SHA512 1bb30dba44f11b0655000350b54cae30b85258dccc130d5cd2b1a5c70e0ebe93abd8fe41d5830da34b6fe622276f69f18a0f47bf9d0b0269338a7efbd5820e44
 DIST ansible-core-2.12.9.tar.gz 7758384 BLAKE2B ed32d1ae9b82e96fe9a2ba2175e2a90961d3a6bb20baecd405e6c0bd1384ac61b9a1f1a1b7bd9f290d89d89c4451129f9049dd9c1dd7897a6d96f1730de4e423 SHA512 da88489c81293e8361067a17891f9330582b3d21c88584e3268f84511811364ce93c4e1b88b3796faea11274c76c64aa8af74608fce9a074fcc8fc3760d2b90b
 DIST ansible-core-2.13.3.tar.gz 13924100 BLAKE2B aabb87a327f2cd4b3a8f8a30d00b09d50ddf05bbd8720e446275004ba98e87bc1de513dfaedf9ee617c77235c92f171b590295ca8a92d03f47829eacf39e7cb8 SHA512 9be80d0dcd10d012c871b5c95b2357430dfa6809bff794158a4ae06a40761c01db60a966115d7a9141028c96d79a1d99d6bfb191788dc1c467dd0107dba7058c
 DIST ansible-core-2.13.4.tar.gz 13929408 BLAKE2B 17e27afebf9ce47d49fe9d171549cc46eca13604474545feb1c6e30432334d38a50e76a2fed71e978ebf44dad925ea66d63142599e07f78cbae8a2d25e923d02 SHA512 62678ad80b2073552070f154c55707c1b89bcb9d2d56235d76bb4701344e387d250590a931340cb676a605677cf69ab56b1b15b30d75859de4b294662dc50ee0
+DIST ansible-core-2.13.5.tar.gz 13934317 BLAKE2B 27ac2040f3626d645e57fab4df9b1b6a349fb81bec4cc8bb87b4dd16351f43d71a6210e32e2906346500742be2bf94512a1b05ba95b7ac0dfeac89696dfc9760 SHA512 e57dca7d457cfbf8a805442dd274499e3a6e4652303dc9e838b46c7dba9a36f2262e548bf9b6ff66f4e4bed5fa648abf9bb9a881047d4c6c0d6efbc91269eca2
 EBUILD ansible-core-2.11.7.ebuild 1565 BLAKE2B 5d203f0e9ab504055997f86ef7b74139d2e667c937d33c6e50bf9a9b807ca509f3c3238f77b75cb95c22a806be53e947f2dcaebdc1f2427219a427916580301c SHA512 c0ee9fa9ddf8a6986c70ca68fd098df44fe82dc9cfe1529b18ca147f823a0f0bb882a852c80de7477d3591993fa43af94a8803b8a5c0f9591f18654cde3c2175
+EBUILD ansible-core-2.12.10.ebuild 1569 BLAKE2B daa7b9387359441b0770cf939eb3095df57e9261b968ccd69405404aa93eda83a73abb94880bfb648421aac0eb24eb79f5315f4c5ebaeaa3e13e03cab4655874 SHA512 e16750ec37ef00b05e6bebc31d31253ab78fb6dc2e60945bc29ef8c648693be8955308b706cac72c053eaf2136643f863cae141df9d261751c3b8f9d4ca86753
 EBUILD ansible-core-2.12.8.ebuild 1566 BLAKE2B 4b333bc88f164266edcd445d164e6922391ead51481dff3bc2513c573dd5abda37ebf6fc10cca09252b596aa67b617c8ef39b5e7e2fdda4349a85eb4d6014a58 SHA512 1182c8ae87094dea4aace7814de9f81829c65368b14ef1adcbf302190a65d2c1b7569b29a96b2ee402cbf11d833e2c59c4368206cfb7503193e6aece3be54b02
-EBUILD ansible-core-2.12.9.ebuild 1569 BLAKE2B daa7b9387359441b0770cf939eb3095df57e9261b968ccd69405404aa93eda83a73abb94880bfb648421aac0eb24eb79f5315f4c5ebaeaa3e13e03cab4655874 SHA512 e16750ec37ef00b05e6bebc31d31253ab78fb6dc2e60945bc29ef8c648693be8955308b706cac72c053eaf2136643f863cae141df9d261751c3b8f9d4ca86753
+EBUILD ansible-core-2.12.9.ebuild 1566 BLAKE2B 4b333bc88f164266edcd445d164e6922391ead51481dff3bc2513c573dd5abda37ebf6fc10cca09252b596aa67b617c8ef39b5e7e2fdda4349a85eb4d6014a58 SHA512 1182c8ae87094dea4aace7814de9f81829c65368b14ef1adcbf302190a65d2c1b7569b29a96b2ee402cbf11d833e2c59c4368206cfb7503193e6aece3be54b02
 EBUILD ansible-core-2.13.3.ebuild 1324 BLAKE2B 75ffcc424dd800cf57842aa168964ece11f7e59082aebee9e9a99af47d143266f859d1dad5b7b3be3f46a3eceae6af20911c7917aaaddbc8b249761e1c4b31d1 SHA512 913588fe37a8cebb0b8eb2bc395f2bd8e4e203893a2c232070e1a8f034c0c5f698355de982e01199a58461325dad6e596904ed122e3ea6a15d4f8b37659a296a
-EBUILD ansible-core-2.13.4.ebuild 1327 BLAKE2B 4d44adf3a972103182afd5b227ccbd839b79a2f40f911c0c724b925c0051f2b99bcf0781d9f1f46f621b37639d91d69869bb4b38c42499b3fdaac6a02bafa2af SHA512 cbb0678d3bbbf7cd7a0040bd2836a948bc076bc460bcee5ee01286e89b3512f80f5bfad8280ace7732ddc0a215db5a9baee9a96d192adb43a538a26a22faacf6
+EBUILD ansible-core-2.13.4.ebuild 1324 BLAKE2B 75ffcc424dd800cf57842aa168964ece11f7e59082aebee9e9a99af47d143266f859d1dad5b7b3be3f46a3eceae6af20911c7917aaaddbc8b249761e1c4b31d1 SHA512 913588fe37a8cebb0b8eb2bc395f2bd8e4e203893a2c232070e1a8f034c0c5f698355de982e01199a58461325dad6e596904ed122e3ea6a15d4f8b37659a296a
+EBUILD ansible-core-2.13.5.ebuild 1327 BLAKE2B 4d44adf3a972103182afd5b227ccbd839b79a2f40f911c0c724b925c0051f2b99bcf0781d9f1f46f621b37639d91d69869bb4b38c42499b3fdaac6a02bafa2af SHA512 cbb0678d3bbbf7cd7a0040bd2836a948bc076bc460bcee5ee01286e89b3512f80f5bfad8280ace7732ddc0a215db5a9baee9a96d192adb43a538a26a22faacf6
 EBUILD ansible-core-9999.ebuild 1569 BLAKE2B daa7b9387359441b0770cf939eb3095df57e9261b968ccd69405404aa93eda83a73abb94880bfb648421aac0eb24eb79f5315f4c5ebaeaa3e13e03cab4655874 SHA512 e16750ec37ef00b05e6bebc31d31253ab78fb6dc2e60945bc29ef8c648693be8955308b706cac72c053eaf2136643f863cae141df9d261751c3b8f9d4ca86753
 MISC metadata.xml 1040 BLAKE2B 35be7c8b41af8b3620c1d14191642ead43cf9b581bf4e9c903618c7644d1552400628759b50cb87174c29efbeaf5ad6948b93ec0e48048723b86dd411c545a9d SHA512 28dbbf4db72f0c97b7e95f1cdef8e8f08d0f1eb36b7c045991364aa0deeb93cc422a55922bd8ca3f86551dcf24b8dd5532c5a083ff4e88b4eaf579c706039214
diff --git a/app-admin/ansible-core/ansible-core-2.12.10.ebuild b/app-admin/ansible-core/ansible-core-2.12.10.ebuild
new file mode 100644
index 000000000000..10e608c937a9
--- /dev/null
+++ b/app-admin/ansible-core/ansible-core-2.12.10.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+	EGIT_BRANCH="devel"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
+	<dev-python/resolvelib-0.6.0[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+python_compile() {
+	export ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
diff --git a/app-admin/ansible-core/ansible-core-2.12.9.ebuild b/app-admin/ansible-core/ansible-core-2.12.9.ebuild
index 10e608c937a9..aebbfcec8b52 100644
--- a/app-admin/ansible-core/ansible-core-2.12.9.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.12.9.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH="devel"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 fi
 
 LICENSE="GPL-3"
diff --git a/app-admin/ansible-core/ansible-core-2.13.4.ebuild b/app-admin/ansible-core/ansible-core-2.13.4.ebuild
index 3655837bc68d..dc98f352bb3f 100644
--- a/app-admin/ansible-core/ansible-core-2.13.4.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.13.4.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH="devel"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 fi
 
 LICENSE="GPL-3"
diff --git a/app-admin/ansible-core/ansible-core-2.13.5.ebuild b/app-admin/ansible-core/ansible-core-2.13.5.ebuild
new file mode 100644
index 000000000000..3655837bc68d
--- /dev/null
+++ b/app-admin/ansible-core/ansible-core-2.13.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+	EGIT_BRANCH="devel"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
+	<dev-python/resolvelib-0.9.0[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+BDEPEND="
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		dev-python/botocore[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	export ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index cdc28dea46b9..331abd15adb2 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -3,9 +3,11 @@ DIST ansible-5.10.0.tar.gz 36898833 BLAKE2B 5705325c150909e4911cbc6fafb9b6194bcd
 DIST ansible-5.9.0.tar.gz 36756162 BLAKE2B 4c713f0a45536aadbd20451c5b5ac37b474cb1d1f9fbfa6031b228a549bfd65e1ae0ee76d6fcd08a0de43d7d07eaebf90d08d00764acad438bcffcdb09c5d58b SHA512 88b26b1ba59a39370ee4a27eedda441d6e6ce8ba8eb857353572c692e49b189e95ed80e5063917c52799fb15bc3608d4c1ada013a7d650909714ca8ea5dd3bbb
 DIST ansible-6.2.0.tar.gz 35390078 BLAKE2B 1e7a5f69e837fe3ec383ee3f1d631ad7ecbd502e582752edef85b3e2841b38ba78af1e7f080b4da007283291d487e481141bc4261b351f48be45874a3399789f SHA512 7e0751fdedef6bd92a01c06e23dd482bb4b4795ef5a17754eea8f8297cebddb84b4d20041affec6589297214cd820cddaea4618d2f3a158daebb556c4a87bdb0
 DIST ansible-6.3.0.tar.gz 35480527 BLAKE2B ddc064f6dc4b1fe820f375d150cc5f50875de4bf721eb31e88d0c279e91e96a6fd4d7981e0110f4fc7d424eeb4c44637c611442b4586d756106c437e240f3118 SHA512 3832159065d6400caade84de1ff5f31d64d7b5d9c3a61ae9bb2ad207e410166dac3537c68d0ec3df7c4b8aec61ee48cc4b690e3117a987efa9306c6cbee534e0
+DIST ansible-6.5.0.tar.gz 38275680 BLAKE2B 5d17ba2b8b3a0ccb1ea9873c0d500ca7984d2d3db19d062807004da5c001ee44d33cd6707226887bef8f6bae0ea9584f8c2c63a8cb176a2244b3b2ad92e13454 SHA512 ddb77304c6a9617186fa0252a0da91632ffc21f910e02fc68e340ed37de0806586a2543700e996db7fb0bb9240a2ee20b7a462f005de200028748b38fbb2e293
 EBUILD ansible-4.6.0.ebuild 701 BLAKE2B d484948763f9511dd75724514873b3b0823855ce3c05e136ebe72d0dbdda4297faff6f8c1c4be0219b373683cc0e208413888b29469daf018e94730cca7bfa4c SHA512 6f5d5560e0fa042bf889ca44a59346184a11e44c7488ff73d04f4c71f7b95e35a5032732fc08ea9b1e0c76f0ed68a2c844fd00a994d4712369e9afcda415e3ec
 EBUILD ansible-5.10.0.ebuild 702 BLAKE2B 3d91e2541f6063cb2e6df89ecfec63e64609eaf9e3fc9fb08e0076d73899551734a05a64ca04234caa4bacf2ca95e3c766a2af5005c79c496af2a46020c7110e SHA512 5236c7ab0cce12706e5346084ba71e2fbf49d8be58b6164ed9b7312dcf1027826b6ceafcc22f380b08c4f180df2eb93a2f84d734af92272b2b246111cf1fe507
 EBUILD ansible-5.9.0.ebuild 702 BLAKE2B 3d91e2541f6063cb2e6df89ecfec63e64609eaf9e3fc9fb08e0076d73899551734a05a64ca04234caa4bacf2ca95e3c766a2af5005c79c496af2a46020c7110e SHA512 5236c7ab0cce12706e5346084ba71e2fbf49d8be58b6164ed9b7312dcf1027826b6ceafcc22f380b08c4f180df2eb93a2f84d734af92272b2b246111cf1fe507
 EBUILD ansible-6.2.0.ebuild 702 BLAKE2B ea065c0134168d49da5ffe6c4eab27377d788a172ad26ddcfa811f4ffa1c88889e0e0fcebe2ba3f26536bc4a47b2d07c1c7711d946073caeb55b1f37c2725049 SHA512 b4cd181d78b5dfbc02dc499956bb0693447786f878b3d9efdcde61dde6cf6e44a1cf7b63ca9217fbd0ea1d742b0695f16ae50816220bad24094f70f3ba44acf7
-EBUILD ansible-6.3.0.ebuild 705 BLAKE2B c01b5eecd57078d7c34c1992a5ade3d72f941bc14ee3bb1a88d3731f72aba08643bb53df826cc6c184100d404d2331f136d52a0299c1df7b1bce7cc692ef6842 SHA512 813a49b0388a0560e828a1bf26d9093dafaa5faf71317b0f60dfe1f044ff96b0acaedfbe086bb017b0199b0f1770a2f9d307a212633524ab6f17d00c02f84ea4
+EBUILD ansible-6.3.0.ebuild 702 BLAKE2B ea065c0134168d49da5ffe6c4eab27377d788a172ad26ddcfa811f4ffa1c88889e0e0fcebe2ba3f26536bc4a47b2d07c1c7711d946073caeb55b1f37c2725049 SHA512 b4cd181d78b5dfbc02dc499956bb0693447786f878b3d9efdcde61dde6cf6e44a1cf7b63ca9217fbd0ea1d742b0695f16ae50816220bad24094f70f3ba44acf7
+EBUILD ansible-6.5.0.ebuild 705 BLAKE2B c01b5eecd57078d7c34c1992a5ade3d72f941bc14ee3bb1a88d3731f72aba08643bb53df826cc6c184100d404d2331f136d52a0299c1df7b1bce7cc692ef6842 SHA512 813a49b0388a0560e828a1bf26d9093dafaa5faf71317b0f60dfe1f044ff96b0acaedfbe086bb017b0199b0f1770a2f9d307a212633524ab6f17d00c02f84ea4
 MISC metadata.xml 726 BLAKE2B 92c09d65c38a346db34eddf78f75aba7d914df678e37dcd54b1a47cf3d7f043604fad89b435fa08877bb0c7254fb1a99db32bdd298f2b12af6f8089828f1e67e SHA512 40b712fc2055cfc60fdcb33705757509adc97feb893c46dab1e6e7d8b88ab2026b3b0ada66d7504f86b25072a4d3bffee023a5aa0e8b5286bcf58a8cb18c5ac3
diff --git a/app-admin/ansible/ansible-6.3.0.ebuild b/app-admin/ansible/ansible-6.3.0.ebuild
index cf0da827da5f..9a54e321f412 100644
--- a/app-admin/ansible/ansible-6.3.0.ebuild
+++ b/app-admin/ansible/ansible-6.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 RESTRICT="test"
 
 RDEPEND=">=app-admin/ansible-core-2.13.0
diff --git a/app-admin/ansible/ansible-6.5.0.ebuild b/app-admin/ansible/ansible-6.5.0.ebuild
new file mode 100644
index 000000000000..cf0da827da5f
--- /dev/null
+++ b/app-admin/ansible/ansible-6.5.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+RESTRICT="test"
+
+RDEPEND=">=app-admin/ansible-core-2.13.0
+	<app-admin/ansible-core-2.14"
+
+python_compile() {
+	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+python_install() {
+	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_install
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 47376f756ff3..5aa7420bd54d 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index fdf49a2de296..5a673e086a64 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,9 +1,16 @@
 AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048 BLAKE2B 36f37b74da309100191f4d8f9c27d08a1b00d2d30fbaf169dbb74ebbe42293357a4fb62332e286fe5725dcfdc30645a602dc2a51c51924b06215b68fd5235658 SHA512 fd12827150e96cd7979ea9611d64ed4ab9e6c61cfecdd697b8fb4d162f20985b734c2bfc365a921809b9029e86a85a9b36c10ec472b3dd49c25ea18f5aef56ce
+AUX gnupg-2.2.40-fix-no-ldap-build.patch 1017 BLAKE2B b260be86597a20ac1daa331d87fa741f1e17bdf65ca81f1e24d5465292567f16c6320271adbdf74cc2f93f2b8d8fda799a23bfedc45de9ce63fe34803da4eea2 SHA512 5a08a2e6737203761358adadfbc781f81923cf1add2614666dc47d25cd012e71779d749cc614f86c73f41d38ff05c2223bfe2b1f409879f020f1343edcb4b0a5
 AUX gnupg-2.3.7-yubikey-workaround-fix.patch 2010 BLAKE2B 9baaa3781e7fcdc7379eb838c965078127dba25eb90285504110bc4e81cc3d5018c0a391a065c33f0b3e29d48b5acbee79e47d4b6b281f11f083b7f44d5b7be1 SHA512 3a59955582af9abc576d533f548c9d6670a089415afbb23de9131d4c8cfab0a285ca71efcc7a423bcff0ec2b759d9428146b90a86413d7c6be6b1b0bbca41056
 DIST gnupg-2.2.39.tar.bz2 7290098 BLAKE2B a9e31830f3ef9ec6d8d461a85fcbe4b91bcac9607d3b5f13f5edc0c54505afb6c6c119cd397023b1378d96c7d0f15c0d60da1d15721e9a18eb3ea8c7b69fba83 SHA512 73f881c12c82010aeaada500517ff39ab22b27ff21b1248bc2228b60a2d75385a44a53c5cfadb8f6b84ef22ad9db0105096b6620fb689560809b324019713940
 DIST gnupg-2.2.39.tar.bz2.sig 119 BLAKE2B 584d7d36671670ac507948257e9c6be556ed2a2d3c0100bb2746edfe96df5ee1d4c6172fe0cae39d85fc290097bc5f6e1b351debc8ec2f5cc78047354fbed016 SHA512 6f7d7c2d1fae706b03c735cf453976c3aebef3f23659426f39a88c63d979f4d873ae09280d75dee9000805468d2a7f49d348609061939000f7cedf34ec5c6019
+DIST gnupg-2.2.40.tar.bz2 7301631 BLAKE2B c9a077e28b22888573bdd12029205eb5f79a463a297e400a623bc86a39eeb6454cd884d05bd96734998613c695f2c9dcc68963c7275b89938ac38ddc7ba1e229 SHA512 4c2f5fbf37ba6fbad0045aad23129186963010c673ea0b81801adc4f98efe14d6c7228e22815b6b26307c1fe5bb51cd088aa6a0f06a9325d3c021849ef81c594
+DIST gnupg-2.2.40.tar.bz2.sig 119 BLAKE2B baaffad8203169fca54be031b3c77f818ecf973c73b9389cb3cbcd8217ae8a6018f0d3d4d2d5b6f0611f7643b78467f91902add3107e9538273607c6ba3a49bf SHA512 fccc06c709450d58e64716c505cd79556edac440462613c47c6ec78714355425c045418946b4b4b2a5c79e33e0e75b20f0699ae6de9921add4877fd6c8cc2d64
 DIST gnupg-2.3.7.tar.bz2 7599853 BLAKE2B 3e9e33c8357222f42cc0e2af538e9f1f1f0453f35d790aaadf47ce9df24229efa91457b6014b34f19084448a3a6603c82e7d07714b89a68c6a84a08af6fa0e02 SHA512 c7fe169050ef17051cdaac9ad476e7ea792483baad1208fc359d568fa9e138d920ecaa2cd9cae73b20f5472a7d8ca6540a62062ff7a06055cc656b0eb4b917b9
 DIST gnupg-2.3.7.tar.bz2.sig 119 BLAKE2B c2652adf203bc828ed0aaf778542e990028156c16b435cd35aa6fe57ca0a5b798087c98e16589685c8ab9b8b92e16c3f7d4da56a4b1209b9adf2c24ea548ae6e SHA512 0257034b3e7ac390dadb151c656ff59822dacedaddca4ad6b5980b3e03a468ada47553e6a1fcff6a12c64ae2f9c15b245df855cd424b010041df8daaaab9a1b8
+DIST gnupg-2.3.8.tar.bz2 7644926 BLAKE2B afb960adb877398363d92585d54bccc82c816f87b4489835950c19fc330edbf5302f7f958fdc6333b80d2e34730c9518e6abffea721891fd76c1b2ff2aa704be SHA512 6df8b1c53f0112c358f9f9eac732dd4ca13bcec24fc55a7d4a606587da988c5b7bb4c61be52b8b7769f1536dd2043087e6eb5cf224991cb0b2ed38ad00717ee2
+DIST gnupg-2.3.8.tar.bz2.sig 119 BLAKE2B 29a133605d72dc4c102ec9a82d654cb980a72463fdc6e255d595e0559bb08860dcb1b014681e1d177eb29c0d32f4ce4ef6caefa6558f1cb97c87c42fb426ea63 SHA512 d97a92c245df997dbff800b25872e9f0769b20e9336b12682b4539fd4fe0e9c2dada7af397b8afeeeba316100b8f4dd86ba96e1dc62cee70158927229b0a015d
 EBUILD gnupg-2.2.39.ebuild 5348 BLAKE2B c1aa7063d623fd45825d528ff392e309620b37a484787151ee786401d067c451c9a4d068d505c114630dbe812aeb0ee497d3ac2149d59abc373c48385b76ba29 SHA512 cf8f0474601831b51a333167257b3f4e18d91e34a2c16ccd27f81092ecf0a19a79056469a715e602379435c7e0699051ef130d014b7239d7d926c8661535ff6c
+EBUILD gnupg-2.2.40.ebuild 5400 BLAKE2B 32ab43b2f518b7c546e598e995a813fed600c42df75f819d3675f7d799ec92f15e6550017b5f37481e2baadbbd534302701a0353098f06068b4b9abed53db4a1 SHA512 7f448909d4923573792daa4d0ab84a1aa0fde9ddbd6c0b5019f887f52144d33063c889a511cfbdd206c035d107687fadbca4ffe62d7adf6e8ad4264add5b23c6
 EBUILD gnupg-2.3.7-r1.ebuild 5574 BLAKE2B 7d32a90de93a16381bc7b8622504b61f08dba7e2f719719e0e0233c77f5e33e9a6763e113aec9446ec3760b8c87132a51b39d93b4fb7deba141ea0f804156385 SHA512 3a7bb0a4465cfb9fb6d0d173f0d19ec6e4e0efeeea467fc0310b3046dd5edbe13d1e67b40c9116b05d30f2a7d943a78f7fe71b2f2270ff863cdd1203bb2fea76
+EBUILD gnupg-2.3.8.ebuild 5577 BLAKE2B dcb32e4f411c1aba0954ba2cd2c30528a82ecb9988c334e65d3c92db42fb2442464e719d6f6a738c61ef05dd9548e1dab90a9b033cf75d7f39c528469d9b07c5 SHA512 ce7ec66d3543a61a6ab7c9a36c88ec8bf5308ec72a78f7b0a3406fbdfd1b04b78623963104157e64b215ba056fcdb855d169b4ffc918e52c2f8a258d40f42619
 MISC metadata.xml 1297 BLAKE2B 2d1b2b6f7e6fdf5b73797347e9a3bf7758f1efc86e53d0d0f4b2c0012152ebc50630ff4f3b2c965063f608cf03b3da2794978a3e3659957970d91d3a735ad604 SHA512 0e9f3d5255ac70d6a08b251bfd20f13ff25f63e763ab9385924fb2cb5ac233b0ae97cc43e8a2d950b9662f088ef65af87f9af4dbb355e122e3fcb118bee1c0de
diff --git a/app-crypt/gnupg/files/gnupg-2.2.40-fix-no-ldap-build.patch b/app-crypt/gnupg/files/gnupg-2.2.40-fix-no-ldap-build.patch
new file mode 100644
index 000000000000..3ab9c0cba902
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.2.40-fix-no-ldap-build.patch
@@ -0,0 +1,36 @@
+https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=7011286ce6e1fb56c2989fdafbd11b931c489faa
+
+From 7011286ce6e1fb56c2989fdafbd11b931c489faa Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka <gniibe@fsij.org>
+Date: Fri, 14 Oct 2022 09:58:41 +0900
+Subject: [PATCH] dirmngr: Fix build with no LDAP support.
+
+* dirmngr/server.c [USE_LDAP] (start_command_handler): Conditionalize.
+
+--
+
+GnuPG-bug-id: 6239
+Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
+---
+ dirmngr/server.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/dirmngr/server.c b/dirmngr/server.c
+index 04ebfd317..98f354300 100644
+--- a/dirmngr/server.c
++++ b/dirmngr/server.c
+@@ -3137,8 +3137,10 @@ start_command_handler (assuan_fd_t fd, unsigned int session_id)
+                ctrl->refcount);
+   else
+     {
++#if USE_LDAP
+       ks_ldap_free_state (ctrl->ks_get_state);
+       ctrl->ks_get_state = NULL;
++#endif
+       release_ctrl_ocsp_certs (ctrl);
+       xfree (ctrl->server_local);
+       dirmngr_deinit_default_ctrl (ctrl);
+-- 
+2.11.0
+
+
diff --git a/app-crypt/gnupg/gnupg-2.2.40.ebuild b/app-crypt/gnupg/gnupg-2.2.40.ebuild
new file mode 100644
index 000000000000..aad9c21dbc70
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.40.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainers should:
+# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
+# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
+# (find the one for the current release then subscribe to it +
+# any subsequent ones linked within so you're covered for a while.)
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+inherit flag-o-matic systemd toolchain-funcs verify-sig
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="https://gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server"
+RESTRICT="!test? ( test )"
+
+# Existence of executables is checked during configuration.
+# Note: On each bump, update dep bounds on each version from configure.ac!
+DEPEND=">=dev-libs/libassuan-2.5.0
+	>=dev-libs/libgcrypt-1.8.0:=
+	>=dev-libs/libgpg-error-1.29
+	>=dev-libs/libksba-1.3.5
+	>=dev-libs/npth-1.2
+	>=net-misc/curl-7.10
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	ldap? ( net-nds/openldap:= )
+	readline? ( sys-libs/readline:0= )
+	smartcard? ( usb? ( virtual/libusb:1 ) )
+	ssl? ( >=net-libs/gnutls-3.0:0= )
+	tofu? ( >=dev-db/sqlite-3.7 )"
+
+RDEPEND="${DEPEND}
+	app-crypt/pinentry
+	nls? ( virtual/libintl )
+	selinux? ( sec-policy/selinux-gpg )
+	wks-server? ( virtual/mta )"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( sys-apps/texinfo )
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
+
+DOCS=(
+	ChangeLog NEWS README THANKS TODO VERSION
+	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
+	"${FILESDIR}"/${P}-fix-no-ldap-build.patch
+)
+
+src_prepare() {
+	default
+
+	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
+	# idea borrowed from libdbus, see
+	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
+	#
+	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
+	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
+	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
+		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable bzip2)
+		$(use_enable nls)
+		$(use_enable smartcard scdaemon)
+		$(use_enable ssl gnutls)
+		$(use_enable test all-tests)
+		$(use_enable test tests)
+		$(use_enable tofu)
+		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
+		$(use_enable wks-server wks-tools)
+		$(use_with ldap)
+		$(use_with readline)
+		--with-mailprog=/usr/libexec/sendmail
+		--disable-ntbtls
+		--enable-gpg
+		--enable-gpgsm
+		--enable-large-secmem
+
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
+		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
+		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
+		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
+
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+
+	if use prefix && use usb; then
+		# bug #649598
+		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
+	fi
+
+	# bug #663142
+	if use user-socket; then
+		myconf+=( --enable-run-gnupg-user-socket )
+	fi
+
+	# glib fails and picks up clang's internal stdint.h causing weird errors
+	tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
+
+	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
+	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
+	# by wks-client & wks-server; and if it's autodetected but not not exist at
+	# build time, then then 'gpg-wks-client --send' functionality will not
+	# work. This has an unwanted side-effect in stage3 builds: there was a
+	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
+	# the build where the install guide previously make the user chose the
+	# logger & mta early in the install.
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	# bug #638574
+	use tofu && export TESTFLAGS=--parallel
+
+	default
+}
+
+src_install() {
+	default
+
+	use tools &&
+		dobin \
+			tools/{convert-from-106,gpg-check-pattern} \
+			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+			tools/make-dns-cert
+
+	dosym gpg /usr/bin/gpg2
+	dosym gpgv /usr/bin/gpgv2
+	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+	use doc && dodoc doc/gnupg.html/* doc/*.png
+
+	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}
diff --git a/app-crypt/gnupg/gnupg-2.3.8.ebuild b/app-crypt/gnupg/gnupg-2.3.8.ebuild
new file mode 100644
index 000000000000..d87edc8dcc51
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.3.8.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainers should:
+# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
+# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
+# (find the one for the current release then subscribe to it +
+# any subsequent ones linked within so you're covered for a while.)
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+inherit flag-o-matic systemd toolchain-funcs verify-sig
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="https://gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+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"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( tofu )"
+
+# Existence of executables is checked during configuration.
+# Note: On each bump, update dep bounds on each version from configure.ac!
+DEPEND=">=dev-libs/libassuan-2.5.0
+	>=dev-libs/libgcrypt-1.9.1:=
+	>=dev-libs/libgpg-error-1.41
+	>=dev-libs/libksba-1.3.4
+	>=dev-libs/npth-1.2
+	>=net-misc/curl-7.10
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	ldap? ( net-nds/openldap:= )
+	readline? ( sys-libs/readline:0= )
+	smartcard? ( usb? ( virtual/libusb:1 ) )
+	tofu? ( >=dev-db/sqlite-3.27 )
+	tpm? ( >=app-crypt/tpm2-tss-2.4.0:= )
+	ssl? ( >=net-libs/gnutls-3.0:0= )
+"
+
+RDEPEND="${DEPEND}
+	app-crypt/pinentry
+	nls? ( virtual/libintl )
+	selinux? ( sec-policy/selinux-gpg )
+	wks-server? ( virtual/mta )"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( sys-apps/texinfo )
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
+
+DOCS=(
+	ChangeLog NEWS README THANKS TODO VERSION
+	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
+	"${FILESDIR}"/${PN}-2.2.40-fix-no-ldap-build.patch
+)
+
+src_prepare() {
+	default
+
+	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
+	# idea borrowed from libdbus, see
+	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
+	#
+	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
+	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
+	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
+		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable bzip2)
+		$(use_enable nls)
+		$(use_enable smartcard scdaemon)
+		$(use_enable ssl gnutls)
+		$(use_enable test all-tests)
+		$(use_enable test tests)
+		$(use_enable tofu)
+		$(use_enable tofu keyboxd)
+		$(use_enable tofu sqlite)
+		$(usex tpm '--with-tss=intel' '--disable-tpm2d')
+		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
+		$(use_enable wks-server wks-tools)
+		$(use_with ldap)
+		$(use_with readline)
+		--with-mailprog=/usr/libexec/sendmail
+		--disable-ntbtls
+		--enable-gpgsm
+		--enable-large-secmem
+
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
+		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
+		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
+		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
+
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+
+	if use prefix && use usb; then
+		# bug #649598
+		append-cppflags -I"${ESYSROOT}/usr/include/libusb-1.0"
+	fi
+
+	# bug #663142
+	if use user-socket; then
+		myconf+=( --enable-run-gnupg-user-socket )
+	fi
+
+	# glib fails and picks up clang's internal stdint.h causing weird errors
+	tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
+
+	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
+	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
+	# by wks-client & wks-server; and if it's autodetected but not not exist at
+	# build time, then then 'gpg-wks-client --send' functionality will not
+	# work. This has an unwanted side-effect in stage3 builds: there was a
+	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
+	# the build where the install guide previously make the user chose the
+	# logger & mta early in the install.
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	# bug #638574
+	use tofu && export TESTFLAGS=--parallel
+
+	default
+}
+
+src_install() {
+	default
+
+	use tools &&
+		dobin \
+			tools/{convert-from-106,gpg-check-pattern} \
+			tools/{gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+			tools/make-dns-cert
+
+	dosym gpg /usr/bin/gpg2
+	dosym gpgv /usr/bin/gpgv2
+	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+	use doc && dodoc doc/gnupg.html/* doc/*.png
+
+	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 4b52420b01ee..007e0b3c079c 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest
index 296e6ea36831..62cb13e9ce00 100644
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@@ -8,6 +8,10 @@ DIST vscode-1.72.0-arm64.tar.gz 113898746 BLAKE2B 98690c88d41695614258100133232c
 DIST vscode-1.72.1-amd64.tar.gz 123829708 BLAKE2B fd5af43d9037228a732ff56fbf4baa404d942602bb2a21cc8c22a8126ebf0cb43c706d7e216c5ee159650be312f99c54df9eb842a236062cde6ea651e24cec29 SHA512 fb785fabb85a45805f96ffbb44a3d19ee8c0debe9d43b9f69bac88c195e343c8be98abf7ba9ff2632dbfa0cfb7fc7563b956267aa44996efce07b076cfd6f5a2
 DIST vscode-1.72.1-arm.tar.gz 104771652 BLAKE2B f6cb9d0dffcf08328be865aa8654ec7946b019518b888f8618409f71fd1691b91d90409a65287000ee6aaf6b7e24eea1378864d07bd6533a60cdf13ebb528456 SHA512 b443104d890cc3336d19caf0404f873126032bdba39dcd49122ef480c7ed83ce4f8b73e4628db990ff5124f33a5ef9e6f381305d5e45c1bdc37cbab7c0182951
 DIST vscode-1.72.1-arm64.tar.gz 113915650 BLAKE2B 7e06292ae9ad6266368b1583e116292a8bcf3197a1692e28d64fa0c17cbab3662bb2b689b093f5404ebdc23106cdf9829801d9ed74e317e59dda166c98ee5380 SHA512 661ab7cc350e8e5ed6dd9569fb1a2b907c8ef98bfd895e7fe9dc27f98c4a23252b0ac05e635acd6138d970b9c31677a020d64b60a81d0373a02fdd97deaff4d7
+DIST vscode-1.72.2-amd64.tar.gz 123828026 BLAKE2B 87b60ababde0e9fd9e5958bfdfa4557f87b8d67f0a84428fdecafb8d4342e4d71bf33c7d180e02d5780fc6638fdf7cfec540fc7019d86d83d92070e394eecdc5 SHA512 efd701f7dbdd3669f22a22fb33b07ab5e044582b0095b8a45e9be14b906f66fa61492de6fbd9936ee6cd44bd065a323b809164a5c0e06029b66929434449926c
+DIST vscode-1.72.2-arm.tar.gz 104783748 BLAKE2B aef1eeaafda5c26cfa0783b8c15d973e539c63b9865e8200015c0158d44367863ec77dd798fda4934168695dd138db17b1cf81403deec753179aa457a3af19d5 SHA512 e952c748c9341a400584a80d612f6f2961dba9cf3997aefe6e948bd51d7ee41fdfb7bd488766045edfd892bca3584c68fbecd4712a32c694983226b0ed97f2ef
+DIST vscode-1.72.2-arm64.tar.gz 113919276 BLAKE2B 25d27a2bb435b7078ec1a09408d24045de2f72a89ea0914da5bf49c9819a786a0e0fad64e675d2771d4a5eb1c61dfc966ad88f2ea9091c057a2abdf8df4a0cbd SHA512 c9cdc341092c9185709af064b8fa93ea34ded7ae04f8a85e1f611e24cdd55473687318b1ad0537fb25a5ad9ecd600071a85afd1e97c464132c94325bb32d3b01
 EBUILD vscode-1.72.0-r1.ebuild 3297 BLAKE2B 486e60860786d0fe530fe6450d25f71286e4730d1bdf696833ec4bc7967b3ddb631fdf7927a20abfccc432c08502746d0192a0c781e0a6e9535772a370c12862 SHA512 1de4e2793eab548c62b4992a02a2bccb80691db866a3e0a46298fbd83625d3a0496ee8ab4f85c72fee5ba7e081ee0f9c5a0ebe18db78efe1097a9884b3f71866
 EBUILD vscode-1.72.1.ebuild 3297 BLAKE2B 486e60860786d0fe530fe6450d25f71286e4730d1bdf696833ec4bc7967b3ddb631fdf7927a20abfccc432c08502746d0192a0c781e0a6e9535772a370c12862 SHA512 1de4e2793eab548c62b4992a02a2bccb80691db866a3e0a46298fbd83625d3a0496ee8ab4f85c72fee5ba7e081ee0f9c5a0ebe18db78efe1097a9884b3f71866
+EBUILD vscode-1.72.2.ebuild 3297 BLAKE2B 486e60860786d0fe530fe6450d25f71286e4730d1bdf696833ec4bc7967b3ddb631fdf7927a20abfccc432c08502746d0192a0c781e0a6e9535772a370c12862 SHA512 1de4e2793eab548c62b4992a02a2bccb80691db866a3e0a46298fbd83625d3a0496ee8ab4f85c72fee5ba7e081ee0f9c5a0ebe18db78efe1097a9884b3f71866
 MISC metadata.xml 1058 BLAKE2B cf7606233d99e4429debe5ef824f235f1ff3083ab5553030453e982bfb5860dd5ccecca3792319665835d604b6ff2cb53ebd885bb959236784c62885087750b2 SHA512 961552953336ad9606c9fc004fc3e0fb8d7481a017b6ba5da683db5ba989f58d474ccb4ea3a001851b2cfe705e7fe3f70ba01a14dd1f048523e73af522d50410
diff --git a/app-editors/vscode/vscode-1.72.2.ebuild b/app-editors/vscode/vscode-1.72.2.ebuild
new file mode 100644
index 000000000000..e52f2ef29431
--- /dev/null
+++ b/app-editors/vscode/vscode-1.72.2.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop pax-utils xdg optfeature
+
+DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
+HOMEPAGE="https://code.visualstudio.com"
+SRC_URI="
+	amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
+	arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz )
+	arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz )
+"
+S="${WORKDIR}"
+
+RESTRICT="mirror strip bindist"
+
+LICENSE="
+	Apache-2.0
+	BSD
+	BSD-1
+	BSD-2
+	BSD-4
+	CC-BY-4.0
+	ISC
+	LGPL-2.1+
+	Microsoft-vscode
+	MIT
+	MPL-2.0
+	openssl
+	PYTHON
+	TextMate-bundle
+	Unlicense
+	UoI-NCSA
+	W3C
+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+
+RDEPEND="
+	|| (
+		>=app-accessibility/at-spi2-core-2.46.0:2
+		( app-accessibility/at-spi2-atk dev-libs/atk )
+	)
+	app-crypt/libsecret[crypt]
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa
+	net-print/cups
+	sys-apps/util-linux
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
+	x11-libs/libXrandr
+	x11-libs/libxshmfence
+	x11-libs/pango
+"
+
+QA_PREBUILT="
+	/opt/vscode/chrome_crashpad_handler
+	/opt/vscode/chrome-sandbox
+	/opt/vscode/code
+	/opt/vscode/libEGL.so
+	/opt/vscode/libffmpeg.so
+	/opt/vscode/libGLESv2.so
+	/opt/vscode/libvk_swiftshader.so
+	/opt/vscode/libvulkan.so*
+	/opt/vscode/resources/app/extensions/*
+	/opt/vscode/resources/app/node_modules.asar.unpacked/*
+	/opt/vscode/swiftshader/libEGL.so
+	/opt/vscode/swiftshader/libGLESv2.so
+"
+
+src_install() {
+	if use amd64; then
+		cd "${WORKDIR}/VSCode-linux-x64" || die
+	elif use arm; then
+		cd "${WORKDIR}/VSCode-linux-armhf" || die
+	elif use arm64; then
+		cd "${WORKDIR}/VSCode-linux-arm64" || die
+	else
+		die "Visual Studio Code only supports amd64, arm and arm64"
+	fi
+
+	# Cleanup
+	rm -r ./resources/app/LICENSES.chromium.html ./resources/app/LICENSE.rtf ./resources/app/licenses || die
+
+	# Disable update server
+	sed -e "/updateUrl/d" -i ./resources/app/product.json || die
+
+	# Install
+	pax-mark m code
+	insinto "/opt/${PN}"
+	doins -r *
+	fperms +x /opt/${PN}/{,bin/}code
+	fperms +x /opt/${PN}/chrome_crashpad_handler
+	fperms 4711 /opt/${PN}/chrome-sandbox
+	fperms 755 /opt/${PN}/resources/app/extensions/git/dist/{askpass,git-editor}{,-empty}.sh
+	fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
+	fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg
+	dosym "../../opt/${PN}/bin/code" "usr/bin/vscode"
+	dosym "../../opt/${PN}/bin/code" "usr/bin/code"
+	domenu "${FILESDIR}/vscode.desktop"
+	domenu "${FILESDIR}/vscode-url-handler.desktop"
+	domenu "${FILESDIR}/vscode-wayland.desktop"
+	domenu "${FILESDIR}/vscode-url-handler-wayland.desktop"
+	newicon "resources/app/resources/linux/code.png" "vscode.png"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	elog "You may want to install some additional utils, check in:"
+	elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
+	optfeature "keyring support inside vscode" "gnome-base/gnome-keyring"
+}
diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest
index 927a7371981c..a2803fdb1bf3 100644
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@@ -8,6 +8,10 @@ DIST vscodium-1.72.0.22279-arm64.tar.gz 112756235 BLAKE2B 447b94bb45d28b2123ee64
 DIST vscodium-1.72.1.22284-amd64.tar.gz 119688396 BLAKE2B 8a0fe6f026179ca8e87a0fe8d985560c8cb73c09f78e12caa75094e9f698925793436d41bfd9c05e3d7ce485ae8ba71076e5e8cea5fe281c36ab52e5f0cccced SHA512 7c04572e8164285990828cc9883dceb3b406be01dca389abb0793b84a0892cbaadc78851e8bdab7aa90e098328ea511837b4b65f4e8ba10c17ee04736ae68bd6
 DIST vscodium-1.72.1.22284-arm.tar.gz 101718778 BLAKE2B 167e7f2afdfc33301a89f748e4e55cff9f25a1e536b18a66517b4768c8d0a8a32d300c41f8c26189caa92190f5a0ae0b3a56a37251e5c711ebd80ace5acb2308 SHA512 683eee4e74355fe5867b14c8b68360047f92b37869866718750a6de9851fee0e49052cced66218fa1a1a2426ddd610daa24b98069ae214fedd2c691e441a7299
 DIST vscodium-1.72.1.22284-arm64.tar.gz 112752546 BLAKE2B 897b15f8ce4cb36c2ff32a1ac2f8bf2516bda64e57dc0e915abe8f2ef75cfab07cd3bfada7c1f4892c0ecf7028b1bcef66c60dc2ce02d7d8a56f03a5bdc01a47 SHA512 b1c57398b11c96103fb1918499c1d4405ae967e57238378285b8daf18b1efaa615d4b48e7e590d2e7664c5494f75bd994b97297e3b01ee634a62202023a71034
+DIST vscodium-1.72.2.22286-amd64.tar.gz 119681152 BLAKE2B 29410f681f9339fc6541f8febc4e26e17701c41f46bdccb3c7378b4eb242453bff9571023a1d3a21d5c27e8e8b8f385aff953e5be155d37a73040556879d785d SHA512 4fb41e5a7c7150e2efb43ab5ee12748f17c142fd8c5299c88fac25129a47335e277c9b13fd566b621767d4e61f2f022ae3f27050ceeda19959d04de150176557
+DIST vscodium-1.72.2.22286-arm.tar.gz 101714736 BLAKE2B 91cb62f483ad92f921746fb7c5b95920dfc96bf4c994bbc22698ce58a13ae5b4051a73716cad3544da902f241c0ca02546908e753167776b2e578c03c8f8b930 SHA512 4eff5f451cf36674fdb5ca336220b9b0f10bdf20634b66ca6177c517ecae437911920da8cb7d25de44117baf31bf67516c0f491d91a3d3b900f2a174b2cf3e9a
+DIST vscodium-1.72.2.22286-arm64.tar.gz 112754473 BLAKE2B f91a89dfc1eaf03c876909596964b3f8e9b6ab77dff67c33b70c57c305daa704d33b695fe20f9c4b29b9cafd29dd12c4aa4f73fad87f215ecc923e59ef7b727a SHA512 a1f1fad2bee2761f0ab3b6d7571469a271597e9308c2e8242d4dd82ad3cb553dab954229d726264a7965491f1d1b60ab42c8ec9b9451fa8b8d6d98603b158e52
 EBUILD vscodium-1.72.0.22279-r1.ebuild 3141 BLAKE2B f8f5b25c497036a9c6a9ad5036a0d9fc2aa023999f744fad1031e0f5f337e34018170fe3cc9a8e19f9180dcee7e641b10ef96bc91dc5e86d7e2cfb0fe6e3a8fc SHA512 465df4a73d9f6d1777bf274bd297210237b9ae2b87346f5da03f19104a76a4be38e4cbf669427fb4ccbeaab085daf8c4d3151e899618fb84bf6385f731ead18e
 EBUILD vscodium-1.72.1.22284.ebuild 3141 BLAKE2B f8f5b25c497036a9c6a9ad5036a0d9fc2aa023999f744fad1031e0f5f337e34018170fe3cc9a8e19f9180dcee7e641b10ef96bc91dc5e86d7e2cfb0fe6e3a8fc SHA512 465df4a73d9f6d1777bf274bd297210237b9ae2b87346f5da03f19104a76a4be38e4cbf669427fb4ccbeaab085daf8c4d3151e899618fb84bf6385f731ead18e
+EBUILD vscodium-1.72.2.22286.ebuild 3141 BLAKE2B f8f5b25c497036a9c6a9ad5036a0d9fc2aa023999f744fad1031e0f5f337e34018170fe3cc9a8e19f9180dcee7e641b10ef96bc91dc5e86d7e2cfb0fe6e3a8fc SHA512 465df4a73d9f6d1777bf274bd297210237b9ae2b87346f5da03f19104a76a4be38e4cbf669427fb4ccbeaab085daf8c4d3151e899618fb84bf6385f731ead18e
 MISC metadata.xml 1302 BLAKE2B ff0c1f72c2394f21e13b89831493df562ca15114fa5006262f794d3f2580deaad01d7e01f87481dcc75cc5044c8b4950955dcc3dbecbc8cfc7a6ceafaf078fb6 SHA512 8ec965d8544c2ab31e3c2f2f3c879b084126880603681fef5e5158af1bc1f2f79351b68284f6a101d486893f968594e1537df1eedeacdebffdf51de7a38ccb25
diff --git a/app-editors/vscodium/vscodium-1.72.2.22286.ebuild b/app-editors/vscodium/vscodium-1.72.2.22286.ebuild
new file mode 100644
index 000000000000..5575b9697f9f
--- /dev/null
+++ b/app-editors/vscodium/vscodium-1.72.2.22286.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop pax-utils xdg optfeature
+
+DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsoft's VSCode"
+HOMEPAGE="https://vscodium.com/"
+SRC_URI="
+	amd64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz -> ${P}-amd64.tar.gz )
+	arm? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-armhf-${PV}.tar.gz -> ${P}-arm.tar.gz )
+	arm64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-arm64-${PV}.tar.gz -> ${P}-arm64.tar.gz )
+"
+
+RESTRICT="strip bindist"
+
+LICENSE="
+	Apache-2.0
+	BSD
+	BSD-1
+	BSD-2
+	BSD-4
+	CC-BY-4.0
+	ISC
+	LGPL-2.1+
+	MIT
+	MPL-2.0
+	openssl
+	PYTHON
+	TextMate-bundle
+	Unlicense
+	UoI-NCSA
+	W3C
+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+IUSE=""
+
+RDEPEND="
+	|| (
+		>=app-accessibility/at-spi2-core-2.46.0:2
+		( app-accessibility/at-spi2-atk dev-libs/atk )
+	)
+	app-crypt/libsecret[crypt]
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa
+	net-print/cups
+	sys-apps/util-linux
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
+	x11-libs/libXrandr
+	x11-libs/libxshmfence
+	x11-libs/pango
+"
+
+QA_PREBUILT="
+	/opt/vscodium/chrome_crashpad_handler
+	/opt/vscodium/chrome-sandbox
+	/opt/vscodium/codium
+	/opt/vscodium/libEGL.so
+	/opt/vscodium/libffmpeg.so
+	/opt/vscodium/libGLESv2.so
+	/opt/vscodium/libvk_swiftshader.so
+	/opt/vscodium/libvulkan.so*
+	/opt/vscodium/resources/app/extensions/*
+	/opt/vscodium/resources/app/node_modules.asar.unpacked/*
+	/opt/vscodium/swiftshader/libEGL.so
+	/opt/vscodium/swiftshader/libGLESv2.so
+"
+
+S="${WORKDIR}"
+
+src_install() {
+	# Cleanup
+	rm "${S}/resources/app/LICENSE.txt" || die
+
+	# Disable update server
+	sed -i "/updateUrl/d" "${S}"/resources/app/product.json || die
+
+	# Install
+	pax-mark m codium
+	insinto "/opt/${PN}"
+	doins -r *
+	fperms +x /opt/${PN}/{,bin/}codium
+	fperms +x /opt/${PN}/chrome_crashpad_handler
+	fperms 4711 /opt/${PN}/chrome-sandbox
+	fperms 755 /opt/${PN}/resources/app/extensions/git/dist/{askpass,git-editor}{,-empty}.sh
+	fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
+	fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg
+	dosym "../../opt/${PN}/bin/codium" "usr/bin/vscodium"
+	dosym "../../opt/${PN}/bin/codium" "usr/bin/codium"
+	domenu "${FILESDIR}/vscodium.desktop"
+	domenu "${FILESDIR}/vscodium-url-handler.desktop"
+	domenu "${FILESDIR}/vscodium-wayland.desktop"
+	domenu "${FILESDIR}/vscodium-url-handler-wayland.desktop"
+	newicon "resources/app/resources/linux/code.png" "vscodium.png"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	elog "When compared to the regular VSCode, VSCodium has a few quirks"
+	elog "More information at: https://github.com/VSCodium/vscodium/blob/master/DOCS.md"
+	optfeature "keyring support inside vscode" "gnome-base/gnome-keyring"
+}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 58ac9f5cef5a..4b5d5d0c078b 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/docker-tramp/Manifest b/app-emacs/docker-tramp/Manifest
new file mode 100644
index 000000000000..ac71ed2b50e5
--- /dev/null
+++ b/app-emacs/docker-tramp/Manifest
@@ -0,0 +1,4 @@
+AUX 50docker-tramp-gentoo.el 76 BLAKE2B 718f2dc3e7a2b8dd983fad5ff4187fa0dc943b390212cf3de39f9841d45ec15e12520198814ba66b75d118bbee538ff32c9887a6132dc962251e7153d3d1248e SHA512 df604a0c460567975a0a8a7f6013c6238f84065de22d6fdacaa2e88b39d5c7255b608df90c8e979d9aabe3b7655318e65a4a83788a9e862a2e0f81c79f70e51d
+DIST docker-tramp-0.1.1.tar.gz 4757 BLAKE2B 1a95df2e17ebde8c02d34b25fa02bb29b96c902a68ceb81848b96eea8e02ae637826565ad4ea6aaee45b802246b59afdd5bb4a3cc617b1c8d1a234b4ad3cb355 SHA512 355baae22c28acf9ef7d97f754d84664d0c13c63317be93678f2e78273410e54fb36dc7ebc348f127486bcd7946934b93c40363864601f955a99e8201b83d666
+EBUILD docker-tramp-0.1.1.ebuild 591 BLAKE2B ae28643ac64cd64ae04f769ef7984ec65ef932b1d267fa02c921b6736ba017bba60bb2a6a414f9da63fe5955d849baa1f6a53bf84bb49912549b6ff39ecd1079 SHA512 2fea99308a7f514678be730500620833ac744f06fc751adcde6afb1da0cf4af59ee9aa01bb92814c803c4abbd4f80307f3e71bbf1508d0f30123ba3499c9aba8
+MISC metadata.xml 463 BLAKE2B f0f2caf05b3ad1035ca08bffa6ba86236a8514bd9c9b67df4c027599e64fbfb8f0d70e75a4bf6c41e4f62b008bc3964415214adbf1ca7de8adbf9733a6ac727e SHA512 7a35640435dad110c5cfaf0477f1c78ffa0eee10738da74168df82ff388382e6ca6bff7587cc6ef0dd02ad1c9cd714c76d5551ccbcd3f7866bd9415c39afd960
diff --git a/app-emacs/docker-tramp/docker-tramp-0.1.1.ebuild b/app-emacs/docker-tramp/docker-tramp-0.1.1.ebuild
new file mode 100644
index 000000000000..09f42e228728
--- /dev/null
+++ b/app-emacs/docker-tramp/docker-tramp-0.1.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Emacs TRAMP integration for docker containers"
+HOMEPAGE="https://github.com/emacs-pe/docker-tramp.el/"
+SRC_URI="https://github.com/emacs-pe/${PN}.el/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}.el-${PV}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md )
+ELISP_REMOVE="Makefile"  # Does not define any tests.
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/docker-tramp/files/50docker-tramp-gentoo.el b/app-emacs/docker-tramp/files/50docker-tramp-gentoo.el
new file mode 100644
index 000000000000..a39520b6ae03
--- /dev/null
+++ b/app-emacs/docker-tramp/files/50docker-tramp-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "docker-tramp-autoloads" nil t)
diff --git a/app-emacs/docker-tramp/metadata.xml b/app-emacs/docker-tramp/metadata.xml
new file mode 100644
index 000000000000..4dcd3076f92b
--- /dev/null
+++ b/app-emacs/docker-tramp/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <stabilize-allarches />
+  <upstream>
+    <bugs-to>https://github.com/emacs-pe/docker-tramp.el/issues/</bugs-to>
+    <remote-id type="github">emacs-pe/docker-tramp.el</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/docker/Manifest b/app-emacs/docker/Manifest
new file mode 100644
index 000000000000..74ba71c374a2
--- /dev/null
+++ b/app-emacs/docker/Manifest
@@ -0,0 +1,4 @@
+AUX 50docker-gentoo.el 70 BLAKE2B 12fd83d3da457ca9cd2dd49394f0bde8b530108c1e9fd01eef4db09e7e945187be90115c42362831fea9d573905080383828e89af496d2fb200ab7ce6f85da3b SHA512 98c278dab73ee3a1a5da0041fdbd77bc3661f54e1c45bd756dc83a994d43953f5eb45b2027992b07ffd04a9f3a122db939b61e05afe0c46af3dc7db68d489e8f
+DIST docker.el-2.2.0_p20221012.tar.gz 112321 BLAKE2B 3834f9b20fc9cf16cec596adbe668943ab137b97a0f4755501b94cea48d87a0ec125d4ea6249faf09ae74da54b35ef0d56bc1c18892a30b3cd7c214908743533 SHA512 187d5ac7b484e352b5bb8994d2dd894a7c4e892bec80062a51de6bdbbb939a9664157d1f5af5cf5fc97a3626a076f8f59056f74a3f1031b61924143623f65be1
+EBUILD docker-2.2.0_p20221012.ebuild 751 BLAKE2B c48223f6d1d94b152e5610edb0cd5915385df9df8e6c249c06038196589a2dc86f115365b930e2666721460036cad100edae4f278553971f050ddef0452b20b5 SHA512 dbd2469ce94b1d32d338d3e5d67acdaec49a1decb817e4038fd63cff47637dc4872f06db5319dd4e08e2cca8c893bb78ba5df13cf2e4e3ebfc6c7d391bf13f90
+MISC metadata.xml 631 BLAKE2B d75ddab8991153738faf075761e5a3317325dd0c10011c700043c1a4bf298a7060f0c5ab485407264031d510fefa091120246e200beb0dde1adc0f39114dd250 SHA512 8e4c2c9974e67f4a358ca62980cb9c4967a9703ba6803ede3bdc420faefea5c106debc912ae3e418a0e2557d3421369b97aa731eab42aca808c3561a0f05cc24
diff --git a/app-emacs/docker/docker-2.2.0_p20221012.ebuild b/app-emacs/docker/docker-2.2.0_p20221012.ebuild
new file mode 100644
index 000000000000..7daf4f5cf869
--- /dev/null
+++ b/app-emacs/docker/docker-2.2.0_p20221012.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=3173403a2d51a2af36f7fdb0b7d2bec9e202e772
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Emacs integration for Docker"
+HOMEPAGE="https://github.com/Silex/docker.el/"
+SRC_URI="https://github.com/Silex/${PN}.el/archive/${H}.tar.gz
+	-> ${PN}.el-${PV}.tar.gz"
+S="${WORKDIR}"/${PN}.el-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=app-emacs/transient-0.3.7_p20220918
+	app-emacs/dash
+	app-emacs/docker-tramp
+	app-emacs/emacs-aio
+	app-emacs/s
+	app-emacs/tablist
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md screenshots )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/docker/files/50docker-gentoo.el b/app-emacs/docker/files/50docker-gentoo.el
new file mode 100644
index 000000000000..c12e5c43467f
--- /dev/null
+++ b/app-emacs/docker/files/50docker-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "docker-autoloads" nil t)
diff --git a/app-emacs/docker/metadata.xml b/app-emacs/docker/metadata.xml
new file mode 100644
index 000000000000..ef84f46e4e9e
--- /dev/null
+++ b/app-emacs/docker/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
+    This package allows you to manipulate docker images, containers and more
+    from Emacs. Supports docker containers, images, volumes, networks and
+    docker-compose.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/Silex/docker.el/issues/</bugs-to>
+    <remote-id type="github">Silex/docker.el</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/transient/Manifest b/app-emacs/transient/Manifest
index 6745b053226c..42d9c086a014 100644
--- a/app-emacs/transient/Manifest
+++ b/app-emacs/transient/Manifest
@@ -1,6 +1,8 @@
 AUX 50transient-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST transient-0.3.6.tar.gz 100905 BLAKE2B cc7a78104b77a7ff49d2ee686a780db7509744b1f737e4f995d5e5f8ada18828ccf1b6ae5d995fb8aa09e9fc16895226e5e8cf3cf50a79c246c5d07d5f467ce0 SHA512 c1b43046f07f9efce1720f6e151d8223922574262d4e5436b0c81453b0a21a404f1c555a5bc92a201c71beb1b2f95aafb38b88203cd08c1d3a9d80f45ed0d0c9
 DIST transient-0.3.7.tar.gz 103105 BLAKE2B 3253529af82116881b6fdbb5465d3e0ffa8246e017a266fe0868d31e9c576a3927ed7b8d968d95f7e84e31859705f08582260d074f7f55cf10e535177df761f4 SHA512 93d1e00db3f483d830c9e636de1ae752c43bada580209c4839e89941507be5fd7ebbd31cf597436f13448b29085453742a0623dad9dcc1d343e29a5d47d76987
+DIST transient-0.3.7_p20220918.tar.gz 125422 BLAKE2B 19d1e2e4ea24076856a1816042d63964527b4c98d5727805058e5bfd829c708afa277d88b46e0e4da64b8a21fc4c012b410399f7bc71d877c285edda6b9e7d8e SHA512 9dd61f6eb69bdcd9a582e34261f9b6806d048df3d009aefe5f3a5a8f36e733187140b933f8e4af02c6e6f35fac6a3d5d13665ac108fa74299b1555c485be87c3
 EBUILD transient-0.3.6.ebuild 632 BLAKE2B f90048b6da631dd63750ab4d8ec5ca04bdde382b42d32b88dda9b2636f1fb7bc2e7169e448b74b0a51e2c98934a47a766caf1a65427a24ead8843c2755253360 SHA512 9d2eb466481bb27193e735acd5530bfd6c2d9e8357061783fc53aef0dde5e981392db318bcf18388d86d0229082d4b68b283d542a09fb9c04437551ea282b2d3
 EBUILD transient-0.3.7.ebuild 632 BLAKE2B 1ac33d5f4c2d989e7f863df815ab30bd3d7513ce30b65c4405cdf77e75d5c3821307e88bb035b78980fb1903708169e7e2b512bd03cb846bd3fe6e2c82e3b6c1 SHA512 4747e729b7f9d01042f43b073933954f65ddfc428dc3e8b1c526765cea198378ebad8d8f43574160487c6ea55d9a1d0dff1e9bc514b0e275d6da0f06e29282b3
+EBUILD transient-0.3.7_p20220918.ebuild 704 BLAKE2B 0708d7e38a69f4698738099ec5d064412ffab4b06f01ad9cd208e665cd6b1e59a790a58e867f4cb76fab2415ccb2099efbc384cf3a05a106d7d2a4662d798b5b SHA512 6d28aba202e0aafa6814c31f609357946c2abc065f9dfcf8525f27d6459edad2815e0d79635114d3db2fed7d19d27184e5556e134338981e8b19d90027a6e2d9
 MISC metadata.xml 1434 BLAKE2B 6f7f91e2cd8c87559f15552d6fbe920e5262a50f21919a096af55df037726eb380a774cfba8be73b588ba9aa2c39da5caf6ad64a31106b843c6bd308fe7aa40e SHA512 3316d9ac21d2a2aa0a5824f2c8ded736ad1bfcd7319a9c4cb8b02f0ffec5f440820bfe48e4f4d4264fbc3864bd7959875f1396285b6a7eb2ad3333a6a062a14f
diff --git a/app-emacs/transient/transient-0.3.7_p20220918.ebuild b/app-emacs/transient/transient-0.3.7_p20220918.ebuild
new file mode 100644
index 000000000000..a78258972198
--- /dev/null
+++ b/app-emacs/transient/transient-0.3.7_p20220918.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=097f5be6e0c228790a6e78ffee5f0c599cb58b20
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Transient commands abstraction for GNU Emacs"
+HOMEPAGE="https://magit.vc/manual/transient
+	https://github.com/magit/transient"
+SRC_URI="https://github.com/magit/transient/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+DOCS=( README.org docs/transient.org )
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="docs/*.texi"
+
+BDEPEND="sys-apps/texinfo"
+
+src_prepare() {
+	mv lisp/*.el . || die
+
+	default
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 66f201bb944c..f1240622c327 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 92e07c97c53d..4198e6b7e235 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -7,5 +7,5 @@ DIST ghostscript-gpl-9.55-patchset-01.tar.xz 2940 BLAKE2B 450498f0bd191d5936de1c
 DIST ghostscript-gpl-9.56.1-patchset-01.tar.xz 2960 BLAKE2B c43f00dce6d1aada40c8e628a1032afe1bf9789b3ad69d9dac2ae94ba040a380c01884173f0ec05ba59240421dc5a53cae45adbbb13dccc9c366b1a6dea7794f SHA512 a444c687ab0f2c3f945f6854991799c2aeca3c410eba4bc53ad7bcc68b0ba8d187c09baebabb6581144781d35b4f2d4e29ff625ca55b0f640a033ba27e993f30
 EBUILD ghostscript-gpl-10.0.0-r1.ebuild 5291 BLAKE2B 3c04a081dd3dae4ef35d8e0969f6f49f0a407f15a7866ab555fbab056934d29c6c8412ed617085d4838891f43b5445a48470e3b81363e833013d4f3cb17b3bc2 SHA512 2de0aef161c002cfbed4066c780ba32fdc0bdcc727d96e89dd7b78dd5c2f192967feabaaa5dfd4ef005ae9ca6225c016f07ad2bb8e007a7e2a893c95894691cc
 EBUILD ghostscript-gpl-9.55.0-r2.ebuild 5160 BLAKE2B 3a0c5c1e5652b34ce81b381532fc10116ac320f4ba83607f25ba4935f4de72e98a4bc038bd89189da8a59c913775fc1c6377afd0523332c0642a26d40db652cb SHA512 b7318f81333290182e3f1d190c62580eee1c2552ba97433c3caace56565a06d9a0782cf984f940d58f47981c5ed3ddddcfeaf69ec1c456f93ed9171a7ab63445
-EBUILD ghostscript-gpl-9.56.1-r3.ebuild 5136 BLAKE2B 5143ee025715f1f3e85e23b4e664b54c6d0b3105a665df8f92d746d6c8bc4c820fff0050847101617c6265564d5186bed18218c661bf56ac5cf1e0486ecfa91c SHA512 e245227008aa7b7bb59192c405f359042bc9799881bc25f5b2740012e6b6975b0ed3803aed5c556d7e9144a80f9735e32acf2cefb545189fb84f3e05ceb7fc93
+EBUILD ghostscript-gpl-9.56.1-r3.ebuild 5135 BLAKE2B ea83184dedb6217cd7b234859e8ff221496e52dde7cf78ff1585d10273672bef9a61d70cb3344aaa92a2c3a0d78dbe901f11cdd2637451aa89452be4018f43dc SHA512 8abd05aefabc933cd2d3c441fd9d5d88c6ad7e0e449ee0ed46282198cb629daa2d140f482cab8bb7091ba068c5b68d82f729fd44bfe0c01240e3ba52a9761a44
 MISC metadata.xml 767 BLAKE2B ff690e8acf31dc71da9c563b45316398d4dd74c2c7690df1a2ad0148ac459aead548ac0ed8e203fe8f6d1a375a91807d08d5c053c702f1551a2f32b66444ae74 SHA512 3edb3742706b1cb89ea09428ddcab3959d6dd435e92957cd2982e074acd449560e5abf41af29029593fff280ca02ad909ec05fd83e0d9fc690f5a9227804f3b9
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1-r3.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1-r3.ebuild
index 4f23a9c39452..fd5728b90fe6 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1-r3.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1-r3.ebuild
@@ -24,7 +24,7 @@ fi
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0/$(ver_cut 1-2)"
-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"
+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"
 IUSE="cups dbus gtk l10n_de static-libs unicode X"
 
 LANGS="ja ko zh-CN zh-TW"
diff --git a/app-text/poppler-data/Manifest b/app-text/poppler-data/Manifest
index d1fb097c87c6..eb01840cdbe2 100644
--- a/app-text/poppler-data/Manifest
+++ b/app-text/poppler-data/Manifest
@@ -1,5 +1,5 @@
 DIST poppler-data-0.4.11-2-extra.tar.xz 3124 BLAKE2B 8ae0cb7613d36e2ceddb77736b04a61353cf4bcd3ac74e6cc65e7ddf727b65b98aa57c31bc02782cd74318119f0577cb3b187c9192ee0bb47dc8666e908a919b SHA512 3e43bc37b1a9affe4fabf68c3ea3490cbae0892286b3fd01f60f2fd232da68bc863fe0b058821d7d2e4ac4d7427b0ab02f8374abeba2cad704d578a155f46885
 DIST poppler-data-0.4.11.tar.gz 4497282 BLAKE2B 01f0f9f3d933f45683a702c4d538d8fc59874512290f199b601c16f98f9b596ff249fbc992574d046931cc80f3685f94733248450d3a54f2f961951cdeda7c39 SHA512 a5b7ace28d1677e12f7500ab6345b277dc22cd48ace8d472c083933416879edf4da4efe8217b0e11f75a3387ed98d832fe50567884095b6c0e09ebd8802b0f32
-EBUILD poppler-data-0.4.11-r2.ebuild 1142 BLAKE2B 9ffea4e58ba3f344df53942830374a0c6ac8b6913358212e9bf00c3e0e6ed5d882f27bbac8c68fab04a8d5e7c2b8f34e7b06ec25221438c9f58764f1291511fd SHA512 942effe29eddae81567eb18cebcfc7b0de19c494204a08e9e69ccfccc69ca00da16e28218b026065ec7b8eb055fd12a3b204630b510cf2e30bf2189a886e0b62
+EBUILD poppler-data-0.4.11-r2.ebuild 1141 BLAKE2B a83c1142ed9acb459a5318129939aad3b0dcec0ce8b7f7fffa25de4b2204c94e30f31888369359eae7c5969a4a50161cd93496e0d01ff92500122c02ecaf86ec SHA512 487684607e8d66d9694700a42d425baea5ac07aa90e2661ec67ed2a5cf19b425b0d154d059d241fe074f6d4cd20480ede831721a279f88bce24ba121a71109db
 EBUILD poppler-data-0.4.11.ebuild 736 BLAKE2B e83fee3787fa33200ea16589379bffef0d70fa06313197441ce7b409d24384c1bcfb2aaff17b0ffe034ae0c6c03354ef67c4d6b168d92474b08da47cf8228e67 SHA512 d14cb205804c76b6f8faa8cb0bfbfff01b53e9195595ebbddfd57a7e632e05e89904f0a95b8d6801172289048ed3c6e38162ab9306574ad51a66f137af6a3757
 MISC metadata.xml 256 BLAKE2B 16ea76357721c3ab7d672ade29d27338ddf9da983571e4ca4efe2520c741fc71315d9609b711850b00c19ed4eea848dea0d5b3955eecb401c42c4db257c300bf SHA512 2748afab7ffea0b3ddadf72dc720f7d83a1d76453fa569091abffe834ec187144a47f9365ccb4a97f676dbcfd799a6be92671f283b179fe4589d95486d7fd24d
diff --git a/app-text/poppler-data/poppler-data-0.4.11-r2.ebuild b/app-text/poppler-data/poppler-data-0.4.11-r2.ebuild
index 4978da0c4d0a..b2a658c91eec 100644
--- a/app-text/poppler-data/poppler-data-0.4.11-r2.ebuild
+++ b/app-text/poppler-data/poppler-data-0.4.11-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${POPPL
 # AGPL-3+ for the extra files needed by ghostscript, bug #844115
 LICENSE="AGPL-3+ BSD GPL-2 MIT"
 SLOT="0"
-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 ~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 ~x64-solaris ~x86-solaris"
 
 src_install() {
 	emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index e856141eee9a..f8922d1cafe2 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 31b2b769d48f..0b8198df22f3 100644
--- a/dev-java/byte-buddy/Manifest
+++ b/dev-java/byte-buddy/Manifest
@@ -1,5 +1,5 @@
 DIST byte-buddy-1.12.13.tar.gz 1721038 BLAKE2B 60aadbbb3b56e5ac2ecc2bb162653b769f4d4b913bd675457ce2fbf12a5777addc4beb2bb2e347d5956dbf1fbe6a6dfce078a29c53b1f1e2a60585670897d4ee SHA512 88c221d0dccb248683069070e498c5d4320f4fce059c45f460e04fbd86c2c596c18a4c7f4e9b3a0480eaf96d93593d1f1af87d894a7c4b3d73511e88a95f4e92
 DIST byte-buddy-1.12.14.tar.gz 1857258 BLAKE2B 6957246f6689d1bdfdc6277ad752e03df0ae47c62b0afded77c94cdd41e00cc736517d0e4e5d5f8c59be519262a03864cde9bffa4ae53e5a7daeed84a519967f SHA512 5035be16fbdf2f7e8e2c93b87ee5f9adc927a19fd3b7d9fcd262906d8d21532cef8111084c3d6d0b75e101df0bfee19bf9177bc6a7d4b18cf0f26146fba4f147
 EBUILD byte-buddy-1.12.13.ebuild 4574 BLAKE2B d86d952b193566329ffde2d167bb3daa5dfc4d9bc2b355841faf7dacd993df3c3c1b338a2fbbd4634957b33e6275da849a88926643f7d2edca63cde7ea31b447 SHA512 cbeef5b365041c0e76e4c2b06ba137e0f60b9b2e87a1e8a14a9e427646587fad51d5e2ee7cee398c8e89b50e3612cd12e57d55cb4334be91ae1c9f1ef000712f
-EBUILD byte-buddy-1.12.14.ebuild 6736 BLAKE2B 3818548ca32d74590e60ef274a41c6c6035dd72efb36591b4df35d33b9d0c1051aa8b0ece530643c00946562c477250eb7afd133148b2895423269e04a7d42b8 SHA512 cb8119bfe6e1e0d5a50ac65e9f35bfccbeaffed435cd546cfac1cac7b0ef5b97711fb14e8ef490acab941499ba1b879b4647a5ebac5909a7e6c4e2b58c8bfaf6
+EBUILD byte-buddy-1.12.14.ebuild 6734 BLAKE2B f76c63a517116477221cc54f340958ae08fc375ed5c6a2c1df06c08cd282813330b3969f90a9f50e0314ca674fd857d6d308afb9e3d1701c3e2cd4ffc6238e46 SHA512 1e65ff5e62c83e8732e5f364de52fe6675394bf799c93b572e3755c3bd33fb3fa10f7dbbac5f172602cd2d58400ac6ca7c2c147b84d98c8704090e583e04145a
 MISC metadata.xml 440 BLAKE2B ef73e69de33dc6bbea38c81b8744fad5ce4764644d9cc6168d7c0f175856e30c3a577ffc597f25f8caf26bacfd80663b55eddde047a346fcb582d883269233b9 SHA512 b27c92e768c2783c90c8b4693c3265a9533a09abe76b2b3bd54e3865d270eed91414fcd89513bc30feb0243ea21f63d354b907b74eb18e98f899811101a6c956
diff --git a/dev-java/byte-buddy/byte-buddy-1.12.14.ebuild b/dev-java/byte-buddy/byte-buddy-1.12.14.ebuild
index edb8938b00ce..61c20f47e67c 100644
--- a/dev-java/byte-buddy/byte-buddy-1.12.14.ebuild
+++ b/dev-java/byte-buddy/byte-buddy-1.12.14.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/raphw/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-11:*
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index a7f63b139760..5eb2a08d2e48 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1,5 +1,5 @@
 AUX commons-logging-1.2-gentoo.patch 825 BLAKE2B 154927ebbda77a76007fe9b448fc2801404717fa933002a69916b9a0558af82b0172039ef294ba01b4cb98bcc93bf40b54681d4c2343e4a404e58772e8a8585d SHA512 1886a28bbccf0f8aa42a147628aeac444a672cb3dc006604088a67d536c376a03781b22394770c580d80c5616569b751e63c91d86cbff6f5caa47100897cd027
 AUX commons-logging-1.2-servletapi.patch 1783 BLAKE2B 5f8bc256542335b5d955d998ef2ee49d8becca46b367ba0ac1152f68ea4fccc226afcd2475331cf292c3f0f11471052e6917c9508a6737c6482c556c2ec87363 SHA512 bf2f0aca771b7278f2d80ae3c149492040c137c1ab190513fd9894fad315f75e4b0423f65a5ffaff04faed3f7256728b5f474cfbe0aefc2a53d60337a6344d39
 DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
-EBUILD commons-logging-1.2-r5.ebuild 4162 BLAKE2B d459324c5da6caff691d148aae1f29abf934f924c9afa62733f39b5aca8e7aa5d819609ff9bca3546dd32533d905abad588913d9e1e87aab61c482b3cf2b3346 SHA512 f3d3d2d630e25e24eb4dffe061bab2c7b970692cbefddd90b70d3cab8276353ff14669d40ad01fa1c05dcae1eea1f15895a027b8e4b75ad3172e5b3f4cc72005
+EBUILD commons-logging-1.2-r6.ebuild 4146 BLAKE2B 3d9d1e7121406deb2cfbb50ce274df70a0c165d99870f77a69068447e68588bd43b259b076bd5dc2e853a4d79e2df80844caaebd4d4dfe095701f3c4799a98c6 SHA512 7bee2954d057db0c3bbfd3b8bba6b7c9e1cc2f708b5d85070defde51fb6c9d2f8f10b1be122fcfadabfaffc612d2b63ef355818cc6a14253a9de05b79c0c0dde
 MISC metadata.xml 552 BLAKE2B ec2efc6f1e5e694ae68d977b40387ecdf6bff5fd184a4a5cd7c65830108d82522e5951a9b9868f4e94b08ec00c1901f43cd027f328b49cffc90ca971fb041026 SHA512 89c4f003ea15a5201ba713ca1819b9ea35d65c27e4106e6bc8e3806f1667f95b3e96c7b76c77b8545ded8abbb3955f6cf96dea11eeaea7740696bb01a933e077
diff --git a/dev-java/commons-logging/commons-logging-1.2-r5.ebuild b/dev-java/commons-logging/commons-logging-1.2-r6.ebuild
index b3a0f8533760..8c38a37bc9cb 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r6.ebuild
@@ -27,7 +27,7 @@ CDEPEND="
 		dev-java/log4j-api:2
 		dev-java/log4j-core:2
 	)
-	servletapi? ( dev-java/tomcat-servlet-api:4.0 )"
+	servletapi? ( dev-java/jakarta-servlet-api:4 )"
 
 RDEPEND="
 	${CDEPEND}
@@ -92,7 +92,7 @@ src_prepare() {
 	fi
 
 	if use servletapi; then
-		echo "servletapi.jar=$(java-pkg_getjar tomcat-servlet-api-4.0 servlet-api.jar)" >> build.properties || die
+		echo "servletapi.jar=$(java-pkg_getjars jakarta-servlet-api-4 )" >> build.properties || die
 	fi
 }
 
diff --git a/dev-java/jackson-databind/Manifest b/dev-java/jackson-databind/Manifest
index 7c08cfded786..84abe09534d9 100644
--- a/dev-java/jackson-databind/Manifest
+++ b/dev-java/jackson-databind/Manifest
@@ -1,5 +1,5 @@
 DIST jackson-databind-2.13.3.tar.gz 48056095 BLAKE2B 04751cd99eae3bbf3c3a30993506f05b47a85782f52e2cf51f50de9bcb5e9c3718d6ba6105667226272d644dcac6aeeb3ce06dc7ae737adf0392a7a7eafef2aa SHA512 785db6cab20ee74ff90815b8a1afedcbf10f13f60c336a61c20513757cbcde80c073d5f4dc60d390a72600a2b5719cca22b4c71220707dd4edd67dd87f6a7ac9
-DIST jackson-databind-2.13.4.tar.gz 48052399 BLAKE2B f3ad6d8c2afa69dfadaef7cc592215bb5b9a63c03ef214dd75f4b5b88a35edd0d24a4a680936a057046dd3418a901aa8af1ca093097f17f0998ab66b19c3cb84 SHA512 b315a8bffdc81c954ed1a3b07032b47229e1fa2e78ca8f4c3609c47d4afd000ba849cc54ea9a0073dd4a9313b17ce7e1f420ce5df5d389d5ecc640e925dc6cd1
+DIST jackson-databind-2.13.4.1.tar.gz 48063423 BLAKE2B 88370810068f3c1b3973f310e55e6fb53067ff9796de960d2c57cd50ee59dd552f58b4e73d4455076b18ec996ce7714ab84000a4887a1779fcf259859c891346 SHA512 22b7a4225903a0fad3d7d17a5fad79905da96a4a7ebf70b7d9f2c778e88f8c9c2a27d96f66beae96f189ebcd9ca19fd7b12405009ae38023ec8b0511e1ba1af2
 EBUILD jackson-databind-2.13.3.ebuild 2675 BLAKE2B 99fa6669fa6749115b81c20add20b3c0d15dcf651ef508cabc1ef3eaa9f0a1f3cde300f94744405feb38833d34bd0fd0e15ff67276302dd3ae44705b76bab00b SHA512 7ea0d52d689f2d4d6477c45921d803d53d58d469e425be587dd6a279112becc2324186d87641e4f7d1b97e210b35e26527c61198c908503e6fa5d7fe8c32eed7
-EBUILD jackson-databind-2.13.4.ebuild 2524 BLAKE2B c90ea708b6148e98ed66cc55cda26b253745ac7a5847d231d7456e779549950259f9f0008ef8c2dbb961304afb98a4358622f12c645e734c423a4494b22210d2 SHA512 44683936721acdf434e3a60dfab388b7bb5372e93f4506bea78e46d70dcbcf0ef4a68b63e157c247711505ef1cca391a7851bbc56edf6d7bf60a158d1f580855
+EBUILD jackson-databind-2.13.4.1.ebuild 2528 BLAKE2B 26756bf02e378c4d0522d25012ad37fba68463c84a199c193df05ea737eaccbab28f919c6c8f7a9f21391516a1cb828bf17ed294e42cdd2508288233cb53988b SHA512 9cf3204e53aab8aa53834b82c7ffb74649a393e8711b4d0236ea4223ac5f9aebe5564fe3ff37460debfe7831ad1f8a02e32067d5d01ac0b502cf611fe2d863fc
 MISC metadata.xml 316 BLAKE2B 06c857b21b1c39450aefd3a56ee67e0a9c57ce28f434e0af285397bf9c0a73801983b71415c1dd3ee1b53e9b1bf855d81b204559ccfe5bda7cf0703975a8420e SHA512 3308a8e0872865b0da8c3c5720364f786764d6cb751b6ad465dc450338b8c3f672b8266ab957a27609363d507b7f711ccb0edb921388a8f50cba73424fc85253
diff --git a/dev-java/jackson-databind/jackson-databind-2.13.4.ebuild b/dev-java/jackson-databind/jackson-databind-2.13.4.1.ebuild
index cefd08b5c6da..bba879961c05 100644
--- a/dev-java/jackson-databind/jackson-databind-2.13.4.ebuild
+++ b/dev-java/jackson-databind/jackson-databind-2.13.4.1.ebuild
@@ -7,7 +7,7 @@
 EAPI=8
 
 JAVA_PKG_IUSE="doc source"
-MAVEN_ID="com.fasterxml.jackson.core:jackson-databind:2.13.4"
+MAVEN_ID="com.fasterxml.jackson.core:jackson-databind:2.13.4.1"
 # No tests because of not yet packaged powermock
 # JAVA_TESTING_FRAMEWORKS="junit-4"
 
@@ -27,8 +27,8 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 # com.fasterxml.jackson.core:jackson-core:2.13.4 -> >=dev-java/jackson-core-2.13.4:0
 
 CP_DEPEND="
-	~dev-java/jackson-annotations-${PV}:2
-	~dev-java/jackson-core-${PV}:0
+	~dev-java/jackson-annotations-2.13.4:2
+	~dev-java/jackson-core-2.13.4:0
 "
 
 # Compile dependencies
diff --git a/dev-java/jackson-dataformat-xml/Manifest b/dev-java/jackson-dataformat-xml/Manifest
index a171a8663c41..8d1b9bea5c60 100644
--- a/dev-java/jackson-dataformat-xml/Manifest
+++ b/dev-java/jackson-dataformat-xml/Manifest
@@ -1,5 +1,5 @@
 DIST jackson-dataformat-xml-2.13.3.tar.gz 3201473 BLAKE2B 90f6b98325e3ae43e7ba560b077ee8fc8e5ad5004fd23b7c10a2c2a3ec7a674b700b80766690d2442820f87698fa5e33c440c2aa12cd521b7566e78eca50bbaa SHA512 52e26e1a398d90f75ef61d074ed1d149b9f13555f1878703b3148ed008f29f8802586a6020f3c1427a748a73b9a4ca56d86ffd769cf6cb7317a69e039345eefa
 DIST jackson-dataformat-xml-2.13.4.tar.gz 3203115 BLAKE2B c959c878c6905de9fee73fab87381296d30146ab755765e715f49f141ea80d3843116752710e78f270c96abb0a2dd784fff01769ce68c126b3c7bd5acbe1a880 SHA512 8b6c76d8b324ceffece806f2de1352e2b2b557d64f51885bec8e60033c254e9c5a9adad29c07b6a5aaa77d535245ad581f67768a62af7a44160221aae62115e6
 EBUILD jackson-dataformat-xml-2.13.3-r1.ebuild 3892 BLAKE2B 8992fdea96019a8d1ddc92c7ca266835071f8e14f6f0fb73ea36d55c9137e4f58712ec66e9f9333faac7c0fa92b36becc504171eddaddeb44091abaac81570fc SHA512 4465715395e23a878b9a9b334ffc419e56edf7a1454cd58295f48cd7801cee60ef56f7869514c901c6bd290d123410a0410b333de661cdf2a23da530d32a26df
-EBUILD jackson-dataformat-xml-2.13.4.ebuild 3817 BLAKE2B 2bc5ddd018f3662c4aff7e8d09eb6b4bf1b938ece3147bbb612c7b61a534372a3563e622029828edff709827d835c12db45cb7caf55965a4d5d8d610b9567ce4 SHA512 216ee5042783fe88686434c53bac37d7157efced9e19d54e709ab746391250c1f77b4b645cda624bf0c1bf2955a9f075bdc80c9c44977ac0522f6ae66ac27885
+EBUILD jackson-dataformat-xml-2.13.4-r1.ebuild 3819 BLAKE2B 2bd854326c9e277dea5f4d891fd6fc83f0e5d81795229224fafed01491eaca6fb8a724fe20baa116602ac635c9da7e18dcfad6bd7d0a078b851d3ec11365541d SHA512 948855c60a53184902b33d44e53c735f2a3641eb7433bb998aa5af0dec088d201005cb73198577a8e8faed6f06286f3b9ff0e8047b16ae9d6dcf286631860642
 MISC metadata.xml 487 BLAKE2B 0e5e73be66b890aab37fce8ccd162c168c7cff415c418a30f5cdcc76624499633abfd366f86ece75de208b981a03364566659e37c2b3a34ad90a01f3577a707a SHA512 b920c1d3b8d8f6023df6c100ba4b36282c7cbfdad4a4690055d70cd3dac8d0da91f236a38565bee798342dd94c49cf2c9ce125282a7e5fd818321e28d288b3f1
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r1.ebuild
index f7c722ff3c0b..d407fdda4d1e 100644
--- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4.ebuild
+++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r1.ebuild
@@ -31,7 +31,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 CP_DEPEND="
 	~dev-java/jackson-annotations-${PV}:2
 	~dev-java/jackson-core-${PV}:0
-	~dev-java/jackson-databind-${PV}:0
+	~dev-java/jackson-databind-${PV}.1:0
 	>=dev-java/stax2-api-4.2.1-r1:0
 	dev-java/woodstox-core:0
 "
diff --git a/dev-java/jackson-dataformat-yaml/Manifest b/dev-java/jackson-dataformat-yaml/Manifest
index d220cfb36e02..5e018fc29d0f 100644
--- a/dev-java/jackson-dataformat-yaml/Manifest
+++ b/dev-java/jackson-dataformat-yaml/Manifest
@@ -1,5 +1,5 @@
 DIST jackson-dataformats-text-2.13.3.tar.gz 3528981 BLAKE2B 98593f45e663905c15ab5cb37152c95d69a0121515990fac0c66f640d93af83cd51802e2856a4e8df6b82c0121ac4fcd20774fd6a3841e019e1da56c599ed9a9 SHA512 77fad3e6ab5ad55d3a46ffaee3482e9f0dbfa36ce67d5ad31e0b7cde667536387f1dce5bc8296733a28efb09f423785aca7291d9ba85a67ca2b94ef4c8766d7f
 DIST jackson-dataformats-text-2.13.4.tar.gz 3530892 BLAKE2B 3cbfcbbd33aeac67476caa453b77c19a1da88a9fb9482360bf427af3f41d689a04fc1ecb28d4424c5bfd7436979f1b03c215ca88a0064338f53dfd169f288562 SHA512 792f416c7cabd639b42bd93205e55328ace53c093e59d57eeaedc27a61358527515031c70dd503702471a13237f6389ca118e453da0ab002e20a531885d58a11
 EBUILD jackson-dataformat-yaml-2.13.3-r1.ebuild 2206 BLAKE2B b1205fbeae520f8f86a70e313fdf39bcb37227c273d75b6c3eb7f45964a067b8f2bfc7d6bd4fd8efbdb21ad9e840f84d386bf9238e7d2c4258630a0b77d60b26 SHA512 702a3a3403e78e03bda687d69df16c2f2507b924decfae2a76860671f3d93cd82abb1d07e6736ab3f2368bff107e0cdc2901910faf042ee55e37156173414d3e
-EBUILD jackson-dataformat-yaml-2.13.4.ebuild 2210 BLAKE2B 9c3bc36cb34e785ccd1897fbb07ddf6872eab2c96502eca6ff7ab2cc565b10cb11c9a88bbc874843b7de4b45b35670ecf85beb9394656e0c0b1a33a4268d3af0 SHA512 9596a0150f83d94e9bc40bc3aad39101c2c935c347e7afdd8350f758704b584658d0bfd93b72e02a3bc4b5b1debeec77fdc85ce8bce2d78418b376d3c6f0e328
+EBUILD jackson-dataformat-yaml-2.13.4-r1.ebuild 2202 BLAKE2B a85b320e9aedb78c74ec48dfd76df2d19a62fcaef41aba67c0b64fbd433a7bfff4e413dba5b18443ef5d37239bd77a0a2301dceb0e88b43e4d6becf9d610e6b1 SHA512 cf49363052bf0f5d7ef9e97ab29d7bcbdcf666998f0f0f89326d08aaffc9aa40e34aad5bebadbbca50d78bf00c7c0655ac1d80f707138e1e62fb77cd2adf2de4
 MISC metadata.xml 398 BLAKE2B 35f92ae137b3d4f6528c3987d1f9a4e8a1492688a687b4fb133b9ac5c02e6dcbde37807569463d8eebf26c078f55199e5848efcd6e11104599e5895044b61d8d SHA512 621d9b0635a22bed22305b4a7724e96beefdb57ff6b2553612f3e4feeeef080d02bc48dd0fcf3cbb3a2f4723c89bf8824f18adff1501fd3876c73e4e85fa20f1
diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4-r1.ebuild
index 56fbfba3fd2a..48c48d9ac0fe 100644
--- a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4.ebuild
+++ b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4-r1.ebuild
@@ -22,8 +22,8 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 DEPEND="
 	~dev-java/jackson-core-${PV}:0
-	~dev-java/jackson-databind-${PV}:0
-	>=dev-java/snakeyaml-1.30-r1:0
+	~dev-java/jackson-databind-${PV}.1:0
+	dev-java/snakeyaml:0
 	>=virtual/jdk-11:*
 "
 
diff --git a/dev-java/jackson-module-jakarta-xmlbind/Manifest b/dev-java/jackson-module-jakarta-xmlbind/Manifest
index 6b46658ef971..a1e9bac7e812 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/Manifest
+++ b/dev-java/jackson-module-jakarta-xmlbind/Manifest
@@ -1,5 +1,5 @@
 DIST jackson-module-jakarta-xmlbind-2.13.3.tar.gz 2145569 BLAKE2B 13864e4272d40e8425232482a67a2bc720ff294e93ec623589bd0b7286e2c63c2b724bc1033eb19437cdea23db0b11142380715fc300c32e8af9dba22eeed407 SHA512 2807a9e1d3531f3553a2ab6bb64e0ece2809ca9d2facae320dbd38efe0797cdc7ab11e9b284122d75a98a50eda9bc0cfb0f098ca0921e3bf67a0e38b5252a14d
 DIST jackson-module-jakarta-xmlbind-2.13.4.tar.gz 2146134 BLAKE2B ae20a115464a052a8403172706025fc595d6e6aeafda60cf3cce784e1e0a29f38d672fb5205e9dbd74de1ef9615f3bfd0268711d9992c123cac0ef692e59be3a SHA512 0706566a9e5e68697d54319a425fde53948ad610a6eb9519d2e02d375ea280468c7e9e3d5ff4378535ed3a71480f207257a558f73819b1b81edc69f9d3c317a8
 EBUILD jackson-module-jakarta-xmlbind-2.13.3-r1.ebuild 2883 BLAKE2B 6e7d8a279484b1a7f05b161ed31b008527d8d7e6c5c2ca6574dd3e172bde39a02aee6f88116efbff79d8e581b2153bc0eef65f68d01c964f9249156eda2f582b SHA512 2ff9cffc503d756e7867e156b4b78fb50379ca41de648db4f7635587b4e161252e0800b56c94fe00adf5078ee61638b74c15a43cdd55cd9044357b85543476c5
-EBUILD jackson-module-jakarta-xmlbind-2.13.4.ebuild 2813 BLAKE2B c1e382f09ef17369e967177819c3104b3581c940f252ec711c8373f8c1769bd7664915d90e202ba25047a7a62d5ef24b77e8faba6a93d398ca9326be5bdf3513 SHA512 eea8389caa1fa772b94d43441f42004c9efcd935818281030cf451e2c351782c0a81a2a964d524a852ba6933406d71991dc38111ba0c5e0d5086184590ec0a16
+EBUILD jackson-module-jakarta-xmlbind-2.13.4-r1.ebuild 2815 BLAKE2B 91224da0786fbac84068f88b7188f1563b88664ebd9256a975b52d618ba838e72d124120728a701b51862cd8edcb24685bff78ef4265d79f37310f7658f18d95 SHA512 564818855f0f99411997b94bbf557beb78fd7b412e1ef7b5df5f51ffae8a23ec3d879c85ab2edf73b05c9cd35dcdcccedea7676bef27d0a16e788c7b70b73922
 MISC metadata.xml 506 BLAKE2B 4e62bddea5ad8f7e6b73de9a173dbc8416b309caf4e4f9801496712f1cc88bdab646d237e48c3f55c99d95c198056b6642cf19070805f694b3a8e996e9bd0528 SHA512 96825b1a8ec0808f4dfa4a2482a1c184acab23d624ab178be8df496c67ff3ca5cd7cf012e6e7017721a3355a6ff3265d6f76734a655bfb261d3530781825f5d5
diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4-r1.ebuild
index cced241a8774..d4c1788b9113 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4.ebuild
+++ b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4-r1.ebuild
@@ -31,7 +31,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 CP_DEPEND="
 	~dev-java/jackson-annotations-${PV}:2
 	~dev-java/jackson-core-${PV}:0
-	~dev-java/jackson-databind-${PV}:0
+	~dev-java/jackson-databind-${PV}.1:0
 	dev-java/jakarta-activation:1
 	dev-java/jaxb-api:4
 "
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 5eccc4550c35..5e1dd28dcadb 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 68f53bbaf357..31e46f5155ac 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,10 +1,12 @@
 DIST libxml2-2.10.2.tar.xz 2636304 BLAKE2B 3ccc11ac73a81ee7ea3e565597c95e74923eba3d858c9a915aecf1dcf2fb6ab3e46c6ed2ea504261a822de2ac2132834ffa8ffd039e9e1390a9637a2dac7d6c5 SHA512 c26ee428ae2fae2326fcaec156ed36c5f5d63aeb4839d626f6544a3fad158a1602e9dc0d542b2f947e6a8de0c09ff130da2626a30aec27446ce09614f78466b5
+DIST libxml2-2.10.3.tar.xz 2639908 BLAKE2B aef2cc87e4632ddc478ff719155fdcb17601a8af37ecc1145ca05e01340935b57f07722e016ca2b27e4b269d47bd2fe97db09119a47849e8745e077e42b8bb66 SHA512 33bb87ae9a45c475c3de09477e5d94840d8f687f893ef7839408bc7267e57611c4f2b863ed8ec819a4b5f1ebd6a122db9f6054c73bceed427d37f3e67f62620c
 DIST libxml2-2.9.14-patches-r0.tar.bz2 8304 BLAKE2B 067faba5bfcbf81e2ef356925c0d3b4ef0aff7604db049366180b8217b781c60c2746be348c5e1a09de925e54fc69e3e431f7e2199ce326b6ff88ea9352ca45c SHA512 e97bada92a14ef0501a5f7be312d35d26eb52b648102d028dc11b3eef62ee0597540d0b474f54bd015a914a9cb7600d4dc34912b0ead5230136e945d80ae8428
 DIST libxml2-2.9.14.tar.xz 3129968 BLAKE2B ab584503d5209e4aaf41ae6f44aed5e94c0ae29e28cfba39a9012568aa97515af861b47891b84d2a352a07357626ba50ddb1e344e911fa14ff2ce93c5beff1f1 SHA512 d08e6cafb289c499fdc5b3a12181e032a34f7a249bc66758859f964d3e71e19fd69be79921e1a9d8ab1e692d15b13f5fae95eeb10c3236974d89e218f5107606
 DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
 EBUILD libxml2-2.10.2.ebuild 5335 BLAKE2B 46ade566ce046d0cf524741064b8e4f365f3df13c709cf6897feb91c3d71197a98f1a26ee41081dc92a79ec13cdbca57e948ac5a18bf8207d91ee307e3b07dc9 SHA512 7ea53bd001bb838007665254d02cdd1ba7ab5ab7ee6d5c056d7406dd799d215a3bcfcbc6a053a5e0e7a7f5552d74189ff66bacbc0e65d9bdbfabf953b5dbcd51
+EBUILD libxml2-2.10.3.ebuild 5343 BLAKE2B 64d792ad51b340afdba62613c4e565ac6c8b2557dc16a0843df4bef23573d28c4ea41e212c72dbaebac82ed2b3bc494689f98800c6e56e949b5f436c51924193 SHA512 b4ea90b16cdd78a46ba4f1591416c7ddd100cd97d2e4f2a0296812581a38db33de922c7a9793bfb81ad286830b416dcb071dc216826fa1b375e102cbe0fa6760
 EBUILD libxml2-2.9.14-r1.ebuild 5029 BLAKE2B 74875e62eede1a5dcacecbd383cc33cf95ef21f49998b88ee88166ddf659f1241840a44412118a3a2a59af6d1438c74e10beadf709ee8da8b826ca1d60e553f1 SHA512 61eac30dfcafe2daf7aa36c85d2c6803e9f44514138d087954ccd626a390056e8018c578880506f171bd4d6865ae22bcf492d5f01acd87ab77d992636cbd9827
 EBUILD libxml2-9999.ebuild 5343 BLAKE2B 64d792ad51b340afdba62613c4e565ac6c8b2557dc16a0843df4bef23573d28c4ea41e212c72dbaebac82ed2b3bc494689f98800c6e56e949b5f436c51924193 SHA512 b4ea90b16cdd78a46ba4f1591416c7ddd100cd97d2e4f2a0296812581a38db33de922c7a9793bfb81ad286830b416dcb071dc216826fa1b375e102cbe0fa6760
 MISC metadata.xml 458 BLAKE2B 318644d7202e85490c0b2f7a6fd36744cce5e4fa8929534149823d679a7fd01d118b9653ea5039c9e82b7cdcd423bf4541313cf550027ccfab8393f0b9b8ceca SHA512 b173246c3ec8351343bbe16f5572728ce6c6740056a0cf96e9eb4d975c181d54213d06c41ada9c38ac11727359d14d453cd1e824b29a52f7291a7ee50bfa5ed0
diff --git a/dev-libs/libxml2/libxml2-2.10.3.ebuild b/dev-libs/libxml2/libxml2-2.10.3.ebuild
new file mode 100644
index 000000000000..b8f7fa168857
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.10.3.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: Please bump in sync with dev-libs/libxslt
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="xml(+)"
+inherit flag-o-matic python-r1 multilib-minimal
+
+XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
+XSTS_NAME_1="xmlschema2002-01-16"
+XSTS_NAME_2="xmlschema2004-01-14"
+XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
+XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
+XMLCONF_TARBALL="xmlts20130923.tar.gz"
+
+DESCRIPTION="XML C parser and toolkit"
+HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2"
+	inherit autotools git-r3
+else
+	inherit gnome.org libtool
+	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
+
+SRC_URI+="
+	test? (
+		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
+		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
+		https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
+	)"
+S="${WORKDIR}/${PN}-${PV%_rc*}"
+
+LICENSE="MIT"
+SLOT="2"
+IUSE="debug examples +ftp icu lzma +python readline static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+if [[ ${PV} == 9999 ]] ; then
+	BDEPEND+=" dev-util/gtk-doc-am"
+fi
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xml2-config
+)
+
+DOCS=( NEWS README.md TODO TODO_SCHEMAS python/TODO )
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		local tarname=${P/_rc/-rc}.tar.xz
+
+		# ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
+		# as they are needed as tarballs in ${S}/xstc instead and not unpacked
+		unpack ${tarname}
+
+		if [[ -n ${PATCHSET_VERSION} ]] ; then
+			unpack ${PN}-${PATCHSET_VERSION}.tar.bz2
+		fi
+	fi
+
+	cd "${S}" || die
+
+	if use test ; then
+		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
+			"${DISTDIR}/${XSTS_TARBALL_2}" \
+			"${S}"/xstc/ \
+			|| die "Failed to install test tarballs"
+		unpack ${XMLCONF_TARBALL}
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	else
+		# Please do not remove, as else we get references to PORTAGE_TMPDIR
+		# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
+		elibtoolize
+	fi
+}
+
+multilib_src_configure() {
+	# Filter seemingly problematic CFLAGS (bug #26320)
+	filter-flags -fprefetch-loop-arrays -funroll-loops
+
+	# Notes:
+	# The meaning of the 'debug' USE flag does not apply to the --with-debug
+	# switch (enabling the libxml2 debug module). See bug #100898.
+	libxml2_configure() {
+		ECONF_SOURCE="${S}" econf \
+			--enable-ipv6 \
+			$(use_with ftp) \
+			$(use_with debug run-debug) \
+			$(use_with icu) \
+			$(use_with lzma) \
+			$(use_enable static-libs static) \
+			$(multilib_native_use_with readline) \
+			$(multilib_native_use_with readline history) \
+			"$@"
+	}
+
+	# Build python bindings separately
+	libxml2_configure --without-python
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_configure --with-python
+}
+
+libxml2_py_emake() {
+	pushd "${BUILD_DIR}"/python >/dev/null || die
+
+	emake top_builddir="${NATIVE_BUILD_DIR}" "$@"
+
+	popd >/dev/null || die
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use python ; then
+		NATIVE_BUILD_DIR="${BUILD_DIR}"
+		python_foreach_impl run_in_build_dir libxml2_py_emake all
+	fi
+}
+
+multilib_src_test() {
+	ln -s "${S}"/xmlconf || die
+
+	emake check
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_py_emake check
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install
+
+	# Hack until automake release is made for the optimise fix
+	# https://git.savannah.gnu.org/cgit/automake.git/commit/?id=bde43d0481ff540418271ac37012a574a4fcf097
+	multilib_is_native_abi && use python && python_foreach_impl python_optimize
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use examples ; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
+		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die
+	fi
+
+	rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
+	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
+	if [[ -n "${ROOT}" ]]; then
+		elog "Skipping XML catalog creation for stage building (bug #208887)."
+	else
+		# Need an XML catalog, so no-one writes to a non-existent one
+		CATALOG="${EROOT}/etc/xml/catalog"
+
+		# We don't want to clobber an existing catalog though,
+		# only ensure that one is there
+		# <obz@gentoo.org>
+		if [[ ! -e "${CATALOG}" ]]; then
+			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
+			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
+			einfo "Created XML catalog in ${CATALOG}"
+		fi
+	fi
+}
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 1cf392446e75..c61fcd27e740 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/base_bigstring/Manifest b/dev-ml/base_bigstring/Manifest
index 020063858e31..15dfe1f12219 100644
--- a/dev-ml/base_bigstring/Manifest
+++ b/dev-ml/base_bigstring/Manifest
@@ -1,5 +1,5 @@
 DIST base_bigstring-0.14.0.tar.gz 16579 BLAKE2B 4708fc425b9a4fb534b10b3536eca11bfd4ed8374319f9be09aa981d1a2a24433a25b62cb3faae459a0a633a2ebe6c15a28c2c15251f2ec9505c35528715de16 SHA512 d60bfd1989a29e4c1359722d4c0e2ec382c6d4f3c763b9b80980f38b51419bdf9d30bd9f8ca9cfbc33064458415e227c9f4077d9746ffc13cb4cd5ec8e221fc4
 DIST base_bigstring-0.15.0.tar.gz 17266 BLAKE2B f557fd8d46ad33afb89f50f914c76b287b19c8ee33a620c6a1def5379d59dd7f73b531c4077a3c7ce9e2cefbf6f71c7e49b3dd21213c68507bd19b0c90c44bf5 SHA512 d8311312ea1b3dc3a1a30c87ba4984438ca2c81f8da9cbb7f111dd74fb9b16ad8226166ae2fc2b572a989af15099b07294a667646b0ab22130de4406da53230b
-EBUILD base_bigstring-0.14.0.ebuild 541 BLAKE2B 25cbdd9524af4588b54b8ec77c03a79bbc356caf4008286de7237a7f3320b2c8a5a2fa079ff0d5ecdd09199c867bcdd9b998f429a86bdc234f1756c964f4637c SHA512 5c4433b2494615a987d8d57692bd944029a18055eaceb6be152d2c46f913448e39862c5c387fa27caa32c245e52d1439b4ee1d8a3432808e4805fb273b448b61
+EBUILD base_bigstring-0.14.0.ebuild 570 BLAKE2B 5bf996b482f5a85c15dc979f8508baad3f62dc4221279b14f917c8fc66eaeb23f70eab0759400cb8c4047078d6be4e83496ad280090476e86617335552cb2ed2 SHA512 39db0d55a9ee07a50f01bb482497533926d93d1c1836420cc418bd942f2bd39ab182206859fd0ea2a33f9773cdf3495a3e82eaa584ff2b5eff93c0bbb7c08e88
 EBUILD base_bigstring-0.15.0.ebuild 505 BLAKE2B 5145ab4b7aa4be0039f37dbb48438da26c3b7b674292d6d787ed52b13f7a64bee4775ce86f46ad1d9c1f9dfeded44c3ecc8d55acfcdd6d538f001abc52dfcfb8 SHA512 f93c712dc7a991e9952d384e7a9c2eb0c9b6abbf489f3cddd6b5be58f0508e2cdb2805d5a7c8a1f91297c2ab4cd15dec8cff5f4cf02c065d53ba84a9788cc141
 MISC metadata.xml 323 BLAKE2B 3729ce1b400ce788ad528fc85ab4c404b3a02a35051f1d73059878ca255fccdbca77cecc62dd1f1172452c4879b5dfa633acc4e5cfdfa3275f7fc4eab80db3e1 SHA512 a1f3fde83f77f720641d14178a1711ce34bae7e4de33a40aa26dd2d56042722019bb5f71011a6a516874013fd7925407fbf2f60ace38b006e00bf45b54c75f13
diff --git a/dev-ml/base_bigstring/base_bigstring-0.14.0.ebuild b/dev-ml/base_bigstring/base_bigstring-0.14.0.ebuild
index 6c657056d29f..f6a9882fea4b 100644
--- a/dev-ml/base_bigstring/base_bigstring-0.14.0.ebuild
+++ b/dev-ml/base_bigstring/base_bigstring-0.14.0.ebuild
@@ -18,5 +18,6 @@ DEPEND="
 	>=dev-lang/ocaml-4.08.0:=[ocamlopt=]
 	dev-ml/base:=
 	dev-ml/ppx_jane:=
+	=dev-ml/ppx_compare-0.14*:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/core_kernel/Manifest b/dev-ml/core_kernel/Manifest
index e0f3e2804740..50d22c7c51b9 100644
--- a/dev-ml/core_kernel/Manifest
+++ b/dev-ml/core_kernel/Manifest
@@ -2,6 +2,6 @@ DIST core_kernel-0.14.1.tar.gz 701832 BLAKE2B 0463641f8ab663f00dff59e1ac0b9693f1
 DIST core_kernel-0.14.2.tar.gz 701911 BLAKE2B e784d6d8f53df03ffb56075a43bdfc82d5099740c4eebdfdebe196cb3c97211b95892af18ab0f69b3143a873962fa74afe09a961ad851fb8eb4f30287e538157 SHA512 d0f719734d920d98c55ac7d1aa8ab5b3de7a3896f6cd8b1ffc5147c689f072361e79045a0b34c1f5359dbf492e612eabd613c4724fe60d45345c2944dcdcf6de
 DIST core_kernel-0.15.0.tar.gz 265183 BLAKE2B b1e67e8a84e1abbb23ccfb65c8320e36b3b2f91be3c2aa02e73b53c411e80da65c34b69d538d027417a52fd1dbb1a2217b9020d86ae00237ebaf3e7c06b35e42 SHA512 da28f11374fda2e869b5ef3f7131461c6d896b52413654f2aeb7c74bc77ba4a8e2a25830eb3e3ef393e0bbae903db20f54773b356c53cab75c1bba1b9ce265bc
 EBUILD core_kernel-0.14.1-r3.ebuild 998 BLAKE2B cc838516b4f7052e611a331d1edcddc203e3234cfd43bef834a7be23c188b52b1c7ab97d30152fbbbcdae749d1d6ebeb68f5c784f618f3fd51f89320c5beb075 SHA512 1a79e711ac27c6479cec85197ad80a9313b7fb72f8ce1c647e110e62a560978540074abeee6048e766e467a82f54c2bf88e0da5945c60a410a08498ede0f9de7
-EBUILD core_kernel-0.14.2-r1.ebuild 1047 BLAKE2B dc75e7459bbbb8068527f7ad929a58d1184bb9745af9f21d80680c02fddc66bbfac452f7712619c48c879c53322f5e0ce453abe7448ead7a8bf1a023fbc42082 SHA512 8f69c997a06e41569cc391441a2a0d90feabd3e0658d50156481992e425bd8bf621f85fad0c9b74db220e0d1e306f13ac1610898a7a4b1de44639410ffb5eacf
+EBUILD core_kernel-0.14.2-r1.ebuild 1075 BLAKE2B 0a88db73c4a3a93e948d624e235d72ba70fc5e960ae68c3472881a537ff0fa5d0690861824fd7e501e9ac384b9a93b6c3b17c600686221a83d1be73d4b1dd8d9 SHA512 b4d1ddd8a0f1e8762786c6b23fafcb388c20e7fcd842e51a876204993942b90a328f8ef36f7f81a9cf981d64f4a2d5d93f436642fb93be761d103da062737224
 EBUILD core_kernel-0.15.0.ebuild 581 BLAKE2B 2333aa98090f65136b984d4887f5e5309f3999cee4cbd221bdeb1d3c5e4ed4cb6b518097cfe0aee758210eb13a35c7d2b24932d8608e3b9e6724a2176cfcda24 SHA512 a22b95ee15cfabdf6abb5e288b0b5be25e463797dd93019a73c27174b37a9307647b4d9aaae893e040ae1bba346d3a1edc4398f90ff313af9d46062f9d7ffb79
 MISC metadata.xml 640 BLAKE2B 411246c9f2ad1ba00a0475e8195d3b54a0ffd9b7c6804c10b482540e6c27d683451ed63d65f48e2dcab87a53a69fa6215590c8b2f8bb951266697df6226e44a9 SHA512 7854d4748ccc7833d4a029e8ee0fdef9d91c2552d916d77bfe171590a1de6c9e547675e04c886afe9b5b6de8c34e200f6e52a193213ae00ce70f5823fa363292
diff --git a/dev-ml/core_kernel/core_kernel-0.14.2-r1.ebuild b/dev-ml/core_kernel/core_kernel-0.14.2-r1.ebuild
index 07c3dc02331e..d06daee72080 100644
--- a/dev-ml/core_kernel/core_kernel-0.14.2-r1.ebuild
+++ b/dev-ml/core_kernel/core_kernel-0.14.2-r1.ebuild
@@ -22,15 +22,15 @@ RDEPEND="
 	<dev-ml/jst-config-0.15.0
 	>=dev-ml/ppx_optcomp-0.14.3:=
 	dev-ml/base:=
-	dev-ml/base_bigstring:=
+	=dev-ml/base_bigstring-0.14*:=
 	dev-ml/base_quickcheck:=
 	dev-ml/bin_prot:=
 	dev-ml/fieldslib:=
 	dev-ml/jane-street-headers:=
 	dev-ml/ocaml-migrate-parsetree:=
-	dev-ml/ppx_assert:=
-	dev-ml/ppx_base:=
-	dev-ml/ppx_hash:=
+	=dev-ml/ppx_assert-0.14*:=
+	=dev-ml/ppx_base-0.14*:=
+	=dev-ml/ppx_hash-0.14*:=
 	dev-ml/ppx_inline_test:=
 	dev-ml/ppx_jane:=
 	dev-ml/ppx_sexp_conv:=
diff --git a/dev-ml/jst-config/Manifest b/dev-ml/jst-config/Manifest
index edf7c0981467..d0a0e024503b 100644
--- a/dev-ml/jst-config/Manifest
+++ b/dev-ml/jst-config/Manifest
@@ -2,6 +2,6 @@ DIST jst-config-0.14.0.tar.gz 4916 BLAKE2B e052cf9aad6e7bef737cd39643663b4577cff
 DIST jst-config-0.14.1.tar.gz 4931 BLAKE2B b24aefa5f4e0b76c3cfd1ecbb9ae7789891db8ade236f6071b814dc3d4be6d94ad39b2d0808ca81a633f2b7a31db18b530c73a7a0c43c65f4ddc8abe90adddd6 SHA512 0a43ba941c2915afb30b3cdc09c3c83e05d5b1367bf89aaa4b3adb72878c8435e07838bcf345452c25482d7621d2a7277b92328a2a8842ec172d4bf73005d9c2
 DIST jst-config-0.15.0.tar.gz 4865 BLAKE2B 165a6aef50f20ed5e71c8211c2ba47dcc03ab7244c692bf3f369b02b8ce0dcfa61bce36d0c93fb5c95fd35883e94621532776c625483e3e692336812eb3183c9 SHA512 59482feb5b02dc09c2cff2154105bc7e162e5788ee357a8663dc8e76eb33ab729e9ba34b2f2a3e49b17fc6e279a6927c2024a32b081b4059b438de81fb1a3790
 EBUILD jst-config-0.14.0.ebuild 537 BLAKE2B 3733f37f016cd7755e1324366bf56a6643ee2259372242a16cc368d8aa8428dffa7fa5261c179348db6101fb65c165bdbc25a59e42528fae1de98558c17b767c SHA512 888d8622b260197646dc1d9e87412cccb80de80549c4e04f96a49513924028ea5217455cb647e59bd30d7f826e37b6f3992802cec83350c2b1698cd66ecaf1eb
-EBUILD jst-config-0.14.1.ebuild 535 BLAKE2B ab8249dc0deac947976d356f4d883a56748b591f295f8fe99b0b34bae60dbcb1291ed49ef6255afd1cbfcfacaa242b6687680cd3d99589e008fa330b90a0fa8f SHA512 15c488168e103aff99d8d60fc2a9168d937380d7568a3629f8c7b6fa20438a2424b929aec292e96d425bd218be11a3a1432cfc889aae7239ab41210d7af54257
+EBUILD jst-config-0.14.1.ebuild 542 BLAKE2B b991afdc7d7b013ca176612070909ccc50294eb963bbc0243d2e96d0f0e994090efbabddb9c69473fb825448647b0ccfb2e6e509af597a5c26126181a03cf1fa SHA512 f5640ed8e020e3d0628bdbc35ab131cd95ade5f86c39d273f3a80296e68be31a1554f7caa1a726f4a2a1df7f1b527ecf8087b87154935a7d5ce587483ce635c5
 EBUILD jst-config-0.15.0-r1.ebuild 551 BLAKE2B ff7406d512144d3107b7fde4d96e02443e7ddf0ab5cff3623ffb10401eac48cd039d2701559ec90672bde584aeac472d015fcd76fa6a17e2f506a0fc03e6f1f3 SHA512 a573407ccc79d6746f00ccf8a5bf8ff5a8f303d3e3ec499c0d8e319a52676c03045464d2d6991800a938f9f9b51c983a5ac94d32867b5f1e610f92e0e9c4d8e4
 MISC metadata.xml 424 BLAKE2B d9fc3127f735edee73ce9922a043dca9bdea8ac03cc61c3a492e3ad5598dffe92d147ea3e817e031c14c34fe69a0b15261ebdc64c5b9a4c9916fbbbbbedd411c SHA512 9f645aefbd7e1d14045c077cf78522e7ddad61c1f35bbf1ea5f31ab19a2973340163ababdfce8c27d79cefe3a866dfb95e7b889a81cbf364380f585f0c25b96f
diff --git a/dev-ml/jst-config/jst-config-0.14.1.ebuild b/dev-ml/jst-config/jst-config-0.14.1.ebuild
index 17ae2234d2b2..060b6d0ab022 100644
--- a/dev-ml/jst-config/jst-config-0.14.1.ebuild
+++ b/dev-ml/jst-config/jst-config-0.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt"
 
 DEPEND="
-	dev-ml/base:=
+	=dev-ml/base-0.14*:=
 	dev-ml/ppx_assert:=
 	dev-ml/stdio:=
 	dev-ml/dune-configurator:=
diff --git a/dev-ml/sexplib/Manifest b/dev-ml/sexplib/Manifest
index 5e3872a3af65..8a109e43e378 100644
--- a/dev-ml/sexplib/Manifest
+++ b/dev-ml/sexplib/Manifest
@@ -1,5 +1,5 @@
 DIST sexplib-0.14.0.tar.gz 54055 BLAKE2B d0ee1470fb9d28eb6d6ed3aaf0f6bd63d7c4860183ac287054f08bc54d57d0c52ebf9fe516aa991d8c66967ecc6ad95b6a6d19eb40a9f610a6f91f832d9d2e20 SHA512 e77a9ae8991e6b73de57ab6b7068d6482471dd34ff0af23b93b5ba57bd69493d15db3279d3b328280f716e531c08c2a6c39bfaa886f1934240dcc13724673684
 DIST sexplib-0.15.0.tar.gz 55020 BLAKE2B 250d2d791abab87e18ad363dc2140d436cec90469156c2bd37d3de533dd219891bdc5e518d1a37eb8ee4e34f1ec5e924684f1408487d3080c5cfe4a0f32e2d69 SHA512 c31fed5e5bf48381a9b6a48085e7d8909471e38a8cc7586e3c520fe60c6df7a1eebcca1a0ca93cd4d1cc61c1c3c36211db05572273550f7218eb69dd97d27333
-EBUILD sexplib-0.14.0.ebuild 553 BLAKE2B 25077a84b940047a78f4e68ffa2dda12f5d8f3c65ed61eae5d839ca87df0abcfce113f588ed7b0eb1d4d35811662d63ceb8af7b66bdaafc446db88d0309c11c4 SHA512 59dc6b766e9e6c13a7daa024956cb023c288df82694390380e20ffc08c545c51ff96b8d7c0d03a5ad28a7342e35c729ddca9c5e3b7f6800197954ea7044ec2fd
+EBUILD sexplib-0.14.0.ebuild 566 BLAKE2B 3a525f96c1003b7ce00f0dc9e3cd8b64bdab635f6ef906e36df3d2eaf3e6d3bacd152f5cb626302d4d5daf43dc0870456e0b4044a63410f9a0ae66783bcf32cb SHA512 91bc3f706b183a780d0885f3db9e6eb4119fa3fda7d5347eecd86d428e931f1f74590ef2fd103b3dc90c0f98931e026250cf10f9a75ad306d0a2f238cc55689e
 EBUILD sexplib-0.15.0-r2.ebuild 581 BLAKE2B deedbbb3769a8efeec00405da6457e58e2a1460b646e52464cb9edbd835d0d24e463010b5364e83f6ba7df6e568de5785f6cdacad736f3b25aa0f1a179388487 SHA512 68035473a9b50a52c7fb06c4d1826ee653606380e2c6e40a04426854ee87e6d44f3b575c8ec05bf7d3d32047bfaf4d23bc778f66fbef35db122d8c74a2b3bdbf
 MISC metadata.xml 482 BLAKE2B cc8a4f1df9d0f76967f46c4e50af6a3355c99ab0138c3e804b60cc97f456e151431f80da3fbc8ee16d832da7fc529b8d06019f1b0613bf4c4ebaef7200f02d35 SHA512 32f96513ff47e289bb41c5864ff462d60f849c79bfbb796ec59ecb2aa4bfb82e14b32bc7caf1c05d333d963f723d99fd324c12aaeaedaf8f552e1800feac7254
diff --git a/dev-ml/sexplib/sexplib-0.14.0.ebuild b/dev-ml/sexplib/sexplib-0.14.0.ebuild
index d1cbba8e921d..97e96b2bc2d8 100644
--- a/dev-ml/sexplib/sexplib-0.14.0.ebuild
+++ b/dev-ml/sexplib/sexplib-0.14.0.ebuild
@@ -15,9 +15,9 @@ KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
-	dev-ml/parsexp:=
-		dev-ml/base:=
-	dev-ml/sexplib0:=
+	=dev-ml/parsexp-0.14*:=
+	dev-ml/base:=
+	dev-ml/sexplib0:0/0.14.0
 	dev-ml/num:=
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 72334e1ebe85..39412f46125f 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index c7c6d5a864cc..97b5af23eb56 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -9,5 +9,5 @@ EBUILD apsw-3.38.5_p1-r1.ebuild 1001 BLAKE2B 34e16dbb37cdac9e86a48591bd96e51b577
 EBUILD apsw-3.39.2.0.ebuild 934 BLAKE2B 674fbc4a2e7b517059bfe6a8a5ce340cee9e68d14720c9d36c57ede504042031c8c13814b50fded7b1555cfc0ad7d57592586e0131af7b3ac26375966e46c8a1 SHA512 b3e9c2dd7093303a6cf0331ee27a8aea618b4ea7214d4e59a13b4e47f9385fe413e3279888ca43147d7ec62169bca8cd5a23468829d74e726a683dd84887f83c
 EBUILD apsw-3.39.2.1-r1.ebuild 888 BLAKE2B c5c1aae0c720c20938f1b11210a0fca49ff5bf39e534d1d317a1b547fc6856e7a89b0c3b4f792b9576235ea3ac80cb1a252b26979f9e167b00a1eb9d8c02ab73 SHA512 0bc0cff0edfd3d21aaa75f621ee7088ff9847abfe1d6313646a22cca4ae896d48682849d33dd8e8d2057ceae0ad3433ac198608bbc8e83edaa4c2afcc8b1f7ef
 EBUILD apsw-3.39.3.0-r1.ebuild 1090 BLAKE2B ba8ed1a895736f1f1c79d402ee6699706baf2c58ad92482579b680e102dc9608794e48aa8e4fdba9215b69f8b1ca1390b474e738ba68b140e74fc62eb1f4f695 SHA512 b4e77726f65bba8df3599c35231ac3b2960fffb8db20321f78828ae0731c1be6c3fb3db86f1334738fb274cc835134ca3a5df01057d3587f4a033e620ac91e0f
-EBUILD apsw-3.39.4.0.ebuild 922 BLAKE2B 2e5ba86985a6bbfbe66af210c711ede39a125267c49ffcd470a26909942ec61f7521b67d27024426547d9ea01a08a3c22e53c846ffa9edd39f4ff03235581b90 SHA512 bc16789a3d3311f93f018881f0f50ccd0c4d983e5a41224c08305ff3985f4b18ffafe866fcc5916bf4ab3390f202d2bde06b750c4245b2d17bfc5ec3dc684ba2
+EBUILD apsw-3.39.4.0.ebuild 920 BLAKE2B d5aceb7b4d931bfcdb2a463dc1a93a6213c1094f08ef69e6ea370e5774f3a2a0d0500f60d29ef463124a0168252eef58e34ea53a768e68853da20f5d35492e76 SHA512 f26182561323982a3efcf248dc78336c897aebdaeb806a7caba6c22b56351c7a284810235c8b8311edf6358343d53744df8f75ca47868fc0a1cc7654f96cf488
 MISC metadata.xml 700 BLAKE2B 258344a1602daf3e081fdb4c94eda8af6e231def3f02fb80d63691b47d0a503c9caad80893386ce7ef42d6be2985906f3fc5cfedfe5a1044aee04c493f3d0683 SHA512 de73b4eb06d0bcf4c81e544a98ad15231b006d62fe22f6bce7e38740b941b98297fa1a38b00060ff83ae9f3259c5020c7071469f2a3f0d9e4f8f0301cb942081
diff --git a/dev-python/apsw/apsw-3.39.4.0.ebuild b/dev-python/apsw/apsw-3.39.4.0.ebuild
index f10a20ff8b30..50827e0db0df 100644
--- a/dev-python/apsw/apsw-3.39.4.0.ebuild
+++ b/dev-python/apsw/apsw-3.39.4.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 436162cde2b6..b15dc542d89f 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -79,6 +79,6 @@ 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 cryptography-37.0.4.ebuild 2950 BLAKE2B 7d98a035a5b8a31fe659936717c53acaa754003388556230a22cc38d53e893a13f7dafcf1bdd46401bd3387685b8d7cbedc7d51bdfbaff90a0a3a10a80163b4e SHA512 3831f1fa923220a92947aa98a826183b2675d41a67f8e514950f03421a39243ad52bc2f0ee0cf32b20d1f55a00850a7e70326cedd950d0467632c3590c9d48d9
-EBUILD cryptography-38.0.1.ebuild 3200 BLAKE2B faa7d9fc8f709098d3dfccf11d234bf8a9d96a20a1814824719f14d7d46d95aef2605ac561d6bc55eb6f0d8cc67159bb84c59468e3a67327ca485d074fc14f33 SHA512 3c666509d1ffb0c675d65e2503818e78f89503ca6d71aa07b3c4832171df5d86717ba0836e70480c175dfd736f413246f8b1d4ff261125dc737e63dac25f6237
+EBUILD cryptography-38.0.1.ebuild 3196 BLAKE2B b54efba7faa014a1c23f696888b9be854dbc5acce12a015bf63c1cebe196ad4281db4761151c5ea2fa6d736bf554c63efbed4d6ea2485ac4823da9d12f2db4f4 SHA512 33c45831a6ad185dfb4728af0f7780760484b431d7ec4468dd46dc1d67a25fe7aa9f981719179650a100f5df38f5ec1ac975684a7c612b9aba2486b7980246c1
 EBUILD cryptography-38.0.2.ebuild 3200 BLAKE2B faa7d9fc8f709098d3dfccf11d234bf8a9d96a20a1814824719f14d7d46d95aef2605ac561d6bc55eb6f0d8cc67159bb84c59468e3a67327ca485d074fc14f33 SHA512 3c666509d1ffb0c675d65e2503818e78f89503ca6d71aa07b3c4832171df5d86717ba0836e70480c175dfd736f413246f8b1d4ff261125dc737e63dac25f6237
 MISC metadata.xml 385 BLAKE2B 28c12f0c0303afca4d0fb015a1ed123efb559686e71477b3120291164a01f219c0dce373d7f4f7380ced372343945a8ee1ce875c27851d3864a468ba48eb2cc1 SHA512 f80a4794ae57fc9e434679ccdd0ff4cc5e2c4fb48274cca32316f827dd6d4cd3b903cb45f52abdd4893866987d4d1026f7ddb1efaa76cb99e0f55d01e8433b83
diff --git a/dev-python/cryptography/cryptography-38.0.1.ebuild b/dev-python/cryptography/cryptography-38.0.1.ebuild
index 62f6288176c9..26ed7b1643e0 100644
--- a/dev-python/cryptography/cryptography-38.0.1.ebuild
+++ b/dev-python/cryptography/cryptography-38.0.1.ebuild
@@ -84,7 +84,7 @@ SRC_URI="
 # extra licenses come from Rust deps
 LICENSE="Apache-2.0 BSD BSD-2 MIT Unicode-DFS-2016"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2o-r6:0=
diff --git a/dev-python/discogs-client/Manifest b/dev-python/discogs-client/Manifest
index e1ab387680e0..5042b9e7eed4 100644
--- a/dev-python/discogs-client/Manifest
+++ b/dev-python/discogs-client/Manifest
@@ -2,7 +2,7 @@ DIST python3-discogs-client-2.3.15.tar.gz 35059 BLAKE2B fe2b577b4810480fcad8a76c
 DIST python3-discogs-client-2.4.tar.gz 35724 BLAKE2B 98976cb4bd52c459ab63e5d178bc0a7eb2c6ee56ff866d2248b326423a9b7f5187ed348d3cfa67d2aa38b1f4cc107367351e40408b9f577ecec27f28724d9be3 SHA512 96a3f1e653c95751b790f58dae2efd7e33a1af581a945327704a31df96e99dad543ca978c4e42f6f05824f6f74ccfcf7fe5e59e46c82df1634a655581d833442
 DIST python3-discogs-client-2.5.tar.gz 36003 BLAKE2B e2350cc2eed986566be79ce3b529885113739da6b42f77dd405456e0552a68d51d1945f3ba569e05b9afc6304233a8b5ebe7c9f4f8105d62d9d159da7a0ff3ec SHA512 d6c90d6f0b472cdeda2a0d019386e3ab609ff46a82c3eefcd9b69162e1f94b34d58916dfb2364afb8cd9def0bf11e60cbed2e2c2dbb03206ea9a0faf141aa4ec
 EBUILD discogs-client-2.3.15.ebuild 806 BLAKE2B 8dc5825187f3d7b01170b84cc5b08b1b4cbe8cc8132a5c008ad72517008aaeed8f49fb9664d80a38039cf8b059332235a72eab23ba85e710f1af2ffb055daccb SHA512 7b53a0f9862008acccee946f5330fc0c41c73a9d63bc7dfa52ae69afbbea840b7f47107a67507a6378ec811b81becf36a0c5c19f37b9c26acc60444f446668cc
-EBUILD discogs-client-2.4.ebuild 807 BLAKE2B 56bd2663a88bd5e75db49b4f2f95eff171a93e5364cd49a0b8e41ecdc0010222d582eb8888391bc7f9f7509cd7db5ea7876d72a808be0287a530572db99df345 SHA512 6c2287c84b6ad91c585ca472cbc52ef32903e30bb2795924276ae539caaf0387787af0af50516a0e0a2176bb9d089aa5e9e5dd3db41b842ccec9283f2bd5c6bc
+EBUILD discogs-client-2.4.ebuild 806 BLAKE2B c1ca94cc5d6875a3a181d25751945b23991a508bba444046fd7377457a9951e0ec8f5138cf3d8d50cf24a8eef28b440efba0d90ea0f645831af540447f02dd50 SHA512 b9a49c4cc124b26108abc38247b72a3825cd9c74a4b1334e8e996d1514259da68af38953753d0a94231f413c55d7b441323417abbf7dfa9b6aeaf7278b53b06d
 EBUILD discogs-client-2.5.ebuild 807 BLAKE2B 56bd2663a88bd5e75db49b4f2f95eff171a93e5364cd49a0b8e41ecdc0010222d582eb8888391bc7f9f7509cd7db5ea7876d72a808be0287a530572db99df345 SHA512 6c2287c84b6ad91c585ca472cbc52ef32903e30bb2795924276ae539caaf0387787af0af50516a0e0a2176bb9d089aa5e9e5dd3db41b842ccec9283f2bd5c6bc
 EBUILD discogs-client-9999.ebuild 807 BLAKE2B 56bd2663a88bd5e75db49b4f2f95eff171a93e5364cd49a0b8e41ecdc0010222d582eb8888391bc7f9f7509cd7db5ea7876d72a808be0287a530572db99df345 SHA512 6c2287c84b6ad91c585ca472cbc52ef32903e30bb2795924276ae539caaf0387787af0af50516a0e0a2176bb9d089aa5e9e5dd3db41b842ccec9283f2bd5c6bc
 MISC metadata.xml 674 BLAKE2B 5c0dd431ad4633cbc7ddaa97e54e9f5b3eb67ed28e07ac313f218fd055e0042365c270e83153627decd196aca49db12304da87f2c74f20bc454fd8e5b4b8fb46 SHA512 ad582419be3887c5fa3c0d630ad32575f378453dd4f7a8c33df91db31b495caa88707214f7e456d69027532540a474c41ad8336b40e90229f1f31cd3193d7f82
diff --git a/dev-python/discogs-client/discogs-client-2.4.ebuild b/dev-python/discogs-client/discogs-client-2.4.ebuild
index c8b04833cbf4..259b45e3f147 100644
--- a/dev-python/discogs-client/discogs-client-2.4.ebuild
+++ b/dev-python/discogs-client/discogs-client-2.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/p/python3-${PN}/python3-${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}/python3-${P}"
 fi
 
diff --git a/dev-python/docutils-glep/Manifest b/dev-python/docutils-glep/Manifest
index 07bd26b438cc..6ca4bd52c491 100644
--- a/dev-python/docutils-glep/Manifest
+++ b/dev-python/docutils-glep/Manifest
@@ -1,5 +1,5 @@
 DIST docutils-glep-1.4.gh.tar.gz 6758 BLAKE2B 92b519022df5d8ac90b7eae15a08e0f0738badcc7018d8d621f9789ddfa97a0ad3989a39b65068ebd1e5ad90b2ddcbd6c4e953de06562391b12eaefebd60dd7a SHA512 601da0d0f7c4fdb2976755c8ca57e07b55b8d87e99735378a3dd5b1b43099d0fe2bb8317265d23e61b536b907901e75a3b527e16125dfaf2ccb178452e411af3
 DIST docutils-glep-1.5.gh.tar.gz 6826 BLAKE2B 09decf04f7978c86a2f7161ebfd858f6ff59450d8a22d22963fdea36bb595615337b2c7a565794d86128764512b6e3dda3a7db7124905c74c186513965117da3 SHA512 2d740b02a46265e27b3d0b82a8424bd66f875fdc3f9fb6c1596522e2924bb6484e028ad060af62e4f5747b4046fe850e3d7fdcc48e4bd0bf1c6e2851599dbbc8
 EBUILD docutils-glep-1.4.ebuild 747 BLAKE2B 00973eab85f01c4eaa2b0b8b4cd0da5d7ec55bd85924a35762148f037cba446227005f16bcc957f95b64c7ecc2b9dda316e92d398795363eed20c9550003466f SHA512 4106a3844e2c576fbcac8c1eb564d1aadd628962d1035ed143855cbf3c3c704bf372aaf48ccc7b19893b65f1e01f78deb564a4a858866b023b6b64dec613481e
-EBUILD docutils-glep-1.5.ebuild 753 BLAKE2B ce46beed58f9feb9f4432c23df7cb8943c112e693129fcd596eb22fb1b0dec30a3ee818ea13563efd41f5f994ef14789603a10db92218317800cac7214b6c345 SHA512 c2e7653b5ad2f09e184fbd5c10a2093bb5340f7bc92ffd23f0697e962e5a0a7104fbf948e3d47035ef6418866c6b794fb9411503648e8765a41c4c00b17b63e3
+EBUILD docutils-glep-1.5.ebuild 747 BLAKE2B 00973eab85f01c4eaa2b0b8b4cd0da5d7ec55bd85924a35762148f037cba446227005f16bcc957f95b64c7ecc2b9dda316e92d398795363eed20c9550003466f SHA512 4106a3844e2c576fbcac8c1eb564d1aadd628962d1035ed143855cbf3c3c704bf372aaf48ccc7b19893b65f1e01f78deb564a4a858866b023b6b64dec613481e
 MISC metadata.xml 509 BLAKE2B 8b84599af3e00a6941e4ced4b0c18b9634e18a0b336a6ebc9697ebeaed0b4262a055d2bcd92ed68b65d8ca91b5b2c3b01db4199b023524579211e3eb3e0e13b4 SHA512 757622b65088c34a2aa0a3bf45069107c828887f622ef993e343d2013694a7a0ad37c0217cd078677df2b5e0485313870b8478638ebcc2bcd2dc1c724a53169f
diff --git a/dev-python/docutils-glep/docutils-glep-1.5.ebuild b/dev-python/docutils-glep/docutils-glep-1.5.ebuild
index 5375a4c04382..3fd1068be959 100644
--- a/dev-python/docutils-glep/docutils-glep-1.5.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-1.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 7a1adb82392b..567b368c3488 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,5 +1,5 @@
 DIST SQLAlchemy-1.4.40.tar.gz 8277132 BLAKE2B fa4362a8abec9845beb3cdb65de4066a8a77a40518187a624af3207198395ae3702db5ca5f65970ec7485e8647bdc5a8685f5d9a3b772778c7d6ec66ad820dcf SHA512 49b8ad8becd6fb2c43615890ef05554ce151f44cda20971a585ff5b325a6a91bb356a3c4320f4b1ac877a9eccdca9bec65cc9942bc5948d4143495b5c884f458
 DIST SQLAlchemy-1.4.41.tar.gz 8281227 BLAKE2B 31fb2bfcb41ceefc2c6ed70444b5d8b38a862e06899dd9b5ede7fde0b624ce9f8be766028aaf32b36983268c35e61d87ada5a597260fb97efe72bfc27ce15a71 SHA512 f03a2d4d61a108b4091a4d2ccf2bf49ea22e6c30fcbd70758f89dc3817968e7b5ffa603ce0158812fe42814cd08bbadd00079609a47765d3c534d769835a5543
 EBUILD sqlalchemy-1.4.40.ebuild 2617 BLAKE2B 8463ac4ba31b500c01b444cd7b305f2c4dfcc9e39752e68fa0d82b6e7a45a34c55fb72fc87e36035139c714dd5c74fdce6a9f7c9f5c39aa1e4b52b1c0695333b SHA512 53105444a9d92f70b4823ba420d533358c609f6e567911fbe1231eb791d552f6d2a34540718c2ed224b1fdb54d09df7faa04eb9f0684322cb11853b28eadd4f7
-EBUILD sqlalchemy-1.4.41.ebuild 2698 BLAKE2B b1ff340d3abdc039f3d72a031e2157087dbe6eca30d8e56c147c5556366446aad8774665bea45c7f797ff07d016a51edc1282f08d52585f76a7859961fea90f6 SHA512 fca4a89adf8fbf44103d33c0443928c7e368c8a7e0b82bf3c82e5712ae54a25a9b98c2a13d0d751839bd91dcb6ab9f3aca301eddafe1d973d3cb1973f50afac0
+EBUILD sqlalchemy-1.4.41.ebuild 2692 BLAKE2B 34242df19fc61d2f22b56bb0903bd752ed618885f99d57762c9c0addae40f8018bd63c92b51e1f1fba55474814a4c98b01f7c849dbbf2b906cf767c34fc1ecc5 SHA512 8330cad3f238d3e67ada8987e02270bb25cce524b55f650c8bbbec2f606307c8b6ce44abd5c550050fe2dee09159fba8c0c1f9b7904a02ae636114486b80c57c
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.41.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.41.ebuild
index 8291064f7c0b..6de370b3641f 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.41.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.41.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 BDEPEND="
diff --git a/dev-python/termcolor/Manifest b/dev-python/termcolor/Manifest
index 93008689f975..c6107631a9d3 100644
--- a/dev-python/termcolor/Manifest
+++ b/dev-python/termcolor/Manifest
@@ -2,6 +2,6 @@ DIST termcolor-1.1.0.tar.gz 3912 BLAKE2B 8d661a708eff02894b6e390befddaef1c9d14f7
 DIST termcolor-2.0.0.tar.gz 9701 BLAKE2B 3c1d81b21788c07870724ca162828037eee11b2c472fbe4cf9c60583155a0eb665c59bbab824882038f453d539b2c3c8518b51e373deb9755205b41b517d8ed3 SHA512 3b5f937c94ba3c0eac04073851fa53123262b3de4e081635069ebd2115b51cf37f88bf129f19d356886487cbeda381921022e52b560b7cbc8a9d935bc902dc6e
 DIST termcolor-2.0.1.tar.gz 9693 BLAKE2B 68592597da70957bd3f03a9a76e546ab17f7c437d00aca53325a617b02c5600679c9912c0ca8d9f7ade03a042cd657e86b1e12a588ec1eeafdfa57f3f5f16372 SHA512 e49f05e587fb420aa373d1644d66e4832a701385fc1da85470fa0d811770f73908ca139e1c1e9cb968cbc74285b038833f371854edc6e20bc22059b31ef1a1ed
 EBUILD termcolor-1.1.0-r3.ebuild 547 BLAKE2B 17a7d7c1abb51c1135317a5730e151167374fba5d4e586e09a5d1e02ed8f9b7bdb2772cb61b15cd68661394de6d971f428b02bb6e61080197a162ba8548b09ae SHA512 29d4fc140d1c01815bb6e3f0e71ebe94671d5118df54370787344eafcdb88a4cc9ad4f82d4de508495832924f902350af15a260711d662f68ff1631597bcdadf
-EBUILD termcolor-2.0.0.ebuild 651 BLAKE2B f0e9bfb2fa403d17cce7b1167c008f973597c24148746d114346913f808f73fea68e6f16e7a02c76f35102e5dbab3e45ea4665f3f7f583a389c33c8df05994f1 SHA512 437a9d9fe3e27b9473ec8f89ae70e7a104987e8615bc43634b61938e3ed910ec25bcab1ee28cf4c47a647b41eaa0b1005e5bca95274f676e30370408c76a1dc7
+EBUILD termcolor-2.0.0.ebuild 643 BLAKE2B ea79175a88c94c4b9530e43b04b4e5da9ab22db6e00718163eed343d39a4f156736414f20fa6de77e957b96299dd2ac2d9cf923d1e75d41ae60e0fdb6ee9fff8 SHA512 bce8238eabe15a6ee0dcc328ccc45799e1a0ac510d0cd8c5c532d56302a95b045743698d2381f2aa7d6068641db3d3e030ca6e5d3a00010516b5155b5d28c667
 EBUILD termcolor-2.0.1.ebuild 651 BLAKE2B f0e9bfb2fa403d17cce7b1167c008f973597c24148746d114346913f808f73fea68e6f16e7a02c76f35102e5dbab3e45ea4665f3f7f583a389c33c8df05994f1 SHA512 437a9d9fe3e27b9473ec8f89ae70e7a104987e8615bc43634b61938e3ed910ec25bcab1ee28cf4c47a647b41eaa0b1005e5bca95274f676e30370408c76a1dc7
 MISC metadata.xml 469 BLAKE2B a9da957ef444f9a2537616c337073c53f3d00d2b35f9b52116c6ffebdea617014e058c66ee97afafff37841c1f6f9cbce4400236a18e9037791baad21705883e SHA512 6664c1026a6c7eb63df6d668a2ba4b4a4fbc23c5737db9a01e915b562d15d3c18196b963805ebf7a09e03ead51316d71b1a0c035813bf4c9729e0cb528e1794f
diff --git a/dev-python/termcolor/termcolor-2.0.0.ebuild b/dev-python/termcolor/termcolor-2.0.0.ebuild
index 61b84954a4c0..83e871771d98 100644
--- a/dev-python/termcolor/termcolor-2.0.0.ebuild
+++ b/dev-python/termcolor/termcolor-2.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	dev-python/hatch-vcs[${PYTHON_USEDEP}]
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 40032f60613c..73a0bf1a2175 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index fbf6ebb42a31..615e849694f4 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -2,8 +2,10 @@ AUX 50pkgcheck-gentoo.el 125 BLAKE2B db546b7f4e1517fb4f3bc46eff6a3294c8d677be031
 DIST pkgcheck-0.10.14.tar.gz 490827 BLAKE2B cf45c66e8cbe11f65840eb98de7e4c8359396f6271dc7d728daeb54704e53c1480198bc1451b4d50510d00029243a0d6dd91201f4bd7b3b5860df27b66792ee7 SHA512 c792a7dfe4f49e6c2008a44f6afb10a2db2067e8e6b9fc6bfe27010e62a6341328f62f3f2e87c4025997392f3883431d4a66c97beb3eeb690cef63e697754ec3
 DIST pkgcheck-0.10.15.tar.gz 493266 BLAKE2B 1dfff3ded8f76c807e79415c6eab1786aeb103975ca639f509e4d97448bed3c7e7969b30ad699528d1a655a6be39fa89f20bf91ee774ab40ca1c99ed23c6f970 SHA512 9bcee0428f6276dc1a5a92dfb528402bc51dd38a79fc2bfeba391297e6e6c058ebf5579e086de881a3331c669dd4700f4b2d5baa74f66172953a329d7e815433
 DIST pkgcheck-0.10.16.tar.gz 495095 BLAKE2B 361d0619454cd25a9b50d837e39501ad7065a0f4f04a7abfa0a24788800247d417d0dfdf0f94d45be1a224564c09b849c4fd111ce38646dfc7e7a6c41fee9470 SHA512 976acd7c8cc4dae9fb486d8ab9d3903286fa0050db43a402dc70e6287daa8613fdf107cd4aa51bb74820aab1e4d9585e9d574ce1c335a118340d7148c793667c
+DIST pkgcheck-0.10.17.tar.gz 497163 BLAKE2B 600b51c5c034356fcfbbbb741681e7e304ccf14b9390207305d35c48dff7675e808101fa76f6a4ce250691b2fd99deae7d59cc91560d609c1a2c3d7421859849 SHA512 3539d877b63e739877f79340ff59c3592f43ac9e00b507ab63d7afc2bb3eaa32f863e7cc8029c5a05bcf7068de70fd3149447054f0d9d304d4e3548a0a25d676
 EBUILD pkgcheck-0.10.14.ebuild 2197 BLAKE2B 3264c08a19b574db9f9808dd1f81838b83fba398fb78032c3eab16668674b0d78a85e01222d830be9ea955dc3f89986c5668e5a6e8263c16f06af026e09542e9 SHA512 b59cf7d591efb278bf430320dbbb8885f0c8df16fd082b8210dfb6503fb3f086b9da22c50ee9b909c5dfcb3a78a7464f58f82b02a5a7a065ec8e7b1269df2a76
 EBUILD pkgcheck-0.10.15.ebuild 2205 BLAKE2B 7713a52128cbf038209461aac056bffb666f4ee75cbff1d04b9fa1d98d6de38459273a2cac4eca9883b410dd4da8cea69c6e6d41089eda0cbfd5ba993a8c0378 SHA512 4a6ac693f2dab601f503ea175c807dec0039c87b77fa2753cde0578948e62b2dce13bc9853d0cb93ec4d1219ed2e6f676db684f83326e24fe8630525c0d50038
 EBUILD pkgcheck-0.10.16.ebuild 2205 BLAKE2B 6d7fb1512f29d14f6d87137c49ac7b7395d732b23b2e70df51f9e2caca8ac49999a9dcf4cb0def6922572543aa898ebf44d6ed50f2bac530e2eef6a6f458464a SHA512 c709720d97857d95533b9f913b3c5183d9b6384d23f7b2f77c4e6ec340e8559da1bba71cc2de2741b2a9861f5fe1980ec869f279f550c659433a3081e659bbc5
+EBUILD pkgcheck-0.10.17.ebuild 2264 BLAKE2B 1040f9ec9cc5b36662518827219056f3c3d0f5fd1644cc572ed7746bc6ae6f57dd8d5afbe8fcc4da6e669a43a82df6add14a756d4c527ef493fe2c8e93b6fe82 SHA512 38c1942f3361a9e63f147f4051e3df9b93507351b2717c4a8aac42a570cc1a107ec543a5c48271767109220f57b41ef1c57124a3e2cb419669bf4df4173fa168
 EBUILD pkgcheck-9999.ebuild 2264 BLAKE2B 1040f9ec9cc5b36662518827219056f3c3d0f5fd1644cc572ed7746bc6ae6f57dd8d5afbe8fcc4da6e669a43a82df6add14a756d4c527ef493fe2c8e93b6fe82 SHA512 38c1942f3361a9e63f147f4051e3df9b93507351b2717c4a8aac42a570cc1a107ec543a5c48271767109220f57b41ef1c57124a3e2cb419669bf4df4173fa168
 MISC metadata.xml 431 BLAKE2B d7d5cd3611d661ef181be38b7087169cd7a73351e54a5e5630915666a81e62761f6b797e255fb7e3172d0135e1a076045ec3727ed6bc9f6d741b5dc63090307c SHA512 8635c9e2b28a5477209d5c3d3a4daf8bbe7a876d1d43bcd0cad30d28155e2cb98c9ca3880418f58bd9ff536e210ae379c3477f2ccdfa3cae409b2b978eb14c64
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.17.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.17.ebuild
new file mode 100644
index 000000000000..1db329941b5c
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.10.17.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit elisp-common distutils-r1 optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcheck.git
+		https://github.com/pkgcore/pkgcheck.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="pkgcore-based QA utility for ebuild repos"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="emacs"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.10.1[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.15[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	dev-libs/tree-sitter
+	dev-libs/tree-sitter-bash
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
+	emacs? (
+		>=app-editors/emacs-24.1:*
+		app-emacs/ebuild-mode
+		app-emacs/flycheck
+	)
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+distutils_enable_tests setup.py
+
+export USE_SYSTEM_TREE_SITTER_BASH=1
+
+src_compile() {
+	distutils-r1_src_compile
+
+	if use emacs ; then
+	   pushd "${S}"/contrib/emacs >/dev/null || die
+	   elisp-compile *.el
+	   popd >/dev/null || die
+	fi
+}
+
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+
+	if use emacs ; then
+		elisp-install ${PN} "${S}"/contrib/emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	optfeature "Network check support" dev-python/requests
+	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index 7714d33ecde6..2004052ab432 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -3,7 +3,9 @@ DIST pkgdev-0.2.1-docs.tar.xz 4156 BLAKE2B d0cae24586dd24d03ae0378205ebf164957a1
 DIST pkgdev-0.2.1.tar.gz 66455 BLAKE2B 6f89b1601813adcb1263a044a096d187d7fa926f116a09dc2b1cec083f8d82da54ae00577c36d64ece5733d8952f8dc5f4dff94aeb695e851f340a30f04b203e SHA512 8277f74f3d9902da295c5436a46302627bdc1cb2a63f29b0603bf9bfa2c8bb812b26f12a54630cbbcba1e2bbac7352146f6ab59fc04cd8b89b46df1fe7c9f8dd
 DIST pkgdev-0.2.2-docs.tar.xz 5496 BLAKE2B 46df2c14370dbe1312e43e08388aa9a3f13e98c5c74b5762f9562cea1d5f6913fc352bc7a4dcce3aae1c3511e3735bc83946bcd0928e56faad32351e811dfbf0 SHA512 e950fa826036ab3cb6fc3ed4b1b5da533d32739ebdc912e77270f4621d378a31b51758801287fd9552c791fbe0f96019b62499ee06950b20f403260e61276237
 DIST pkgdev-0.2.2.tar.gz 66977 BLAKE2B 50b7c06339438ada28ffc9e8e8ba0c472342cbe447790ec7df7506979a1865ebdcd317071833b05091e3749f78857867729e905c1a971bf04e44137337106abe SHA512 f154c7442c40fb1ef5fe9917079db4ddf5bfda4b4d7ca964b9a11fad2a273e79971455142e99905e2293babf73b45d26974480faf0c5c1b25057afc6d658bdc2
+DIST pkgdev-0.2.3.tar.gz 67292 BLAKE2B 8e4195c1094200836e23f97ed8ddf44659dcbe123180b253bf961fc08f2534d3573c7194302b3dbe866b45a548e63951ef63d4fce77c4d0903c34a0f4ece9c0b SHA512 ea09483fff8d64ed2a53ab3435bf01be172f1ef6fcbcfa5eac2f19104fdd20cd57f045f578db896c92689f4e6e36acfa4ae4feb28424b5566041fc0e1d5ccb05
 EBUILD pkgdev-0.2.1-r3.ebuild 2441 BLAKE2B 99cdd71ce398fc02d96ae8cdae0cced060e3854aaa802dd3fa118166f60726d26181ee8a76c191c8b8c8daa4e2028600e92e5f257ff7d93b5626aa59e8897261 SHA512 632fbc60b508672044e7981f9fcb9e9b9df64a187bb371fc2f7e579f5a7e1f21ccb03794288e1808b395b5e6b949fa4824240f85add9210453cb39ae529d5bb8
 EBUILD pkgdev-0.2.2.ebuild 2398 BLAKE2B d226f59a1674e3726c7b4cfb162470243e5435c5d23711381e359ac7687f55faaa7fd0d5913a23a07e8372ac2e7034ec8d29ab1c001fd7a0f36b2e9689597010 SHA512 dc3026258c5f3f9bf84cfa05a9322bc797bc49c90b22c0adeef4c0604a6af3e39c2034e772c6637024c287525842fe98835bc18f280f67fadac336a9fc312bac
-EBUILD pkgdev-9999.ebuild 1690 BLAKE2B ff55c939c65b5461f98cea4a18225f3107b41929821aa1d1c738ca61370520d44cff73bf0ca03ec796629f13a0de070ca503f77f03c2edf329a2bfe2490089c8 SHA512 8a1a0e0b03155ebbf3e517c0c257e029e8494aeca9ef03740d83cd51f751d525ec0d32ecbb575990ef7ddcc82d74e38d5852930157bddd7d95f59bf5fae0cb01
+EBUILD pkgdev-0.2.3.ebuild 1696 BLAKE2B 67a3cc19a92763cd445cf2fbca50b600f137992dff3b64e0ab0bb795f3ca654a45db61d99058e944bd4e2c2c6723e1285210335eafa947d59aeea72628db112c SHA512 bbcd2b20f752f86f421d7561ebbc95f227a363388237c693d7282d86075d5781f44f87cc3b86f26774965068990cc24810af6b520556254caae3326a4106a098
+EBUILD pkgdev-9999.ebuild 1696 BLAKE2B 67a3cc19a92763cd445cf2fbca50b600f137992dff3b64e0ab0bb795f3ca654a45db61d99058e944bd4e2c2c6723e1285210335eafa947d59aeea72628db112c SHA512 bbcd2b20f752f86f421d7561ebbc95f227a363388237c693d7282d86075d5781f44f87cc3b86f26774965068990cc24810af6b520556254caae3326a4106a098
 MISC metadata.xml 449 BLAKE2B f440d395e5453394e7bcc857ccd07b6735bce1b68b3e4ce9d33068c28c5794f6ba65d7394ed6f585dcd3e58ccd3f49ecee4d001ff4e40893db721b5ac869f7ae SHA512 a07c315d071af0ad53ee79f9db3cfd1a8acbdbabfad960cf64025eea1a3759f1ef7d5dcf71bf07b17cbfb6f912513edf118c28d3c24de06223a7a3420cc4438d
diff --git a/dev-util/pkgdev/pkgdev-0.2.3.ebuild b/dev-util/pkgdev/pkgdev-0.2.3.ebuild
new file mode 100644
index 000000000000..0599a544b7a9
--- /dev/null
+++ b/dev-util/pkgdev/pkgdev-0.2.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	PKGDEV_DOCS_PREBUILT=0
+
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgdev.git
+		https://github.com/pkgcore/pkgdev.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Collection of tools for Gentoo development"
+HOMEPAGE="https://github.com/pkgcore/pkgdev"
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="doc"
+
+if [[ ${PV} == *9999 ]] ; then
+	# https://github.com/pkgcore/pkgdev/blob/main/requirements/dev.txt
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
+	"
+else
+	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
+	RDEPEND="
+		>=dev-python/snakeoil-0.10.1[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.10.16[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.16[${PYTHON_USEDEP}]
+	"
+fi
+
+# Uses pytest but we want to use the setup.py runner to get generated modules
+BDEPEND+="test? ( dev-python/pytest )"
+RDEPEND+="dev-vcs/git"
+
+distutils_enable_sphinx doc
+distutils_enable_tests setup.py
+
+python_compile_all() {
+	use doc && emake -C doc man
+
+	# HTML pages only
+	sphinx_compile_all
+}
+
+python_install_all() {
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if use doc; then
+		doman doc/_build/man/*
+	elif [[ ${PV} != *9999 ]]; then
+		doman man/*.[0-8]
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/pkgdev/pkgdev-9999.ebuild b/dev-util/pkgdev/pkgdev-9999.ebuild
index 736ac5eb9f9c..0599a544b7a9 100644
--- a/dev-util/pkgdev/pkgdev-9999.ebuild
+++ b/dev-util/pkgdev/pkgdev-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Collection of tools for Gentoo development"
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 39a7675ad150..651595be6a56 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/mozcoreconf-v6.eclass b/eclass/mozcoreconf-v6.eclass
index 2d94be6baee4..450697773409 100644
--- a/eclass/mozcoreconf-v6.eclass
+++ b/eclass/mozcoreconf-v6.eclass
@@ -195,15 +195,6 @@ mozconfig_init() {
 	# Strip optimization so it does not end up in compile string
 	filter-flags '-O*'
 
-	# elf-hack is broken on x86 and disabled by default.
-	if is-flagq '-g*' ; then
-		case "${ARCH}" in
-		amd64 | arm)
-			mozconfig_annotate 'elf-hack is broken with -g* flags' --disable-elf-hack
-			;;
-		esac
-	fi
-
 	# Strip over-aggressive CFLAGS
 	use custom-cflags || strip-flags
 
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 39687da2d348..74a55eded90b 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 949ab91d102c..7e55d9658af7 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -3,7 +3,7 @@ AUX 42.0-optional-bluetooth.patch 2032 BLAKE2B 635ba18f5bb5ca0c9f44fe11c2b526523
 DIST gnome-shell-42.4.tar.xz 1928776 BLAKE2B cd986668683a8c57b69ca6b84351d6988d5dde5b96c780ea79109db3f3cd0d032883019dd07bf6e4ea678a549fe95ea99b29e9f9b6efc8d4231fcd4cd2fa3159 SHA512 f06f390cdb55b5b5871bbd35dfc3b0057fbc79d4dcb2334b34bfa198ec46a1880de99097e42ed9052b3183266dd017457f6a9a07fc3c517277551295478cb340
 DIST gnome-shell-42.5.tar.xz 1930668 BLAKE2B 0442ef92588e9891082c024d1e3b4ddb105a01ef5b7913ac8f1d2cac1af1c2ae8efd18184c511c554e41d8c0540c8712b7ef39ba1a9cac8c6c9336bb7b4cb320 SHA512 575559b99161b7045b04fc100cde719bbca83d90f78b673acc2189f3bb5104fd14f40da7d19611b154976f1c006e0dc2ff8cc124dc816da765c933fdda0624d9
 DIST gnome-shell-43.0.tar.xz 1945812 BLAKE2B 1d0ef32324e66ca4ffcdf7d6470247f50cb80f86a4ba647d44b9bc956477f5d6899b54d63024f69bb1432b90d3cc46855424c2c463ff2bdfcd96d56f5cdc52f2 SHA512 6f3609c8bac923f052d51fce44a448dba997cac543331b56229f46b56e8770de9370deb7759d4bf0e7385794232715b9b34e41f90dd1da30e88d5cfbf3f095eb
-EBUILD gnome-shell-42.4-r3.ebuild 7559 BLAKE2B 5347e5115d06d47ee8b20833d978a8704978e2a91e4f865b9f97d0855f700b8047122d3554da7eb7b8c34fedcf45f823061fbbc7824e14549847835ae670561e SHA512 271b51cc5e01202282111825374b2dff74748698c73fa5493680d2ce22fb2c1951460f413505c427c82bd5845ffcd979a76eb0c228ebd9e896adabb9f99914c8
+EBUILD gnome-shell-42.4-r4.ebuild 7514 BLAKE2B c0a28ffb318797d8df272ea0cce0233da48fdd990f28b5be50c446910047bdb8454ff56861888d8a025b4633cd76fc524b88e38770f67e94ec119610c56b8f38 SHA512 7b122fbb501a2598a7c5db027e0d101e5c0357dc5ba4992ef310bbe324f4df0927bbc9c4ee3adc937c0024f90b05a99796402824b7fe1ea84d34fd717a819130
 EBUILD gnome-shell-42.5-r2.ebuild 7515 BLAKE2B 408fe13e095208228c883d72f120f1da8be2b05dd039e300ae24dc82c7b7a09c18d249ff93d41a9f9062d372669141875345ded5f89af04377c19a22a26cf890 SHA512 aa41b2007379241266df149684ac47f9eb556fe1f39a3b225891e7a15c93383e234e652894f71c2ffde6eaf55806d201e249e4342d00cc079aac30945fc39551
 EBUILD gnome-shell-43.0.ebuild 6451 BLAKE2B 8b50ba4e49cfd516935db134bc54838d65698fb31bd99b205c35d6aabafbaac10b67eb4b7eb63ab949b39cc08bc06860d63c90a7dc8237e22e162ad0a684e21f SHA512 49102bf162ed5285ccac2718d40f84bd53788d9343ab73b941cc78c336e53a7c39ab0052c34a61b45ee9bf1a030580e3bba432b22cd455e9e127c3868f75a213
 MISC metadata.xml 1056 BLAKE2B 3c9f2a359f9c19a56c79dafd9da3bd773f76fbbd7d23adc8562bf3baa800e03da6e6f71199a824291e72cd36b2712a6c5421c98f3ff49fa50d6b2aee0e1eb300 SHA512 7fe46183a2fb3f20d79118a079105450be28b76ae7913b32a4aec481e5c1bc63f0f0235b3896aa12c37e0aa8787f828c6746109636c105bd2fc0fa1133e72983
diff --git a/gnome-base/gnome-shell/gnome-shell-42.4-r3.ebuild b/gnome-base/gnome-shell/gnome-shell-42.4-r4.ebuild
index 98679dac2b62..69c46d9d3274 100644
--- a/gnome-base/gnome-shell/gnome-shell-42.4-r3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-42.4-r4.ebuild
@@ -88,7 +88,7 @@ DEPEND="
 # 7. IBus is needed for nls integration
 # 8. Optional telepathy chat integration
 # 9. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
-# 10. xdg-desktop-portal-gtk for various integration, e.g. #764632
+# 10. xdg-desktop-portal-gnome for various integration, e.g. #764632
 # 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
 # <libgweather-4.2.0 because of libsoup:3 transition
 RDEPEND="${DEPEND}
@@ -121,7 +121,7 @@ RDEPEND="${DEPEND}
 	)
 	media-fonts/cantarell
 
-	|| ( sys-apps/xdg-desktop-portal-gnome <sys-apps/xdg-desktop-portal-gtk-1.14.0 )
+	sys-apps/xdg-desktop-portal-gnome
 "
 # avoid circular dependency, see bug #546134
 PDEPEND="
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 0f0caf8a8f45..44700a745cb3 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 8f965fcf4121..d489e574d8e1 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,5 +1,5 @@
 DIST yoshimi-2.2.1.tar.gz 8039881 BLAKE2B 8ef8851b6e0808190f8bf97fc6502448d703cd910726f44c8c1f839299badcd858872291f54d4d219d12e11acc31ec1d342f5df5009d71b0fc1d8eae2f6cb7d1 SHA512 9f1895273b8e6ecedf503d59f351f568c189a03d5111d3bc7de8cc0c025f89f48383540f462184b9fad9487ea3cc18c0cc6cb6b1ba7ccd2619ddb2c28c4c66f0
 DIST yoshimi-2.2.2.1.tar.gz 8038479 BLAKE2B a33d231770981dcc4f2215941c60b3d959eaa93f883cda483d8d97452e37676b8dc1397b4c45bf2e2e63f1da1454c4187ea1709e58d867471ef1fa028f255512 SHA512 edabf5130c71c5fc303f6825e0323cd00b341079e61577772c547f104413646623b5c2a86a0ffd573013b4b84b6fa724161f851ead6d525e7f630d95ab724987
 EBUILD yoshimi-2.2.1.ebuild 1193 BLAKE2B 423cb8e0224ad1beafe1a7f5ecb11a5a731342737e0fdd8ce9c78e9d4efaf8dd6516a5f3a20409d21f07e499adee505bf81bb539b9bb010eb2a569428aff107e SHA512 df0a44b3bcf0d780910fd2dabfc8237d3690093115bc8065dd238f4188afb77c39a66a877d5e2642de6db6dc48028af09130df1fdb43e5a983920fd43f9fe173
-EBUILD yoshimi-2.2.2.1.ebuild 1195 BLAKE2B 702beff33095cc515d4a7513f14c47391c34e18a89eee23916f19a807ffbfabc65851ff5cf5ea9cfb4e5666ed25ce60fc317ed4d49103bbd78609647589c2fe6 SHA512 6d0462e93e9bc1aba1c521aeb4f7d2f3bc1171baff37341e3a65ab6c95723bd9cbf2486ceb54d0e57cc86be070e7ae8f253153cf4ec8041a0370ddbf76d2c0be
+EBUILD yoshimi-2.2.2.1.ebuild 1193 BLAKE2B 423cb8e0224ad1beafe1a7f5ecb11a5a731342737e0fdd8ce9c78e9d4efaf8dd6516a5f3a20409d21f07e499adee505bf81bb539b9bb010eb2a569428aff107e SHA512 df0a44b3bcf0d780910fd2dabfc8237d3690093115bc8065dd238f4188afb77c39a66a877d5e2642de6db6dc48028af09130df1fdb43e5a983920fd43f9fe173
 MISC metadata.xml 1414 BLAKE2B 4dab154682ec4f0dfe9f4ee1f2b1510f020ef9bf8ce8b871c7bae3709a505faff8e07a2af20cedc3de357dd01c5a2bc192b2776153c1fb028894db732e0215dc SHA512 0ae6d64001643cc80c58929a4d28af6c3c4e0433b31567091e495dd34c350f7fa8908bf89d9aea1b3f004b40e7c8b60ec36025d04fa510f93af17f2316833c61
diff --git a/media-sound/yoshimi/yoshimi-2.2.2.1.ebuild b/media-sound/yoshimi/yoshimi-2.2.2.1.ebuild
index 07ae2d6616da..d37c7559c8db 100644
--- a/media-sound/yoshimi/yoshimi-2.2.2.1.ebuild
+++ b/media-sound/yoshimi/yoshimi-2.2.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+lv2"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index b198d7051908..17102a71302e 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index c7f2d897c6ca..200cec980864 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -2,6 +2,7 @@ AUX 99-pipewire-default-hook.conf 540 BLAKE2B cec76e78db9db290054bf766774c284d7a
 AUX gentoo-pipewire-launcher.in 1227 BLAKE2B 4316a991978fac653a00d076e9236d0ab6c01a6e4b800c82851e2bd6f9476369605c741aa7ffd47b10853653ef1d4222c449f0b912a0f7694fffd2b1611d7a47 SHA512 edbc03cec765d2307bcf33a14521c6f8beeae52d9fd6a4e181ba66b9f5dd0d64995fdef847453d1a4c682d701814b3afbe70931f55a0e4198fc5c9d87d7a95c5
 AUX pipewire-0.3.25-enable-failed-mlock-warning.patch 704 BLAKE2B dc0732b89b57a258ea6dc54941899134259469675f92ae93aebda09a796c73ace8bc4ed0ab2aef4ea1bcaa30c1bea8c3304288168421ce8f9939ec993c8aa438 SHA512 7456a24276b7b766ff5799acf5b80ef5f85ee7a78fc5b52adff3206c0b0aa1985a0bf72634aacf7818c90136c09bcc11cb0fecec291d961c8b3585c897869f65
 AUX pipewire-0.3.56-big-endian.patch 1632 BLAKE2B b47b5ca888de71c9ee71ba35d5a490074e39219777345f4bf55252c0e9de65b97cc995c894b27c43945c8b32d70304e46610b3b641732170dc8f1ad97ea6549b SHA512 84bda8d747b91f04a40da6e55f186991b679b124e2571d64cd18368d5d4e1e2273565e3eee0a7b4b1a20a731429c240f168b970b02f88534375131b24c358cc1
+AUX pipewire-0.3.59-filter-chain-alloc-port-data-handle.patch 2771 BLAKE2B a6248de6ca263fa275938f61e504b442e06e41ef5cb650fe03c0c8a91d28567fc3e20b02626f2293a3ca1c0014c8f6692498178be38017445e167efcdf2d6e7e SHA512 46534f3fc267170090c0abdc076a1486fe4c3b964790bba19156349814b26b14b0dd637ff4aeaa0b5a3775ddebcf021e93cc4e1f85f7aa7cfda3bb4a66af6fc7
 AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344
 AUX pipewire.desktop-r1 325 BLAKE2B 7d823a264e5147bf8669127df22f468518fd54375ed57910f0143821894b33cfee8925b1cf8b9c5b1d219453a5c62fffa50d111b78bc5e151e23aed84d0a577e SHA512 e51ba049484daba3e4cdc5890748267f0c23ea6e57f31f3bb8a49c011e1a61b47b68eea742e5e7bcd58bfeddb96dd4064079fd9787cb66c78bd5eff10799a7bf
 DIST pipewire-0.3.51.tar.gz 1789070 BLAKE2B 8538eb9f2178efa26365f30b324b707826e580caa1fd9c09b62c561c140c14186e0d2b04808fa78eb5642ddccf1a347def19934ecd654be06b215a693075b6fc SHA512 a762fd260b4b14ad9ef142be11ab1c22268da6726e2179559ffb254f0ce7daf7a502779e33c64313a9c6a9fc1bd15150b76be04ec81aa27c35dbb4333cecdb4a
@@ -11,6 +12,7 @@ DIST pipewire-0.3.59.tar.gz 1909977 BLAKE2B 098a75060799013e9a5e5ac4b0c7c62e7883
 EBUILD pipewire-0.3.51-r2.ebuild 13198 BLAKE2B 367ab8b3f5682ed707f8ad46a4959216c10ade3697661e748c90a4473f993d40f1137cf1364b35b2aa884acbf24b3989a5fd3046fdc78bc90ca4334644a711b1 SHA512 a9b4ce58ae5a13491f019d51863f2de822e642cbecdc1ca4018385a2e3a07e5bfba865df09fec6d2a5af3269a72fbcd8c8c3b13a3db310e83cf0e3cd100380da
 EBUILD pipewire-0.3.56.ebuild 15643 BLAKE2B 15b146a8ca79173ffa4b93315681fda18d1290711ec8b41715c96dcdfff325ea8ffd1fd9418671cfe966542ba7c81bef6ef08f14c7f17b569bb82abc66c6fa63 SHA512 832ba476d2e4f2bbcb78118152b407f426ed40bf514096a19fcf3f8a00afcbfaf3f17e2d914279055c8afdf526969598d9aaa3acddbc905d62509c43fd6b6917
 EBUILD pipewire-0.3.58.ebuild 15765 BLAKE2B 79fdd8c05c6168d9f433c182b986acc0bb27cc19a1024882a77534c045380a5d64b978b431258d519d7c05a964e1d00a3b622ba830ece87ecc1b4992950e9033 SHA512 567219b52c72061d88e3ed70bc479991114a30e0bc63d9b47b0576b92b32f86fbbfce460e569b727db0e6d2c66a8a5e6c60306ab31ee7b570b681b997854fa29
+EBUILD pipewire-0.3.59-r1.ebuild 15857 BLAKE2B 761e60c6eeef8eb3075b71276092f20e9d38d2a28561896d61417663fb94ac6d5e21fa9319a3375d855ddfba583327b455a57ca979852bb80470836c0628a863 SHA512 29982d776489b585ee4b8a94fbcd78fc6b75d8f753e1eacfd50d48f6b4ebc6969adce58da5154be27422ee824616008db4f02bb1c9b1e259322f9c57fab9ffd0
 EBUILD pipewire-0.3.59.ebuild 15795 BLAKE2B c731accff189f39853293293d1585e57745024027322bf7a3c3119f8e3f09f4fded8a8e13bdc56c883f16a64974b35075b65f087c11c4e52ab2d663e007ed48f SHA512 e30a2dcffd163648267127fcaf5b72418342d6fe5b62886a98c3ec5a52b45bceedf7e4146fbbd7186a991b5c3b9a74a8231e365af2e5682adeb10e21800d4435
 EBUILD pipewire-9999.ebuild 15795 BLAKE2B c731accff189f39853293293d1585e57745024027322bf7a3c3119f8e3f09f4fded8a8e13bdc56c883f16a64974b35075b65f087c11c4e52ab2d663e007ed48f SHA512 e30a2dcffd163648267127fcaf5b72418342d6fe5b62886a98c3ec5a52b45bceedf7e4146fbbd7186a991b5c3b9a74a8231e365af2e5682adeb10e21800d4435
 MISC metadata.xml 1533 BLAKE2B 75e656bea9420a16158649d0909be5833ddd7e8f61664d4e6ef00ecaa179110704777faaa5971c1bb7d818b193474e015649468533a0699c6249c57c27f51293 SHA512 8ba9665ef28168d804c5ef3c3f353b8313dbbb12fc9d3bbdfc09771a13a690ae4af903a73670789a2d17c9d3e0566575140d6f6b104279771fd374fab90338d4
diff --git a/media-video/pipewire/files/pipewire-0.3.59-filter-chain-alloc-port-data-handle.patch b/media-video/pipewire/files/pipewire-0.3.59-filter-chain-alloc-port-data-handle.patch
new file mode 100644
index 000000000000..bd066e31af09
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.59-filter-chain-alloc-port-data-handle.patch
@@ -0,0 +1,87 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/94a857550b566472e5ab51191e1b34098e5a9506
+
+From 94a857550b566472e5ab51191e1b34098e5a9506 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Mon, 3 Oct 2022 09:44:32 +0200
+Subject: [PATCH] filter-chain: alloc port data per handle.
+
+--- a/src/modules/module-filter-chain.c
++++ b/src/modules/module-filter-chain.c
+@@ -1501,7 +1501,6 @@ static int load_node(struct graph *graph, struct spa_json *json)
+ 	bool have_config = false;
+ 	uint32_t i;
+ 	int res;
+-	float *data;
+ 
+ 	while (spa_json_get_string(json, key, sizeof(key)) > 0) {
+ 		if (spa_streq("type", key)) {
+@@ -1576,14 +1575,6 @@ static int load_node(struct graph *graph, struct spa_json *json)
+ 		port->idx = i;
+ 		port->external = SPA_ID_INVALID;
+ 		port->p = desc->output[i];
+-		if ((data = port->audio_data[i]) == NULL) {
+-			data = calloc(1, MAX_SAMPLES * sizeof(float));
+-			if (data == NULL) {
+-				pw_log_error("cannot create port data: %m");
+-				return -errno;
+-			}
+-		}
+-		port->audio_data[i] = data;
+ 		spa_list_init(&port->link_list);
+ 	}
+ 	for (i = 0; i < desc->n_control; i++) {
+@@ -1629,6 +1620,26 @@ static void node_cleanup(struct node *node)
+ 	}
+ }
+ 
++static int port_ensure_data(struct port *port, uint32_t i)
++{
++	float *data;
++	if ((data = port->audio_data[i]) == NULL) {
++		data = calloc(1, MAX_SAMPLES * sizeof(float));
++		if (data == NULL) {
++			pw_log_error("cannot create port data: %m");
++			return -errno;
++		}
++	}
++	port->audio_data[i] = data;
++	return 0;
++}
++
++static void port_free_data(struct port *port, uint32_t i)
++{
++	free(port->audio_data[i]);
++	port->audio_data[i] = NULL;
++}
++
+ static void node_free(struct node *node)
+ {
+ 	uint32_t i, j;
+@@ -1636,7 +1647,7 @@ static void node_free(struct node *node)
+ 	spa_list_remove(&node->link);
+ 	for (i = 0; i < node->n_hndl; i++) {
+ 		for (j = 0; j < node->desc->n_output; j++)
+-			free(node->output_port[j].audio_data[i]);
++			port_free_data(&node->output_port[j], i);
+ 	}
+ 	node_cleanup(node);
+ 	descriptor_unref(node->desc);
+@@ -1688,6 +1699,8 @@ static int graph_instantiate(struct graph *graph)
+ 
+ 				spa_list_for_each(link, &port->link_list, input_link) {
+ 					struct port *peer = link->output;
++					if ((res = port_ensure_data(peer, i)) < 0)
++						goto error;
+ 					pw_log_info("connect input port %s[%d]:%s %p",
+ 							node->name, i, d->ports[port->p].name,
+ 							peer->audio_data[i]);
+@@ -1696,6 +1709,8 @@ static int graph_instantiate(struct graph *graph)
+ 			}
+ 			for (j = 0; j < desc->n_output; j++) {
+ 				port = &node->output_port[j];
++				if ((res = port_ensure_data(port, i)) < 0)
++					goto error;
+ 				pw_log_info("connect output port %s[%d]:%s %p",
+ 						node->name, i, d->ports[port->p].name,
+ 						port->audio_data[i]);
+GitLab
diff --git a/media-video/pipewire/pipewire-0.3.59-r1.ebuild b/media-video/pipewire/pipewire-0.3.59-r1.ebuild
new file mode 100644
index 000000000000..da8ad2640541
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.59-r1.ebuild
@@ -0,0 +1,431 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 1. Please regularly check (even at the point of bumping) Fedora's packaging
+# for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
+#
+# 2. Upstream also sometimes amend release notes for the previous release to mention
+# needed patches, e.g. https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
+#
+# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things
+# continue to move quickly. It's not uncommon for fixes to be made shortly
+# after releases.
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *_p* ]] ; then
+		MY_COMMIT=""
+		SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+		S="${WORKDIR}"/${PN}-${MY_COMMIT}
+	else
+		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+	fi
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
+SLOT="0/0.4"
+IUSE="bluetooth dbus doc echo-cancel extra flatpak gstreamer jack-client jack-sdk lv2
+pipewire-alsa sound-server ssl system-service systemd test udev v4l X zeroconf"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+# TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but ALSA is always enabled
+# TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server connection will work
+# which provides adequate guarantee that alsa-lib will be able to provide audio services.
+# If that works, pulseaudio defaults are loaded into alsa-lib runtime replacing default PCM and CTL.
+# When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally.
+REQUIRED_USE="
+	jack-sdk? ( !jack-client )
+	system-service? ( systemd )
+	!sound-server? ( !pipewire-alsa )
+	jack-client? ( dbus )
+"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-util/meson-0.59
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	acct-group/audio
+	media-libs/alsa-lib
+	sys-libs/readline:=
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	bluetooth? (
+		media-libs/fdk-aac
+		media-libs/libldac
+		media-libs/libfreeaptx
+		media-libs/opus
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+		virtual/libusb:1
+	)
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
+	extra? (
+		>=media-libs/libsndfile-1.0.20
+	)
+	flatpak? (
+		dev-libs/glib
+	)
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	jack-sdk? (
+		!media-sound/jack-audio-connection-kit
+		!media-sound/jack2
+	)
+	lv2? ( media-libs/lilv )
+	pipewire-alsa? (
+		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
+	)
+	sound-server? (
+		!media-sound/pulseaudio[daemon(+)]
+		!media-sound/pulseaudio-daemon
+	)
+	ssl? ( dev-libs/openssl:= )
+	systemd? ( sys-apps/systemd )
+	system-service? (
+		acct-user/pipewire
+		acct-group/pipewire
+	)
+	udev? ( virtual/libudev[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l )
+	X? (
+		media-libs/libcanberra
+		x11-libs/libX11
+		x11-libs/libXfixes
+	)
+	zeroconf? ( net-dns/avahi )
+"
+
+DEPEND="${RDEPEND}"
+
+# TODO: Consider use cases where pipewire is not used for driving audio
+# Doing so with WirePlumber currently involves editing Lua scripts
+PDEPEND=">=media-video/wireplumber-0.4.8-r3"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-video/ffmpeg:=
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+	"${FILESDIR}"/${P}-filter-chain-alloc-port-data-handle.patch
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+python_check_deps() {
+	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+
+	einfo "Generating ${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		@audio	-	memlock 256
+
+		$(use system-service && {
+			echo @pipewire - rtprio 95
+			echo @pipewire - nice -19
+			echo @pipewire - memlock 4194304
+		})
+
+		# End of ${limitsdfile} from ${P}
+	EOF
+}
+
+multilib_src_configure() {
+	# https://bugs.gentoo.org/838301
+	filter-flags -fno-semantic-interposition
+
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+
+		$(meson_feature dbus)
+		$(meson_native_use_feature zeroconf avahi)
+		$(meson_native_use_feature doc docs)
+		$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
+		$(meson_native_enabled man)
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gstreamer gstreamer-device-provider)
+		$(meson_native_use_feature systemd)
+
+		$(meson_native_use_feature system-service systemd-system-service)
+		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
+		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
+
+		$(meson_native_use_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_use_feature bluetooth bluez5-codec-aac)
+		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
+		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
+		$(meson_native_use_feature bluetooth bluez5-codec-opus)
+		$(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
+		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
+		# Not yet packaged.
+		-Dbluez5-codec-lc3=disabled
+		-Dbluez5-codec-lc3plus=disabled
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		$(meson_native_use_feature flatpak)
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_use jack-sdk jack-devel)
+		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		$(meson_native_use_feature lv2)
+		$(meson_native_use_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		$(meson_native_use_feature ssl raop)
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_native_use_feature extra pw-cat)
+		$(meson_feature udev)
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+		-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
+
+		# Just for bell sounds in X11 right now.
+		$(meson_native_use_feature X x11)
+		$(meson_native_use_feature X x11-xfixes)
+		$(meson_native_use_feature X libcanberra)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install() {
+	# Our custom DOCS do not exist in multilib source directory
+	DOCS= meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc/security/limits.d
+	doins ${limitsdfile}
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+
+		# Install pipewire conf loader hook
+		insinto /usr/share/alsa/alsa.conf.d
+		doins "${FILESDIR}"/99-pipewire-default-hook.conf
+		eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf
+
+		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf
+	fi
+
+	# Enable required wireplumber alsa and bluez monitors
+	if use sound-server; then
+		dodir /etc/wireplumber/main.lua.d
+		echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die
+
+		dodir /etc/wireplumber/bluetooth.lua.d
+		echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
+
+		exeinto /usr/bin
+		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
+
+		# Disable pipewire-pulse if sound-server is disabled.
+		if ! use sound-server ; then
+			sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' "${ED}"/usr/bin/gentoo-pipewire-launcher || die
+		fi
+
+		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
+	fi
+}
+
+pkg_postrm() {
+	use udev && udev_reload
+}
+
+pkg_postinst() {
+	use udev && udev_reload
+
+	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
+	elog "using PipeWire. Do it either manually or add yourself"
+	elog "to the 'audio' group:"
+	elog
+	elog "  usermod -aG audio <youruser>"
+	elog
+
+	local ver
+	for ver in ${REPLACING_VERSIONS} ; do
+		if ver_test ${ver} -le 0.3.53-r1 && ! use sound-server ; then
+			ewarn "USE=sound-server is disabled! If you want PipeWire to provide"
+			ewarn "your sound, please enable it. See the wiki at"
+			ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio"
+			ewarn "for more details."
+
+			break
+		fi
+	done
+
+	if ! use jack-sdk; then
+		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+		elog "alternative libraries have been installed to a non-default location."
+		elog "To use them, put pw-jack <application> before every JACK application."
+		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+		elog "provider is still needed to compile the JACK applications themselves."
+		elog
+	fi
+
+	if use systemd; then
+		elog "When switching from PulseAudio, you may need to disable PulseAudio:"
+		elog
+		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
+		elog
+		elog "To use PipeWire, the user units must be manually enabled"
+		elog "by running this command as each user you use for desktop activities:"
+		elog
+		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
+		elog
+		elog "A reboot is recommended to avoid interferences from still running"
+		elog "PulseAudio daemon."
+		elog
+		elog "Both new users and those upgrading need to enable WirePlumber"
+		elog "for relevant users:"
+		elog
+		elog "  systemctl --user disable pipewire-media-session.service"
+		elog "  systemctl --user --force enable wireplumber.service"
+		elog
+		elog "Root user may replace --user with --global to change system default"
+		elog "configuration for all of the above commands."
+	else
+		ewarn "PipeWire daemon startup has been moved to a launcher script!"
+		ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
+		ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
+		ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
+		ewarn
+		ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
+		ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
+		ewarn "advised that a D-Bus user session is set up before starting the script."
+		ewarn
+
+		if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then
+			elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+			elog "are recommended to edit pulseaudio client configuration files:"
+			elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
+			elog "if it exists, and disable autospawning of the original daemon by setting:"
+			elog
+			elog "  autospawn = no"
+			elog
+			elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+			elog
+			elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+			elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
+			elog "command:"
+			elog
+			elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
+			elog
+		fi
+		elog "NOTE:"
+		elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
+		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
+		elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
+		elog "and just override the sections you want to change."
+	fi
+	elog
+
+	elog "For latest tips and tricks, troubleshooting information and documentation"
+	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
+	elog
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+
+	if use sound-server && ! use pipewire-alsa; then
+		optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
+	fi
+
+	if has_version 'net-misc/ofono' ; then
+		ewarn "Native backend has become default. Please disable oFono via:"
+		if systemd_is_booted ; then
+			ewarn "systemctl disable ofono"
+		else
+			ewarn "rc-update delete ofono"
+		fi
+		ewarn
+	fi
+
+	if use system-service; then
+		ewarn
+		ewarn "WARNING: you have enabled the system-service USE flag, which installs"
+		ewarn "the system-wide systemd units that enable PipeWire to run as a system"
+		ewarn "service. This is more than likely NOT what you want. You are strongly"
+		ewarn "advised not to enable this mode and instead stick with systemd user"
+		ewarn "units. The default configuration files will likely not work out of"
+		ewarn "box, and you are on your own with configuration."
+		ewarn
+	fi
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 2a8a383c2a20..b7f4231d9696 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 54e4c77c9473..5f6ed57d5d07 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 14 Oct 2022 17:39:54 +0000
+Sat, 15 Oct 2022 00:09:49 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 93192875bd8d..273ce1240335 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 529253 BLAKE2B 4870d0ebed8f73802444d2a3e204d4fe556355a8b2b4d4ffdd695d17206e94777c458bc34f39aee9fe92a996aea872cf895c73e601729b57032c40785dea2d65 SHA512 ca03ae189444f830ef68a97bf0be8dd0ed5045d9010eaead8695ce26c0591587965b16cbf215850d4c87fa27139a325c616d08f336a7213ad4483bb7e1f46baa
-TIMESTAMP 2022-10-14T17:39:58Z
+TIMESTAMP 2022-10-15T00:09:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNJnu5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNJ+lFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klApTBAAtZwoBpHJB+NQ+mDe1gLznDFBUUxnUQiE7G2+89xnDJe7BXXZLAsALhIs
-dJtET8AqpwY07P94G5OrHHTArhO+CUgaMj5ZyuhJycFK2Z3dDgsvX7vWo+8StgXj
-uhDnWRSotkn3W64Wv3MUUl77VAAmUd3PqvwZEZJ6rFU/W/SV42ozmXGmSi2PDTsQ
-s5sQPGObXp1eYZk6WERklpzQDJlG1B2GWqqrvYGQw+qzgCuM0U0OqMhjKfrhwcPh
-b/1Z3ZtSgbCe6Lhf5PeYE8KUPZpQM8ehzVec0iHI+guCB2msY1p/n+2I+XUQBgMA
-5N9kBLLkIlK12kFOPWj9TcJD7ODVlgfufI+EYk3msQm+5VPvWLXT83iCt0zjibJi
-j5uEQZXqpxS3ApTn8zc47mzTaQK7BF3lOl00pB5ff67FLfH3HTVKLN7NnflcMgMi
-zLXgfWqQ2HabndAUX0k06/OdcEwOyPCG+PqiZ4uB9+SRebFhoYpqwRDljcjGh7DF
-271dlsn+p2LkBwhdtQprnKrDFWqajWVB2LA7fe1CEQjzSm0BbgfQGsPvrv3Ai5iu
-YTRXhwVS7vQV441PicoA7tcV0jxpNVtpwZoc7ii6h2QpNfGNTWRBTOZD2wlCaWOc
-p08iAODDcmZ/PdwcPPAnOkr5W5Xw/gfIw8Y12d46kLrytholX6I=
-=Jwke
+klB4xRAAmmeGq2WYCmEGRKIK9fSqGzkkcebvQLEIeNYBEyZREQ1bqcoq373HxvIq
+IIXnaS+jvF4fsg/KZwzR5DFrHxTF219cflDg9U4ctk4MhlViuD/qhygoTVzefjQs
+2AHKVSXoVHUZLoPyY8ZoveYG9yq2XxKzA6gSrLt9o/i3/FV9eTAy6sAvIBrF3V1N
+k6BP77EztgYiLf6is8LoAtjPxP3rQGfxg2AfJAM3zZxCVxAgVu+ydlnqfiNc/8+j
+W7dN+fQWg3f7iguIeY9gJQM4VnLn2odaRReqKNsNQERt4OC74AAZoSL+VTQLsmkb
+31/0VtMva4YZl5teHukzoZ/DLswtfoM0H52XU6TSH8fVDL66BUq4XBkl9vScjG/C
+jU+pEmZ1FE17T27O9QqnX7AVAsSCFjGKTxKOHm/Ih4asTDhDsf4cikTLvb+BgpcD
+kVj0VQfndvlo3Z9OFm2DoQfyTJNki0tO6VjKAmwQC4nKT0Ptp9hcglSvWaR//8mz
+SzmXSb09ZE/9RcawJqfyRXklg5xS/F+vCTk9atpZPpZpw4NNKjw4jG8lizyrWkQj
++OehnOwIL7pKqI/6INDcCndfNWOkNFZkrNCHD3TCFlT94s1UfkOvxoZAXogNz0NX
+PC1a27Gjl4d1q+CjIu2IMwBpwZ4Dva2F65NP5xExV/fATG3kd1I=
+=KpuQ
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 54e4c77c9473..cf302584036d 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 14 Oct 2022 17:39:54 +0000
+Sat, 15 Oct 2022 00:09:50 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 1dc7cd69e6b4..187fc8c2f08c 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index ea7c3419e867..0b0c51f7be5d 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/ansible-6.3.0 b/metadata/md5-cache/app-admin/ansible-6.3.0
index 51b5a719cd37..c9cb885f7c4d 100644
--- a/metadata/md5-cache/app-admin/ansible-6.3.0
+++ b/metadata/md5-cache/app-admin/ansible-6.3.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.ansible.com/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=>=app-admin/ansible-core-2.13.0 <app-admin/ansible-core-2.14 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
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible/ansible-6.3.0.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1c810cd4a97da4059b2ee100c4947338
+_md5_=fb67cf41369672cbc9a00c526f503fbc
diff --git a/metadata/md5-cache/app-admin/ansible-6.5.0 b/metadata/md5-cache/app-admin/ansible-6.5.0
new file mode 100644
index 000000000000..94c73bc62176
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-6.5.0
@@ -0,0 +1,16 @@
+BDEPEND=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 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=8
+HOMEPAGE=https://www.ansible.com/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos
+LICENSE=GPL-3+
+RDEPEND=>=app-admin/ansible-core-2.13.0 <app-admin/ansible-core-2.14 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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/a/ansible/ansible-6.5.0.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=1c810cd4a97da4059b2ee100c4947338
diff --git a/metadata/md5-cache/app-admin/ansible-core-2.12.10 b/metadata/md5-cache/app-admin/ansible-core-2.12.10
new file mode 100644
index 000000000000..0a2932f1b6e6
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-core-2.12.10
@@ -0,0 +1,17 @@
+BDEPEND=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 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/packaging-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/resolvelib-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/sshpass virtual/ssh dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git )
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=8
+HOMEPAGE=https://www.ansible.com/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/resolvelib-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/sshpass virtual/ssh 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 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/a/ansible-core/ansible-core-2.12.10.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=f2afaf32aaae1e8eb38bfa4cda9a3b68
diff --git a/metadata/md5-cache/app-admin/ansible-core-2.12.9 b/metadata/md5-cache/app-admin/ansible-core-2.12.9
index fb5f588367ea..d0f4deecff1f 100644
--- a/metadata/md5-cache/app-admin/ansible-core-2.12.9
+++ b/metadata/md5-cache/app-admin/ansible-core-2.12.9
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.ansible.com/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/resolvelib-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/sshpass virtual/ssh 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 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible-core/ansible-core-2.12.9.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f2afaf32aaae1e8eb38bfa4cda9a3b68
+_md5_=8bfc0834335709bf821b52d71884ae87
diff --git a/metadata/md5-cache/app-admin/ansible-core-2.13.4 b/metadata/md5-cache/app-admin/ansible-core-2.13.4
index 19f06eac11d6..2bfd9e0a9c77 100644
--- a/metadata/md5-cache/app-admin/ansible-core-2.13.4
+++ b/metadata/md5-cache/app-admin/ansible-core-2.13.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.ansible.com/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/resolvelib-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/sshpass virtual/ssh 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=mirror://pypi/a/ansible-core/ansible-core-2.13.4.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=82af196fad1ff7872e51dd4380080511
+_md5_=0ee85e7e4770b695630fa0d97003dbbf
diff --git a/metadata/md5-cache/app-admin/ansible-core-2.13.5 b/metadata/md5-cache/app-admin/ansible-core-2.13.5
new file mode 100644
index 000000000000..08bf02c51890
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-core-2.13.5
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/packaging-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/resolvelib-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/sshpass virtual/ssh >=dev-python/pytest-7.1.3[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 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=8
+HOMEPAGE=https://www.ansible.com/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/resolvelib-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/sshpass virtual/ssh 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 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/ansible-core/ansible-core-2.13.5.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=82af196fad1ff7872e51dd4380080511
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index b9c149371ad3..d39756a44875 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.2.40 b/metadata/md5-cache/app-crypt/gnupg-2.2.40
new file mode 100644
index 000000000000..8018a12f7dac
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/gnupg-2.2.40
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( sys-apps/texinfo ) nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-gnupg ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.8.0:= >=dev-libs/libgpg-error-1.29 >=dev-libs/libksba-1.3.5 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) tofu? ( >=dev-db/sqlite-3.7 )
+DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
+EAPI=8
+HOMEPAGE=https://gnupg.org/
+INHERIT=flag-o-matic systemd toolchain-funcs verify-sig
+IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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=GPL-3+
+RDEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.8.0:= >=dev-libs/libgpg-error-1.29 >=dev-libs/libksba-1.3.5 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry nls? ( virtual/libintl ) selinux? ( sec-policy/selinux-gpg ) wks-server? ( virtual/mta )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.40.tar.bz2 verify-sig? ( mirror://gnupg/gnupg/gnupg-2.2.40.tar.bz2.sig )
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=338f4f1f31a4dd73b158c85b6e7c5cef
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.3.8 b/metadata/md5-cache/app-crypt/gnupg-2.3.8
new file mode 100644
index 000000000000..d4070c47dda6
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/gnupg-2.3.8
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig doc? ( sys-apps/texinfo ) nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-gnupg ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.9.1:= >=dev-libs/libgpg-error-1.41 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) tofu? ( >=dev-db/sqlite-3.27 ) tpm? ( >=app-crypt/tpm2-tss-2.4.0:= ) ssl? ( >=net-libs/gnutls-3.0:0= )
+DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
+EAPI=8
+HOMEPAGE=https://gnupg.org/
+INHERIT=flag-o-matic systemd toolchain-funcs verify-sig
+IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server verify-sig
+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=GPL-3+
+RDEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.9.1:= >=dev-libs/libgpg-error-1.41 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) tofu? ( >=dev-db/sqlite-3.27 ) tpm? ( >=app-crypt/tpm2-tss-2.4.0:= ) ssl? ( >=net-libs/gnutls-3.0:0= ) app-crypt/pinentry nls? ( virtual/libintl ) selinux? ( sec-policy/selinux-gpg ) wks-server? ( virtual/mta )
+REQUIRED_USE=test? ( tofu )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnupg/gnupg/gnupg-2.3.8.tar.bz2 verify-sig? ( mirror://gnupg/gnupg/gnupg-2.3.8.tar.bz2.sig )
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=c7130cb95e04b2185ac98f1716d584c9
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 43b5c7201655..1e219c1c809c 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/vscode-1.72.2 b/metadata/md5-cache/app-editors/vscode-1.72.2
new file mode 100644
index 000000000000..408fcffa6175
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vscode-1.72.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst
+DESCRIPTION=Multiplatform Visual Studio Code from Microsoft
+EAPI=8
+HOMEPAGE=https://code.visualstudio.com
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop pax-utils xdg optfeature
+KEYWORDS=-* ~amd64 ~arm ~arm64
+LICENSE=Apache-2.0 BSD BSD-1 BSD-2 BSD-4 CC-BY-4.0 ISC LGPL-2.1+ Microsoft-vscode MIT MPL-2.0 openssl PYTHON TextMate-bundle Unlicense UoI-NCSA W3C
+RDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) app-crypt/libsecret[crypt] dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/util-linux sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libxshmfence x11-libs/pango
+RESTRICT=mirror strip bindist
+SLOT=0
+SRC_URI=amd64? ( https://update.code.visualstudio.com/1.72.2/linux-x64/stable -> vscode-1.72.2-amd64.tar.gz ) arm? ( https://update.code.visualstudio.com/1.72.2/linux-armhf/stable -> vscode-1.72.2-arm.tar.gz ) arm64? ( https://update.code.visualstudio.com/1.72.2/linux-arm64/stable -> vscode-1.72.2-arm64.tar.gz )
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=2c8a2ec636b580e6f1acf8e3b4cc5642
diff --git a/metadata/md5-cache/app-editors/vscodium-1.72.2.22286 b/metadata/md5-cache/app-editors/vscodium-1.72.2.22286
new file mode 100644
index 000000000000..cf56de8259f4
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vscodium-1.72.2.22286
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst
+DESCRIPTION=A community-driven, freely-licensed binary distribution of Microsoft's VSCode
+EAPI=8
+HOMEPAGE=https://vscodium.com/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop pax-utils xdg optfeature
+KEYWORDS=-* ~amd64 ~arm ~arm64
+LICENSE=Apache-2.0 BSD BSD-1 BSD-2 BSD-4 CC-BY-4.0 ISC LGPL-2.1+ MIT MPL-2.0 openssl PYTHON TextMate-bundle Unlicense UoI-NCSA W3C
+RDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) app-crypt/libsecret[crypt] dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/util-linux sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libxshmfence x11-libs/pango
+RESTRICT=strip bindist
+SLOT=0
+SRC_URI=amd64? ( https://github.com/VSCodium/vscodium/releases/download/1.72.2.22286/VSCodium-linux-x64-1.72.2.22286.tar.gz -> vscodium-1.72.2.22286-amd64.tar.gz ) arm? ( https://github.com/VSCodium/vscodium/releases/download/1.72.2.22286/VSCodium-linux-armhf-1.72.2.22286.tar.gz -> vscodium-1.72.2.22286-arm.tar.gz ) arm64? ( https://github.com/VSCodium/vscodium/releases/download/1.72.2.22286/VSCodium-linux-arm64-1.72.2.22286.tar.gz -> vscodium-1.72.2.22286-arm64.tar.gz )
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=8eb35ffbbe52d87d107315f25295d730
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index f63fe4630930..5c72f1509bbd 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/docker-2.2.0_p20221012 b/metadata/md5-cache/app-emacs/docker-2.2.0_p20221012
new file mode 100644
index 000000000000..8f0c661a97c7
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/docker-2.2.0_p20221012
@@ -0,0 +1,13 @@
+BDEPEND=>=app-emacs/transient-0.3.7_p20220918 app-emacs/dash app-emacs/docker-tramp app-emacs/emacs-aio app-emacs/s app-emacs/tablist >=app-editors/emacs-26.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Emacs integration for Docker
+EAPI=8
+HOMEPAGE=https://github.com/Silex/docker.el/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-emacs/transient-0.3.7_p20220918 app-emacs/dash app-emacs/docker-tramp app-emacs/emacs-aio app-emacs/s app-emacs/tablist >=app-editors/emacs-26.1:*
+SLOT=0
+SRC_URI=https://github.com/Silex/docker.el/archive/3173403a2d51a2af36f7fdb0b7d2bec9e202e772.tar.gz -> docker.el-2.2.0_p20221012.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_md5_=97aa1027f170f17312a180e391c045a2
diff --git a/metadata/md5-cache/app-emacs/docker-tramp-0.1.1 b/metadata/md5-cache/app-emacs/docker-tramp-0.1.1
new file mode 100644
index 000000000000..e61e0ef027b0
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/docker-tramp-0.1.1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-24:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Emacs TRAMP integration for docker containers
+EAPI=8
+HOMEPAGE=https://github.com/emacs-pe/docker-tramp.el/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-24:*
+SLOT=0
+SRC_URI=https://github.com/emacs-pe/docker-tramp.el/archive/v0.1.1.tar.gz -> docker-tramp-0.1.1.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_md5_=c0aae341ee052c026941232c7d748efa
diff --git a/metadata/md5-cache/app-emacs/transient-0.3.7_p20220918 b/metadata/md5-cache/app-emacs/transient-0.3.7_p20220918
new file mode 100644
index 000000000000..57997f4895ea
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/transient-0.3.7_p20220918
@@ -0,0 +1,13 @@
+BDEPEND=sys-apps/texinfo >=app-editors/emacs-25.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Transient commands abstraction for GNU Emacs
+EAPI=8
+HOMEPAGE=https://magit.vc/manual/transient https://github.com/magit/transient
+INHERIT=elisp
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-25.1:*
+SLOT=0
+SRC_URI=https://github.com/magit/transient/archive/097f5be6e0c228790a6e78ffee5f0c599cb58b20.tar.gz -> transient-0.3.7_p20220918.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_md5_=6965d27d57010b7a071741466c096b22
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 6928b35d5d7e..405adaff880f 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/ghostscript-gpl-9.56.1-r3 b/metadata/md5-cache/app-text/ghostscript-gpl-9.56.1-r3
index 30e27399f942..62b557addedd 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.56.1-r3
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.56.1-r3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://ghostscript.com/ https://git.ghostscript.com/?p=ghostpdl.git;a=summary
 INHERIT=autotools toolchain-funcs
 IUSE=cups dbus gtk l10n_de static-libs unicode X l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW
-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
+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
 LICENSE=AGPL-3 CPL-1.0
 RDEPEND=app-text/libpaper:= media-libs/fontconfig >=media-libs/freetype-2.4.9:2= >=media-libs/jbig2dec-0.19:= >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:= media-libs/libjpeg-turbo:= >=media-libs/openjpeg-2.1.0:2= >=media-libs/tiff-4.0.1:= >=sys-libs/zlib-1.2.7 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:3 ) unicode? ( net-dns/libidn:= ) X? ( x11-libs/libXt x11-libs/libXext ) >=app-text/poppler-data-0.4.11-r2 >=media-fonts/urw-fonts-2.4.9 l10n_ja? ( media-fonts/kochi-substitute ) l10n_ko? ( media-fonts/baekmuk-fonts ) l10n_zh-CN? ( media-fonts/arphicfonts ) l10n_zh-TW? ( media-fonts/arphicfonts )
 SLOT=0/9.56
 SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9561/ghostscript-9.56.1.tar.xz https://dev.gentoo.org/~sam/distfiles/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1-patchset-01.tar.xz https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/ghostscript-gpl-9.56.1-patchset-01.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=656ae1fd4f9049c5b274d01bd7d99fa2
+_md5_=ab164f29d6b9a82672f2dcc0a51393ce
diff --git a/metadata/md5-cache/app-text/poppler-data-0.4.11-r2 b/metadata/md5-cache/app-text/poppler-data-0.4.11-r2
index 18af01bfcddf..ff013452d3b7 100644
--- a/metadata/md5-cache/app-text/poppler-data-0.4.11-r2
+++ b/metadata/md5-cache/app-text/poppler-data-0.4.11-r2
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Data files for poppler to support uncommon encodings without xpdfrc
 EAPI=8
 HOMEPAGE=https://poppler.freedesktop.org/
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=AGPL-3+ BSD GPL-2 MIT
 SLOT=0
 SRC_URI=https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz https://dev.gentoo.org/~sam/distfiles/app-text/poppler-data/poppler-data-0.4.11-2-extra.tar.xz
-_md5_=888357fa050413ca3b5da573e6ec334c
+_md5_=53e7c5bc239badb86303100f1f14c676
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index d92ad266ef3f..6421340ad32d 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.14 b/metadata/md5-cache/dev-java/byte-buddy-1.12.14
index 99790f7f6f80..d371320c468e 100644
--- a/metadata/md5-cache/dev-java/byte-buddy-1.12.14
+++ b/metadata/md5-cache/dev-java/byte-buddy-1.12.14
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://bytebuddy.net
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86
+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.14.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=10bea378efe61497efce5a2eaf435927
+_md5_=1472f0f3357b81479663ba4ac86a9e40
diff --git a/metadata/md5-cache/dev-java/commons-logging-1.2-r5 b/metadata/md5-cache/dev-java/commons-logging-1.2-r6
index 9211659872a1..b1a8f896f03f 100644
--- a/metadata/md5-cache/dev-java/commons-logging-1.2-r5
+++ b/metadata/md5-cache/dev-java/commons-logging-1.2-r6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=avalon-logkit? ( dev-java/avalon-logkit:2.0 ) avalon-framework? ( dev-java/avalon-framework:4.2 ) log4j? ( dev-java/log4j-12-api:2 dev-java/log4j-api:2 dev-java/log4j-core:2 ) servletapi? ( dev-java/tomcat-servlet-api:4.0 ) >=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=avalon-logkit? ( dev-java/avalon-logkit:2.0 ) avalon-framework? ( dev-java/avalon-framework:4.2 ) log4j? ( dev-java/log4j-12-api:2 dev-java/log4j-api:2 dev-java/log4j-core:2 ) servletapi? ( dev-java/jakarta-servlet-api:4 ) >=virtual/jdk-1.8:* test? ( dev-java/ant-junit: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=An ultra-thin bridge between different Java logging libraries
 EAPI=8
 HOMEPAGE=https://commons.apache.org/logging/
@@ -7,10 +7,10 @@ INHERIT=java-pkg-2 java-ant-2 java-osgi
 IUSE=avalon-framework avalon-logkit log4j servletapi test doc source
 KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=avalon-logkit? ( dev-java/avalon-logkit:2.0 ) avalon-framework? ( dev-java/avalon-framework:4.2 ) log4j? ( dev-java/log4j-12-api:2 dev-java/log4j-api:2 dev-java/log4j-core:2 ) servletapi? ( dev-java/tomcat-servlet-api:4.0 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=avalon-logkit? ( dev-java/avalon-logkit:2.0 ) avalon-framework? ( dev-java/avalon-framework:4.2 ) log4j? ( dev-java/log4j-12-api:2 dev-java/log4j-api:2 dev-java/log4j-core:2 ) servletapi? ( dev-java/jakarta-servlet-api:4 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 REQUIRED_USE=doc? ( avalon-framework avalon-logkit log4j servletapi )
 RESTRICT=!test? ( test ) !servletapi? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/logging/source/commons-logging-1.2-src.tar.gz
 _eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-osgi	c9b922d3fd7b5c6117f4c4d68e32e881	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=43416132fd6c4efd7cf735c6b5aacef9
+_md5_=8e5b2fdebc8ca72e7d1ed312eb10aa52
diff --git a/metadata/md5-cache/dev-java/jackson-databind-2.13.4 b/metadata/md5-cache/dev-java/jackson-databind-2.13.4.1
index 44917edcc456..1912a47aeda9 100644
--- a/metadata/md5-cache/dev-java/jackson-databind-2.13.4
+++ b/metadata/md5-cache/dev-java/jackson-databind-2.13.4.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.4:2 ~dev-java/jackson-core-2.13.4:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
-SRC_URI=https://github.com/FasterXML/jackson-databind/archive/jackson-databind-2.13.4.tar.gz
+SRC_URI=https://github.com/FasterXML/jackson-databind/archive/jackson-databind-2.13.4.1.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=597aa478eaa9df7d69ad7c66eb1217e9
+_md5_=8240034e5fb534857e85d63df126052d
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.4 b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.4-r1
index 5fd6455b1c34..04666a5b255e 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.4
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-11:* ~dev-java/jackson-annotations-2.13.4:2 ~dev-java/jackson-core-2.13.4:0 ~dev-java/jackson-databind-2.13.4:0 >=dev-java/stax2-api-4.2.1-r1:0 dev-java/woodstox-core:0 test? ( ~dev-java/jackson-module-jakarta-xmlbind-2.13.4:0 dev-java/jaxb-api:4 dev-java/sjsxp:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DEPEND=>=virtual/jdk-11:* ~dev-java/jackson-annotations-2.13.4:2 ~dev-java/jackson-core-2.13.4:0 ~dev-java/jackson-databind-2.13.4.1:0 >=dev-java/stax2-api-4.2.1-r1:0 dev-java/woodstox-core:0 test? ( ~dev-java/jackson-module-jakarta-xmlbind-2.13.4:0 dev-java/jaxb-api:4 dev-java/sjsxp:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
 DESCRIPTION=Data format extension for Jackson
 EAPI=8
 HOMEPAGE=https://github.com/FasterXML/jackson-dataformat-xml
@@ -7,9 +7,9 @@ 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/jackson-annotations-2.13.4:2 ~dev-java/jackson-core-2.13.4:0 ~dev-java/jackson-databind-2.13.4:0 >=dev-java/stax2-api-4.2.1-r1:0 dev-java/woodstox-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.4:2 ~dev-java/jackson-core-2.13.4:0 ~dev-java/jackson-databind-2.13.4.1:0 >=dev-java/stax2-api-4.2.1-r1:0 dev-java/woodstox-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.13.4.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=dfe4f136ff2beb26726428d32b697b42
+_md5_=3e06b34db90afb881523b052af7ad298
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.4 b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.4-r1
index 4c0e569c75f4..eb250d4261fc 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.4
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=~dev-java/jackson-core-2.13.4:0 ~dev-java/jackson-databind-2.13.4:0 >=dev-java/snakeyaml-1.30-r1:0 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DEPEND=~dev-java/jackson-core-2.13.4:0 ~dev-java/jackson-databind-2.13.4.1:0 dev-java/snakeyaml:0 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
 DESCRIPTION=Support for reading and writing YAML-encoded data via Jackson abstractions
 EAPI=8
 HOMEPAGE=https://github.com/FasterXML/jackson-dataformats-text
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-2.13.4.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=8f8ba403670a6715cf1fd1a6632a0b9c
+_md5_=9ae1f83fb5ec5ad078069bae1bc03585
diff --git a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.4 b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.4-r1
index 843b8738fc47..0f736215e932 100644
--- a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.4
+++ b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-11:* ~dev-java/jackson-annotations-2.13.4:2 ~dev-java/jackson-core-2.13.4:0 ~dev-java/jackson-databind-2.13.4:0 dev-java/jakarta-activation:1 dev-java/jaxb-api:4 test? ( dev-java/jaxb-runtime:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DEPEND=>=virtual/jdk-11:* ~dev-java/jackson-annotations-2.13.4:2 ~dev-java/jackson-core-2.13.4:0 ~dev-java/jackson-databind-2.13.4.1:0 dev-java/jakarta-activation:1 dev-java/jaxb-api:4 test? ( dev-java/jaxb-runtime:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
 DESCRIPTION=Support for using Jakarta XML Bind (aka JAXB 3.0) annotations
 EAPI=8
 HOMEPAGE=https://github.com/FasterXML/jackson-modules-base
@@ -7,9 +7,9 @@ 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/jackson-annotations-2.13.4:2 ~dev-java/jackson-core-2.13.4:0 ~dev-java/jackson-databind-2.13.4:0 dev-java/jakarta-activation:1 dev-java/jaxb-api:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.4:2 ~dev-java/jackson-core-2.13.4:0 ~dev-java/jackson-databind-2.13.4.1:0 dev-java/jakarta-activation:1 dev-java/jaxb-api:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-2.13.4.tar.gz -> jackson-module-jakarta-xmlbind-2.13.4.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=1be3341f4941d44c11a163f1705a2928
+_md5_=8969cdcc19d54d9965c7a10975e75109
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 1521804e2c75..8fe74fd8f1e8 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/libxml2-2.10.3 b/metadata/md5-cache/dev-libs/libxml2-2.10.3
new file mode 100644
index 000000000000..1e9cfbfa8026
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libxml2-2.10.3
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig app-arch/xz-utils >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=>=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(-)?] icu? ( >=dev-libs/icu-51.2-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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] ) ) readline? ( sys-libs/readline:= )
+DESCRIPTION=XML C parser and toolkit
+EAPI=8
+HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2
+INHERIT=flag-o-matic python-r1 multilib-minimal gnome.org libtool
+IUSE=debug examples +ftp icu lzma +python readline static-libs test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+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(-)?] icu? ( >=dev-libs/icu-51.2-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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] ) ) readline? ( sys-libs/readline:= )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=mirror://gnome/sources/libxml2/2.10/libxml2-2.10.3.tar.xz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz )
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=2fa007d959b952e6666a01443967dfef
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index b7674fa91c99..96105cd61e07 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/base_bigstring-0.14.0 b/metadata/md5-cache/dev-ml/base_bigstring-0.14.0
index 1e037ce5925b..dfa984248914 100644
--- a/metadata/md5-cache/dev-ml/base_bigstring-0.14.0
+++ b/metadata/md5-cache/dev-ml/base_bigstring-0.14.0
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-4.08.0:=[ocamlopt=] dev-ml/base:= dev-ml/ppx_jane:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=>=dev-lang/ocaml-4.08.0:=[ocamlopt=] dev-ml/base:= dev-ml/ppx_jane:= =dev-ml/ppx_compare-0.14*:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=String type based on Bigarray, for use in I/O and C-bindings
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/base_bigstring
@@ -8,8 +8,8 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=MIT
-RDEPEND=>=dev-lang/ocaml-4.08.0:=[ocamlopt=] dev-ml/base:= dev-ml/ppx_jane:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=>=dev-lang/ocaml-4.08.0:=[ocamlopt=] dev-ml/base:= dev-ml/ppx_jane:= =dev-ml/ppx_compare-0.14*:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/base_bigstring/archive/v0.14.0.tar.gz -> base_bigstring-0.14.0.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=dea925e6135e4aed947d682c531fd11e
+_md5_=792cfcc5ab703292b35ff8fe641e646c
diff --git a/metadata/md5-cache/dev-ml/core_kernel-0.14.2-r1 b/metadata/md5-cache/dev-ml/core_kernel-0.14.2-r1
index 610ef56b4338..d5d52be037e6 100644
--- a/metadata/md5-cache/dev-ml/core_kernel-0.14.2-r1
+++ b/metadata/md5-cache/dev-ml/core_kernel-0.14.2-r1
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=dev-lang/ocaml:= <dev-ml/jst-config-0.15.0 >=dev-ml/ppx_optcomp-0.14.3:= dev-ml/base:= dev-ml/base_bigstring:= dev-ml/base_quickcheck:= dev-ml/bin_prot:= dev-ml/fieldslib:= dev-ml/jane-street-headers:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_assert:= dev-ml/ppx_base:= dev-ml/ppx_hash:= dev-ml/ppx_inline_test:= dev-ml/ppx_jane:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_sexp_message:= dev-ml/sexplib:= dev-ml/splittable_random:= dev-ml/stdio:= dev-ml/time_now:= dev-ml/typerep:= dev-ml/variantslib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=dev-lang/ocaml:= <dev-ml/jst-config-0.15.0 >=dev-ml/ppx_optcomp-0.14.3:= dev-ml/base:= =dev-ml/base_bigstring-0.14*:= dev-ml/base_quickcheck:= dev-ml/bin_prot:= dev-ml/fieldslib:= dev-ml/jane-street-headers:= dev-ml/ocaml-migrate-parsetree:= =dev-ml/ppx_assert-0.14*:= =dev-ml/ppx_base-0.14*:= =dev-ml/ppx_hash-0.14*:= dev-ml/ppx_inline_test:= dev-ml/ppx_jane:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_sexp_message:= dev-ml/sexplib:= dev-ml/splittable_random:= dev-ml/stdio:= dev-ml/time_now:= dev-ml/typerep:= dev-ml/variantslib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=System-independent part of Core
 EAPI=8
 HOMEPAGE=https://github.com/janestreet/core_kernel
@@ -8,9 +8,9 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-lang/ocaml:= <dev-ml/jst-config-0.15.0 >=dev-ml/ppx_optcomp-0.14.3:= dev-ml/base:= dev-ml/base_bigstring:= dev-ml/base_quickcheck:= dev-ml/bin_prot:= dev-ml/fieldslib:= dev-ml/jane-street-headers:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_assert:= dev-ml/ppx_base:= dev-ml/ppx_hash:= dev-ml/ppx_inline_test:= dev-ml/ppx_jane:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_sexp_message:= dev-ml/sexplib:= dev-ml/splittable_random:= dev-ml/stdio:= dev-ml/time_now:= dev-ml/typerep:= dev-ml/variantslib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=dev-lang/ocaml:= <dev-ml/jst-config-0.15.0 >=dev-ml/ppx_optcomp-0.14.3:= dev-ml/base:= =dev-ml/base_bigstring-0.14*:= dev-ml/base_quickcheck:= dev-ml/bin_prot:= dev-ml/fieldslib:= dev-ml/jane-street-headers:= dev-ml/ocaml-migrate-parsetree:= =dev-ml/ppx_assert-0.14*:= =dev-ml/ppx_base-0.14*:= =dev-ml/ppx_hash-0.14*:= dev-ml/ppx_inline_test:= dev-ml/ppx_jane:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_sexp_message:= dev-ml/sexplib:= dev-ml/splittable_random:= dev-ml/stdio:= dev-ml/time_now:= dev-ml/typerep:= dev-ml/variantslib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/0.14.2
 SRC_URI=https://github.com/janestreet/core_kernel/archive/v0.14.2.tar.gz -> core_kernel-0.14.2.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=9a960d947586301f6103e064bdff3c51
+_md5_=6d9eb27e479dcbba7bf1d4e3325f9e17
diff --git a/metadata/md5-cache/dev-ml/jst-config-0.14.1 b/metadata/md5-cache/dev-ml/jst-config-0.14.1
index 2151c18d0dff..72dd8a1dc6df 100644
--- a/metadata/md5-cache/dev-ml/jst-config-0.14.1
+++ b/metadata/md5-cache/dev-ml/jst-config-0.14.1
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=dev-ml/base:= dev-ml/ppx_assert:= dev-ml/stdio:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND==dev-ml/base-0.14*:= dev-ml/ppx_assert:= dev-ml/stdio:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Compile-time configuration for Jane Street libraries
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/jst-config
@@ -8,8 +8,8 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=dev-ml/base:= dev-ml/ppx_assert:= dev-ml/stdio:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND==dev-ml/base-0.14*:= dev-ml/ppx_assert:= dev-ml/stdio:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/jst-config/archive/v0.14.1.tar.gz -> jst-config-0.14.1.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=adbeae5a69bc51155fdbb7d24ccdb444
+_md5_=93945cc9dfbd1c8a36dd3dc651a940c1
diff --git a/metadata/md5-cache/dev-ml/sexplib-0.14.0 b/metadata/md5-cache/dev-ml/sexplib-0.14.0
index a111e3abf586..52bed74f500c 100644
--- a/metadata/md5-cache/dev-ml/sexplib-0.14.0
+++ b/metadata/md5-cache/dev-ml/sexplib-0.14.0
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=dev-ml/parsexp:= dev-ml/base:= dev-ml/sexplib0:= dev-ml/num:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND==dev-ml/parsexp-0.14*:= dev-ml/base:= dev-ml/sexplib0:0/0.14.0 dev-ml/num:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Library for automated conversion of OCaml-values to and from S-expressions
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/sexplib
@@ -8,8 +8,8 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
-RDEPEND=dev-ml/parsexp:= dev-ml/base:= dev-ml/sexplib0:= dev-ml/num:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND==dev-ml/parsexp-0.14*:= dev-ml/base:= dev-ml/sexplib0:0/0.14.0 dev-ml/num:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/sexplib/archive/v0.14.0.tar.gz -> sexplib-0.14.0.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=2ed24cbbeb59e1cac926324203c4c4f1
+_md5_=a1c036b63df53153448300e9de6f9950
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index df0006d15386..98622c20168e 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/apsw-3.39.4.0 b/metadata/md5-cache/dev-python/apsw-3.39.4.0
index d6dd3784f23b..1625331b6872 100644
--- a/metadata/md5-cache/dev-python/apsw-3.39.4.0
+++ b/metadata/md5-cache/dev-python/apsw-3.39.4.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/rogerbinns/apsw/ https://pypi.org/project/apsw/
 INHERIT=distutils-r1
 IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc64 x86
 LICENSE=ZLIB
 RDEPEND=>=dev-db/sqlite-3.39.4:3 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 )
 SLOT=0
 SRC_URI=https://github.com/rogerbinns/apsw/archive/3.39.4.0.tar.gz -> apsw-3.39.4.0.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f21ef7b5826966bb24795bb1bed9a51f
+_md5_=84ea79acc291b6c38d1f35a0c9e30ac6
diff --git a/metadata/md5-cache/dev-python/cryptography-38.0.1 b/metadata/md5-cache/dev-python/cryptography-38.0.1
index 4798ab5c157f..9f28642963f9 100644
--- a/metadata/md5-cache/dev-python/cryptography-38.0.1
+++ b/metadata/md5-cache/dev-python/cryptography-38.0.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/
 INHERIT=cargo distutils-r1 multiprocessing
 IUSE=test debug python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0 BSD BSD-2 MIT Unicode-DFS-2016
 RDEPEND=>=dev-libs/openssl-1.0.2o-r6:0= python_targets_python3_8? ( >=dev-python/cffi-1.8:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-python/cffi-1.8:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[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=[threads(+)] ) 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(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] )
 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=mirror://pypi/c/cryptography/cryptography-38.0.1.tar.gz https://crates.io/api/v1/crates/Inflector/0.11.4/download -> Inflector-0.11.4.crate https://crates.io/api/v1/crates/aliasable/0.1.3/download -> aliasable-0.1.3.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/asn1/0.12.2/download -> asn1-0.12.2.crate https://crates.io/api/v1/crates/asn1_derive/0.12.2/download -> asn1_derive-0.12.2.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bumpalo/3.10.0/download -> bumpalo-3.10.0.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/chrono/0.4.22/download -> chrono-0.4.22.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.47/download -> iana-time-zone-0.1.47.crate https://crates.io/api/v1/crates/indoc/0.3.6/download -> indoc-0.3.6.crate https://crates.io/api/v1/crates/indoc-impl/0.3.6/download -> indoc-impl-0.3.6.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/js-sys/0.3.59/download -> js-sys-0.3.59.crate https://crates.io/api/v1/crates/libc/0.2.132/download -> libc-0.2.132.crate https://crates.io/api/v1/crates/lock_api/0.4.8/download -> lock_api-0.4.8.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/once_cell/1.14.0/download -> once_cell-1.14.0.crate https://crates.io/api/v1/crates/ouroboros/0.15.4/download -> ouroboros-0.15.4.crate https://crates.io/api/v1/crates/ouroboros_macro/0.15.4/download -> ouroboros_macro-0.15.4.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/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.crate https://crates.io/api/v1/crates/pem/1.1.0/download -> pem-1.1.0.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.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/proc-macro2/1.0.43/download -> proc-macro2-1.0.43.crate https://crates.io/api/v1/crates/pyo3/0.15.2/download -> pyo3-0.15.2.crate https://crates.io/api/v1/crates/pyo3-build-config/0.15.2/download -> pyo3-build-config-0.15.2.crate https://crates.io/api/v1/crates/pyo3-macros/0.15.2/download -> pyo3-macros-0.15.2.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.15.2/download -> pyo3-macros-backend-0.15.2.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/smallvec/1.9.0/download -> smallvec-1.9.0.crate https://crates.io/api/v1/crates/syn/1.0.99/download -> syn-1.0.99.crate https://crates.io/api/v1/crates/unicode-ident/1.0.3/download -> unicode-ident-1.0.3.crate https://crates.io/api/v1/crates/unindent/0.1.10/download -> unindent-0.1.10.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.82/download -> wasm-bindgen-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.82/download -> wasm-bindgen-backend-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.82/download -> wasm-bindgen-macro-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.82/download -> wasm-bindgen-macro-support-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.82/download -> wasm-bindgen-shared-0.2.82.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 test? ( mirror://pypi/c/cryptography_vectors/cryptography_vectors-38.0.1.tar.gz )
 _eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=751522e5575f439dafc145fc60d73268
+_md5_=9f92cca8d4d260d868f0cb48fc489104
diff --git a/metadata/md5-cache/dev-python/discogs-client-2.4 b/metadata/md5-cache/dev-python/discogs-client-2.4
index 9ac7f380ccfd..f4b3717d1018 100644
--- a/metadata/md5-cache/dev-python/discogs-client-2.4
+++ b/metadata/md5-cache/dev-python/discogs-client-2.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/joalla/discogs_client/ https://pypi.org/project/python3-discogs-client/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/oauthlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python3-discogs-client/python3-discogs-client-2.4.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c78cbcecb88f86c1015665a8ab52db3b
+_md5_=243d98732f89e2f500a0c670a1ddb0ae
diff --git a/metadata/md5-cache/dev-python/docutils-glep-1.5 b/metadata/md5-cache/dev-python/docutils-glep-1.5
index 10ffba458a32..de1d0dbf14d0 100644
--- a/metadata/md5-cache/dev-python/docutils-glep-1.5
+++ b/metadata/md5-cache/dev-python/docutils-glep-1.5
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/projg2/docutils-glep/ https://pypi.org/project/docutils-glep/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 RDEPEND=>=dev-python/docutils-0.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[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 )
 SLOT=0
 SRC_URI=https://github.com/projg2/docutils-glep/archive/v1.5.tar.gz -> docutils-glep-1.5.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=0a867bcdd9317a96e3a3c721dd39cbb8
+_md5_=f871ec51c85fef0949afab05f95c81b7
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.41 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.41
index b715260d97a5..913acebe183b 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.41
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.41
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/ https://github.com/sqlalchemy/sqlalchemy/
 INHERIT=distutils-r1 optfeature
 IUSE=examples +sqlite test 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[sqlite?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite?] )
 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/SQLAlchemy/SQLAlchemy-1.4.41.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c1806b6b9981e33a0941077cde5be220
+_md5_=900218c854893143c7fcb3504b1ca3a3
diff --git a/metadata/md5-cache/dev-python/termcolor-2.0.0 b/metadata/md5-cache/dev-python/termcolor-2.0.0
index 35465d9fed00..16e129f40abf 100644
--- a/metadata/md5-cache/dev-python/termcolor-2.0.0
+++ b/metadata/md5-cache/dev-python/termcolor-2.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/termcolor/termcolor/ https://pypi.org/project/termcolor/
 INHERIT=distutils-r1
 IUSE=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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 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/t/termcolor/termcolor-2.0.0.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=64c75e26d2a2a240466b795931c18854
+_md5_=a9518eb16c6b99bae7d4b16026fab001
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 03423206fccb..01c9d517e5c7 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/pkgcheck-0.10.17 b/metadata/md5-cache/dev-util/pkgcheck-0.10.17
new file mode 100644
index 000000000000..744686891349
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.10.17
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/snakeoil-0.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-apps/pkgcore-0.12.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-libs/tree-sitter dev-libs/tree-sitter-bash dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] emacs? ( >=app-editors/emacs-24.1:* app-emacs/ebuild-mode app-emacs/flycheck ) test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git ) test? ( >=dev-python/snakeoil-0.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-apps/pkgcore-0.12.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-libs/tree-sitter dev-libs/tree-sitter-bash dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] emacs? ( >=app-editors/emacs-24.1:* app-emacs/ebuild-mode app-emacs/flycheck ) ) 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 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DESCRIPTION=pkgcore-based QA utility for ebuild repos
+EAPI=8
+HOMEPAGE=https://github.com/pkgcore/pkgcheck
+INHERIT=elisp-common distutils-r1 optfeature
+IUSE=emacs test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD MIT
+RDEPEND=>=dev-python/snakeoil-0.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-apps/pkgcore-0.12.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-libs/tree-sitter dev-libs/tree-sitter-bash dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] emacs? ( >=app-editors/emacs-24.1:* app-emacs/ebuild-mode app-emacs/flycheck ) 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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.10.17.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=afc8156778d3eac7101f58449f9eabc5
diff --git a/metadata/md5-cache/dev-util/pkgdev-0.2.3 b/metadata/md5-cache/dev-util/pkgdev-0.2.3
new file mode 100644
index 000000000000..9763e0db77ef
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pkgdev-0.2.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/snakeoil-0.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/pkgcheck-0.10.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-apps/pkgcore-0.12.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git ) 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 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Collection of tools for Gentoo development
+EAPI=8
+HOMEPAGE=https://github.com/pkgcore/pkgdev
+INHERIT=distutils-r1
+IUSE=doc doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=BSD MIT
+RDEPEND=>=dev-python/snakeoil-0.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/pkgcheck-0.10.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-apps/pkgcore-0.12.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git 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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgdev/pkgdev-0.2.3.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=3a2ffae5ed663529255708f7314deee2
diff --git a/metadata/md5-cache/dev-util/pkgdev-9999 b/metadata/md5-cache/dev-util/pkgdev-9999
index 2aa178d14e7f..58cb628df6dc 100644
--- a/metadata/md5-cache/dev-util/pkgdev-9999
+++ b/metadata/md5-cache/dev-util/pkgdev-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=6f0fd69bfa2510ffeab54ad3f6e70895
+_md5_=3a2ffae5ed663529255708f7314deee2
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index e7249fddb9d0..b6636111c104 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-42.4-r3 b/metadata/md5-cache/gnome-base/gnome-shell-42.4-r4
index 7c1dd21c06a8..4b8541a42adc 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-42.4-r3
+++ b/metadata/md5-cache/gnome-base/gnome-shell-42.4-r4
@@ -10,10 +10,10 @@ IUSE=+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd
 KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2+ LGPL-2+
 PDEPEND=>=gnome-base/gdm-3.5[introspection(+)] >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] browser-extension? ( gnome-extra/gnome-browser-connector )
-RDEPEND=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.7.5:0=[introspection] >=dev-libs/glib-2.68:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.71.1[cairo] >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-42.0:0/10[introspection,test?] >=sys-auth/polkit-0.120_p20220509[introspection] >=gnome-base/gsettings-desktop-schemas-42_beta[introspection] >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.19 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] bluetooth? ( net-wireless/gnome-bluetooth:3=[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 >=media-video/pipewire-0.3.0:= networkmanager? ( >=net-misc/networkmanager-1.10.4[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-242:= >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-atk-2.5.3:2 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-libs/libpulse-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 gui-libs/gtk:4[introspection] 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 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) media-libs/mesa[X(+)] >=sys-apps/accountsservice-0.6.14[introspection] app-accessibility/at-spi2-core:2[introspection] app-misc/geoclue[introspection] media-libs/graphene[introspection] >=dev-libs/libgweather-4.0.0:4[introspection] <dev-libs/libgweather-4.2.0:4 x11-libs/pango[introspection] net-libs/libsoup:2.4[introspection] >=sys-power/upower-0.99:=[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 x11-misc/xdg-utils >=x11-themes/adwaita-icon-theme-3.26 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] ) telepathy? ( >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] ) media-fonts/cantarell || ( sys-apps/xdg-desktop-portal-gnome <sys-apps/xdg-desktop-portal-gtk-1.14.0 )
+RDEPEND=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.7.5:0=[introspection] >=dev-libs/glib-2.68:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.71.1[cairo] >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-42.0:0/10[introspection,test?] >=sys-auth/polkit-0.120_p20220509[introspection] >=gnome-base/gsettings-desktop-schemas-42_beta[introspection] >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.19 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] bluetooth? ( net-wireless/gnome-bluetooth:3=[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 >=media-video/pipewire-0.3.0:= networkmanager? ( >=net-misc/networkmanager-1.10.4[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-242:= >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-atk-2.5.3:2 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-libs/libpulse-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 gui-libs/gtk:4[introspection] 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 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) media-libs/mesa[X(+)] >=sys-apps/accountsservice-0.6.14[introspection] app-accessibility/at-spi2-core:2[introspection] app-misc/geoclue[introspection] media-libs/graphene[introspection] >=dev-libs/libgweather-4.0.0:4[introspection] <dev-libs/libgweather-4.2.0:4 x11-libs/pango[introspection] net-libs/libsoup:2.4[introspection] >=sys-power/upower-0.99:=[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 x11-misc/xdg-utils >=x11-themes/adwaita-icon-theme-3.26 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] ) telepathy? ( >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] ) media-fonts/cantarell sys-apps/xdg-desktop-portal-gnome
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ?? ( elogind systemd )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/42/gnome-shell-42.4.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f05ae089753487bc99d2a2267306196b
+_md5_=a573b4c41cbcbc075fc46cc97f829f17
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 8e67b4bd9cbf..3ac002fb4ba4 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/yoshimi-2.2.2.1 b/metadata/md5-cache/media-sound/yoshimi-2.2.2.1
index 5428f2aa1b6b..ff340406e92e 100644
--- a/metadata/md5-cache/media-sound/yoshimi-2.2.2.1
+++ b/metadata/md5-cache/media-sound/yoshimi-2.2.2.1
@@ -7,10 +7,10 @@ HOMEPAGE=https://yoshimi.github.io/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake flag-o-matic xdg
 IUSE=+lv2
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/mxml media-libs/alsa-lib media-libs/fontconfig media-libs/libsndfile sci-libs/fftw:3.0= sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/jack x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 )
 SLOT=0
 SRC_URI=https://github.com/Yoshimi/yoshimi/archive/2.2.2.1.tar.gz -> yoshimi-2.2.2.1.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0108fbc5a76ce2e4101c349c69cb47b1
+_md5_=eec97c1054cf3a7eeaa47134ac81f162
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index bbc3a43e8a5b..bb85a7c1400e 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.59-r1 b/metadata/md5-cache/media-video/pipewire-0.3.59-r1
new file mode 100644
index 000000000000..81ac4dfe98a9
--- /dev/null
+++ b/metadata/md5-cache/media-video/pipewire-0.3.59-r1
@@ -0,0 +1,18 @@
+BDEPEND=>=dev-util/meson-0.59 virtual/pkgconfig || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=acct-group/audio media-libs/alsa-lib sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) 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(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
+DESCRIPTION=Multimedia processing graphs
+EAPI=8
+HOMEPAGE=https://pipewire.org/
+INHERIT=flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
+IUSE=bluetooth dbus doc echo-cancel extra flatpak gstreamer jack-client jack-sdk lv2 pipewire-alsa sound-server ssl system-service systemd test udev v4l X zeroconf 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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT LGPL-2.1+ GPL-2
+PDEPEND=>=media-video/wireplumber-0.4.8-r3
+RDEPEND=acct-group/audio media-libs/alsa-lib sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) 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(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
+REQUIRED_USE=jack-sdk? ( !jack-client ) system-service? ( systemd ) !sound-server? ( !pipewire-alsa ) jack-client? ( dbus )
+RESTRICT=!test? ( test )
+SLOT=0/0.4
+SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.59/pipewire-0.3.59.tar.gz
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=782a6065a12782c57068eada6b0c30be
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index f9bf019ff6c4..ff8c7b7e6e06 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/dhcp-4.4.2_p1-r2 b/metadata/md5-cache/net-misc/dhcp-4.4.2_p1-r2
deleted file mode 100644
index ac2043dc5c13..000000000000
--- a/metadata/md5-cache/net-misc/dhcp-4.4.2_p1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare unpack
-DEPEND=acct-group/dhcp acct-user/dhcp client? ( kernel_linux? ( ipv6? ( sys-apps/iproute2 ) sys-apps/net-tools ) ) ldap? ( net-nds/openldap:= ssl? ( dev-libs/openssl:= ) )
-DESCRIPTION=ISC Dynamic Host Configuration Protocol (DHCP) client/server
-EAPI=7
-HOMEPAGE=https://www.isc.org/dhcp
-INHERIT=systemd toolchain-funcs flag-o-matic tmpfiles
-IUSE=+client ipv6 ldap selinux +server ssl vim-syntax
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MPL-2.0 BSD SSLeay GPL-2
-RDEPEND=acct-group/dhcp acct-user/dhcp client? ( kernel_linux? ( ipv6? ( sys-apps/iproute2 ) sys-apps/net-tools ) ) ldap? ( net-nds/openldap:= ssl? ( dev-libs/openssl:= ) ) selinux? ( sec-policy/selinux-dhcp ) vim-syntax? ( app-vim/dhcpd-syntax ) virtual/tmpfiles
-SLOT=0
-SRC_URI=ftp://ftp.isc.org/isc/dhcp/dhcp-4.4.2-P1.tar.gz ftp://ftp.isc.org/isc/dhcp/4.4.2-P1/dhcp-4.4.2-P1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f2ee55c7de64e3325bcde340898a96c7
diff --git a/metadata/md5-cache/net-misc/dhcp-4.4.3-r1 b/metadata/md5-cache/net-misc/dhcp-4.4.3-r1
deleted file mode 100644
index 3cf4be9282ef..000000000000
--- a/metadata/md5-cache/net-misc/dhcp-4.4.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare unpack
-DEPEND=acct-group/dhcp acct-user/dhcp client? ( kernel_linux? ( ipv6? ( sys-apps/iproute2 ) sys-apps/net-tools ) ) ldap? ( net-nds/openldap:= ssl? ( dev-libs/openssl:= ) )
-DESCRIPTION=ISC Dynamic Host Configuration Protocol (DHCP) client/server
-EAPI=7
-HOMEPAGE=https://www.isc.org/dhcp
-INHERIT=systemd toolchain-funcs flag-o-matic tmpfiles
-IUSE=+client ipv6 ldap selinux +server ssl vim-syntax
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MPL-2.0 BSD SSLeay GPL-2
-RDEPEND=acct-group/dhcp acct-user/dhcp client? ( kernel_linux? ( ipv6? ( sys-apps/iproute2 ) sys-apps/net-tools ) ) ldap? ( net-nds/openldap:= ssl? ( dev-libs/openssl:= ) ) selinux? ( sec-policy/selinux-dhcp ) vim-syntax? ( app-vim/dhcpd-syntax ) virtual/tmpfiles
-SLOT=0
-SRC_URI=ftp://ftp.isc.org/isc/dhcp/dhcp-4.4.3.tar.gz ftp://ftp.isc.org/isc/dhcp/4.4.3/dhcp-4.4.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0603caa77936b187642c2ec327d56470
diff --git a/metadata/md5-cache/net-misc/dhcp-4.4.3_p1 b/metadata/md5-cache/net-misc/dhcp-4.4.3_p1
index c515ff95d2d7..ec39c7790348 100644
--- a/metadata/md5-cache/net-misc/dhcp-4.4.3_p1
+++ b/metadata/md5-cache/net-misc/dhcp-4.4.3_p1
@@ -12,4 +12,4 @@ RDEPEND=acct-group/dhcp acct-user/dhcp client? ( kernel_linux? ( ipv6? ( sys-app
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/dhcp/dhcp-4.4.3-P1.tar.gz ftp://ftp.isc.org/isc/dhcp/4.4.3-P1/dhcp-4.4.3-P1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0603caa77936b187642c2ec327d56470
+_md5_=a42ba7b5b52d713a89eba4151c51c510
diff --git a/metadata/md5-cache/net-misc/kafkacat-1.7.1 b/metadata/md5-cache/net-misc/kafkacat-1.7.1
new file mode 100644
index 000000000000..666ff9abdfe3
--- /dev/null
+++ b/metadata/md5-cache/net-misc/kafkacat-1.7.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=>=dev-libs/librdkafka-0.9.4 avro? ( dev-libs/avro-c dev-libs/libserdes ) json? ( dev-libs/yajl )
+DESCRIPTION=Generic command line non-JVM Apache Kafka producer and consumer
+EAPI=7
+HOMEPAGE=https://github.com/edenhill/kcat
+INHERIT=toolchain-funcs
+IUSE=+avro +json
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=>=dev-libs/librdkafka-0.9.4 avro? ( dev-libs/avro-c dev-libs/libserdes ) json? ( dev-libs/yajl )
+SLOT=0
+SRC_URI=https://github.com/edenhill/kcat/archive/1.7.1.tar.gz -> kcat-1.7.1.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=29330d4f8c78d9a8c43e99b0f2ac20d2
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index ae397d8f0728..8089b7e84692 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/systemd-251.6 b/metadata/md5-cache/sys-apps/systemd-251.6
new file mode 100644
index 000000000000..689d9c1b25fc
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-251.6
@@ -0,0 +1,18 @@
+BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig test? ( app-text/tree dev-lang/perl sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/lxml[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
+DEPEND=>=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) iptables? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.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(-)?] ) >=sys-kernel/linux-headers-4.15 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+DESCRIPTION=System and service manager for Linux
+EAPI=7
+HOMEPAGE=http://systemd.io/
+INHERIT=bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+IUSE=acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +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 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
+RDEPEND=>=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) iptables? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.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(-)?] ) >=acct-group/adm-0-r1 >=acct-group/wheel-0-r1 >=acct-group/kmem-0-r1 >=acct-group/tty-0-r1 >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 >=acct-group/kvm-0-r1 >=acct-group/lp-0-r1 >=acct-group/render-0-r1 acct-group/sgx >=acct-group/tape-0-r1 acct-group/users >=acct-group/video-0-r1 >=acct-group/systemd-journal-0-r1 >=acct-user/root-0-r1 acct-user/nobody >=acct-user/systemd-journal-remote-0-r1 >=acct-user/systemd-coredump-0-r1 >=acct-user/systemd-network-0-r1 acct-user/systemd-oom >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] sec-policy/selinux-ntp ) sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
+REQUIRED_USE=dns-over-tls? ( || ( gnutls openssl ) ) homed? ( cryptsetup pam openssl ) importd? ( curl lzma || ( gcrypt openssl ) ) pwquality? ( homed )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/systemd/systemd-stable/archive/v251.6/systemd-stable-251.6.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=5096dc32de6d590add81ede4262dad68
diff --git a/metadata/md5-cache/sys-apps/systemd-utils-251.6 b/metadata/md5-cache/sys-apps/systemd-utils-251.6
new file mode 100644
index 000000000000..605a7d874f13
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-utils-251.6
@@ -0,0 +1,18 @@
+BDEPEND=|| ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gperf >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=elibc_musl? ( >=sys-libs/musl-1.2.3 ) selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) >=sys-kernel/linux-headers-3.11 boot? ( >=sys-boot/gnu-efi-3.0.2 )
+DESCRIPTION=Utilities split out from systemd for OpenRC users
+EAPI=8
+HOMEPAGE=https://systemd.io/
+INHERIT=bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+IUSE=+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=udev? ( >=sys-fs/udev-init-scripts-34 )
+RDEPEND=elibc_musl? ( >=sys-libs/musl-1.2.3 ) selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) boot? ( !<sys-boot/systemd-boot-250 ) tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 ) udev? ( acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kmem acct-group/kvm acct-group/lp acct-group/render acct-group/sgx acct-group/tape acct-group/tty acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/hwids[udev] !<sys-fs/udev-250 !sys-fs/eudev ) !sys-apps/systemd
+REQUIRED_USE=|| ( boot tmpfiles sysusers udev )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v251.6.tar.gz -> systemd-stable-251.6.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/dist/systemd-musl-patches-251.2.tar.gz )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
+_md5_=73d449763793f8a98e5d115dbf59e123
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 4ffd74dc5298..70bb08547d4f 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/lld-13.0.1-r1 b/metadata/md5-cache/sys-devel/lld-13.0.1-r1
new file mode 100644
index 000000000000..13d23d83b142
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/lld-13.0.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/lit-13.0.1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/lit-13.0.1[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/lit-13.0.1[python_targets_python3_8(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-13.0.1 !!sys-devel/llvm:0
+DESCRIPTION=The LLVM linker (link editor)
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1
+IUSE=debug test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=~sys-devel/llvm-13.0.1 !sys-devel/lld:0
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=13/13
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.1.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	9407b72c482a902f7f7d94f1302ba826	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=3fa8b1e18223c5e3afb23c226c93c378
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 0b1887ef21fd..501222c224da 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20221012 b/metadata/md5-cache/sys-kernel/linux-firmware-20221012
index 17b2fd4bda55..944d551226e8 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20221012
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20221012
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
 INHERIT=mount-boot savedconfig
 IUSE=initramfs +redistributable savedconfig unknown-license savedconfig
-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=GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) unknown-license? ( all-rights-reserved )
 RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-block/qla-fc-firmware !sys-firmware/iwl1000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/raspberrypi-wifi-ucode ) unknown-license? ( !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] ) )
 REQUIRED_USE=initramfs? ( redistributable )
@@ -13,4 +13,4 @@ RESTRICT=binchecks strip test unknown-license? ( bindist )
 SLOT=0
 SRC_URI=https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/linux-firmware-20221012.tar.xz
 _eclasses_=mount-boot	02a45c5e022c08dbc05178522b2772f2	portability	58227860123d3e8da23290064ce3373e	savedconfig	4011d8d7370446e970e2c92b20a31341
-_md5_=6695b9043faeabe0f5ce7256f3425040
+_md5_=f9868c67490659913163798b02bb47cd
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index a0dda5d54011..7f7a2db6a4b6 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/zlib-1.2.13 b/metadata/md5-cache/sys-libs/zlib-1.2.13
new file mode 100644
index 000000000000..d45168af36df
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/zlib-1.2.13
@@ -0,0 +1,15 @@
+BDEPEND=minizip? ( || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 ) verify-sig? ( sec-keys/openpgp-keys-madler ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=!sys-libs/zlib-ng[compat]
+DESCRIPTION=Standard (de)compression library
+EAPI=8
+HOMEPAGE=https://zlib.net/
+INHERIT=autotools multilib-minimal usr-ldscript verify-sig
+IUSE=minizip 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 split-usr verify-sig
+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 ~x86-winnt
+LICENSE=ZLIB
+RDEPEND=!sys-libs/zlib-ng[compat]
+SLOT=0/1
+SRC_URI=https://zlib.net/zlib-1.2.13.tar.xz https://zlib.net/fossils/zlib-1.2.13.tar.xz https://zlib.net/current/beta/zlib-1.2.13.tar.xz verify-sig? ( https://zlib.net/zlib-1.2.13.tar.xz.asc ) elibc_Cygwin? ( https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch -> zlib-1.2.11-cygwin-gzopen_w.patch https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch -> zlib-1.2.7-cygwin-minizip.patch )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=5880485fb06e31db5c5bc110c0ed5c1c
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index dda085de67be..b2c1c7c51e9d 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/seamonkey-2.53.13 b/metadata/md5-cache/www-client/seamonkey-2.53.13
index 1d5109a2daa0..a72cb6a383e4 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.53.13
+++ b/metadata/md5-cache/www-client/seamonkey-2.53.13
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2 >=app-text/hunspell-1.5.4:= dev-libs/atk >=dev-libs/glib-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/seamonkey/releases/2.53.13/source/seamonkey-2.53.13.source.tar.xz -> seamonkey-2.53.13.source.tar.xz https://archive.mozilla.org/pub/seamonkey/releases/2.53.13/source/seamonkey-2.53.13.source-l10n.tar.xz -> seamonkey-2.53.13.source-l10n.tar.xz https://github.com/BioMike/gentoo-seamonkey-patches/archive/refs/tags/2.53.13.tar.gz -> seamonkey-2.53.13-patches.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mozcoreconf-v6	31a6d2316984c386ce9094883a0ba1ee	mozextension	d63ee4e7c8fe4efa03011a91a2d7ff83	mozlinguas-v2	c09206fab700c5657f500fc2c9baeb6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mozcoreconf-v6	873239a4b91e1dc60cfe80a0583a7a50	mozextension	d63ee4e7c8fe4efa03011a91a2d7ff83	mozlinguas-v2	c09206fab700c5657f500fc2c9baeb6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=8355c0f4a1f6c20370c505b235c5aa74
diff --git a/metadata/md5-cache/www-client/seamonkey-2.53.14 b/metadata/md5-cache/www-client/seamonkey-2.53.14-r1
index 3d337195e95c..364f9356ccff 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.53.14
+++ b/metadata/md5-cache/www-client/seamonkey-2.53.14-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/unzip app-arch/zip >=dev-lang/nasm-2.13 dev-lang/perl dev-util/cbindgen >=sys-devel/binutils-2.16.1 virtual/pkgconfig <=virtual/rust-1.63.0 amd64? ( >=dev-lang/yasm-1.1 ) lto? ( sys-devel/binutils[gold] ) x86? ( >=dev-lang/yasm-1.1 ) 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 virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( >=dev-lang/python-3.10.4:3.10[ncurses,sqlite,ssl,threads(+)] >=dev-lang/python-3.9.12:3.9[ncurses,sqlite,ssl,threads(+)] >=dev-lang/python-3.8.13:3.8[ncurses,sqlite,ssl,threads(+)] )
+BDEPEND=app-arch/unzip app-arch/zip >=dev-lang/nasm-2.13 dev-lang/perl dev-util/cbindgen >=sys-devel/binutils-2.16.1 virtual/pkgconfig <virtual/rust-1.65.0 amd64? ( >=dev-lang/yasm-1.1 ) lto? ( sys-devel/binutils[gold] ) x86? ( >=dev-lang/yasm-1.1 ) 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 virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( >=dev-lang/python-3.10.4:3.10[ncurses,sqlite,ssl,threads(+)] >=dev-lang/python-3.9.12:3.9[ncurses,sqlite,ssl,threads(+)] >=dev-lang/python-3.8.13:3.8[ncurses,sqlite,ssl,threads(+)] )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
 DEPEND=app-arch/bzip2 >=app-text/hunspell-1.5.4:= dev-libs/atk >=dev-libs/glib-2.26:2 >=dev-libs/libffi-3.0.10:= >=dev-libs/nspr-4.23 >=dev-libs/nss-3.47.1 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=media-libs/mesa-10.2:= >=sys-libs/zlib-1.2.3 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt x11-libs/libxcb:= >=x11-libs/pango-1.22.0 x11-libs/pixman media-video/ffmpeg virtual/freedesktop-icon-theme dbus? ( >=dev-libs/dbus-glib-0.72 >=sys-apps/dbus-0.60 ) jack? ( virtual/jack ) kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.9-r1 >=media-libs/harfbuzz-1.3.3:0= ) system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-libvpx? ( >=media-libs/libvpx-1.8.0:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.31:0=[apng] ) system-sqlite? ( >=dev-db/sqlite-3.38.2:3[secure-delete] ) wifi? ( kernel_linux? ( >=dev-libs/dbus-glib-0.72 net-misc/networkmanager >=sys-apps/dbus-0.60 ) ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) app-arch/unzip
 DESCRIPTION=Seamonkey Web Browser
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2 >=app-text/hunspell-1.5.4:= dev-libs/atk >=dev-libs/glib-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/seamonkey/releases/2.53.14/source/seamonkey-2.53.14.source.tar.xz -> seamonkey-2.53.14.source.tar.xz https://archive.mozilla.org/pub/seamonkey/releases/2.53.14/source/seamonkey-2.53.14.source-l10n.tar.xz -> seamonkey-2.53.14.source-l10n.tar.xz https://github.com/BioMike/gentoo-seamonkey-patches/archive/refs/tags/2.53.14.tar.gz -> seamonkey-2.53.14-patches.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mozcoreconf-v6	31a6d2316984c386ce9094883a0ba1ee	mozextension	d63ee4e7c8fe4efa03011a91a2d7ff83	mozlinguas-v2	c09206fab700c5657f500fc2c9baeb6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=73a37a827303ca17f5d822d62fe2731b
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mozcoreconf-v6	873239a4b91e1dc60cfe80a0583a7a50	mozextension	d63ee4e7c8fe4efa03011a91a2d7ff83	mozlinguas-v2	c09206fab700c5657f500fc2c9baeb6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=cb9c89106cac1b5f90708a78ce745079
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 4bfeec628b44..f138f99b4a96 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-10-14T17:39:58Z
+TIMESTAMP 2022-10-15T00:09:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNJnu5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNJ+lFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCUExAAl09veu2LcFjcY5yN+F7lPlkvQlNoKtB4ou2n7zR1GFeWhs8GUbkpJEfa
-0xsUYMUcj1Rg3XyRvTdnNaCzpNPb4q8hBov9aXb7UzZ0Lw9775ZncBxxqMtCx5QE
-QAjsOHlnbCpDJQGla97cuSlqlko5EX0iET6e71uvimfVT6XyCKpqZfjl91RUMgPD
-bjpZ9uECzUSYj4PzDdGnLmKCZKVF7Azgl3DE9I7LRfleRUp/Slo/x2nybD47Oq4L
-KP5Yg7EfEK4GVJPMhIQ4TdOzd2quNhHCtNj18ALSlPjXtM54UGeyf22K+hKhMcg9
-k9ArdADND9D56iKm4p9xhpOwPcBaphKAUVKLp7r7fK/teD9E6PkiRFxz/UfYWn/B
-E746scTe1WedQqvuKQU3wv9izy8g+FaiN5yj5f6wZgSKaPJLeCoBPyuKDDdD3zWF
-mJWcGp31uoGS753JmqqSdwjeUJFSXh1EaersN/GooMjB2rGDGu/TZ43FUWtrHVYk
-XuFCjI7UT8NRl+b+6afPggHTCSsARbSynHfiJ3PI8kq8vDG/tCv3MI/20wIiM/x/
-M8aeaea9ZuLhzQsVoJsPmQHB6lAN12RlnHlCfvi4wTz9En3mviV8E4PbbajjETKJ
-G9eirpn9SUF7fIhCPmWYlHQf4raJnZwdSMPLeV3MuEYG3OWAIog=
-=7xvM
+klBf8RAAlmXqyDbPQ5X5G+NiwCWv2qVZSxsoWZj3mQCr+zpkXRq22leu3/ZrS/up
+cEuSapFYxl5YzNZOJwcfc+c0MaFBQ6AIeB0YOPx56aeRu0hEASBbOmpOveQwzdTl
+ghVm2l9BnbbU0Mwj2buzvuPSTXUJjYzyBkv6xAVKKJzq1odcOE1Fc/msphKJRClb
+RZTZuUYz/3rJQ+Sb2rbvBgG+m2eEl7w5dRjnlUxuOBHyy3tpS4e1kVCoHGoDUxEu
+ru5+Pk8dZp/RVBRT1fZn1mMTXdzg8AiLNRfnzOrxTRMAYlThISnq9qzs+Q0TsFmv
+o3+zFVI9BeFdJbC5QQWrY+NHVXi11PrMkXJcEIgsA/p6WnJjjzPKRVdeu5wj8YsI
+W7QGNz4QeIBcSwuT/sPIB1i0wbL02dnaHNlHgX4o8sNevNWJtOO6kWNbeaueY9nq
+A5m11NUmYfauMGzPoSPHJ5Dc2hVzRleZjkHNyMD44mgyvcj4RwRMH5Z989mHgrHZ
+rVUPzumdeFper4Pk2BTN5biEQ4C6dv30AWS8q5nblZWxA0LlaWWqu7BQM5r4N+c8
+JvQeSTgPnaRHSZ5+Ex3REIDU6CgbDy9aOjlpS4FZOZjeBI3N9tgPZTQjDSGqGSmM
+uJBPmZIyFcKTFnYKYPOmthgeQUpNnwJLRa7YV0HgLhFayGP5Dps=
+=HDnR
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 54e4c77c9473..cf302584036d 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 14 Oct 2022 17:39:54 +0000
+Sat, 15 Oct 2022 00:09:50 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index b027246f70e1..010e1903de55 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Oct 14 05:39:54 PM UTC 2022
+Sat Oct 15 12:09:49 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 8a554553814a..01a79353ae36 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 14 Oct 2022 17:45:01 +0000
+Sat, 15 Oct 2022 00:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 4870bc9c240f..e3bb6fc4c842 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-57815e3bae0ad8bb6658fd2754732cc51f52a430 1665767989 2022-10-14T17:19:49+00:00
+42c2b28175dbf2b7ebe5338efbb33edb0751c734 1665790238 2022-10-14T23:30:38+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 0d418319e948..1c6b2c1619aa 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1665769201 Fri 14 Oct 2022 05:40:01 PM UTC
+1665792601 Sat 15 Oct 2022 12:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 54e4c77c9473..5f6ed57d5d07 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 14 Oct 2022 17:39:54 +0000
+Sat, 15 Oct 2022 00:09:49 +0000
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 00843ad9a188..48f5e4fab9ae 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 2a9e38f6fa53..8bfa36c32dae 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,17 +1,14 @@
-AUX dhcp-3.0-fix-perms.patch 417 BLAKE2B 2001859a901ce59c7ff8d5741349ccec44f50e808464290490795fca4c19cb069cd7c4befdab39d9a3878066d377f69f95ca05c51aa7e388b4b5e1ab0d40c27d SHA512 7b5b607f62dae3075c9126ce0055b649a9c1fc5c0d591f40208d0c951c2a921ced63c7a4c7b78e82e463c57cffc90734b23ef51b69fe70ecb8ad366ddca97cc7
-AUX dhcp-4.2.2-dhclient-stdin-conf.patch 3017 BLAKE2B 59e2107764d49f7d9099e53d4a178876e0d71243da3c01f487a595e1e309fed5ddacdac6ee4832eaf8f26d785815ea2c571dccd0eb33bb88578dd70928ba96c3 SHA512 1adfa938e5531040008981dd4dcba37219bce0794524d3c3530eff527528ef7b22aa6fd540f9ac175339372e98347c0a91b86b4bb5f2aa93f04217b9902c3388
-AUX dhcp-4.2.5-bindtodevice-inet6.patch 826 BLAKE2B 30feafe2b8238743d08c80ea8f376d60dd89b7693a1f7d33dae78cd26635508fbe337e002cbe00228f1ad76979379655e8278374ba1839c541caff285652a0a4 SHA512 74d9d30b4803d10a63843d474dda92f019e4b7b9d7a9f4e32a49a1c261c1bb7238cd13f9b91c2bf8cf7f3ce5a5c665ef1d32998b06ca1439b30785d33827fe67
-AUX dhcp-4.3.3-ldap-ipv6-client-id.patch 2095 BLAKE2B 6f35bfb4ee123d6c0c5ecc56d882404753cc5d8ea6a342cc47bfa795a91712e83cdeee2899a63619f48566ced2edce6e24ae382e2954950cd3be534abb75dad6 SHA512 c8e48bc405d75281790c44c48d89c27b9ec7dd7273c41cacdc0e5e3b08648ae0eda1bd9b308a19667f11703b4bb25fc94911036bcca11f1197f87ec265b0c35a
-AUX dhcp-4.3.6-dhclient-ntp.patch 6810 BLAKE2B 9cf5ea5d55277e1821f2c97dc807e63a67b7712770f621e95272f58f3ac9cc12e586511114dc3c046a18624fc08caada1dd6bf4c36724219751f330a306071ff SHA512 13e4215c4fe02ea8d17a1559b2653de1bb72675eb72ae7b17707c2cf138fd620406f1d57eea3812f491df475f942e2f44b9b784d5ad5a2f352d455bef3df771e
-AUX dhcp-4.3.6-dhclient-resolvconf.patch 15340 BLAKE2B 57bd2576fa861d866b568e8814f591614167801bd3ef30270f81fd4b25637b255dd455ea8824d291b91a3a084f3aa0e55e1285fced0f8a5c684633f6ebe47a90 SHA512 264a2e073a80109c9dced6a3f7834f958990a15e578dd1435128e7ef9335b0b9751020166fbb0e1b01193c19eb28322648226fc5a1b07dc0b9452b702903cc8d
-AUX dhcp-4.3.6-iproute2-path.patch 451 BLAKE2B dcb948428326f7ca198061b1956f25981441c80d7bb8275a09f7b97c50644ba500966edf9b6483c43b96d88abba348976a0fb23b29032682da58014a9d559415 SHA512 91f20102e41cef81253617c80ba4d8193f35f51419606ab62e01f07153f1f616c70e0c43838c3d83913402f8d02ff333e4e36e08efd50aa8f8fe83939f91ae3e
-AUX dhcp-4.3.6-nogateway.patch 1904 BLAKE2B 9cb4c4a491e590958ed0654f0b1d7006e310ff5e40b3872bdcb17de45f7fb023d3d08b2433b25a362f13da89c0b818d88bb5f2d9737b3a00528c581a297f65f5 SHA512 571320f652ba5b24813ce9707f333f1d44d09c046c6371c86d011bd9d1c3c1288918851df336a881a62c6c095b6ac3bd9699f022e6f30dbb2542157b10ec20f7
-AUX dhcp-4.3.6-quieter-ping.patch 2622 BLAKE2B fc9c49f60419d39f81d097c70ee61db879578225c4d6c90eb9828852bd1c3fb5daf8de5651b0d75a020767bb7e8b7917355d7e68cc7f8fc3052e010e96115be1 SHA512 4338ca0fd733676ed6ecc790cd5305b9eca468a9be206f0a1d195d024974aabdb7def81d2181261d3b6033fd4e9b5461c07adfb3b16d1df1dc2e5f819c90ba47
-AUX dhcp-4.4.0-always-accept-4.patch 889 BLAKE2B ce7ddd45c924f31c37294eb091476ec1aae4a658beadfd1481e2b0a2044f2d1a5be6798eac3c8f677c223eadf9be043ff3e38bfaec14305a0ad823ec3b2930b8 SHA512 2801de50402443196c412d2c578c74cc040869b7dd59f6e7ae9e66e69edb1fd567de7acbc2b2612b46b5cddca08f984401fefc4f81c26ea630b193f0e0f1884e
-AUX dhcp-4.4.0-bind-disable.patch 774 BLAKE2B 32f09258aeaa3aa299de1f53008cfb4d4e6d994ee2034904bd7ab80d85189a2179e05acdcf43746349b9906df67c1a967c6371f49a07f1f01c892706c0db5160 SHA512 dee1b6dd62528c8c761fea4a61ddf0057a2f594746bf698b2cc31c5de211614c5b8cb5bab69190f0bdad4d1ec781946e91889fb5fa85ca7370d4357cb9d92dd5
-AUX dhcp-4.4.2-fno-common.patch 876 BLAKE2B 004abacf9f6167440b762fd69bcd821df6531cc1d74514841cbc88abdef5f21a51d1907cbb1424eb787fc37d8d869344f9f43dbe908e3fa28d8836d898b6efff SHA512 1a0e0c57bc08e9746e372733fff3a726d99064cde800fc921cbaab0eb19d32bf8cd813d197fd0d64b6d8f4e18c4557d0ef2e81334077d363b995012301bbe176
-AUX dhcp-4.4.2-variable-name.patch 699 BLAKE2B fd0ba7636ccd09e171bfbd6efd061335f56ea6f670c1ac3b87bd73d81938862ca065358777c05f3e5a23a8fff3d0257709fce113904afb12009da43e2908f6e2 SHA512 fccc8ab1f48756dfebec0a90ac414731cdb7f2c08e6356c5ad8b7d04f2459d94dc80692d49b304efba17beb6e2585d4250d53b3a3aee6826a934a111ee391c0a
+AUX dhcp-4.4.3-always-accept-4.patch 889 BLAKE2B ce7ddd45c924f31c37294eb091476ec1aae4a658beadfd1481e2b0a2044f2d1a5be6798eac3c8f677c223eadf9be043ff3e38bfaec14305a0ad823ec3b2930b8 SHA512 2801de50402443196c412d2c578c74cc040869b7dd59f6e7ae9e66e69edb1fd567de7acbc2b2612b46b5cddca08f984401fefc4f81c26ea630b193f0e0f1884e
 AUX dhcp-4.4.3-bind-disable.patch 974 BLAKE2B 4a833ddbd8f67d44681044ab5393e94929ac64a694b5ebfec7344634ca1dbd71bd5becc9668c89b58c6d2efc5a7ca28fba84e0dc4e3f64be942f183710a4252c SHA512 315261ffdfd349872d2c70f9f7d2ca4a6f6bf3e6b7841ae9513c13a7856b4abc95ec56153730ff0f12826d29e7898a9fa5a053ddb63ae3e0128fcce4f5702a8c
+AUX dhcp-4.4.3-bindtodevice-inet6.patch 611 BLAKE2B 0570b8c7fec82d5894d1b406ceedc3dda84ccaf1b00f5f04d10953fe1196d85d70b7b4aec2f75b68a81a3b4d6d53689cabc33ffd698c2d319d9e91b2a84ad9de SHA512 cfbab5f72c82b1cd49b2ece856b72267118f4e2e50dbffac5b9737c9e13bfcc95e7db8649452f5023b4797d84ddc2c377118fbd0628d26a5191f95ab64b5f525
+AUX dhcp-4.4.3-dhclient-ntp.patch 6810 BLAKE2B 9cf5ea5d55277e1821f2c97dc807e63a67b7712770f621e95272f58f3ac9cc12e586511114dc3c046a18624fc08caada1dd6bf4c36724219751f330a306071ff SHA512 13e4215c4fe02ea8d17a1559b2653de1bb72675eb72ae7b17707c2cf138fd620406f1d57eea3812f491df475f942e2f44b9b784d5ad5a2f352d455bef3df771e
+AUX dhcp-4.4.3-dhclient-resolvconf.patch 15642 BLAKE2B 94492900ce0667daefa20a3a42d3e6798a86c03dc4e6a3d69f501e2d6b99466feef38291acf9ad4fb225422140d09a173161cc1128979ee05049947b4744f911 SHA512 8edb0e059cff6ddeb568307e87c63dbfde0524fe0e9fd9cde1feb2b3309614b773a227d49e951ce5429338630beb909891a97a4b2cd8af00de1fa8181160cfac
+AUX dhcp-4.4.3-dhclient-stdin-conf.patch 3017 BLAKE2B 59e2107764d49f7d9099e53d4a178876e0d71243da3c01f487a595e1e309fed5ddacdac6ee4832eaf8f26d785815ea2c571dccd0eb33bb88578dd70928ba96c3 SHA512 1adfa938e5531040008981dd4dcba37219bce0794524d3c3530eff527528ef7b22aa6fd540f9ac175339372e98347c0a91b86b4bb5f2aa93f04217b9902c3388
+AUX dhcp-4.4.3-fix-perms.patch 443 BLAKE2B 5c3382cf486e1e338bff3d50bce046971466e43d4c18a86ee21d4a05c3955d8ab45810a4de951dd3635502861510ad33e1cc0803a863a3f9d249077726bc7079 SHA512 f557faf3ebeaa668bc01b4cfb5a9adc37f5d786fc8bdb4e1f6ab9f34761b8d9663dc44b55f317a5bba5c3d11ee59fcf3d94c42abc70d566a411a289360529309
+AUX dhcp-4.4.3-iproute2-path.patch 451 BLAKE2B dcb948428326f7ca198061b1956f25981441c80d7bb8275a09f7b97c50644ba500966edf9b6483c43b96d88abba348976a0fb23b29032682da58014a9d559415 SHA512 91f20102e41cef81253617c80ba4d8193f35f51419606ab62e01f07153f1f616c70e0c43838c3d83913402f8d02ff333e4e36e08efd50aa8f8fe83939f91ae3e
+AUX dhcp-4.4.3-ldap-ipv6-client-id.patch 2095 BLAKE2B 6f35bfb4ee123d6c0c5ecc56d882404753cc5d8ea6a342cc47bfa795a91712e83cdeee2899a63619f48566ced2edce6e24ae382e2954950cd3be534abb75dad6 SHA512 c8e48bc405d75281790c44c48d89c27b9ec7dd7273c41cacdc0e5e3b08648ae0eda1bd9b308a19667f11703b4bb25fc94911036bcca11f1197f87ec265b0c35a
+AUX dhcp-4.4.3-nogateway.patch 1904 BLAKE2B 9cb4c4a491e590958ed0654f0b1d7006e310ff5e40b3872bdcb17de45f7fb023d3d08b2433b25a362f13da89c0b818d88bb5f2d9737b3a00528c581a297f65f5 SHA512 571320f652ba5b24813ce9707f333f1d44d09c046c6371c86d011bd9d1c3c1288918851df336a881a62c6c095b6ac3bd9699f022e6f30dbb2542157b10ec20f7
+AUX dhcp-4.4.3-quieter-ping.patch 2622 BLAKE2B fc9c49f60419d39f81d097c70ee61db879578225c4d6c90eb9828852bd1c3fb5daf8de5651b0d75a020767bb7e8b7917355d7e68cc7f8fc3052e010e96115be1 SHA512 4338ca0fd733676ed6ecc790cd5305b9eca468a9be206f0a1d195d024974aabdb7def81d2181261d3b6033fd4e9b5461c07adfb3b16d1df1dc2e5f819c90ba47
 AUX dhcpd.conf2 1068 BLAKE2B abbe4f73517fba252398da00b9aa801d0ea411ac639b219cad4a64700b74cc14322af131e0053af948f1f1b35c5a3556af75092ea5565e01d7c0d1a602ea7c40 SHA512 7b7a77b7826b475a4113ebeee54501ce417cc56e85754301a82a185d88b4713d198f615a366e63e0e2b0aef988c8137dcd1e18c4036d993378257079da17693d
 AUX dhcpd.init5 2882 BLAKE2B 9ce56c4aef62641508b8f4d366672725dd277c18846f9a001de8d244ca03720aba2c52ca7bd34ac63b08db082489d915c23bd1c685c37699034373bde1a7c37f SHA512 0cf238f3e79ee5d1ba059331664fd092d025ecb8fdb3f1d428713d7cd81ad4efe10ad7ad4ef48146aa6c9763293c1641057a257480e58a639fc6cc20e623f4c1
 AUX dhcpd.tmpfiles 75 BLAKE2B 8e4ddbccb162c620df175dbb39621659f9905c54ba2dc46d3863438e030dee3a04bb4b528bb7ee91a1cb47564081e48ac6937a6aee4ea026adcdb1887e643152 SHA512 0c34ab0ef8618e6792ba8bda797877ce2e6c4fa433b4944dbc03cc4fc69efe26ce4b5e4dec661fbb2b7ae4173d908de02f4e86f8539364789a23f36cfd8edacb
@@ -24,10 +21,6 @@ AUX dhcrelay4.service.conf 105 BLAKE2B 52ad8018d2b6fd47b5d752a6e6626a8fa6c1d21fa
 AUX dhcrelay6.conf 325 BLAKE2B be916f3f73eab9813f6b548be254277659f267610efb3ecd53dc30a25aad02f5332f538bc9d6ca65b5d388ff83f0ee30358d56cefa440fe7f5b8a6678521ba6b SHA512 40d3a6bdf8521bf5152cf31b961aea88b2fb0339433d0b6a6360a16c796298620b377bd079c0246e97bc9c0533ddb13bbb58cc5169d0ca598e3a51d1a607a9e9
 AUX dhcrelay6.service 237 BLAKE2B 2b32d453de82873f18ce905c5c336e974d4d5263415b51860f28d93bbf449056809471da1965f6ed5e79449bfe39dba65516fb113eb140771b81e866211e01b4 SHA512 11d17aebef403fce1f3b0514f1c7206cb6520f1712c603b016c11275a83e102b969cc371dbe5a3a9c430a392dedf0c7af33692a49197092c467ea764dfaede9d
 AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9153dd26c4a0e6df687ca284554fa1d2b304af2f2dbdaac9a3cfafafc362befe8864d386f304588fa4c61092 SHA512 2ac54a5ebdf009854700e6f6b70662b36787b71a5b917fc61be35d31762508ede0e81b3874965b91de655a088914dbe43927911d8df1a16c262cb68389c168a9
-DIST dhcp-4.4.2-P1.tar.gz 9898311 BLAKE2B 7cc40dfbe578bee13c7dd7868a25d0d88358bf82b02539e933a4eba06039a43f0d99b3ef6ce811b60ed3a991b222844f4a5bd9e597c11d83b09ff551ba0380a6 SHA512 924e8b44f288361dbe837987869e57b929c73cb5e4af37cb2d7b19bca5ea8594048fb41c0792fede003188185f61b25befbc2ccda42f1f68e6b6bc22ef44b040
 DIST dhcp-4.4.3-P1.tar.gz 10081055 BLAKE2B 6cc16f7472efb1e1f6b7a83cafd9a81a16f10af7361da079c48a5eff0d9e310f475dcc82e984c20936c64867183402d00d26e5366e75bf7463ec2aea4a6f68a4 SHA512 d14dc44d1c015780ae19769816cb01015959927a1ad7a3e84b89e0463253aaf46451af88e3260347196373906d5b438c7c616fee45ec3f128aa82af6702b7154
-DIST dhcp-4.4.3.tar.gz 10078953 BLAKE2B d88570760cc00bd72d1e9c2e76c7a7b9f07cadfbe044220a43ee33fc201c217725c3909a386ae11f28346920dacb0313d78193a9e3d7eac9757384b4fe762597 SHA512 4472d6794af80b482560956cee6895889cc1aca39980f851faf56824627e95731f2983cf7c7454bc3decb0a12c874fcbd29bd6c5a9695412def6bc14c6df17e0
-EBUILD dhcp-4.4.2_p1-r2.ebuild 8410 BLAKE2B bce58f30a590a98a8d5d61076ae43d5783ab2daa6095456e4253b671d94f2012072d4525ec8e7fff2adc641496ba519aa06d438d66ab969c37cbe0a3a4f339cf SHA512 e6fe16ac2fc57f9eaa9bdafc2af75fec1053cb6191a79d1b09064cdf77c0a88e0f7254d5b97e3a1a72477814d2d57d26cc2719eef543b2c538f3d62b802fbacc
-EBUILD dhcp-4.4.3-r1.ebuild 8527 BLAKE2B 0fd7d6dc235f1d7c3e29b5879901a99d442cfd71c90e70f22ae3d57260768c5f8ed272b7f12b10c9ad0ffd83b85811cd41fb981491b1087111c446b829c1bfc1 SHA512 6db12c5cc6c176bc6be89dda65707bb21e1c36c689328c75b73b779cae6b0d97ec5173d3d2b6f1c2a3cb3ffee500f2a9f0771cf3376a36ad23688405d5c99091
-EBUILD dhcp-4.4.3_p1.ebuild 8527 BLAKE2B 0fd7d6dc235f1d7c3e29b5879901a99d442cfd71c90e70f22ae3d57260768c5f8ed272b7f12b10c9ad0ffd83b85811cd41fb981491b1087111c446b829c1bfc1 SHA512 6db12c5cc6c176bc6be89dda65707bb21e1c36c689328c75b73b779cae6b0d97ec5173d3d2b6f1c2a3cb3ffee500f2a9f0771cf3376a36ad23688405d5c99091
+EBUILD dhcp-4.4.3_p1.ebuild 8529 BLAKE2B 5b330f0333889d89456c097851cc57890b1bfb4bff4ca9e44be543a7276c5275522e0fd244252dc67e28c117787a8bd7ae7fa13526deb9b3fab6442f6e867f65 SHA512 0791828092b3cfcda94ed53a6641e27a70db0fed9ac16e411e6e31c4694f7de06d60e42fa8ff18ea5dbca37dae30efc13ec4b2c7cadd100630fd294d8a5601d7
 MISC metadata.xml 477 BLAKE2B 0e786da79e394f5dcc0812f19f81fa11327f2a173e5debb9b67929aab6100695908a2a1d990a9c25547f58b9ec7495483cd9a73e1e28da09ffcf08e77b9deaf6 SHA512 18add50afc3ff6b795a94f8fd00f13c666682beb60cea990b5a7c0d3e19a104b21d3eb29c7b8438e4386129b90b275821174eb5b7f98f4523026b6e5d714007d
diff --git a/net-misc/dhcp/dhcp-4.4.2_p1-r2.ebuild b/net-misc/dhcp/dhcp-4.4.2_p1-r2.ebuild
deleted file mode 100644
index 6b2cf7158832..000000000000
--- a/net-misc/dhcp/dhcp-4.4.2_p1-r2.ebuild
+++ /dev/null
@@ -1,285 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs flag-o-matic tmpfiles
-
-MY_PV="${PV//_alpha/a}"
-MY_PV="${MY_PV//_beta/b}"
-MY_PV="${MY_PV//_rc/rc}"
-MY_PV="${MY_PV//_p/-P}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
-HOMEPAGE="https://www.isc.org/dhcp"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
-	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
-
-DEPEND="
-	acct-group/dhcp
-	acct-user/dhcp
-	client? (
-		kernel_linux? (
-			ipv6? ( sys-apps/iproute2 )
-			sys-apps/net-tools
-		)
-	)
-	ldap? (
-		net-nds/openldap:=
-		ssl? ( dev-libs/openssl:= )
-	)"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-dhcp )
-	vim-syntax? ( app-vim/dhcpd-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	# handle local bind hell
-	cd "${S}"/bind
-	unpack ./bind.tar.gz
-}
-
-PATCHES=(
-	# Gentoo patches - these will probably never be accepted upstream
-	# Fix some permission issues
-	"${FILESDIR}/${PN}-3.0-fix-perms.patch"
-
-	# Enable dhclient to equery NTP servers
-	"${FILESDIR}/${PN}-4.3.6-dhclient-ntp.patch"
-	"${FILESDIR}/${PN}-4.3.6-dhclient-resolvconf.patch"
-
-	# Enable dhclient to get extra configuration from stdin
-	"${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch"
-	"${FILESDIR}/${PN}-4.3.6-nogateway.patch" #265531
-	"${FILESDIR}/${PN}-4.3.6-quieter-ping.patch" #296921
-	"${FILESDIR}/${PN}-4.4.0-always-accept-4.patch" #437108
-	"${FILESDIR}/${PN}-4.3.6-iproute2-path.patch" #480636
-	"${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch" #471142
-	"${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch" #559832
-
-	# Possible upstream candidates
-	"${FILESDIR}/${PN}-4.4.2-fno-common.patch" #710194
-	"${FILESDIR}/${PN}-4.4.2-variable-name.patch" #752402
-)
-
-src_prepare() {
-	default
-
-	# Brand the version with Gentoo
-	sed -i \
-		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
-		configure || die
-
-	# Change the hook script locations of the scripts
-	sed -i \
-		-e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
-		-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
-		client/scripts/* || die
-
-	# No need for the linux script to force bash #158540
-	sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
-
-	# Quiet the freebsd logger a little
-	sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
-
-	# Remove these options from the sample config
-	sed -i -r \
-		-e "/(script|host-name|domain-name) /d" \
-		client/dhclient.conf.example || die
-
-	if use client && ! use server ; then
-		sed -i -r \
-			-e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
-			Makefile.in || die
-	elif ! use client && use server ; then
-		sed -i -r \
-			-e '/^SUBDIRS/s:\<client\>::' \
-			Makefile.in || die
-	fi
-
-	# Only install different man pages if we don't have en
-	if [[ " ${LINGUAS} " != *" en "* ]]; then
-		# Install Japanese man pages
-		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
-			einfo "Installing Japanese documention"
-			cp doc/ja_JP.eucJP/dhclient* client || die
-			cp doc/ja_JP.eucJP/dhcp* common || die
-		fi
-	fi
-	# Now remove the non-english docs so there are no errors later
-	rm -r doc/ja_JP.eucJP || die
-
-	# make the bind build work - do NOT make "binddir" local!
-	binddir="${S}/bind"
-	cd "${binddir}" || die
-	cat <<-EOF > bindvar.tmp
-	binddir=${binddir}
-	GMAKE=${MAKE:-gmake}
-	EOF
-	eapply -p2 "${FILESDIR}"/${PN}-4.4.0-bind-disable.patch
-	# Only use the relevant subdirs now that ISC
-	#removed the lib/export structure in bind.
-	sed '/^SUBDIRS/s@=.*$@= isc dns isccfg irs samples@' \
-		-i bind-*/lib/Makefile.in || die
-}
-
-src_configure() {
-	# bind defaults to stupid `/usr/bin/ar`
-	tc-export AR BUILD_CC
-	export ac_cv_path_AR=${AR}
-
-	# this is tested for by the bind build system, and can cause trouble
-	# when cross-building; since dhcp itself doesn't make use of libcap,
-	# simply disable it.
-	export ac_cv_lib_cap_cap_set_proc=no
-
-	# Use FHS sane paths ... some of these have configure options,
-	# but not all, so just do it all here.
-	local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
-	cat <<-EOF >> includes/site.h
-	#define _PATH_DHCPD_CONF     "${e}/dhcpd.conf"
-	#define _PATH_DHCLIENT_CONF  "${e}/dhclient.conf"
-	#define _PATH_DHCPD_DB       "${l}/dhcpd.leases"
-	#define _PATH_DHCPD6_DB      "${l}/dhcpd6.leases"
-	#define _PATH_DHCLIENT_DB    "${l}/dhclient.leases"
-	#define _PATH_DHCLIENT6_DB   "${l}/dhclient6.leases"
-	#define _PATH_DHCPD_PID      "${r}/dhcpd.pid"
-	#define _PATH_DHCPD6_PID     "${r}/dhcpd6.pid"
-	#define _PATH_DHCLIENT_PID   "${r}/dhcpclient.pid"
-	#define _PATH_DHCLIENT6_PID  "${r}/dhcpclient6.pid"
-	#define _PATH_DHCRELAY_PID   "${r}/dhcrelay.pid"
-	#define _PATH_DHCRELAY6_PID  "${r}/dhcrelay6.pid"
-	EOF
-
-	# Breaks with -O3 because of reliance on undefined behaviour
-	# bug #787935
-	append-flags -fno-strict-aliasing
-
-	# bug #720806, bug #801592
-	if use ppc || use arm || use hppa || [[ ${CHOST} == i486* ]] ; then
-		append-libs -latomic
-	fi
-
-	local myeconfargs=(
-		--enable-paranoia
-		--enable-early-chroot
-		--sysconfdir=${e}
-		--with-randomdev=/dev/random
-		$(use_enable ipv6 dhcpv6)
-		$(use_with ldap)
-		$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
-		LIBS="${LIBS}"
-	)
-	econf "${myeconfargs[@]}"
-
-	# configure local bind cruft.  symtable option requires
-	# perl and we don't want to require that #383837.
-	cd bind/bind-*/ || die
-	local el
-	eval econf \
-		$(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el//\\} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
-		--with-randomdev=/dev/random \
-		--disable-symtable \
-		--without-make-clean
-}
-
-src_compile() {
-	# build local bind cruft first
-	emake -C bind/bind-*/lib install
-	# then build standard dhcp code
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
-	docinto html
-	dodoc doc/References.html
-
-	if [[ -e client/dhclient ]] ; then
-		# move the client to /
-		dodir /sbin
-		mv "${ED}"/usr/sbin/dhclient "${ED}"/sbin/ || die
-
-		exeinto /sbin
-		if use kernel_linux ; then
-			newexe "${S}"/client/scripts/linux dhclient-script
-		else
-			newexe "${S}"/client/scripts/freebsd dhclient-script
-		fi
-	fi
-
-	if [[ -e server/dhcpd ]] ; then
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins contrib/ldap/dhcp.*
-			dosbin contrib/ldap/dhcpd-conf-to-ldap
-		fi
-
-		newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
-		newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
-		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
-		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
-		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
-		newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
-		newtmpfiles "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
-		systemd_dounit "${FILESDIR}"/dhcpd4.service
-		systemd_dounit "${FILESDIR}"/dhcpd6.service
-		systemd_dounit "${FILESDIR}"/dhcrelay4.service
-		systemd_dounit "${FILESDIR}"/dhcrelay6.service
-		systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
-		systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
-
-		sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
-	fi
-
-	# the default config files aren't terribly useful #384087
-	local f
-	for f in "${ED}"/etc/dhcp/*.conf.example ; do
-		mv "${f}" "${f%.example}" || die
-	done
-	sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-
-	diropts -m0750 -o dhcp -g dhcp
-	keepdir /var/lib/dhcp
-}
-
-pkg_preinst() {
-	# Keep the user files over the sample ones.  The
-	# hashing is to ignore the crappy defaults #384087.
-	local f h
-	for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
-		h=${f#*:}
-		f="/etc/dhcp/${f%:*}.conf"
-		if [ -e "${EROOT}"${f} ] ; then
-			case $(md5sum "${EROOT}"${f}) in
-				${h}*) ;;
-				*) cp -p "${EROOT}"${f} "${ED}"${f};;
-			esac
-		fi
-	done
-}
-
-pkg_postinst() {
-	if use server ; then
-		tmpfiles_process dhcpd.conf
-	fi
-
-	if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
-		ewarn
-		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
-		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
-		ewarn "and dhcp should be removed from the default runlevel"
-		ewarn
-	fi
-}
diff --git a/net-misc/dhcp/dhcp-4.4.3-r1.ebuild b/net-misc/dhcp/dhcp-4.4.3-r1.ebuild
deleted file mode 100644
index 9db36ddb42da..000000000000
--- a/net-misc/dhcp/dhcp-4.4.3-r1.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs flag-o-matic tmpfiles
-
-MY_PV="${PV//_alpha/a}"
-MY_PV="${MY_PV//_beta/b}"
-MY_PV="${MY_PV//_rc/rc}"
-MY_PV="${MY_PV//_p/-P}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
-HOMEPAGE="https://www.isc.org/dhcp"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
-	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
-
-DEPEND="
-	acct-group/dhcp
-	acct-user/dhcp
-	client? (
-		kernel_linux? (
-			ipv6? ( sys-apps/iproute2 )
-			sys-apps/net-tools
-		)
-	)
-	ldap? (
-		net-nds/openldap:=
-		ssl? ( dev-libs/openssl:= )
-	)"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-dhcp )
-	vim-syntax? ( app-vim/dhcpd-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	# handle local bind hell
-	cd "${S}"/bind
-	unpack ./bind.tar.gz
-}
-
-PATCHES=(
-	# Gentoo patches - these will probably never be accepted upstream
-	# Fix some permission issues
-	"${FILESDIR}/${PN}-3.0-fix-perms.patch"
-
-	# Enable dhclient to equery NTP servers
-	"${FILESDIR}/${PN}-4.3.6-dhclient-ntp.patch"
-	"${FILESDIR}/${PN}-4.3.6-dhclient-resolvconf.patch"
-
-	# Enable dhclient to get extra configuration from stdin
-	"${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch"
-	# bug #265531
-	"${FILESDIR}/${PN}-4.3.6-nogateway.patch"
-	# bug #296921
-	"${FILESDIR}/${PN}-4.3.6-quieter-ping.patch"
-	# bug #437108
-	"${FILESDIR}/${PN}-4.4.0-always-accept-4.patch"
-	# bug #480636
-	"${FILESDIR}/${PN}-4.3.6-iproute2-path.patch"
-	# bug #471142
-	"${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch"
-	# bug #559832
-	"${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch"
-
-	# Possible upstream candidates
-)
-
-src_prepare() {
-	default
-
-	# Brand the version with Gentoo
-	sed -i \
-		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
-		configure || die
-
-	# Change the hook script locations of the scripts
-	sed -i \
-		-e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
-		-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
-		client/scripts/* || die
-
-	# No need for the linux script to force bash #158540
-	sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
-
-	# Quiet the freebsd logger a little
-	sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
-
-	# Remove these options from the sample config
-	sed -i -r \
-		-e "/(script|host-name|domain-name) /d" \
-		client/dhclient.conf.example || die
-
-	if use client && ! use server ; then
-		sed -i -r \
-			-e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
-			Makefile.in || die
-	elif ! use client && use server ; then
-		sed -i -r \
-			-e '/^SUBDIRS/s:\<client\>::' \
-			Makefile.in || die
-	fi
-
-	# Only install different man pages if we don't have en
-	if [[ " ${LINGUAS} " != *" en "* ]]; then
-		# Install Japanese man pages
-		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
-			einfo "Installing Japanese documention"
-			cp doc/ja_JP.eucJP/dhclient* client || die
-			cp doc/ja_JP.eucJP/dhcp* common || die
-		fi
-	fi
-	# Now remove the non-english docs so there are no errors later
-	rm -r doc/ja_JP.eucJP || die
-
-	# make the bind build work - do NOT make "binddir" local!
-	binddir="${S}/bind"
-	cd "${binddir}" || die
-	cat <<-EOF > bindvar.tmp
-	binddir=${binddir}
-	GMAKE=${MAKE:-gmake}
-	EOF
-	eapply -p2 "${FILESDIR}"/${PN}-4.4.3-bind-disable.patch
-	# Only use the relevant subdirs now that ISC
-	#removed the lib/export structure in bind.
-	sed '/^SUBDIRS/s@=.*$@= isc dns isccfg irs samples@' \
-		-i bind-*/lib/Makefile.in || die
-}
-
-src_configure() {
-	# bind defaults to stupid `/usr/bin/ar`
-	tc-export AR BUILD_CC
-	export ac_cv_path_AR=${AR}
-
-	# this is tested for by the bind build system, and can cause trouble
-	# when cross-building; since dhcp itself doesn't make use of libcap,
-	# simply disable it.
-	export ac_cv_lib_cap_cap_set_proc=no
-
-	# Use FHS sane paths ... some of these have configure options,
-	# but not all, so just do it all here.
-	local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
-	cat <<-EOF >> includes/site.h
-	#define _PATH_DHCPD_CONF     "${e}/dhcpd.conf"
-	#define _PATH_DHCLIENT_CONF  "${e}/dhclient.conf"
-	#define _PATH_DHCPD_DB       "${l}/dhcpd.leases"
-	#define _PATH_DHCPD6_DB      "${l}/dhcpd6.leases"
-	#define _PATH_DHCLIENT_DB    "${l}/dhclient.leases"
-	#define _PATH_DHCLIENT6_DB   "${l}/dhclient6.leases"
-	#define _PATH_DHCPD_PID      "${r}/dhcpd.pid"
-	#define _PATH_DHCPD6_PID     "${r}/dhcpd6.pid"
-	#define _PATH_DHCLIENT_PID   "${r}/dhcpclient.pid"
-	#define _PATH_DHCLIENT6_PID  "${r}/dhcpclient6.pid"
-	#define _PATH_DHCRELAY_PID   "${r}/dhcrelay.pid"
-	#define _PATH_DHCRELAY6_PID  "${r}/dhcrelay6.pid"
-	EOF
-
-	# Breaks with -O3 because of reliance on undefined behaviour
-	# bug #787935
-	append-flags -fno-strict-aliasing
-
-	# bug #720806, bug #801592
-	if use ppc || use arm || use hppa || [[ ${CHOST} == i486* ]] ; then
-		append-libs -latomic
-	fi
-
-	local myeconfargs=(
-		--enable-paranoia
-		--enable-early-chroot
-		--sysconfdir=${e}
-		--with-randomdev=/dev/random
-		$(use_enable ipv6 dhcpv6)
-		$(use_with ldap)
-		$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
-		LIBS="${LIBS}"
-	)
-	econf "${myeconfargs[@]}"
-
-	# configure local bind cruft.  symtable option requires
-	# perl and we don't want to require that. bug #383837.
-	cd bind/bind-*/ || die
-	local el
-	eval econf \
-		$(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el//\\} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
-		--with-randomdev=/dev/random \
-		--disable-symtable \
-		--without-make-clean
-}
-
-src_compile() {
-	# Build local bind cruft first
-	emake -C bind/bind-*/lib install
-	# then build standard dhcp code
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
-	docinto html
-	dodoc doc/References.html
-
-	if [[ -e client/dhclient ]] ; then
-		# Move the client to /
-		dodir /sbin
-		mv "${ED}"/usr/sbin/dhclient "${ED}"/sbin/ || die
-
-		exeinto /sbin
-		if use kernel_linux ; then
-			newexe "${S}"/client/scripts/linux dhclient-script
-		else
-			newexe "${S}"/client/scripts/freebsd dhclient-script
-		fi
-	fi
-
-	if [[ -e server/dhcpd ]] ; then
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins contrib/ldap/dhcp.*
-			dosbin contrib/ldap/dhcpd-conf-to-ldap
-		fi
-
-		newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
-		newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
-		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
-		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
-		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
-		newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
-		newtmpfiles "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
-		systemd_dounit "${FILESDIR}"/dhcpd4.service
-		systemd_dounit "${FILESDIR}"/dhcpd6.service
-		systemd_dounit "${FILESDIR}"/dhcrelay4.service
-		systemd_dounit "${FILESDIR}"/dhcrelay6.service
-		systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
-		systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
-
-		sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
-	fi
-
-	# the default config files aren't terribly useful #384087
-	local f
-	for f in "${ED}"/etc/dhcp/*.conf.example ; do
-		mv "${f}" "${f%.example}" || die
-	done
-	sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-
-	diropts -m0750 -o dhcp -g dhcp
-	keepdir /var/lib/dhcp
-}
-
-pkg_preinst() {
-	# Keep the user files over the sample ones.  The
-	# hashing is to ignore the crappy defaults #384087.
-	local f h
-	for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
-		h=${f#*:}
-		f="/etc/dhcp/${f%:*}.conf"
-		if [ -e "${EROOT}"${f} ] ; then
-			case $(md5sum "${EROOT}"${f}) in
-				${h}*) ;;
-				*) cp -p "${EROOT}"${f} "${ED}"${f};;
-			esac
-		fi
-	done
-}
-
-pkg_postinst() {
-	if use server ; then
-		tmpfiles_process dhcpd.conf
-	fi
-
-	if use client ; then
-		ewarn "The client and relay functionality will be removed in the next release!"
-		ewarn "Upstream have decided to discontinue this functionality."
-	fi
-
-	if [[ -e "${EROOT}"/etc/init.d/dhcp ]] ; then
-		ewarn
-		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
-		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
-		ewarn "and dhcp should be removed from the default runlevel"
-		ewarn
-	fi
-}
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
index 9db36ddb42da..e425d52ea36c 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
@@ -50,26 +50,26 @@ src_unpack() {
 PATCHES=(
 	# Gentoo patches - these will probably never be accepted upstream
 	# Fix some permission issues
-	"${FILESDIR}/${PN}-3.0-fix-perms.patch"
+	"${FILESDIR}/${PN}-4.4.3-fix-perms.patch"
 
 	# Enable dhclient to equery NTP servers
-	"${FILESDIR}/${PN}-4.3.6-dhclient-ntp.patch"
-	"${FILESDIR}/${PN}-4.3.6-dhclient-resolvconf.patch"
+	"${FILESDIR}/${PN}-4.4.3-dhclient-ntp.patch"
+	"${FILESDIR}/${PN}-4.4.3-dhclient-resolvconf.patch"
 
 	# Enable dhclient to get extra configuration from stdin
-	"${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch"
+	"${FILESDIR}/${PN}-4.4.3-dhclient-stdin-conf.patch"
 	# bug #265531
-	"${FILESDIR}/${PN}-4.3.6-nogateway.patch"
+	"${FILESDIR}/${PN}-4.4.3-nogateway.patch"
 	# bug #296921
-	"${FILESDIR}/${PN}-4.3.6-quieter-ping.patch"
+	"${FILESDIR}/${PN}-4.4.3-quieter-ping.patch"
 	# bug #437108
-	"${FILESDIR}/${PN}-4.4.0-always-accept-4.patch"
+	"${FILESDIR}/${PN}-4.4.3-always-accept-4.patch"
 	# bug #480636
-	"${FILESDIR}/${PN}-4.3.6-iproute2-path.patch"
+	"${FILESDIR}/${PN}-4.4.3-iproute2-path.patch"
 	# bug #471142
-	"${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch"
+	"${FILESDIR}/${PN}-4.4.3-bindtodevice-inet6.patch"
 	# bug #559832
-	"${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch"
+	"${FILESDIR}/${PN}-4.4.3-ldap-ipv6-client-id.patch"
 
 	# Possible upstream candidates
 )
diff --git a/net-misc/dhcp/files/dhcp-4.4.0-bind-disable.patch b/net-misc/dhcp/files/dhcp-4.4.0-bind-disable.patch
deleted file mode 100644
index b74255ca4e97..000000000000
--- a/net-misc/dhcp/files/dhcp-4.4.0-bind-disable.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- dhcp-4.4.0/bind/Makefile.in
-+++ dhcp-4.4.0/bind/Makefile.in
-@@ -37,6 +37,7 @@
- @BIND_ATF_TRUE@all: bind1 atf bind2
- 
- bind1:
-+disable:
- # Extract the source from the tarball, if it hasn't been already.
- 	@if test -d ${bindsrcdir} ; then                  \
- 		echo ${bindsrcdir} already unpacked... ;  \
-@@ -60,6 +61,7 @@
- 	fi
- 
- atf:
-+disable:
- # Build and copy the ATF support if not yet installed.
- 	@if test -d ./atf ; then                      \
- 		echo ATF support already installed ;  \
---- dhcp-4.4.0/bind/test
-+++ dhcp-4.4.0/bind/test
-@@ -0,0 +1 @@
-+--disable-kqueue --disable-epoll --disable-devpoll --without-openssl --without-libxml2 --enable-exportlib --with-gssapi=no --enable-threads=no @BINDCONFIG@ --includedir=${binddir}/include --libdir=${binddir}/lib
diff --git a/net-misc/dhcp/files/dhcp-4.4.2-fno-common.patch b/net-misc/dhcp/files/dhcp-4.4.2-fno-common.patch
deleted file mode 100644
index 5d0b7bdd5352..000000000000
--- a/net-misc/dhcp/files/dhcp-4.4.2-fno-common.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/client/dhclient.c
-+++ b/client/dhclient.c
-@@ -83,8 +83,6 @@
- static const char url [] = "For info, please visit https://www.isc.org/software/dhcp/";
- #endif /* UNIT_TEST */
- 
--u_int16_t local_port = 0;
--u_int16_t remote_port = 0;
- #if defined(DHCPv6) && defined(DHCP4o6)
- int dhcp4o6_state = -1; /* -1 = stopped, 0 = polling, 1 = started */
- #endif
---- a/relay/dhcrelay.c
-+++ b/relay/dhcrelay.c
-@@ -95,9 +95,6 @@
-        forward_untouched,	/* Forward without changes. */
-        discard } agent_relay_mode = forward_and_replace;
- 
--u_int16_t local_port;
--u_int16_t remote_port;
--
- /* Relay agent server list. */
- struct server_list {
- 	struct server_list *next;
---- a/server/mdb.c
-+++ b/server/mdb.c
-@@ -67,8 +67,6 @@
- 
- int numclasseswritten;
- 
--omapi_object_type_t *dhcp_type_host;
--
- isc_result_t enter_class(cd, dynamicp, commit)
- 	struct class *cd;
- 	int dynamicp;
diff --git a/net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch b/net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch
deleted file mode 100644
index 9f5085dd5e23..000000000000
--- a/net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 261c84d91d1b4581df9f7f0ec031908299de7726 Mon Sep 17 00:00:00 2001
-From: Mark Andrews <marka@isc.org>
-Date: Thu, 19 Dec 2019 09:27:44 +1100
-Subject: [PATCH] fix variable name in conditional block
-
----
- lib/isc/stats.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/isc/stats.c b/lib/isc/stats.c
-index 5bce3c1100..a7ab97ce53 100644
---- a/bind/bind-9.11.14/lib/isc/stats.c
-+++ b/bind/bind-9.11.14/lib/isc/stats.c
-@@ -297,7 +297,7 @@ setcounter(isc_stats_t *stats,
- 	isc_atomic_store((int32_t *)&stats->counters[counter].lo,
- 			 (uint32_t)(value & 0xffffffff));
- # else
--	stats->counters[counter] = val;
-+	stats->counters[counter] = value;
- # endif
- #endif
- }
--- 
-GitLab
-
diff --git a/net-misc/dhcp/files/dhcp-4.4.0-always-accept-4.patch b/net-misc/dhcp/files/dhcp-4.4.3-always-accept-4.patch
index bbb25eb194bd..bbb25eb194bd 100644
--- a/net-misc/dhcp/files/dhcp-4.4.0-always-accept-4.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-always-accept-4.patch
diff --git a/net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch b/net-misc/dhcp/files/dhcp-4.4.3-bindtodevice-inet6.patch
index 77254c32e2b0..f6ea0f858c6d 100644
--- a/net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-bindtodevice-inet6.patch
@@ -5,15 +5,14 @@ snipped from fedora
 # dhclient -6: bind socket to interface (#1001742)
 # (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #34784])
 
-diff -up dhcp-4.2.5/common/socket.c.bindtodevice_inet6 dhcp-4.2.5/common/socket.c
---- dhcp-4.2.5/common/socket.c.bindtodevice_inet6	2013-09-17 16:47:05.000000000 +0200
-+++ dhcp-4.2.5/common/socket.c	2013-09-17 16:48:18.975997842 +0200
-@@ -245,7 +245,7 @@ if_register_socket(struct interface_info
+--- a/common/socket.c
++++ b/common/socket.c
+@@ -266,7 +266,7 @@
  
  #if defined(SO_BINDTODEVICE)
  	/* Bind this socket to this interface. */
 -	if ((local_family != AF_INET6) && (info->ifp != NULL) &&
 +	if (((do_multicast == 0)||(*do_multicast == 0)) && (info->ifp != NULL) &&
  	    setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE,
- 			(char *)(info -> ifp), sizeof(*(info -> ifp))) < 0) {
- 		log_fatal("setsockopt: SO_BINDTODEVICE: %m");
+ 		       (char *)(info -> ifp), sizeof(*(info -> ifp))) < 0) {
+ 		log_fatal("Can't set SO_BINDTODEVICE on dhcp socket for"
diff --git a/net-misc/dhcp/files/dhcp-4.3.6-dhclient-ntp.patch b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-ntp.patch
index a504840dd5ab..a504840dd5ab 100644
--- a/net-misc/dhcp/files/dhcp-4.3.6-dhclient-ntp.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-ntp.patch
diff --git a/net-misc/dhcp/files/dhcp-4.3.6-dhclient-resolvconf.patch b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-resolvconf.patch
index ccfdbcf4a206..63a67b7b1151 100644
--- a/net-misc/dhcp/files/dhcp-4.3.6-dhclient-resolvconf.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-resolvconf.patch
@@ -1,5 +1,5 @@
---- dhcp-4.3.6/client/scripts/bsdos
-+++ dhcp-4.3.6/client/scripts/bsdos
+--- a/client/scripts/bsdos
++++ b/client/scripts/bsdos
 @@ -1,27 +1,25 @@
  #!/bin/sh
  
@@ -55,10 +55,10 @@
 +      chmod 644 /etc/resolv.conf
 +    fi
    fi
- }
- 
---- dhcp-4.3.6/client/scripts/freebsd
-+++ dhcp-4.3.6/client/scripts/freebsd
+   # If we're making confs, may as well make an ntp.conf too
+   make_ntp_conf
+--- a/client/scripts/freebsd
++++ b/client/scripts/freebsd
 @@ -11,54 +11,23 @@
  fi
  
@@ -160,9 +160,9 @@
 +      chmod 644 /etc/resolv.conf
      fi
    fi
- }
---- dhcp-4.3.6/client/scripts/linux
-+++ dhcp-4.3.6/client/scripts/linux
+   # If we're making confs, may as well make an ntp.conf too
+--- a/client/scripts/linux
++++ b/client/scripts/linux
 @@ -35,16 +35,16 @@
  # update /etc/resolv.conf based on received values
  # This updated version mostly follows Debian script by Andrew Pollock et al.
@@ -248,10 +248,10 @@
  	fi
 -        mv -f $new_resolv_conf /etc/resolv.conf
      fi
- }
  
---- dhcp-4.3.6/client/scripts/netbsd
-+++ dhcp-4.3.6/client/scripts/netbsd
+     # If we're making confs, may as well make an ntp.conf too
+--- a/client/scripts/netbsd
++++ b/client/scripts/netbsd
 @@ -1,27 +1,25 @@
  #!/bin/sh
  
@@ -308,10 +308,10 @@
 +      chmod 644 /etc/resolv.conf
 +    fi
    fi
- }
- 
---- dhcp-4.3.6/client/scripts/openbsd
-+++ dhcp-4.3.6/client/scripts/openbsd
+   # If we're making confs, may as well make an ntp.conf too
+   make_ntp_conf
+--- a/client/scripts/openbsd
++++ b/client/scripts/openbsd
 @@ -1,27 +1,25 @@
  #!/bin/sh
  
@@ -369,10 +369,10 @@
 +      chmod 644 /etc/resolv.conf
 +    fi
    fi
- }
- 
---- dhcp-4.3.6/client/scripts/solaris
-+++ dhcp-4.3.6/client/scripts/solaris
+   # If we're making confs, may as well make an ntp.conf too
+   make_ntp_conf
+--- a/client/scripts/solaris
++++ b/client/scripts/solaris
 @@ -1,21 +1,39 @@
  #!/bin/sh  
  
@@ -418,5 +418,5 @@
 +      chmod 644 /etc/resolv.conf
 +    fi
    fi
- }
- 
+   # If we're making confs, may as well make an ntp.conf too
+   make_ntp_conf
diff --git a/net-misc/dhcp/files/dhcp-4.2.2-dhclient-stdin-conf.patch b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-stdin-conf.patch
index bf5a54c32153..bf5a54c32153 100644
--- a/net-misc/dhcp/files/dhcp-4.2.2-dhclient-stdin-conf.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-stdin-conf.patch
diff --git a/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch b/net-misc/dhcp/files/dhcp-4.4.3-fix-perms.patch
index f4b3fd18e167..5b3a8ab2c20a 100644
--- a/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-fix-perms.patch
@@ -1,6 +1,6 @@
 --- a/server/dhcpd.c
 +++ b/server/dhcpd.c
-@@ -602,6 +602,12 @@
+@@ -892,6 +892,12 @@
  	if (lftest)
  		exit (0);
  
@@ -11,5 +11,5 @@
 +#endif /* PARANOIA */
 +
  	/* Discover all the network interfaces and initialize them. */
- 	discover_interfaces (DISCOVER_SERVER);
- 
+ #if defined(DHCPv6) && defined(DHCP4o6)
+ 	if (dhcpv4_over_dhcpv6) {
diff --git a/net-misc/dhcp/files/dhcp-4.3.6-iproute2-path.patch b/net-misc/dhcp/files/dhcp-4.4.3-iproute2-path.patch
index 18b04e620c14..18b04e620c14 100644
--- a/net-misc/dhcp/files/dhcp-4.3.6-iproute2-path.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-iproute2-path.patch
diff --git a/net-misc/dhcp/files/dhcp-4.3.3-ldap-ipv6-client-id.patch b/net-misc/dhcp/files/dhcp-4.4.3-ldap-ipv6-client-id.patch
index 2a7f8183d4e0..2a7f8183d4e0 100644
--- a/net-misc/dhcp/files/dhcp-4.3.3-ldap-ipv6-client-id.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-ldap-ipv6-client-id.patch
diff --git a/net-misc/dhcp/files/dhcp-4.3.6-nogateway.patch b/net-misc/dhcp/files/dhcp-4.4.3-nogateway.patch
index d299cc503f60..d299cc503f60 100644
--- a/net-misc/dhcp/files/dhcp-4.3.6-nogateway.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-nogateway.patch
diff --git a/net-misc/dhcp/files/dhcp-4.3.6-quieter-ping.patch b/net-misc/dhcp/files/dhcp-4.4.3-quieter-ping.patch
index 3efb6459ebf9..3efb6459ebf9 100644
--- a/net-misc/dhcp/files/dhcp-4.3.6-quieter-ping.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-quieter-ping.patch
diff --git a/net-misc/kafkacat/Manifest b/net-misc/kafkacat/Manifest
index 47fb25b55cd7..43fa15657745 100644
--- a/net-misc/kafkacat/Manifest
+++ b/net-misc/kafkacat/Manifest
@@ -1,3 +1,5 @@
 DIST kafkacat-1.5.0.tar.gz 124682 BLAKE2B 392689ded1cd07268bba572273b2b18dbac0d0f4c2daf87c0a4c5fbbff2568df7ec5ca7b64aed34caa851b5e9b8629e246f9d19087496a882b8b55b2e2138f78 SHA512 57f75b26ef32df244043fa9fc17dc2d6fd93daeea4bc389aa78356ea6e45dea780ff9c3462ed27d2a7798560a21eef04f098bf7766c7305bcee4573f557651ad
+DIST kcat-1.7.1.tar.gz 142699 BLAKE2B 2736d284d9f1f940688a3605db3a966ddee0cb26cc271d0d288f5910a86b8d494e207757d5d35e445ea99bb4a0a218715401815167734eee3942d7de6573baaf SHA512 07aa442a840819ca8d1ab20d86fe9d07afee0e4fa546b033ceb0c1c526f3fb5d9fbd2c34c29460d3439c5046b836605150dc76e85072d9516d82b9a193a0a3cd
 EBUILD kafkacat-1.5.0.ebuild 667 BLAKE2B 912e8c4ee0f788eed5024f008031db1bdf47fa46909f9b5a7b8e1c84ede1cf2724796fda1e2ddcf3ecee3fcceddf00cd872795fceab8b7a4d84da9ea07a58efb SHA512 a69fd7fe4268b5e42c2da2e058f10fa53975b45fa56675e2be9756a84bc0dcf8137f0f020dd11d4ec282198c9ab24e18fe21cd692ba10452736b86c0aa390187
+EBUILD kafkacat-1.7.1.ebuild 869 BLAKE2B 06393c2be6ccbdcf16f3cb8f15a7ef46a7fc97d53bc43f2c0b5241043cdad500c3912daef3712c678f8ec0e3a2ba625ee9bd359314979ededd0a151b8dfb93cf SHA512 df3e3c90ca718737a3829eaeca45ab94d3a7bc4b912fd13fae14f43925aef67f18789ec19d6fdd2d5bcc81e11b8dc0b5cb4a9db231ab44b85ae901fb75df0453
 MISC metadata.xml 468 BLAKE2B a9a00808af0af8c2a3183f35ccef3edd15c2772d99c3c01e2a0da115dafe46c89449d1dbe7119e08c294c7d53372ac4a6dc31d5cc956c66b73350143472af09b SHA512 d1cdf304cc2cca1744e2092b50db577b981d8684ebfa4a4d099bd84bada67e00558c439d9a735bc43247db598fa34e0419dd3fcaae94ae68246baf003bbffca8
diff --git a/net-misc/kafkacat/kafkacat-1.7.1.ebuild b/net-misc/kafkacat/kafkacat-1.7.1.ebuild
new file mode 100644
index 000000000000..9534872d1cd2
--- /dev/null
+++ b/net-misc/kafkacat/kafkacat-1.7.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MY_PN=kcat
+
+inherit toolchain-funcs
+
+DESCRIPTION="Generic command line non-JVM Apache Kafka producer and consumer"
+HOMEPAGE="https://github.com/edenhill/kcat"
+SRC_URI="https://github.com/edenhill/kcat/archive/${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+avro +json"
+
+DEPEND=">=dev-libs/librdkafka-0.9.4
+	avro? (
+		dev-libs/avro-c
+		dev-libs/libserdes
+	)
+	json? ( dev-libs/yajl )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+	econf $(use_enable avro) $(use_enable json) --cc="$(tc-getCC)"
+}
+
+src_install() {
+	default
+	dodoc CHANGELOG.md
+	doman ${MY_PN}.1
+}
+
+pkg_postinst() {
+	ewarn "Note that starting with version 1.7.1 the executable name"
+	ewarn "was changed from kafkacat to kcat"
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index f945faf9b832..d4b3e700edee 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index a1d9d512a8fe..685cc3b536df 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -74,7 +74,7 @@ games-mud/gnome-mud
 # Sam James <sam@gentoo.org> (2022-10-13)
 # Depends on vulnerable version of Rust. See bug #877005.
 # Will be unmasked once dependency is updated.
-www-client/seamonkey
+<www-client/seamonkey-2.53.14-r1
 
 # Joshua Kinard <kumba@gentoo.org> (2022-10-13)
 # Difficult-to-resolve build issues on modern toolchains,
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 55546bf3244b..b4a803cba68a 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index c85e4fd161c4..4ee1f7bd29c8 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,3 +1,4 @@
+AUX 251-gpt-auto-no-cryptsetup.patch 958 BLAKE2B 7067224e613433fcb139c38597552e080e07d33b207965a9c9a2b3d4e353c43dae38e6800d6ce28cadcba5f914b1b49e80fa48929df2c4bb96248bfeb6bf6aa5 SHA512 6a78bbdde3aae9a2ad4c4f824eb5281ca9ab24770516ad7c9a9e3daf7f39475bf9b4dd868c857a9833dd408db801393f949b8fae1700b2ad04ea822dc84e3429
 AUX 251-revert-fortify-source-3-fix.patch 2059 BLAKE2B 5b34062821f2097fc622ffc66d83029267173b2b4131b29d9339644577b7e80c513c83f62d07ba3e030c2a861efe7d399bd871cc35803b39940f7ec0e7bacfec SHA512 14c5ac8d0343a4cb50de6c56124e515b159cf5f9bf358404ba41ec7a9c439206673e0d44888164ff3872236c7b8c74f5ea9544ea7a981a3b5930585dabcd4782
 AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0535c93ccf83486bbdae8f68d682714576b072a174df070505cce9c6f4b729e91a6f61ed89da72e8e SHA512 92e2be610839432f46cefab4d128825199dc9f2c5ef33119f9ff84dfe635ef56a4f7aaed64ba52ea2798868b00c3a1b7955caa33219aa298c6a2b8290181f94b
 AUX systemd-tmpfiles-setup 329 BLAKE2B 7b4d801ec7c29a3d6073c47af8fa1c9fa670b3762c5358d0008ecf372e675e3f65cba3ea453d374c5e23453cfe32252421b69dff23aaeea636c611b960eb7b11 SHA512 cd7f7c69d1b1861cb4eac90d44579361e365ee77906376b6124ff79ba1c0d414b8891ffca19e715585d7400bddc5e9ad973f191125039a4a2c37acb95a111c37
@@ -5,6 +6,8 @@ AUX systemd-tmpfiles-setup-dev 342 BLAKE2B 95956e57d4f2aa10a09f23c08045ceed6fac3
 DIST systemd-musl-patches-251.2.tar.gz 28512 BLAKE2B 4ac6a5220dab8409962a3954af2fb2484af718d0f282129957236ce241fbe8538a90d507a96c7c3d86f4f408ab784a6888b37486405d3276e7734a1bd5aa9680 SHA512 6e56b62234ac54929faea5a7cad699d0b932f869b48e3ba4e1f349a88653b7c787efec24a09b00290c3dc566614e3c1dc2f3c04f04e943f513108a91eca1be82
 DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e SHA512 7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738
 DIST systemd-stable-251.5.tar.gz 11444428 BLAKE2B 96df35dae789b11ead1960e1139046972a29c41f74ca800e0fafd84e6a8c238f8d4a30e2991ee94e07e866bc0c3137774ee116f276ac1203cca85254ccf91913 SHA512 2c645a694d45a2670920115529c5f34001153dafe26e5c4e65f8d1a37922a351569d056fc002f1af72dfc173988f93e11893460f64b497e3d5fc339083dcb2fa
+DIST systemd-stable-251.6.tar.gz 11448383 BLAKE2B 987ea88ea23662fd4119e3c796cc2e5f428fcce6cf0b033a5f8da7974c0026d41851f517e489354bbc22973b33c3932ac7280c56527f03a1fcbce3092148b638 SHA512 2da41ac7e939a893ada3ce682a6fe7dd326e8e0132221589da3d2b1d994e1a879118e0c6025f03351dac6567d754223a5f5401d64a5ca9256ab95512800370f8
 EBUILD systemd-utils-251.4-r2.ebuild 12095 BLAKE2B 21014fadfa7a5ea04e2cabde58ff7a5c404c28feb224680309c49f3f056b2b0af92688d245f17f42896e71bd1e59879ed070c691dfadaaa29e90580a3a216038 SHA512 f3bb8010c6162fc601b95eebc297ae8f3f5256bd6a20c70423aec1c90854744c773f63affe3f610c3b28ab795f5579cfb45ec57f70cb5eb6121c4347a7f45e95
 EBUILD systemd-utils-251.5.ebuild 12004 BLAKE2B 813622adb081673984af0142e4fcec51259441bcc31d2cd2985cd93c31ab6790a82081469525b6e3a05e9fe17f9cc581f717903aefa267aeb5167edebf714521 SHA512 3cfc14f2d5d0570dc6be9d4ad1ad9ebcc17c59970e5840a02a84bda6d80f35b33facddd46554a1857ecc38fc6e69875681e292d57a2dc32205e4e2f88a377c54
+EBUILD systemd-utils-251.6.ebuild 12053 BLAKE2B 885efc6eacdee2839c1098a7a450eee58b7cd28eb4c1c09c58cf090c9ba6c6c9a887ffee96cde1131a8f5d3ac701bb02c0ed47581d7a4da75189237774a1c729 SHA512 c25c6088674b560130e7b113e376077c44e5eb622ab62e5c8211dd7c9d84efd97df82fd94d169bbbbf46f180203d042dad8d39b34773b33fb5294ad92ef934f9
 MISC metadata.xml 713 BLAKE2B 1dcb5d9949600c9a8c8ac0c005ffa03b2ca91293a932fa96092a24c094e9fb29f2cf063af041432c12daec4aa4e60d11ea77ed0a423e188095f995c68e75b91a SHA512 46d167a6d898abfc56130e373d232c18fb3ef8865755379fa7678c049515458e7354b7a8cab3bf3faa7326932cccceb0b0745b4695ab9bea492bc2344abf9da4
diff --git a/sys-apps/systemd-utils/files/251-gpt-auto-no-cryptsetup.patch b/sys-apps/systemd-utils/files/251-gpt-auto-no-cryptsetup.patch
new file mode 100644
index 000000000000..f56f2febfd2b
--- /dev/null
+++ b/sys-apps/systemd-utils/files/251-gpt-auto-no-cryptsetup.patch
@@ -0,0 +1,28 @@
+https://github.com/systemd/systemd/commit/d0523bb0d12766485fde3b87bb42db8dfc3c45d3
+https://github.com/systemd/systemd/issues/24978
+
+From d0523bb0d12766485fde3b87bb42db8dfc3c45d3 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Wed, 12 Oct 2022 21:47:29 +0200
+Subject: [PATCH] gpt-auto: allow using without cryptsetup
+
+Fixes #24978
+--- a/src/gpt-auto-generator/gpt-auto-generator.c
++++ b/src/gpt-auto-generator/gpt-auto-generator.c
+@@ -571,11 +571,15 @@ static int add_root_rw(DissectedPartition *p) {
+ 
+ #if ENABLE_EFI
+ static int add_root_cryptsetup(void) {
++#if HAVE_LIBCRYPTSETUP
+ 
+         /* If a device /dev/gpt-auto-root-luks appears, then make it pull in systemd-cryptsetup-root.service, which
+          * sets it up, and causes /dev/gpt-auto-root to appear which is all we are looking for. */
+ 
+         return add_cryptsetup("root", "/dev/gpt-auto-root-luks", true, false, NULL);
++#else
++        return 0;
++#endif
+ }
+ #endif
+ 
+
diff --git a/sys-apps/systemd-utils/systemd-utils-251.6.ebuild b/sys-apps/systemd-utils/systemd-utils-251.6.ebuild
new file mode 100644
index 000000000000..a59e868762b9
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-251.6.ebuild
@@ -0,0 +1,525 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+	MY_P="systemd-stable-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+	MY_P="systemd-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-251.2"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	elibc_musl? ( >=sys-libs/musl-1.2.3 )
+	selinux? ( sys-libs/libselinux:0= )
+	tmpfiles? (
+		acl? ( sys-apps/acl:0= )
+	)
+	udev? (
+		>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+		sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+		virtual/libcrypt:=[${MULTILIB_USEDEP}]
+		acl? ( sys-apps/acl:0= )
+		kmod? ( >=sys-apps/kmod-15:0= )
+	)
+	!udev? (
+		>=sys-apps/util-linux-2.30:0=
+		sys-libs/libcap:0=
+		virtual/libcrypt:=
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.11
+	boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+	boot? ( !<sys-boot/systemd-boot-250 )
+	tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+	udev? (
+		acct-group/audio
+		acct-group/cdrom
+		acct-group/dialout
+		acct-group/disk
+		acct-group/input
+		acct-group/kmem
+		acct-group/kvm
+		acct-group/lp
+		acct-group/render
+		acct-group/sgx
+		acct-group/tape
+		acct-group/tty
+		acct-group/video
+		!sys-apps/gentoo-systemd-integration
+		!sys-apps/hwids[udev]
+		!<sys-fs/udev-250
+		!sys-fs/eudev
+	)
+	!sys-apps/systemd
+"
+PDEPEND="
+	udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gperf
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+src_prepare() {
+	local PATCHES=(
+		# Breaks Clang. Revert the commit for now and force off F_S=3.
+		"${FILESDIR}/251-revert-fortify-source-3-fix.patch"
+		"${FILESDIR}/251-gpt-auto-no-cryptsetup.patch"
+	)
+
+	if use elibc_musl; then
+		PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+		# Applied upstream in 251.3
+		rm "${WORKDIR}/${MUSL_PATCHSET}/0001-Add-sys-file.h-for-LOCK_.patch" || die
+	fi
+	default
+
+	# Remove install_rpath; we link statically
+	local rpath_pattern="install_rpath : rootlibexecdir,"
+	grep -q -e "${rpath_pattern}" meson.build || die
+	sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+	# Broken with FORTIFY_SOURCE=3 without a patch. And the patch
+	# wasn't backported to 250.x, but it turns out to break Clang
+	# anyway:  bug #841770.
+	#
+	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+	# to unset F_S first, then explicitly set 2, to negate any default
+	# and anything set by the user if they're choosing 3 (or if they've
+	# modified GCC to set 3).
+	#
+	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+		# We can't unconditionally do this b/c we fortify needs
+		# some level of optimisation.
+		filter-flags -D_FORTIFY_SOURCE=3
+		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_use split-usr)
+		$(meson_use split-usr split-bin)
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dsysvinit-path=
+		$(meson_native_use_bool boot efi)
+		$(meson_native_use_bool boot gnu-efi)
+		$(meson_native_use_bool boot kernel-install)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool sysusers)
+		$(meson_use test tests)
+		$(meson_native_use_bool tmpfiles)
+		$(meson_use udev hwdb)
+
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+		# Link staticly with libsystemd-shared
+		-Dlink-boot-shared=false
+		-Dlink-udev-shared=false
+
+		# systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+		-Dstandalone-binaries=true
+
+		# Disable all optional features
+		-Dadm-group=false
+		-Danalyze=false
+		-Dapparmor=false
+		-Daudit=false
+		-Dbacklight=false
+		-Dbinfmt=false
+		-Dbzip2=false
+		-Dcoredump=false
+		-Ddbus=false
+		-Delfutils=false
+		-Denvironment-d=false
+		-Dfdisk=false
+		-Dgcrypt=false
+		-Dglib=false
+		-Dgshadow=false
+		-Dgnutls=false
+		-Dhibernate=false
+		-Dhostnamed=false
+		-Didn=false
+		-Dima=false
+		-Dinitrd=false
+		-Dfirstboot=false
+		-Dldconfig=false
+		-Dlibcryptsetup=false
+		-Dlibcurl=false
+		-Dlibfido2=false
+		-Dlibidn=false
+		-Dlibidn2=false
+		-Dlibiptc=false
+		-Dlocaled=false
+		-Dlogind=false
+		-Dlz4=false
+		-Dmachined=false
+		-Dmicrohttpd=false
+		-Dnetworkd=false
+		-Dnscd=false
+		-Dnss-myhostname=false
+		-Dnss-resolve=false
+		-Dnss-systemd=false
+		-Doomd=false
+		-Dopenssl=false
+		-Dp11kit=false
+		-Dpam=false
+		-Dpcre2=false
+		-Dpolkit=false
+		-Dportabled=false
+		-Dpstore=false
+		-Dpwquality=false
+		-Drandomseed=false
+		-Dresolve=false
+		-Drfkill=false
+		-Dseccomp=false
+		-Dsmack=false
+		-Dsysext=false
+		-Dtimedated=false
+		-Dtimesyncd=false
+		-Dtpm=false
+		-Dqrencode=false
+		-Dquotacheck=false
+		-Duserdb=false
+		-Dutmp=false
+		-Dvconsole=false
+		-Dwheel-group=false
+		-Dxdg-autostart=false
+		-Dxkbcommon=false
+		-Dxz=false
+		-Dzlib=false
+		-Dzstd=false
+	)
+
+	if use tmpfiles || use udev; then
+		emesonargs+=( $(meson_native_use_bool acl) )
+	else
+		emesonargs+=( -Dacl=false )
+	fi
+
+	if use udev; then
+		emesonargs+=( $(meson_native_use_bool kmod) )
+	else
+		emesonargs+=( -Dkmod=false )
+	fi
+
+	if use elibc_musl; then
+		# Avoid redefinition of struct ethhdr.
+		append-cppflags -D__UAPI_DEF_ETHHDR=0
+	fi
+
+	if multilib_is_native_abi || use udev; then
+		meson_src_configure
+	fi
+}
+
+efi_arch() {
+	case "$(tc-arch)" in
+		amd64) echo x64 ;;
+		arm)   echo arm ;;
+		arm64) echo aa64 ;;
+		x86)   echo x86 ;;
+	esac
+}
+
+multilib_src_compile() {
+	local targets=()
+	if multilib_is_native_abi; then
+		if use boot; then
+			targets+=(
+				bootctl
+				kernel-install
+				man/bootctl.1
+				man/kernel-install.8
+				src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+				src/boot/efi/systemd-boot$(efi_arch).efi
+			)
+		fi
+		if use sysusers; then
+			targets+=(
+				systemd-sysusers.standalone
+				man/sysusers.d.5
+				man/systemd-sysusers.8
+			)
+			if use test; then
+				targets+=(
+					systemd-runtest.env
+				)
+			fi
+		fi
+		if use tmpfiles; then
+			targets+=(
+				systemd-tmpfiles.standalone
+				man/tmpfiles.d.5
+				man/systemd-tmpfiles.8
+			)
+			if use test; then
+				targets+=( test-tmpfiles )
+			fi
+		fi
+		if use udev; then
+			targets+=(
+				udevadm
+				systemd-hwdb
+				src/udev/ata_id
+				src/udev/cdrom_id
+				src/udev/fido_id
+				src/udev/mtd_probe
+				src/udev/scsi_id
+				src/udev/udev.pc
+				src/udev/v4l_id
+				man/udev.conf.5
+				man/systemd.link.5
+				man/hwdb.7
+				man/udev.7
+				man/systemd-hwdb.8
+				man/systemd-udevd.service.8
+				man/udevadm.8
+				hwdb.d/60-autosuspend-chromiumos.hwdb
+				rules.d/50-udev-default.rules
+				rules.d/64-btrfs.rules
+			)
+			if use test; then
+				targets+=(
+					# Used by udev-test.pl
+					systemd-detect-virt
+					test/sys
+					test-udev
+
+					test-fido-id-desc
+					test-udev-builtin
+					test-udev-event
+					test-udev-netlink
+					test-udev-node
+					test-udev-util
+				)
+			fi
+		fi
+	fi
+	if use udev; then
+		targets+=(
+			udev:shared_library
+			src/libudev/libudev.pc
+		)
+		if use test; then
+			targets+=(
+				test-libudev
+				test-libudev-sym
+				test-udev-device-thread
+			)
+		fi
+	fi
+	if multilib_is_native_abi || use udev; then
+		meson_src_compile "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	local tests=()
+	if multilib_is_native_abi; then
+		if use sysusers; then
+			tests+=(
+				test-sysusers.standalone
+			)
+		fi
+		if use tmpfiles; then
+			tests+=(
+				test-systemd-tmpfiles.standalone
+				test-tmpfiles
+			)
+		fi
+		if use udev; then
+			tests+=(
+				rule-syntax-check
+				test-fido-id-desc
+				test-udev-builtin
+				test-udev-event
+				test-udev-netlink
+				test-udev-node
+				test-udev-util
+			)
+			if [[ -w /dev ]]; then
+				tests+=( udev-test )
+			else
+				ewarn "Skipping udev-test (needs write access to /dev)"
+			fi
+		fi
+	fi
+	if use udev; then
+		tests+=(
+			test-libudev
+			test-libudev-sym
+			test-udev-device-thread
+		)
+	fi
+	if [[ ${#tests[@]} -ne 0 ]]; then
+		meson_src_test "${tests[@]}"
+	fi
+}
+
+src_install() {
+	local rootprefix="$(usex split-usr '' /usr)"
+	meson-multilib_src_install
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		if use boot; then
+			into /usr
+			dobin bootctl kernel-install
+			doman man/{bootctl.1,kernel-install.8}
+			insinto usr/lib/systemd/boot/efi
+			doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+		fi
+		if use sysusers; then
+			into "${rootprefix:-/}"
+			newbin systemd-sysusers{.standalone,}
+			doman man/{systemd-sysusers.8,sysusers.d.5}
+		fi
+		if use tmpfiles; then
+			into "${rootprefix:-/}"
+			newbin systemd-tmpfiles{.standalone,}
+			doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+		fi
+		if use udev; then
+			into "${rootprefix:-/}"
+			dobin udevadm systemd-hwdb
+			dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+			exeinto "${rootprefix}"/lib/udev
+			doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+			insinto "${rootprefix}"/lib/udev/rules.d
+			doins rules.d/*.rules
+
+			insinto "${rootprefix}"/lib/udev/hwdb.d
+			doins hwdb.d/*.hwdb
+
+			insinto /usr/share/pkgconfig
+			doins src/udev/udev.pc
+
+			doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+			newman man/systemd-udevd.service.8 systemd-udevd.8
+		fi
+	fi
+	if use udev; then
+		meson_install --no-rebuild --tags libudev
+		gen_usr_ldscript -a udev
+		insinto "/usr/$(get_libdir)/pkgconfig"
+		doins src/libudev/libudev.pc
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use boot; then
+		into /usr
+		exeinto usr/lib/kernel/install.d
+		doexe src/kernel-install/*.install
+		dobashcomp shell-completion/bash/bootctl
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/{_bootctl,_kernel-install}
+	fi
+	if use tmpfiles; then
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_systemd-tmpfiles
+	fi
+	if use udev; then
+		doheader src/libudev/libudev.h
+
+		insinto /etc/udev
+		doins src/udev/udev.conf
+		keepdir /etc/udev/{hwdb.d,rules.d}
+
+		insinto "${rootprefix}"/lib/systemd/network
+		doins network/99-default.link
+
+		# Remove to avoid conflict with elogind
+		# https://bugs.gentoo.org/856433
+		rm rules.d/70-power-switch.rules || die
+		insinto /lib/udev/rules.d
+		doins rules.d/*.rules
+		doins "${FILESDIR}"/40-gentoo.rules
+
+		insinto /lib/udev/hwdb.d
+		doins hwdb.d/*.hwdb
+
+		dobashcomp shell-completion/bash/udevadm
+
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_udevadm
+	fi
+}
+
+add_service() {
+	local initd=$1
+	local runlevel=$2
+
+	ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+	mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+	eend $?
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		add_service systemd-tmpfiles-setup-dev sysinit
+		add_service systemd-tmpfiles-setup boot
+	fi
+	if use udev; then
+		ebegin "Updating hwdb"
+		systemd-hwdb --root="${ROOT}" update
+		eend $?
+		udev_reload
+	fi
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index e9eb8abf41fc..44bcfa8d6e08 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,4 +1,5 @@
 AUX 251-glibc-2.36.patch 4101 BLAKE2B 79b05ed39a2c840358b2030fd5bba61a3c0786e376f7fc4dee133aa7539a55008ac57a58d5c11ef9e2a2f047b359b6ab2841ea0adc5977da066e5b6c2ae26cc2 SHA512 0c4a05129a3ce22432db6e189e87db71c73be517b7e4a10e2218a0b24f0fd5d8dff331249574e6e0e1958476db95315054320837b784ae6351473f5eecc20800
+AUX 251-gpt-auto-no-cryptsetup.patch 958 BLAKE2B 7067224e613433fcb139c38597552e080e07d33b207965a9c9a2b3d4e353c43dae38e6800d6ce28cadcba5f914b1b49e80fa48929df2c4bb96248bfeb6bf6aa5 SHA512 6a78bbdde3aae9a2ad4c4f824eb5281ca9ab24770516ad7c9a9e3daf7f39475bf9b4dd868c857a9833dd408db801393f949b8fae1700b2ad04ea822dc84e3429
 AUX 251-revert-fortify-source-3-fix.patch 2059 BLAKE2B 5b34062821f2097fc622ffc66d83029267173b2b4131b29d9339644577b7e80c513c83f62d07ba3e030c2a861efe7d399bd871cc35803b39940f7ec0e7bacfec SHA512 14c5ac8d0343a4cb50de6c56124e515b159cf5f9bf358404ba41ec7a9c439206673e0d44888164ff3872236c7b8c74f5ea9544ea7a981a3b5930585dabcd4782
 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada
 AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad
@@ -8,8 +9,10 @@ AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab2821
 DIST systemd-stable-251.3.tar.gz 11435458 BLAKE2B 544238536848ab390b2476d5ad95d33998674be50020b8db0627bb9d0c86be6576c404ce786b01ceec86f1c75b174c6fc2d7e0d7fbab802a78f48c9d0915c2b8 SHA512 fb5b8dc1742562ef95469e90d406cfb6dfcb337860ad1208b460414b88ff0565071bde797d195faa62761206abc881829de6b1009e5d727cad2dfe0764310d5f
 DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e SHA512 7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738
 DIST systemd-stable-251.5.tar.gz 11444428 BLAKE2B 96df35dae789b11ead1960e1139046972a29c41f74ca800e0fafd84e6a8c238f8d4a30e2991ee94e07e866bc0c3137774ee116f276ac1203cca85254ccf91913 SHA512 2c645a694d45a2670920115529c5f34001153dafe26e5c4e65f8d1a37922a351569d056fc002f1af72dfc173988f93e11893460f64b497e3d5fc339083dcb2fa
+DIST systemd-stable-251.6.tar.gz 11448383 BLAKE2B 987ea88ea23662fd4119e3c796cc2e5f428fcce6cf0b033a5f8da7974c0026d41851f517e489354bbc22973b33c3932ac7280c56527f03a1fcbce3092148b638 SHA512 2da41ac7e939a893ada3ce682a6fe7dd326e8e0132221589da3d2b1d994e1a879118e0c6025f03351dac6567d754223a5f5401d64a5ca9256ab95512800370f8
 EBUILD systemd-251.3.ebuild 15507 BLAKE2B a5b9463fe2f440b01ab987b134fb147f88a811393e8122f2e404ca8163c7805cf42844292da3dbed72140e188958ccd67f11fc000c94b2e76aea0054a7a0606e SHA512 d1cd4e249b30fe9f975c4a70d7efd08b718dab197d84de621ab2e407299de764a1b47dc7d5df60028e3a2a5feedc9824b5d295a71c5583c369cc8283565de281
 EBUILD systemd-251.4.ebuild 15500 BLAKE2B c8ea106e1dbbf830fba008ed6f70486e36a62947cf390f436b2c45856a8f3fc74d819f67983dde5fa49b854cf91e3c76e4ccb7d99af9c9753cc7a0183d8bb0d3 SHA512 f97e89cbc1fad054b265878f0f55b7bbfccdecc1f907743d4373cb7a9783805ea1e5536ad5fe759da4e3b6954146c9b456ce4147fa86f41c61187b11333ee8ec
 EBUILD systemd-251.5.ebuild 15508 BLAKE2B dd89dde571cfd27fad856e2802c8b837d96b567f07fcae62af911f9dc6ebf6752ef7a287a7f1d695695a8f84cd43638a156101fcd53488fd25bdf43d65cb8560 SHA512 1c4b6a2dd35171dea0363d1331bfa67967fdb9bc8025cf4b3fea7b20af60748373473a3efed0710a8c86762ba53fb3bdcd0df62bb1e70a55a43a1ab722171ecd
+EBUILD systemd-251.6.ebuild 15557 BLAKE2B 124b3527e460ec93d8a1f5a5fea3f435aa8db9a6b25b729ef46480b451a89aa77800d7a6062b7ba94d817152951f6f22c58d68708e2fd0fafbf73841b23bb9a0 SHA512 09f4318b267ef45fcd92d4ce3f25d5c6e665f0d1662cb339796c60e38c48ab780977d93f816f80c8e7512f6cb2c9802e68914375b351a08d14d96d2ff30365e5
 EBUILD systemd-9999.ebuild 15372 BLAKE2B f480ab02dd6910b271805ef126bfefd478b9c94487dd4d2134edebd5a15e780ecb9104ae16a0f50dd921f642cb78389ffb486cc9ea76ea3d4db863a0db12d63f SHA512 ee3c87a63e7295e02679364f7337985eaf073026e57672b6352bb65979224791e491222b4309ca66ecc4df6c1b312acb4b706419299800fa8c94e179c235f5c6
 MISC metadata.xml 2545 BLAKE2B fc424b7f9e471860cba69b6f11ea2094c70f125cd55c42ea77e4549a399680c4444119c79424c266828a284b0214001421f760477b1341844dddd2d474d70c33 SHA512 f0b8c4614e3c88d123916bb3399d6025ab30ff839849b136a29e1960bf0c50699b3f09b5307f40b77cc8c5566c20b11de2364a08311adceb15507df3e4bb0565
diff --git a/sys-apps/systemd/files/251-gpt-auto-no-cryptsetup.patch b/sys-apps/systemd/files/251-gpt-auto-no-cryptsetup.patch
new file mode 100644
index 000000000000..f56f2febfd2b
--- /dev/null
+++ b/sys-apps/systemd/files/251-gpt-auto-no-cryptsetup.patch
@@ -0,0 +1,28 @@
+https://github.com/systemd/systemd/commit/d0523bb0d12766485fde3b87bb42db8dfc3c45d3
+https://github.com/systemd/systemd/issues/24978
+
+From d0523bb0d12766485fde3b87bb42db8dfc3c45d3 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Wed, 12 Oct 2022 21:47:29 +0200
+Subject: [PATCH] gpt-auto: allow using without cryptsetup
+
+Fixes #24978
+--- a/src/gpt-auto-generator/gpt-auto-generator.c
++++ b/src/gpt-auto-generator/gpt-auto-generator.c
+@@ -571,11 +571,15 @@ static int add_root_rw(DissectedPartition *p) {
+ 
+ #if ENABLE_EFI
+ static int add_root_cryptsetup(void) {
++#if HAVE_LIBCRYPTSETUP
+ 
+         /* If a device /dev/gpt-auto-root-luks appears, then make it pull in systemd-cryptsetup-root.service, which
+          * sets it up, and causes /dev/gpt-auto-root to appear which is all we are looking for. */
+ 
+         return add_cryptsetup("root", "/dev/gpt-auto-root-luks", true, false, NULL);
++#else
++        return 0;
++#endif
+ }
+ #endif
+ 
+
diff --git a/sys-apps/systemd/systemd-251.6.ebuild b/sys-apps/systemd/systemd-251.6.ebuild
new file mode 100644
index 000000000000..de8a975e58e1
--- /dev/null
+++ b/sys-apps/systemd/systemd-251.6.ebuild
@@ -0,0 +1,530 @@
+# Copyright 2011-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..11} )
+
+# Avoid QA warnings
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
+	MY_PV=${PV/_/-}
+	MY_P=${MY_PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="http://systemd.io/"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="
+	acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
+	fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod
+	+lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
+	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
+"
+REQUIRED_USE="
+	dns-over-tls? ( || ( gnutls openssl ) )
+	homed? ( cryptsetup pam openssl )
+	importd? ( curl lzma || ( gcrypt openssl ) )
+	pwquality? ( homed )
+"
+RESTRICT="!test? ( test )"
+
+MINKV="4.15"
+
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+	curl? ( net-misc/curl:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	fido2? ( dev-libs/libfido2:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-3.6.0:0= )
+	http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
+	idn? ( net-dns/libidn2:= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	iptables? ( net-firewall/iptables:0= )
+	openssl? ( >=dev-libs/openssl-1.1.0:0= )
+	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( app-crypt/p11-kit:0= )
+	pcre? ( dev-libs/libpcre2 )
+	pwquality? ( dev-libs/libpwquality:0= )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	tpm? ( app-crypt/tpm2-tss:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
+"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=acct-group/adm-0-r1
+	>=acct-group/wheel-0-r1
+	>=acct-group/kmem-0-r1
+	>=acct-group/tty-0-r1
+	>=acct-group/utmp-0-r1
+	>=acct-group/audio-0-r1
+	>=acct-group/cdrom-0-r1
+	>=acct-group/dialout-0-r1
+	>=acct-group/disk-0-r1
+	>=acct-group/input-0-r1
+	>=acct-group/kvm-0-r1
+	>=acct-group/lp-0-r1
+	>=acct-group/render-0-r1
+	acct-group/sgx
+	>=acct-group/tape-0-r1
+	acct-group/users
+	>=acct-group/video-0-r1
+	>=acct-group/systemd-journal-0-r1
+	>=acct-user/root-0-r1
+	acct-user/nobody
+	>=acct-user/systemd-journal-remote-0-r1
+	>=acct-user/systemd-coredump-0-r1
+	>=acct-user/systemd-network-0-r1
+	acct-user/systemd-oom
+	>=acct-user/systemd-resolve-0-r1
+	>=acct-user/systemd-timesync-0-r1
+	>=sys-apps/baselayout-2.2
+	selinux? (
+		sec-policy/selinux-base-policy[systemd]
+		sec-policy/selinux-ntp
+	)
+	sysv-utils? (
+		!sys-apps/openrc[sysv-utils(-)]
+		!sys-apps/sysvinit
+	)
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-apps/hwids[udev]
+	!sys-auth/nss-myhostname
+	!sys-fs/eudev
+	!sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-fs/udev-init-scripts-34
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		app-text/tree
+		dev-lang/perl
+		sys-apps/dbus
+	)
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test && has pid-sandbox ${FEATURES}; then
+			ewarn "Tests are known to fail with PID sandboxing enabled."
+			ewarn "See https://bugs.gentoo.org/674458."
+		fi
+
+		local CONFIG_CHECK=" ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS
+			~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+
+		if kernel_is -ge 5 10 20; then
+			CONFIG_CHECK+=" ~KCMP"
+		else
+			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
+		fi
+
+		if kernel_is -ge 4 18; then
+			CONFIG_CHECK+=" ~AUTOFS_FS"
+		else
+			CONFIG_CHECK+=" ~AUTOFS4_FS"
+		fi
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	local PATCHES=(
+		# Breaks Clang. Revert the commit for now and force off F_S=3.
+		# bug #841770.
+		"${FILESDIR}/251-revert-fortify-source-3-fix.patch"
+		"${FILESDIR}/251-gpt-auto-no-cryptsetup.patch"
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-generator-path-r2.patch"
+			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
+			"${FILESDIR}/gentoo-journald-audit.patch"
+		)
+	fi
+
+	# Fails with split-usr.
+	sed -i -e '2i exit 77' test/test-rpm-macros.sh || die
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	# Broken with FORTIFY_SOURCE=3 without a patch. We have to revert
+	# the upstream patch for it because it breaks Clang: bug #841770.
+	#
+	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+	# to unset F_S first, then explicitly set 2, to negate any default
+	# and anything set by the user if they're choosing 3 (or if they've
+	# modified GCC to set 3).
+	#
+	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+		# We can't unconditionally do this b/c we fortify needs
+		# some level of optimisation.
+		filter-flags -D_FORTIFY_SOURCE=3
+		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+	fi
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		$(meson_use split-usr)
+		$(meson_use split-usr split-bin)
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Dima=true
+		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+		# Optional components/dependencies
+		$(meson_native_use_bool acl)
+		$(meson_native_use_bool apparmor)
+		$(meson_native_use_bool audit)
+		$(meson_native_use_bool cryptsetup libcryptsetup)
+		$(meson_native_use_bool curl libcurl)
+		$(meson_native_use_bool dns-over-tls dns-over-tls)
+		$(meson_native_use_bool elfutils)
+		$(meson_native_use_bool fido2 libfido2)
+		$(meson_use gcrypt)
+		$(meson_native_use_bool gnuefi gnu-efi)
+		$(meson_native_use_bool gnutls)
+		-Defi-includedir="${ESYSROOT}/usr/include/efi"
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+		$(meson_native_use_bool homed)
+		$(meson_native_use_bool http microhttpd)
+		$(meson_native_use_bool idn)
+		$(meson_native_use_bool importd)
+		$(meson_native_use_bool importd bzip2)
+		$(meson_native_use_bool importd zlib)
+		$(meson_native_use_bool kmod)
+		$(meson_use lz4)
+		$(meson_use lzma xz)
+		$(meson_use zstd)
+		$(meson_native_use_bool iptables libiptc)
+		$(meson_native_use_bool openssl)
+		$(meson_use pam)
+		$(meson_native_use_bool pkcs11 p11kit)
+		$(meson_native_use_bool pcre pcre2)
+		$(meson_native_use_bool policykit polkit)
+		$(meson_native_use_bool pwquality)
+		$(meson_native_use_bool qrcode qrencode)
+		$(meson_native_use_bool seccomp)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool tpm tpm2)
+		$(meson_native_use_bool test dbus)
+		$(meson_native_use_bool xkb xkbcommon)
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+		-Dcreate-log-dirs=false
+
+		# multilib options
+		$(meson_native_true backlight)
+		$(meson_native_true binfmt)
+		$(meson_native_true coredump)
+		$(meson_native_true environment-d)
+		$(meson_native_true firstboot)
+		$(meson_native_true hibernate)
+		$(meson_native_true hostnamed)
+		$(meson_native_true ldconfig)
+		$(meson_native_true localed)
+		$(meson_native_true man)
+		$(meson_native_true networkd)
+		$(meson_native_true quotacheck)
+		$(meson_native_true randomseed)
+		$(meson_native_true rfkill)
+		$(meson_native_true sysusers)
+		$(meson_native_true timedated)
+		$(meson_native_true timesyncd)
+		$(meson_native_true tmpfiles)
+		$(meson_native_true vconsole)
+	)
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	meson_src_test
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+	local sbin=$(usex split-usr sbin bin)
+
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}${rootprefix}/${sbin}"/resolvconf || die
+	fi
+
+	rm "${ED}"/etc/init.d/README || die
+	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
+
+	if ! use sysv-utils; then
+		rm "${ED}${rootprefix}/${sbin}"/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+	fi
+
+	if ! use resolvconf && ! use sysv-utils && use split-usr; then
+		rmdir "${ED}${rootprefix}"/sbin || die
+	fi
+
+	# https://bugs.gentoo.org/761763
+	rm -r "${ED}"/usr/lib/sysusers.d || die
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/kernel/install.d
+	keepdir /etc/systemd/{network,system,user}
+	keepdir /etc/udev/rules.d
+
+	keepdir /etc/udev/hwdb.d
+
+	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
+
+	if use pam; then
+		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+	fi
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+
+	gen_usr_ldscript -a systemd udev
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_preinst() {
+	if ! use split-usr; then
+		local dir
+		for dir in bin sbin lib; do
+			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
+				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
+				eerror "One of them should be a symbolic link to the other one."
+				FAIL=1
+			fi
+		done
+		if [[ ${FAIL} ]]; then
+			eerror "Migration to system layout with merged directories must be performed before"
+			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+			die "System layout with split directories still used"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required.
+	systemd-hwdb --root="${ROOT}" update
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respected, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 28a49df7c487..90c434a487a6 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index a34f60c29f3e..df1ae88f75ad 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -4,6 +4,7 @@ DIST llvm-project-15.0.2.src.tar.xz 112071864 BLAKE2B 96f2884d6c1007260d71e5dd41
 DIST llvm-project-15.0.2.src.tar.xz.sig 438 BLAKE2B 37a3a7fbc2d74db9060e85f04e159b475cf818c95a6fe2e9f5f038eb990f414d94833ecac2f9c826825a69b752876399e37e70e6934def06363f7ccb18be033a SHA512 cfe3bc400a64536ad9181c2ede7227a0953a8632fdc777d1ea1d9225c1fc4e699d90ce0b99e057ee5b87c1272d5810c4b52fb0cac167ddd2aad88f1f3ef46ee8
 DIST llvm-project-ebb258d3b0785f6dcc65e1f277d0690891ddc94d.tar.gz 168823463 BLAKE2B 111afe0f6ba6cef28c3d0162c9c650d15239f981949030768780ebe308418346d0ad367e0e58417832ae43e57b27bccaf56415f81e8221c6c5e78d1113f5617b SHA512 80351d7eeac77a15bf5613b289c71d718ecaccd8a6a4ea6736ed8bfc15c8154099c771564f99ea6c8b491f99bf1ca3a45fac977d638f6a03d7f7b42ba522fa20
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
+EBUILD lld-13.0.1-r1.ebuild 2008 BLAKE2B bbf6bdbfa9284481ce75297b88c734c40e8899da3a39c4da0474f1bb053be810a4bdbe4ed6f16e8eb512ed7826c0d172aa410c2a333fb112782b1ad308d3ce73 SHA512 0d8058ffde5633b22f988136b6f15e5700c84d09dfbef8edb1e936f1de6986f42b0de49e6bca249129b03281679e3eea84d42173a6280ed6642873828c3fec7c
 EBUILD lld-13.0.1.ebuild 1882 BLAKE2B 1a5207649cc769c725f4825ebb6c070eb2b43ffa53ce4c3a04297e5c8e11e9f8cc2df88de51dccefc48a7ad045caadf95b22e747b3760c2d0961f6adba6ff422 SHA512 9f098fda60de3570cd04200babd163d940606a96ff5f7a6f3e8bf31ce054dd50636f47cc25c945cc46e5b4c7646763f58d2799b4940dbee412bad76f73de8dee
 EBUILD lld-14.0.6-r1.ebuild 2014 BLAKE2B cc9fe38292d98e136ec49b7c42e440cc66a6b3a83c9b587066f110ad3d5389b1e771f26bc6f6b7ebd93efbb8fb85d9b24536d6e12b383cb054172aaf802cb270 SHA512 6a53b78cbe58eac99f40f74f9f80772aea8d52522ee124f13c677bfc69f3a513afa3d2beca14b575447a6167db52fae6e8d946b71dcaaa0b79b76a6226b26e80
 EBUILD lld-14.0.6.ebuild 1894 BLAKE2B 8f5922031c9b64b0cf246800fd26b1802bdcc1fd84aae911106bd0c5a6d9482ff7c92571b7cc7f988e0b8b0b679eb94fa6c62685d69fdf9cc2b697ae29252e09 SHA512 4959af6727591bbd411861f4717ffd523b9a026c33c4de3b035230b1b5dc1067d9fa5c539455ea16fd7a294c95b9019be1e85638448afb0d900dedbb4284a30a
diff --git a/sys-devel/lld/lld-13.0.1-r1.ebuild b/sys-devel/lld/lld-13.0.1-r1.ebuild
new file mode 100644
index 000000000000..b92595d59d45
--- /dev/null
+++ b/sys-devel/lld/lld-13.0.1-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake flag-o-matic llvm llvm.org python-any-r1
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~sys-devel/llvm-${PV}
+"
+RDEPEND="
+	${DEPEND}
+	!sys-devel/lld:0
+"
+BDEPEND="
+	test? (
+		>=dev-util/cmake-3.16
+		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+	)
+"
+
+LLVM_COMPONENTS=( lld libunwind/include/mach-o )
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
+llvm.org_set_globals
+
+python_check_deps() {
+	python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	llvm.org_src_unpack
+
+	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
+	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
+	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
+	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
+	# to existent directory ${WORKDIR}/libunwind/include.
+	mkdir -p "${WORKDIR}/llvm" || die
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=ON
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lld
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index def49f0ab7a5..367ee31e8425 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 3e38adc40de5..90c336b0af9e 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -17,6 +17,6 @@ EBUILD linux-firmware-20220610.ebuild 9800 BLAKE2B ddd7ff41cf1e2e86da288de91078f
 EBUILD linux-firmware-20220708.ebuild 9735 BLAKE2B 6d233c4e2ceb85955d039a7b4323e3d102f28b9531281f0d4cbfe5229ec051384ed383eb977922a0e31b8783daace3b5176a22c4f00df4d70bc9799d8dbbe6ea SHA512 22ddcc5a34c7cc6789adbed9b6556ec67218a19cd8c9ed1f806d5013e609e956cc4f8162beb2e8ffd01021da99889be4920c5fc9a4b0b9a82dd5a040988ca726
 EBUILD linux-firmware-20220815.ebuild 9735 BLAKE2B 6d233c4e2ceb85955d039a7b4323e3d102f28b9531281f0d4cbfe5229ec051384ed383eb977922a0e31b8783daace3b5176a22c4f00df4d70bc9799d8dbbe6ea SHA512 22ddcc5a34c7cc6789adbed9b6556ec67218a19cd8c9ed1f806d5013e609e956cc4f8162beb2e8ffd01021da99889be4920c5fc9a4b0b9a82dd5a040988ca726
 EBUILD linux-firmware-20220913-r2.ebuild 9901 BLAKE2B 7c1def3ff8d49722abab2c298fafbd637df5b6f21cd5171b8a169149f752aca8415d8535b3068cd5433e8449d0465b5680fdd73a9796af5d1bb285b84ebefead SHA512 d99dcb62bd50a36895f64396fddb517483a6892c7930ae81af7aab273605402eb1006a649f8fa2419de6fe5e08d26aaf28cf50ae20d40b04128b4efc6f80be9f
-EBUILD linux-firmware-20221012.ebuild 9909 BLAKE2B ae55cea49b5b1dae692b425aff4d3fbf6d193498407499efafd569173a48aedfad7d7a8ec0bd5566e817092ac72fe25ca6252cda3f1ceb24de062d86d1cd0256 SHA512 aa1d40fd47e6c12e2cafd37782f170b11c12c41a4d2dc87f6baf3ed9b9677eb23f3683f68ccbe0076679607b4117d38d1d326a57145d02c2aa3c68a056479c5d
+EBUILD linux-firmware-20221012.ebuild 9901 BLAKE2B 7c1def3ff8d49722abab2c298fafbd637df5b6f21cd5171b8a169149f752aca8415d8535b3068cd5433e8449d0465b5680fdd73a9796af5d1bb285b84ebefead SHA512 d99dcb62bd50a36895f64396fddb517483a6892c7930ae81af7aab273605402eb1006a649f8fa2419de6fe5e08d26aaf28cf50ae20d40b04128b4efc6f80be9f
 EBUILD linux-firmware-99999999.ebuild 9691 BLAKE2B c9076729135f91fd4491b6df406da45837f071e3ab7f2ee475a2770d87e7929adefb87927c5133934b20b7ac8abf5675531180dc99a5d30f44ea71697e0e837e SHA512 8c04303e8b8add3c798cbac06ebff4a0048c1d75ae1e81b341c158d363755dfd036c39c8fbeab3e18e167a544be7826a175c70997b183b9970bc921db4b13664
 MISC metadata.xml 970 BLAKE2B b775ae0bf7cecb73829acb649595bb15c0cf95dd696b02223023ed97d42b57fa2ecc3523d678ff1dbafd27b3d71d1f27f5661adc0dfe07a416563b523682c776 SHA512 649289c0e622b28d31598524ecb48470d274a6835f6c2de00de95b114038e2d5d0f42354aaf1948da55e51060a9b3a87c8bb30f5a7b2124e373818de4e945860
diff --git a/sys-kernel/linux-firmware/linux-firmware-20221012.ebuild b/sys-kernel/linux-firmware/linux-firmware-20221012.ebuild
index 4f6a56ef2c72..57a14cdbbc9c 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20221012.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20221012.ebuild
@@ -19,7 +19,7 @@ else
 		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
 	fi
 
-	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"
 fi
 
 DESCRIPTION="Linux firmware files"
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 952d10fe7796..6da43fe4dfb9 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index a0d371340ed6..d917a77e3380 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -4,9 +4,13 @@ AUX zlib-1.2.12-CRC-buggy-input.patch 1673 BLAKE2B a45b5c36dc4519f785b29981eaa47
 AUX zlib-1.2.12-CVE-2022-37434.patch 2563 BLAKE2B c2aa6275365965ef5c84668372dde46a2b7579d4f87703ca91332f8473ffa8784772ff3d2105696b5c1b65ca07819a66d4e9c1ef0d6894a44fc78702901647e7 SHA512 6ae143b5de553992c1a5460faae2b309f7e9f049c3afdc5ab7f6cad4479e202affa79b09a058f23dd0f24b07c1a52719b2aa921b4209b2ddbe16caafd6df1cbb
 AUX zlib-1.2.12-fix-CC-logic-in-configure.patch 1427 BLAKE2B 7e76e07dc8aef1ee0f38a237a4a37f8c8fa22e1dffe70407781320a325634bc92a0485de7e0de492354672e008f3a689c16087b87c15b1c893f120f5916f906f SHA512 8cdc6fa6754d5d752ae6e59b491cf6f652feb2ea4839d8debf778bbffb0c5dcd1f952a1e7cdb2e01d6e96fe67197db1ad7908c4d9d4f654932cf3deb97cddb16
 AUX zlib-1.2.12-use-LDFLAGS-in-configure.patch 2593 BLAKE2B da920b443437d2f912a3c49c2db7478b19268418f94dd70c083ff44640c71b752f84763392300fc3e843a4025910375c058a0648bef65c5ca0db419297d32be8 SHA512 d884348c96da593e3abc7f14f3eea19369c9105c9814e38012e68c53c01a51e260439d18bc7a2bb121965ad1636c774f6cb701c062eba5e79eca4f199005b859
+AUX zlib-1.2.13-use-LDFLAGS-in-configure.patch 2650 BLAKE2B 3cfae2b0658534aab64f7969d86307bf96724f4ec847e378c2f87b6b9e43c00bae96845d1c3405d5d913d2005e9f18f53923329ad1cfd73e9395f94d035e275f SHA512 77499165a934d171c7d4bbd177f3cfa2e57db8923c61222a48734f8d3879245ed91fe2b900b3a429db89e098a4d4fcd9f3b6f2c1c3a86f761e1b33b56a73987d
 DIST zlib-1.2.11-cygwin-gzopen_w.patch 1170 BLAKE2B fe351436716634bd823da8c2811d332327d335d450d89bee85d7713b09dd454fe6aee264b044a41bf3be603aa36d67943ba6c7d8b46470e180e9b639728b5274 SHA512 14cc63a17fbf6afb6c8a8dd0b92df9807b48e0faf09c88f952083f10716ae62be8de2a0e1424b77fb538605b88898b381160521f2872afdda59e12bd27535c5a
 DIST zlib-1.2.12.tar.gz 1490071 BLAKE2B 76e7b26f8dc761b0eae6276cc32bc36fa74a88197699c95d158c1548f97b80db5e39d21144ecd6ee3eb90c42730aa5f387f9952d9a3f0930b56e9dfcd12f1e67 SHA512 cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14
 DIST zlib-1.2.12.tar.gz.asc 235 BLAKE2B bb1efc89b10b894ebc8e8008ee3e98104348f197fae54d298d62057a2d8b8d7246de937962b531189f80ad64a803112300a73862cba121cbf6a6d5ac5f9bc40c SHA512 5c1144371a83b83f9f1d008aa9297e23c0db992cab6c4a8966f9320e70c6186867d62753511d6a663b0fe181cd37fe256c53586358a42ea348ccc0747b1a7153
+DIST zlib-1.2.13.tar.xz 1296496 BLAKE2B cefcd25989ce27e7d339af2a88455fcf64f6f5e647bedb0f05a45e4370a885fe45a60c023aa63e79b8ecf20ed3254d0052245f33f5769aca2838b42242be14a8 SHA512 9e7ac71a1824855ae526506883e439456b74ac0b811d54e94f6908249ba8719bec4c8d7672903c5280658b26cb6b5e93ecaaafe5cdc2980c760fa196773f0725
+DIST zlib-1.2.13.tar.xz.asc 235 BLAKE2B 29206175f06b4e36960fc6b9403101f55c1f5b768e1921ce1402217bc85978b9fba1a4130db2df5c148b6a1c947148372be20ff8c4ce337c6f2541b42fef7274 SHA512 ca5decebe9572e77e88bac5c5119bfda7e222ed3944e4692510ae70fb5f01d8694b59a6878472b84e6b61d2d1682d94473b6312832afa520a2a23293572ea621
 DIST zlib-1.2.7-cygwin-minizip.patch 2626 BLAKE2B 885f1fda877c0b783618b163702fb46126b7db572767cd4edb86bd92db1f432c887ef1724e70c8319c26886368dba3a962af5284ec0875c20ec8ad2245fd100a SHA512 e372f1e06311e843eca2092e182c41abb009b5e9880b60292d708e4bc0de5a9e4c43d49b25b0c09df4784bc46a1254472bc5cdbdd8d6c762a9f6a145a555bfe7
 EBUILD zlib-1.2.12-r3.ebuild 5208 BLAKE2B f13244f97c80dd030bae8af8d6db4e7063b52f99b8992a156a62105f92fe94defe023706b0551a098c177dfbafcc006e07f7d0bdd4cb4e36f03bdb1cc1a723d2 SHA512 9216e57c869b69128184dc76d0b697b0c1090735aa3be5620e42cfa99d45661093be97b7bed93acfc13f3366ab520fceb41d16877decbae7805f67ca50849365
+EBUILD zlib-1.2.13.ebuild 4953 BLAKE2B b7ec2ea18bb15ac1f76584b4c78f4cdb7764b6382dad3753e5dc0a31b4cee6e44d58e6952919058c31732d43316dca9d317ab032378c349fde0ee76c94fafed7 SHA512 b89d0d6e90d5677687945fd77a4658272c59a72083611d8a03877c85a62d00b4d9f9c81d0f8cff075dea24e9f4b1745a69838c3c25fdfaf4f171ebc872f136d0
 MISC metadata.xml 494 BLAKE2B a4a57a4153aefc189e407bcb8ce84f7c94581cc66967f69097087da7e6ff48d2de683b919fb00445d095c47ef39d31e01590f8c989ce0e5e01474e73ee2a0565 SHA512 a7e0160c127b3c2a6afe99e95992d9dbd017061303759c299ec38800efd6a9e11a35ae850c23c77c09c8833cd9d61ac1267f6becadf9c22437ee35e4304400c9
diff --git a/sys-libs/zlib/files/zlib-1.2.13-use-LDFLAGS-in-configure.patch b/sys-libs/zlib/files/zlib-1.2.13-use-LDFLAGS-in-configure.patch
new file mode 100644
index 000000000000..9f2b240334e8
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.2.13-use-LDFLAGS-in-configure.patch
@@ -0,0 +1,72 @@
+https://github.com/madler/zlib/pull/599
+
+Rebased version of:
+
+From 37c9730ba474d274f4cc6a974943eef95087b9f6 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 8 Mar 2022 22:38:47 -0800
+Subject: [PATCH] configure: Pass LDFLAGS to link tests
+
+LDFLAGS can contain critical flags without which linking wont succeed
+therefore ensure that all configure tests involving link time checks are
+using LDFLAGS on compiler commandline along with CFLAGS to ensure the
+tests perform correctly. Without this some tests may fail resulting in
+wrong confgure result, ending in miscompiling the package
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/configure
++++ b/configure
+@@ -436,7 +436,7 @@ if test $shared -eq 1; then
+   echo Checking for shared library support... | tee -a configure.log
+   # we must test in two steps (cc then ld), required at least on SunOS 4.x
+   if try $CC -w -c $SFLAGS $test.c &&
+-     try $LDSHARED $SFLAGS -o $test$shared_ext $test.o; then
++     try $LDSHARED $SFLAGS $LDFLAGS -o $test$shared_ext $test.o; then
+     echo Building shared library $SHAREDLIBV with $CC. | tee -a configure.log
+   elif test -z "$old_cc" -a -z "$old_cflags"; then
+     echo No shared library support. | tee -a configure.log
+@@ -498,7 +498,7 @@ int main(void) {
+ }
+ EOF
+   fi
+-  if try $CC $CFLAGS -o $test $test.c; then
++  if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then
+     sizet=`./$test`
+     echo "Checking for a pointer-size integer type..." $sizet"." | tee -a configure.log
+     CFLAGS="${CFLAGS} -DNO_SIZE_T=${sizet}"
+@@ -532,7 +532,7 @@ int main(void) {
+   return 0;
+ }
+ EOF
+-  if try $CC $CFLAGS -o $test $test.c; then
++  if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then
+     echo "Checking for fseeko... Yes." | tee -a configure.log
+   else
+     CFLAGS="${CFLAGS} -DNO_FSEEKO"
+@@ -549,7 +549,7 @@ cat > $test.c <<EOF
+ #include <errno.h>
+ int main() { return strlen(strerror(errno)); }
+ EOF
+-if try $CC $CFLAGS -o $test $test.c; then
++if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then
+   echo "Checking for strerror... Yes." | tee -a configure.log
+ else
+   CFLAGS="${CFLAGS} -DNO_STRERROR"
+@@ -656,7 +656,7 @@ int main()
+   return (mytest("Hello%d\n", 1));
+ }
+ EOF
+-  if try $CC $CFLAGS -o $test $test.c; then
++  if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then
+     echo "Checking for vsnprintf() in stdio.h... Yes." | tee -a configure.log
+ 
+     echo >> configure.log
+@@ -746,7 +746,7 @@ int main()
+ }
+ EOF
+ 
+-  if try $CC $CFLAGS -o $test $test.c; then
++  if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then
+     echo "Checking for snprintf() in stdio.h... Yes." | tee -a configure.log
+ 
+     echo >> configure.log
diff --git a/sys-libs/zlib/zlib-1.2.13.ebuild b/sys-libs/zlib/zlib-1.2.13.ebuild
new file mode 100644
index 000000000000..ed611f394ec6
--- /dev/null
+++ b/sys-libs/zlib/zlib-1.2.13.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Worth keeping an eye on 'develop' branch upstream for possible backports.
+AUTOTOOLS_AUTO_DEPEND="no"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/madler.asc
+inherit autotools multilib-minimal usr-ldscript verify-sig
+
+CYGWINPATCHES=(
+	"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch -> ${PN}-1.2.11-cygwin-gzopen_w.patch"
+	"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch -> ${PN}-1.2.7-cygwin-minizip.patch"
+)
+
+DESCRIPTION="Standard (de)compression library"
+HOMEPAGE="https://zlib.net/"
+SRC_URI="https://zlib.net/${P}.tar.xz
+	https://zlib.net/fossils/${P}.tar.xz
+	https://zlib.net/current/beta/${P}.tar.xz
+	verify-sig? ( https://zlib.net/${P}.tar.xz.asc )
+	elibc_Cygwin? ( ${CYGWINPATCHES[*]} )"
+
+LICENSE="ZLIB"
+SLOT="0/1" # subslot = SONAME
+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 ~x86-winnt"
+IUSE="minizip static-libs"
+
+RDEPEND="!sys-libs/zlib-ng[compat]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	minizip? ( ${AUTOTOOLS_DEPEND} )
+	verify-sig? ( sec-keys/openpgp-keys-madler )
+"
+
+PATCHES=(
+	# Don't install unexpected & unused crypt.h header (which would clash with other pkgs)
+	# Pending upstream. bug #658536
+	"${FILESDIR}"/${PN}-1.2.11-minizip-drop-crypt-header.patch
+
+	# Respect AR, RANLIB, NM during build. Pending upstream. bug #831628
+	"${FILESDIR}"/${PN}-1.2.11-configure-fix-AR-RANLIB-NM-detection.patch
+
+	# Respect LDFLAGS during configure tests. Pending upstream
+	"${FILESDIR}"/${PN}-1.2.13-use-LDFLAGS-in-configure.patch
+)
+
+src_prepare() {
+	default
+
+	if use elibc_Cygwin ; then
+		local p
+		for p in "${CYGWINPATCHES[@]}" ; do
+			# Strip out the "... -> " from the array
+			eapply -p2 "${DISTDIR}/${p#*> }"
+		done
+	fi
+
+	if use minizip ; then
+		cd contrib/minizip || die
+		eautoreconf
+	fi
+
+	case ${CHOST} in
+		*-cygwin*)
+			# Do not use _wopen, it's a mingw-only symbol
+			sed -i -e '/define WIDECHAR/d' "${S}"/gzguts.h || die
+
+			# zlib1.dll is the mingw name, need cygz.dll
+			# cygz.dll is loaded by toolchain, put into subdir
+			sed -i -e 's|zlib1.dll|win32/cygz.dll|' win32/Makefile.gcc || die
+
+			;;
+	esac
+
+	case ${CHOST} in
+		*-mingw*|mingw*|*-cygwin*)
+			# Uses preconfigured Makefile rather than configure script
+			multilib_copy_sources
+
+			;;
+	esac
+}
+
+echoit() { echo "$@"; "$@"; }
+
+multilib_src_configure() {
+	case ${CHOST} in
+		*-mingw*|mingw*|*-cygwin*)
+			;;
+
+		*)
+			# bug #347167
+			local uname=$("${BROOT}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3)
+
+			local myconf=(
+				--shared
+				--prefix="${EPREFIX}/usr"
+				--libdir="${EPREFIX}/usr/$(get_libdir)"
+				${uname:+--uname=${uname}}
+			)
+
+			# Not an autoconf script, so can't use econf
+			echoit "${S}"/configure "${myconf[@]}" || die
+
+			;;
+	esac
+
+	if use minizip ; then
+		local minizipdir="contrib/minizip"
+		mkdir -p "${BUILD_DIR}/${minizipdir}" || die
+
+		cd ${minizipdir} || die
+		ECONF_SOURCE="${S}/${minizipdir}" econf $(use_enable static-libs static)
+	fi
+}
+
+multilib_src_compile() {
+	case ${CHOST} in
+		*-mingw*|mingw*|*-cygwin*)
+			emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}-
+			sed \
+				-e 's|@prefix@|'"${EPREFIX}"'/usr|g' \
+				-e 's|@exec_prefix@|${prefix}|g' \
+				-e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \
+				-e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \
+				-e 's|@includedir@|${prefix}/include|g' \
+				-e 's|@VERSION@|'${PV}'|g' \
+				zlib.pc.in > zlib.pc || die
+			;;
+
+		*)
+			emake
+
+			;;
+	esac
+
+	use minizip && emake -C contrib/minizip
+}
+
+sed_macros() {
+	# Clean up namespace a little, bug #383179
+	# We do it here so we only have to tweak 2 files
+	sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "$@" || die
+}
+
+multilib_src_install() {
+	case ${CHOST} in
+		*-mingw*|mingw*|*-cygwin*)
+			emake -f win32/Makefile.gcc install \
+				BINARY_PATH="${ED}/usr/bin" \
+				LIBRARY_PATH="${ED}/usr/$(get_libdir)" \
+				INCLUDE_PATH="${ED}/usr/include" \
+				SHARED_MODE=1
+
+			# Overwrites zlib.pc created from win32/Makefile.gcc, bug #620136
+			insinto /usr/$(get_libdir)/pkgconfig
+			doins zlib.pc
+
+			;;
+
+		*)
+			emake install DESTDIR="${D}" LDCONFIG=:
+			gen_usr_ldscript -a z
+
+			;;
+	esac
+
+	sed_macros "${ED}"/usr/include/*.h
+
+	if use minizip ; then
+		emake -C contrib/minizip install DESTDIR="${D}"
+		sed_macros "${ED}"/usr/include/minizip/*.h
+	fi
+
+	if use minizip; then
+		# This might not exist if slibtool is used.
+		# bug #816756
+		rm -f "${ED}"/usr/$(get_libdir)/libminizip.la || die
+	fi
+
+	if ! use static-libs ; then
+		# bug #419645
+		rm "${ED}"/usr/$(get_libdir)/libz.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc FAQ README ChangeLog doc/*.txt
+	use minizip && dodoc contrib/minizip/*.txt
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 433fd157f5aa..9a1b97c2e5ef 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 939c89f2b2eb..6ebd82a09edf 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -7,5 +7,5 @@ DIST seamonkey-2.53.14-patches.tar.gz 64614 BLAKE2B b63a3ebfea69f27a3057a21871f6
 DIST seamonkey-2.53.14.source-l10n.tar.xz 13656176 BLAKE2B daa2697d51ea74ef085a5e610cdce35c256e2d052ff7c557af47d0204bfe49b08c62de963574c22427b6ccbdab484fc8b7f122eeb7f1dc171514c2626b3a794c SHA512 18cd269df9d603a319f83f9e8a90182fdcdb44c3f4fc606abe2d30a5706a0a00f8f488b574e59b1885eecd2b0490c679222ebaaf77b60aa432e2412a61d34dfc
 DIST seamonkey-2.53.14.source.tar.xz 256277216 BLAKE2B baf48d89ae84d19c3accb0045658bad9e265e402ddbe7325a1df37682ea54bae1c09336e44312cf66dae037ec89672e8078ffb285e3f8588e42f6f484a7fd5c6 SHA512 19b35d7301b3a3c4cff41ea90bd401f9b41ec8ea1207e8ccd738eb2f52068cc39b4838eabb60a04596926035a143472656a291cab8adcea608bd569b30b5b7e3
 EBUILD seamonkey-2.53.13.ebuild 17164 BLAKE2B 17e833b5ce99dbe8f223b3493d71f71c0088a650d585c846b684ced28e2963940e760ae2e656539aa0de88ebecbd58a455edf67ea6d8c958e31fdfc14f4c8924 SHA512 259a5ef286024c64ef68df263d4ded5a6937be4157d1705d7e510edee4b2f710e8239df87dbab19070f845bd5a865dc6fda5af233ef5451a7dd87d5c80aec093
-EBUILD seamonkey-2.53.14.ebuild 17639 BLAKE2B da4b8d846bc7873a4048c97e08b2700a16b44d98e5ddf190a035878fa41161103507960cb6f6d7f197e3f748ffaf11407d6f0e79fb7232e9f09b0b5eb8692cad SHA512 d86879c4ea7044e2179b85db768f053349467424bf5f3d673d9aa15a21ee9b5774237cdd8fdad1ed73e1afd04788ade63b20f483d08a623421a1272f63c63391
+EBUILD seamonkey-2.53.14-r1.ebuild 16930 BLAKE2B 8dc2b46f3fd05fc6e6d97490e4a2b1c4122ac419f3f1a19740e36f085ba5447fe2d1a7f01afb04e5b78d6473baafba6cc9b6f44f212be0f52b6e3eebb5b28146 SHA512 3f0949d0d0c67dbea0cf799dc779eadec0fcc809ce0d019940698ee848f21e215176b6a67cf39023641bf590e7e3a08caacb0cd46ae7701587fee55f9d25e2ca
 MISC metadata.xml 2085 BLAKE2B bdc1da446f817a45f519f41f0eaba8c8437e81a1c4387cd94e168ed35548692b0b137e98a890cdd3cbb10fe3876820123fa22f64f69be8cb2fde31548184eca2 SHA512 50d64f3eba08f582c723328d7face922a67f62c08e3f23e719fe49092584e2e59e3e5e6a82e4b7bae6f9b05180f70e2e3cd5246315bd980a89207bb9172ed230
diff --git a/www-client/seamonkey/seamonkey-2.53.14.ebuild b/www-client/seamonkey/seamonkey-2.53.14-r1.ebuild
index 57fc76cd3cb3..0ac462443e0f 100644
--- a/www-client/seamonkey/seamonkey-2.53.14.ebuild
+++ b/www-client/seamonkey/seamonkey-2.53.14-r1.ebuild
@@ -60,7 +60,7 @@ BDEPEND="
 	dev-util/cbindgen
 	>=sys-devel/binutils-2.16.1
 	virtual/pkgconfig
-	<=virtual/rust-1.63.0
+	<virtual/rust-1.65.0
 	amd64? ( >=dev-lang/yasm-1.1 )
 	lto? ( sys-devel/binutils[gold] )
 	x86? ( >=dev-lang/yasm-1.1 )
@@ -147,11 +147,11 @@ pkg_setup() {
 		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
 	fi
 
-	if ver_test $(rustc -V | tr -cd '[0-9.]' | cut -d" " -f2) -ge "1.64"; then
-	    ewarn "Rust-1.64 is currently unsupported for building ${P}."
+	if ver_test $(rustc -V | tr -cd '[0-9.]' | cut -d" " -f2) -ge "1.65"; then
+	    ewarn "Rust-1.65 or newer is currently unsupported for building ${P}."
 	    ewarn "Please use 'eselect rust' to switch to a lower version, then resume"
 	    ewarn "building ${PN}."
-	    die "Rust-1.64 detected. Use eselect rust to choose <1.64"
+	    die "Rust-1.65 or newer detected. Use eselect rust to choose <1.65"
 	fi
 
 	moz_pkgsetup
@@ -382,32 +382,13 @@ src_configure() {
 	# use startup-cache for faster startup time
 	mozconfig_annotate '' --enable-startupcache
 
-	# Elf-hack is known to be broken on x86 and arm64.
+	# Elf-hack is known to be broken on multiple archs.
+	# Disable it by default, because on the archs that still work,
+	# it also gives more problems than it solves.
 	# https://bugs.gentoo.org/851933
 	# https://bugzilla.mozilla.org/show_bug.cgi?id=1706264
-	if use x86 || use arm64 ; then
-		mozconfig_annotate 'elf-hack is broken on x86 and arm64' --disable-elf-hack
-	fi
-
-	# Elf hack should be enabled by default on architectures that support it.
-	# On archs that don't support it, it should not be enabled by default.
-	# www-client/firefox says building with clang breaks elf hack on archs that
-	# support it, so they disable that. We assume this is the same for www-client/seamonkey.
-	# The code below is copied over from www-client/firefox.
-	if tc-is-clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
+	if use x86 || use arm64 || use arm || use amd64 ; then
+		mozconfig_annotate 'elf-hack is broken' --disable-elf-hack
 	fi
 
 	# Disabled by default. See bug 836319 , comment 17.
author	V3n3RiX <venerix@koprulu.sector>	2022-10-15 01:47:28 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-10-15 01:47:28 +0100
commit	f208e35deefe1ee6fe6722cec9ad8cc12e92e638 (patch)
tree	f63456d14b948e3a902ace235a9961865728faaf
parent	4392d53af7ce45ccfe6eb14146479ef0e2bd790a (diff)