gentoo auto-resync : 18:04:2024 - 12:04:39

author: V3n3RiX <venerix@koprulu.sector> 2024-04-18 12:04:39 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2024-04-18 12:04:39 +0100
commit: 2d01b3d133c0fbf17de8d7b47905585af88bd6e4 (patch)
tree: f74eb9a3d16ed25f8c15b825f4d28b759ae99a42
parent: 97bacba3ead078e5db8b87ab651a3ffa7d82f60f (diff)
1049 files changed, 19687 insertions, 5669 deletions
diff --git a/Manifest b/Manifest
index d9156b799380..4cb1d0a2c915 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29759 BLAKE2B 6d51126466f7ebf1a1a6df9e16611ef7a1a39107074ec31c66f87c8e8886e7c5fa2675dfee1c2fa0bfdb9a252c2fc0a1b6ce17383de27bc0ab13be8a5fbaae75 SHA512 cc1e42f7146180aa1274d5bfc985b9c31d512e86c540ba79761bef9605efe0ce7a0792df5cf3c9dc4082ccc0db39a4c18a33b77a0dd829faf2b0faa0a468303f
-TIMESTAMP 2024-04-17T10:41:46Z
+MANIFEST Manifest.files.gz 29729 BLAKE2B e12e63e69ebc6bc34a208f0e1e4aea28b0dfd01816dfc23af27bf661822e37cff982d22872d5d37589b094fa4e3f06da6b144d5888483fedd9993966ea55fa43 SHA512 13c5b4479256e033e6b136b12d427c38b0a09aac1897bfb372d2aa81d20f9339e52c2999f22216b16deea88d74189b9ba70368f5525724eaa2b79d1033c74294
+TIMESTAMP 2024-04-18T10:40:26Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYfp2pfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYg+JpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB46Q//ZnYFw71n+c26xL6OoEhQ0xvarR6+5IM6Wf3J8GdvlKt9aekOg0XIQZdu
-7LdylCQkNezNNd/haHiunDtGNIdrv7TFuRHgtQsOX25gZgitae09V95GBI5QMqVx
-KSdWQyb6w3HUsBlg1M/X6/VXKe7mL67Nb6BUCGNY6ccJzYSLdS9vpynDSNXZbkdH
-taKxwyjo/Nz78trPyo2aH4czb7oL/oA/hJuq96wVTrX3LsZ+KdK+9dW+N9Md/Cne
-w8nQe6P6pmePRzEyTYf4mF3IS3yKVZO3m5r8+/v9M8DCB3cl3DT4kbHxvpDPfHK3
-wYCO4/PxxWmCMCOmXpxAAytv4h1PT82pRD8F8DDvmiEYN1kAVD74dlGf1vSiiRMD
-M+zC54tz4VfqjHBBTJUlYUqLI3o0F/P2j88bbSE04fe1sAxj+ha/TvJIE6KxlibD
-CkeBKFBeLxGH1m5ML12ug4+vxguONqSoeK23SQtXVhJOLoNTSI+oY4iBjd751kuw
-EinmVxdLP3UfPBBr+9irdz/XBNEGEsTuljcis1fGl+PvErMCwcQ7zhPsuEPQ7tI4
-H6WtyM/utFb3N/uh4sa0H9zOCk1bl4i1z01PTwFlf8aoNjTPkZIRtMW/r2PEC2rn
-sLxymdt+K/UDkWk4GuPN8UiwWN/ojDuy+M6ydAX3K9G5CBmd74U=
-=/d2T
+klDzHg/9Ffkp5u4bof+bQiDYlODeZIJlGDnXm21dVYHNpD3PWx8nWOdrhIMRLEMq
+j5oVqrHWeegE+9dPqW+Q0bkT/wqMDS6p6jm16p8VW7UBZfVCle2P0WqPfY+3AYX1
+0m3Q/vTHNBBXtZuuMMN/dKhZZT4W5hlpn3952/G6nPJGoHsZRYA8OzaAxIFUx2MY
+H2fVXotThfSiJkXEyZk+4AXj2Cvb0YYrTE+M2kYEOHb/fslCnXy7IRxkRhVWUdm2
+UvXDza2dGOOu/PK6cePexveVnrzX5ihOeiBDlSmjh1qQVXmC2X7lOnk90rzu1HAp
+IC7hQhtc0r+TdkQrf+5w9iIUvhIJOhvRtkt+3LT1kKcULK+hNRNANJUMp4gY7dnO
+iCIi8DR7LHZSYNb9xSbu07fm4lb3h8JGhX1LGG0UeBVKM29XpjUAT86U5NJI8IuG
+uJC+f0+2V+ugTP1i+fi5lB/3NvkVN5TMNYaEfsKl0sF498AKh9z8LLjFCOY+YN/H
+mB92HYyXEEpIMrTRX3NJ8tqXRYSiKUivEaofV9stKHOsURn0Riu4hzZ83lFzJ0l/
+9YM8o4tp8bxH63I+qqB5xtPQUlqJNinjB8MFQSqo1VfbWsyaDOtFrl72tJLE/2St
+Tv8YgPFPtaKxPIKHNZ6caRbf+HHJJziX7vUfY5dSYv3QZ9TL34U=
+=WlXV
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 08d381cd52ff..d995e4686d99 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index bda82589b524..b72541ad4c9f 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli-bin/Manifest b/app-admin/awscli-bin/Manifest
index a57d0899ac15..ba68a7aa6591 100644
--- a/app-admin/awscli-bin/Manifest
+++ b/app-admin/awscli-bin/Manifest
@@ -7,4 +7,4 @@ DIST awscli-exe-linux-x86_64-2.13.11.zip 58360364 BLAKE2B 46cbc0136a19f198f9ec7e
 EBUILD awscli-bin-2.11.17.ebuild 2310 BLAKE2B b271c5f667a9e74d4f912969acc212d0859cc2e08f2c27f97eda4b5a93b731a26065447f1e2fbf457328eadcd028b30784cb3aba42aacda60d32e8acb493714d SHA512 7ca23b363f727e50e5eceeb5eb3240e6e7a2a0b674d1db3b6a9271025e8ce3a5183b8515b2b1924ddb6e60d63436e9a3ce40694f937a2a620fd2bb5f40ca0e1e
 EBUILD awscli-bin-2.12.0.ebuild 2310 BLAKE2B b271c5f667a9e74d4f912969acc212d0859cc2e08f2c27f97eda4b5a93b731a26065447f1e2fbf457328eadcd028b30784cb3aba42aacda60d32e8acb493714d SHA512 7ca23b363f727e50e5eceeb5eb3240e6e7a2a0b674d1db3b6a9271025e8ce3a5183b8515b2b1924ddb6e60d63436e9a3ce40694f937a2a620fd2bb5f40ca0e1e
 EBUILD awscli-bin-2.13.11.ebuild 2310 BLAKE2B b271c5f667a9e74d4f912969acc212d0859cc2e08f2c27f97eda4b5a93b731a26065447f1e2fbf457328eadcd028b30784cb3aba42aacda60d32e8acb493714d SHA512 7ca23b363f727e50e5eceeb5eb3240e6e7a2a0b674d1db3b6a9271025e8ce3a5183b8515b2b1924ddb6e60d63436e9a3ce40694f937a2a620fd2bb5f40ca0e1e
-MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
+MISC metadata.xml 325 BLAKE2B 70bc11988dd7ae437aad389e11f87713a2022f63a196124c1ede43f0f6198a9466210d56564e80cb944b06e273f4719443ea07fab9823d23533ed89079d28c2f SHA512 2fecb561d8f59b47aebcb83a274aff85755346e2e8fd31e22508d0eb0880e7d6c9d3a6243cffc9089ccca63418962a9362a8ddb5b92025cd6ed5591e0a318251
diff --git a/app-admin/awscli-bin/metadata.xml b/app-admin/awscli-bin/metadata.xml
index db463f3eeb66..b60727e29e46 100644
--- a/app-admin/awscli-bin/metadata.xml
+++ b/app-admin/awscli-bin/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">aws/aws-cli</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index ab031c488ce5..113aeacdd06a 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -2,8 +2,10 @@ DIST aws-cli-1.32.74.gh.tar.gz 2682208 BLAKE2B aba8be6e597a6d07197bd06d51f167f7a
 DIST aws-cli-1.32.79.gh.tar.gz 2685785 BLAKE2B 3bbfad927d9d882e6b502f47919ce963df498c614a92730c5d6b1fb4efd7a8bd805a5c8cc82c705b97d8ee0ddbee4d6ddfa9cb46661fe7e9337add53bda3d9a1 SHA512 e0e369b6a5fca4d72365e54ef99c862e2d6f68caed61ac431516777e82ec8b292cf50516f379d8e94787b2a0ee58ad6e68d0951624f1ed742079295c4d2987ce
 DIST aws-cli-1.32.84.gh.tar.gz 2691519 BLAKE2B 4cb78f14975d74013803af0f6397d959294cca6046ee19c1a907ca3e60fd224539d39535416ddcc2713b1de653b78ba03965dc78415dd915e80d11fcd6fbe02f SHA512 19d2030201806b336ede2c5e09f761e39959a156057d68316180145232e54013f2e5fa57023146488d407aa7e655fdb2245058e45eb5c4d6778eecd867f6eac1
 DIST aws-cli-1.32.85.gh.tar.gz 2692681 BLAKE2B 1b74cd51dd71ce01b492f21de40d25e7ea4b2e3e3572cf2346b0fd293a4ba2dbb870acb1f0b2f41494f5fb065d5eb20c6e3f98a4035d7426bf6926535c8ef83e SHA512 7f471978f4a306944d30ad2cacd3feaea6a821be79aa814300a2833824328414f878ee2d0a6d42371d38e3d841530be7f25f0e14b81360e81182d9c9e35227b5
+DIST aws-cli-1.32.86.gh.tar.gz 2692809 BLAKE2B b0c9956d7b2b81f05b8f59ccbcd14baca3acb9f006ac965d0df06d86309bdd4d71c430514d22ef5c5c871e6009a174e8abc25b47ab8cd4471230e301bc0e50a1 SHA512 ab689fc5997bd14223e76307c1c4609950b5e4a62932163bd68d8a4d7a9c09db55b17c4377cba3901cd9518ac2b6ccc191fd9c7692dd0e188bfdd475bfcfc0ac
 EBUILD awscli-1.32.74.ebuild 3022 BLAKE2B eca1e9b920babafc0c226e1d3c0b23baa63965cffceacc71118d2e4a1302945d10294223300a94f9dec4b39e52c7bd8f44e35cbf7cf30c117f9d86fe93450326 SHA512 11de7ee4880fe2bd192c6c15081b598d4c9d2f18b28064908a855cb01283408542c8981841c531d546b6de9e2b932d2a23e2fe1a9e90030566af6b966c30fd97
 EBUILD awscli-1.32.79.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
 EBUILD awscli-1.32.84.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
 EBUILD awscli-1.32.85.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
+EBUILD awscli-1.32.86.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.32.86.ebuild b/app-admin/awscli/awscli-1.32.86.ebuild
new file mode 100644
index 000000000000..4a677affdbc4
--- /dev/null
+++ b/app-admin/awscli/awscli-1.32.86.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 distutils-r1
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local serial_tests=(
+		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
+		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+		tests/unit/customizations/test_sessionmanager.py
+		tests/unit/test_compat.py::TestIgnoreUserSignals
+		tests/unit/test_help.py
+		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	EPYTEST_XDIST= epytest "${serial_tests[@]}"
+
+	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/cronlocker/Manifest b/app-admin/cronlocker/Manifest
index bf22bd1bdb98..1ed62501fdfc 100644
--- a/app-admin/cronlocker/Manifest
+++ b/app-admin/cronlocker/Manifest
@@ -1,3 +1,3 @@
 DIST cronlocker-0.5.0.tar.gz 937557 BLAKE2B ef34fd58e6df60cf2f216ea03dd40b139a60e36ae5a0ee6184e4eb8c1134c6afbbf8c83a8547c5d5b1387597df241c2579b047c720146dd259bb9eda80e1deab SHA512 821c200006fd2972bbb8d850a39348872e18b24ec9d68a90d0b3cce0848bd85d3542253260a4bb5bae3a89fe269b3c35151b829dbda5cacf9c7ab44a14a3c0a9
 EBUILD cronlocker-0.5.0.ebuild 523 BLAKE2B 46f2b48c3194ac891655fb69ca97e5339ab97a633601953c2d7bcb1b955f8d80a29660dacac20611aa1753073ecd5fe231ccf1e7b62444a1525f390fd47ec830 SHA512 394a81443cc9736d4ec8b1c70a31bd9f6087f2d510266e21aa78dcdb4d4b0b7f6e0f5a86a2f4b2720f56e3a39855c8e97a91d78da8e16a52d32030d3e5e2b343
-MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
+MISC metadata.xml 335 BLAKE2B 232bc2d749ee9b4b39a034ef91bde92aab73a71f9e0e292fe39175c56c0afd0d935221b1b9b5d4345117c9fc764b5d68167d53a37a7c10590f1e496786b62f49 SHA512 6d47ef3946dfc62c6bb6bf0e78dc00e3d957c26d40cb5ea8268cb35efc44c8ad9c2b064212ae8bc5d51d80341951fd88fd384ea15da7ab1fe42918c0b0b083e1
diff --git a/app-admin/cronlocker/metadata.xml b/app-admin/cronlocker/metadata.xml
index db463f3eeb66..5e93affc2408 100644
--- a/app-admin/cronlocker/metadata.xml
+++ b/app-admin/cronlocker/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">viafintech/cronlocker</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index a386b8f51a04..38f5f4025a25 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -2,6 +2,6 @@ AUX keepassxc-2.7.4-tests.patch 402 BLAKE2B d1d88059d70e8c43f51bdd94ba17222a9190
 DIST keepassxc-2.7.6-src.tar.xz 8474624 BLAKE2B 2ecdd387a7bc70aeeaef6eeabdfeed6aaf1d779056580375c011aa71d62459d38258617a4cb46fc3b215a2b6e1e3326cc8c62b228bee0be674923399421b0cbe SHA512 58bdf731e1ce15e4a9db5aae27b7740372c4b28e2998b9acf2d1be6ee5b4eead37149ddd3de039d1cb70d34f11b09f43969d36ce4241b3fe3af4adf53d8ba812
 DIST keepassxc-2.7.7-src.tar.xz 9734460 BLAKE2B d94c42334bbfde46f14f4b14612f4297c500da76ba8a82de26c4a450ee1cacb9a15517a84ef445441651dc33a71f9ca7bca63bb04d0a4e8eeb0380eded6e5477 SHA512 fd82e377bf6e57623c65f2bdd463ea59c6465fbe009552e1030ce0fe9d9177fc448b7b36a90a0da9ed2a2ed161c017d13cef618ae785f89110c038e1d9396926
 EBUILD keepassxc-2.7.6.ebuild 2445 BLAKE2B f9c77b86135647269ba4e811fb9c1bc8099c569bd7aa4fcef000646844bc8e16e07849448d1a7b40b2e1210018c6aac10ebca862eca8607cea290e7dfb69938d SHA512 d463f50715d1c40b3422ca15e3ec7a5b6865caf332a6c4b5f28af3f6e96625cd32d35c7055e275a5b7a8c14cfc8d77dffda75e2f738368a9525e9b461487a896
-EBUILD keepassxc-2.7.7-r2.ebuild 2477 BLAKE2B 1e90617a2fa9c9d8a131b04c563bfae58b18c6a0ff73c035cc6263d849f1701b610303037d0076940c899fc589e8cfd18e214afc38e33bcc703c707a1806da16 SHA512 8c377f3ea6227a9d7d55e6558a3d21b37c0faa9f32472f6b7965261230baaf7323618e8c8fd3898ef08b442ad68beb923f9cc775c28a2a83e893f94156a0733d
+EBUILD keepassxc-2.7.7-r2.ebuild 2475 BLAKE2B 16d23dc524610072a785e868b4c732b81d106eebbe72731f3ecaec8aafe2858e2d36e2fec4c86dc62c3b8abf6ce2e1ad1ea5ba392d6335150968b6989f6b9768 SHA512 c72d9249a3a33e45f97600185e90d3bf95a46e5472bf441c4ce5a7e4bff21210bd2a6e1942ae8d89367b39f5d44d95dde984077f1d671f076bfb1d8cde236e4f
 EBUILD keepassxc-9999.ebuild 2378 BLAKE2B e55dea5e89824e32b3413a17e10db58f1efc5ad98069f0843f32223f1d8201f5f597f02b2b9fa0f60d23daed0bb32ef48b3782ce1f313d212548927ec325fe09 SHA512 0f697b681b485b4db0f12ccf304c63fef3eaf97abab1ae64d7a8404c717b60f367587e0325de316560d38b2c8832847a7569d0aee265c88d76dfccafe556fd19
 MISC metadata.xml 1077 BLAKE2B 410793b2f278ccbddceb10a72e4a010f4b2d6fc81bd8a472b867e1230d43a0e6f461ff6459095d334536d462e2297c4978dbb247e3a5ccb82c36fd70c6f44b51 SHA512 d338787a7ea319d752c19314ee53ee1306293ae2dddeedd22bd010e990a1680fdd1b96c5173c653b4dbbe336d713a07f9fc1a771951fca8636b3973361787f20
diff --git a/app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild b/app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild
index d5cc5c92be33..6d17e534e3b4 100644
--- a/app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != *9999 ]] ; then
 	else
 		SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz"
 
-		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+		KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 	fi
 else
 	inherit git-r3
diff --git a/app-admin/linode-cli/Manifest b/app-admin/linode-cli/Manifest
index 58788c52bca6..d5f26bd4f786 100644
--- a/app-admin/linode-cli/Manifest
+++ b/app-admin/linode-cli/Manifest
@@ -1,5 +1,7 @@
 DIST linode-cli-5.47.1.tar.gz 128364 BLAKE2B db21cdd9a1bfbe17fb17b8b0e27ca36bb15c7d3b16ddde4dcc59a9ce64cd34d644d3d5d120efb88bb146767cf9b2c3ee820a847a2fcff487a11bc3abd6973870 SHA512 b61ac1e7c97a1395b150227fe822bc2e7199ed15a44c6d93d71bfdbc2f919827e87e89cf41a47b069be06144a849f5ab11c9dd7f38d138f80ce80563f55bf75a
 DIST linode-cli-5.48.3.tar.gz 142927 BLAKE2B 48ae197d780f77a7a4dbf54d4e9959d28c117d90e052f401f563f1557dc11155afc5d16da1140e9ed2828fa3e19243e91205759636247d2fb893383975d89f43 SHA512 9efd3f0392848ebcd896becff191e94c90cbec01cc2b805c0262ecb3c40c51346d0b42891ddaadb9191d75e379083f68e4c9aa35f9ba7c6309c74ae3febbde7a
+DIST linode_cli-5.48.4.tar.gz 142928 BLAKE2B 28b1c90bb0709afc594b7023ef846b6d59e0376730f05d9701ebbc6744376f33536ad5a6f53b7b26a25805b258dc58378a76b0e6a4157e149f83e691d862dec8 SHA512 b07a3612afc329fc346b523412ac03932c84213d6bc23726f4c0e5edc737100bf65ec84f8131943439444fee268646789dc4d135cd61b2362311d1ab18601c3e
 EBUILD linode-cli-5.47.1.ebuild 660 BLAKE2B a201c1d2337d075d6195e262c2555947e691f35c76c57ab3dc92207b7b7b7650ceba39988fc4ce5809b2fab6b7b19a07c9c0355a34e1edc6cef99858304c3736 SHA512 6f22dbce83ece2297dd270725cf4a99a1f54abeafe4972042fefcc7851c8ea3e5626f54e59e92fba80141c7dd5aa6a2d4d8d511492a297635e756e50b1a83a6b
 EBUILD linode-cli-5.48.3.ebuild 847 BLAKE2B d00a8a4706bf9bfde4399b1fea38ba04a2b1f761d2839f83c1664eb055f4b892caf82cfa4100e5e6a1b8530e3d25fcd667242355c5ebf0f722aa53a8ce9d05a4 SHA512 36d218d1fb7de357dffa37f4fd9da4f24e9b4182da6ad5bb398b5706e422d907f81dd7a13c6ae43856a47bcde888cfb2ad9266ceaf5770a7d6b989d6df002bc3
+EBUILD linode-cli-5.48.4.ebuild 827 BLAKE2B 60bb1fc982d25f7252d11ca930b30e958736b504388c0c705cfa89a19b7fe372f68e696290a9fee87a6512d14bff62e6d14f789e5fc1a6f1299edadd4bbcf33c SHA512 3c50b132d9eb5f9fc950e97f0fc23c3a698d783e4deb60ad803169ac2502e2a6a407c88bc4ddc0dbddb2e58346d7351102986b19df2eab3c999c46a0bfe6aa20
 MISC metadata.xml 483 BLAKE2B 7b3a4b824e16ba32424777359d0daf09d17cc498a06f9ce5acfd7baec80ffea26220145676f37edfe46302257fd0a2bc5071d60f955dc19cda582419b2027f5c SHA512 33c8fae2235a7a6d2653a4db3341b2d69e390ed6dfa33868dd7e6b3a384f78013ae3c42a91d8eddd25929086f7705ce0869a34e28eedadb497e286ae59570be4
diff --git a/app-admin/linode-cli/linode-cli-5.48.4.ebuild b/app-admin/linode-cli/linode-cli-5.48.4.ebuild
new file mode 100644
index 000000000000..0e1692e8e982
--- /dev/null
+++ b/app-admin/linode-cli/linode-cli-5.48.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 pypi
+
+DESCRIPTION="Linode Command Line Interface"
+HOMEPAGE="https://github.com/linode/linode-cli https://www.linode.com/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Tests require network, a linode account and an API key.
+# WARNING: tests will incur costs and will wipe the account.
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/boto3[${PYTHON_USEDEP}]
+	dev-python/linode-metadata[${PYTHON_USEDEP}]
+	dev-python/openapi3[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/rich[${PYTHON_USEDEP}]
+	<dev-python/urllib3-3[${PYTHON_USEDEP}]
+"
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 9676591343b0..bb58cfbabcbd 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamtk/Manifest b/app-antivirus/clamtk/Manifest
index 45fd9905d44d..c49d5b89779d 100644
--- a/app-antivirus/clamtk/Manifest
+++ b/app-antivirus/clamtk/Manifest
@@ -1,9 +1,7 @@
-DIST clamtk-6.17.tar.xz 288544 BLAKE2B 56dce01a74e4d81e683c53dd5a040a342ec0ac3dd441f5b1bc7e288999e6ce1f104fd75e03babee4e0f6a8b487b56a1b588a614f405833813240607861875f00 SHA512 8dd03af9a390f19881dd3e94c2687bc2927b3a731cd6756c944ba2bf92d54cc2a78cb1f7befbb5cda9d0f258d7a457deaa1b05874a9e1194b43ae08abaef5397
 DIST clamtk-6.18.tar.xz 287692 BLAKE2B f33a0799550978859706b94f10e9125654cdbfa6384f4929f4a87cecc4a8524b65098d13a50215ca5155105200c09e0e6655b1f75f6ef7f72f1cb40214879472 SHA512 f126b61e2493473ecb4df1adbc0583a844b9abfd9e0c62e8f82a5b635b72690c91cc1a44f70aca46a7987edd63713ec2a67ac634241a33e5d993abe77026c323
 DIST clamtk-gnome-6.14.tar.xz 15156 BLAKE2B ed87dc8317b60a63c4f8824b0e24568ab29874d1e62ef0f4eddeb636960d9b2753b12dfb8fb6f3eb27a6fbfb18dc88b6a480b532afd0d22f20955f4023278eb8 SHA512 3fd798a7d8dbea0e33db09f266b6ad74b96ae5097ecc4d54e00c30c2a5f76a93cd6f2cbaa2b83dc69eb295905c09db88dc2f364592a398786e473783d1ee2c4e
 DIST clamtk-kde-0.19.tar.xz 18652 BLAKE2B 4ecb849c9312948d493938683310904c9bbe7f4e26514d76dbfee3afdd063eec2a0aa85a638f83130c8e3ff41cfabee1479885691cc484680d97d1f8fbb76f00 SHA512 57a99d50f171ada999723dc69c2d193e91a482533add4281c6aac96a23273b3eb5456bff6918f69c72edf1635d22be86beae4c434eb29fc3c27fb687fa716861
 DIST nemo-sendto-clamtk-0.05.tar.xz 5980 BLAKE2B ca5f37fb9ba9e7f7dc9dc67d52fe36f430697f200c2c91f4d912b068f28d79bee100a85878f66414012728e979073a0afc411e6789959a35bd468c28bf207618 SHA512 4cb2d32711da47c959be84d69654ea0ab0bfb4f2c4a806cbc035129fd0d985a93b89d51c5874de272f2a2841c66702c8867178f5af41505e698c8e37e3c74da9
 DIST thunar-sendto-clamtk-0.07.tar.xz 5432 BLAKE2B 7b0911abbcf1601ee961a0449815e21273acb7e757b4c4f532a100da48fe4c7b2f6ecb05a27931e0cf60af94e7cd52af23736180f0d9afa1dd00b9f44eaa3c0b SHA512 f25802c80d5e8a6d703b7b3b2266a91eb031a377792420052f6873cb0eb759235d79df457dc26303d6ef4ed9989dbc4ff803258255fb568fef27c782144c1145
-EBUILD clamtk-6.17.ebuild 3982 BLAKE2B b137099e904c8754c85fec50c35be3a2dcc4ba82e1881df2ee7a0ef5415e2f52cd50b2424255465b292ecc3f6e99df9e3064286482839322de48b8450047c183 SHA512 cd12088df6f945ba74123c9f1616d09d5af12a1dbe45fb8b487d8688dda07e7ebcee51b888ac77570474e8bedc075147977b1451401b5d43b3c7d2e81fc9866f
-EBUILD clamtk-6.18.ebuild 3985 BLAKE2B 1cc13bcfbc6c9ec3b24531aa3a3c80d90c1d47b191f470d12d5f4eeb7ebecffb2b87dfbd60b262ccc8c970c3dfbbd2bc374a806e999e0d8ca596ab0456838daf SHA512 3086e02ad0bbaf7b2c7ee458f84488a0b9d325c2ae2ff975828f85edf60097218ebe03914f2128fde4296cfac942f12614f50cb1b90799f7ce5a6f7108023299
+EBUILD clamtk-6.18.ebuild 3983 BLAKE2B 64d12654648a769f5ee5e3beb5b4dc0deb17929230db7f69e4d905f539d9b8c9d3feab7ad2a40b7b9c03bdfe0b6eff5e2136109e78e820870113c8607aa1b339 SHA512 5e67cda00de70167af65172edcf65f9f5798de0d0192ca0ab61121c0aca7afd099b5e8457861409daa17a4e12f81abe5aaad0498f42f999b55ed990e46cd788b
 MISC metadata.xml 870 BLAKE2B 503e8b1fdd2cd3d2539c4cab72fa307e98df2824ec89e77a2a17303e96badaaf700332be4466443c3e881b371423cb40d464022692a563aa31e7698ba326a191 SHA512 77ac4d301d79f7404946014c243415dc408c165f6d0febd2a9fb74d257877ccee0b662b909efbb1afad5462b939a6405c9363e6fcc9e8e278414fdcf4166b253
diff --git a/app-antivirus/clamtk/clamtk-6.17.ebuild b/app-antivirus/clamtk/clamtk-6.17.ebuild
deleted file mode 100644
index 5426ee5997a8..000000000000
--- a/app-antivirus/clamtk/clamtk-6.17.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit desktop perl-functions python-single-r1 xdg-utils
-
-MY_PV_KDE="0.19"
-MY_PV_NAUTILUS="6.14"
-MY_PV_NEMO="0.05"
-MY_PV_THUNAR="0.07"
-
-DESCRIPTION="A graphical front-end for ClamAV"
-HOMEPAGE="https://gitlab.com/dave_m/clamtk/wikis/Home"
-SRC_URI="
-	https://github.com/dave-theunsub/${PN}/releases/download/v${PV}/${P}.tar.xz
-	kde? ( https://github.com/dave-theunsub/${PN}-kde/releases/download/v${MY_PV_KDE}/${PN}-kde-${MY_PV_KDE}.tar.xz )
-	nautilus? ( https://github.com/dave-theunsub/${PN}-gnome/releases/download/v${MY_PV_NAUTILUS}/${PN}-gnome-${MY_PV_NAUTILUS}.tar.xz )
-	nemo? ( https://github.com/dave-theunsub/nemo-sendto-${PN}/releases/download/v${MY_PV_NEMO}/nemo-sendto-${PN}-${MY_PV_NEMO}.tar.xz )
-	thunar? ( https://github.com/dave-theunsub/thunar-sendto-${PN}/releases/download/v${MY_PV_THUNAR}/thunar-sendto-${PN}-${MY_PV_THUNAR}.tar.xz )
-"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="kde nautilus nemo +nls thunar"
-REQUIRED_USE="nautilus? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	app-antivirus/clamav
-	dev-perl/File-chdir
-	dev-perl/Gtk3
-	dev-perl/JSON
-	dev-perl/LWP-Protocol-https
-	dev-perl/LWP-UserAgent-Cached
-	dev-perl/Locale-gettext
-	dev-perl/Text-CSV
-	dev-perl/glib-perl
-	dev-perl/libwww-perl
-	virtual/perl-Digest-MD5
-	virtual/perl-Digest-SHA
-	virtual/perl-Encode
-	virtual/perl-MIME-Base64
-	virtual/perl-Time-Piece
-	nautilus? (
-		${PYTHON_DEPS}
-		dev-python/nautilus-python[${PYTHON_SINGLE_USEDEP}]
-	)
-"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-
-DOCS=( "CHANGES" "credits.md" "DISCLAIMER.md" "README.md" )
-
-pkg_setup() {
-	use nautilus && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	unpack "${S}"/clamtk.1.gz
-
-	use kde && unpack "${S}"/../clamtk-kde-${MY_PV_KDE}/clamtk-kde.1.gz
-	use nautilus && unpack "${S}"/../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.1.gz
-	use nemo && unpack "${S}"/../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.1.gz
-	use thunar && unpack "${S}"/../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.1.gz
-}
-
-src_install() {
-	dobin clamtk
-
-	perl_set_version
-	insinto "${VENDOR_LIB}"/ClamTk
-	doins lib/*.pm
-
-	use nls && domo po/*.mo
-
-	doicon images/clamtk.png images/clamtk.xpm
-
-	domenu clamtk.desktop
-
-	doman ../clamtk.1
-
-	if use kde; then
-		insinto /usr/share/kservices5/ServiceMenus
-		doins ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.desktop
-
-		doicon ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.png ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.xpm
-
-		doman ../clamtk-kde.1
-
-		docinto dolphin
-		dodoc ../clamtk-kde-${MY_PV_KDE}/CHANGES ../clamtk-kde-${MY_PV_KDE}/README.md
-	fi
-
-	if use nautilus; then
-		insinto /usr/share/nautilus-python/extensions
-		doins ../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.py
-
-		doicon ../clamtk-gnome-${MY_PV_NAUTILUS}/images/clamtk-gnome.png
-
-		doman ../clamtk-gnome.1
-
-		docinto nautilus
-		dodoc \
-			../clamtk-gnome-${MY_PV_NAUTILUS}/CHANGES \
-			../clamtk-gnome-${MY_PV_NAUTILUS}/DISCLAIMER \
-			../clamtk-gnome-${MY_PV_NAUTILUS}/README.md
-	fi
-
-	if use nemo; then
-		insinto /usr/share/nemo/actions/
-		doins ../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.nemo_action
-
-		doman ../nemo-sendto-clamtk.1
-
-		docinto nemo
-		dodoc \
-			../nemo-sendto-clamtk-${MY_PV_NEMO}/CHANGES \
-			../nemo-sendto-clamtk-${MY_PV_NEMO}/DISCLAIMER \
-			../nemo-sendto-clamtk-${MY_PV_NEMO}/README.md
-	fi
-
-	if use thunar; then
-		insinto /usr/share/Thunar/sendto
-		doins ../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.desktop
-
-		doman ../thunar-sendto-clamtk.1
-
-		docinto thunar
-		dodoc \
-			../thunar-sendto-clamtk-${MY_PV_THUNAR}/CHANGES \
-			../thunar-sendto-clamtk-${MY_PV_THUNAR}/DISCLAIMER \
-			../thunar-sendto-clamtk-${MY_PV_THUNAR}/README.md
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-antivirus/clamtk/clamtk-6.18.ebuild b/app-antivirus/clamtk/clamtk-6.18.ebuild
index a9f6b6ff5527..b82a6c233e8e 100644
--- a/app-antivirus/clamtk/clamtk-6.18.ebuild
+++ b/app-antivirus/clamtk/clamtk-6.18.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="kde nautilus nemo +nls thunar"
 REQUIRED_USE="nautilus? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 93d43c58a1cd..dab27669c364 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index cdd3d080d0ff..46085ae10138 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -5,4 +5,4 @@ DIST engrampa-1.28.1.tar.xz 1720164 BLAKE2B a2776cbf7040bcb7baf992caa323afaabffe
 EBUILD engrampa-1.26.1.ebuild 1829 BLAKE2B d64ed0661d8ad80e42e8d19a9c3ffd0fc8e0430682c0456bab1563852fa52d0a7d9d6dcc78cf9e2b001bcfbd3877148ca5e364a7fba0c5e4bae22b009f503f23 SHA512 dfdf358bc79e3b88d7e658f17cab44a68f8ac49f30175c3d65d5f8afe6b3f42831cec4b33d9b516fb588a0c11cd0da8d715ad59dc5a573bd6220f4e6ef1a7b6a
 EBUILD engrampa-1.26.2.ebuild 1831 BLAKE2B 431696ce53469ed156aadde686fd583381507e884d0e3c795b55a6138790f213c30133c05e35b75f13e04028f42ecb3ce81d4b45bbecd9cc49610868fdc4aa4d SHA512 10f574dc9928b03f1917ca76280a94d5816fdd1c38b607e5e8d3daa12d70d1d56a2eb1cce6b9db07fa07aab84051bfb974f37a6039b7e3007ac84d91e8919962
 EBUILD engrampa-1.28.1.ebuild 1662 BLAKE2B 69ede314312b1ee6b1b8dba8f7862b1bc894a54517cb190ad935f9241f2bb60be9071b42ba8ee0dc13389d2ed5777f3ee6926baef6942e348ccb239d6ac95a5e SHA512 09921d87a4323adbc5a6aa2ae1db1efe059ccf9dc3defc4403546128518170b288b96ac67bc89822f4e8b8ccf24098fca033c7f1ebc0fb10e33d21b39337b557
-MISC metadata.xml 747 BLAKE2B 850d18366285bb6c1c9124dfd7d1ae97ba42c59b59647f2eba2e837d6da78484967353453b0549bab8cb9efd019738c7c46bd75afeec6fb70eec2acc00341e17 SHA512 7c71387272f4179160e00bf6d602e8eda8e56d2457957d1e917ef2c582374ad302d76a9086bbc88e3a5c843defdb9e575af163c743105e42024859164841655e
+MISC metadata.xml 746 BLAKE2B 943a74ae6bae535d42e5dab737c90c2c48400566fbc558ad32e9268aa525f46e93be31d9f8f71027faa39645f8605ba38c8ea850586b0dc8ad52c50a772467df SHA512 873e51c83a22119d9b95c83991a3e1a6063190b0b8a2c48fffb065db3f5f787d9f42cbb374f886e433f9e661b77bab22631bf517f19670443d1f66f548e3350e
diff --git a/app-arch/engrampa/metadata.xml b/app-arch/engrampa/metadata.xml
index 4cfc7ced6425..9a73784dd824 100644
--- a/app-arch/engrampa/metadata.xml
+++ b/app-arch/engrampa/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Oz Tiram</name>
 	</maintainer>
 	<maintainer type="person" proxied="yes">
-		<email>immoloismm@gmail.com</email>
+		<email>immoloism@gmail.com</email>
 		<name>Ian Jordan</name>
 	</maintainer>
 	<maintainer type="project" proxied="proxy">
diff --git a/app-arch/lzip/Manifest b/app-arch/lzip/Manifest
index d0987cfb8421..ec8c439ee34e 100644
--- a/app-arch/lzip/Manifest
+++ b/app-arch/lzip/Manifest
@@ -1,7 +1,4 @@
 DIST lzip-1.24.1.tar.gz 123899 BLAKE2B b387577087af5596ea49af16c44e1dfc11f78cbcc1031fc480a4e7ef1a01f4d8fb35c03d8cbeb7f6feb51e427708b1ed0f9a160e80ff938555ea3cf34f28be7c SHA512 b67b3b8ab594306dd863b6f51525ab80e90cbff3af1faf190fd7a35eac895ef869e6a1f8f503d623c16ad5c1496816c8f851abf0be5983d53052bea80afc34bd
 DIST lzip-1.24.1.tar.gz.sig 72 BLAKE2B 6b957524cbca62aed7eb1dc35284da24550d8d90c8bf95d0c84063afe5e0cc1fc6f70bd513dece615f286e0d49c1a7dfcf6940a443f293975380c8e3ada2cb2d SHA512 40cfa84a7c7e6b907d76560eae27b22cb11aea79a94a2231e041952fe0f452a4e291355f60965bd6ca712e03f4ebf5381b759409e66a4a12653a005a6a1d8395
-DIST lzip-1.24.tar.gz 123850 BLAKE2B ef6b7b51e7369b7b07ca2d5bbdd57a287f3a96866f50b327237a35ce9a4d19b2e3f7586a099ff4191c3c793de2dfe59120a42b8d744e220c4f7652d049df87f5 SHA512 119de48deaedcbfdc0bf61c57ac54b463a3cf1ec064c70095b36d18784f59e5c80bb07ad69ad0e168443d6e73f7a506a65d80a2eeae111669b3194fa5dd0ca3c
-DIST lzip-1.24.tar.gz.sig 72 BLAKE2B 629c25f2ae80932246657efeca0fcaf57024203d9739db9734e9b2df799809f7b3b9ac70afa4a47eb631865246674a2f269b2fba4fbaf58e0299efa74388c6cb SHA512 c1960f051393c26beb504e95a3e99335c3b700b3e8895bd6c3c733549a1cb56a2e51024f4d7c9655670db1877cb29680418b77642a9fdbe816d59bab1e0f2f72
 EBUILD lzip-1.24.1.ebuild 977 BLAKE2B 134c6ff37849099a94706f7dd25397e9944fc8e4b5e9181e82fcc4f3c45ee6b04633477c673a600b8bd3518d99d03a79dc0c717e5ee99421ca2f70e1d236d31a SHA512 b47ce8346c8425120178f8432c50ce410c5cc5051495c741048b85860516f92810666e4f38d01e9360ade9511e74293d0e3fb950fffafb490bb7ba2b95d3e2d8
-EBUILD lzip-1.24.ebuild 977 BLAKE2B 134c6ff37849099a94706f7dd25397e9944fc8e4b5e9181e82fcc4f3c45ee6b04633477c673a600b8bd3518d99d03a79dc0c717e5ee99421ca2f70e1d236d31a SHA512 b47ce8346c8425120178f8432c50ce410c5cc5051495c741048b85860516f92810666e4f38d01e9360ade9511e74293d0e3fb950fffafb490bb7ba2b95d3e2d8
 MISC metadata.xml 433 BLAKE2B f223f7a52fed40be8267d75a1a16ba3657fde4e5eff20059ac53496fa243a680c415455fc4bfb478cbf98875d8874276c747597ec37847c72f2db7b0caad15b3 SHA512 5ba5e22b1e4291e49bca77cf4c76b10dad22e172329b5f189c345dbca2321c61371908808952faaac7ad26049e8b53124358d5a2705b4213029e23c15f37eb59
diff --git a/app-arch/lzip/lzip-1.24.ebuild b/app-arch/lzip/lzip-1.24.ebuild
deleted file mode 100644
index 8d1cf3e805da..000000000000
--- a/app-arch/lzip/lzip-1.24.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/antoniodiazdiaz.asc
-inherit toolchain-funcs verify-sig
-
-DESCRIPTION="Lossless data compressor based on the LZMA algorithm"
-HOMEPAGE="https://www.nongnu.org/lzip/lzip.html"
-SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${P/_/-}.tar.gz"
-SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/${PN}/${P/_/-}.tar.gz.sig )"
-S="${WORKDIR}/${P/_/-}"
-
-LICENSE="GPL-2+"
-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"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )"
-
-src_configure() {
-	# not autotools-based
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		CXX="$(tc-getCXX)" \
-		CPPFLAGS="${CPPFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}" || die
-}
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index bcd7019fd69c..44225f483cde 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -1,9 +1,5 @@
-DIST rarlinux-x32-624.tar.gz 627966 BLAKE2B 8069b5a33bbc229c1f64564bc483e98da8996388890defe03cd430571a269ec9a0d935bdb9ca24d97a5ca2d2eff078c50f2ed158a5d48a263312063ff56b073d SHA512 967ca151e2927f427738c49eedd0bd4a0c1e56bd43d417bfbfb1e940d553c30a4860b279b90a47151838312f8e788f0fee13c424ee3b31ab2574a077de957234
 DIST rarlinux-x32-700.tar.gz 739081 BLAKE2B 3f0d18ba3c9ff6b606bbddd3aafcc70209d87a1aa08877fa8ee62e4c28a56b0dd0d38304d273abb708fa1a9fb1d2264df0dc7eb2ac6dbd1264b250df40f141c5 SHA512 a1f1d1f203ae2f98949346ad331a27ce2d120bf28f289fc42d286fae5c9392af033a4ff72fbe078a130b9267eb42e9739db35aa98ce07f4d97566299aa233934
-DIST rarlinux-x64-624.tar.gz 614146 BLAKE2B 4cad338a68234a8223b63427fbb2d735b65012d79466c0ef799b5764e2df8e575c3e42dcaa37c8a3e5e51474633452dc4e832b05a7c13164e1778d4f741edc49 SHA512 04b935d918d7636bf7cececee2c306f6c586ac363932a30529dcf0e5e199823ca976269acf26456f9a91830dfe909d67ff0a13e55a68096e59875e46e0e0b0de
 DIST rarlinux-x64-700.tar.gz 730268 BLAKE2B 6a3c4890232b6bdc24a6e321bff66c8a41c3c64b7da8dbcd40714de647edabb32f8719be882335895a09453f36e247b7ce96edf8089f8fa6ea08489d69eb7813 SHA512 988b755d1b52051f5d4115a64f598e5d6a6a9d1756e8136a00a159001199bf684c4961245c1010f0414e174f61964e1e3f32f437810708cd77742b9b89946166
-DIST winrar-x64-624.exe 3589048 BLAKE2B 5afb3069bea3e73f6f8aca103a99fb83d09fc0bf692757e5213515423918a7219a86dc0a5936131a180a0e324b04c9685cb47a493cb69f61f7673d4f45bcac26 SHA512 f5f61a3cf4440d9fa59e7093341a293c0b42081b547992284e54cef61eee1f817fdbbbcc2cb921b077f8bce5b9280072c0f3b5a1bff266ef23c3d9a792d24b9f
 DIST winrar-x64-700.exe 3911632 BLAKE2B f2191937e1e3d0938f0ca2c56467c838415401a20a0966efad050e9fde5fe7fc6e05694c98fd06daa6fe4d7c03f588e60d456d8d510c849929a52dab36d6a10a SHA512 bc94f526d4dd751a44071dd6f540f2957d96f5c6500d7e5bb41ec6581bb0a584a6bb91fe13f7a1d9c7749c4601b1fe95f2a12a204b73bdc9a37c83cff7ac35c3
-EBUILD rar-6.24.ebuild 2289 BLAKE2B 2a4ed068245b6907f8d2023318942ea1e0890cb1fb266d8fee61ebac35a436af747a428a26307b5d0135099a0ea5601a96f9531da63244b9e88a4d99923fb2dd SHA512 22661c82c6df0cdff56dcb3186b946a7b9f738bd6e6056363ff6da8ed4f151b7a54ad6d0991b80b2ccad06c2fd664fd538bf440b39151a1cd9fd0501917aaa4f
-EBUILD rar-7.00.ebuild 2291 BLAKE2B e9c81fbd3d933f7af8552044d797c3f5a43334471aa3ce0735f2d9ff7734e9928fc2a119831499f785a0a4f56145ce1074701365035c9f062345f014b078ab0b SHA512 61e1197fa2d24c0e1cce63ea8cb80f0ca129969d44017107c26b6061c1ae218aa66e9bad22202ba43e8d3d584743e5397a7e613ee55308d8d07da1d6da31e0d0
+EBUILD rar-7.00.ebuild 2289 BLAKE2B 82df73549d6f74c2c33be6ee5bab8049a17eb8760dd09c27233cc72186b6dc011e6d2cf1b95d8e74bed5a3dec61a2cbc7dd4066167d0448eff889c16ea4a59a0 SHA512 cd0939e7f06dcb0a621cfc1abb01c0db7359370006f8a43768a45556f06991fce12206cbee9932d5d138a98f8ea48b9738cac7f1928d16f9e3f763b879a218f4
 MISC metadata.xml 436 BLAKE2B 89434fe285ad2b7be02c6e0014bb0a8fd54772e899345cb1c6de1da1e7cf5396d490af746bad1af6449183a4970c70415178765d918488f047174e64c289ceee SHA512 c9d65d30420f8febc660ad83169a8ae95c11ffcc673ca0cbc16530367e441ff72636fdbe3948065270547cb043ab0e1114dd573e4bd8716089bd01f056a63ff6
diff --git a/app-arch/rar/rar-6.24.ebuild b/app-arch/rar/rar-6.24.ebuild
deleted file mode 100644
index cb4faa7c2b6d..000000000000
--- a/app-arch/rar/rar-6.24.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV="${PV/./}"
-URI_AMD64="https://www.rarlab.com/rar/rarlinux-x64-${MY_PV}.tar.gz"
-URI_X86="https://www.rarlab.com/rar/rarlinux-x32-${MY_PV}.tar.gz"
-URI_WIN64="https://www.rarlab.com/rar/winrar-x64-${MY_PV}.exe"
-
-inherit unpacker
-
-DESCRIPTION="RAR compressor/uncompressor"
-HOMEPAGE="https://www.rarlab.com/"
-SRC_URI="
-	all-sfx? (
-		${URI_AMD64}
-		${URI_X86}
-		${URI_WIN64}
-	)
-	amd64? ( ${URI_AMD64} )
-	x86? ( ${URI_X86} )
-"
-S="${WORKDIR}/${PN}"
-
-LICENSE="BSD BSD-2 RAR"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="all-sfx"
-RESTRICT="bindist mirror"
-
-RDEPEND="sys-libs/glibc"
-BDEPEND="all-sfx? ( app-arch/unrar )"
-
-DOCS=( "acknow.txt" "rar.txt" "readme.txt" "whatsnew.txt" )
-
-QA_PREBUILT="
-	opt/rar/default.sfx
-	opt/rar/default-elf32.sfx
-	opt/rar/default-elf64.sfx
-	opt/rar/default-win32.sfx
-	opt/rar/default-win64.sfx
-	opt/rar/unrar
-	opt/rar/rar
-	opt/rar/WinCon.SFX
-	opt/rar/WinCon64.SFX
-	opt/rar/Zip.SFX
-	opt/rar/Zip64.SFX
-"
-
-src_unpack() {
-	local _file
-
-	for _file in ${A}; do
-		if [[ "${_file}" == rarli* ]]; then
-			if [[ "${_file}" =~ x64 ]]; then
-				if ! use amd64; then
-					continue
-				fi
-
-				unpack "${_file}"
-			elif [[ ! "${_file}" =~ x64 ]]; then
-				if ! use x86; then
-					continue
-				fi
-
-				unpack "${_file}"
-			else
-				die "Unknown SRC file '${_file}'!"
-			fi
-		fi
-	done
-
-	if use all-sfx ; then
-		mkdir sfx
-		cd sfx
-		for _file in ${A}; do
-			if [[ "${_file}" == rarli* ]]; then
-				unpack "${_file}"
-				if [[ "${_file}" =~ x64 ]]; then
-					mv rar/default.sfx default-elf64.sfx || die
-				else
-					mv rar/default.sfx default-elf32.sfx || die
-				fi
-			elif [[ "${_file}" == winrar* ]]; then
-				ln -s "${DISTDIR}"/${_file} w64.rar || die
-				unpack_rar ./w64.rar
-				mv Default.SFX default-win32.sfx || die
-				mv Default64.SFX default-win64.sfx || die
-			else
-				die "Unknown SFX file '${_file}'!"
-			fi
-		done
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	exeinto /opt/rar
-	doexe rar unrar
-
-	insinto /opt/rar
-	doins rarfiles.lst
-
-	if use all-sfx; then
-		doins "${WORKDIR}"/sfx/*.{sfx,SFX}
-	else
-		doins default.sfx
-	fi
-
-	dodir /opt/bin
-	dosym ../rar/rar /opt/bin/rar
-	dosym ../rar/unrar /opt/bin/unrar
-
-	docinto html
-	dodoc order.htm
-
-	einstalldocs
-}
diff --git a/app-arch/rar/rar-7.00.ebuild b/app-arch/rar/rar-7.00.ebuild
index da7d0285f178..cefa88191bb3 100644
--- a/app-arch/rar/rar-7.00.ebuild
+++ b/app-arch/rar/rar-7.00.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="BSD BSD-2 RAR"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="all-sfx"
 RESTRICT="bindist mirror"
 
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 64831a7b9eed..5a45a577221b 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/consul-backinator/Manifest b/app-backup/consul-backinator/Manifest
index de05292a2816..5e6a534220c5 100644
--- a/app-backup/consul-backinator/Manifest
+++ b/app-backup/consul-backinator/Manifest
@@ -1,4 +1,4 @@
 DIST consul-backinator-1.6.6-deps.tar.xz 122137280 BLAKE2B 6d84b45082ce151f730ae21071b58557adac169e7268f08a10be4e8d47197c22d215baa82cba6b633bde06dfd904b10ba076ab98dcb9419f373b8aae8a6bafaf SHA512 59f395d644a95320ff3fc16dd9deb76241da3d2afb9d02e8f8bfcd26751dbaf2be422cfaaec42e59352a39f63aaa15c287f77eade82cf92cb8b36e9c67f1c40e
 DIST consul-backinator-1.6.6.tar.gz 38848 BLAKE2B 2bd3bca4e1986b5bfc229ca38724bd037c2bfcbfc940b7a87be6bb1703f4a8621b4f9cc921937063ef0927085b0d07790e52b6bf50fef9b21c94075a42720f17 SHA512 4ae9b29e335eb15b78fad64ad91462b3a3b1b6d6a4b0f6ba58c4f0871781ce106e9f1026272074c38c4b8ac035b80ac2c6d1671080795fd2943979087c2ee279
 EBUILD consul-backinator-1.6.6.ebuild 585 BLAKE2B abba670486161e6ba3308ded65d40dea19fc73ce1693a0c5ab60f145936579b0da8bc91a5d91ed1d2d87afb76e8f4cfa9faabcfd5582a44b90fb49063fa7dafc SHA512 11b6228d3de6fb50a1dca7c3cd7c8a14974017bafb41877554e65fda6e063e64bd15f86bd6fbb2790de55505ef33108e8ee303581c1b419c2a605a21ad5d2140
-MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
+MISC metadata.xml 337 BLAKE2B 7cb1bbb14b17a975caa8f04eada39fc83fd7ce4b007f23aad73f193b2d86c0b2d9265b3ad31380553bc302b4e3fd5fc7996d35cae322abc4517e33da05f6a263 SHA512 8e983ba9fd61804afaf7224f2c39af4c82f92c7b0479904bb40493eb71c34343f9075aa895c59926c4aff59e6228eaa4b08f2bb5956e049236fbf8123b41c7ec
diff --git a/app-backup/consul-backinator/metadata.xml b/app-backup/consul-backinator/metadata.xml
index db463f3eeb66..5df036ade5f2 100644
--- a/app-backup/consul-backinator/metadata.xml
+++ b/app-backup/consul-backinator/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">myENA/consul-backinator</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index cdb081f63874..50415169084f 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/geekbench/Manifest b/app-benchmarks/geekbench/Manifest
index f309bce1380a..b963dd0a0797 100644
--- a/app-benchmarks/geekbench/Manifest
+++ b/app-benchmarks/geekbench/Manifest
@@ -6,10 +6,13 @@ DIST Geekbench-5.5.1-Linux.tar.gz 93199992 BLAKE2B e2ff24da19134778dd1b3036ac3fb
 DIST Geekbench-5.5.1-LinuxARMPreview.tar.gz 111581640 BLAKE2B be413e306a77c0612be380d0ec0d589067365ac1c4091b55a08b722d469180c9cf9126cc0597e3f3c8a75acf77d2a0423bc43b753f30a219924b1a7df640243d SHA512 1d76b9a7928f89f1fdfa0e3cc9859c305e109cbbe72b013b4c249b03722273c985ad1e5d818341a6e399e9e7b3c61136856df87c9f5e61bcc9e7e0455f80e61b
 DIST Geekbench-6.2.2-Linux.tar.gz 227984666 BLAKE2B 0e7618de3717f2fbe251b003a808c8b736d2905c3ce04b3c64db848e2fb071f63466288a63dbcd92f55e83a718b7c510cfb41d53471dc52bfede5547ab855bde SHA512 e72d564a977718ccbf97a434049d74fd9f145056e394affaa1ce06c4190a8e7508f8f1a1207e1c4de7f8945842d05d713e87873a287df5b20ead36abc89aab2f
 DIST Geekbench-6.2.2-LinuxARMPreview.tar.gz 191739279 BLAKE2B 723954d473825af66bc2755719a4fd113bb13d0efd3618b006646b90c6bdb8261ff41f7f284ba5c0c1c7aeeb6870a38f5679c196d85e59fa30c7a99e7a05cb59 SHA512 e2df2789abc77f9f076940f0dc5fcea811e279e603cd21ba976ba2ee078e3f421f53ea5d7ef5fc27c9a5887aa9bab2b6962bd4410fb434d6fc2dfd4b3a2935ec
-EBUILD geekbench-2.4.2-r1.ebuild 1028 BLAKE2B 75e84bed9e787a465867397f183eb8bcbd100a91c9ce5610bbd4b11b92ebf13aef9227fa8c8c06012a773bb872daa20c9bfc4754aa6ef9f1d16121f2ed2815b6 SHA512 497985b5c7a877473fa89ead3e04dfba6bb8a1df2042eaedc1964ee5dfbc3c4685fb389a96d9b1cda93f4badb174719af7765646cd6b957ed657dbf50c08337a
-EBUILD geekbench-2.4.3-r1.ebuild 1088 BLAKE2B f6699780652748451d42b106a2c74b5113778066ff83b92bf216e9da4efe63527cd454f84046be456d6e9266f4ee85efb4c3655f45bbe4e4ace3ab9867cc847c SHA512 1f8b1640a4e121767e51b6c4fcd9ff77cd60fe37f5010fb7bbb670d763fc1166beaefb5ec74b4acf8390ccc19956d1f9945151af61c37f7f2767c5f47c53c2c6
-EBUILD geekbench-3.4.4.ebuild 1086 BLAKE2B ae0d15dba696a0b5e13fbdc11665867cf716784b0a9b2a7457ff76b72d3c9ed319c4f3b4c640864e6239800bb3c011cca213eae93de20184b9ae4704930692ed SHA512 deb2bc643708f9399b09003fbea3497e33fd461af152af97bab66c23f7e10245d43f32217ad39b6677b829e77db53929039495a15d2b3b2a0a319a21200e2aa8
-EBUILD geekbench-4.4.4.ebuild 1082 BLAKE2B f57db98cc6fb65345866324bdd646dceab92b214862137efd45c93dfd505e5f87c781911efae91fc724ccbfa9503abd1827827927e05ad6b87f5c0d737feaaf7 SHA512 e357043fcea4d2f1893d46eaa36407f34e8e98478ed556597cbbc79984a2d96c057a8632e2a3c1e387067f5969648d6050797aee8ad842209b5607dc50fd2b5f
-EBUILD geekbench-5.5.1.ebuild 1361 BLAKE2B 15a2b963658ab40701fd4affc3a30c5365718a0f2486d84a9f3413101256965ca11a567dd8f52b3f02cb3e090ccf88f7e68de48a75c140baf3a15003a5c4a6af SHA512 2c48619b431eb93dcf53ea3d0a91c1045c5f0fd3b440a7a65fa0c72bf3e3b51fb1ae6777ac8a450f8cb95496cb87e4a79fdf357ab263b48fd79ab062a019d541
-EBUILD geekbench-6.2.2.ebuild 1393 BLAKE2B 0fdaa02a888915e6d61e709e9bdb7e53b1744e31411c25ed2957ab31954ee45f1dd7fcf9118c42bffe60661a0cf38e9ca08aea01e2d68f230821890534d213fa SHA512 860e6cb6f3aa18f168dc3a4bd81a98f31e18fef14926945ec6dbe6c6b50e91391042e5600b049326ec7ef1567ed376b737d8d1474b7df8594a0c28004300fe71
+DIST Geekbench-6.3.0-Linux.tar.gz 228034734 BLAKE2B fada4628e67ffa61caf77129865ea98871633cc8b197f41fbd8558539fd0b92be803f65c6590ee597b67642998661701fb58089dfe606e98a2219ea838ee3f5c SHA512 0c0d89adea5c25cd6b9cc804fdbb5f3e53178ca3cf7b9505ab9c194f84f7d38274c1bc57651a073c50490e731ae1bbd56d13e388144a2529e9a556cef181ab6a
+DIST Geekbench-6.3.0-LinuxARMPreview.tar.gz 191781760 BLAKE2B a99009396a761f9bbcf3a4c32f1afcbed9938d865615da696dc2cdae83a81a1d3bb06aeb11aa26a803caa22479e4d8bb5cf8a52c3260abe07e792b312d29443c SHA512 e9992eb5c7038efdb721fd970bfcf8b0ee3e9d323a9e7cd98588514798560f16428c3e7c4d1d235d2a28320dc629305f29ec56a504923826d09136f4cfb7b775
+EBUILD geekbench-2.4.2-r1.ebuild 1028 BLAKE2B a5bc490c520d077f49f2aa5a41a95cbcdd324913573ceeea1574f06ab080a68301c395d1b8cb4cfb551a62c917c479f4819b61cb4248660724bac828286172da SHA512 35f667146f41cd83241443523714eeb8bde12e172fbd5f1083c93a0f57099ecfb678a588262a90842dc89c96591e8731fe3933d38a494a25d9a6b470ec69716d
+EBUILD geekbench-2.4.3-r1.ebuild 1088 BLAKE2B 273e223506f28fdff54ae1dbe6f98de5d5ce483d85ead46727be0965e072a129b0c86ee7f2f9352da1e299230c09b21323e294d40e59d6c638276e42a02beaa3 SHA512 417ebf67e98b614313be568c4da9a21eb530dd3f733d1535195f8142509b7d77728907a6a8eeb9e902e27fdaa44f4af834b56da794be1f989615baa438f1cec4
+EBUILD geekbench-3.4.4.ebuild 1086 BLAKE2B a33c73c0a235d931aedf6b5396db74e18d8c8685b2da3e70574b472fdbc97c4e78f54ff03b53f67c6065d8b16c3c702faf137cf68d15ecc372ec0589e7ade2c3 SHA512 5591b62c4c5919b2faaddcf75e909d05e880b5b6c53d6d18938810a26fe298c05d111e73ab59b3b6bac0fc9b299dc26d4da862963e306c672166507cb21473ab
+EBUILD geekbench-4.4.4.ebuild 1082 BLAKE2B cf21d8a59ad9dca4ff370d7ec4dc99987f64b189cd6b0a93b977e36d46f699b7dc946327cd2438dfdf437f7ca0bc7bdedff8b6633f5aeed8daf5ca61dfc62b13 SHA512 df16ed7204f87c9c113000ab4c85b9f585dd5a1a3004d6093c3ab4520fe55b7804270cb4e3963d72c19edac1bf4154d8e0d9763384a456f45beddefffed1aaf4
+EBUILD geekbench-5.5.1.ebuild 1361 BLAKE2B 80966b69ad065471a7c51995103b5213408763c0c712e7c79332ecf87c0ded10f8bad439b2f14488af358635b91921d3dea503331238035a62c9c13baad60498 SHA512 914eaa3b1ec9711c0c26aa3cc4ddeafa4c0eab63b92e234ef65695775e3d7c85455307c25dcea1bdd62992a93fdc8e384965b7febd2a30b2d3a4c8daee72e787
+EBUILD geekbench-6.2.2.ebuild 1393 BLAKE2B ea0e40ac4d9ea51768acc7649b752d663d1b4108ae5e7d236174160367927253226cc962294f80eb60f855ba7ed436d8925f2aa67adaa5fff7eeb4120ea122ba SHA512 bdd78d0a3886a8d68e957c263f233aa8ebea68cd21de46e28f572039ba745d4aa28e54e8e4b53e182f87fec74c503ffd64d57eaa3424b022235eaf09a0518bc2
+EBUILD geekbench-6.3.0.ebuild 1394 BLAKE2B 2a621377ad9c6f1639e6854ae6692fc6b00f976d99ad1e7f8e8b653d9aa62f2a82613d6e864ef1b70d55b0279da473afaf7a2f43d829f861a6213ad1652675b4 SHA512 41eb45c5729fb87cf8e0eacc9df968f129d03f33c33c829e08e4c05a7a70a261a7f5442ad49f722233899c0b70c839fff9259479a4349587f41098e6bdf02b4d
 MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/app-benchmarks/geekbench/geekbench-2.4.2-r1.ebuild b/app-benchmarks/geekbench/geekbench-2.4.2-r1.ebuild
index 0b1ff2c7cfc8..1fbe5af393dd 100644
--- a/app-benchmarks/geekbench/geekbench-2.4.2-r1.ebuild
+++ b/app-benchmarks/geekbench/geekbench-2.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,9 +8,9 @@ HOMEPAGE="https://www.geekbench.com"
 SRC_URI="https://cdn.primatelabs.com/Geekbench-${PV}-LinuxARM.tar.gz"
 S="${WORKDIR}/dist/Geekbench-${PV}-LinuxARM"
 
-KEYWORDS="-* arm"
 LICENSE="geekbench"
 SLOT="2"
+KEYWORDS="-* arm"
 
 RESTRICT="bindist mirror"
 
diff --git a/app-benchmarks/geekbench/geekbench-2.4.3-r1.ebuild b/app-benchmarks/geekbench/geekbench-2.4.3-r1.ebuild
index 57304c2b28df..9cc497a9ae21 100644
--- a/app-benchmarks/geekbench/geekbench-2.4.3-r1.ebuild
+++ b/app-benchmarks/geekbench/geekbench-2.4.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,9 +8,9 @@ HOMEPAGE="https://www.geekbench.com"
 SRC_URI="https://cdn.primatelabs.com/Geekbench-${PV}-Linux.tar.gz"
 S="${WORKDIR}/dist/Geekbench-${PV}-Linux"
 
-KEYWORDS="-* amd64 x86"
 LICENSE="geekbench"
 SLOT="2"
+KEYWORDS="-* amd64 x86"
 
 RESTRICT="bindist mirror"
 
diff --git a/app-benchmarks/geekbench/geekbench-3.4.4.ebuild b/app-benchmarks/geekbench/geekbench-3.4.4.ebuild
index ca2ca92c220c..7f8726c4ab60 100644
--- a/app-benchmarks/geekbench/geekbench-3.4.4.ebuild
+++ b/app-benchmarks/geekbench/geekbench-3.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,9 +8,9 @@ HOMEPAGE="https://www.geekbench.com"
 SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
 S="${WORKDIR}/dist/Geekbench-${PV}-Linux"
 
-KEYWORDS="-* amd64 x86"
 LICENSE="geekbench"
 SLOT="3"
+KEYWORDS="-* amd64 x86"
 
 RESTRICT="bindist mirror"
 
diff --git a/app-benchmarks/geekbench/geekbench-4.4.4.ebuild b/app-benchmarks/geekbench/geekbench-4.4.4.ebuild
index cfe8d5583c78..88711110a509 100644
--- a/app-benchmarks/geekbench/geekbench-4.4.4.ebuild
+++ b/app-benchmarks/geekbench/geekbench-4.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,9 +8,9 @@ HOMEPAGE="https://www.geekbench.com"
 SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
 S="${WORKDIR}/Geekbench-${PV}-Linux"
 
-KEYWORDS="-* amd64 x86"
 LICENSE="geekbench"
 SLOT="4"
+KEYWORDS="-* amd64 x86"
 
 RESTRICT="bindist mirror"
 
diff --git a/app-benchmarks/geekbench/geekbench-5.5.1.ebuild b/app-benchmarks/geekbench/geekbench-5.5.1.ebuild
index 1ef1df0ab213..c2fc48f349de 100644
--- a/app-benchmarks/geekbench/geekbench-5.5.1.ebuild
+++ b/app-benchmarks/geekbench/geekbench-5.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,9 +11,9 @@ SRC_URI="
 "
 S="${WORKDIR}"
 
-KEYWORDS="-* amd64 ~arm64"
 LICENSE="geekbench"
 SLOT="5"
+KEYWORDS="-* amd64 ~arm64"
 
 RESTRICT="bindist mirror"
 
diff --git a/app-benchmarks/geekbench/geekbench-6.2.2.ebuild b/app-benchmarks/geekbench/geekbench-6.2.2.ebuild
index 0f2d1e36167a..8e88c986939c 100644
--- a/app-benchmarks/geekbench/geekbench-6.2.2.ebuild
+++ b/app-benchmarks/geekbench/geekbench-6.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,9 +11,9 @@ SRC_URI="
 "
 S="${WORKDIR}"
 
-KEYWORDS="-* amd64 ~arm64"
 LICENSE="geekbench"
 SLOT="6"
+KEYWORDS="-* amd64 ~arm64"
 
 RESTRICT="bindist mirror"
 
diff --git a/app-benchmarks/geekbench/geekbench-6.3.0.ebuild b/app-benchmarks/geekbench/geekbench-6.3.0.ebuild
new file mode 100644
index 000000000000..c8c4ee1266f3
--- /dev/null
+++ b/app-benchmarks/geekbench/geekbench-6.3.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows"
+HOMEPAGE="https://www.geekbench.com/"
+SRC_URI="
+	amd64? ( https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz )
+	arm64? ( https://cdn.geekbench.com/Geekbench-${PV}-LinuxARMPreview.tar.gz )
+"
+S="${WORKDIR}"
+
+LICENSE="geekbench"
+SLOT="6"
+KEYWORDS="-* ~amd64 ~arm64"
+
+RESTRICT="bindist mirror"
+
+QA_PREBUILT="
+	opt/geekbench6/geekbench_aarch64
+	opt/geekbench6/geekbench_avx2
+	opt/geekbench6/geekbench_x86_64
+	opt/geekbench6/geekbench6
+"
+
+pkg_nofetch() {
+	elog "Please download ${A} from ${HOMEPAGE}/download/linux"
+	elog "and place it in your DISTDIR directory."
+}
+
+src_install() {
+	local MY_S="Geekbench-${PV}-Linux$(usex arm64 'ARMPreview' '')"
+
+	exeinto /opt/geekbench6
+	use amd64 && doexe "${MY_S}"/geekbench_avx2 "${MY_S}"/geekbench_x86_64
+	use arm64 && doexe "${MY_S}"/geekbench_aarch64
+	doexe "${MY_S}"/geekbench6
+
+	insinto /opt/geekbench6
+	doins "${MY_S}"/geekbench.plar "${MY_S}"/geekbench-workload.plar
+
+	dodir /opt/bin
+	dosym ../geekbench6/geekbench6 /opt/bin/geekbench6
+}
+
+pkg_postinst() {
+	elog "If you have purchased a commercial license, you can enter"
+	elog "your email address and your license key with the following command:"
+	elog "geekbench6 -r <email address> <license key>"
+}
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 58d2bc786dfc..a621d3e2474e 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,3 +1,3 @@
-DIST stress-ng-0.17.06.tar.gz 6244583 BLAKE2B cb5285d5ca12957d9eab7df1e6e011be35cc87a7d43d4d99ec7433588c1c9c959ac05f97b6dde4483ed6c3ad4b9317e299e0650aa8c0cb50f5bd38f8e9bd4ace SHA512 ba59321305a1e3d9ba49f7d71bf8287f1ed37db1b9b54603b2f209272d959ac21a583c5810db5019db0a56c12c7d29e8485d0088c9c3a2e5355657da3ffd4c9f
-EBUILD stress-ng-0.17.06.ebuild 1283 BLAKE2B 2de2672d0293a2269359f0294a2c785fb887b6489ebdc720bf70e7ed0574759d02153dc81a269e3ff4dd1aa963862086b5bae3dbf95b94b99dcc4eba60b8f1f2 SHA512 a9d68decc14943cbc57f285f1674764fdd8e876fe0d68bc908bba2f980175dd8281596449665ce210340b14ff2553e70079f329de5c9a18af0ab136c3dc44c6a
+DIST stress-ng-0.17.07.tar.gz 6260811 BLAKE2B f56dc22ca55a3b4e9c22f179653b4f832d164fd61968af146bedd3a9242509f7ede070d5cf9392ba494025682f6dfed33bd6034244c0731716977e2179514929 SHA512 5bd6dc8175d2d410447559c489e7bb1187fdce7657018ac48a2744be6e8998bc21e84b7bc536477b5db170ca9bd2aba0992127af90e3ff2312bd6130061dce6c
+EBUILD stress-ng-0.17.07.ebuild 1283 BLAKE2B 2de2672d0293a2269359f0294a2c785fb887b6489ebdc720bf70e7ed0574759d02153dc81a269e3ff4dd1aa963862086b5bae3dbf95b94b99dcc4eba60b8f1f2 SHA512 a9d68decc14943cbc57f285f1674764fdd8e876fe0d68bc908bba2f980175dd8281596449665ce210340b14ff2553e70079f329de5c9a18af0ab136c3dc44c6a
 MISC metadata.xml 965 BLAKE2B bc3ca07d204693d8e4efa2bd547af2e57e672c312cf2e8feafecc9fbaad8d7119b61483684c16ce89ffd0224bb42a4ca1a7df277909364f77439091e02b0d153 SHA512 963755da68b098fc10b296a15b866fafc0ec6ea0d232a2d2eae9aa478801b282818b3b124303f92ad77b7bbd258acfb54e56317012cd2bd7a1274a1f81c419d5
diff --git a/app-benchmarks/stress-ng/stress-ng-0.17.06.ebuild b/app-benchmarks/stress-ng/stress-ng-0.17.07.ebuild
index fcf28898a409..fcf28898a409 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.17.06.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.17.07.ebuild
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index f295753eb6f0..a65b8e335c75 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/earthly/Manifest b/app-containers/earthly/Manifest
index db528f49c604..d80690246ab6 100644
--- a/app-containers/earthly/Manifest
+++ b/app-containers/earthly/Manifest
@@ -6,8 +6,11 @@ DIST earthly-0.8.6-deps.tar.xz 157843872 BLAKE2B aade314abdcd8aaf18737908df1a90d
 DIST earthly-0.8.6.tar.gz 8052646 BLAKE2B 43cb74b7ad198d6418a60dd8b3bac61c1bf67f460b73ca3627647ce71778178e69075bc5122a24cfe33c075c40e962db60845ae6d0933782432eb56087ed83f2 SHA512 4c5ae65452ff940bbeeff7ec489882c5db82597977d18ac3f187ae6a444f6b78222f16f3e0ff10250100195227b925d1a73e24c2ffce618b8675fd826302a47a
 DIST earthly-0.8.7-deps.tar.zst 180209748 BLAKE2B e4c5f4b856d0ed3a0c757128c144f6267fd763118de12a51877781e82ea15722420c871f5d66a4dd797cc67b85b7c7cd26a1d2e8f417bd5517f1109e376bbefc SHA512 b8dc56b302aca63837a87cfcced4d0387adaea5433b72eb7c7056dab8a486208d06fff39b4ecd753a30f27878b1497eb1892456876e7632ee2c44926747a12d6
 DIST earthly-0.8.7.tar.gz 8062437 BLAKE2B 82796711c13cb7fd2bf957148ddd7ff31d14b9888b30a910682b956ecb8cd9c66539a71b558f92f972b54c566411257c769dadfe2e1d720d9a4e496292185d48 SHA512 c8bddfc2c4e5702abb5c119a022ab5cc875b460535fb5af4364ee7bd89e950768f71fe1ccf1860d0826d8934b283745ca22abae147852a7b779081373b40be4f
+DIST earthly-0.8.8-deps.tar.zst 180214607 BLAKE2B f407dcc4cb8daee7ac53433af830b6c872b0c9e1e05004b2bc4c8706eb98b65e457f7bea2b221e6c4cf4dfe8bb218a5ca60e85beb1f7839cb0ffaadaf8110ad3 SHA512 6a9d0eb7a69b36cca2f79d3f92e21f9f97d858451308f7151e4810c479105b7dad3fe2ad1b8a90a6ca9f0c7d3d06a8f89cd3eab4fde54e10fae2e3ea98fbb7bb
+DIST earthly-0.8.8.tar.gz 8069650 BLAKE2B 05dca12e206a22c522d36711cb960525bb20c51439dd73c8ec4a96151c306022483ade55ebe80f30d85acba3c1531b0c9b97115702c6bfc96daa615d9b798d31 SHA512 9a19ddfcaa40720b1cbab166e40a6300a79d38245074bd111082eaa04206ae8020c7596ad5801f3048e3a411cbcd88b161d8c01375e4b00192b8cf2b23e62e77
 EBUILD earthly-0.8.4.ebuild 1781 BLAKE2B 536d58e1bc3b2e18fde2ff6ee85296a2e666bd67af47ec3ccacf8dc5b8a127b639a12b7a09d4d7a89af9fe0068513b825239e2d0b2b9ca70a94eefd01641f102 SHA512 8d3504d6e1bbd517d660392fd2f734c2061a48e19aa397bad7284c0823587b77b0090cdf1697b93451362fd110d22aa15115c6bf4bd930c468fbeccc105b9453
-EBUILD earthly-0.8.5.ebuild 1782 BLAKE2B 720acd491c6ef2c2ec1f6520866d295174a3490281a269f5e488bf7116c5d3f4c0e52b77311f006a580041bfb43e630acf7f90df4e8742e43e53a4ddc4912487 SHA512 a381e131461389d91028fcc920e61e3ca49a6790977bbed4408368ed0aaadfe4135254ca7f6a8e98bafa526bfecdc920a5168b3d6cf7e6dacfadf0da17178c31
+EBUILD earthly-0.8.5.ebuild 1781 BLAKE2B afc6d0b17b07b47828256815031d62038dad6a180e7263d429d73bc9958a6ed1f2672af0a8a33186fbf74e8a6aac6d48700362a0ae040bea5f5f72a632cafb68 SHA512 6c8fd6bf5f1ed1a02050d481fc4a5b8a03c6e94f2406962a5693e75d09e0308f9c3bcf3c7c30cd786973bc5740033773e70c72be3d52d47da5f101f40bea2c26
 EBUILD earthly-0.8.6.ebuild 1782 BLAKE2B a468ae75e56269713a31bd8bd69726603668ab76ffc778e7d93fa64f018726982ed2bdf45de73a69c46246c7cf497398e5db62b90d4ea6a8d684ce383b85c62f SHA512 ae2ad347f5ab0d3ee92759c8ad18b3808faad7740a9a87b087524de92918278ef938163c612776ef7fc104aee566765fc37f2526985be010fde3ce2fdd6aab63
 EBUILD earthly-0.8.7.ebuild 1863 BLAKE2B 1d7bc52f1fdf575a3a6d49fdc360aa077fd0688c5c27c445d7441cbf769e602cf0de77627d1045adc5fbc20ea2712fc9dd23149c335f933edfe21c0086db62f4 SHA512 fe84123b4423936a3ad3b06b8baf5c70c129e8fbd4d4216074a9e67579d38b52cef2db04debccd3e357d17d697e071bee57538510aec39422621b95c33300149
+EBUILD earthly-0.8.8.ebuild 1863 BLAKE2B 7a28cfa40b085b46d570fc6e7d30888fe476f68510acfae7e9ad9608fc39a94da74f9e3fbed2e50a41b93246251841004ff70b39e2eb81bb364b58a7570db1d5 SHA512 0015769ef0a2ecefd3ea57ecfad548bf58f545991f0b8b3e019c04f184bf34493076bc8aff9792c89a2cb5bc93a0c1cee1d1c7c2f5566592c0f408f84f64cd4d
 MISC metadata.xml 927 BLAKE2B b7d5184df16f39603bf6df8b503e701d737fec188d1d97673e4ca59babd990c1b872784c91db04c74d9a08dbffa76f4e7530d8b021cbbe9ae51fd9966f709522 SHA512 f7f49eb583b2b5a9939c26e9eaff3917392525c3a94e5f8274c89b69e172547ad02fa4ed1b078e7d778f765659e1b9a7cf99d88042034cfbfbef54e685c8b6dd
diff --git a/app-containers/earthly/earthly-0.8.5.ebuild b/app-containers/earthly/earthly-0.8.5.ebuild
index 97d327f570a3..94da15dd4a73 100644
--- a/app-containers/earthly/earthly-0.8.5.ebuild
+++ b/app-containers/earthly/earthly-0.8.5.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	|| (
diff --git a/app-containers/earthly/earthly-0.8.8.ebuild b/app-containers/earthly/earthly-0.8.8.ebuild
new file mode 100644
index 000000000000..bace0e6e3fcf
--- /dev/null
+++ b/app-containers/earthly/earthly-0.8.8.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Git commit SHA is needed at runtime by earthly to pull and bootstrap images.
+if [[ "${PV}" == 0.8.8 ]] ; then
+	COMMIT_SHA=2718b793272cf8f80fa61071b41fec8469a7427b
+else
+	die 'Could not detect "COMMIT_SHA", please update the ebuild.'
+fi
+
+inherit go-module unpacker
+
+DESCRIPTION="Build automation tool that executes in containers"
+HOMEPAGE="https://earthly.dev/
+	https://github.com/earthly/earthly/"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+	https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.zst
+"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	|| (
+		app-containers/docker
+		app-containers/podman
+	)
+"
+
+DOCS=( CHANGELOG.md CONTRIBUTING.md README.md )
+
+src_unpack() {
+	unpacker "${P}-deps.tar.zst"
+
+	go-module_src_unpack
+}
+
+src_compile() {
+	local go_tags="dfrunmount,dfrunsecurity,dfsecrets,dfssh,dfrunnetwork,dfheredoc,forceposix"
+	local go_ldflags="
+		-X main.DefaultBuildkitdImage=docker.io/earthly/buildkitd:v${PV}
+		-X main.GitSha=${COMMIT_SHA}
+		-X main.Version=v${PV}
+	"
+	local -a go_buildargs=(
+		-tags "${go_tags}"
+		-ldflags "${go_ldflags}"
+		-o ./bin/
+	)
+	ego build "${go_buildargs[@]}" ./cmd/...
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe bin/earthly
+	newexe bin/debugger earthly-debugger
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	if has_version "app-containers/podman" ; then
+		ewarn "Podman is supported but not recommended."
+		ewarn "If issues arise, then please try running earthly with docker."
+	fi
+
+	if has_version "app-containers/podman[rootless]" ; then
+		ewarn "Running podman in rootless mode is not supported because"
+		ewarn "earthly/dind and earthly/buildkit require privileged access."
+		ewarn "For more info see: https://docs.earthly.dev/docs/guides/podman/"
+	fi
+}
diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index 877b825a1d63..223aca9ead1d 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -8,10 +8,10 @@ AUX podman-restart-5.0.0_rc4.initd 641 BLAKE2B c62aa18fe0da2d00032f09bc2e23debfc
 AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45
 AUX seccomp-toggle-4.7.0.patch 400 BLAKE2B 9f02e58c06b507a294207c66bd5ea218f87803a9b9f0ddafc86a8b21df912589357adf054302e5a69d300155bdf8dcd8b77c18c1ddf8a4042ae1f05de5faf46d SHA512 e507e3a52d2f5f48b65fdb77ceaa095f13fda3e834dafc976bcd291cb35755da879c9c99b7950b2905399dedf4ac3370bd70462343648613a7c6aedc141d7ef7
 DIST podman-4.9.4.tar.gz 21733620 BLAKE2B 17d099c0a13fbbb77556742313c39995127fc97b4086ef3c2d74a92cc0a4f825a6c729dd099c6d4f4cd3d2ebfd470494babdeaa85a5653b327ea1a16fb5ea993 SHA512 7b52555789a1c214fcf26b0826bdda6cf0ccca588f87c0f15ac5e8358ddac625e17cafbe6a43de07cad964e1418b5ee0d2e38a5cb5dc6f6d4e638399749a7f7b
-DIST podman-5.0.0.tar.gz 21861935 BLAKE2B 1ec7006f272f5da7f93929bc543cd8988d6f9596cb868e9561578ebef85d51cbd6baa4b66571872fc9748c639ca636ce27f6d90303707f04caa321c7b71db81a SHA512 8800d96d668cbc7a7ff85a09c71b3307a280c124513fd02fe478f415cf8db43ee47dc7e9c3b75046c6bda9f916937a2cc59887c2c4b26766c2f770abb87fd7ce
 DIST podman-5.0.1.tar.gz 21863115 BLAKE2B 433949d70e7984a278d5231fe4a480d0c758a67e6df30f587f25da727440ba944cf38bb979ab6b6375f0ba65038c6b4c5a8ca73c6bc73df57b92089c5f6c072e SHA512 4ab64beea9b23839caa35bf8ec0f097ed16b4d2f448ce16039bb55672ac8b1d8d8cadf86c21eb32dc2c1d30dabb5b57a141823aa5fc3f14f09741f76cffa6023
+DIST podman-5.0.2.tar.gz 23811875 BLAKE2B e943eb36eb0b80332223afc5d971c0886f6eaffeb7133c634d28c0a38e9aae6a54266691067dbca7684882f8b6dad72c3d5de2287ec5a7e8fb4b1cfd96df0b4d SHA512 70dbac9fc81d66eb9b0a5174f5776b805397005cacca917674d2b001591fadd05a776c956e693bad932e9eefe591c35da5c566e8e9e01db8be42bc454cd03104
 EBUILD podman-4.9.4.ebuild 4333 BLAKE2B 5867c27e10a823ff2b6065244a7fddae63f65d2626fef1306da79f34136b191e2db42c03c57a36c5e4a672415c43f123562d93858491c5f62fce422da6b30ea5 SHA512 acd08fafd1626b6bfaae89fad0acabc68d442b169acbe9c7f97184f7edf2edaa83bf7c593b4acc15b95adc4f4558c8f2401f86489e91ff3d31e0c62801332c30
-EBUILD podman-5.0.0.ebuild 3412 BLAKE2B 0194429cf22dec482365035063ae9de98c3a89d853eaf3bf7e2b887504c4603db30126383c2c4ab84c3f16e7d47df18519317919af01af605ae4603fa2d01657 SHA512 498bbc1b729e20ebbc3564d70292398c4acbd59db7825dead070c24297381f722db70f0f99f31e6548454ff4ac1bae048c0434eccc42d9f505b211c21fc9eed4
 EBUILD podman-5.0.1.ebuild 3412 BLAKE2B 0194429cf22dec482365035063ae9de98c3a89d853eaf3bf7e2b887504c4603db30126383c2c4ab84c3f16e7d47df18519317919af01af605ae4603fa2d01657 SHA512 498bbc1b729e20ebbc3564d70292398c4acbd59db7825dead070c24297381f722db70f0f99f31e6548454ff4ac1bae048c0434eccc42d9f505b211c21fc9eed4
+EBUILD podman-5.0.2.ebuild 3412 BLAKE2B 0194429cf22dec482365035063ae9de98c3a89d853eaf3bf7e2b887504c4603db30126383c2c4ab84c3f16e7d47df18519317919af01af605ae4603fa2d01657 SHA512 498bbc1b729e20ebbc3564d70292398c4acbd59db7825dead070c24297381f722db70f0f99f31e6548454ff4ac1bae048c0434eccc42d9f505b211c21fc9eed4
 EBUILD podman-9999.ebuild 3412 BLAKE2B 0194429cf22dec482365035063ae9de98c3a89d853eaf3bf7e2b887504c4603db30126383c2c4ab84c3f16e7d47df18519317919af01af605ae4603fa2d01657 SHA512 498bbc1b729e20ebbc3564d70292398c4acbd59db7825dead070c24297381f722db70f0f99f31e6548454ff4ac1bae048c0434eccc42d9f505b211c21fc9eed4
 MISC metadata.xml 1709 BLAKE2B 0138cd1f7fec54f2b15f8a8af7a29ee0202b0c824371ed6f45726c06e84c5a0c78e6446f817ee2b81c44320203b50c54072757b9cd271080cd07a072141760ce SHA512 65fdac8344812dd71fcf7018da7320a055870f48af6c4f623a9c65f5375e69eee142409ff3451c5e046eef648e0ac00bf96550a7dfc37be5b7aa3aff1a51d42b
diff --git a/app-containers/podman/podman-5.0.0.ebuild b/app-containers/podman/podman-5.0.2.ebuild
index b535f608f817..b535f608f817 100644
--- a/app-containers/podman/podman-5.0.0.ebuild
+++ b/app-containers/podman/podman-5.0.2.ebuild
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 7c0956a8bb31..f41b85ba870d 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/consult/Manifest b/app-emacs/consult/Manifest
index c9bd94f06777..918d02b50f9d 100644
--- a/app-emacs/consult/Manifest
+++ b/app-emacs/consult/Manifest
@@ -4,6 +4,6 @@ DIST consult-1.3.tar.gz 103808 BLAKE2B 180f775ac76a4e0c40b8bbeeb254a8eccc3afd01e
 DIST consult-1.4.tar.gz 103709 BLAKE2B 5326856b6bafc0a52d525971d84bd2fd3e0450aa1e8060d9ad49dabc6620fb2b721e5a26ba8d219bd889723109af766ba7fb8faa510301031f9372c798a8853d SHA512 4721820d288a357ea3432a850556a85cb037c1ddc262cada62d75e80641f1b402dd6edfceabb89b8dc386ae391081e02d2550f8773f9760ae267f3af8e381cb6
 EBUILD consult-1.2.ebuild 630 BLAKE2B 7c30b2c13d15563093403bc4e5d2ba7710d16ad1ff9cbe1e4c76c2dd97b263b7e4d27780c0acdab36a509f31e4d1b91072f8923ab2788e2445c74012164b09b9 SHA512 eb40c440ce28a37a94b5da4059a671ea938811019d2cfec275841687f418e688aaa58e1777d025def5cb3fb1ffa0d16c020c6e08db58277077cb5bfc72dacc0b
 EBUILD consult-1.3.ebuild 630 BLAKE2B 7c30b2c13d15563093403bc4e5d2ba7710d16ad1ff9cbe1e4c76c2dd97b263b7e4d27780c0acdab36a509f31e4d1b91072f8923ab2788e2445c74012164b09b9 SHA512 eb40c440ce28a37a94b5da4059a671ea938811019d2cfec275841687f418e688aaa58e1777d025def5cb3fb1ffa0d16c020c6e08db58277077cb5bfc72dacc0b
-EBUILD consult-1.4.ebuild 631 BLAKE2B e0b5397e07a2598270dfb934b6af87d8ade6225c01b654e0650a771c9bfbdb467e59636490f8195ad049c2feb8e2829cfe98110bc6fa893df74646141fe0b2bf SHA512 4ad14156bc002c94ac3e91a9218886e24c7d69bd9c2c57ed056e9788477299fe5cf367ff42e32004cb83e0ae7b567d9aee4f9640fa07a93cbfefcac89bb59648
+EBUILD consult-1.4.ebuild 630 BLAKE2B 7c30b2c13d15563093403bc4e5d2ba7710d16ad1ff9cbe1e4c76c2dd97b263b7e4d27780c0acdab36a509f31e4d1b91072f8923ab2788e2445c74012164b09b9 SHA512 eb40c440ce28a37a94b5da4059a671ea938811019d2cfec275841687f418e688aaa58e1777d025def5cb3fb1ffa0d16c020c6e08db58277077cb5bfc72dacc0b
 EBUILD consult-9999.ebuild 631 BLAKE2B b923f9b2a906c47f745c2d7370ca7b2005726e9b3c14bdafd1c062771739be98a117349ab7e2d9ada4de5d8d6cf24207e0191eb51d470b2bef5fa9b5c389d5b9 SHA512 763403456ea8eae4e00cc8d886184f74ae66401a302832b0fe1f6ef939349cf92100a9920783d6c43feffeb9df843600bab892eceef5656dd4021365a674c744
 MISC metadata.xml 359 BLAKE2B 569bd0c5fe81610f0b67c94e8c431edddb5060800a6e22d0833a4d5f120df34545dc49c879c12a6522ccbe791472df47be42af97fbb228498e79d9e0893697f3 SHA512 8e01b569f019ea43209f43c783fd41b9661a7235d300363a9441179058b10921629cf8b891874c706d2c1ec106248f6c1e0a3501df7bfcdd02000d08f7997c29
diff --git a/app-emacs/consult/consult-1.4.ebuild b/app-emacs/consult/consult-1.4.ebuild
index e1f29886c2e1..ec7220ffd0b6 100644
--- a/app-emacs/consult/consult-1.4.ebuild
+++ b/app-emacs/consult/consult-1.4.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://github.com/minad/${PN}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/eldev/Manifest b/app-emacs/eldev/Manifest
index a9cf22ba68c9..118cb3da12b9 100644
--- a/app-emacs/eldev/Manifest
+++ b/app-emacs/eldev/Manifest
@@ -2,7 +2,7 @@ DIST eldev-1.8.2.tar.gz 298578 BLAKE2B 579c72d61e15863a81b8a060da0c78900785a2b58
 DIST eldev-1.9.1.tar.gz 301188 BLAKE2B ce57bee48dda505113df269504fdcad1847e80b2df9e3f7916d7960ee7212a7cb44165b373f0e6c54c0d04f7990f46132afdf6d64ae1b93a9433353cf5058a81 SHA512 f059f49e920ea518b23cbd0a8d49d0e86c9fdb5d759bb42d44a620b95dd7eb007e1457de904c9a5149b9c76ef7737ba2942de4cf7a6be2becb2a6152e08bea26
 DIST eldev-1.9.tar.gz 300721 BLAKE2B dac07c0f7fba1a8637ca9c2e26ebef26fefa88bc6d709a313818233e8c00e2c53acdd2ba37baba2d8e07aa49634a590790faf58edcefafe910793125d7ab7aed SHA512 c3b64cf457ffc0aaa21c34c48379736c98a94773ffd830cd9d79e840638340201f08899f09363912985f54b248130946d4ce6175891fd298548e6538ca9ee142
 EBUILD eldev-1.8.2.ebuild 1344 BLAKE2B 175e22e3b62437d6ec5af0241f1545af201338980a4fff084c6ac6d292a70bb9f7a2c442a721fbb8d61f5f8503dca53d6fa541de24980b487f5b3b8685c80365 SHA512 94c06c8a8404f0990c28e6722a046a7633c73f91c26a43cd1d40b28ac4bf9664e41afadd2d3b3dec9189a1ddc68beb520c2f07c107ef36f13439ee0c6cd2893d
-EBUILD eldev-1.9.1.ebuild 1367 BLAKE2B 37cc3419305ccfe35ec0b849c3b40209df863b2e1b8013d09ee2864a4f172ced1fd00171a7b6a99ff5f23ff892b0949d5fb02079540f60c1aee8fa56f87cb470 SHA512 2ace4b2f987434eafc3901c3eb0227707e9c4369c5a08982849d5d03e2363fd81d2f3bde188d43ac085d42fc49834d09ba3a9dea7ebeafd18b4e9723dd4ca231
+EBUILD eldev-1.9.1.ebuild 1366 BLAKE2B 19e99d63e8aa7749c394106d19e4290618433af425de74afb00ae3c63f0f54d7e6070629faf87184c4892fead2201466ac6934ceb2de8ae95dd65fe01f8431b5 SHA512 0d541ea5355d0888b18def31486d8658d6e261a37708994b07e04ca14d890050d00b80738104da6d7ae6ad19842b66d697622dd0ecf28e188078ec37a2db7e2d
 EBUILD eldev-1.9.ebuild 1367 BLAKE2B 37cc3419305ccfe35ec0b849c3b40209df863b2e1b8013d09ee2864a4f172ced1fd00171a7b6a99ff5f23ff892b0949d5fb02079540f60c1aee8fa56f87cb470 SHA512 2ace4b2f987434eafc3901c3eb0227707e9c4369c5a08982849d5d03e2363fd81d2f3bde188d43ac085d42fc49834d09ba3a9dea7ebeafd18b4e9723dd4ca231
 EBUILD eldev-9999.ebuild 1266 BLAKE2B da46690b2345f74c543a5cd3fd94cfd2c072cdce13da71051c2f0ecfcd3a4fd82fa3b3976a08ff34b894b32104298964122a69ae94afe8741eae9dee2acbadc1 SHA512 01c6c2232244713f9533f4ef3e7b30df221c0fa42efb9fa15adeb68664ab20b823e296fbd24b2b5b1a6973969edc3e3d932366ce68dbe66ce34a405559f3a255
 MISC metadata.xml 982 BLAKE2B db2324ced8f4bc4ba579130677175a9de7a8dc7b8d937cd902edd69a20bc897bf4ee034acb6a9400b88de82c58c2b144e62ec4ac7b75d8dc63cdf56670cacc9e SHA512 3e4d2d7ea4fbada45b4d933d7711266bcd9ffd217ee3c3e3351e9f66145785dc11449b4f09f5ffa4853d2b475db45e501848d259f80fb5aa26429acadcb6da7d
diff --git a/app-emacs/eldev/eldev-1.9.1.ebuild b/app-emacs/eldev/eldev-1.9.1.ebuild
index c7b3f8685f75..d7fd8d4962bb 100644
--- a/app-emacs/eldev/eldev-1.9.1.ebuild
+++ b/app-emacs/eldev/eldev-1.9.1.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/doublep/${PN}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~arm ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/jinx/Manifest b/app-emacs/jinx/Manifest
index e7aa8bc3361e..101fc3bc06b5 100644
--- a/app-emacs/jinx/Manifest
+++ b/app-emacs/jinx/Manifest
@@ -4,7 +4,7 @@ DIST jinx-1.4.tar.gz 34299 BLAKE2B c28a1535826a1b3a4541cae33ec5ac7badc4fec0188d5
 DIST jinx-1.5.tar.gz 34515 BLAKE2B fed6482001a879f50f9f8a093dc9e82443e0400b8e8c0c0b2fd4984cad4e48a4acd6d8a794a3ec71d3ee5d1c0dd851170dc5bec2a8e9ec9f0c7ddb6e25b5c732 SHA512 f19f7500e955b0ed584b2dc7e288911d59a584db596d55304c23d0ff28bceda6dad866b47891396fd342fe9f43d1adc8135611a67074f13638d58c28b545d3f8
 DIST jinx-1.6.tar.gz 34624 BLAKE2B 57917120dd6b10e30d989f056d3587452b2a2fe4db97df989de25c31ae7dd0e56ab2fd40cb92e570cd076209ab039ae0a8cc1ba7cb42210acbc4a1a07cef5f52 SHA512 b4e2b7ef03036e79c91e2a3d2c39ec6505ac9b6b2f7b32cfeee961448b4015de87c60adc9c14de3faccab14d7be75a77622fb0e21982a6e3fdcd58046c54d471
 EBUILD jinx-1.3.ebuild 925 BLAKE2B e1faeb92a90f8b5925e7018b7a28fba753bfe01f3ecdb0769784951645f87f54dbba2d9476a75e12053777134e95b5dfa6873883fd4ff88b812735dcdad54113 SHA512 5b6ccc6f825a354103fa6dae049c8209712b19582a23aa183e957991e3ac9bc2fff0f48879220ecdb81e4e96e8d59852c5ff992d3e87c6fc78dd6cafcf4d34e7
-EBUILD jinx-1.4.ebuild 926 BLAKE2B a64882d836ff6c3cc62dc9fd352a75799df9809b1b7286698b3bcb1abdca366f587c6ec6591c47bce738881f59f2bc909a760564fadfb86be52ecae489508f16 SHA512 4e9cb347df916168879998e0c1ac411c85e2fe29e58667eca4834d8c0f9e6ab22f96d8da260eb5352ae9e5edfbc5bd760383ae3b36d104b5107784d6a867cf70
+EBUILD jinx-1.4.ebuild 925 BLAKE2B e1faeb92a90f8b5925e7018b7a28fba753bfe01f3ecdb0769784951645f87f54dbba2d9476a75e12053777134e95b5dfa6873883fd4ff88b812735dcdad54113 SHA512 5b6ccc6f825a354103fa6dae049c8209712b19582a23aa183e957991e3ac9bc2fff0f48879220ecdb81e4e96e8d59852c5ff992d3e87c6fc78dd6cafcf4d34e7
 EBUILD jinx-1.5.ebuild 926 BLAKE2B a64882d836ff6c3cc62dc9fd352a75799df9809b1b7286698b3bcb1abdca366f587c6ec6591c47bce738881f59f2bc909a760564fadfb86be52ecae489508f16 SHA512 4e9cb347df916168879998e0c1ac411c85e2fe29e58667eca4834d8c0f9e6ab22f96d8da260eb5352ae9e5edfbc5bd760383ae3b36d104b5107784d6a867cf70
 EBUILD jinx-1.6.ebuild 926 BLAKE2B a64882d836ff6c3cc62dc9fd352a75799df9809b1b7286698b3bcb1abdca366f587c6ec6591c47bce738881f59f2bc909a760564fadfb86be52ecae489508f16 SHA512 4e9cb347df916168879998e0c1ac411c85e2fe29e58667eca4834d8c0f9e6ab22f96d8da260eb5352ae9e5edfbc5bd760383ae3b36d104b5107784d6a867cf70
 MISC metadata.xml 596 BLAKE2B 637e6f9f170f3ce64857712ff8156e123e42fa1e3495291ca05fc260f69ba267df6536c08b2a1ba042d8cc13f86f499d1e5f8dd223b89efd2c62ca38a9f37d2d SHA512 1fd1a6b8ba360f7aa2c03e8c318482b564afcf2392c20fe0c70d96b181df9323706c3b81bd3aa98916b65cff29aafcf9c9a486bfbbd55b775ff7adee85886950
diff --git a/app-emacs/jinx/jinx-1.4.ebuild b/app-emacs/jinx/jinx-1.4.ebuild
index fd1936d0c50c..55cad1b7e1c1 100644
--- a/app-emacs/jinx/jinx-1.4.ebuild
+++ b/app-emacs/jinx/jinx-1.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	app-text/enchant:2
diff --git a/app-emacs/muse/Manifest b/app-emacs/muse/Manifest
index e73a1a66a6d1..8f3892cf767d 100644
--- a/app-emacs/muse/Manifest
+++ b/app-emacs/muse/Manifest
@@ -2,5 +2,5 @@ AUX 50muse-gentoo.el 64 BLAKE2B 1af4c3cb29edfe7f0263b2eefb1483c2f680a4199c1ec27a
 DIST muse-3.20.2.tar.xz 143820 BLAKE2B 2e33ba2b0ab10bb390a640b1f8370a3689b6ed67e249dd966b606fc1f33ad2538f09bac2b2f8082c68c8d0133c7daccee665ca4e335976aeb1e069a827577c37 SHA512 d0fc59839ac2c907a3ea5814ae4d2d141bedde9ebadab36966bc4dee94b5532a98781a2af51d9aa3498634ac6036c2fc3eac76c5e908b3f9e93b2c0498d1b915
 DIST muse-3.20.tar.gz 407054 BLAKE2B ff2babe2caf109c9de7504c4f82e04a7769b5e708455439e59faf96fa939423d6439e34f912cd79df420ec8498f7e91e5faa2e7410d4df236207fded66eff532 SHA512 864eca508d34f4c329ffd31cd3c169b67dff6d19c6695a85d8190511fa05d85f4a68f12e58c1679f91940ebcd823766e9f60309f2bfba17c985f811a3f342dda
 EBUILD muse-3.20-r2.ebuild 764 BLAKE2B ee13cdcd30cb0dded88009798238854c02d9e29d2b2054de091f7f748ad35ae9c4d5ae7755699125f3070fe2d3265782b45daedde8aca5781cd77736c4325646 SHA512 719d062e4b7fa10779454d56032be5a03681815dbb4807d39e127e067da7cc612e5aa583845be1b2613f2c494cab1fa2a1cd8811aac56ec3e688002f51637d69
-EBUILD muse-3.20.2.ebuild 534 BLAKE2B 76199772daca3d398202522dc5fdfea6fa3c35f81bd3dc81c7bc8cb08c1dadc219ba10002c306a229ec119ae5d9974f98cf3d91c2dee9addeb96b525cb9a1882 SHA512 2389a4a5f1f5b9a6c5c555e12c19bfab605c14b6b56539126a723fbafdc5bb7c8bc1a0084229c546dee14eb607d6868ba8b05f4245cbd79c83c252cd0dcfb1f4
+EBUILD muse-3.20.2.ebuild 531 BLAKE2B 747cd3e84b411a0c7b783158f6ca88150af6b561b56ab480aab562bda97eb15a08c3074978f71024d581eb983d3c68c0a48a8f4d4dc9f0f43dd81681e5d5eb26 SHA512 f7cd148df46a440b2e166bf0a1d71e68209915f4ee023c39fd141794d2d5b9caa5d8f77cff2b59590cd0781ea72546ecbdd44f6dc7af8f1c92de9bdb79a0cff4
 MISC metadata.xml 1649 BLAKE2B 52d61da3a0ca81428b9aeba81c574a86832ff807f0a21b583150b7f455f3807748bdcb17806fbf6d06d6fa5d3fbd70d79c9f1af128691b456cf32d5d6f65089a SHA512 fbc0716855cc4915a2f774eb684cc5fbd035e49f0fadf7bae2dc2a4dd9f60fb824b9c0fcb4e02b84bdbea04bee5a9887695310d7b4a177eae03686deae1255f4
diff --git a/app-emacs/muse/muse-3.20.2.ebuild b/app-emacs/muse/muse-3.20.2.ebuild
index 89091bbc5d7e..75a603c12fbd 100644
--- a/app-emacs/muse/muse-3.20.2.ebuild
+++ b/app-emacs/muse/muse-3.20.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~xgqt/distfiles/repackaged/${P}.tar.xz"
 
 LICENSE="GPL-3+ FDL-1.2+ GPL-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
 	app-emacs/htmlize
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 82d8e05479e4..0e5c676c6eac 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 695a616f4110..8623dccc4370 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -2,8 +2,10 @@ DIST VBoxGuestAdditions_6.1.48.iso 63969280 BLAKE2B 7bba272d427a6a91cd4d63c5d494
 DIST VBoxGuestAdditions_6.1.50.iso 64051200 BLAKE2B 9eff4a3643579ee0426dbe2b62247b8c89321be495e61469628574445fedc06ff2fb9afa108705cbaf24a13db99b4e6e850c61e5c97343095549f444831fcf62 SHA512 d74ce912dbbcef7f644a9f3ba9917782336cbee8e0756727a8753ffc17486a75e833adaa869e205531bc3b81b9cb26aa9b50f44210e78dceece966687122f6c6
 DIST VBoxGuestAdditions_7.0.12.iso 53448704 BLAKE2B 1b738c648c902c1a98d83dc9525c7e091cd2234aa67f464a4beb3d6bd9bbb6893fe02eee4a37a05eae8e880efc6c834931a7ec7f08ae7b1615b1a622117767a2 SHA512 7f5db8f73bc2c89ad798fd2ec3543c460aa3fd3e44f02c04c334539172699af08c16312d96b6fdd5c561bc3d8133fc7a3662e51a86f82980d692f050286e0e7e
 DIST VBoxGuestAdditions_7.0.14.iso 53526528 BLAKE2B 2ec95d9261d3a7f762f333c1e3eb36f7b75cfd7cf722d1bdcd5c0b38a3a311db82b728fe800aed79b41b979ec345cd2586e3fd8c2d2c54f8b83516061d81d304 SHA512 5aa80b04c567d383793c560eb535babd1ebc4f472aaa51753867dbee00e1f5a3efeb5dd4c9eb1a48149ff0fa2e7598aa68792d3da9959709b619d234c2b57544
+DIST VBoxGuestAdditions_7.0.16.iso 53528576 BLAKE2B a57b056f540e949574f78cee476240b9bab8a151a32f90412d9dd8acfaa40407c45bee037eb14192a0304a30ff0938625df586c48be9997cf545809cb30fa300 SHA512 12aead8c363d7ca33c3cc52d84ee86cfbd2db98ab84942d24fd5aa841dd2aaa0fb3075aa9b7188db3df1cac11de475c4e56d270ea9dc9f6663c9e9e7236bf9fe
 EBUILD virtualbox-additions-6.1.48.ebuild 567 BLAKE2B cfacfeed3e15bb0407abaf7b9584d37054ed47cff35bdc80b71f9a97af7a49534ec4ade228ea39e3801f94a25fe6fd872c698d811f14f7ae744e816a0ead9061 SHA512 1fd1aa81f3ff55ca2d71ca5384fdb2bf46c9cdf5bce89917089743a86b92caaf06ffc1e1cf844a10bd2259ebfb59417850eeabd75653cd613c3f64f85ce30c70
 EBUILD virtualbox-additions-6.1.50.ebuild 568 BLAKE2B e32d46e8fb724eb80708b33e06cb656d2f028487bee20864a803332bb3127d10f84481868db6039a42d93bd137af74bd5fc0bc8e499958b5d4a9cb7d3189d549 SHA512 eb8c748bfab69483f2bde7e3a13649c1109b6bf558ac78bd49fb02d45f9633489a8dff93dab2ed52f8b648a3e38b58db5e6cbe139f220ac9253395138d65a40e
 EBUILD virtualbox-additions-7.0.12.ebuild 555 BLAKE2B 2b0398d65ffbc61bb3a6f5833ae5f5fc3bf4582df3caa78007b3da03d840cd2e455cd5bbbe81cbe6b0652613dd7d75acb7d0e0e04312b419717ac7c473ae6163 SHA512 7f10e29a7ee72d988c92228b64a769e00ef42292b26ce61e62182af93938f63489615009f8224b4fef8bd927ee6d24c6301496be50cc3efaa817423b4ac54e84
 EBUILD virtualbox-additions-7.0.14.ebuild 556 BLAKE2B 73f1560fb266d485e972ddc631bdae9aa25b7153ebfe43a242ed2391fe00782fd63ba91559f3f484da3c75c746128b2248dc57a00fee90d6704faed507d6e90f SHA512 50ef140eaf64677cac9c29ffd51cb48cbbfcb22e5c6bcc0ff2a87fb16621d53accab5aa805b85be62e3d0da3ff6f5b5e05d299621ac57b5914ab31042dfbb67f
+EBUILD virtualbox-additions-7.0.16.ebuild 556 BLAKE2B 73f1560fb266d485e972ddc631bdae9aa25b7153ebfe43a242ed2391fe00782fd63ba91559f3f484da3c75c746128b2248dc57a00fee90d6704faed507d6e90f SHA512 50ef140eaf64677cac9c29ffd51cb48cbbfcb22e5c6bcc0ff2a87fb16621d53accab5aa805b85be62e3d0da3ff6f5b5e05d299621ac57b5914ab31042dfbb67f
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-7.0.16.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-7.0.16.ebuild
new file mode 100644
index 000000000000..92124a9f779e
--- /dev/null
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-7.0.16.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=VBoxGuestAdditions
+MY_P=${MY_PN}_${PV}
+
+DESCRIPTION="CD image containing guest additions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"
+S="${WORKDIR}"
+
+LICENSE="GPL-3 || ( GPL-3 CDDL )"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+src_unpack() {
+	return 0
+}
+
+src_install() {
+	insinto /usr/share/${PN/-additions}
+	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
+}
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 1352257bfd45..770dff1efb04 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -2,8 +2,10 @@ DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.48.tar.gz 11166368 BLAKE2B 5c1ced17
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.50.tar.gz 11175855 BLAKE2B 898ef92a91dbfb39079f8dfa5f4c1e6d91df66e92deb00849ba1da8a2278e3adcfd5754bf70acc6d8b6d7d6273923999860b71c01de3eaabf4d487d718aa14ef SHA512 818f0564a8ee1266f2d03d6e0d5df44278746067ae86279f6e884f519ad3e923382c7b987b3a58fe95e2aa4f0a53b98d553106b0250923e88989e5fdaa9dc3ae
 DIST Oracle_VM_VirtualBox_Extension_Pack-7.0.12.tar.gz 18245684 BLAKE2B 6a55307034da5510d47bbf57bf557308be5c0459bbb21d0c79cc769a0f1ebae1e26c3202e23da17cd900b0ca88dbc653d2be0297817b79b61f426c6c5880c43a SHA512 0d311ed94a52d02634050f309886d6c5b627151b7e85a50e81a602c02c9400f01c1dfc21a7f52f33e50c2e27df96213f5b97cb3edc82f784ef171796c3ae6d56
 DIST Oracle_VM_VirtualBox_Extension_Pack-7.0.14.tar.gz 18331089 BLAKE2B 278341be074c7bb276b90034355da3a55e2ef5efd89ad9a26a8f53b6743890772e1486ed5552ec131a8c80a710405dac284789d71a6c3bbec2dd79cf0e7e0459 SHA512 9301300dd1c2a178c730045128574b99a4a6cd1c2dd3f6a5782a78fa08588a4c5fd9c9ff6b2dbeba04747de915e3342ebbd08a4b9ed4641ff60f90f6a5c7fc3d
+DIST Oracle_VM_VirtualBox_Extension_Pack-7.0.16.tar.gz 18331063 BLAKE2B efacd03316b4a71e98fe41509851fe00227d6a935dbf5f8834e6aa32d5b0added25bc9282fdeff9f046ffba7775dc49d8ebc3fef497f88dc6cdbcc720f92c077 SHA512 50ca8f0961fcb7a7db1864faad99b9e0b00e06f9f7e1e377897d92353029e3d7d4a9acf07a2f7abd304fed1fa38e2acdad67b4ca73d645196feddf81c54366eb
 EBUILD virtualbox-extpack-oracle-6.1.48.ebuild 742 BLAKE2B 687dfef72959968f610b73f55ad028e00e59fd9bf4ff7d9d60b77e704bf61395ff1680958455619c5afd2867be365e161e5845b03a53902a7a14f88b7887815a SHA512 00fd45d6068420328b559d7ab7ca491b8dde2b8b96e5bd8a7e46108cf980e38c660425020de6a58501d6b119443f80cbd64fc52ed223f5c9f3ecf8834cf52d02
 EBUILD virtualbox-extpack-oracle-6.1.50.ebuild 743 BLAKE2B 420c1b62cae1a98496881015f02a3642cf94a078c78b71f394747739fb332ed68fd8622e2f65ce97bf4a17338df6d6f1dd8d638a566310fec92e6d3943eaaffd SHA512 b557a8d29c53e23f5529ea5a6ae4ca50cc30b66d8d2528381845cc7b7adba4c95243cdcf9d4bda8d900f826358729b320faa857661325dd68741bba0d4d3d764
 EBUILD virtualbox-extpack-oracle-7.0.12.ebuild 742 BLAKE2B e9002db38c5157dbfdac2633b27e61a710db0962adf694a21c7daff940a16049e79dfdbb626d65265578079553e844e9c00e63d5f8f84185faa996011866c53e SHA512 2b74eaca4575f8ae76e29b51a1dbae113d61e3f8f4d91d49160638cc34798283213e089c3ddc6472fc8cd26ac54cf43268a574612ea6491ac66a3ce4d5de420a
 EBUILD virtualbox-extpack-oracle-7.0.14-r1.ebuild 798 BLAKE2B 44a1206f56d92807da770168cd25cb915a9afa2dd5d771835bcbe63d9244685b2f660a7e1f77b4e24ba4ee35b7c012eecdf2fc3f67b5915e994a8cb34bcce957 SHA512 0f62e25ac4aaa983706863ba84f831fdc41238373df0c8c18bf7071d7646b2ed8cb431367831326a43a7f393b6e29fa20c2711767067ee8e1227dea32020faa0
+EBUILD virtualbox-extpack-oracle-7.0.16.ebuild 798 BLAKE2B 44a1206f56d92807da770168cd25cb915a9afa2dd5d771835bcbe63d9244685b2f660a7e1f77b4e24ba4ee35b7c012eecdf2fc3f67b5915e994a8cb34bcce957 SHA512 0f62e25ac4aaa983706863ba84f831fdc41238373df0c8c18bf7071d7646b2ed8cb431367831326a43a7f393b6e29fa20c2711767067ee8e1227dea32020faa0
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.16.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.16.ebuild
new file mode 100644
index 000000000000..8c44669215ab
--- /dev/null
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.16.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="$(ver_cut 1-3)"
+MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="PUEL extensions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
+S="${WORKDIR}"
+
+LICENSE="PUEL-11"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	|| (
+		=app-emulation/virtualbox-${MY_PV}*
+		=app-emulation/virtualbox-kvm-${MY_PV}*
+	)
+"
+
+QA_PREBUILT="usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/*"
+
+src_install() {
+	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+}
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 9bc17de69261..b4fac20224c7 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -10,8 +10,10 @@ DIST VirtualBox-6.1.48.tar.bz2 165960987 BLAKE2B c981e390ae518b829970827f6032fb1
 DIST VirtualBox-6.1.50.tar.bz2 165959648 BLAKE2B e244c4fa2ffe86216664104473e27e8ddbad86aae3bc26612d18204a4e67cece91d1fa3aa9e70f1c39f915bf5e4a1e6a14bbb19162c3ae2ff554373df95bce51 SHA512 ee2ec352e020f07262bf2120278d0d9807c501cd7c4d621d4e12ce18a821b134d48eb852bc7136008cfa77ed709703d3c2835b7a7177c325d989e8f433aff73f
 DIST VirtualBox-7.0.12.tar.bz2 175644088 BLAKE2B 507cbf7b1a8a807bd2602e74bc19a59cb177b9b2bdefa1be582e520666360a42510ca501f20c354746a0f1dadf61fe29135e3edc867e611bfe60a9405cb2bbce SHA512 9fe4511442eba788d02f932f5e98cfcc5aa4ebed41c00bd7333cf7e3f5de787e458f1f56930978283f041f403652c803143335fe9120ab63a2c113ca7b3f588f
 DIST VirtualBox-7.0.14.tar.bz2 175654864 BLAKE2B 99f4942b864ce481d69983af31393d763452c5b55697ab642b43c155f5fbc2a9963fbe1b7744baef620d0b351e1ac73c1ef978698b9a7e77897bb9cbc18dc17c SHA512 6a82933bbf51ff255d17cb61ae6ddfb791a2200e3dff705f181cd06c6031b48cf15faa5e8202a65daef0fb20b7fd9e33d40dbd0f9cc3f49af49fff04a1cb0a73
+DIST VirtualBox-7.0.16.tar.bz2 170897951 BLAKE2B 6b436c38df632222621723db94677a0efef5de2ac1eacec73571bc658955f23fff347fa60c37ec78c58bf94b82b8f9a95fb26c07ef4becc7e9f535af069151f5 SHA512 1b8ba08bec144cbd1f2e9aa0929cdf60a0b99930f1dd80567094fba75097d87661aef3da2cc24f4abff6b6db8f186e251c5f693a2a93943cc39909d5f1e1bce5
 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
 DIST virtualbox-patches-7.0.14.tar.bz2 6937 BLAKE2B da5f18efbba2a8f4701b3d29dc00784e4e80e18a18b029e5dce8c142eb4dc97637069bfc5081422064a7dc59dfacf503ebbdc3421caa96430dc53fa72988aa20 SHA512 57cc34b92e4626de5c445e34ae025da7ec0d752a60618c619a55c28bf7d6b1cc9dc81ea059b949b0f3e625568207e8084f9462faf487ca0daf2794e7f1feac36
+DIST virtualbox-patches-7.0.16.tar.bz2 6808 BLAKE2B d15fa2ca306375142c3e25d4759d2790b2bb9eb69e333a8773ad500b29dd127b401943abf59ca59d01858a3ed5551fb3a6c93c4c893c8de971a714ce5306d577 SHA512 a488cbc6660fe8637c44cd79d87156609af089988239a7e76fea8a3c7e6319512c574bef2e942b354b14ce671a8e75ab8b2160abf7c40963795ee8a545ecd992
 DIST virtualbox-patches-7.0.8.tar.bz2 2733 BLAKE2B 044dfe02a5bd5e757091318b394b0e5918677b5bbce9caef4a18d4d8df54821559f0df6ffbdd6f52d4934bc4018e9c9d908571c5d3d8804fd3b0f22a7a1aed84 SHA512 93a06aa3f9508d3a8743ca8494a958159b5bc3fd7a0a08ff23414d05c4f31084cf0f1c82a3866e222c83e6996ba004546f0bd33c6eb9a90eec8e548b8b3f2fbf
 EBUILD virtualbox-guest-additions-6.1.48.ebuild 7515 BLAKE2B c431547ddba5da48b1adf38c5586b0716f35bcef669584928e5d8e0611b47afedbf7e928f173d69b40891bd992e394630386587fcf05504bbc03d14251f42b75 SHA512 9c345dff47ab1aecede001e780f61cd51dbd0b4edd6a67491d410d964a387defdb282e13feaf14336291b58c9fb23532c5a438ffa26af7b60d63f75cbb931343
 EBUILD virtualbox-guest-additions-6.1.50-r1.ebuild 7489 BLAKE2B 777c460693bb72400c5b287cee323b572fa4d0bbf758346e1059c7db0cd73f1520893e79df1698095fd05d662947630bda85266eef38b0f4e0f1eefafdb4305a SHA512 f7acd23993f08d31ff55d927d5a1576247e6894d517827f0b24cfee38cfc7d62c27fa8b18ca251a859656247e2dc2d595a2405747443f0ec45b25f9631705d49
@@ -20,4 +22,5 @@ EBUILD virtualbox-guest-additions-7.0.12.ebuild 7838 BLAKE2B 20770a15705f5baace0
 EBUILD virtualbox-guest-additions-7.0.14-r1.ebuild 7842 BLAKE2B 7fd2e35869c242f27921421c9fd64ca06b8e8b25a42493d4198001461e9361ca7ce26aeb470acde0370c20437bce2a8c2f66f450774b202d38ad68ee0c505f74 SHA512 05650c3a2c3da915d9750085f9da62b7eade125cb26e1854a79ecb4fef18647111c06c429b125b2065dae5aaf09cf11d93072f5d30e7c8c03d2da0e3a84887d7
 EBUILD virtualbox-guest-additions-7.0.14-r2.ebuild 7866 BLAKE2B 04d6051b866043522464dcae776474e5776709169745c7a283b7dc3f309ed2f5fddd97680a5b7527427d722c7615f889538cfd95b0fc9ea97657095654692772 SHA512 c4356da414c11158bcae40e46e04cd62afeb6b474cbd1261f45cef8275a658368e51f09d380c72140f0a0c67a1b014b7eebb2500b6781831d4dfba6d605e6753
 EBUILD virtualbox-guest-additions-7.0.14-r3.ebuild 7808 BLAKE2B f93356b04394c3eaa560afced18de849a99006b3d913f6aecbce9cd4f4dbfeac359133c73fe71a2515759176e99c4adf3336769fcbdda75bb0e8bfed936425b4 SHA512 65f6933ff83baaf62b979e685631dbc0b80663fadc39915df41663bd1f647ccf922dfabcd2d850c664b28244a1b2c4318e95a833b24e02e02c5f1ae318b8de74
+EBUILD virtualbox-guest-additions-7.0.16.ebuild 7682 BLAKE2B 971eb95142c82b6f5e099d9dc09ca6b0fae788d008cdbb0b65bbe4f77d9f023febc302ffe1b5ff75d8bbcb66f715d930514688598bc9eb2e58c7381f5f7ac3a0 SHA512 b14ee1d6113c65100e37d508b1e109a14ffbd1d779c22b8aae916d59903f2b3a8494cc967bfe533d32b5504f7a42851abb9e0d6de918341fc1a55597ff0b004f
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.16.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.16.ebuild
new file mode 100644
index 000000000000..f704b0857188
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.16.ebuild
@@ -0,0 +1,290 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo linux-mod-r1 readme.gentoo-r1 systemd toolchain-funcs udev
+
+MY_PN="VirtualBox"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2
+	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.16.tar.bz2"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# Reminder: see the LICENSE related comment in app-emulation/virtualbox-additions ebuild
+LICENSE="GPL-3 LGPL-2.1+ MIT || ( GPL-3 CDDL )"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dbus gui"
+
+# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
+# TODO: find out what this is, remove comment if obsolete
+
+RDEPEND="
+	acct-group/vboxguest
+	acct-group/vboxsf
+	acct-user/vboxguest
+	sys-libs/pam
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	gui? (
+		x11-apps/xrandr
+		x11-apps/xrefresh
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+	)
+"
+# some libs here are indirect dependencies, and also needed at compile time.
+# keeping them in DEPEND to avoid warnings from qa-vdb.
+DEPEND="
+	${RDEPEND}
+	gui? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	>=dev-lang/yasm-0.6.2
+	>=dev-build/kbuild-0.1.9998.3127
+	sys-devel/bin86
+	sys-power/iasl
+"
+
+DOCS=()	# Don't install the default README file during einstalldocs
+
+VBOX_MOD_SRC_DIR="out/linux.${ARCH}/release/bin/additions/src"
+CONFIG_CHECK="~DRM_TTM ~DRM_VMWGFX"
+WARNING_DRM_TTM="DRM_TTM is needed for running the vboxvideo driver."
+WARNING_DRM_VMWGFX="DRM_VMWGFX is the recommended driver for VMSVGA."
+
+DOC_CONTENTS="\n
+Please add users to the \"vboxguest\" group so they can\n
+benefit from seamless mode, auto-resize and clipboard.\n
+\n
+The vboxsf group has been added to make automount services work.\n
+These services are part of the shared folders support.\n
+\n
+Please add:\n
+	/etc/init.d/virtualbox-guest-additions\n
+to the default runlevel in order to start\n
+needed services.\n
+\n
+An autostart .desktop file has been installed to start\n
+VBoxClient in desktop sessions.\n
+\n
+You can mount shared folders with:\n
+	mount -t vboxsf <shared_folder_name> <mount_point>\n
+\n
+Warning:\n
+	this ebuild is only needed if you are running gentoo\n
+	inside a VirtualBox Virtual Machine, you don't need\n
+	it to run VirtualBox itself.\n
+\n"
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Provide kernel sources
+	pushd src/VBox/Additions &>/dev/null || die
+	ebegin "Extracting guest kernel module sources"
+	kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null
+	eend $? || die
+	popd &>/dev/null || die
+
+	# PaX fixes (see bug #298988)
+	eapply -d "${VBOX_MOD_SRC_DIR}" -- "${FILESDIR}"/vboxguest-6.1.36-log-use-c99.patch
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
+	if ! use gui; then
+		echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk || die
+	fi
+
+	# Remove pointless GCC version check
+	sed -e '/ check_gcc$/d' -i configure || die
+
+	# Respect LDFLAGS (bug #759100)
+	sed -i -e '/TEMPLATE_VBoxR3Exe_LDFLAGS.linux[    ]*=/ s/$/ $(CCLDFLAGS)/' Config.kmk || die
+
+	eapply "${WORKDIR}/virtualbox-patches-7.0.16/patches"
+	eapply_user
+}
+
+src_configure() {
+	tc-export AR CC CXX LD RANLIB
+
+	# Build the user-space tools, warnings are harmless
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		$(usev !dbus --disable-dbus)
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+
+	# bug #843437
+	# Respect LDFLAGS (bug #759100)
+	# Cannot use LDFLAGS here because they also get passed to $(LD)
+	cat >> LocalConfig.kmk <<-EOF || die
+		CFLAGS=${CFLAGS}
+		CXXFLAGS=${CXXFLAGS}
+		CCLDFLAGS=${LDFLAGS}
+	EOF
+
+	edo ./configure "${myconf[@]}"
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+
+	local myemakeargs=(
+		VBOX_BUILD_PUBLISHER=_Gentoo
+		VBOX_ONLY_ADDITIONS=1
+
+		KBUILD_VERBOSE=2
+
+		AS="$(tc-getCC)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		LD="$(tc-getCC)"
+
+		TOOL_GCC3_CC="$(tc-getCC)"
+		TOOL_GCC3_CXX="$(tc-getCXX)"
+		TOOL_GCC3_LD="$(tc-getCC)"
+		TOOL_GCC3_AS="$(tc-getCC)"
+		TOOL_GCC3_AR="$(tc-getAR)"
+		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
+		#TOOL_GCC3_LD_SYSMOD="$(tc-getCC)"
+
+		TOOL_GXX3_CC="$(tc-getCC)"
+		TOOL_GXX3_CXX="$(tc-getCXX)"
+		TOOL_GXX3_LD="$(tc-getCXX)"
+		TOOL_GXX3_AS="$(tc-getCXX)"
+		TOOL_GXX3_AR="$(tc-getAR)"
+		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
+		#TOOL_GXX3_LD_SYSMOD="$(tc-getCXX)"
+
+		TOOL_GCC3_CFLAGS="${CFLAGS}"
+		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
+		VBOX_GCC_OPT="${CXXFLAGS}"
+		VBOX_NM="$(tc-getNM)"
+		TOOL_YASM_AS=yasm
+	)
+
+	MAKE="kmk" emake "${myemakeargs[@]}"
+
+	# Now creating the kernel modules. We must do this _after_
+	# we compiled the user-space tools as we need two of the
+	# automatically generated header files. (>=3.2.0)
+	# Move this here for bug 836037
+	local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" )
+	local modlist=( vboxguest vboxsf )
+	use gui && modlist+=( vboxvideo )
+	modlist=( "${modlist[@]/%/=misc:${VBOX_MOD_SRC_DIR}}" )
+	linux-mod-r1_src_compile
+}
+
+src_install() {
+	linux-mod-r1_src_install
+
+	insinto /etc/modprobe.d # 485996
+	newins - vboxsf.conf <<-EOF
+		# modprobe.d configuration file for VBOXSF
+
+		# Internal Aliases - Do not edit
+		# ------------------------------
+		alias fs-vboxsf vboxsf
+	EOF
+
+	cd out/linux.${ARCH}/release/bin/additions || die
+
+	insinto /sbin
+	newins mount.vboxsf mount.vboxsf
+	fperms 4755 /sbin/mount.vboxsf
+
+	if use dbus; then
+		newinitd "${FILESDIR}"/${PN}-8.initd-r1 ${PN}
+	else
+		newinitd <(sed 's/ dbus\>//' "${FILESDIR}"/${PN}-8.initd-r1) ${PN}
+	fi
+
+	insinto /usr/sbin/
+	newins VBoxService vboxguest-service
+	fperms 0755 /usr/sbin/vboxguest-service
+
+	insinto /usr/bin
+	doins VBoxControl
+	fperms 0755 /usr/bin/VBoxControl
+
+	# VBoxClient user service and xrandr wrapper
+	if use gui ; then
+		doins VBoxClient
+		fperms 0755 /usr/bin/VBoxClient
+		doins VBoxDRMClient
+		fperms 4755 /usr/bin/VBoxDRMClient
+
+		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null || die
+		newins 98vboxadd-xclient VBoxClient-all
+		fperms 0755 /usr/bin/VBoxClient-all
+		popd &>/dev/null || die
+	fi
+
+	# udev rule for vboxdrv
+	local udev_rules_dir="/lib/udev/rules.d"
+	dodir ${udev_rules_dir}
+	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+
+	# VBoxClient autostart file
+	insinto /etc/xdg/autostart
+	doins "${FILESDIR}"/vboxclient.desktop
+
+	# sample xorg.conf
+	dodoc "${FILESDIR}"/xorg.conf.vbox
+	docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	linux-mod-r1_pkg_postinst
+	udev_reload
+
+	if ! use gui ; then
+		elog "The use flag \"gui\" is off, enable it to install the"
+		elog "X Window System drivers and integration."
+	fi
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-emulation/virtualbox-kvm/Manifest b/app-emulation/virtualbox-kvm/Manifest
index ed7d6d02f061..6978ee1fb508 100644
--- a/app-emulation/virtualbox-kvm/Manifest
+++ b/app-emulation/virtualbox-kvm/Manifest
@@ -8,9 +8,14 @@ AUX virtualbox-7.0.8-disable-rebuild-iPxeBiosBin.patch 843 BLAKE2B bd7fef7afc725
 AUX virtualbox-ose-6-wrapper 3578 BLAKE2B c150e578212435268de3c5fb0eea701bc843ec2241dc3839d3d1e33604fc01f6bdff6ed0425ba6917072f652b8c29d0df9a550a92900ca13306fcd36521afbee SHA512 315d981f3e92f2e0134946f6bbb8ad4ea4228afb8f73aaed7feead59b3f55cef01cec4285a7fdaf30ce0931d8b69bda4698baebd63d11f2cd9dfe9d0591a0f40
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
 DIST VirtualBox-7.0.14.tar.bz2 175654864 BLAKE2B 99f4942b864ce481d69983af31393d763452c5b55697ab642b43c155f5fbc2a9963fbe1b7744baef620d0b351e1ac73c1ef978698b9a7e77897bb9cbc18dc17c SHA512 6a82933bbf51ff255d17cb61ae6ddfb791a2200e3dff705f181cd06c6031b48cf15faa5e8202a65daef0fb20b7fd9e33d40dbd0f9cc3f49af49fff04a1cb0a73
+DIST VirtualBox-7.0.16.tar.bz2 170897951 BLAKE2B 6b436c38df632222621723db94677a0efef5de2ac1eacec73571bc658955f23fff347fa60c37ec78c58bf94b82b8f9a95fb26c07ef4becc7e9f535af069151f5 SHA512 1b8ba08bec144cbd1f2e9aa0929cdf60a0b99930f1dd80567094fba75097d87661aef3da2cc24f4abff6b6db8f186e251c5f693a2a93943cc39909d5f1e1bce5
 DIST virtualbox-help-7.0.14.tar.xz 3944832 BLAKE2B 95079e4da8c960c41cee799142779a6c2587e0e8af7956ca551cb5a4c0f36f313189dfe08afba83a0c32886866a7f9903b5e370008d6b3ce6283fb2288866b06 SHA512 e2f1acdd7577a93047e220300b1996d2855ddef20053c01294f8295fde0840645c41b75632d71dd2fc276219084fe4105fd057623f39375542358796425a2d03
+DIST virtualbox-help-7.0.16.tar.xz 3948696 BLAKE2B 5c5937313ea0e5cb4764b8a61fd1587e88a4afc965ef00862c5a265a15253929d35e0635231b6be5656f26f600bc4b70a2fa2ebc0f33b35d35c184b57e5acef8 SHA512 b9baca57118a82e3489c8445f0988671f16f75de60cc2d929d5e3b0c4c9e3ceacd796a72a81bba88d69eb4b4559835a13775c18d7782ae7dbe8ad202e247db0c
 DIST virtualbox-kvm-7.0.14_pre20240325.tar.gz 134926 BLAKE2B 3e707b272219b2c5703d91d1f6a2f0a6c54fe29eeb6e91e5830949f7260e5b409e3425c38daea568725cb7fd10ddee234af6b72d747206e0a98ac1e33a10028c SHA512 e30291e1d7e2649057a9b38ea907f22f62b0367f33d88af10fdaaa49333890be2b719626103f9800836a3833368a018f5fc63a46577dd1d83178d7406bf8c494
+DIST virtualbox-kvm-7.0.16_pre20240325.tar.gz 134926 BLAKE2B 3e707b272219b2c5703d91d1f6a2f0a6c54fe29eeb6e91e5830949f7260e5b409e3425c38daea568725cb7fd10ddee234af6b72d747206e0a98ac1e33a10028c SHA512 e30291e1d7e2649057a9b38ea907f22f62b0367f33d88af10fdaaa49333890be2b719626103f9800836a3833368a018f5fc63a46577dd1d83178d7406bf8c494
 DIST virtualbox-patches-7.0.14.tar.bz2 6937 BLAKE2B da5f18efbba2a8f4701b3d29dc00784e4e80e18a18b029e5dce8c142eb4dc97637069bfc5081422064a7dc59dfacf503ebbdc3421caa96430dc53fa72988aa20 SHA512 57cc34b92e4626de5c445e34ae025da7ec0d752a60618c619a55c28bf7d6b1cc9dc81ea059b949b0f3e625568207e8084f9462faf487ca0daf2794e7f1feac36
+DIST virtualbox-patches-7.0.16.tar.bz2 6808 BLAKE2B d15fa2ca306375142c3e25d4759d2790b2bb9eb69e333a8773ad500b29dd127b401943abf59ca59d01858a3ed5551fb3a6c93c4c893c8de971a714ce5306d577 SHA512 a488cbc6660fe8637c44cd79d87156609af089988239a7e76fea8a3c7e6319512c574bef2e942b354b14ce671a8e75ab8b2160abf7c40963795ee8a545ecd992
 EBUILD virtualbox-kvm-7.0.14_pre20240325.ebuild 21690 BLAKE2B 379b33503a4b372f95419b7e674b7a1dc229efab4761e83fe1b0cb01b3d7e11e1713e7cd646c2e825b72ce8297c28fea707e6917b3a438ad0c639ec277b653b2 SHA512 4c54f1b8a8429a1d44a395c3ff910da39033252bf05691fddd13695cfdc534456f182f91a5117414845de53f95b7542c4b3b1df0b2420729b6e6e55c6b42d02b
-EBUILD virtualbox-kvm-9999.ebuild 21690 BLAKE2B 379b33503a4b372f95419b7e674b7a1dc229efab4761e83fe1b0cb01b3d7e11e1713e7cd646c2e825b72ce8297c28fea707e6917b3a438ad0c639ec277b653b2 SHA512 4c54f1b8a8429a1d44a395c3ff910da39033252bf05691fddd13695cfdc534456f182f91a5117414845de53f95b7542c4b3b1df0b2420729b6e6e55c6b42d02b
+EBUILD virtualbox-kvm-7.0.16_pre20240325.ebuild 21690 BLAKE2B cffc5291611fb24a82de0b9eeae15b5a762123595518821be8d8cf2566821668cbad2f14e8c04ed93f06f448e00ae96477b1f62715bfc54917f2315debbdd683 SHA512 aac9d44496e4f63c14a0110f58e46b5a2536f6fee3b71f0b8c541eb0db49a1321660075b82e6efc56a40677837525719a23ba3831b88fe06da3ec6db800b01fb
+EBUILD virtualbox-kvm-9999.ebuild 21690 BLAKE2B cffc5291611fb24a82de0b9eeae15b5a762123595518821be8d8cf2566821668cbad2f14e8c04ed93f06f448e00ae96477b1f62715bfc54917f2315debbdd683 SHA512 aac9d44496e4f63c14a0110f58e46b5a2536f6fee3b71f0b8c541eb0db49a1321660075b82e6efc56a40677837525719a23ba3831b88fe06da3ec6db800b01fb
 MISC metadata.xml 825 BLAKE2B 380d7acae6669eb133e4e430cc4df85e9ee43798e836c60b26a7b06a0e550f01f007bbab93d7ce0d5eb53e4b32c3d0c30fb9d0593513c30111dd23686d58fa84 SHA512 01b64b0a2dd969d19014db69d0b58c019c6aeca6b8fac60d7591ddd817fe0a75d64e6f84b8c08c5de2f8de75b8750a5803246c48d407f91c4c69433264b5bda1
diff --git a/app-emulation/virtualbox-kvm/virtualbox-kvm-7.0.16_pre20240325.ebuild b/app-emulation/virtualbox-kvm/virtualbox-kvm-7.0.16_pre20240325.ebuild
new file mode 100644
index 000000000000..f501f05d7084
--- /dev/null
+++ b/app-emulation/virtualbox-kvm/virtualbox-kvm-7.0.16_pre20240325.ebuild
@@ -0,0 +1,768 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# To add a new Python here:
+# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic)
+#    Do NOT skip this part. It'll end up silently not-building the Python extension
+#    or otherwise misbehaving if you do.
+#
+# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python.
+#
+#  May need to look at other distros (e.g. Arch Linux) to find patches for newer
+#  Python versions as upstream tends to lag. Upstream may have patches on their
+#  trunk branch but not release branch.
+#
+#  See bug #785835, bug #856121.
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils \
+	python-single-r1 tmpfiles toolchain-funcs udev xdg
+
+PATCHES_PV="7.0.16"
+ORIGIN_PN="VirtualBox"
+ORIGIN_PV=${PATCHES_PV}
+
+MY_PN=virtualbox
+MY_PV=${PV#*_pre}
+
+PATCHES_DIR="${WORKDIR}"/${PN}-${MY_PV}
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/ https://github.com/cyberus-technology/virtualbox-kvm"
+SRC_URI="https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-${PATCHES_PV}.tar.bz2"
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+
+	ORIGIN_PV=${PATCHES_PV}
+	EGIT_REPO_URI="https://github.com/cyberus-technology/virtualbox-kvm"
+else
+	ORIGIN_PV=${PV%_pre*}
+	PATCHES_DIR="${WORKDIR}"/${PN}-dev-${MY_PV}
+	SRC_URI+=" https://github.com/cyberus-technology/virtualbox-kvm/archive/dev-${MY_PV}.tar.gz -> ${P}.tar.gz"
+fi
+MY_P=${ORIGIN_PN}-${ORIGIN_PV}
+SRC_URI+="
+	https://download.virtualbox.org/virtualbox/${ORIGIN_PV}/${MY_P}.tar.bz2
+	gui? ( !doc? ( https://dev.gentoo.org/~ceamac/${CATEGORY}/${MY_PN}/${MY_PN}-help-${ORIGIN_PV}.tar.xz ) )
+"
+S="${WORKDIR}/${ORIGIN_PN}-${ORIGIN_PV}"
+
+LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )"
+SLOT="0"
+IUSE="alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde vnc"
+
+unset WATCOM #856769
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	acct-group/vboxusers
+	dev-libs/libtpms
+	dev-libs/libxml2
+	dev-libs/openssl:0=
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	net-misc/curl
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qthelp:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtxml:5
+		x11-libs/libX11
+		x11-libs/libXt
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	lvm? ( sys-fs/lvm2 )
+	opengl? (
+		media-libs/libglvnd[X]
+		media-libs/vulkan-loader
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+	pam? ( sys-libs/pam )
+	sdl? (
+		media-libs/libsdl2[X,video]
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXt
+	)
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] )
+	vde? ( net-misc/vde )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+"
+# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
+# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
+# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
+# based on *DEPEND doesn't work for BDEPEND at least right now.
+#
+# There's a comment in Config.kmk about it
+# ("With Java 11 wsimport was removed, usually part of a separate install now.")
+# but it needs more investigation.
+#
+# See bug #878299 to track this issue.
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-libs/libxslt-1.1.19
+	virtual/libcrypt:=
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	gui? (
+		x11-base/xorg-proto
+		x11-libs/libxcb:=
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXmu
+		x11-libs/libXrandr
+	)
+	java? ( virtual/jdk:1.8 )
+	opengl? (
+		x11-base/xorg-proto
+		x11-libs/libXcursor
+		x11-libs/libXinerama
+		x11-libs/libXmu
+		x11-libs/libXrandr
+		virtual/glu
+	)
+	sdl? ( x11-libs/libXinerama )
+	pulseaudio? ( media-libs/libpulse )
+	udev? ( >=virtual/udev-171 )
+"
+RDEPEND="
+	!app-emulation/virtualbox
+	${COMMON_DEPEND}
+	gui? ( x11-libs/libxcb:= )
+	java? ( virtual/jre:1.8 )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-arch/tar-1.34-r2
+	>=dev-lang/yasm-0.6.2
+	dev-libs/libIDL
+	dev-util/glslang
+	>=dev-build/kbuild-0.1.9998.3592
+	sys-apps/which
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-sgml-dtd:4.4
+		app-text/docbook-xsl-ns-stylesheets
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+		dev-qt/qthelp:5
+	)
+	gui? ( dev-qt/linguist-tools:5 )
+	nls? ( dev-qt/linguist-tools:5 )
+	java? ( virtual/jdk:1.8 )
+"
+
+QA_FLAGS_IGNORED="
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
+"
+
+QA_TEXTRELS="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+"
+
+QA_EXECSTACK="
+	usr/lib64/virtualbox/iPxeBaseBin
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
+"
+
+QA_WX_LOAD="
+	usr/lib64/virtualbox/iPxeBaseBin
+"
+
+QA_PRESTRIPPED="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+PATCHES=(
+	# Downloaded patchset
+	"${WORKDIR}"/virtualbox-patches-${PATCHES_PV}/patches
+	"${PATCHES_DIR}"/patches
+)
+
+pkg_pretend() {
+	if ! use gui; then
+		einfo "No USE=\"gui\" selected, this build will not include any Qt frontend."
+	fi
+
+	if ! use opengl; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+	if ! use nls && use gui; then
+		einfo "USE=\"gui\" also selects USE=\"nls\".  This build"
+		einfo "will have NLS support."
+	fi
+
+	# 749273
+	local d=${ROOT}
+	for i in usr "$(get_libdir)"; do
+		d="${d}/$i"
+		if [[ "$(stat -L -c "%g %u" "${d}")" != "0 0" ]]; then
+			die "${d} should be owned by root, VirtualBox will not start otherwise"
+		fi
+	done
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	[[ ${PV} == *9999* ]] && git-r3_src_unpack
+	default
+}
+
+src_prepare() {
+	default
+
+	# Only add nopie patch when we're on hardened
+	if gcc-specs-pie; then
+		eapply "${FILESDIR}"/050_virtualbox-5.2.8-nopie.patch
+	fi
+
+	# Remove shipped binaries (kBuild, yasm) and tools, see bug #232775
+	rm -r kBuild/bin || die
+	# Remove everything in tools except kBuildUnits
+	find tools -mindepth 1 -maxdepth 1 -name kBuildUnits -prune -o -exec rm -r {} \+ || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${MY_PN}-5-localconfig > LocalConfig.kmk || die
+
+	if ! use pch; then
+		# bug #753323
+		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
+			>> LocalConfig.kmk || die
+	fi
+
+	# bug #916002, #488176
+	tc-ld-force-bfd
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam; then
+		einfo "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+		echo -e "\nIPRT_WITHOUT_PAM=1" >> LocalConfig.kmk || die
+	fi
+
+	# add correct java path
+	if use java; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	#856811 #864274
+	# cannot filter out only one flag, some combinations of these flags produce buggy executables
+	for i in abm avx avx2 bmi bmi2 fma fma4 popcnt; do
+		append-cflags $(test-flags-CC -mno-$i)
+		append-cxxflags $(test-flags-CXX -mno-$i)
+	done
+
+	# bug #908814
+	filter-lto
+
+	# bug #843437
+	cat >> LocalConfig.kmk <<-EOF || die
+		CXXFLAGS=${CXXFLAGS}
+		CFLAGS=${CFLAGS}
+	EOF
+
+	if use sdl; then
+		sed -i 's/sdl-config/sdl2-config/' configure || die
+		echo -e "\nVBOX_WITH_VBOXSDL=1" >> LocalConfig.kmk || die
+	fi
+
+	#443830
+	echo -e "\nVBOX_WITH_VBOX_IMG=1" >> LocalConfig.kmk || die
+
+	if tc-is-clang; then
+		# clang assembler chokes on comments starting with /
+		sed -i -e '/^\//d' src/libs/xpcom18a4/nsprpub/pr/src/md/unix/os_Linux_x86_64.s || die
+
+		# clang does not support this extension
+		eapply "${FILESDIR}"/${MY_PN}-7.0.8-disable-rebuild-iPxeBiosBin.patch
+	fi
+
+	# fix doc generation
+	echo -e "\nVBOX_PATH_DOCBOOK=/usr/share/sgml/docbook/xsl-ns-stylesheets" >> LocalConfig.kmk || die
+	# replace xhtml names with numeric equivalents
+	find doc/manual -name \*.xml -exec sed -i \
+		-e 's/&nbsp;/\&#160;/g' \
+		-e 's/&ndash;/\&#8211;/g' \
+		-e 's/&larr;/\&#8592;/g' \
+		-e 's/&rarr;/\&#8594;/g' \
+		-e 's/&harr;/\&#8596;/g' {} \+ || die
+
+	# fix help path #891879
+	echo -e "\nVBOX_PATH_PACKAGE_DOCS=/usr/share/doc/${PF}" >> LocalConfig.kmk || die
+
+	# 489208
+	# Cannot patch the whole text, many translations.  Use sed instead to replace the command
+	find src/VBox/Frontends/VirtualBox/nls -name \*.ts -exec sed -i \
+		's/&apos;[^&]*\(vboxdrv setup\|vboxconfig\)&apos;/\&apos;emerge -1 virtualbox-modules\&apos;/' {} \+ || die
+	sed -i "s:'/sbin/vboxconfig':'emerge -1 virtualbox-modules':" \
+		src/VBox/Frontends/VirtualBox/src/main.cpp \
+		src/VBox/VMM/VMMR3/VM.cpp || die
+
+	# 890561
+	echo -e "\nVBOX_GTAR=gtar" >> LocalConfig.kmk || die
+
+	if ! use nls && ! use gui; then
+		cat >> LocalConfig.kmk <<-EOF || die
+			VBOX_WITH_NLS :=
+			VBOX_WITH_MAIN_NLS :=
+			VBOX_WITH_PUEL_NLS :=
+			VBOX_WITH_VBOXMANAGE_NLS :=
+		EOF
+	fi
+}
+
+src_configure() {
+	tc-export AR CC CXX LD RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+
+		--disable-kmods
+		--with-kvm
+
+		# this is required for kvm to work.
+		# also this prohibits installation with suid.
+		--disable-hardening
+
+		$(usev !alsa --disable-alsa)
+		$(usev !dbus --disable-dbus)
+		$(usev debug --build-debug)
+		$(usev !doc --disable-docs)
+		$(usev !java --disable-java)
+		$(usev !lvm --disable-devmapper)
+		$(usev !pulseaudio --disable-pulse)
+		$(usev !python --disable-python)
+		$(usev vboxwebsrv --enable-webservice)
+		$(usev vde --enable-vde)
+		$(usev vnc --enable-vnc)
+	)
+
+	if use gui || use sdl || use opengl; then
+		myconf+=(
+			$(usev !opengl --disable-opengl)
+			$(usev !gui --disable-qt)
+			$(usev !sdl --disable-sdl)
+		)
+	else
+		myconf+=(
+			--build-headless
+		)
+	fi
+
+	if use amd64 && ! has_multilib_profile; then
+		myconf+=( --disable-vmmraw )
+	fi
+
+	# not an autoconf script
+	edo ./configure "${myconf[@]}"
+
+	# Force usage of chosen Python implementation
+	# bug #856121, bug #785835
+	sed -i \
+		-e '/VBOX_WITH_PYTHON.*=/d' \
+		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
+		-e '/VBOX_LIB_PYTHON.*=/d' \
+		AutoConfig.kmk || die
+
+	cat >> AutoConfig.kmk <<-EOF || die
+		VBOX_WITH_PYTHON=$(usev python 1)
+		VBOX_PATH_PYTHON_INC=$(python_get_includedir)
+		VBOX_LIB_PYTHON=$(python_get_library_path)
+	EOF
+
+	if use python; then
+		local mangled_python="${EPYTHON#python}"
+		mangled_python="${mangled_python/.}"
+
+		# Stub out the script which defines what the Makefile ends up
+		# building for. gen_python_deps.py gets called by the Makefile
+		# with some args and it spits out a bunch of paths for a hardcoded
+		# list of Pythons. We just override it with what we're actually using.
+		# This minimises the amount of patching we have to do for new Pythons.
+		cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
+			print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
+			print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
+			print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
+			print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
+		EOF
+
+		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
+	fi
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+
+	local myemakeargs=(
+		VBOX_BUILD_PUBLISHER=_Gentoo
+		VBOX_WITH_VBOXIMGMOUNT=1
+
+		KBUILD_VERBOSE=2
+
+		AS="$(tc-getCC)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		TOOL_GCC3_CC="$(tc-getCC)"
+		TOOL_GCC3_LD="$(tc-getCC)"
+		TOOL_GCC3_AS="$(tc-getCC)"
+		TOOL_GCC3_AR="$(tc-getAR)"
+		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GXX3_CC="$(tc-getCC)"
+		TOOL_GXX3_CXX="$(tc-getCXX)"
+		TOOL_GXX3_LD="$(tc-getCXX)"
+		TOOL_GXX3_AS="$(tc-getCXX)"
+		TOOL_GXX3_AR="$(tc-getAR)"
+		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GCC3_CFLAGS="${CFLAGS}"
+		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
+		VBOX_GCC_OPT="${CXXFLAGS}"
+		VBOX_NM="$(tc-getNM)"
+
+		TOOL_YASM_AS=yasm
+	)
+
+	if use amd64 && has_multilib_profile; then
+		myemakeargs+=(
+			CC32="$(tc-getCC) -m32"
+			CXX32="$(tc-getCXX) -m32"
+
+			TOOL_GCC32_CC="$(tc-getCC) -m32"
+			TOOL_GCC32_CXX="$(tc-getCXX) -m32"
+			TOOL_GCC32_LD="$(tc-getCC) -m32"
+			TOOL_GCC32_AS="$(tc-getCC) -m32"
+			TOOL_GCC32_AR="$(tc-getAR)"
+			TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
+
+			TOOL_GXX32_CC="$(tc-getCC) -m32"
+			TOOL_GXX32_CXX="$(tc-getCXX) -m32"
+			TOOL_GXX32_LD="$(tc-getCXX) -m32"
+			TOOL_GXX32_AS="$(tc-getCXX) -m32"
+			TOOL_GXX32_AR="$(tc-getAR)"
+			TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
+		)
+	fi
+
+	MAKE="kmk" emake "${myemakeargs[@]}" all
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${MY_PN}" each size ico icofile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${MY_PN}-4-config" vbox.cfg
+
+	# Set the correct libdir
+	sed \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${MY_PN}-ose-6-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,VMMPreload,XPCOMIPCD} \
+		vboximg-mount vbox-img *so *r0; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 0750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	for each in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${each} 0644
+	done
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${ED}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} \
+		VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
+	dosym ${vbox_inst_path}/vbox-img /usr/bin/vbox-img
+
+	if use pam; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
+
+	# set an env-variable for 3rd party tools
+	echo "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	# environment variables used during SDK binding installation
+	echo "VBOX_SDK_PATH=${vbox_inst_path}/sdk" >> "${T}/90virtualbox"
+	echo "VBOX_INSTALL_PATH=${vbox_inst_path}" >> "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if use sdl; then
+		vbox_inst VBoxSDL 0750
+		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
+
+		for each in vboxsdl VBoxSDL ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+	fi
+
+	if use gui; then
+		vbox_inst VirtualBox
+		vbox_inst VirtualBoxVM 0750
+		for each in VirtualBox{,VM} ; do
+			pax-mark -m "${ED}"${vbox_inst_path}/${each}
+		done
+
+		if use opengl; then
+			vbox_inst VBoxTestOGL
+			pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
+		fi
+
+		for each in virtualbox{,vm} VirtualBox{,VM} ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+
+		insinto /usr/share/${PN}
+		doins -r nls
+		doins -r UnattendedTemplates
+
+		newmenu ${MY_PN}.desktop ${PN}.desktop
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${MY_PN}-${size}px.png ${PN}.png
+		done
+		newicon ${MY_PN}-48px.png ${PN}.png
+		newicon -s scalable ${MY_PN}.svg ${PN}.png
+		popd &>/dev/null || die
+		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
+		for size in 16 24 32 48 64 72 96 128 256 512 ; do
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="${MY_PN}-${ico}-${size}px.png"
+				if [[ -f "${icofile}" ]]; then
+					newicon -s ${size} ${icofile} ${MY_PN}-${ico}.png
+				fi
+			done
+		done
+		popd &>/dev/null || die
+	fi
+
+	if use lvm; then
+		vbox_inst VBoxVolInfo 0750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java; then
+			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev; then
+		local udevdir="$(get_udevdir)"
+		local udev_file="VBoxCreateUSBNode.sh"
+		local rules_file="10-virtualbox.rules"
+
+		insinto ${udevdir}
+		doins ${udev_file}
+		fowners root:vboxusers ${udevdir}/${udev_file}
+		fperms 0750 ${udevdir}/${udev_file}
+
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
+			> "${T}"/${rules_file} || die
+		doins "${T}"/${rules_file}
+	fi
+
+	if use vboxwebsrv; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	# Remove dead symlinks (bug #715338)
+	find "${ED}"/usr/$(get_libdir)/${MY_PN} -xtype l -delete || die
+
+	# Fix version string in extensions or else they don't get accepted
+	# by the virtualbox host process (see bug #438930)
+	find ExtensionPacks -type f -name "ExtPack.xml" -exec sed -i '/Version/s@_Gentoo@@' {} \+ || die
+
+	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
+
+	if use vnc; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/VNC
+	fi
+
+	if use dtrace; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
+	fi
+
+	if use doc; then
+		dodoc UserManual.pdf UserManual.q{ch,hc}
+		docompress -x /usr/share/doc/${PF}/UserManual.q{ch,hc}
+	elif use gui; then
+		dodoc "${WORKDIR}"/${MY_PN}-help-${ORIGIN_PV}/UserManual.q{ch,hc}
+		docompress -x /usr/share/doc/${PF}/UserManual.q{ch,hc}
+	fi
+	dodoc ${PATCHES_DIR}/README.*
+
+	if use python; then
+		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython3.so"
+		if [[ ! -x "${python_path_ext}" ]]; then
+			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
+			eerror "but none were installed. This may happen if support for a Python target"
+			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
+			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
+		fi
+
+		# 378871
+		local installer_dir="${ED}/usr/$(get_libdir)/virtualbox/sdk/installer"
+		pushd "${installer_dir}" &> /dev/null || die
+		sed -e "s;%VBOX_INSTALL_PATH%;${vbox_inst_path};" \
+			-e "s;%VBOX_SDK_PATH%;${vbox_inst_path}/sdk;" \
+			-i vboxapi/__init__.py || die
+		# insert shebang, the files come without one
+		find vboxapi -name \*.py -exec sed -e "1 i\#! ${PYTHON}" -i {} \+ || die
+		python_domodule vboxapi
+		popd &> /dev/null || die
+		python_doscript vboxshell.py
+
+		# do not install the installer
+		rm -r "${installer_dir}" || die
+	fi
+
+	newtmpfiles "${FILESDIR}"/${MY_PN}-vboxusb_tmpfilesd virtualbox-vboxusb.conf
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use udev; then
+		udev_reload
+		udevadm trigger --subsystem-match=usb
+	fi
+
+	tmpfiles_process virtualbox-vboxusb.conf
+
+	if use gui; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "https://download.virtualbox.org/virtualbox/${ORIGIN_PV}/UserManual.pdf"
+	elog ""
+
+	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
+	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
+	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
+
+	if ! use udev; then
+		ewarn "Without USE=udev, USB devices will likely not work in ${MY_PN}."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	use udev && udev_reload
+}
diff --git a/app-emulation/virtualbox-kvm/virtualbox-kvm-9999.ebuild b/app-emulation/virtualbox-kvm/virtualbox-kvm-9999.ebuild
index 34dd04078029..f501f05d7084 100644
--- a/app-emulation/virtualbox-kvm/virtualbox-kvm-9999.ebuild
+++ b/app-emulation/virtualbox-kvm/virtualbox-kvm-9999.ebuild
@@ -20,7 +20,7 @@ PYTHON_COMPAT=( python3_{10..11} )
 inherit desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils \
 	python-single-r1 tmpfiles toolchain-funcs udev xdg
 
-PATCHES_PV="7.0.14"
+PATCHES_PV="7.0.16"
 ORIGIN_PN="VirtualBox"
 ORIGIN_PV=${PATCHES_PV}
 
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 1af5321d5b27..ff69699f6c76 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -5,10 +5,12 @@ DIST vbox-kernel-module-src-6.1.48.tar.xz 680552 BLAKE2B 243cd013a7e027634b7f633
 DIST vbox-kernel-module-src-6.1.50.tar.xz 680700 BLAKE2B c3a10ce8f3eb7e6c0c05f81cd3c072296557b9f9f6f501bb0aec3f04aabfe1fbb67b553510104139cef290c09ff9e67161085781b8d28c968dfafd15958a1b1a SHA512 7822e421b595263cbdaae08103255742360ca7ab0c385818ec895f10570c5b9ed5c7614742d8fa8bc2414cd426907cd1c49d735cde8caf9d2b7692898058f592
 DIST vbox-kernel-module-src-7.0.12.tar.xz 718284 BLAKE2B 8b427f9764ad7cb216d3b8dcfa05e8b564a8b67cf3beb7ec048b2529a31580eb59eb0e41a887bb85503542cae18d873d91108a522fc0ba106d119a73ce629f34 SHA512 0b64ad2ddc6eaf56759e636aa6c8e5dba998e232ec42a7bf0cf92dc00e7a6c0ebb11e9d7500a8a407e0c92a162ebb71cdb15cbfd4f570c1860641a7fdba21bd0
 DIST vbox-kernel-module-src-7.0.14.tar.xz 718532 BLAKE2B 64df92802ab5e9fa3fdf9ba3e3b13004dc687dd2d5f3d41d24354f116a79000fe6ea07bfa8877113ab263d4f75210b600e61d983616f66b6e96324b3ea6a4b2d SHA512 2a0b9a0bbcb0a21a580000309be3a71722ee3cb9a63a5e12cd0d8a391b3832a6cc92ff806f8ca4b5fcb80fed02a44aa4de6a2d49f4583d704cec0902572a68bb
+DIST vbox-kernel-module-src-7.0.16.tar.xz 719888 BLAKE2B df78a70f677384be47f9ca28c1d473680dfbc491f2c4dcdccf05e0d80f46177db808adf81bc2af4539aeca10046edbc67a561a62870d2233af5e8fbeccc3ee43 SHA512 c4858c20f557bec7893d3604a9a572068999e60bceeceb65b1ccc9dc92ad2531a8e5bded91b55caa1d55ddf06c0f72672bccf73f5e86546a804ff1ecee413164
 EBUILD virtualbox-modules-6.1.48-r1.ebuild 1008 BLAKE2B bf64bf8cb1b7a10062ed0c21d7780a17a531ea20197f3fbb2cd9981f002f4c20d7ef05d37c919c2d4d74da0535fd686d702599d479c0673edc6038e4e1c60bdb SHA512 537ad0f3095684bb1a5f2cb1cd1ea8ae0ec14116cafa7c4cd255f9898668a3ae045b402e5539c28f6aecf348b3c2151c09d6aa542ae1c34470962e94ccbcbb5b
 EBUILD virtualbox-modules-6.1.48.ebuild 941 BLAKE2B b88e79d530b44f81bc866991afb65865bb2598e8cda0451d3d9c0ed4d12f6230c3fc5e4fd6d91081bf8ddaa7387b6dd1bc5c09cbbd4e37cb28e82971f4fd4d00 SHA512 819fba543be3eebb700f36d5c08e8fdfe4c86f864040dede2f05e971c610f14b3f840142ea2a82c9582ffbc0c9f2894ab7fbd5a49c02152372e599161998bd37
 EBUILD virtualbox-modules-6.1.50-r1.ebuild 1008 BLAKE2B bf64bf8cb1b7a10062ed0c21d7780a17a531ea20197f3fbb2cd9981f002f4c20d7ef05d37c919c2d4d74da0535fd686d702599d479c0673edc6038e4e1c60bdb SHA512 537ad0f3095684bb1a5f2cb1cd1ea8ae0ec14116cafa7c4cd255f9898668a3ae045b402e5539c28f6aecf348b3c2151c09d6aa542ae1c34470962e94ccbcbb5b
 EBUILD virtualbox-modules-7.0.12-r1.ebuild 1008 BLAKE2B 75da3c0ede11cdbcce10f53939d552c96cd6fa444a6a1a5a247340df8005f2a77c1fb18e568161ef39756690861d1f8b5da602d07028350fdc5f80d13d6eb6c4 SHA512 c1b57727e5e48fd900e98056b4afc8ae96fad08f9ed1a94f95f5a2f1977e2f7ab303bfbc439de7200ded494d459d92cafdd7ad7297514c9f56de242e36ba24ed
 EBUILD virtualbox-modules-7.0.12.ebuild 941 BLAKE2B 23539d6f2c798b730f2f9afb007158672cabb6e199356b104c5e34b4f8e819e55f77ae1f303d655333cbc4351b67dc44735c131d59bb04031bc7c1b900d49c7b SHA512 379c3e216af76612970ca077c29a3c750de40c9a91dd288754cf55e7612e64227c261ffe2b0ccb8aef21f47ed1afac713295d6f7b063f27fa083715d311f7c75
 EBUILD virtualbox-modules-7.0.14-r1.ebuild 1000 BLAKE2B ca0f30b59f06c422cbb20d1729ac171aaba277817b6a23c098f390c8f837c42de5155dff50d5dd1aa4191254894870dc5f13098b026ed989bb0539269b02e671 SHA512 e17950d1e2612ddd5a2716e00c200537b69b3b5d022e2f8f40af36ae94e26bc579da744ffd3b5c24e499e69d41fcb4654eeb2d8b91b93cacc8d20696adbb26b0
+EBUILD virtualbox-modules-7.0.16.ebuild 942 BLAKE2B eefe2ce819d229a06584224a5f4ffe531e821df6dcc7b5f761d88605ab854880f9182a22d228953e2194d9a37191e6816fb5db4f87e3e10d324a42f71486ffce SHA512 181fece45985e074c73476473eba544a69151e6e2499e6162ca6019213aff95d6460d240890b01e24ff230eb87070d31f2ab9e595a21545a3020e9f4b1e7da34
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-7.0.16.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-7.0.16.ebuild
new file mode 100644
index 000000000000..08e22e5e0379
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-7.0.16.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from VirtualBox-*.run
+# XXX: update: now it is split from virtualbox-*-Debian~bullseye_amd64.deb
+
+EAPI=8
+
+inherit linux-mod-r1
+
+MY_P="vbox-kernel-module-src-${PV}"
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${MY_P}.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="GPL-3"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+CONFIG_CHECK="~!SPINLOCK JUMP_LABEL"
+
+src_compile() {
+	local modlist=( {vboxdrv,vboxnetflt,vboxnetadp}=misc )
+	local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" )
+	linux-mod-r1_src_compile
+}
+
+src_install() {
+	linux-mod-r1_src_install
+	insinto /usr/lib/modules-load.d/
+	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
+}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 5db7287f8e18..40554bddf8be 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -16,15 +16,19 @@ DIST VirtualBox-6.1.48.tar.bz2 165960987 BLAKE2B c981e390ae518b829970827f6032fb1
 DIST VirtualBox-6.1.50.tar.bz2 165959648 BLAKE2B e244c4fa2ffe86216664104473e27e8ddbad86aae3bc26612d18204a4e67cece91d1fa3aa9e70f1c39f915bf5e4a1e6a14bbb19162c3ae2ff554373df95bce51 SHA512 ee2ec352e020f07262bf2120278d0d9807c501cd7c4d621d4e12ce18a821b134d48eb852bc7136008cfa77ed709703d3c2835b7a7177c325d989e8f433aff73f
 DIST VirtualBox-7.0.12.tar.bz2 175644088 BLAKE2B 507cbf7b1a8a807bd2602e74bc19a59cb177b9b2bdefa1be582e520666360a42510ca501f20c354746a0f1dadf61fe29135e3edc867e611bfe60a9405cb2bbce SHA512 9fe4511442eba788d02f932f5e98cfcc5aa4ebed41c00bd7333cf7e3f5de787e458f1f56930978283f041f403652c803143335fe9120ab63a2c113ca7b3f588f
 DIST VirtualBox-7.0.14.tar.bz2 175654864 BLAKE2B 99f4942b864ce481d69983af31393d763452c5b55697ab642b43c155f5fbc2a9963fbe1b7744baef620d0b351e1ac73c1ef978698b9a7e77897bb9cbc18dc17c SHA512 6a82933bbf51ff255d17cb61ae6ddfb791a2200e3dff705f181cd06c6031b48cf15faa5e8202a65daef0fb20b7fd9e33d40dbd0f9cc3f49af49fff04a1cb0a73
+DIST VirtualBox-7.0.16.tar.bz2 170897951 BLAKE2B 6b436c38df632222621723db94677a0efef5de2ac1eacec73571bc658955f23fff347fa60c37ec78c58bf94b82b8f9a95fb26c07ef4becc7e9f535af069151f5 SHA512 1b8ba08bec144cbd1f2e9aa0929cdf60a0b99930f1dd80567094fba75097d87661aef3da2cc24f4abff6b6db8f186e251c5f693a2a93943cc39909d5f1e1bce5
 DIST virtualbox-help-7.0.10.tar.xz 3941196 BLAKE2B fa6667e0cf12e2e05b896a7d9d7e1f78d43bb4618f35b3c81f5ccf5f227d1181b0c8fb1f6dc02a8619550b193a73d4094c5d3f0d43514392f9ed563085068789 SHA512 fab2dff812a438f3e78dbace24741d91b317bbbc7362f082a18f3871e3c6fd8af7744cf1b3fd3b82cf5135e03d521de05a7a5bc98ec19aacfa1b4e5392e60f30
 DIST virtualbox-help-7.0.12.tar.xz 3945920 BLAKE2B 7f2201f3baf6d27d95dc9f878426e34a27c9f9e113d55348f57703b1bd4878df8c6f02492412b779896c48224fb2df224c953b425dde9c99d2b4dbfda1d80d4f SHA512 ddf429a984fe433c4bcbdf87930b3cc16075d4f4725d2e571e9bf05d820d26eb6f88dd6f2bd3992927b261377c84ac4e35a929113b3294e3b2887760fe7a0b52
 DIST virtualbox-help-7.0.14.tar.xz 3944832 BLAKE2B 95079e4da8c960c41cee799142779a6c2587e0e8af7956ca551cb5a4c0f36f313189dfe08afba83a0c32886866a7f9903b5e370008d6b3ce6283fb2288866b06 SHA512 e2f1acdd7577a93047e220300b1996d2855ddef20053c01294f8295fde0840645c41b75632d71dd2fc276219084fe4105fd057623f39375542358796425a2d03
+DIST virtualbox-help-7.0.16.tar.xz 3948696 BLAKE2B 5c5937313ea0e5cb4764b8a61fd1587e88a4afc965ef00862c5a265a15253929d35e0635231b6be5656f26f600bc4b70a2fa2ebc0f33b35d35c184b57e5acef8 SHA512 b9baca57118a82e3489c8445f0988671f16f75de60cc2d929d5e3b0c4c9e3ceacd796a72a81bba88d69eb4b4559835a13775c18d7782ae7dbe8ad202e247db0c
 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
 DIST virtualbox-patches-7.0.14.tar.bz2 6937 BLAKE2B da5f18efbba2a8f4701b3d29dc00784e4e80e18a18b029e5dce8c142eb4dc97637069bfc5081422064a7dc59dfacf503ebbdc3421caa96430dc53fa72988aa20 SHA512 57cc34b92e4626de5c445e34ae025da7ec0d752a60618c619a55c28bf7d6b1cc9dc81ea059b949b0f3e625568207e8084f9462faf487ca0daf2794e7f1feac36
+DIST virtualbox-patches-7.0.16.tar.bz2 6808 BLAKE2B d15fa2ca306375142c3e25d4759d2790b2bb9eb69e333a8773ad500b29dd127b401943abf59ca59d01858a3ed5551fb3a6c93c4c893c8de971a714ce5306d577 SHA512 a488cbc6660fe8637c44cd79d87156609af089988239a7e76fea8a3c7e6319512c574bef2e942b354b14ce671a8e75ab8b2160abf7c40963795ee8a545ecd992
 DIST virtualbox-patches-7.1.0_pre20240210.tar.bz2 5479 BLAKE2B 98bfc9391e756df139e0dd88ca2dd5c9f6cd9c0ce5b5e770dbe28d2e6acbfd04a26b06414c2640894bd3bbd2f10a80f6053d0c6f18d27752a05cadf773e50f19 SHA512 51b0fe68f23a73d20ec3a93b1fc8c073e0bc2bfe4e2e267de6ee6f103abc44c35bb50a96f3842a1e46049418336a3327ab291972a17b8a29b596ba9be4bdb962
 EBUILD virtualbox-6.1.48-r2.ebuild 18946 BLAKE2B aad9adbb63d7252b67c4ac441900542ab085e749c6f3159a2a4ca88b7ba22d492ca81d72dce940d3caa9db449929e377544414873a7b7029456f0ba63b085a25 SHA512 a62a6b18a51143b925ef3d8940283746ba2ddff975bec0e1335da7bc5f5bcd9b0bc4a4f30880faa3e590c0c7064fe758620f730726899d81e0a97c6c953e822e
 EBUILD virtualbox-6.1.50-r2.ebuild 18982 BLAKE2B 0290f1ebcb0f31f211b92c7e7d64a9187886ce214d7a710df4676060789ae4d9d408cd25d50c97698ad67aad4384682ae87d6b6f4076f39e4722145245ed7314 SHA512 63e87fec69f8d1ec84bfa4ddb364ea029f7950d684ddbe6d58552c0582ae5dc782c08b58126f68a96219737ef72410196434a888781d6f367209c88302f67424
 EBUILD virtualbox-7.0.12-r2.ebuild 20777 BLAKE2B bb294e6143551fdd1553609e4f47c2e7451cc5907b8b5d180f0b0263097a1d21b63b1822b7e7579e4661b1d1831dcf0a8cced0cc906655a4cd76d1bdae6117f4 SHA512 888b6736c82b57bd364c4671f6cddea033c92798f7ba5cd1edd934b3c0edbf63dfbafddb61044cea2c9e5f4347eb2910a4c3a16ec7357b8c4f59fb6c6056dd26
 EBUILD virtualbox-7.0.14-r2.ebuild 20785 BLAKE2B 2b67f9feb5aeca76ee368fed058e70199c0eaa81c61dd1d6f45f7792535555369a6cca5b48036b2a471b8b2ae61daa4e25f98cb37eb2b74aa09d5e228d2e91a7 SHA512 753839ffe74dfc62a0cbd43cd93b6afbb3614cf64dc768ff22c0f42096225364e60099adb2b996f8cdd36b051a1f8b24d16f15760106a7f9a51d69ee4dd83f5b
+EBUILD virtualbox-7.0.16.ebuild 20785 BLAKE2B f7894541ca64dab97dfb0c254dc88efbc4b1e0ae016b30ef53bcc9b43e45da35e027e1c929938d11d8d50873cee291fa826e7d204367e05c323f8e52ae6b61f9 SHA512 dbff90c4946662cf3daebe7769c8c33444368fe88a7f09fb992ec931ad5164ff412327fb5cbd396c43b5db6142a214e27c08520493d9afa2588e20ba2852754d
 EBUILD virtualbox-9999.ebuild 21624 BLAKE2B a3590b3abfa2f318ced4bbe4fe35c224a09229d199f215fa60e72a9de80bc561ec479f80ae3de3923d0adaf6160cbc825b7cc3d8f167cc46ceeb50bec8559634 SHA512 917b865d73c3c41c7c2b91140e0fcd7771dcf35dff54643ad10587012ea87ecef125b0f0e76cebcb519134fab9e248370bf86a027fc3b315e18747a92c2ec8c8
 MISC metadata.xml 870 BLAKE2B 26f9370557a12c17465e7ca2d63902a2ce5b2d65fbdf40f3b890bd89aca28a1816424caf579f71b762876e8e91b292c5ecbcbad985e9da1e1472e66a2eaf6965 SHA512 eb2e9114dc343062e9afd3b933a5d355be790febb4a18f741347072d305b7d63ed40a6a3b9d11b91eb8602d5d2d4f5cf6c2ebde278fb0d0df48a5c5647374e33
diff --git a/app-emulation/virtualbox/virtualbox-7.0.16.ebuild b/app-emulation/virtualbox/virtualbox-7.0.16.ebuild
new file mode 100644
index 000000000000..eb51ad77cc44
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-7.0.16.ebuild
@@ -0,0 +1,740 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# To add a new Python here:
+# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic)
+#    Do NOT skip this part. It'll end up silently not-building the Python extension
+#    or otherwise misbehaving if you do.
+#
+# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python.
+#
+#  May need to look at other distros (e.g. Arch Linux) to find patches for newer
+#  Python versions as upstream tends to lag. Upstream may have patches on their
+#  trunk branch but not release branch.
+#
+#  See bug #785835, bug #856121.
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils \
+	python-single-r1 tmpfiles toolchain-funcs udev xdg
+
+MY_PN="VirtualBox"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="
+	https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2
+	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.16.tar.bz2
+	gui? ( !doc? ( https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-help-${PV}.tar.xz ) )
+"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde vnc"
+
+unset WATCOM #856769
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	acct-group/vboxusers
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libtpms
+	dev-libs/libxml2
+	dev-libs/openssl:0=
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	net-misc/curl
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qthelp:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtxml:5
+		x11-libs/libX11
+		x11-libs/libXt
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	lvm? ( sys-fs/lvm2 )
+	opengl? (
+		media-libs/libglvnd[X]
+		media-libs/vulkan-loader
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+	pam? ( sys-libs/pam )
+	sdl? (
+		media-libs/libsdl2[X,video]
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXt
+	)
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] )
+	vde? ( net-misc/vde )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+"
+# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
+# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
+# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
+# based on *DEPEND doesn't work for BDEPEND at least right now.
+#
+# There's a comment in Config.kmk about it
+# ("With Java 11 wsimport was removed, usually part of a separate install now.")
+# but it needs more investigation.
+#
+# See bug #878299 to track this issue.
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-libs/libxslt-1.1.19
+	virtual/libcrypt:=
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	gui? (
+		x11-base/xorg-proto
+		x11-libs/libxcb:=
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXmu
+		x11-libs/libXrandr
+	)
+	java? ( virtual/jdk:1.8 )
+	opengl? (
+		x11-base/xorg-proto
+		x11-libs/libXcursor
+		x11-libs/libXinerama
+		x11-libs/libXmu
+		x11-libs/libXrandr
+		virtual/glu
+	)
+	sdl? ( x11-libs/libXinerama )
+	pulseaudio? ( media-libs/libpulse )
+	udev? ( >=virtual/udev-171 )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	gui? ( x11-libs/libxcb:= )
+	java? ( virtual/jre:1.8 )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-arch/tar-1.34-r2
+	>=dev-lang/yasm-0.6.2
+	dev-libs/libIDL
+	dev-util/glslang
+	>=dev-build/kbuild-0.1.9998.3592
+	sys-apps/which
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-sgml-dtd:4.4
+		app-text/docbook-xsl-ns-stylesheets
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+		dev-qt/qthelp:5
+	)
+	gui? ( dev-qt/linguist-tools:5 )
+	nls? ( dev-qt/linguist-tools:5 )
+	java? ( virtual/jdk:1.8 )
+"
+
+QA_FLAGS_IGNORED="
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
+"
+
+QA_TEXTRELS="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+"
+
+QA_EXECSTACK="
+	usr/lib64/virtualbox/iPxeBaseBin
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
+"
+
+QA_WX_LOAD="
+	usr/lib64/virtualbox/iPxeBaseBin
+"
+
+QA_PRESTRIPPED="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+PATCHES=(
+	# Downloaded patchset
+	"${WORKDIR}"/virtualbox-patches-7.0.16/patches
+)
+
+pkg_pretend() {
+	if ! use gui; then
+		einfo "No USE=\"gui\" selected, this build will not include any Qt frontend."
+	fi
+
+	if ! use opengl; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+	if ! use nls && use gui; then
+		einfo "USE=\"gui\" also selects USE=\"nls\".  This build"
+		einfo "will have NLS support."
+	fi
+
+	# 749273
+	local d=${ROOT}
+	for i in usr "$(get_libdir)"; do
+		d="${d}/$i"
+		if [[ "$(stat -L -c "%g %u" "${d}")" != "0 0" ]]; then
+			die "${d} should be owned by root, VirtualBox will not start otherwise"
+		fi
+	done
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Only add nopie patch when we're on hardened
+	if gcc-specs-pie; then
+		eapply "${FILESDIR}"/050_virtualbox-5.2.8-nopie.patch
+	fi
+
+	# Remove shipped binaries (kBuild, yasm) and tools, see bug #232775
+	rm -r kBuild/bin || die
+	# Remove everything in tools except kBuildUnits
+	find tools -mindepth 1 -maxdepth 1 -name kBuildUnits -prune -o -exec rm -r {} \+ || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	if ! use pch; then
+		# bug #753323
+		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
+			>> LocalConfig.kmk || die
+	fi
+
+	# bug #916002, #488176
+	tc-ld-force-bfd
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam; then
+		einfo "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+		echo -e "\nIPRT_WITHOUT_PAM=1" >> LocalConfig.kmk || die
+	fi
+
+	# add correct java path
+	if use java; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	#856811 #864274
+	# cannot filter out only one flag, some combinations of these flags produce buggy executables
+	for i in abm avx avx2 bmi bmi2 fma fma4 popcnt; do
+		append-cflags $(test-flags-CC -mno-$i)
+		append-cxxflags $(test-flags-CXX -mno-$i)
+	done
+
+	# bug #908814
+	filter-lto
+
+	# bug #843437
+	cat >> LocalConfig.kmk <<-EOF || die
+		CXXFLAGS=${CXXFLAGS}
+		CFLAGS=${CFLAGS}
+	EOF
+
+	if use sdl; then
+		sed -i 's/sdl-config/sdl2-config/' configure || die
+		echo -e "\nVBOX_WITH_VBOXSDL=1" >> LocalConfig.kmk || die
+	fi
+
+	#443830
+	echo -e "\nVBOX_WITH_VBOX_IMG=1" >> LocalConfig.kmk || die
+
+	if tc-is-clang; then
+		# clang assembler chokes on comments starting with /
+		sed -i -e '/^\//d' src/libs/xpcom18a4/nsprpub/pr/src/md/unix/os_Linux_x86_64.s || die
+
+		# clang does not support this extension
+		eapply "${FILESDIR}"/${PN}-7.0.8-disable-rebuild-iPxeBiosBin.patch
+	fi
+
+	# fix doc generation
+	echo -e "\nVBOX_PATH_DOCBOOK=/usr/share/sgml/docbook/xsl-ns-stylesheets" >> LocalConfig.kmk || die
+	# replace xhtml names with numeric equivalents
+	find doc/manual -name \*.xml -exec sed -i \
+		-e 's/&nbsp;/\&#160;/g' \
+		-e 's/&ndash;/\&#8211;/g' \
+		-e 's/&larr;/\&#8592;/g' \
+		-e 's/&rarr;/\&#8594;/g' \
+		-e 's/&harr;/\&#8596;/g' {} \+ || die
+
+	# fix help path #891879
+	echo -e "\nVBOX_PATH_PACKAGE_DOCS=/usr/share/doc/${PF}" >> LocalConfig.kmk || die
+
+	# 489208
+	# Cannot patch the whole text, many translations.  Use sed instead to replace the command
+	find src/VBox/Frontends/VirtualBox/nls -name \*.ts -exec sed -i \
+		's/&apos;[^&]*\(vboxdrv setup\|vboxconfig\)&apos;/\&apos;emerge -1 virtualbox-modules\&apos;/' {} \+ || die
+	sed -i "s:'/sbin/vboxconfig':'emerge -1 virtualbox-modules':" \
+		src/VBox/Frontends/VirtualBox/src/main.cpp \
+		src/VBox/VMM/VMMR3/VM.cpp || die
+
+	# 890561
+	echo -e "\nVBOX_GTAR=gtar" >> LocalConfig.kmk || die
+
+	if ! use nls && ! use gui; then
+		cat >> LocalConfig.kmk <<-EOF || die
+			VBOX_WITH_NLS :=
+			VBOX_WITH_MAIN_NLS :=
+			VBOX_WITH_PUEL_NLS :=
+			VBOX_WITH_VBOXMANAGE_NLS :=
+		EOF
+	fi
+}
+
+src_configure() {
+	tc-export AR CC CXX LD RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+
+		--disable-kmods
+
+		$(usev !alsa --disable-alsa)
+		$(usev !dbus --disable-dbus)
+		$(usev debug --build-debug)
+		$(usev !doc --disable-docs)
+		$(usev !java --disable-java)
+		$(usev !lvm --disable-devmapper)
+		$(usev !pulseaudio --disable-pulse)
+		$(usev !python --disable-python)
+		$(usev vboxwebsrv --enable-webservice)
+		$(usev vde --enable-vde)
+		$(usev vnc --enable-vnc)
+	)
+
+	if use gui || use sdl || use opengl; then
+		myconf+=(
+			$(usev !opengl --disable-opengl)
+			$(usev !gui --disable-qt)
+			$(usev !sdl --disable-sdl)
+		)
+	else
+		myconf+=(
+			--build-headless
+		)
+	fi
+
+	if use amd64 && ! has_multilib_profile; then
+		myconf+=( --disable-vmmraw )
+	fi
+
+	# not an autoconf script
+	edo ./configure "${myconf[@]}"
+
+	# Force usage of chosen Python implementation
+	# bug #856121, bug #785835
+	sed -i \
+		-e '/VBOX_WITH_PYTHON.*=/d' \
+		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
+		-e '/VBOX_LIB_PYTHON.*=/d' \
+		AutoConfig.kmk || die
+
+	cat >> AutoConfig.kmk <<-EOF || die
+		VBOX_WITH_PYTHON=$(usev python 1)
+		VBOX_PATH_PYTHON_INC=$(python_get_includedir)
+		VBOX_LIB_PYTHON=$(python_get_library_path)
+	EOF
+
+	if use python; then
+		local mangled_python="${EPYTHON#python}"
+		mangled_python="${mangled_python/.}"
+
+		# Stub out the script which defines what the Makefile ends up
+		# building for. gen_python_deps.py gets called by the Makefile
+		# with some args and it spits out a bunch of paths for a hardcoded
+		# list of Pythons. We just override it with what we're actually using.
+		# This minimises the amount of patching we have to do for new Pythons.
+		cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
+			print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
+			print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
+			print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
+			print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
+		EOF
+
+		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
+	fi
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+
+	local myemakeargs=(
+		VBOX_BUILD_PUBLISHER=_Gentoo
+		VBOX_WITH_VBOXIMGMOUNT=1
+
+		KBUILD_VERBOSE=2
+
+		AS="$(tc-getCC)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		TOOL_GCC3_CC="$(tc-getCC)"
+		TOOL_GCC3_LD="$(tc-getCC)"
+		TOOL_GCC3_AS="$(tc-getCC)"
+		TOOL_GCC3_AR="$(tc-getAR)"
+		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GXX3_CC="$(tc-getCC)"
+		TOOL_GXX3_CXX="$(tc-getCXX)"
+		TOOL_GXX3_LD="$(tc-getCXX)"
+		TOOL_GXX3_AS="$(tc-getCXX)"
+		TOOL_GXX3_AR="$(tc-getAR)"
+		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GCC3_CFLAGS="${CFLAGS}"
+		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
+		VBOX_GCC_OPT="${CXXFLAGS}"
+		VBOX_NM="$(tc-getNM)"
+
+		TOOL_YASM_AS=yasm
+	)
+
+	if use amd64 && has_multilib_profile; then
+		myemakeargs+=(
+			CC32="$(tc-getCC) -m32"
+			CXX32="$(tc-getCXX) -m32"
+
+			TOOL_GCC32_CC="$(tc-getCC) -m32"
+			TOOL_GCC32_CXX="$(tc-getCXX) -m32"
+			TOOL_GCC32_LD="$(tc-getCC) -m32"
+			TOOL_GCC32_AS="$(tc-getCC) -m32"
+			TOOL_GCC32_AR="$(tc-getAR)"
+			TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
+
+			TOOL_GXX32_CC="$(tc-getCC) -m32"
+			TOOL_GXX32_CXX="$(tc-getCXX) -m32"
+			TOOL_GXX32_LD="$(tc-getCXX) -m32"
+			TOOL_GXX32_AS="$(tc-getCXX) -m32"
+			TOOL_GXX32_AR="$(tc-getAR)"
+			TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
+		)
+	fi
+
+	MAKE="kmk" emake "${myemakeargs[@]}" all
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the correct libdir
+	sed \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,VMMPreload,XPCOMIPCD} \
+		vboximg-mount vbox-img *so *r0; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	for each in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${each} 0644
+	done
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${ED}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} \
+		VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
+	dosym ${vbox_inst_path}/vbox-img /usr/bin/vbox-img
+
+	if use pam; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
+
+	# set an env-variable for 3rd party tools
+	echo "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	# environment variables used during SDK binding installation
+	echo "VBOX_SDK_PATH=${vbox_inst_path}/sdk" >> "${T}/90virtualbox"
+	echo "VBOX_INSTALL_PATH=${vbox_inst_path}" >> "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if use sdl; then
+		vbox_inst VBoxSDL 4750
+		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
+
+		for each in vboxsdl VBoxSDL ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+	fi
+
+	if use gui; then
+		vbox_inst VirtualBox
+		vbox_inst VirtualBoxVM 4750
+		for each in VirtualBox{,VM} ; do
+			pax-mark -m "${ED}"${vbox_inst_path}/${each}
+		done
+
+		if use opengl; then
+			vbox_inst VBoxTestOGL
+			pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
+		fi
+
+		for each in virtualbox{,vm} VirtualBox{,VM} ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+
+		insinto /usr/share/${PN}
+		doins -r nls
+		doins -r UnattendedTemplates
+
+		domenu ${PN}.desktop
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
+		for size in 16 24 32 48 64 72 96 128 256 512 ; do
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="${PN}-${ico}-${size}px.png"
+				if [[ -f "${icofile}" ]]; then
+					newicon -s ${size} ${icofile} ${PN}-${ico}.png
+				fi
+			done
+		done
+		popd &>/dev/null || die
+	fi
+
+	if use lvm; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java; then
+			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev; then
+		local udevdir="$(get_udevdir)"
+		local udev_file="VBoxCreateUSBNode.sh"
+		local rules_file="10-virtualbox.rules"
+
+		insinto ${udevdir}
+		doins ${udev_file}
+		fowners root:vboxusers ${udevdir}/${udev_file}
+		fperms 0750 ${udevdir}/${udev_file}
+
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
+			> "${T}"/${rules_file} || die
+		doins "${T}"/${rules_file}
+	fi
+
+	if use vboxwebsrv; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	# Remove dead symlinks (bug #715338)
+	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
+
+	# Fix version string in extensions or else they don't get accepted
+	# by the virtualbox host process (see bug #438930)
+	find ExtensionPacks -type f -name "ExtPack.xml" -exec sed -i '/Version/s@_Gentoo@@' {} \+ || die
+
+	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
+
+	if use vnc; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/VNC
+	fi
+
+	if use dtrace; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
+	fi
+
+	if use doc; then
+		dodoc UserManual.pdf UserManual.q{ch,hc}
+		docompress -x /usr/share/doc/${PF}
+	elif use gui; then
+		dodoc "${WORKDIR}"/${PN}-help-${PV}/UserManual.q{ch,hc}
+		docompress -x /usr/share/doc/${PF}
+	fi
+
+	if use python; then
+		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython3.so"
+		if [[ ! -x "${python_path_ext}" ]]; then
+			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
+			eerror "but none were installed. This may happen if support for a Python target"
+			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
+			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
+		fi
+
+		# 378871
+		local installer_dir="${ED}/usr/$(get_libdir)/virtualbox/sdk/installer"
+		pushd "${installer_dir}" &> /dev/null || die
+		sed -e "s;%VBOX_INSTALL_PATH%;${vbox_inst_path};" \
+			-e "s;%VBOX_SDK_PATH%;${vbox_inst_path}/sdk;" \
+			-i vboxapi/__init__.py || die
+		# insert shebang, the files come without one
+		find vboxapi -name \*.py -exec sed -e "1 i\#! ${PYTHON}" -i {} \+ || die
+		python_domodule vboxapi
+		popd &> /dev/null || die
+		python_doscript vboxshell.py
+
+		# do not install the installer
+		rm -r "${installer_dir}" || die
+	fi
+
+	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use udev; then
+		udev_reload
+		udevadm trigger --subsystem-match=usb
+	fi
+
+	tmpfiles_process virtualbox-vboxusb.conf
+
+	if use gui; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "https://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+
+	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
+	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
+	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
+
+	if ! use udev; then
+		ewarn "Without USE=udev, USB devices will likely not work in ${PN}."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	use udev && udev_reload
+}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 8b38f9c8cbe3..7348270ddaf5 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/scim-uim/Manifest b/app-i18n/scim-uim/Manifest
index ac5833579f4d..caf70f44ff22 100644
--- a/app-i18n/scim-uim/Manifest
+++ b/app-i18n/scim-uim/Manifest
@@ -2,5 +2,5 @@ AUX scim-uim-0.2.0-gcc43.patch 420 BLAKE2B 491828a4fa94ed7f0343b449b35e911666dd9
 AUX scim-uim-0.2.0-uim-1.5.patch 367 BLAKE2B e73cefa76abb64816265ee870c44d39966606624c649d97c09d5e5cf5494af34f49c9770ad103f7af2afa8eedc662098565c68a12fc70b0fc936e384a19035d8 SHA512 2c68a8fa1e5d99e624145ce9a85aeb1a286e4a4afe33d92c32c13ad3e14060afa8f730d58146d9a2b134b9565172a909138742357b640ba000a7129e5e65e485
 DIST scim-uim-0.2.0.tar.gz 344389 BLAKE2B da0cd29036cf3fd4a94ca0f5c9e72566ccb37c4d64019645b9ea04d9859d33d1614d8cf786ca67a0d2c474b79b13d7d100ddf815b982ba414ac950306ae00448 SHA512 18df8de8ebc02289e21bf54c921b5425f67ef3c379b3c3e4392431dc3b1d9d7f12a25bcbcaaddd264913bacf61ba2be9339845700f541c22f73981e99824c6e9
 EBUILD scim-uim-0.2.0-r2.ebuild 1060 BLAKE2B 17b7f42528436c4b944965273c316518395142dc0a51a91d45bd35b00a8f098e5cb936e9e6321df548e3be248fb1d23340f9879c7ae44b273d3e57062c37e5e7 SHA512 7c316c4db8b026c5c6c10ce92fd315bea2f56d84f761afc483a501d0ec8c80b56452b078aa0f360972776d4aa7adbf60fdb137db2e79fdc5f26ee302ae81cf1e
-EBUILD scim-uim-0.2.0-r3.ebuild 1089 BLAKE2B 1d484fd14bc3a84cb791ea19305628c58698113dc86f8c6866ab7f1de1a44a84d6068bc53797327e01d7b21c4feb17ba7dbdbe8f2f5e1831b70276e201836738 SHA512 b70f4888d311af89cdbb779c6d8394f36bdcf4a53fb1adc9150670e78422c3a6f72d1909b3d15ecb6117ccc3f34f855793af468f50f214ffaa2d787590bc0755
+EBUILD scim-uim-0.2.0-r3.ebuild 1088 BLAKE2B f0bc93e0ad35e7f9068308089b083f244542c10af29fb505cafe84e3f385a7fc867ba20119072bd96e25d8f23403f0c0f48a7ac3784533cceb6bd70c516b5888 SHA512 469d6504ec2af6366026a5820998355ccc87778047ce886d20b20b86b0c972277c4ce6695ef996f23d3d23b7452f4d496493ea900dc3cac984c813e6ab7ea80e
 MISC metadata.xml 309 BLAKE2B dbae5a3009517b9481eba1b44e2db32c260bbb0f52aa2dc5ed112b782ddbed0da5094cda5ef43f87d5c7c2e2fd53683bafb15f968d46fdaa7e7172953090c951 SHA512 24868fa1884d67b6eef373a1571333f1ab4342fa982a782015383e27345f90eec98a32f4c8dbced47d3bd433edd2aaeb372360ebea8a36fabcd4e093dfd78e6b
diff --git a/app-i18n/scim-uim/scim-uim-0.2.0-r3.ebuild b/app-i18n/scim-uim/scim-uim-0.2.0-r3.ebuild
index 3672fe4dfdf1..26f68659064d 100644
--- a/app-i18n/scim-uim/scim-uim-0.2.0-r3.ebuild
+++ b/app-i18n/scim-uim/scim-uim-0.2.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 0c0679a56c04..0242d6907627 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/ceph_exporter/Manifest b/app-metrics/ceph_exporter/Manifest
index 4dba4624a2fc..860504f2ee40 100644
--- a/app-metrics/ceph_exporter/Manifest
+++ b/app-metrics/ceph_exporter/Manifest
@@ -3,4 +3,4 @@ AUX ceph_exporter.initd 508 BLAKE2B dfee0d329912868a9b581290e437ebf23a3c53b17d63
 DIST ceph_exporter-4.1.1-deps.tar.xz 7386488 BLAKE2B d5ccacba93ae8ee0f03f349860e02e19bb52a5bd6af7ec1b2c6209d29834a74a6934f19a9435f5be1539e6f141ec41e1219b62660aff90a529513b91a3d0649e SHA512 a6f9a8053d3a8957bd03535089c3bb3c818f153f69c2488db08d0fc9a63f7d30ff3b490b0f0fd81399153a19c853239a9744564881c159bc88f5cf91807e10b0
 DIST ceph_exporter-4.1.1.tar.gz 146022 BLAKE2B d833b59418148efb1008d7d444f27a9310d1214197abfb022f74c8fd7af15eceb04c26bab8307eca80bbb4c60b54e7469da74562e38e06cbf7c3559f01d2e0d2 SHA512 1f840d02b50c6cd55c1fb78d44a9fb0beafd241168d3c1d4ad2a9ede67a4fd67b48311de8af0b637a07b04a562938afb72a3379a3c40d765f73923024a8ddd62
 EBUILD ceph_exporter-4.1.1-r1.ebuild 934 BLAKE2B fbcd0f5f5767cb675a76849a6d5d80804cc1ad59be35bc36c10fa240b8802721a8f03795c5c46ca3900233c65777af6dd6a1135e1e6db56722dcb4910218219d SHA512 e95798b8c9359dfc3892f7bdfee43c42ffc5846e20e5faecd8e538cbd6cfd72ba4519e5decacebb58809a22da7a2816731de2fc88a990e24c10817245c6ebc7c
-MISC metadata.xml 243 BLAKE2B 63665ae2020bc799fa6ebd6e1fca6755be6498803fdbc17cc630f9f4ffa03fbd46a9ad396e70adc3bc1c32b0a746fe4bab1c6291f32e68e636251207bca9e95c SHA512 78eab20831018fcf4957171a83aaaca9ced53380e01f083c07450c30fa1adfc02dd50ff2fa9f491dd62802f6e779264add1c47a09ade0a35cda558c1d5529ad0
+MISC metadata.xml 350 BLAKE2B 19dbaffec8e80e409b9419f0dca4fab3d93d3fba5e6347e8596dd39ecff90d742bb03d03044363e8e73c83c546252af271dbcef4f595fff5b42f12bbd04b5e23 SHA512 70d33e02845ca0b8ca38c316741ad6d8aaa6032acdc4809d1865ec47834f7a8a95d8b01399f671cd8b8259d88f74beefd10d95962a9c671577a84ecf192c1fe0
diff --git a/app-metrics/ceph_exporter/metadata.xml b/app-metrics/ceph_exporter/metadata.xml
index 3b2a9c591010..e8f6eed41f10 100644
--- a/app-metrics/ceph_exporter/metadata.xml
+++ b/app-metrics/ceph_exporter/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>williamh@gentoo.org</email>
-<name>William Hubbs</name>
-</maintainer>
+  <maintainer type="person">
+    <email>williamh@gentoo.org</email>
+    <name>William Hubbs</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">digitalocean/ceph_exporter</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-metrics/consul_exporter/Manifest b/app-metrics/consul_exporter/Manifest
index 21a9928dff65..a91226a1bcf4 100644
--- a/app-metrics/consul_exporter/Manifest
+++ b/app-metrics/consul_exporter/Manifest
@@ -2,4 +2,4 @@ AUX consul_exporter.confd 95 BLAKE2B 11a6f462b15c57e8b97504feb1dc8070c1c6f6b1cd8
 AUX consul_exporter.initd 445 BLAKE2B 4b0f58b838e02b46597734580b1b409c6b2426bbd92d88278d960cd29ae3fe018a7a945bb64ac324657b7a96f13d3ff996458d1c0571c6645e9270638129e6b6 SHA512 fe26e5ea6a272143f18567600580c3cf0f557299fd39353ebaf195feee5a916333be1a779b87716810a2dd77ec6e4fb78052dcf7996065723119369c1081e3df
 DIST consul_exporter-0.7.1.tar.gz 1583526 BLAKE2B 8c3211f1d75a767e18e47e16eef056dc07403abbd1cdb165a45b8d0830124e3e91b7dac67301e1b5d1ed564a94dfe9ff05c43267dbeb950ca1ff9b698ebd25ce SHA512 bc5ef24151d53abefd4b975f1ca3a18c98837c6c650c4bf6851fbc1299620db6e8e79a05d2355579ee78c1d2721ceec4bc946ee76d6bf7acdecb6f76957f5984
 EBUILD consul_exporter-0.7.1.ebuild 1060 BLAKE2B 62658136fa4b1b92c62108a698b53fdca951520e47139255abc786fc6344abd91fb5ad89e6f7321a3b251dabe647839d4f5bcfd7c51f1e19249415ed23744dac SHA512 95c7cb6f8e4ca89b53af552c3634b5ffea34e78825def22bfb9f5176c99e3b87cffffbdb7480cc928a2de0e6d6c13ff05e9a67c9650f76c54f91b814c0fa1aca
-MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
+MISC metadata.xml 340 BLAKE2B cef3ad986e71faa4559aaedd8894ff2b3fd55ed633cc18cd10d08b71edd385197b526e3c5d3ab41501376c35fa509a6bc60e425815db648eb50ee22698911752 SHA512 ea10445a42ddd481ccb2390bfe949c362ce70e237bb3c9cf13454f38e52b3e17f4dcf198e08347c10157d63f6b8ed6f06fc220d44b10a9ff05fee81693b329db
diff --git a/app-metrics/consul_exporter/metadata.xml b/app-metrics/consul_exporter/metadata.xml
index db463f3eeb66..7a57065b9b93 100644
--- a/app-metrics/consul_exporter/metadata.xml
+++ b/app-metrics/consul_exporter/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">prometheus/consul_exporter</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-metrics/dnsmasq_exporter/Manifest b/app-metrics/dnsmasq_exporter/Manifest
index 3bfe06b4b8d5..e32a7ee03c41 100644
--- a/app-metrics/dnsmasq_exporter/Manifest
+++ b/app-metrics/dnsmasq_exporter/Manifest
@@ -3,4 +3,4 @@ AUX dnsmasq_exporter.initd 450 BLAKE2B f4abd4190c75512b8d047573cdb2d0186053213b2
 DIST dnsmasq_exporter-0.2.0-deps.tar.xz 12889812 BLAKE2B d57f3a83bcab80d8fa7ca8ddcfb96897285c5dcd94d6a5631c7c308ead758a6f8bb1b43695d305bc5baf930dc3ca8073c21d99369edbf76c95d167ea0d546f1e SHA512 1967c94ee658828691194fe7495757b7adb8e7116ec58eb039b4797cfb1a8f61fc112a7c56316d1938e6185d3a66eb5082b418c649fde83e52530b1fbd0d00e8
 DIST dnsmasq_exporter-0.2.0.tar.gz 12912 BLAKE2B e4166ff1648b4f6780da767ec2b1ea144d132190d6fc53f77c0ebcc73a8515bbdc198d7f34e1ae806b8c76ae41ed90d60c69cb82294a67397022b522fc22f9d8 SHA512 5f1eb899da3b20c384c19cff0bfe0a8b09a0078b683cabacdaa78ab07153ecf35ddf94bf04cae64891eca83b18c6e027d9096afa9cf2dd2e4d3a2040e3daed0c
 EBUILD dnsmasq_exporter-0.2.0-r1.ebuild 943 BLAKE2B 3d54519877b45c17c1196bc31118ee9fc7df87dfac9bc724578cf0d170bcbd9accfa2953f0003b469a7fc120cd4a9f3f6bdb88c2c51694740f89ab8554a7d13e SHA512 d179f7f858198e652289712e80f0e7b9c604f60a3f37f173cfeb0128c52b3e4f5ad21dd639a543de137bf1889d5eca38526447d671198fab83ef4efc000ac45a
-MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
+MISC metadata.xml 337 BLAKE2B d8bb913d0b5dc696240ca621c53dd619f4008ea44d41b0dbbe0303d8fb4d21ecffc2d85ebc2d0624e592998d2f368a6f07bfdeb44b56bc257fc9fb5b0d30bf81 SHA512 e44c37d318195800960dbd49ce9a110807fc87fb809d3f643ac099d2f7ec43e604b9fc46affe01681957b8502616ffa741064d8b4cab3c6960496de320c7c04a
diff --git a/app-metrics/dnsmasq_exporter/metadata.xml b/app-metrics/dnsmasq_exporter/metadata.xml
index db463f3eeb66..eac5fa0c8606 100644
--- a/app-metrics/dnsmasq_exporter/metadata.xml
+++ b/app-metrics/dnsmasq_exporter/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">google/dnsmasq_exporter</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-metrics/grok_exporter/Manifest b/app-metrics/grok_exporter/Manifest
index 89b714be60c6..adbe6f55a2fa 100644
--- a/app-metrics/grok_exporter/Manifest
+++ b/app-metrics/grok_exporter/Manifest
@@ -1,4 +1,4 @@
 AUX grok_exporter.initd 566 BLAKE2B b95ccaa8e4829a02b1bf57f22693629b6e853ac7fb9410c88c5ece617209d52ae4453123300032fc1e424c13c9ab4f0f19cad2b417c0f3b1e62500e44b4dc613 SHA512 b3ff88a1339dfc54b694a4bd73e9256eaef75cbfcf7a8a077fa5b7e51548fef9b0887e5d42892b8b985d9b200605eea6bf5da579fba9732fe3e066dea9e36c3b
 DIST grok_exporter-1.0.0_rc5.tar.gz 2324696 BLAKE2B 2042067127e18fb63d2ecc412fa75184b410e27a755fd06c3634c7b345c13b1bd1d000e323467d10cc5a0cf13363b6782c4c98532875158a793111fe56a36edd SHA512 5b4772aa4b147dadc2d8298d043cc8329cbfeb081dc9bc686c34e16ae0c8a4fa30e55478a8328293349fda2d3f785a5feeda22d5ea1722ab3fa586375b696a92
 EBUILD grok_exporter-1.0.0_rc5.ebuild 1012 BLAKE2B e8adb17a75b2e6413fa55927c1885a1c35ef7975323eaab8ffc05b88151ab958c25f89b021c7ff9b852a252cb827758e19e14414393ecfcb6cf910d2d4193acc SHA512 65f937922d192e63469d108011f113c2a64e34ed57132299d4408baecbfd851f0bc94d7544c31e354dc0d8e93cf478516d6d5d260ef6b63a08fbde57e7ba1605
-MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
+MISC metadata.xml 333 BLAKE2B da516e8856f3a544135fc5ed3e69e674cc136c47ea943264885870c4c237d9b6f7e12c4b36719d13f2aecc67dcd6be6efaff5add481fc6c1ca1f228d13df9da6 SHA512 e9e283b8d2515e6fa1437647be059ae949519784a572dd5eae1fc049e5c4cf994f448ea4d7d47ff40e4215008356960bf0bf0348efafab4a7ee7a01abefa70c1
diff --git a/app-metrics/grok_exporter/metadata.xml b/app-metrics/grok_exporter/metadata.xml
index db463f3eeb66..114ebfe695bd 100644
--- a/app-metrics/grok_exporter/metadata.xml
+++ b/app-metrics/grok_exporter/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">fstab/Grok_exporter</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-metrics/memcached_exporter/Manifest b/app-metrics/memcached_exporter/Manifest
index 31ad6def5dfa..8136deab49b0 100644
--- a/app-metrics/memcached_exporter/Manifest
+++ b/app-metrics/memcached_exporter/Manifest
@@ -3,4 +3,4 @@ AUX memcached_exporter.initd 485 BLAKE2B c4e34f4ae1e43b78291f24f32857e548a9ba384
 DIST memcached_exporter-0.10.0-deps.tar.xz 24009256 BLAKE2B acdf45e6340e95601ecd5b1a7d5bc6d61ec5f323d01ebd0be54e151643a647dabe4705f70ad6b68c3df254deeb5103406809cf4f7080ca5f6c17765ed4024735 SHA512 e567b0a94d7ccc7b87b51bb08f165b88aae24338a2a28ca8f392057eda508407615d43d5d821ae7fd48ca2d50df2bf2b9d2acce3f7be23d12f79ac4ba09c7ed2
 DIST memcached_exporter-0.10.0.tar.gz 41003 BLAKE2B 497d1643ac7909cda5d82df5cb89dc09a7f961d3a6e7d60d8619f5f0ebce444e565bc00cb98843dd5f81a7618b38bc14dad9af4063bba58e24ae7e7db6a8de00 SHA512 53b913cb7f398dae5de5f3ccf6c468775a30528ff390cbd112dc7a9aba584c36cc7834b74ee1c1130e4ac19d63f01cc10ca5c6853480bdb130248ab7d0f0ba51
 EBUILD memcached_exporter-0.10.0.ebuild 1103 BLAKE2B 17668b04f5c7b3a4f8f01fea94403846938156c7b4a4eb9bbc8748fb3a07a2de4733adbb434575b193fac5f4b35ca97427ec2b08c13729ebbd308a6dd0a6f6be SHA512 93109aea8add399c154513254703b5c08373e447c5e723d4c7db349618c3909fc0e00c33be3b68d97d6cad5e011e76a16760af8760cef2562389ac5f0283dcda
-MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
+MISC metadata.xml 343 BLAKE2B 7d0065b286514be48e4dcc666f127c43b37bb8044b5cca86aa47219754aaa839f4f94aed6b3937031832938d1dfa8fe8bf927b5179d1ebe428cba0e1697dd652 SHA512 bf84217b53e90bad497c0d9b2327626bf6d41d698748019e0f46183e8a95112196c07f9f3539e58f2ca37893bc1ed57258694d866abe5251b96abcd37c6aa91a
diff --git a/app-metrics/memcached_exporter/metadata.xml b/app-metrics/memcached_exporter/metadata.xml
index db463f3eeb66..0fe79eb261c2 100644
--- a/app-metrics/memcached_exporter/metadata.xml
+++ b/app-metrics/memcached_exporter/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">prometheus/memcached_exporter</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-metrics/nginx-lua-prometheus/Manifest b/app-metrics/nginx-lua-prometheus/Manifest
index 463e88807580..4737d94daa12 100644
--- a/app-metrics/nginx-lua-prometheus/Manifest
+++ b/app-metrics/nginx-lua-prometheus/Manifest
@@ -1,3 +1,3 @@
 DIST nginx-lua-prometheus-0.1_pre20170610.tar.gz 10307 BLAKE2B b08fcb126a6d7034c143c7e96709f3f2751d90f60f6b9225f55ed46f7f211ebcf5f1688bd8b2c82286e329dd23e09a5163ad316ba6568755936253e8e55590f1 SHA512 df1022a88e82e388e68146f81e51a53f9b0c1a14a43d58e468d258ac0ca9875c1c88af44c46c91d89dc7fc1fef0ffebdb9163f886d85fde995e61e2cac3b5c81
 EBUILD nginx-lua-prometheus-0.1_pre20170610-r100.ebuild 951 BLAKE2B 180cf0823943d7ea3e09bdf63eb6c3f69ebf180b8596e62d3828716b980e2ec5d1d518cd99b53c24da6605571c5574be665af7e721314641983e2b6b0fb8adec SHA512 6629fa183078273acc278fb55f3682273eca1be4e29b5e867913de6063174cc650834b1234a3706599e29f37d8713a0a91640060c6a09e41760f2d88a18bae5f
-MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
+MISC metadata.xml 340 BLAKE2B 35ab513999e0559d9e836235d41489e9cbef32819a75250f1818a096d5eee6f3d8335d906546a19deca5f062c8c420dde3a2a647fa2687b805fcde501dacb104 SHA512 4814998b8ea719d4b455eec3fc5ccc87c599093182e17791a088ede4542bcf0620af824a6ba69d5e70b780bd73aca1d018df9526791ac06192cbb98e7e976973
diff --git a/app-metrics/nginx-lua-prometheus/metadata.xml b/app-metrics/nginx-lua-prometheus/metadata.xml
index db463f3eeb66..f914d62ef5af 100644
--- a/app-metrics/nginx-lua-prometheus/metadata.xml
+++ b/app-metrics/nginx-lua-prometheus/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">knyar/nginx-lua-prometheus</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-metrics/process-exporter/Manifest b/app-metrics/process-exporter/Manifest
index ae3098770bac..9663d4560126 100644
--- a/app-metrics/process-exporter/Manifest
+++ b/app-metrics/process-exporter/Manifest
@@ -2,4 +2,4 @@ AUX process-exporter.initd 443 BLAKE2B 7b1c0475cb3c0c96685b8831578df131661787221
 DIST process-exporter-0.7.10-deps.tar.xz 106360268 BLAKE2B a06448eb38cee7cac6c93d8dedecfbb4fc7152f25c7ff42cb440aa6162aa8daac5ddbe7e56e99d96386b70723124b59f0bd0ab9df2b3f519532ac9487ba34b9e SHA512 6982da5d9c4ecdeacaa970baf0c820e0e3053ff3dbbbb260e7f3e68bff2c1e04beffbbbe8546e1f680d0dcba2eaac256a1bce4b6eee290a847ce70fe8653b68d
 DIST process-exporter-0.7.10.tar.gz 55320 BLAKE2B 72497d513105486de9bc212f4b8af14c52afa8acbcf04f52ab8015bef78172936917cb58573a4ea16b4b3e433e90b404da6658012d904e3d3d787787c7c16c4d SHA512 fd7ff44b28a608184ee0045c2304dad6d5ba0a1b122f9098244a46dfcfd54d0a9e65bb2891e5198ecb9f4bc51a0fcc8577880a05f2e29a073d15e8b0cb5766c1
 EBUILD process-exporter-0.7.10.ebuild 698 BLAKE2B 1fb86f1ba8c15fb5983efc61c17f60df1060a5bac8109a00ee2f0b2d38b2212c4d0e17406f278ab6bc464dd4d7e33dd1a4da11864221f2d0c272be343a301050 SHA512 00a1b82e4c91225af7eb6b6e06c19c00b34ea236eb34951d1603e8d667beb9c860e5ec7afcf98a7b6869fe833858677d57efc85e39276e6b57ed3d7891c0e9fe
-MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
+MISC metadata.xml 340 BLAKE2B 0de18fb34400a6b49cbcb2722b8e795deeaca317ed8d748d0f30351c3f03a050a507fbe17eed52707bfbd3765b5c67e6e75bb9f6dde9ed6e285907d6d69f35b8 SHA512 5b48439cc93734d94d84553946e03ee70d4bca29055d76ce358df294800861c8f801a0cb6e2ecd67d7c36edb4cf24279470fe868d3a2a308595c733c307e8cab
diff --git a/app-metrics/process-exporter/metadata.xml b/app-metrics/process-exporter/metadata.xml
index db463f3eeb66..bcdac9073e99 100644
--- a/app-metrics/process-exporter/metadata.xml
+++ b/app-metrics/process-exporter/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">ncabatoff/process-exporter</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-metrics/rabbitmq_exporter/Manifest b/app-metrics/rabbitmq_exporter/Manifest
index 75a1e4f64c47..6814004eb391 100644
--- a/app-metrics/rabbitmq_exporter/Manifest
+++ b/app-metrics/rabbitmq_exporter/Manifest
@@ -13,4 +13,4 @@ DIST github.com-prometheus-common-2998b132700a7d019ff618c06a234b47c1f3f681.tar.g
 DIST github.com-prometheus-procfs-b1a0a9a36d7453ba0f62578b99712f3a6c5f82d1.tar.gz 61720 BLAKE2B 2f9b25506527aaf6e1bf560a1b680b958d1281acbaa2bb896bfea50b5b7de8992d10e8e812f8ae449ab67145c88179c15afe1f719851d1717b28963071088082 SHA512 5938b4a8fa9a5ee32be995fed0d0e6b26941765470aca4eda63a7c42db457e83da43fde2f33b2d4ded3545e5643f607ec7060406b0a1b15e64cc732bb2badd4a
 DIST rabbitmq_exporter-0.29.0.tar.gz 36950 BLAKE2B c4e10acb4fb610725dfc82c227ccf79ca60ffc30cd6c3f4ff741020cd7d2a757895af046bc2ded8a9b6a8c3fec870abb746e0f363e12d5221ccbce4b0fa6ca3c SHA512 8806e4a0c62126ef3575be2d558663165c04bf9b94a865d078e1ca92c0bb2d4ab057f6c37993236ab2327c1932bcf155c90ce9729924a06066da74e68086485d
 EBUILD rabbitmq_exporter-0.29.0-r1.ebuild 1912 BLAKE2B 651f68d19bf87354a76b5881d577a3ec7aeb51cbf1ac1c61aa4f285bd70c5d7d1bc0d650f52286e3d2db67bb0e615bf4452ca995165029c5847c78c7e89d7637 SHA512 43388411f40a618b5a18bf5db0be7eb6b3422ca22f9da43acdd1e7d06227776628b0c4bd276bc45fe81899f1bf3f44adc347f930164adaac39a8992a9805bb62
-MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
+MISC metadata.xml 338 BLAKE2B ed425191ceda8f7a949a22e589dd1fb26bc8af996f6e4ad8212bc197825e90a94fef22b89d73947e641bd1c1f23f5125751d5cc5f1c52abc4efa600ba89506d0 SHA512 bdaff4f85b11d4c3d714a5aab4408b2b42f3880631bfec65b4612d84fce47610648e8d9c1a4ab86b5dc73c0cc06d80f8a2c46553263ccbc35e619d764ecfe4fc
diff --git a/app-metrics/rabbitmq_exporter/metadata.xml b/app-metrics/rabbitmq_exporter/metadata.xml
index db463f3eeb66..363b01159674 100644
--- a/app-metrics/rabbitmq_exporter/metadata.xml
+++ b/app-metrics/rabbitmq_exporter/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">kbudde/rabbitmq_exporter</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index f1d02540dc92..d8037744cdc9 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/fr24feed/Manifest b/app-misc/fr24feed/Manifest
index 0bb638d8e091..0e21c1ffa11a 100644
--- a/app-misc/fr24feed/Manifest
+++ b/app-misc/fr24feed/Manifest
@@ -1,10 +1,7 @@
 AUX fr24feed.confd 182 BLAKE2B 10edd368975b775273a7269da6d554c4321b910f1383a9892a0b9ec2c24d776b1f679e541ad3d59a2e3fb76560341ed88debb01ad037f548663ad993c5894fbf SHA512 c614df857f630dc1bea0d7174ae7a26fceda73d6e793609c90d23478e4bb947b45e09f6f17873c22b8888b33bc738d6128466ee09fe4ea885ddc6c31f5188e25
 AUX fr24feed.ini 15 BLAKE2B bb6e818c0ee430ca84bbc59688a6087fa50095521d7c7e8cd799d5bd2b0f7607c056dc826b0d71571f709afd35fbd4808cd54480b4bcb0ec68c024c333ae04f2 SHA512 b3b9f0597a74f29da5c0308c9acd0d42a0d70165aa3ef53f03c7412dbe69a8d7472111c9ab273c93aa7ef06f9146555f4b3255d2bcbc2b3b356db867998bc186
 AUX fr24feed.initd 618 BLAKE2B 5e7a6cf2160be2cce8f5779b2fd6613a2cc4d8e754a8538cf5d6ff39e434ed97b5763ec76ed97a1cfd1e36e3d9884b63604e770368668cfa1ad9f0599f08e928 SHA512 8bc686237a15206569aea00a68e3f6bbf97036915c23781a122831b43ac3045e12b440f565d862b25ff3b453fc17cd32a026cafc7e4409aca6dfef0514901528
-DIST fr24feed_1.0.34-0_amd64.tgz 4288772 BLAKE2B 82e343206f09de28c89e137180263ce2039c1450ba39d73f974c178c56a3f0488fe1a146709943c13cbfbbb0e91feb8f7ee083066adfb5ad7a9029886fac2b74 SHA512 c8c1288001c8781377662351e6f23d61e0120e6085f22da79b2782f07fde17f26ec7a70fed4ed73fad6ccb7a421be3b5ad3bfef79de9fc9a54c7efe9db00c9a9
-DIST fr24feed_1.0.34-0_i386.tgz 4173637 BLAKE2B 0b80092de623a1d8ac0260259a758af999fa738589cd38b196a719429077ad0c3c899ae9ee7034282653e23157669a592ca8ee3fb8d63de5cea328eb614b86db SHA512 6885be5179c9e6cddba21f6cd0f3b7749a1d8e7e0e4e4fb4a2290e7c9bc1d20c62cd0b150f7925276f3bdd55fceaf27d4143f9162587d0a71d9da81f3a274913
 DIST fr24feed_1.0.46-2_amd64.tgz 5481020 BLAKE2B b2e4b0b53b62a7056fda3868a35358d943cb31cdf988cab94d0bf9df67fd83d7db4ffedcb6582e90a062d18885f6cc8a5c8a680e530f7f1fc0c91fd49c6db265 SHA512 83d22375f9e294a8ad862b01b3e093908cecb5a7751ab9ad3c5c0b7dadae7a1007544c373a78f39e14a5cbc1c10e18157a8ef81844695a17b21e3836eb9b2bb7
 DIST fr24feed_1.0.46-2_i386.tgz 5322012 BLAKE2B 2bea3c93bcfcf6c23904b9a283f7e3dc43f564173a9dd9063858d3070548de67868fe4adf8bea3e505279c2dd1c9936fa1f9d60da14ea5b8a59b611432299fdb SHA512 67a3771e3b9ff4f75491a1b99e03f0942418d87d9b30ac650a4f33fae116547133c95d37f4384832bf59a16d01b506cebc3227f4bbc7c08da800510d1ea02bca
-EBUILD fr24feed-1.0.34_p0.ebuild 978 BLAKE2B 302c7d4da81553841e5a86bfdc2a299b77a914433f4626669e633dd756eed383ec056a3e12b67ff097ddcdced305e0c800e3be415ab242fbd58b67bc6b8dd49f SHA512 7e493ce6d422a245a791915e0991a1a84c6a3bc0e5c398a8999280576891f56df60f8111a95838b3331b5a05e07f376e4efe900a425051ba56de72d27821e159
-EBUILD fr24feed-1.0.46_p2.ebuild 948 BLAKE2B f7f4276f7778e2b1aa6e3d50f822360351f7d502b926f58c6c647fbd5ecd8138cde0a07729eac4f3c420e600c000769861353e00f922ae03ae850590201bcd9c SHA512 d61e1f03b77414e004cdd1e725026a6680de89c745676f2f192b6db40ce1fbc50020b9e134413d44e90804def267fafff00d887e0659b6f119f3e45c32de4943
+EBUILD fr24feed-1.0.46_p2.ebuild 946 BLAKE2B a04ef7e3c430769cd0579a205fb11b701c39c3548c1b3f6af4ebe82384d2915f60f3cd10b19408c15265c7d68a08d12cd037b8d3db74de769b30bc04b1f84e48 SHA512 3e8471c4baca853c7c9d47d28b40baa01bd1d483ecc5881b0231eb0745e87b580141054652775f4c9e59de601926039b027a34386fe2677458e1a0743a5da1e4
 MISC metadata.xml 892 BLAKE2B 3f633d57522476cd02848c3cf0a71a2882902f46c297c9983abf370b904eb0e002f97204efbdb9c2343095950d9ae2984e75e579190353fc8298c0b91b5f635f SHA512 f77a024b866b96fe8b2d690ffa88f1c4e6a1a79af211d4e2f56b8e361980f8734e514c9d5a7d140ecc3dd9fb51761c25cca43807fc56b4aa24447cfdbda9a66a
diff --git a/app-misc/fr24feed/fr24feed-1.0.34_p0.ebuild b/app-misc/fr24feed/fr24feed-1.0.34_p0.ebuild
deleted file mode 100644
index a351172dd87e..000000000000
--- a/app-misc/fr24feed/fr24feed-1.0.34_p0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV="${PV/-/_}"
-MY_PV="${MY_PV/_p/-}"
-MY_P="${PN}_${MY_PV}"
-
-DESCRIPTION="Flightradar24 data sharing software"
-HOMEPAGE="https://www.flightradar24.com/share-your-data"
-SRC_URI="
-	amd64? ( https://repo-feed.flightradar24.com/linux_x86_64_binaries/${MY_P}_amd64.tgz )
-	x86? ( https://repo-feed.flightradar24.com/linux_x86_binaries/${MY_P}_i386.tgz )
-"
-S="${WORKDIR}"
-
-LICENSE="Flightradar24"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-RDEPEND="
-	net-wireless/dump1090
-	virtual/libusb:1
-"
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="usr/bin/fr24feed"
-
-src_install() {
-	dobin fr24feed_$(usex amd64 'amd64' 'i386')/fr24feed
-
-	insinto /etc
-	doins "${FILESDIR}"/fr24feed.ini
-
-	newinitd "${FILESDIR}"/fr24feed.initd fr24feed
-	newconfd "${FILESDIR}"/fr24feed.confd fr24feed
-}
-
-pkg_postinst() {
-	elog "Please run '/usr/bin/fr24feed --signup', to register yourself as a data feeder."
-}
diff --git a/app-misc/fr24feed/fr24feed-1.0.46_p2.ebuild b/app-misc/fr24feed/fr24feed-1.0.46_p2.ebuild
index d47ca576b62b..21cfd04ac05e 100644
--- a/app-misc/fr24feed/fr24feed-1.0.46_p2.ebuild
+++ b/app-misc/fr24feed/fr24feed-1.0.46_p2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="Flightradar24"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="net-wireless/dump1090"
 
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
index 754866e512ce..2a50a3edbcde 100644
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@@ -1,7 +1,5 @@
 AUX jq-1.6-r3-never-bundle-oniguruma.patch 867 BLAKE2B 7afe5d3390071a4ccd14ae376c27db07f3d189a32973d82d77b3bd0b8826cf3ed6c032e31e0b7ffdf3834050aeb367316f8930dbb0a1a66218f86ab94cbd36ff SHA512 27b38e765e0850cb97c51015f36ebc447bd23066b640269ff4ea838946545dd86cdd975393943bf4257dc9ce8436a16b610e34883ddacc64b8106f895d1c79c3
 AUX jq-1.7-runpath.patch 572 BLAKE2B 31daf5c3062a446c9e745f065b90add1d23fb6738076becbb67cc3412bdff6b062a66502e453900366d0c4feef90925ffe220acd4d8672c96b611895185a3808 SHA512 00958a570efdc54af7105299576cf528d8091fac0a9aa63bb362a9852d0923d7c0d5207e9349eea29dc7d782547b192554c36b9cd1b50dfdcdbf622c46f7d1e0
 DIST jq-1.7.1.gh.tar.gz 1323338 BLAKE2B 17e3b68e23f9a7f1aa8749ede6c0b8fe435990899886f0c96da36d130c17d13609ba7f910321316f0c3b35985360f8cb5e6a3b12caea5e9bc7792e128798f137 SHA512 af9c444e5306423182f467a53acdf45bb8aefa058a47f490ce16395f0aebfb7627e3843f65e96f41cd9d4b72b8ad274ab0bdb061abc6990b1158f86d2256d4ec
-DIST jq-1.7.gh.tar.gz 1267139 BLAKE2B b6a54f9beaabd7915d7a8f14cda9621573f1796af53fe1645561a7a199787a7e9b2b2df038208f23e63f339dec567851b70696ffb8194986250527333d36d44e SHA512 01676319fe98d5ab1e278430b2c58ec594191cc9485a20312d658c0e199ac7ea5f5e934817ce98da0864ec7e0a018aae9b87525260e8ab6a7bde918db483bd84
-EBUILD jq-1.7.1.ebuild 2219 BLAKE2B 3736b326b46f405a92ce99a690f69a8b6cd90899ae098f2123c3c684b19475be3ff0b2c18af61df76f925d80c628712e2bba5716ba9e8d0b3f0c571b70b1bdb8 SHA512 b32b685332a17387804953df1d216a02aa14451d9bb9bc18251906dfc8baf039e39029fa16c827a743cef509b338936519a63344ae3c0489aab0ec7a09f29f6a
-EBUILD jq-1.7.ebuild 2217 BLAKE2B e61a4350121fd8f13af941c30d3995b9932709dd1bc479666cbc1b873cb653b4a83e494dbe157440e3fb61e1d92b0a68383e0c53cf16d19f0728d1b31207780d SHA512 4ccd85145e3613621ce47e3d4c6e2fce307065f29f2f60bfce8dccfa10d016574a0a376581ff608c752ac71b47c1c7215049f86fe32c3882b6dfcb0d0c8dba69
+EBUILD jq-1.7.1.ebuild 2217 BLAKE2B e61a4350121fd8f13af941c30d3995b9932709dd1bc479666cbc1b873cb653b4a83e494dbe157440e3fb61e1d92b0a68383e0c53cf16d19f0728d1b31207780d SHA512 4ccd85145e3613621ce47e3d4c6e2fce307065f29f2f60bfce8dccfa10d016574a0a376581ff608c752ac71b47c1c7215049f86fe32c3882b6dfcb0d0c8dba69
 MISC metadata.xml 619 BLAKE2B 07d8852baec2c77bdef39bd1bb742ce1148dfdde1c76af80727ea7dda9ebfdc61ee24e3992c3f868c312fb258b8f7a2064996b3a609a801eaeabe09b7a10f6a0 SHA512 10824dca3462dcf96b2025d71f47dbddb3b1fa7ba864fcb5d0a7782423213323143c7c224174b1ac9d69e0c1094285286c213809f023d25542a865fc064d1b04
diff --git a/app-misc/jq/jq-1.7.1.ebuild b/app-misc/jq/jq-1.7.1.ebuild
index e94109ed9ab0..81be3fadd8dc 100644
--- a/app-misc/jq/jq-1.7.1.ebuild
+++ b/app-misc/jq/jq-1.7.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+oniguruma static-libs test"
 
 ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.9.3' # Keep this in sync with bundled modules/oniguruma/
diff --git a/app-misc/jq/jq-1.7.ebuild b/app-misc/jq/jq-1.7.ebuild
deleted file mode 100644
index 81be3fadd8dc..000000000000
--- a/app-misc/jq/jq-1.7.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MY_PV="${PV/_/}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="A lightweight and flexible command-line JSON processor"
-HOMEPAGE="https://stedolan.github.io/jq/"
-SRC_URI="https://github.com/jqlang/jq/archive/refs/tags/${MY_P}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LICENSE="MIT CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="+oniguruma static-libs test"
-
-ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.9.3' # Keep this in sync with bundled modules/oniguruma/
-DEPEND="
-	>=sys-devel/bison-3.0
-	app-alternatives/lex
-	oniguruma? ( ${ONIGURUMA_MINPV}:=[static-libs?] )
-"
-RDEPEND="
-	!static-libs? (
-		oniguruma? ( ${ONIGURUMA_MINPV}[static-libs?] )
-	)
-"
-PATCHES=(
-	"${FILESDIR}"/jq-1.6-r3-never-bundle-oniguruma.patch
-	"${FILESDIR}"/jq-1.7-runpath.patch
-)
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( oniguruma )"
-
-src_prepare() {
-	sed -e '/^dist_doc_DATA/d; s:-Wextra ::' -i Makefile.am || die
-	printf "#!/bin/sh\\nprintf '%s'\\n\n" "${MY_PV}" > scripts/version || die
-
-	# jq-1.6-r3-never-bundle-oniguruma makes sure we build with the system oniguruma,
-	# but the bundled copy of oniguruma still gets eautoreconf'd since it
-	# exists; save the cycles by nuking it.
-	sed -e '/modules\/oniguruma/d' -i Makefile.am || die
-	rm -rf "${S}"/modules/oniguruma || die
-
-	default
-
-	sed -i "s/\[jq_version\]/[${MY_PV}]/" configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		# don't try to rebuild docs
-		--disable-docs
-		--disable-valgrind
-		--disable-maintainer-mode
-		--enable-rpathhack
-		$(use_enable static-libs static)
-		$(use_with oniguruma oniguruma yes)
-	)
-	econf "${econfargs[@]}"
-}
-
-src_test() {
-	if ! LD_LIBRARY_PATH="${S}/.libs" nonfatal emake check; then
-		if [[ -r "${S}/test-suite.log" ]]; then
-			eerror "Tests failed, outputting testsuite log"
-			cat "${S}/test-suite.log"
-		fi
-		die "Tests failed"
-	fi
-}
-
-src_install() {
-	local DOCS=( AUTHORS NEWS.md README.md SECURITY.md )
-	default
-
-	use static-libs || { find "${D}" -name '*.la' -delete || die; }
-}
diff --git a/app-misc/rtlamr/Manifest b/app-misc/rtlamr/Manifest
index c68c50be7e0b..241a0087895b 100644
--- a/app-misc/rtlamr/Manifest
+++ b/app-misc/rtlamr/Manifest
@@ -1,3 +1,3 @@
 DIST rtlamr-0.9.1.tar.gz 961802 BLAKE2B 164e3071871a52ab13cadf55f3ac79243625de01f054ff0777b45928f8fc2f29c9088a1935499ec9363efeef66ec07ae68e659aa82662d5198c0037bbf953cef SHA512 1219d408ca324a2bb8a3b412fa1c8c04c637560cda2d49e5b66de7c8082d01f0ccb6b3fb4db520a5bc9ef74285c74e0b160b3c7c9de6fdc05054c27f19d3bf15
 EBUILD rtlamr-0.9.1.ebuild 497 BLAKE2B bb0eb7282f08da51329de3a73ca12f7cd5ff94877131c8ba43ba85632785c1c316f99b58782167b4542587e99c5ec426f42d226c3a293a973b7917f73feebf02 SHA512 a4228d778fb404cb7c2cc4e4b409aa8945e7316f2bf2424a1018114289a86e90ead64d0ea697026691a2483f37fc059e68b30bfc08c0ffb7b6fb2b0b16b3d27a
-MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
+MISC metadata.xml 329 BLAKE2B 1adee6923602329ea83b131981934f69411ca5b852e7a5f9e2c18f07df39f61866a990fdf0a8757b1a2516624b844f9938a84ed60f0ba5ad34beb86cdca1d686 SHA512 14b6529489dfaad2772c35a76df7a4faa274012ca0c6171af4c930c92f521d05bb19370580b9383331d5d02f94065a7a09489809187d7300b8be648a88ad2fde
diff --git a/app-misc/rtlamr/metadata.xml b/app-misc/rtlamr/metadata.xml
index db463f3eeb66..a7b2b2414946 100644
--- a/app-misc/rtlamr/metadata.xml
+++ b/app-misc/rtlamr/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">bemasher/rtlamr</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-misc/spire/Manifest b/app-misc/spire/Manifest
index 16f280a56b27..458d7c3a706e 100644
--- a/app-misc/spire/Manifest
+++ b/app-misc/spire/Manifest
@@ -11,4 +11,4 @@ DIST spire-1.8.7.tar.gz 2628189 BLAKE2B d3aac37fedf0035191dfef58a947b3da7551ba22
 EBUILD spire-1.3.3.ebuild 1402 BLAKE2B 35013f147606eadf81fad470bf76d9303dc87ae0e9068020cb62a9741ed340055e5764fa8b07485b520eefbfb5d9dc8c25c7150e10d599b5ff3d115b23a4c62b SHA512 d1c7b59db95d3c5d56ef34c8645aade4c5333a3c809b9513a8a1b932056e0b05facff4d8cfb737e8614fb8ddb75805d0b04942aca848cc6fef6a3ddfc9f07f1a
 EBUILD spire-1.7.1.ebuild 1546 BLAKE2B 59f31cbb43e040bf9a66dcb6391f3ee6a1e5a3bb44d4b15ca6e2610bbfdd2a3807bf1351425718138918a1f22fdbd8558f914d8c7ca69d264b3c079758830ca1 SHA512 afd3e2e4bef37337f33822fd5e5adb69f827117ba00bc48658d5b30d77f67a1680a5f04fa8981f03037c0e26f7c1512e4f9afadd99678293ff8cbdb357f3097f
 EBUILD spire-1.8.7.ebuild 1547 BLAKE2B 7bdf6fb16ec758d63ec2135791acbb536139b36b79fe7195b10aeff835a76c10f0a5e035f8ebb0a35086ac600e5ed812a248caa5db85877bb5b7a7a4f25a66af SHA512 ceeb687ea53f1df74109217d8d304aa74f3ce5386f239303eb7c1efd86c9c214981219d495587b907bf8bbe931d39eba51526cd37948610450166ef1e8ffa4e8
-MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
+MISC metadata.xml 326 BLAKE2B 7b7a118d80f01fdf3fb61050463baad127b64405295eb9cdb8d25ed26f5613bd4a783b3672b47989c8fff336cf1892c751350e5e4df887562a4abf211de5fdb6 SHA512 4a762296e3614b2c3abfa4ae6782515185eaaf92e49514fec3562264ac65f35bc9fc51695d5b7e8f71f18ccd55e0be2b18ab49de94a95235303467dec551338c
diff --git a/app-misc/spire/metadata.xml b/app-misc/spire/metadata.xml
index db463f3eeb66..55969a3d8a87 100644
--- a/app-misc/spire/metadata.xml
+++ b/app-misc/spire/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">spiffe/spire</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 40398f9c6036..83622da9433b 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/moneydance/Manifest b/app-office/moneydance/Manifest
index 2de878a76063..4e614233f6b6 100644
--- a/app-office/moneydance/Manifest
+++ b/app-office/moneydance/Manifest
@@ -1,4 +1,4 @@
 AUX moneydance-bin 567 BLAKE2B 4a1f80df1e5e20c08ba95168b680f8e0cdd7413fdc7991b12d40048dde6465db8c4d3a18c7b3f70bb829a2f5d2002258a8e6ccefcc64afbf419633ff948f3e15 SHA512 344e05050f28ea61264899b62f3e14844371ef452b0b84c6146abdecd2b9fc1230102bf2685b6c0649e014048c82ecd5dd7ce3117e65a9a22a2737eb39f4ca9a
-DIST moneydance-2023.3.5064-amd64.tar.gz 149144383 BLAKE2B 5a33330a93a6e0b973f544a66071ed4cafc22d60fed82fa1c791d06a4add209cd355331a7aae5fced070fed8de8461c72133129788905a717c4a4685abd9b443 SHA512 0da77143e9a4449946c392cc02d98c3a0a7080666b2d6f26d49c660f600d8c2534281cdaa689f01142a23bc106a170b7dc576b113795408682402a117285c101
-EBUILD moneydance-2023.3.5064.ebuild 1066 BLAKE2B 7b482ec47dadb7a335206c4864af341dee8fac45c740ea93554e1b7e5c5da760ec61d148169a826997537bfb6fd46252a5cfd8801410705f58d819da18558973 SHA512 4416c5c7c3a64ea82cb798cb51ec11f425fe7b8fe0000b43bc249782823cea8428b9e1baee7d536d9da2d956fbfab923757e512a13a7434195670ee5f40388a0
+DIST moneydance-2024.5117-amd64.tar.gz 146426222 BLAKE2B f7fe5572c7b25a2bee0500e62a12a46e05c5c42916c9e3a65ea55af6fcb150afb8edd5304adc317a3ca94c95e8fb2d1405d06bd68e89db3c71d07ef31ffb0aa1 SHA512 1dc45e5ef195f71d7ec95037f6a1b42cf946feebf82d7b7c238c21bfa467546c983d5f77df5836d7d04e3081c08366eb4b1d1c70fccb83274d758c9419b669b5
+EBUILD moneydance-2024.5117.ebuild 1064 BLAKE2B 89ae81dfa8a239b8cda4f691f27ec366c273c048d635724b27b69335e259205d8b2913ff73ca4b02d86dc277c005c0d10783e335d0ff2acb8eb62edd739ab24c SHA512 cc3475c838089efb9fb527548fcafcb1a6dc12838ad43b3d3c13cb26642cb920eb1c46cc5da3ffb33b5e4f8bd166aef5c2c4e03db4fa97e475bd48deb5b39f1e
 MISC metadata.xml 483 BLAKE2B 99cf5578a26fc1cbef35d9e3a6c9921965209a4939787085839ec1bdcaa5fed282a663056cc4c83b2093d51e7e4eade7403ac8f1a2cec8737571bd3c59659b95 SHA512 40384d7c92f76bbd16409a7a6711625ca52b902580e836b98f9a64e77a2aabcd2d5f8fde99647c93ab25e32614a866dacd8dd85ca5386483a2cd3bd0e1837d0c
diff --git a/app-office/moneydance/moneydance-2023.3.5064.ebuild b/app-office/moneydance/moneydance-2024.5117.ebuild
index cb4920436788..16ed7e74f2be 100644
--- a/app-office/moneydance/moneydance-2023.3.5064.ebuild
+++ b/app-office/moneydance/moneydance-2024.5117.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2023 Gentoo Authors
+# Copyright 2018-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 inherit desktop java-pkg-2 xdg-utils
 
 MY_PN="Moneydance"
-MY_PV="$(ver_cut 1-2)_$(ver_cut 3)"
+MY_PV="$(ver_cut 1)_$(ver_cut 2)"
 
 DESCRIPTION="A cross-platform personal finance application"
 HOMEPAGE="https://moneydance.com/"
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index adba56ebd225..71cc492cd4fc 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/elt-patches/Manifest b/app-portage/elt-patches/Manifest
index 90807f61bdd7..ff16c7989cc3 100644
--- a/app-portage/elt-patches/Manifest
+++ b/app-portage/elt-patches/Manifest
@@ -5,7 +5,7 @@ DIST elt-patches-20240324.tar.xz 45712 BLAKE2B 29a94ad3132ba10f4fc90cde685732b1c
 DIST elt-patches-20240415.tar.xz 46164 BLAKE2B 460a21bb20368c541406d8e0031d379a41d7a41f62a74a2a33c40647261f1dc542693ee9c3148c8f07ecb830c18d6d34500fbe2f05d03902b06967d6f762f131 SHA512 d876049860aad979bdf5e8b9842688cb31f3e1487d4966247ec4bcb6b696c25ef4b2a4abd4b330ecc39cff4f9ef18cf8b401660e59f35468b8dc1a26996a5c06
 EBUILD elt-patches-20240116.ebuild 1121 BLAKE2B 8cab4f98b5693faa9037022f6394b5ab35aebfc9e68070bc37f02922714a1a1d822ff68ae8beae56c0bdb56f195262def79630e030dc86948ab26b8e86c5a51b SHA512 d601772227bd9131addd7302d563f8a02243999c8f7be99297024e94b51389dc17ace6df5ca29dce20b1a572a06c212fc86bd03cd17a45745fd4b1030ef91e0d
 EBUILD elt-patches-20240213.ebuild 1121 BLAKE2B 8cab4f98b5693faa9037022f6394b5ab35aebfc9e68070bc37f02922714a1a1d822ff68ae8beae56c0bdb56f195262def79630e030dc86948ab26b8e86c5a51b SHA512 d601772227bd9131addd7302d563f8a02243999c8f7be99297024e94b51389dc17ace6df5ca29dce20b1a572a06c212fc86bd03cd17a45745fd4b1030ef91e0d
-EBUILD elt-patches-20240315.ebuild 1123 BLAKE2B f6e45b0e31821d3beb16d8fe462e3a34788126555c55a8fd81d2b55260148fe0d2756526a8d07f1b2807e56d07bc8399507cc620aabad95e2a008518dc679acb SHA512 cccd8ca0e57a3ceb6b3d0725474a945586adfee7bc9bb1a9ff511d08bd2e141e654c2bff54cebbafbec59d5d9af62b2d14b9c750e731888dc451adc2894ee686
+EBUILD elt-patches-20240315.ebuild 1122 BLAKE2B 9ec31ef0dabc35401c1da153edbd7c355d4969bd20c405decd68c405c0c5371b4a89b17c344aaad2933b13ef8c309e1d5d64feb6716a3782f19185045a3457c4 SHA512 34cbbfb266337862925aa6a85946f2437dee8156484479209721047d19452585365bf37e37ea8e8f395da2f41c8fabd921f305b3c7e8bed0e65ddcc4579f85c4
 EBUILD elt-patches-20240324.ebuild 1129 BLAKE2B ce0561c78f6c37f5c2950d1298705a5b77aea386af5bfe87df42ed878c44cc7f453c5fe745f224a1a4cf2329f8db5180f0eb0045332962c43e376e233a12e944 SHA512 712d16b3402d00e831efa0274fc4053bc188423fde9c1ddf59f707554fc9170649e58e443b784737337f66f73a687b32a66ddbdc88338d632c2580b76a3c6e8f
 EBUILD elt-patches-20240415.ebuild 1129 BLAKE2B ce0561c78f6c37f5c2950d1298705a5b77aea386af5bfe87df42ed878c44cc7f453c5fe745f224a1a4cf2329f8db5180f0eb0045332962c43e376e233a12e944 SHA512 712d16b3402d00e831efa0274fc4053bc188423fde9c1ddf59f707554fc9170649e58e443b784737337f66f73a687b32a66ddbdc88338d632c2580b76a3c6e8f
 EBUILD elt-patches-99999999.ebuild 1129 BLAKE2B ce0561c78f6c37f5c2950d1298705a5b77aea386af5bfe87df42ed878c44cc7f453c5fe745f224a1a4cf2329f8db5180f0eb0045332962c43e376e233a12e944 SHA512 712d16b3402d00e831efa0274fc4053bc188423fde9c1ddf59f707554fc9170649e58e443b784737337f66f73a687b32a66ddbdc88338d632c2580b76a3c6e8f
diff --git a/app-portage/elt-patches/elt-patches-20240315.ebuild b/app-portage/elt-patches/elt-patches-20240315.ebuild
index fd97160b32c8..e4f296996a88 100644
--- a/app-portage/elt-patches/elt-patches-20240315.ebuild
+++ b/app-portage/elt-patches/elt-patches-20240315.ebuild
@@ -19,7 +19,7 @@ else
 		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
 	"
 
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 55b5696a5593..082dd306788a 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index e3c0278b72d5..3a480e9b0947 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -17,7 +17,7 @@ DIST calibre-7.8.0.tar.xz 44167208 BLAKE2B 676f5519b2809ca91c972ce0b4227aeac9779
 DIST calibre-7.8.0.tar.xz.sig 566 BLAKE2B 03f283bee606d3071a2602ad2b1cc962b3d0cf6737ca294955524da6de7f22ddbe740d9b455332961b847331ad15f47efa884cc65bfe1a42eb46bef9f7a4a1dd SHA512 527a931f6d8701580b7b405124f53b54bb6ca65056aa41d677806a00c2ece3cb138c1c37e0d29394ee4e83487dec9dc7e82b6db63a4154e19f8463c19956e040
 EBUILD calibre-5.44.0-r3.ebuild 8840 BLAKE2B e391fd8baf637882693b9c11b43d2b7e102c8a91767d46210f36a30617d641dcf57146b79230beddf9260ed4db10942b8496458f03b6d9acd24d4ffe0867ed68 SHA512 369964a397b4caccdd060163ad4b15cb6212cbebd021dd1ea8646c9e4a08e25da73bdcaa664f3a23eca0205fcb31d8feaf4abdd655f8cdc00c0608db46535220
 EBUILD calibre-7.5.0.ebuild 7940 BLAKE2B ff30097fd21d286e465410f2796af5bf3e9b67f00e68ac2045a1a6b18b6c67ced488a3d0d8d61b0862f4ca59dcc6839b3256026bb1ae4e535fc5621a661c12d1 SHA512 5cfa3e7e07fd46c506121284017c907d9715196c0d8377e8dfeb843d17fab27f85117f4582e548172bbe8f50fe1e24466e6b22c77e672d8149e3f6c537bc5095
-EBUILD calibre-7.6.0.ebuild 7941 BLAKE2B a4b8f1463fa257bf8e9d7a10a675c1652c8cc67f1330f1606244cffde6b7ef9651070bd1839f2eddcb9e107f72110bc057b8006ff7f5d4032e486ba655a65862 SHA512 7f8c702176baddc3efc69701dc1c87d59e7561c02d2d10a9bca5736c9bf29164bcd7bc3ec5b346f90364aaa889a84b95061d4197c14792fc5afd93147890fca0
+EBUILD calibre-7.6.0.ebuild 7940 BLAKE2B ff30097fd21d286e465410f2796af5bf3e9b67f00e68ac2045a1a6b18b6c67ced488a3d0d8d61b0862f4ca59dcc6839b3256026bb1ae4e535fc5621a661c12d1 SHA512 5cfa3e7e07fd46c506121284017c907d9715196c0d8377e8dfeb843d17fab27f85117f4582e548172bbe8f50fe1e24466e6b22c77e672d8149e3f6c537bc5095
 EBUILD calibre-7.7.0.ebuild 7941 BLAKE2B a4b8f1463fa257bf8e9d7a10a675c1652c8cc67f1330f1606244cffde6b7ef9651070bd1839f2eddcb9e107f72110bc057b8006ff7f5d4032e486ba655a65862 SHA512 7f8c702176baddc3efc69701dc1c87d59e7561c02d2d10a9bca5736c9bf29164bcd7bc3ec5b346f90364aaa889a84b95061d4197c14792fc5afd93147890fca0
 EBUILD calibre-7.8.0.ebuild 7941 BLAKE2B a4b8f1463fa257bf8e9d7a10a675c1652c8cc67f1330f1606244cffde6b7ef9651070bd1839f2eddcb9e107f72110bc057b8006ff7f5d4032e486ba655a65862 SHA512 7f8c702176baddc3efc69701dc1c87d59e7561c02d2d10a9bca5736c9bf29164bcd7bc3ec5b346f90364aaa889a84b95061d4197c14792fc5afd93147890fca0
 MISC metadata.xml 751 BLAKE2B 6421ae0198af28bc4f1e5dfc5ee999ccbde3b8b4c519ffce696cad1b064913261e568018b2777a0c82483c82a83a49dad24991a05cc8c5ae9674f86c09b025e1 SHA512 6df006c27490bda4b3e874f7d169eda893e5c441551b79b4cd062ff0aff5d84d154058fe3ac75e3da18cfbef40ed2636a1caf2bd2f040f9ca7d6600c7fca3f76
diff --git a/app-text/calibre/calibre-7.6.0.ebuild b/app-text/calibre/calibre-7.6.0.ebuild
index fc786f35d76c..d0df8273c381 100644
--- a/app-text/calibre/calibre-7.6.0.ebuild
+++ b/app-text/calibre/calibre-7.6.0.ebuild
@@ -35,7 +35,7 @@ LICENSE="
 	OFL-1.1
 	PSF-2
 "
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 SLOT="0"
 IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar"
 
diff --git a/app-text/docbook-sgml-utils/Manifest b/app-text/docbook-sgml-utils/Manifest
index 2bcf2e7bf485..b528b7ca090f 100644
--- a/app-text/docbook-sgml-utils/Manifest
+++ b/app-text/docbook-sgml-utils/Manifest
@@ -3,6 +3,5 @@ AUX docbook-sgml-utils-0.6.14-grep-2.7.patch 565 BLAKE2B c68fca7e9f273a6d32b9689
 AUX docbook-utils-0.6.14-elinks.patch 239 BLAKE2B 3f2b99e9afe33849af50428053cd057e96420f9a2e004b4193afd8ca5b43b7795ec852cfd5e511b5c2aff8013092c805b0c46b3d334148eb915fab2b2793c315 SHA512 d8848ff585a3db20b95d58f6eb249dcbea039e303f21ae047946e809e734824227a2fab8ff5d5366bba4a66650ccc7f1a0e3b3e11fa1f8b8173c2ae308844b5a
 AUX docbook-utils-0.6.14-prefix.patch 2810 BLAKE2B 1dcb7b40cabc930f96d2caa3c541dba42c7ab380a08cbaf6bf87b9c84dbb13f976c7f1dc05883c308b789c5295fd5ec97c2ef2aa8cf5046c9f302e3d8c873fe8 SHA512 c0fcd0575b031c9dba6ca42cac7e46bfeb687279006b69ba931dbbd546234309f9667e9a6bdd355bd518d8346589a68e1c453b36239fcb158899693819c41f70
 DIST docbook-utils-0.6.14.tar.gz 124998 BLAKE2B c0ae31adbbbf78732362638bdc73638cd67205b4ce2b2ac4e740334fd230c8cb031e5ba3ee9e34110c48ea42115f2f5f4dab4b4b6dd45d963976d2b48d7836a2 SHA512 8052316a643b5eaa6c0373a9ed7f2406e7c3cb3da9d3c955a271c89813a8f3196fcd9e6c8385c7b6b7ecb916515e3ec7897aece4473989f0e4dc52a2bc8bbfdf
-EBUILD docbook-sgml-utils-0.6.14-r5.ebuild 1853 BLAKE2B 06ea398147d39a5a970415c5cf61f35f7a33caa4e2e342eecdf4d68b4e089f2b22d738be3e17eedbd95b51bc3a31402e18db6d432f5fdefda940da9fd24c8d41 SHA512 a894ae7b80702844bbb9d9a13ab85e2e697f9098d3fc578468e8814ee012591373172bac51fed47315b3520ea7daef1554bfab7611ec520036e6fab0cb5aa2d1
 EBUILD docbook-sgml-utils-0.6.14-r6.ebuild 1953 BLAKE2B 68526e5a48313e94b2fd4922273b72b90685bffc34fcf1b0d3119145c725ca8c4a8c3489bf68656f5882742c54d9531f8ac98c32d94e4942b120e49ee0d636fb SHA512 c0ae936ebae81821aecfab575fa6acef981c14f181053d33ae1408433fcd58eaf0d643623b93cbe5cd89f89afe2cccfa63dbb59d00c0e3bebde8d043f70e69a4
 MISC metadata.xml 376 BLAKE2B 41601b1cfab5c502384fe8f8d13e1404d91434eb58573a527d6999d82c26761bce727f42e467f6336c41220d1dc4446b4ff020f3fa66b7ff1c968bf3f688717b SHA512 750848b4e8edd39b3032e4c10f0c3bcb1d5e2251c2faab08cea9effd19ae67263d956dfae37677770fc1a6cce434b3d89b209f78fc164ed48b3fb86968eda59f
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild
deleted file mode 100644
index 43f3d58d7e5c..000000000000
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools prefix
-
-MY_P=${PN/-sgml/}-${PV}
-DESCRIPTION="Shell scripts to manage DocBook documents"
-HOMEPAGE="https://sourceware.org/docbook-tools/"
-SRC_URI="https://sourceware.org/pub/docbook-tools/new-trials/SOURCES/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="jadetex"
-
-DEPEND=">=dev-lang/perl-5
-	app-text/docbook-dsssl-stylesheets
-	app-text/docbook-xml-dtd:4.2
-	app-text/openjade
-	app-text/xhtml1
-	dev-perl/SGMLSpm
-	~app-text/docbook-sgml-dtd-3.0
-	~app-text/docbook-sgml-dtd-3.1
-	~app-text/docbook-sgml-dtd-4.0
-	~app-text/docbook-sgml-dtd-4.1
-	~app-text/docbook-sgml-dtd-4.2
-	~app-text/docbook-sgml-dtd-4.4
-	~app-text/docbook-xml-simple-dtd-1.0
-	~app-text/docbook-xml-simple-dtd-4.1.2.4
-	sys-apps/which
-	jadetex? ( dev-texlive/texlive-formatsextra )
-	|| (
-		www-client/lynx
-		www-client/links
-		www-client/elinks
-		virtual/w3m
-	)"
-RDEPEND="${DEPEND}"
-
-# including both xml-simple-dtd 4.1.2.4 and 1.0, to ease
-# transition to simple-dtd 1.0, <obz@gentoo.org>
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${MY_P}-elinks.patch
-	eapply "${FILESDIR}"/${P}-grep-2.7.patch
-	if use prefix; then
-		eapply "${FILESDIR}"/${MY_P}-prefix.patch
-		eprefixify doc/{man,HTML}/Makefile.am bin/jw.in backends/txt configure.in
-		eautoreconf
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" \
-		htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		install
-
-	if ! use jadetex; then
-		local i
-		for i in dvi pdf ps; do
-			rm "${ED}"/usr/bin/docbook2${i} || die
-			rm "${ED}"/usr/share/sgml/docbook/utils-${PV}/backends/${i} || die
-			rm "${ED}"/usr/share/man/man1/docbook2${i}.1 || die
-		done
-	fi
-	einstalldocs
-}
diff --git a/app-text/foliate/Manifest b/app-text/foliate/Manifest
index f9761c68abde..c8a0cf388aab 100644
--- a/app-text/foliate/Manifest
+++ b/app-text/foliate/Manifest
@@ -1,10 +1,3 @@
-AUX foliate-validate.patch 1073 BLAKE2B 276e30a9efd16cbbbe524bf4ef6edb3eee05b60dfe90a7b460718b016c9cf91ed751fc7a31922fcee4cf4f78cba8d478d9b19c48f9c6cd6a25227615474d2b55 SHA512 b1a28ba2e58440967b8ab683c3d0fc2e7e6510465690fd4494c643d2bad215fa57ce7cd5599def1fa585b8f6b94b650405e6355ef50b38d6bd6f8fcde56e63e7
-AUX foliate-webkit.patch 296 BLAKE2B bc6387586dcde1f2b59a7f1e1e5306f06c73813c0ab17d813eefd5b99fa08940e32307f94f9d6475a03255988aaf9968fbde6ed7111a626ec2c23def102aa7b8 SHA512 2ebc26006de0520edea6cdf427bb420e9a564a6e01294ddca45bb6973e505d54c4d4ff6b64301949a8494abd20a156c6e282ee3689e5206e8c5e2ae269efab0c
-DIST foliate-2.6.4.tar.gz 4824560 BLAKE2B fd109d76a7cd0cfbff3fb7273b232a7c749922c5e4d782ed4b7dcb63e914a7cc0bd6e7623a509c3117e45ead5c1d7538c57f322742e4e826b88bddc6182abdf1 SHA512 af58efa2c33451617dbf7327b56551557d762ac80f1b489d5da1c5a46ebbfe329052149deb8b2f4c7729a7fd46deccd5500fd96c0a662b731c871c1ad8061cd3
-DIST foliate-3.0.1.tar.bz2 7873783 BLAKE2B 678fcd9c384df8b623074a83d5ab64bbd6144301bad60813c2d7735e8c89ed94cc35ef90adf234db894d9fca5ed2a45db985944f5749d3c433f32ebfec0d87b2 SHA512 e4e7344858327b75cbd44c4b4243386c9f175499c14f3d4a4407c6d850af9b585878ead69b4ab1941561ab84b4aa9db0e1ef66eaeabe4bbae5078d652f16b2a8
 DIST foliate-3.1.0.tar.bz2 7902106 BLAKE2B cd804b168529ebde3312954de6e907d4de30ef4342dbcf872757f485d5b5e223c96629c01d6e0e0b3bb7cfcc1e98015b034b053d6a6429138a8aa1ed40b0b0c2 SHA512 36dfb6618b04fcfdd3d298133f9fb592e987b898420da08d1e2e1539f162abc4c06cf28e3c9e6ae5f008554fdec9ab36a69333f5c5074b069c345ae729301236
-EBUILD foliate-2.6.4-r2.ebuild 1209 BLAKE2B bfca831829a675d16b39a27a3a1449431cdb206b7609625df542e7c50d57c682065456e75cdee11126d8c4fbf1ae275b616349792bdfd5c332fa574c3e825285 SHA512 b9f37500296ac30323f85e8d42038438c4f5dc9cc11f6250548d3923a21d96c71e6917b02259a5de62a6585b02b1d46eca2bdbea7d03577b8de5c7fc789e4ffc
-EBUILD foliate-2.6.4-r3.ebuild 1386 BLAKE2B 169da3eec3f401b75bb94da57f182b8491031103c8f771de76e1df4e8a49c29bbe634b04499fdbbbd1838cba7f2997bbf1b84c83f9a1c7f344d4924047ae6eaa SHA512 9d0978ebd368c7b71715aa0e5d27d4834b38617f28189ad1a2eb491c243cef27ef946e587277f0495f90666aae8d73d5f8c3ba929e91bf0e5bbcdb779c0843d6
-EBUILD foliate-3.0.1.ebuild 918 BLAKE2B af474939033cf62326bbae2f2c0eb8655ccbb31a156bf4a3ced4ca9663c176192e58697c42e106809d21898d1de60193bad661158569da6671c83f416fe460cf SHA512 44c20dd72ae14b1cbf3920e59e92bc488d784e9848b0f1e1d3a0c7d4b385e7da7dd1b936d38c1128874a138b66e460dec92d03ff0e8e2c97e52621b63657f351
-EBUILD foliate-3.1.0.ebuild 921 BLAKE2B e2dff17cf6d747361089b49393d84309b223893ede229cd4fda93710dd5dbf2ec364da55f7f8e2e484f088b17b9b4bd6d28f22efa7c866dd91979c401e1f38a9 SHA512 3a679ddcd7d390a6028ac0298e4c7fdfe8592fc3960181939d041876abcba1f43aa6de8f2b1e022e0899fa8de788585d0105447ee53f3c5657f0d1033e751c10
-MISC metadata.xml 607 BLAKE2B ab5cffaca496e55fe6c7cce465104fe2c0010d4ef6110c816575944d7f48ae94d834ac61430e1c722daca0ceb739fdb4e2ad35b2afef010675726aea967d2ea2 SHA512 7e1d53bcd78408d6ef3803871d131beced46b118555d7daf0ccc0abf6233d3892568ca3264f1b123f20524d56600cb162c53057fb38a0811571a98ca0051573b
+EBUILD foliate-3.1.0.ebuild 920 BLAKE2B c84656143ae140f637f6962f6dbc99e16e94ae6c74cc3e752fcc701b5ea9b97adbc2b8bffad07326a3f9c1f2cc7ac6d187d3ebd91693dc7dd3754d242da1211f SHA512 54db85697a1ab7529f3e11c7b5c36cb52844213a9228e7cd1264923ac4a65c62546046d389979c9854a7c228ebe9ff7906edeb5988f05d85032828992187733d
+MISC metadata.xml 527 BLAKE2B b5c85198cff7dacca2093d8ba3899e74d8cfdef703f5166517cbef8084eb1386494ab4749d7609bdfa39b18051ffecfc10eb31604088c7c73343731cd21384bc SHA512 1235c2c0a5f68cd6c2e11f2563a61239960b76ca23cf98ac37340ac19c33d14e82a0063842fa93f6347cba5b813c8207388dbb3299edc1aeb6ff2843b6ed139d
diff --git a/app-text/foliate/files/foliate-validate.patch b/app-text/foliate/files/foliate-validate.patch
deleted file mode 100644
index 45d2c42eef73..000000000000
--- a/app-text/foliate/files/foliate-validate.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -r -U3 foliate-2.6.4.orig/data/meson.build foliate-2.6.4/data/meson.build
---- foliate-2.6.4.orig/data/meson.build	2022-01-13 19:23:26.000000000 +0700
-+++ foliate-2.6.4/data/meson.build	2023-05-14 13:08:00.443754308 +0700
-@@ -7,13 +7,6 @@
-   install_dir: join_paths(get_option('datadir'), 'applications')
- )
- 
--desktop_utils = find_program('desktop-file-validate', required: false)
--if desktop_utils.found()
--  test('Validate desktop file', desktop_utils,
--    args: [desktop_file]
--  )
--endif
--
- appstream_file = i18n.merge_file(
-   input: 'com.github.johnfactotum.Foliate.metainfo.xml.in',
-   output: 'com.github.johnfactotum.Foliate.metainfo.xml',
-@@ -22,13 +15,6 @@
-   install_dir: join_paths(get_option('datadir'), 'metainfo')
- )
- 
--appstream_util = find_program('appstream-util', required: false)
--if appstream_util.found()
--  test('Validate appstream file', appstream_util,
--    args: ['validate', appstream_file]
--  )
--endif
--
- install_data('com.github.johnfactotum.Foliate.gschema.xml',
-   install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas')
- )
diff --git a/app-text/foliate/files/foliate-webkit.patch b/app-text/foliate/files/foliate-webkit.patch
deleted file mode 100644
index cb559bf0003d..000000000000
--- a/app-text/foliate/files/foliate-webkit.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/main.js b/src/main.js
-index 718d420..2ea2018 100644
---- a/src/main.js
-+++ b/src/main.js
-@@ -18,7 +18,7 @@ pkg.initFormat()
- pkg.require({
-     'Gio': '2.0',
-     'Gtk': '3.0',
--    'WebKit2': '4.0'
-+    'WebKit2': '4.1'
- })
- 
- const { Gio, Gtk, Gdk, GLib, WebKit2 } = imports.gi
diff --git a/app-text/foliate/foliate-2.6.4-r2.ebuild b/app-text/foliate/foliate-2.6.4-r2.ebuild
deleted file mode 100644
index 55777f866399..000000000000
--- a/app-text/foliate/foliate-2.6.4-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PLOCALES="cs de es eu fr id ie it ko nb nl nn pt_BR ru sv tr uk zh_CN zh_TW"
-PYTHON_COMPAT=( python3_{9..11} )
-inherit meson python-any-r1 plocale xdg gnome2-utils
-SRC_URI="https://github.com/johnfactotum/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="gtk ebook reader built with gjs"
-HOMEPAGE="https://github.com/johnfactotum/foliate/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="handy spell"
-
-BDEPEND="${MESON_DEPEND}
-	${PYTHON_DEPS}
-	sys-devel/gettext"
-RDEPEND="dev-libs/gjs
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	net-libs/webkit-gtk:4[introspection]
-	sys-devel/gettext
-	handy? ( gui-libs/libhandy:=[introspection] )
-	spell? ( app-text/gspell[introspection] )"
-
-src_prepare() {
-	default
-	python_fix_shebang build-aux/meson
-	xdg_environment_reset
-
-	plocale_find_changes "${S}"/po '' '.po'
-
-	rm_po() {
-		rm po/${1}.po
-		sed -e "/^${1}/d" -i po/LINGUAS
-	}
-
-	plocale_for_each_disabled_locale rm_po
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
diff --git a/app-text/foliate/foliate-2.6.4-r3.ebuild b/app-text/foliate/foliate-2.6.4-r3.ebuild
deleted file mode 100644
index 666dca3a88a1..000000000000
--- a/app-text/foliate/foliate-2.6.4-r3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PLOCALES="cs de es eu fr id ie it ko nb nl nn pt_BR ru sv tr uk zh_CN zh_TW"
-PYTHON_COMPAT=( python3_{9..11} )
-inherit meson python-any-r1 plocale xdg gnome2-utils
-SRC_URI="https://github.com/johnfactotum/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="gtk ebook reader built with gjs"
-HOMEPAGE="https://github.com/johnfactotum/foliate/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="handy spell"
-
-BDEPEND="${MESON_DEPEND}
-	${PYTHON_DEPS}
-	sys-devel/gettext"
-RDEPEND="dev-libs/gjs
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	net-libs/webkit-gtk:4.1[introspection]
-	sys-devel/gettext
-	handy? ( gui-libs/libhandy:=[introspection] )
-	spell? ( app-text/gspell[introspection] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-webkit.patch "${FILESDIR}"/${PN}-validate.patch )
-
-src_prepare() {
-	default
-	python_fix_shebang build-aux/meson
-	xdg_environment_reset
-
-	plocale_find_changes "${S}"/po '' '.po'
-
-	rm_po() {
-		rm po/${1}.po
-		sed -e "/^${1}/d" -i po/LINGUAS
-	}
-
-	plocale_for_each_disabled_locale rm_po
-}
-
-src_install() {
-	meson_src_install
-	dosym com.github.johnfactotum.Foliate /usr/bin/foliate
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
diff --git a/app-text/foliate/foliate-3.0.1.ebuild b/app-text/foliate/foliate-3.0.1.ebuild
deleted file mode 100644
index 675697e18bee..000000000000
--- a/app-text/foliate/foliate-3.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PLOCALES="ar cs de el es eu fa_IR fr he hi id ie it ko nb nl nn pt_BR ru sv tr uk zh_CN zh_TW"
-inherit meson plocale xdg gnome2-utils
-SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
-DESCRIPTION="gtk ebook reader built with gjs"
-HOMEPAGE="https://github.com/johnfactotum/foliate/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="${MESON_DEPEND}"
-RDEPEND=">=dev-libs/gjs-1.76
-	>=gui-libs/gtk-4.12
-	gui-libs/libadwaita
-	net-libs/webkit-gtk:6[introspection]
-	sys-devel/gettext"
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	plocale_find_changes "${S}"/po '' '.po'
-
-	rm_po() {
-		rm po/${1}.po
-		sed -e "/^${1}/d" -i po/LINGUAS
-	}
-
-	plocale_for_each_disabled_locale rm_po
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
diff --git a/app-text/foliate/foliate-3.1.0.ebuild b/app-text/foliate/foliate-3.1.0.ebuild
index f52ddf361f68..87f75f240349 100644
--- a/app-text/foliate/foliate-3.1.0.ebuild
+++ b/app-text/foliate/foliate-3.1.0.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 PLOCALES="ar cs de el es eu fa_IR fr he hi hr id ie it ko nb nl nn pt_BR ru sv tr uk zh_CN zh_TW"
 inherit meson plocale xdg gnome2-utils
-SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
 DESCRIPTION="gtk ebook reader built with gjs"
 HOMEPAGE="https://github.com/johnfactotum/foliate/"
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND="${MESON_DEPEND}"
 RDEPEND=">=dev-libs/gjs-1.76
diff --git a/app-text/foliate/metadata.xml b/app-text/foliate/metadata.xml
index 86063f52e8d8..56812b6b96b7 100644
--- a/app-text/foliate/metadata.xml
+++ b/app-text/foliate/metadata.xml
@@ -9,9 +9,6 @@
     Supported formats:
     epub, epub3, azw, azw3, mobi, fb2, fb2.zip, cbr, cbz, cbt, cb7, txt
   </longdescription>
-  <use>
-    <flag name="handy">Use <pkg>gui-libs/libhandy</pkg></flag>
-  </use>
   <upstream>
     <remote-id type="github">johnfactotum/foliate</remote-id>
   </upstream>
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index fea161ee03fb..964a52bc8f6a 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 9fb30e6f1585..f27cb167f3af 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -6,12 +6,15 @@ AUX sqlite-3.45.2-tests-x86.patch 3704 BLAKE2B 107828e5cda62c2fc9f6c23efa5a5c1e3
 DIST sqlite-doc-3440200.zip 10704552 BLAKE2B 3d50ac157bd2793c9167328994334a417835e5381e432fd8028e064869b8eab2ab1d213815d2232850d695bc71626e9d89518b201888a43673274cba2a1b345d SHA512 a7c92af0d3a61a2450511cfb507785c7ab64c21c6dbcf5a8bdef509d25a6b3ca35ce93a25ca827497c27abca77d11b794fbbc783e4d8e131981bf1d4b29f83e8
 DIST sqlite-doc-3450100.zip 10746925 BLAKE2B 6e45a33b41b8fd1e0b5ef3a44febf5ed53a19883441f0eaef6d811190a26cd072a49d254a35d5b90f92255082f91d3f7956a6e574b638b34f156f7297588b57e SHA512 dc036737973a29ea2b6cb4fe7ab4468f449e21eed34a773600570ed2e57ed4d195286c75afec91ab76ac55e25a0cc82e73c3b3119a9c8e7b5918bae8a1a3c8c0
 DIST sqlite-doc-3450200.zip 10755940 BLAKE2B 5d70100ae972024a44a0dbe3214e0465b819710dc23e7b68e6995d2a8f66286ef4378b7bbb96bfaab2551954aa09f0aa85ebde60b5a672d5a3e2d6c739393a81 SHA512 5e80255b0030dd6dfc0f93a1d6863a35dc319c6567300ac5f4e16d15c322f0b3fc2681cae7d27de0d23bf6731069d0060b9edddf3d7e0b105c538beab53979dc
+DIST sqlite-doc-3450300.zip 10759906 BLAKE2B 3ad2307d4c5de10f20d0cb58bb673b291a63bf0328c3f1e40e37a4823fadda82e0f1fbfe7c9c76925ab1d1448e76cc4cbce4d4ad15c732f134f1b4b4caee9543 SHA512 8f865302137684c31c4f54d6cbe4ee82126394887930ec50501fb811023bc612878d2dc1c2317e960fe818a277b008a9835475e7a47822fc5ece5fe37aa61e31
 DIST sqlite-src-3440200.zip 14070781 BLAKE2B 9d29964ee15da6a104f4857cb5f2621df5b51d043012789793526f34c56097d7b1b1dcaa7672637f2d16bcab4ff775ba2c8415213b79f80636c0ff2aeff883ba SHA512 5c1fed9c399dad75735a1b4451f8f6be474b07652d74500649e60474691923f56156ef6d5bce51b58367c1676371f1184e32584fe9ac4d5dd0c4776fa6f1d9a3
 DIST sqlite-src-3450100.zip 14152147 BLAKE2B 815fb3e92b080a7c0014b68451f571c174c656ba26c75f76bfca8b2d4c5373e82f4314ad3d9657ee711194019b4534c51bcd3fe71abfec588df2c5e4cdf2f153 SHA512 475de1c473d2d828038a2afb98d74d52b5e0fd06a5bfc8516e44084ed38b1438310172905fd4fe0a64a736d699095ed286dfdee059ceeb50dfb9bb49131e2005
 DIST sqlite-src-3450200.zip 14156848 BLAKE2B a830dce41fd6c9ef936115460ed4aa9be277688389c50545fcb5e8ee65317d3adaf51873ec789556cf293418f7059868c7ffac229dc30756ba5137431839ec69 SHA512 b6e875ab4ed24cd564330e50a87f35aae43c382f88ca86c2eedf5308c7fab683c1880c0053408e864b0cec1feb7ae81aca8a91979a3ee3975f26037a7983011a
+DIST sqlite-src-3450300.zip 14160555 BLAKE2B 1c16a9b26587ed6b50dcd8373d4328266da0a47da7ffff15d505eddc8df74850a5bca3330bd9ee2b52036ccff9fb8aeebea02ef5713cc933753b4d8a4c15b2e8 SHA512 8f44ffdefd2cf09e7edb7cd78d5416fe7b42e01fe4b4e4803ce9d34c7b1b2971ec170a908a94b4bb11737dd3888675c8ff101ff2b41c53b8db05b5954e947cc9
 EBUILD sqlite-3.44.2-r1.ebuild 12998 BLAKE2B 966b5bb1ff09af723212e872ac5b9b90abcc0aea3040f4d0ca07b8e48709f7a390e9d23b40effda97fe913cb5509baeccb5d5ab14488fd9183f4884a8159f2a8 SHA512 819738dfb5631f54cca84bc7f4fe92570e14e069091d223db7bf144a1a1521e119eb2b2d9af7e1f4635245d5c6dc86c6de04ebc0ec68a92e45a7ae8d5c8b9785
 EBUILD sqlite-3.44.2-r2.ebuild 13048 BLAKE2B f96de4afc858433fa5224f341c98d7580096a133237651bf2f6716015d4e3a82e2f881f918280d34c78f143233cb01b4359988f2ffd1d8545c92c96f6b8b7066 SHA512 a2c5d12eb7bad8e584a70c51be398870ac7d851a8d79be9dc5c184ae7e579e42d19550cdf00dd959d3900eada05cac5201bcd17341bc7a637fa9ad98e413097d
 EBUILD sqlite-3.45.1-r1.ebuild 13371 BLAKE2B b48b41cfa7cf530b1f1840d3de06caaae2f373f96605fb3c195430a27e4d8d84dfbfdf50c6a96f8e8752859b866e6d8b29beabf706742d75761cfffe9411cbdd SHA512 85a19292a341bd797c9992fbbff323a4fb9cbd3011486e094a8b603e00976d6eb5ee66cacaf8caf7abd8e68ecd1f29a3b9110d8f6fbc7cec7e793c27e4e77a5d
 EBUILD sqlite-3.45.2.ebuild 12850 BLAKE2B f31414a41ffc3ce4c1f018247ef74372fd533d5d7d0e0603dc5a2cb73b04410cf9f7599d5054dde994ed1a2b3751483237bdb0c533995929be1730d12be9f880 SHA512 91e184ad35434b54fb77ba9cc577c1900ae933cd522b554abc2903d8107875d841357d0cf38d1dd16efb34c483d0fb97c0b6d13c2c88fff70e059932a53ad71c
+EBUILD sqlite-3.45.3.ebuild 12850 BLAKE2B f31414a41ffc3ce4c1f018247ef74372fd533d5d7d0e0603dc5a2cb73b04410cf9f7599d5054dde994ed1a2b3751483237bdb0c533995929be1730d12be9f880 SHA512 91e184ad35434b54fb77ba9cc577c1900ae933cd522b554abc2903d8107875d841357d0cf38d1dd16efb34c483d0fb97c0b6d13c2c88fff70e059932a53ad71c
 EBUILD sqlite-9999.ebuild 12749 BLAKE2B 8d9fd23e015d4c606d894bfeff3c163485b5948bb34faaed74226a688290a414ec398f8cfe47533cc0c36ff1f7a79cc2d597657885a44368d20348f28c2ee79e SHA512 d2aa53da9fa6982d64529b37f91c55080e7fa6c0b26815625b0bd882535e4da54170b7c84d03a1b6949620fc3cb50ad5e84a6b5b8fee0374178b6f888cfa101e
 MISC metadata.xml 824 BLAKE2B 8ab2e8f230bf3a2b26077d90944bca7bf35ae905310205b90bf243365148488303256606c0ee7c3fb736300686466a1c2583bf103693c20063ca668fe9e52647 SHA512 ed4a89e3c2d633cb6ebf8bcbf3ca055d0d1b2ffd801ba559395f812faeaafdfedd97dae11a5a53a4c068e43026fbd4eed4cb12c8b89a7fda6dabe6f78a2e0b38
diff --git a/dev-db/sqlite/sqlite-3.45.3.ebuild b/dev-db/sqlite/sqlite-3.45.3.ebuild
new file mode 100644
index 000000000000..46c442c73331
--- /dev/null
+++ b/dev-db/sqlite/sqlite-3.45.3.ebuild
@@ -0,0 +1,427 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="SQL database engine"
+HOMEPAGE="https://sqlite.org/"
+
+# On version updates, make sure to read the forum (https://sqlite.org/forum/forum)
+# for hints regarding test failures, backports, etc.
+if [[ ${PV} == 9999 ]]; then
+	S="${WORKDIR}"/${PN}
+	PROPERTIES="live"
+else
+	printf -v SRC_PV "%u%02u%02u%02u" $(ver_rs 1- " ")
+	DOC_PV="${SRC_PV}"
+	#printf -v DOC_PV "%u%02u%02u00" $(ver_rs 1-3 " ")
+
+	SRC_URI="
+		https://sqlite.org/2024/${PN}-src-${SRC_PV}.zip
+		doc? ( https://sqlite.org/2024/${PN}-doc-${DOC_PV}.zip )
+	"
+	S="${WORKDIR}/${PN}-src-${SRC_PV}"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+LICENSE="public-domain"
+SLOT="3"
+IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:=[${MULTILIB_USEDEP}] )
+	tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] )
+	tools? ( dev-lang/tcl:= )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )
+"
+BDEPEND=">=dev-lang/tcl-8.6:0"
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+=" dev-vcs/fossil"
+else
+	BDEPEND+=" app-arch/unzip"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.45.1-ppc64-ptr.patch
+	"${FILESDIR}"/${PN}-3.45.2-tests-x86.patch
+)
+
+_fossil_fetch() {
+	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+	local repo_id="${1}"
+	local repo_uri="${2}"
+
+	local -x FOSSIL_HOME="${HOME}"
+
+	mkdir -p "${T}/fossil/${repo_id}" || die
+	pushd "${T}/fossil/${repo_id}" > /dev/null || die
+
+	if [[ -n "${EVCS_OFFLINE}" ]]; then
+		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
+			die "Network activity disabled using EVCS_OFFLINE and clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
+		fi
+	else
+		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
+			einfo fossil clone --verbose "${repo_uri}" "${repo_id}.fossil"
+			fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" || die
+			echo
+		else
+			cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" . || die
+			einfo fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}"
+			fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" || die
+			echo
+		fi
+
+		(
+			addwrite "${distdir}"
+			mkdir -p "${distdir}/fossil-src/${repo_id}" || die
+			cp -p "${repo_id}.fossil" "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" || die
+		)
+	fi
+
+	popd > /dev/null || die
+}
+
+_fossil_checkout() {
+	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+	local repo_id="${1}"
+	local branch_or_commit="${2}"
+	local target_directory="${3}"
+
+	local -x FOSSIL_HOME="${HOME}"
+
+	if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
+		die "Clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
+	fi
+
+	if [[ ! -f "${T}/fossil/${repo_id}/${repo_id}.fossil" ]]; then
+		mkdir -p "${T}/fossil/${repo_id}" || die
+		cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" "${T}/fossil/${repo_id}" || die
+	fi
+
+	mkdir "${target_directory}" || die
+	pushd "${target_directory}" > /dev/null || die
+
+	einfo fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}"
+	fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" || die
+	echo
+
+	popd > /dev/null || die
+}
+
+fossil_fetch() {
+	local repo_id="${1}"
+	local repo_uri="${2}"
+	local target_directory="${3}"
+
+	local branch_or_commit="${EFOSSIL_COMMIT:-${EFOSSIL_BRANCH:-trunk}}"
+
+	_fossil_fetch "${repo_id}" "${repo_uri}"
+	_fossil_checkout "${repo_id}" "${branch_or_commit}" "${target_directory}"
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		fossil_fetch sqlite https://sqlite.org/src "${WORKDIR}/${PN}"
+		if use doc; then
+			fossil_fetch sqlite-doc https://sqlite.org/docsrc "${WORKDIR}/${PN}-doc"
+		fi
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
+	local options=()
+
+	options+=(
+		--enable-load-extension
+		--enable-threadsafe
+	)
+
+	# Support detection of misuse of SQLite API.
+	# https://sqlite.org/compile.html#enable_api_armor
+	append-cppflags -DSQLITE_ENABLE_API_ARMOR
+
+	# Support bytecode and tables_used virtual tables.
+	# https://sqlite.org/compile.html#enable_bytecode_vtab
+	# https://sqlite.org/bytecodevtab.html
+	append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB
+
+	# Support column metadata functions.
+	# https://sqlite.org/compile.html#enable_column_metadata
+	# https://sqlite.org/c3ref/column_database_name.html
+	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+	# Support sqlite_dbpage virtual table.
+	# https://sqlite.org/compile.html#enable_dbpage_vtab
+	# https://sqlite.org/dbpage.html
+	append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
+
+	# Support dbstat virtual table.
+	# https://sqlite.org/compile.html#enable_dbstat_vtab
+	# https://sqlite.org/dbstat.html
+	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
+
+	# Support sqlite3_serialize() and sqlite3_deserialize() functions.
+	# https://sqlite.org/compile.html#enable_deserialize
+	# https://sqlite.org/c3ref/serialize.html
+	# https://sqlite.org/c3ref/deserialize.html
+	append-cppflags -DSQLITE_ENABLE_DESERIALIZE
+
+	# Support comments in output of EXPLAIN.
+	# https://sqlite.org/compile.html#enable_explain_comments
+	append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+
+	# Support Full-Text Search versions 3, 4 and 5.
+	# https://sqlite.org/compile.html#enable_fts3
+	# https://sqlite.org/compile.html#enable_fts3_parenthesis
+	# https://sqlite.org/compile.html#enable_fts4
+	# https://sqlite.org/compile.html#enable_fts5
+	# https://sqlite.org/fts3.html
+	# https://sqlite.org/fts5.html
+	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
+	options+=( --enable-fts5 )
+
+	# Support hidden columns.
+	append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
+
+	# Support memsys5 memory allocator.
+	# https://sqlite.org/compile.html#enable_memsys5
+	# https://sqlite.org/malloc.html#memsys5
+	append-cppflags -DSQLITE_ENABLE_MEMSYS5
+
+	# Support sqlite3_normalized_sql() function.
+	# https://sqlite.org/c3ref/expanded_sql.html
+	append-cppflags -DSQLITE_ENABLE_NORMALIZE
+
+	# Support sqlite_offset() function.
+	# https://sqlite.org/compile.html#enable_offset_sql_func
+	# https://sqlite.org/lang_corefunc.html#sqlite_offset
+	append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
+
+	# Support pre-update hook functions.
+	# https://sqlite.org/compile.html#enable_preupdate_hook
+	# https://sqlite.org/c3ref/preupdate_count.html
+	append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
+
+	# Support Resumable Bulk Update extension.
+	# https://sqlite.org/compile.html#enable_rbu
+	# https://sqlite.org/rbu.html
+	append-cppflags -DSQLITE_ENABLE_RBU
+
+	# Support R*Trees.
+	# https://sqlite.org/compile.html#enable_rtree
+	# https://sqlite.org/compile.html#enable_geopoly
+	# https://sqlite.org/rtree.html
+	# https://sqlite.org/geopoly.html
+	append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
+
+	# Support Session extension.
+	# https://sqlite.org/compile.html#enable_session
+	# https://sqlite.org/sessionintro.html
+	append-cppflags -DSQLITE_ENABLE_SESSION
+
+	# Support scan status functions.
+	# https://sqlite.org/compile.html#enable_stmt_scanstatus
+	# https://sqlite.org/c3ref/stmt_scanstatus.html
+	# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
+	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
+
+	# Support sqlite_stmt virtual table.
+	# https://sqlite.org/compile.html#enable_stmtvtab
+	# https://sqlite.org/stmt.html
+	append-cppflags -DSQLITE_ENABLE_STMTVTAB
+
+	# Support unknown() function.
+	# https://sqlite.org/compile.html#enable_unknown_sql_function
+	append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
+
+	# Support unlock notification.
+	# https://sqlite.org/compile.html#enable_unlock_notify
+	# https://sqlite.org/c3ref/unlock_notify.html
+	# https://sqlite.org/unlock_notify.html
+	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+
+	# Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
+	# https://sqlite.org/compile.html#enable_update_delete_limit
+	# https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses
+	# https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses
+	append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
+
+	# Support soundex() function.
+	# https://sqlite.org/compile.html#soundex
+	# https://sqlite.org/lang_corefunc.html#soundex
+	append-cppflags -DSQLITE_SOUNDEX
+
+	# Support URI filenames.
+	# https://sqlite.org/compile.html#use_uri
+	# https://sqlite.org/uri.html
+	append-cppflags -DSQLITE_USE_URI
+
+	options+=( $(use_enable debug) )
+
+	if use icu; then
+		# Support ICU extension.
+		# https://sqlite.org/compile.html#enable_icu
+		append-cppflags -DSQLITE_ENABLE_ICU
+		sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+	fi
+
+	options+=(
+		--disable-editline
+		$(use_enable readline)
+	)
+
+	if use readline; then
+		options+=( --with-readline-inc="-I${ESYSROOT}/usr/include/readline" )
+	fi
+
+	if use secure-delete; then
+		# Enable secure_delete pragma by default.
+		# https://sqlite.org/compile.html#secure_delete
+		# https://sqlite.org/pragma.html#pragma_secure_delete
+		append-cppflags -DSQLITE_SECURE_DELETE
+	fi
+
+	options+=( $(use_enable static-libs static) )
+
+	# tcl, test, tools USE flags.
+	if use tcl || use test || { use tools && multilib_is_native_abi; }; then
+		options+=(
+			--enable-tcl
+			--with-tcl="${ESYSROOT}/usr/$(get_libdir)"
+		)
+	else
+		options+=( --disable-tcl )
+	fi
+
+	if [[ "${ABI}" == "x86" ]]; then
+		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
+			append-cflags -mfpmath=sse
+		else
+			append-cflags -ffloat-store
+		fi
+	fi
+
+	econf "${options[@]}"
+}
+
+multilib_src_compile() {
+	emake HAVE_TCL="$(usev tcl 1)" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+
+	if use tools && multilib_is_native_abi; then
+		emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
+	fi
+
+	if [[ ${PV} == 9999 ]] && use doc && multilib_is_native_abi; then
+		emake tclsqlite3.c
+
+		local build_directory="$(pwd)"
+		build_directory="${build_directory##*/}"
+
+		mkdir "${WORKDIR}/${PN}-doc-build" || die
+		pushd "${WORKDIR}/${PN}-doc-build" > /dev/null || die
+
+		emake -f "../${PN}-doc/Makefile" -j1 SRC="../${PN}" BLD="../${build_directory}" DOC="../${PN}-doc" CC="$(tc-getBUILD_CC)" TCLINC="" TCLFLAGS="$($(tc-getBUILD_PKG_CONFIG) --libs tcl) -ldl -lm" base doc
+		rmdir doc/matrix{/*,} || die
+
+		popd > /dev/null || die
+	fi
+}
+
+multilib_src_test() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		ewarn "Skipping tests due to root permissions"
+		return
+	fi
+
+	local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
+
+	# e_uri.test tries to open files in /.
+	# bug #839798
+	local SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict "/test.db"
+	addpredict "/ÿ.db"
+
+	emake -Onone HAVE_TCL="$(usex tcl 1 "")" $(usex debug 'fulltest' 'test')
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
+
+	if use tools && multilib_is_native_abi; then
+		install_tool() {
+			if [[ -f ".libs/${1}" ]]; then
+				newbin ".libs/${1}" "${2}"
+			else
+				newbin "${1}" "${2}"
+			fi
+		}
+
+		install_tool changeset sqlite3-changeset
+		install_tool dbdump sqlite3-db-dump
+		install_tool dbhash sqlite3-db-hash
+		install_tool dbtotxt sqlite3-db-to-txt
+		install_tool index_usage sqlite3-index-usage
+		install_tool rbu sqlite3-rbu
+		install_tool scrub sqlite3-scrub
+		install_tool showdb sqlite3-show-db
+		install_tool showjournal sqlite3-show-journal
+		install_tool showshm sqlite3-show-shm
+		install_tool showstat4 sqlite3-show-stat4
+		install_tool showwal sqlite3-show-wal
+		install_tool sqldiff sqlite3-diff
+		install_tool sqlite3_analyzer sqlite3-analyzer
+		install_tool sqlite3_checker sqlite3-checker
+		install_tool sqlite3_expert sqlite3-expert
+		install_tool sqltclsh sqlite3-tclsh
+
+		unset -f install_tool
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	doman sqlite3.1
+
+	if use doc; then
+		if [[ ${PV} == 9999 ]]; then
+			pushd "${WORKDIR}/${PN}-doc-build/doc" > /dev/null || die
+		else
+			pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die
+		fi
+
+		find "(" -name "*.db" -o -name "*.txt" ")" -delete || die
+		if [[ ${PV} != 9999 ]]; then
+			rm search search.d/admin || die
+			rmdir search.d || die
+			find -name "*~" -delete || die
+		fi
+
+		(
+			docinto html
+			dodoc -r *
+		)
+
+		popd > /dev/null || die
+	fi
+}
diff --git a/dev-dotnet/Manifest.gz b/dev-dotnet/Manifest.gz
index 74c24d324611..1f29806cb0ea 100644
--- a/dev-dotnet/Manifest.gz
+++ b/dev-dotnet/Manifest.gz
diff --git a/dev-dotnet/dotnet-outdated/Manifest b/dev-dotnet/dotnet-outdated/Manifest
index f740f545b41c..f9008f43b58e 100644
--- a/dev-dotnet/dotnet-outdated/Manifest
+++ b/dev-dotnet/dotnet-outdated/Manifest
@@ -2,6 +2,7 @@ AUX dotnet-outdated-4.6.0-net8.0.patch 523 BLAKE2B 7067d9c3e1b7498d52f1765ecc779
 DIST castle.core.5.0.0.nupkg 797531 BLAKE2B e24ccd29030be7d337291ea670bf6909b8a58f1fc2a3c413ca2307d948445761ea479e89ea3262196677d32b12cf49c185d90d0c9d5d07ea8330f4decf0dc027 SHA512 210328587ff705f78fa46a9e1bdc07c5a8110335122d533f604bde9382b6317677a3168cb4238a45483fc38bd3d2661738f6afaecc42d170b7ba778912cfa74e
 DIST csvhelper.30.0.1.nupkg 717621 BLAKE2B 7461c95cf2687cb0344261a967c22c33602f2a360a18073fcfc4fcebe9513a56ab15c530683458c7c64bd2ceab4cc8c376aae01905f093f7774efb4bedc4a159 SHA512 f02de9ab8f3a99b5b6d83abc0e8eebbd65563512c3610cbdf4f433202075c342fcfe58245c3ab7735e328433e80f0d6379dbfd5fc5392df27fdaa15182a438da
 DIST dotnet-outdated-4.6.0.tar.gz 134898 BLAKE2B ccefdcffd86436c81ec809eca5c3f7e025789f9bf2c62393408791b4a5105a4896d7217ac73786332ad4402978c9df99a3d62f99498d38bb28c871498030fb7c SHA512 6a6181d8482f2a01653192f6087762e1af5ca49fb795304171bc964bcd6095203460d4bc3e47051d24199d064a24847484d9b20b8845ea2e6cc161fcb999b780
+DIST dotnet-outdated-4.6.1.tar.gz 135711 BLAKE2B 36453875f01b9870723648f2a1e224476d5e5c127bdea033e0584d1dac34e5ff74bf2f3d84bad132d48281cad98a8d58d890c5a76a1f875340b763159d56e92d SHA512 0327833f60407d7ffa820df2be2c8fd1feb12b97c2fbc905fb0d8ce43fe002faee597e44dddbb2e37c3de761e69e8af1b8e40487d4f582d6a26087b8efa05970
 DIST dotnet-xunit.2.3.1.nupkg 774955 BLAKE2B 338a47a377be9bb1edc7bebd765d2d9e740307358bd03ab3f18153f21ad00a7a3cbbb7de0341ae96c0b4355e6f3a41b0e40692d73bd1bfb67d531f054ee0c60c SHA512 2f0ee05b38a7674b4e1826a1284dbf18e2d122ae3f5f741150b318669ad1ebedb03e22a7c5c35d8b43c3a7a1a70ec8253eeb0b74915eb81309bcd998218dcdb8
 DIST libuv.1.9.0.nupkg 1270373 BLAKE2B c20e78a6c8cac53a66968af0eabeb270c84987f2e1e118325034ab07e7d08784c58b60c5ee70b3fc0cae05410da66b446e94b112eda9957bcabce1417394c053 SHA512 75fc28894498f492bdf5db6c599e40059e7a8c5417ba71bd6b4a87416b0f669611f6dd98dae1da4c0b1e076598724914514c87d4cc92ed51197e5a251b94ecc3
 DIST mcmaster.extensions.commandlineutils.4.0.2.nupkg 280825 BLAKE2B 66318edbb1103d364bd4a659bf75cbc3ac448b775abde2d5aba5a1f5e939757bd5d01d02b9e2014aa7da5284c157695159ba39e85a75de748b147ddc7cb16bf8 SHA512 d8767c2101e96f63267638acd3c21aa9b3259a32e7ee49aac5928cf84913a1f28262436adc83482b19c870dca5f734072bb3c9c7b4d23dcc779d83f7cf6b9316
@@ -272,4 +273,5 @@ DIST xunit.extensibility.core.2.6.2.nupkg 277478 BLAKE2B 4ddf6199bf9291c3f726ff1
 DIST xunit.extensibility.execution.2.6.2.nupkg 365448 BLAKE2B 20c1e852121fdeb126ee4b1a895e88baf1bf6046837354cb768397c16e07d7956866791b7d796889da903390eae4eea4dde15e9b6d31aa66d2a4b775660e4520 SHA512 332b7416440605cbd0e641d02553f6163df3dfb41d5f1af5bd7f6b89e27970cd30cbe147a93ec466e501f288c023ae811a772ecc646073344c2b40f2c0ed6d6e
 DIST xunit.runner.visualstudio.2.5.4.nupkg 575805 BLAKE2B 4c236a13f9daa0ef51e2c89f278ab13eaa381e608c760ecda5e509be8e1272dc33da7920996e9a61f8ae83281260bf62f000d8ca8edc29b23369ea1d0a6da0bd SHA512 0d719e261d990e4d3f56bff9a22d43793509ee644e23954d12053bf7be2952b33495fe4620b5975e3a601b1b7bec4c02e126ad3848970b5af4d7783ea91ccb1b
 EBUILD dotnet-outdated-4.6.0.ebuild 10608 BLAKE2B 28195a7320c95e16dffa671d50b05610fe2763acfddc0ad1d76da5affaa3bddb6010164bb7248d627bde8edb08410f012659e335d156d188c410ddf0fc4a29d0 SHA512 2b484834bc64b075c840f60fb077355f7d1ee90f6eb54816430846e8545fbda80eae3b4f2d8ca244f6335566bc3a2698be39f0b7a4c8320f79f5878a138e7511
+EBUILD dotnet-outdated-4.6.1.ebuild 10608 BLAKE2B 0405fd23ff978556ee6e6fa90b99b0007781327b1308b9c99de7fdc603ac9309b2a4e8e1500c333b023449c47672cf540f93adadd9fe319e99842416a04f3d2c SHA512 6f03028f4146cf4ee864a8ab1086551e1f703f85c3f50ea6f3eb536110ef0b8f18a9b2987b821d4778c3ff3464ddd923435f41d8ac9d8219e39e9b058749720c
 MISC metadata.xml 445 BLAKE2B 512ad8e068aba0ff4986a052d318a763cc4338fa948240cce5ae737bf6d2941e3488f5c877f01b4118b3a8c85ca1b22e310f4c720c27c6e0a95c1e883a36d8cc SHA512 7480effe8c3acc0f1c360db47590f8fe05777e524132aa68a1f24552da8c87e859168cc871e62cc8bef53e968d6075f404742c5958e9073ba0a70ca53d2d4425
diff --git a/dev-dotnet/dotnet-outdated/dotnet-outdated-4.6.1.ebuild b/dev-dotnet/dotnet-outdated/dotnet-outdated-4.6.1.ebuild
new file mode 100644
index 000000000000..8d24f392b15f
--- /dev/null
+++ b/dev-dotnet/dotnet-outdated/dotnet-outdated-4.6.1.ebuild
@@ -0,0 +1,321 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOTNET_PKG_COMPAT=8.0
+NUGETS="
+castle.core@5.0.0
+csvhelper@30.0.1
+dotnet-xunit@2.3.1
+libuv@1.9.0
+mcmaster.extensions.commandlineutils@4.0.2
+microsoft.bcl.asyncinterfaces@7.0.0
+microsoft.codeanalysis.analyzers@1.1.0
+microsoft.codeanalysis.common@1.3.0
+microsoft.codeanalysis.csharp@1.3.0
+microsoft.codeanalysis.visualbasic@1.3.0
+microsoft.codecoverage@17.8.0
+microsoft.csharp@4.0.1
+microsoft.extensions.dependencyinjection.abstractions@7.0.0
+microsoft.extensions.dependencyinjection@7.0.0
+microsoft.net.test.sdk@17.8.0
+microsoft.netcore.app@1.0.0
+microsoft.netcore.dotnethost@1.0.1
+microsoft.netcore.dotnethostpolicy@1.0.1
+microsoft.netcore.dotnethostresolver@1.0.1
+microsoft.netcore.jit@1.0.2
+microsoft.netcore.platforms@1.0.1
+microsoft.netcore.platforms@1.1.0
+microsoft.netcore.runtime.coreclr@1.0.2
+microsoft.netcore.targets@1.0.1
+microsoft.netcore.targets@1.1.0
+microsoft.netcore.windows.apisets@1.0.1
+microsoft.testplatform.objectmodel@17.8.0
+microsoft.testplatform.testhost@17.8.0
+microsoft.visualbasic@10.0.1
+microsoft.win32.primitives@4.0.1
+microsoft.win32.primitives@4.3.0
+microsoft.win32.registry@4.0.0
+netstandard.library@1.6.0
+netstandard.library@1.6.1
+newtonsoft.json@13.0.3
+nsubstitute@5.0.0
+nuget.common@6.8.0
+nuget.configuration@6.8.0
+nuget.credentials@6.8.0
+nuget.dependencyresolver.core@6.8.0
+nuget.frameworks@6.5.0
+nuget.frameworks@6.8.0
+nuget.librarymodel@6.8.0
+nuget.packaging@6.8.0
+nuget.projectmodel@6.8.0
+nuget.protocol@6.8.0
+nuget.versioning@6.8.0
+runtime.any.system.collections@4.3.0
+runtime.any.system.diagnostics.tools@4.3.0
+runtime.any.system.diagnostics.tracing@4.3.0
+runtime.any.system.globalization.calendars@4.3.0
+runtime.any.system.globalization@4.3.0
+runtime.any.system.io@4.3.0
+runtime.any.system.reflection.extensions@4.3.0
+runtime.any.system.reflection.primitives@4.3.0
+runtime.any.system.reflection@4.3.0
+runtime.any.system.resources.resourcemanager@4.3.0
+runtime.any.system.runtime.handles@4.3.0
+runtime.any.system.runtime.interopservices@4.3.0
+runtime.any.system.runtime@4.3.0
+runtime.any.system.text.encoding.extensions@4.3.0
+runtime.any.system.text.encoding@4.3.0
+runtime.any.system.threading.tasks@4.3.0
+runtime.any.system.threading.timer@4.3.0
+runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.native.system.io.compression@4.1.0
+runtime.native.system.io.compression@4.3.0
+runtime.native.system.net.http@4.0.1
+runtime.native.system.net.http@4.3.0
+runtime.native.system.net.security@4.0.1
+runtime.native.system.security.cryptography.apple@4.3.0
+runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.native.system.security.cryptography@4.0.0
+runtime.native.system@4.0.0
+runtime.native.system@4.3.0
+runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple@4.3.0
+runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.unix.microsoft.win32.primitives@4.3.0
+runtime.unix.system.console@4.3.0
+runtime.unix.system.diagnostics.debug@4.3.0
+runtime.unix.system.io.filesystem@4.3.0
+runtime.unix.system.net.primitives@4.3.0
+runtime.unix.system.net.sockets@4.3.0
+runtime.unix.system.private.uri@4.3.0
+runtime.unix.system.runtime.extensions@4.3.0
+system.appcontext@4.1.0
+system.appcontext@4.3.0
+system.buffers@4.0.0
+system.buffers@4.3.0
+system.buffers@4.5.1
+system.collections.concurrent@4.0.12
+system.collections.concurrent@4.3.0
+system.collections.immutable@1.2.0
+system.collections@4.0.11
+system.collections@4.3.0
+system.componentmodel.annotations@4.1.0
+system.componentmodel.annotations@5.0.0
+system.componentmodel@4.0.1
+system.console@4.0.0
+system.console@4.3.0
+system.diagnostics.debug@4.0.11
+system.diagnostics.debug@4.3.0
+system.diagnostics.diagnosticsource@4.0.0
+system.diagnostics.diagnosticsource@4.3.0
+system.diagnostics.eventlog@6.0.0
+system.diagnostics.fileversioninfo@4.0.0
+system.diagnostics.process@4.1.0
+system.diagnostics.stacktrace@4.0.1
+system.diagnostics.tools@4.0.1
+system.diagnostics.tools@4.3.0
+system.diagnostics.tracing@4.1.0
+system.diagnostics.tracing@4.3.0
+system.dynamic.runtime@4.0.11
+system.formats.asn1@6.0.0
+system.globalization.calendars@4.0.1
+system.globalization.calendars@4.3.0
+system.globalization.extensions@4.0.1
+system.globalization.extensions@4.3.0
+system.globalization@4.0.11
+system.globalization@4.3.0
+system.io.abstractions.testinghelpers@19.2.64
+system.io.abstractions@19.2.64
+system.io.compression.zipfile@4.0.1
+system.io.compression.zipfile@4.3.0
+system.io.compression@4.1.0
+system.io.compression@4.3.0
+system.io.filesystem.accesscontrol@5.0.0
+system.io.filesystem.primitives@4.0.1
+system.io.filesystem.primitives@4.3.0
+system.io.filesystem.watcher@4.0.0
+system.io.filesystem@4.0.1
+system.io.filesystem@4.3.0
+system.io.memorymappedfiles@4.0.0
+system.io.unmanagedmemorystream@4.0.1
+system.io@4.1.0
+system.io@4.3.0
+system.linq.expressions@4.1.0
+system.linq.expressions@4.3.0
+system.linq.parallel@4.0.1
+system.linq.queryable@4.0.1
+system.linq@4.1.0
+system.linq@4.3.0
+system.memory@4.5.4
+system.memory@4.5.5
+system.net.http@4.1.0
+system.net.http@4.3.0
+system.net.nameresolution@4.0.0
+system.net.nameresolution@4.3.0
+system.net.primitives@4.0.11
+system.net.primitives@4.3.0
+system.net.requests@4.0.11
+system.net.security@4.0.0
+system.net.sockets@4.1.0
+system.net.sockets@4.3.0
+system.net.webheadercollection@4.0.1
+system.numerics.vectors@4.1.1
+system.numerics.vectors@4.4.0
+system.numerics.vectors@4.5.0
+system.objectmodel@4.0.12
+system.objectmodel@4.3.0
+system.private.uri@4.3.0
+system.reflection.dispatchproxy@4.0.1
+system.reflection.emit.ilgeneration@4.0.1
+system.reflection.emit.ilgeneration@4.3.0
+system.reflection.emit.lightweight@4.0.1
+system.reflection.emit.lightweight@4.3.0
+system.reflection.emit@4.0.1
+system.reflection.emit@4.3.0
+system.reflection.extensions@4.0.1
+system.reflection.extensions@4.3.0
+system.reflection.metadata@1.3.0
+system.reflection.metadata@1.6.0
+system.reflection.primitives@4.0.1
+system.reflection.primitives@4.3.0
+system.reflection.typeextensions@4.1.0
+system.reflection.typeextensions@4.3.0
+system.reflection@4.1.0
+system.reflection@4.3.0
+system.resources.reader@4.0.0
+system.resources.resourcemanager@4.0.1
+system.resources.resourcemanager@4.3.0
+system.runtime.compilerservices.unsafe@4.5.3
+system.runtime.compilerservices.unsafe@6.0.0
+system.runtime.extensions@4.1.0
+system.runtime.extensions@4.3.0
+system.runtime.handles@4.0.1
+system.runtime.handles@4.3.0
+system.runtime.interopservices.runtimeinformation@4.0.0
+system.runtime.interopservices.runtimeinformation@4.3.0
+system.runtime.interopservices@4.1.0
+system.runtime.interopservices@4.3.0
+system.runtime.loader@4.0.0
+system.runtime.numerics@4.0.1
+system.runtime.numerics@4.3.0
+system.runtime@4.1.0
+system.runtime@4.3.0
+system.security.accesscontrol@5.0.0
+system.security.claims@4.0.1
+system.security.claims@4.3.0
+system.security.cryptography.algorithms@4.2.0
+system.security.cryptography.algorithms@4.3.0
+system.security.cryptography.cng@4.2.0
+system.security.cryptography.cng@4.3.0
+system.security.cryptography.cng@5.0.0
+system.security.cryptography.csp@4.0.0
+system.security.cryptography.csp@4.3.0
+system.security.cryptography.encoding@4.0.0
+system.security.cryptography.encoding@4.3.0
+system.security.cryptography.openssl@4.0.0
+system.security.cryptography.openssl@4.3.0
+system.security.cryptography.pkcs@6.0.4
+system.security.cryptography.primitives@4.0.0
+system.security.cryptography.primitives@4.3.0
+system.security.cryptography.protecteddata@4.4.0
+system.security.cryptography.x509certificates@4.1.0
+system.security.cryptography.x509certificates@4.3.0
+system.security.principal.windows@4.0.0
+system.security.principal.windows@4.3.0
+system.security.principal.windows@5.0.0
+system.security.principal@4.0.1
+system.security.principal@4.3.0
+system.text.encoding.codepages@4.0.1
+system.text.encoding.extensions@4.0.11
+system.text.encoding.extensions@4.3.0
+system.text.encoding@4.0.11
+system.text.encoding@4.3.0
+system.text.encodings.web@7.0.0
+system.text.json@7.0.3
+system.text.regularexpressions@4.1.0
+system.text.regularexpressions@4.3.0
+system.threading.overlapped@4.0.1
+system.threading.tasks.dataflow@4.6.0
+system.threading.tasks.extensions@4.0.0
+system.threading.tasks.extensions@4.3.0
+system.threading.tasks.extensions@4.5.4
+system.threading.tasks.parallel@4.0.1
+system.threading.tasks@4.0.11
+system.threading.tasks@4.3.0
+system.threading.thread@4.0.0
+system.threading.threadpool@4.0.10
+system.threading.threadpool@4.3.0
+system.threading.timer@4.0.1
+system.threading.timer@4.3.0
+system.threading@4.0.11
+system.threading@4.3.0
+system.xml.readerwriter@4.0.11
+system.xml.readerwriter@4.3.0
+system.xml.xdocument@4.0.11
+system.xml.xdocument@4.3.0
+system.xml.xmldocument@4.0.1
+system.xml.xpath.xdocument@4.0.1
+system.xml.xpath@4.0.1
+testableio.system.io.abstractions.testinghelpers@19.2.64
+testableio.system.io.abstractions.wrappers@19.2.64
+testableio.system.io.abstractions@19.2.64
+xunit.abstractions@2.0.3
+xunit.analyzers@1.6.0
+xunit.assert@2.6.2
+xunit.core@2.6.2
+xunit.extensibility.core@2.6.2
+xunit.extensibility.execution@2.6.2
+xunit.runner.visualstudio@2.5.4
+xunit@2.6.2
+"
+
+inherit check-reqs dotnet-pkg
+
+DESCRIPTION="Display and update outdated NuGet packages in a project"
+HOMEPAGE="https://github.com/dotnet-outdated/dotnet-outdated/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+SRC_URI+=" ${NUGET_URIS} "
+
+LICENSE="MIT"
+SLOT="0"
+
+CHECKREQS_DISK_BUILD="1500M"
+DOTNET_PKG_PROJECTS=( src/DotNetOutdated/DotNetOutdated.csproj )
+PATCHES=( "${FILESDIR}/${PN}-4.6.0-net8.0.patch" )
+
+DOCS=( CHANGELOG.md README.md )
+
+dotnet-pkg_force-compat
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	dotnet-pkg_pkg_setup
+}
+
+src_unpack() {
+	dotnet-pkg_src_unpack
+
+	if [[ -n "${EGIT_REPO_URI}" ]] ; then
+		git-r3_src_unpack
+	fi
+}
diff --git a/dev-dotnet/dotnet-runtime-nugets/Manifest b/dev-dotnet/dotnet-runtime-nugets/Manifest
index 46824447dc53..d35bebb63fec 100644
--- a/dev-dotnet/dotnet-runtime-nugets/Manifest
+++ b/dev-dotnet/dotnet-runtime-nugets/Manifest
@@ -205,11 +205,11 @@ DIST microsoft.netcore.app.runtime.linux-x64.8.0.3.nupkg 34970810 BLAKE2B fb97c6
 EBUILD dotnet-runtime-nugets-6.0.24-r1.ebuild 1446 BLAKE2B 58364d46cbba7e2462b8c832a4dc9be495adbdc1b5db34de6cf93755e4268d15c14a1c7b5e118777c5f41bb97794a7d302fb39b3d4d2187599e2b9e4f0f53d29 SHA512 0494ebf5167919856db14860d8cb9be8e5d768cd6a183a4f386ab13e1867daa30934f1a842969e226a7f73bf87bf9e8f316ecac072d7b6300317a3bff9d82f29
 EBUILD dotnet-runtime-nugets-6.0.25-r1.ebuild 1446 BLAKE2B 58364d46cbba7e2462b8c832a4dc9be495adbdc1b5db34de6cf93755e4268d15c14a1c7b5e118777c5f41bb97794a7d302fb39b3d4d2187599e2b9e4f0f53d29 SHA512 0494ebf5167919856db14860d8cb9be8e5d768cd6a183a4f386ab13e1867daa30934f1a842969e226a7f73bf87bf9e8f316ecac072d7b6300317a3bff9d82f29
 EBUILD dotnet-runtime-nugets-6.0.27-r1.ebuild 1446 BLAKE2B 58364d46cbba7e2462b8c832a4dc9be495adbdc1b5db34de6cf93755e4268d15c14a1c7b5e118777c5f41bb97794a7d302fb39b3d4d2187599e2b9e4f0f53d29 SHA512 0494ebf5167919856db14860d8cb9be8e5d768cd6a183a4f386ab13e1867daa30934f1a842969e226a7f73bf87bf9e8f316ecac072d7b6300317a3bff9d82f29
-EBUILD dotnet-runtime-nugets-6.0.28-r1.ebuild 1449 BLAKE2B dbd3c68aa47da7fa30fd740d19f383e83dcd7a6388c9d7187689febf8e49622c54d3481ff43b87cf1740bfd9a27c881059a143e3b4a46d446c0a318f5a76b5eb SHA512 2fda9cb4b8adfc7b989fd375e157dc47415375a4796695d3cf92ecd3fd2659368d2222c8f7d24297af402357d87e3c9bb72b4e9a0ce1a9e22424c55ee2624bc1
+EBUILD dotnet-runtime-nugets-6.0.28-r1.ebuild 1447 BLAKE2B 57107a5d573851b2679adf2bdbea9a57468671625710f85bf368c7bc3f4578c741cb5d0849b2c34ff34cec74c3fe8fb5be3da8ef2cb99b904c5fd671d4c3bacc SHA512 56fc429e015b16abebcadcfdc226c2fad2b72b6d0182a8726fe36de27603d08c8839a3c07a4ab29e1afd964cc16b6590c520a63b02501c65c52fe540f9fa28d2
 EBUILD dotnet-runtime-nugets-7.0.13-r1.ebuild 1446 BLAKE2B 58364d46cbba7e2462b8c832a4dc9be495adbdc1b5db34de6cf93755e4268d15c14a1c7b5e118777c5f41bb97794a7d302fb39b3d4d2187599e2b9e4f0f53d29 SHA512 0494ebf5167919856db14860d8cb9be8e5d768cd6a183a4f386ab13e1867daa30934f1a842969e226a7f73bf87bf9e8f316ecac072d7b6300317a3bff9d82f29
 EBUILD dotnet-runtime-nugets-7.0.14-r1.ebuild 1446 BLAKE2B 58364d46cbba7e2462b8c832a4dc9be495adbdc1b5db34de6cf93755e4268d15c14a1c7b5e118777c5f41bb97794a7d302fb39b3d4d2187599e2b9e4f0f53d29 SHA512 0494ebf5167919856db14860d8cb9be8e5d768cd6a183a4f386ab13e1867daa30934f1a842969e226a7f73bf87bf9e8f316ecac072d7b6300317a3bff9d82f29
 EBUILD dotnet-runtime-nugets-7.0.16-r1.ebuild 1446 BLAKE2B 58364d46cbba7e2462b8c832a4dc9be495adbdc1b5db34de6cf93755e4268d15c14a1c7b5e118777c5f41bb97794a7d302fb39b3d4d2187599e2b9e4f0f53d29 SHA512 0494ebf5167919856db14860d8cb9be8e5d768cd6a183a4f386ab13e1867daa30934f1a842969e226a7f73bf87bf9e8f316ecac072d7b6300317a3bff9d82f29
-EBUILD dotnet-runtime-nugets-7.0.17-r1.ebuild 1449 BLAKE2B dbd3c68aa47da7fa30fd740d19f383e83dcd7a6388c9d7187689febf8e49622c54d3481ff43b87cf1740bfd9a27c881059a143e3b4a46d446c0a318f5a76b5eb SHA512 2fda9cb4b8adfc7b989fd375e157dc47415375a4796695d3cf92ecd3fd2659368d2222c8f7d24297af402357d87e3c9bb72b4e9a0ce1a9e22424c55ee2624bc1
+EBUILD dotnet-runtime-nugets-7.0.17-r1.ebuild 1447 BLAKE2B 57107a5d573851b2679adf2bdbea9a57468671625710f85bf368c7bc3f4578c741cb5d0849b2c34ff34cec74c3fe8fb5be3da8ef2cb99b904c5fd671d4c3bacc SHA512 56fc429e015b16abebcadcfdc226c2fad2b72b6d0182a8726fe36de27603d08c8839a3c07a4ab29e1afd964cc16b6590c520a63b02501c65c52fe540f9fa28d2
 EBUILD dotnet-runtime-nugets-8.0.2-r2.ebuild 1520 BLAKE2B 98c7835a4d868382ad63c0eb8362f6e16479e3d80d1ad1b10922228b3ff89df88e2e2af0da9b3f21053cc49f68803986657a8617fa1176baa63a1d214e7116f5 SHA512 65e4f1082395dad23ff7116bcf0ae4c3c8e273df54e7406166e1c8b7858aa0bb9719243269efa90f679b21515e5af6911243453515c7e098f8507e587fd4c9c4
-EBUILD dotnet-runtime-nugets-8.0.3-r1.ebuild 1523 BLAKE2B e5c66cd3e2c1fc299a892aedb138bc5138fbadda7fb1f269490e3bfe28ba84724a884a3c3f48651432be0a527042922aed186c62e5f69c60300a84a3db340c15 SHA512 163a977ff91bd8016fa16ea241360b528d64bbb4c32c6f9d2b4c9e93e2576bfd6cd6e60bc86dbb6b3ca96ecd5412c8669da42adc9fcc2ec1a4a85eb4e8645cf8
+EBUILD dotnet-runtime-nugets-8.0.3-r1.ebuild 1521 BLAKE2B 027dfed0fce02d2e808399f37f23b6e236125dbd5b75aaa3aef197f96f497331c0d2cdc5211d106a827caa227aafe47801761724dc3d37bb4bd3fc62a848a512 SHA512 d7eba212554f13e04f6e766b06a862642687d20bfa6ddcbadbfbc2c10b8ff602c52407f8d4768ddccc5115c0eb5131b86328e8ba3947368d654249dabadaebae
 MISC metadata.xml 263 BLAKE2B b7250eba637783739670dfb7b05df6b4ed4408fdb4619492f5c0469f1a91f175053126d885d36b6f3ed200e325746e82168c7c9b9b6c4f20199befe3aa75467e SHA512 74facd2b3fc2386c15269f2b9a070059b108137167cb741b2be8d1f56ae816e57355704d0617f37248b3e4e9fa69d5cace89f38f1b30e91f0e42db854ee26914
diff --git a/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-6.0.28-r1.ebuild b/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-6.0.28-r1.ebuild
index 396b85995652..7c2d3f084c83 100644
--- a/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-6.0.28-r1.ebuild
+++ b/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-6.0.28-r1.ebuild
@@ -36,7 +36,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV}/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 arm ~arm64"
 
 src_unpack() {
 	:
diff --git a/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-7.0.17-r1.ebuild b/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-7.0.17-r1.ebuild
index 396b85995652..7c2d3f084c83 100644
--- a/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-7.0.17-r1.ebuild
+++ b/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-7.0.17-r1.ebuild
@@ -36,7 +36,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV}/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 arm ~arm64"
 
 src_unpack() {
 	:
diff --git a/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-8.0.3-r1.ebuild b/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-8.0.3-r1.ebuild
index 034c38a42baf..b79c2e4a086f 100644
--- a/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-8.0.3-r1.ebuild
+++ b/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-8.0.3-r1.ebuild
@@ -38,7 +38,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV}/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 arm ~arm64"
 
 src_unpack() {
 	:
diff --git a/dev-dotnet/dotnet-sdk-bin/Manifest b/dev-dotnet/dotnet-sdk-bin/Manifest
index fbbbf79547b5..68124bd999b6 100644
--- a/dev-dotnet/dotnet-sdk-bin/Manifest
+++ b/dev-dotnet/dotnet-sdk-bin/Manifest
@@ -31,6 +31,6 @@ DIST dotnet-sdk-8.0.203-linux-x64.tar.gz 226131531 BLAKE2B 6b70ea6b4c462cb489e87
 EBUILD dotnet-sdk-bin-6.0.417-r4.ebuild 3648 BLAKE2B cae115deee48b38c6ebb1eba1a4eea60d4d21d5378702aa1a72dd3569b548f1bbdfbe0f0030ec0911eb9f564d208c49fbba14712651d2da555cc778b5399a435 SHA512 36011a4300685da89ece02df2f3f4193e34976e3e38ea41c88937a1b90e4ba21fb0fa908e5544b90b4e3ccde89af9b15d86fdf9969233ca4e2a85e267cb45b0a
 EBUILD dotnet-sdk-bin-7.0.404-r4.ebuild 3827 BLAKE2B ebeeaad4a1a335fff5ea6f07e0a28d65337b0d948626636bbe8435cc4fa7a8ef356fbd78b294dad0f9913b595775d45bc5a0ed45cfc0daf7705280b492224d18 SHA512 9d841acc5259e8c5f1ad98b1864bdec93b972c797ff7cfad17bd1ab03ad35a25554868f20167de622513ac47ab49f5e492fd9bad97256f7db5598abd6f994cc0
 EBUILD dotnet-sdk-bin-8.0.201.ebuild 3868 BLAKE2B 642c51c1c0a12576b2e1c38b7577e124da46adb09ed17daf4ce9ad780c6d3e086792a4f863a8dcedf80dc58bbb904c805d2c13743933083908b1041a347765a3 SHA512 92fa2b266381d798424b6e5935aae5109955c8899aa986d977f297b90b04020b4645067d5a5004e98118eed94103856a93642f4175f74ad8fe7e280d4cac7cd0
-EBUILD dotnet-sdk-bin-8.0.202.ebuild 3871 BLAKE2B a6d8331b079336d21c0d29200bd4eea037b1479f6b1013a67a20242e336c8457662f1805685c440680e93e2cd4effdc0fc7bd0361583508cb46f9d0ccecdb827 SHA512 9668564c209c31a36a6b76424641b2daab36aae0d109164ef4fdd1ddeb9523e1b192ba79d36341c6d4bdc015ed9cd07cd0fd49fb39a3351b87bb7b62eb25de02
+EBUILD dotnet-sdk-bin-8.0.202.ebuild 3869 BLAKE2B b80f8922d69542b8f9ac3d82aa729269fa776a5137167b25b5186e88bf572c3e781967a4a567aa5dda5ad86e59f0d578882a4054e2581e23f9e3a6725ad1bc59 SHA512 4c14fd3adb03dfa9102d5516f81223990d7dc1f391faa5701d2249e54ba6b9348f734e47f1f20be31bb77a06eefac5f3854667a3e604c6553c1298b16dc3248e
 EBUILD dotnet-sdk-bin-8.0.203.ebuild 3871 BLAKE2B a6d8331b079336d21c0d29200bd4eea037b1479f6b1013a67a20242e336c8457662f1805685c440680e93e2cd4effdc0fc7bd0361583508cb46f9d0ccecdb827 SHA512 9668564c209c31a36a6b76424641b2daab36aae0d109164ef4fdd1ddeb9523e1b192ba79d36341c6d4bdc015ed9cd07cd0fd49fb39a3351b87bb7b62eb25de02
 MISC metadata.xml 399 BLAKE2B 77e69a42625154f791fdf1e9559921a4e7aa077e91f78d3ec52779818287d05612080ca21a4199a3531e8d1af34a78f362a07b3cd89cd027dc1f0b6cf84fbbdf SHA512 d0b85e5ea0a2a4aa361d21a81218ef5dd68f6d51972addc771681208342075a860436a135e8f219cb5b4424f8a40d1dace8260c6c0eb1da3ef1a0dd13811c1d0
diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.202.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.202.ebuild
index 35d59a50075c..ad7a9f225a79 100644
--- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.202.ebuild
+++ b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.202.ebuild
@@ -27,7 +27,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${SDK_SLOT}/${RUNTIME_SLOT}"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 arm ~arm64"
 
 # STRIP="llvm-strip" corrupts some executables when using the patchelf hack,
 # bug https://bugs.gentoo.org/923430
diff --git a/dev-dotnet/fable/Manifest b/dev-dotnet/fable/Manifest
index 31bcd3388023..736f2dd2b2e2 100644
--- a/dev-dotnet/fable/Manifest
+++ b/dev-dotnet/fable/Manifest
@@ -286,5 +286,5 @@ DIST xunit.extensibility.core.2.6.3.nupkg 280310 BLAKE2B d512419e023a22a902f2800
 DIST xunit.extensibility.execution.2.6.3.nupkg 366636 BLAKE2B 46b0974d34fcf4fe53a27c3b4d6c1b62b2d1aec109deed5e41f0e08db165aa508b78933a1bbf61405ce1f696ec988aa8138a6480119c4db8e9d6886f238958ca SHA512 de800160dbc2d09f74f225760aae46f2097e1d2b8b319518b07e1dd5a8d5f54d7edfc488be2c2fefa70f1b20cc45820a5428a0bb552ded18ed6186955caab4fc
 DIST xunit.runner.visualstudio.2.5.5.nupkg 581796 BLAKE2B fb23a6bedb05374f379bcf9c7e4def52d9cc5b641f5bd6064ac8a91eb6819faedca6546812592de7e236e754f4fc7c58742014285e96c9bdc19c297c6097e121 SHA512 deb4a947bf9b0a25994c625817606066e0db747469ecfe37862f0c9832f5f57915c0f6fee873ef1e20b3cda4f5d2709b40aa98495ca4a511a1e175f5ea4f5935
 EBUILD fable-4.12.0.ebuild 11030 BLAKE2B 7cf0297d3e4331d375f54598be36ffeb7f0f32d8ba3b184609b5142eb46ec52f7bc39efeb17df5db8a53a97f5512093f31cd6286c6998e590abf8d0d047d45f8 SHA512 b201a640d840ad19f377b925878645298254007ffa8b75a9ea0ff747ece3cb5d557818feeb11e4d084d84e8215b87a7b78d366f53fa4ab0788229619aa01476d
-EBUILD fable-4.14.0.ebuild 11048 BLAKE2B b22abfc18851317b2a678c364e2ba884fdb7b6f9ae1565f42eefce72bf1c0077a4e11edfbc347c6a2afceeb38fd8cf4c6ce0347b86cd14360397fea62b93580f SHA512 ce1b058bfdabb33e851cc6a9790a74cfe874f0260f1704c9639dba3bb9a5a1bd20db9b27416ce8f34070e500cbe824bbad8e0b4df8854ec389e4e2cfec34158b
+EBUILD fable-4.14.0.ebuild 11047 BLAKE2B 93e4e0a90d1ee47148b722b13664c37db751402fca8c3a9ad30261dc0752b219552951508fec48107982f05bbdd8501cab358b51ad469e44bf2ce1392102edab SHA512 b610e105ab03deabf7d016895db205998739d1f055bdc08444ee32369627e00905e9e800fe4a3ec9d5f3ad52200683acf9c55c679023be12cf9b3f8add090f56
 MISC metadata.xml 615 BLAKE2B 9d25df11215f987833b54f525cf50cc61c03d716545929d2d8380de98b34b8e3fff379bfac9220576a2d89a6e4a05d9d4e4a3c2c3ff2daf3b170c502bd7d2b7a SHA512 8c644b9c67ba562029985d1fcea99656a1d2a92c436affdea98c72bb4f1426529098247b7fecf311cd608e6e4b9b4a44e772d4264f775674eb7e4efe51926711
diff --git a/dev-dotnet/fable/fable-4.14.0.ebuild b/dev-dotnet/fable/fable-4.14.0.ebuild
index b4739fb311a3..cf0ecbc1e77b 100644
--- a/dev-dotnet/fable/fable-4.14.0.ebuild
+++ b/dev-dotnet/fable/fable-4.14.0.ebuild
@@ -307,7 +307,7 @@ else
 		-> ${P}.tar.gz"
 	S="${WORKDIR}/${P^}"
 
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 SRC_URI+=" ${NUGET_URIS} "
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index ce37c2ee6563..2624f81cfa6a 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
index 718df0c31773..005494305438 100644
--- a/dev-games/godot/Manifest
+++ b/dev-games/godot/Manifest
@@ -6,6 +6,8 @@ AUX godot-4.0_rc2-musl.patch 878 BLAKE2B d10e22acc29e14df6b42b180ed480908c61e6a9
 AUX godot-4.0_rc3-scons.patch 506 BLAKE2B 2fd1421760f082ea65febce90459f8a2d63e06e5b02b5e86e59bbacd14db78f76448ee50d0fa7c935b1a867f528b46a9b82b5bb03765d0b237e9af73d7fd14da SHA512 9ac654edc66a5a330055d1af0b706a5fa143061712146ddc02657add45d4518d96391d9e980c0a6b33d9fa966b5914a3f90a7b333f20885f0a05a7b8985fc667
 DIST godot-3.5.3-stable.tar.xz 24072964 BLAKE2B a4c03328e3aa77d741a1c642cfd645de04084f2852e865757fc8960c4919d3b8b8571e772f44004901fdd80a967e8e21bd8c6be8b36263db7afae787dcbd3ed6 SHA512 4c008af5bb7c298d465edbe03f6ebc642f5bbbb0a4254e99d7a7a88919e1f9424b98c5dff95a55ae68d4e2e5878c7c0bb7d13a66869cb632ecb51a913f865155
 DIST godot-4.2.1-stable.tar.xz 26687808 BLAKE2B 0f7d06b27e2e9174dad04d1926935a46c05d39349e73a0ed146815c21f1100be04cd772c2d6b16d96f70dbfe9a5727126b4dc782c3654c36282f39ca4df87f4d SHA512 ac09046532f5cf504bd57c867ac8fcb40b30848152cd6a95ee2a2d2c7e9cce027fdfceb66fcf1146e562cbca853a484da861c45c2a5fc0a63021d309bdf04590
+DIST godot-4.2.2-stable.tar.xz 26768552 BLAKE2B e4a6040d7a1f63f841f56d74bb7b04e58f2fa26ddd8850df7f93937deb10c4af925ea2059c174d9f457222e0cddfe477498e3462bfaaf69ec8e57de8f2d43c83 SHA512 4a623063be5488957e1ede7e45b6865f6cd61bc954ac311587b9e97bed848a4083c4a7225d0a81bca285d854d33be9b07d7d0c21465c9f25b90e92b08090429c
 EBUILD godot-3.5.3.ebuild 6564 BLAKE2B a2d12f6ffeb748314eadd122537d8b76d835c66e3c2a3776bd2f91c0a98c69b7b47ef8099e9a97f16f6170da29ca1a27c1d01b9837559067e91b6a397e83b28f SHA512 5de17a38a6c16cf8f0b514e223a2a75e54254b612c3c66e9f4512ff612b4bcf5e5448ea2f32a92a6b1a6240023ba5f5f2da5a1581d705f4a7533f3c14482049b
 EBUILD godot-4.2.1.ebuild 7023 BLAKE2B 662e984a83e11162817a105df2fd6a4e1ac380127948c1aeccfb3cc51b402e1ce9ea62b39380f450488fcadae534242a6bbed80ed48425f3c6ee07abd7b84f27 SHA512 04da3f0c0fe0561e0aaefe17d1e96d0e19e6dc9d5d2637bbdbc31187c86eb957867d839f8ba80bca0cd3e75db0731eabbc800931851e7d742f6825fe4edb8a4d
+EBUILD godot-4.2.2.ebuild 6970 BLAKE2B 7636bbc9570e98a0e5eea9557b45e1389f3284d622a3705753f3a5b28eb47e7f93294f5f89fb0d7a12e63255332793818112b708003f2f7ffaea0a5fc33138f0 SHA512 930b0327472d38b10b0039d200e9fe20cb05c3b3fb5d86966d83d0d85baf498b1d2001c84472e687418562e0686a6941d0b80cf6e7ea029f90521f7f184aca59
 MISC metadata.xml 1492 BLAKE2B ae5789569351fbb3df1da26f655750404bc22d56d0e252ca83b973abaa9ed29f26afd48c263c29266eb883444c6399ab35939d57e081d4733f7ea8b5a161f737 SHA512 fe692458dbe8293a1b76a1f0f79fe01f86ed61c731eb8b6c5acf0ef24a5d0b4cba94dd1ad72abe287d584883bc08e090f48d2b709ffbf06758c45d8996432973
diff --git a/dev-games/godot/godot-4.2.2.ebuild b/dev-games/godot/godot-4.2.2.ebuild
new file mode 100644
index 000000000000..bda89ed4d705
--- /dev/null
+++ b/dev-games/godot/godot-4.2.2.ebuild
@@ -0,0 +1,238 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit desktop python-any-r1 flag-o-matic scons-utils
+inherit shell-completion toolchain-funcs xdg
+
+DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor"
+HOMEPAGE="https://godotengine.org/"
+SRC_URI="
+	https://downloads.tuxfamily.org/godotengine/${PV}/${P}-stable.tar.xz
+	https://github.com/godotengine/godot/releases/download/${PV}-stable/${P}-stable.tar.xz
+"
+S=${WORKDIR}/${P}-stable
+
+LICENSE="
+	MIT
+	Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB
+	gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )
+"
+SLOT="4"
+KEYWORDS="~amd64"
+# Enable roughly same as upstream by default so it works as expected,
+# except raycast (tools-only heavy dependency), and deprecated.
+IUSE="
+	alsa +dbus debug deprecated +fontconfig +gui pulseaudio raycast
+	+runner speech test +theora +tools +udev +upnp +vulkan +webp
+"
+# TODO: tests still need more figuring out
+RESTRICT="test"
+
+# dlopen: libglvnd
+RDEPEND="
+	app-arch/brotli:=
+	app-arch/zstd:=
+	dev-games/recastnavigation:=
+	dev-libs/icu:=
+	dev-libs/libpcre2:=[pcre32]
+	media-libs/freetype[brotli,harfbuzz]
+	media-libs/harfbuzz:=[icu]
+	media-libs/libogg
+	media-libs/libpng:=
+	media-libs/libvorbis
+	<net-libs/mbedtls-3:=
+	net-libs/wslay
+	sys-libs/zlib:=
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	fontconfig? ( media-libs/fontconfig )
+	gui? (
+		media-libs/libglvnd
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libxkbcommon
+		tools? ( raycast? ( media-libs/embree:3 ) )
+		vulkan? ( media-libs/vulkan-loader[X] )
+	)
+	pulseaudio? ( media-libs/libpulse )
+	speech? ( app-accessibility/speech-dispatcher )
+	theora? ( media-libs/libtheora )
+	tools? ( app-misc/ca-certificates )
+	udev? ( virtual/udev )
+	upnp? ( net-libs/miniupnpc:= )
+	webp? ( media-libs/libwebp:= )
+"
+DEPEND="
+	${RDEPEND}
+	gui? ( x11-base/xorg-proto )
+	tools? ( test? ( dev-cpp/doctest ) )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0_rc2-musl.patch
+	"${FILESDIR}"/${PN}-4.0_rc3-scons.patch
+)
+
+src_prepare() {
+	default
+
+	# handle slotting
+	sed -i "1,5s/ godot/&${SLOT}/i" misc/dist/linux/godot.6 || die
+	sed -i "/id/s/Godot/&${SLOT}/" misc/dist/linux/org.godotengine.Godot.appdata.xml || die
+	sed -e "s/=godot/&${SLOT}/" -e "/^Name=/s/$/ ${SLOT}/" \
+		-i misc/dist/linux/org.godotengine.Godot.desktop || die
+	sed -e "s/godot/&${SLOT}/g" \
+		-i misc/dist/shell/{godot.bash-completion,godot.fish,_godot.zsh-completion} || die
+
+	sed -i "s|pkg-config |$(tc-getPKG_CONFIG) |" platform/linuxbsd/detect.py || die
+
+	# use of builtin_ switches can be messy (see below), delete to be sure
+	local unbundle=(
+		brotli doctest embree freetype graphite harfbuzz icu4c libogg
+		libpng libtheora libvorbis libwebp linuxbsd_headers mbedtls
+		miniupnpc pcre2 recastnavigation volk wslay zlib zstd
+		# certs: unused by generated header, but scons panics if not found
+	)
+	rm -r "${unbundle[@]/#/thirdparty/}" || die
+
+	ln -s "${ESYSROOT}"/usr/include/doctest thirdparty/ || die
+}
+
+src_compile() {
+	local -x BUILD_NAME=gentoo # replaces "custom_build" in version string
+
+	filter-lto #921017
+
+	local esconsargs=(
+		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+
+		progress=no
+		verbose=yes
+
+		use_sowrap=no
+
+		alsa=$(usex alsa)
+		dbus=$(usex dbus)
+		deprecated=$(usex deprecated)
+		fontconfig=$(usex fontconfig)
+		opengl3=$(usex gui)
+		pulseaudio=$(usex pulseaudio)
+		speechd=$(usex speech)
+		udev=$(usex udev)
+		use_volk=no # unnecessary when linking directly to libvulkan
+		vulkan=$(usex gui $(usex vulkan))
+		x11=$(usex gui)
+
+		system_certs_path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
+
+		# platform/*/detect.py uses builtin_* switches to check if need
+		# to link with system libraries, but many ignore whether the dep
+		# is actually used, so "enable" deleted builtins on disabled deps
+		builtin_brotli=no
+		builtin_certs=no
+		builtin_clipper2=yes # not packaged
+		builtin_embree=$(usex !gui yes $(usex !tools yes $(usex !raycast)))
+		builtin_enet=yes # bundled copy is patched for IPv6+DTLS support
+		builtin_freetype=no
+		builtin_glslang=yes #879111 (for now, may revisit if more stable)
+		builtin_graphite=no
+		builtin_harfbuzz=no
+		builtin_icu4c=no
+		builtin_libogg=no
+		builtin_libpng=no
+		builtin_libtheora=$(usex !theora)
+		builtin_libvorbis=no
+		builtin_libwebp=$(usex !webp)
+		builtin_mbedtls=no
+		builtin_miniupnpc=$(usex !upnp)
+		builtin_msdfgen=yes # not wired for unbundling nor packaged
+		builtin_openxr=yes # not packaged
+		builtin_pcre2=no
+		builtin_recastnavigation=no
+		builtin_rvo2=yes # bundled copy has godot-specific changes
+		builtin_squish=yes # ^ likewise, may not be safe to unbundle
+		builtin_wslay=no
+		builtin_xatlas=yes # not wired for unbundling nor packaged
+		builtin_zlib=no
+		builtin_zstd=no
+		# (more is bundled in third_party/ but they lack builtin_* switches)
+
+		# modules with optional dependencies, "possible" to disable more but
+		# gets messy and breaks all sorts of features (expected enabled)
+		module_mono_enabled=no # unhandled
+		# note raycast is only enabled on amd64+arm64, see raycast/config.py
+		module_raycast_enabled=$(usex gui $(usex tools $(usex raycast)))
+		module_theora_enabled=$(usex theora)
+		module_upnp_enabled=$(usex upnp)
+		module_webp_enabled=$(usex webp)
+
+		# let *FLAGS handle these
+		debug_symbols=no
+		lto=none
+		optimize=custom
+		use_static_cpp=no
+	)
+
+	if use runner && use tools; then
+		# build alternate faster + ~60% smaller binary for running
+		# games or servers without game development debug paths
+		escons extra_suffix=runner target=template_release "${esconsargs[@]}"
+	fi
+
+	esconsargs+=(
+		target=$(usex tools editor template_$(usex debug{,} release))
+		dev_build=$(usex debug)
+
+		# harmless but note this bakes in --test in the final binary
+		tests=$(usex tools $(usex test))
+	)
+
+	escons extra_suffix=main "${esconsargs[@]}"
+}
+
+src_test() {
+	xdg_environment_reset
+	bin/godot*.main --headless --test || die
+}
+
+src_install() {
+	local s=godot${SLOT}
+
+	newbin bin/godot*.main ${s}
+	if use runner && use tools; then
+		newbin bin/godot*.runner ${s}-runner
+	else
+		# always available, revdeps shouldn't depend on [runner]
+		dosym ${s} /usr/bin/${s}-runner
+	fi
+
+	newman misc/dist/linux/godot.6 ${s}.6
+	dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md
+
+	if use gui; then
+		newicon icon.svg ${s}.svg
+		newmenu misc/dist/linux/org.godotengine.Godot.desktop \
+			org.godotengine.${s^}.desktop
+
+		insinto /usr/share/metainfo
+		newins misc/dist/linux/org.godotengine.Godot.appdata.xml \
+			org.godotengine.${s^}.appdata.xml
+
+		insinto /usr/share/mime/application
+		newins misc/dist/linux/org.godotengine.Godot.xml \
+			org.godotengine.${s^}.xml
+	fi
+
+	newbashcomp misc/dist/shell/godot.bash-completion ${s}
+	newfishcomp misc/dist/shell/godot.fish ${s}.fish
+	newzshcomp misc/dist/shell/_godot.zsh-completion _${s}
+}
diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index f2bbae5413a4..9a09cd22b811 100644
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
diff --git a/dev-go/get-ego-vendor/Manifest b/dev-go/get-ego-vendor/Manifest
index 294192a4233f..7052e39a5196 100644
--- a/dev-go/get-ego-vendor/Manifest
+++ b/dev-go/get-ego-vendor/Manifest
@@ -1,3 +1,3 @@
 DIST get-ego-vendor-0.2.0.tar.gz 2027 BLAKE2B 41803e088f86775cdf93759580722b5dad6b9d0a2d70a0f57540f2a578a97df399ed7ba8b0c0a2a61d53841b4aca470189fd3b24523c044d15fd542b33e600cb SHA512 32cd123b5782399fc7b51fef5a2fe5115a6c473e8d62c5a0ad354efdd72d89c291c1cc4b8eb9034a1f3fef1e9ce39a8fcc989fe5ee21c852058655ed7e0dc57a
 EBUILD get-ego-vendor-0.2.0.ebuild 466 BLAKE2B 3e157926b6f6dc2badbb1a0bb8789d3f6e8f40ecab9a341e45f45330efdda8200b89bcdaaea29696f50c8d985c2514a1beab397e785f1f881cbbef406df99493 SHA512 ee56676423067b389b1cbb33e95543a00f6cfbb4c8d0d2f67e15aeb0392cb9f6eae976644783d9a2a18d4a23be59d7f24adb3b934b50ea07f9087915b8857bf3
-MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
+MISC metadata.xml 337 BLAKE2B fc4d24f0241947a981b0f2b8ca580024ed84e0bde980ca6d98090fefd8f5f78ea9e8dc9e71c1d77337eca81119a1bb6f8f08fc10e42664cd09a8f6b6da9743e0 SHA512 5044d7501f4417720a40cd5911a5c92e9a914783b569c0979ee34635f3c26998e8f8f01e44a8e32e65fa3ed45f9fec8b8815d6eafa9166445f354e412fa29cd2
diff --git a/dev-go/get-ego-vendor/metadata.xml b/dev-go/get-ego-vendor/metadata.xml
index db463f3eeb66..4f606fb54ec4 100644
--- a/dev-go/get-ego-vendor/metadata.xml
+++ b/dev-go/get-ego-vendor/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">williamh/get-ego-vendor</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-go/go-license-detector/Manifest b/dev-go/go-license-detector/Manifest
index 81e656a7421f..db2c06eb24ef 100644
--- a/dev-go/go-license-detector/Manifest
+++ b/dev-go/go-license-detector/Manifest
@@ -1,4 +1,4 @@
 DIST go-license-detector-4.3.0-deps.tar.xz 278025716 BLAKE2B ed1ae5cf19c6ed128a86cee9bdd792c60910058b3e3e5e881e09113eeeede2d715f29de288e60f71c4e68c405121693b3b1d67f9ce0c8470a068642e774b52e4 SHA512 a88d3b925036bc0eda179dfec34ffb06fd7aeb373e9b5fdcb5f42d624cb3cf95b2bd428b535316264a9831a679134bf6eaf2b5780fec975cee55559a14ca00c1
 DIST go-license-detector-4.3.0.tar.gz 9004382 BLAKE2B dee059cd5e892e918363241557cadf7434c41a3206483642ec577f13f8ee2f0d1671f56bb602098fb344f66ede17157d56049ac93c7804ef0aa8abfa54a68a31 SHA512 c8407542b4094332f89ff6fd9c4a493f64580f2c1f50e8a54982856bb35fe22e5535c2f9ff05b7b7d96164e84e33481ef3bf823227d1606bb072c54d6f908dde
 EBUILD go-license-detector-4.3.0.ebuild 588 BLAKE2B 866d4fb58cda0977de61a572617b64f58369732d9803efb878d270f95b377a15ed0e9fa13a6cfd93bf3762f5f5341dc82530fa4709621a08324cfb183d06e4d5 SHA512 ab8f413da356541c5ebea878639a6a9da507b0b386a5ac78a0699f1faca142fcc1f86abccafdc92ea0e1e40748f74f462dfc96e5fa2c7680e53adefc5d603f69
-MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
+MISC metadata.xml 341 BLAKE2B 208aeb8f1c9f41bfeb9de39b2c6cd269855be732239605cdd8683e489eb72f908af19f0bd67042c150af4dae7cfa99c93bab4e0a23652c7f86bed2a42a349e51 SHA512 5ca925b2b76164c7c9cbf271993c0f43f3ebca2146844d91a16edfec8b9f9323bfbe46d05cd3e66323862176ed0fe9a2a18f8056b4db7b8406e675242f795161
diff --git a/dev-go/go-license-detector/metadata.xml b/dev-go/go-license-detector/metadata.xml
index db463f3eeb66..2bc2c78caf52 100644
--- a/dev-go/go-license-detector/metadata.xml
+++ b/dev-go/go-license-detector/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">go-enry/go-license-detector</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-go/gox/Manifest b/dev-go/gox/Manifest
index 960156ee2ab1..ede0d88958e6 100644
--- a/dev-go/gox/Manifest
+++ b/dev-go/gox/Manifest
@@ -1,4 +1,4 @@
 DIST gox-1.0.1.tar.gz 30819 BLAKE2B c99cbf93fcb357561a32a8f2ee7b77b1db481c8f3b886040865436ae9f69c9dfe6b88647d4b07edd0567cce8868a491b6c37ab979bb529093ae2dd7046a7ec0d SHA512 cfcad670d9b752fe629de26db0a7f02a72f183f1c6acaf232d4908085f27a297453ab35f5c9a3ede209cb9143fd9ed7a8b5d9c182c8796f3fe4d023cb5294497
 DIST gox-riscv.patch 17220 BLAKE2B da5d43d90e03eacb4d8893b3426e81b9bfac0377e5cce9e2c24abcf93e5f33f88ff9da89af037b5db36ba3590022328f35102484a91dd529e56254ea0f35d36b SHA512 e4ad1601d10816349f09faa51376a0895cab40653b0631d2164d5dab838f861f203ee8c3f405258f4024ec93cff2774cad92fb4f03ce8d3bd029401dc8357bd0
 EBUILD gox-1.0.1.ebuild 658 BLAKE2B 5ce517bff776c0446c267594d6e9469b123cf3737bca917c7e2e477c17224fb7a94560cef9060b8623f8e8da1e87c2466a4cd4b49d6a510090a65907c3b42a5a SHA512 8d6bb2e66c09c2977b60cae35a8f3361e4f38b0d61823743b74883291fa714c5c94382f7c31c4ce094d2b18dae1cfdd29aade6e68a97055053e550392c7eccf1
-MISC metadata.xml 253 BLAKE2B fd160456025095471294c4e25662a7d7cf702d0e0ad9a68427eb728a290fc5d26b961cb3bc7c2b2363aabd63804950c1b62a2d05db6440a5b956d9d14a717969 SHA512 08c7a7298d2bac8407d8f9dfe92835be841b182e2c0987fa0cc320b8a8f07db7dc28cc079ae3221710fb34f659e9f4d109c2e4517cc0110d8935f16d643b5636
+MISC metadata.xml 327 BLAKE2B 0b5a7893e7c5d31ed0369ce6741564021e8fabb37f33fb057e78235ca59e21e5a9947d58911f73da73d5bfd4727d6319ce9a261ff74fcc80f0e7d197af030526 SHA512 ec405404419cade0fd26741f0b09788db26113f20b1238d40591d4e9f453b54babe69a6f9c22647bd5bf8f0b52ed5235b490aba06915915896eb2b941213b717
diff --git a/dev-go/gox/metadata.xml b/dev-go/gox/metadata.xml
index e1caffbdc76e..70ced8d42adf 100644
--- a/dev-go/gox/metadata.xml
+++ b/dev-go/gox/metadata.xml
@@ -3,6 +3,9 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>williamh@gentoo.org</email>
-			<name>William Hubbs</name>
-				</maintainer>
+		<name>William Hubbs</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mitchellh/gox</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-go/vend/Manifest b/dev-go/vend/Manifest
index 10a3466f5507..cefc3f240022 100644
--- a/dev-go/vend/Manifest
+++ b/dev-go/vend/Manifest
@@ -1,3 +1,3 @@
 DIST vend-1.0.3.tar.gz 4728 BLAKE2B 0e8815aad305d87da728e1a1a8098497bc46dddb422c58f8c8019a50b15f7f7daf76e8c19d1edfd5890aa377c41f4483d3d081ab86168b86e20dc8a2aa90859c SHA512 ea963f1626a389d627add1c44cdc6a672d68870eff038ffabf649f0e62b3c4cf7e21d699647f627e039859dc9ac53bf1eca8d8e8eb8fb852503cadbd24a23f70
 EBUILD vend-1.0.3.ebuild 465 BLAKE2B 94be51d22fb74ca419f731c883f71382855eda8393d0b7e4f5f6a8de9fcfbcffef609cbfbdde3c68c6f0c80cf1b5af78a4a22a3a82efa1db887cc4675a1e00fe SHA512 e33f4ab8136176896c6ea89d44af238c7f7c4951f5283a97a54456788c0f662ceebc95faabbd028b0948ec63369065fb988e30058213ebadf0021179b53bcaa2
-MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
+MISC metadata.xml 333 BLAKE2B 1fd120c09cf6b6df45aea29b77167008f338b39142a778870c2f3f75e4d95bb09153bf2efaae58d4b72bc3360365e99c80c974e0508f9e3d00747c63a869653b SHA512 5ce2f8bde49a168fa3932c316c3aa3b972ae2a99562fe70eb20f370e95b90446b0a34130924eeade7030980adfcef6c427dd054bade05c6eda7b564091b7d46e
diff --git a/dev-go/vend/metadata.xml b/dev-go/vend/metadata.xml
index db463f3eeb66..9863aa1e6e03 100644
--- a/dev-go/vend/metadata.xml
+++ b/dev-go/vend/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">nomad-software/vend</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index b3ba1ed37105..9b5042a56a8f 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/abstract-par/Manifest b/dev-haskell/abstract-par/Manifest
index 00e583fad196..dd49d621ac2d 100644
--- a/dev-haskell/abstract-par/Manifest
+++ b/dev-haskell/abstract-par/Manifest
@@ -1,3 +1,3 @@
 DIST abstract-par-0.3.3.tar.gz 4714 BLAKE2B d43acc721fc7d4e0f9c9fc85f2edeb489ea145332173840d93bfac9b0bcffcc50a89cf33a1b0f8736c76fc894140ba8d45f13821bf1515491d012f0ee53915a7 SHA512 d603745202ececf5a514e5ac7da82fdd03dd27ec4fbb11a870a7b0a6c92e468cf3bd68763afa748434b3ed0ed5b80a1d2cefaa84c68a84b82028225400841605
 EBUILD abstract-par-0.3.3-r1.ebuild 591 BLAKE2B d1d51556dd89adbd6ebd08f998858e2963bb0e613dab510cab193740c41d4d3ab542939da2a1358f2858c30d10a6014c7dce5f90cb35cc3f39e5fb460203ae68 SHA512 ac0746527a85d29f35df1d41e17d7773f85f3e293aff346e4a3ef8118ea7b875b00e558a83740cbbac4a38eae2fc025a9296e1cf44a96e270747ad9c24f4bb73
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 333 BLAKE2B 755a6e0c0e2e12d4a2a4a21fbc3d04590acb878683fbf4ec8c9c87f1c4c1e6882ccd39ad439520bdcd77fdf658dd2c17655d1f7cae436558a7a0ccfa8c20df68 SHA512 51c8b61172dd583ba3614e2939e3c13d8866fc7dfb2110d873a6aa245c26d6c9ed486eac71bde03e028d4acb4135b54f6bf165ab2d1d3524bc881a63aaa48624
diff --git a/dev-haskell/abstract-par/metadata.xml b/dev-haskell/abstract-par/metadata.xml
index 937381521944..8902881b1334 100644
--- a/dev-haskell/abstract-par/metadata.xml
+++ b/dev-haskell/abstract-par/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">simonmar/monad-par</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/atomic-primops/Manifest b/dev-haskell/atomic-primops/Manifest
index 0dc2d8d5eef3..2f99138a3f07 100644
--- a/dev-haskell/atomic-primops/Manifest
+++ b/dev-haskell/atomic-primops/Manifest
@@ -1,3 +1,3 @@
 DIST atomic-primops-0.8.4.tar.gz 33639 BLAKE2B 5293b6f839599fe7a47c8f3f13a03df12fe8a5d7223a4b488a86b7f1f2c208ecd01f75acf7378668b4f91046221d9076875e05ca2611bb51d6ff1ad7a2e0d8f6 SHA512 a9e873e6f4eba26541d370c5ee3b81b518a1bf0f54d303d26a2065ba47eac7db1366436661b108c0648503386ffb9cb121567236c9635bf30d4e523a2d63a8b4
 EBUILD atomic-primops-0.8.4.ebuild 713 BLAKE2B ea8636bc369e740a996b197f8be450a46a2ea3275bc6bf4d8bccb020608d77adb1b6eaa3dcd277866aceb0f3f4e7b570b2e6b08f9b23c73f346946fb613eee58 SHA512 53c35fe7a1d1326d05fc4aa414f849e34a05a45e9166c3c847192333f8d980a5e41c06bd415a1c7c4c70b7370e3a6709d551c52180d21448173aa9e9fee4bb84
-MISC metadata.xml 985 BLAKE2B bdc88207e30c05665b2dd2b91d733d9bfbd2b9c93028b8e1259baf7f16e0391d36547fc7a61c79be6d3495cacafdfb44c03fadcf11c143c17dc0000cac3462fc SHA512 fbcb6b7dce3acc68b236b752432576857e75b9cc33d45cddb8782f4797644fbd3ace901941552d479ff2bc4344447b6ad7ee33e52c017ca2fd8222cd353e17b3
+MISC metadata.xml 1075 BLAKE2B 8f4435367e2f5508dabc725dd9592e14d6925fba9323f901f85ae1264ec06978f49d62d4b5e73a0d27c446b09ebfaa24658dc21762dd966b91eba7b0ceb7bbe8 SHA512 8ca057a14b095a529cbe0b10643983da1febaf78a2a473ea04140eb2812730dd38550f2323b791f286f7b69d405c437226288e1390fe440864523386bb31304d
diff --git a/dev-haskell/atomic-primops/metadata.xml b/dev-haskell/atomic-primops/metadata.xml
index 29001c3441a1..e7eb4b93a250 100644
--- a/dev-haskell/atomic-primops/metadata.xml
+++ b/dev-haskell/atomic-primops/metadata.xml
@@ -22,4 +22,7 @@
 		This library is engineered to work pre- and post-GHC-7.8, while exposing the
 		same interface.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">rrnewton/haskell-lockfree</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/byteable/Manifest b/dev-haskell/byteable/Manifest
index 6e2188279cdd..f027e572b930 100644
--- a/dev-haskell/byteable/Manifest
+++ b/dev-haskell/byteable/Manifest
@@ -1,3 +1,3 @@
 DIST byteable-0.1.1.tar.gz 2400 BLAKE2B 0da53566faeb934ffb63623dbc58f6f3b2e4499f6a5547ff6707b034e8e5ea097c4dea600d83421f7da47958cc54c0377d4f53e123480aba464ab5fcfe7780bb SHA512 f2e6225390be9f35ee6a4ce981aaa8c2683f1627a8401386b1abb7fff5fe1474ae0fa07e71a0c83694d7a18ca793943fe36b844d868c3e9c3387ce1a7b2bf54c
 EBUILD byteable-0.1.1.ebuild 580 BLAKE2B 46d5768843e768c3652da67686c830d52580da15cc0b44c347235b0bc7bf2a22e8e6363a7f97945eee58217afc149a796cda2ddfa629164ca68869d3f9b7d280 SHA512 f4198fac7d1f585ceba0d2441099f3d9dbbb34980ec942dc81dfc6ed8f817a583730bac90592ab1ea3dec98f01313f0852ba86a4ad469dfa9e10cf62bd349d7d
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 336 BLAKE2B 4d2cb6360778db9eee20e72654431d8ef3958337f22025db3b160fd6f2b4a3dc030c902ebd6fc2c59a59b1fb5402c2d1e102b6eeeeac7c97342378c81c9e76c1 SHA512 f7cd9c65873dd422ec01c5a6b6541540d6bfa674dbb537a632b9d0eb0ac86828c298511f5a0d29a3a655667e2bb9e9992ab3669f80d07e6ca543e31140ba2263
diff --git a/dev-haskell/byteable/metadata.xml b/dev-haskell/byteable/metadata.xml
index 937381521944..0f4a77f67e72 100644
--- a/dev-haskell/byteable/metadata.xml
+++ b/dev-haskell/byteable/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">vincenthz/hs-byteable</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/conduit-combinators/Manifest b/dev-haskell/conduit-combinators/Manifest
index ba6a2e5573ba..c735f44b8655 100644
--- a/dev-haskell/conduit-combinators/Manifest
+++ b/dev-haskell/conduit-combinators/Manifest
@@ -1,3 +1,3 @@
 DIST conduit-combinators-1.3.0.tar.gz 2204 BLAKE2B 4d3c7783f00a90a45e2e5947c523792a67cf234d12232c3abcf865df4647d0767b27516430704792f2f6393e61fc4c4513346d390774b8b3eeb2d05b494a4d3e SHA512 b994c73f0a9c0d017831125f2dbde406d6ff1b51b0f37079e8292ff1747c9718c28cceba708b3451136a384504db1d1275e01ce0335cf1e726edd69d90a206b7
 EBUILD conduit-combinators-1.3.0.ebuild 708 BLAKE2B f05afcdf21c145543e505d6b45562755d58c7d6c6653c06108ebf425718b449097c07b3da054a81309a0069a8718693097efa09bf2f2e5660f0077952b7ca3d9 SHA512 5e37b62284c5b02af39a6a9f7f4d938ad2171a2459e1f623e1e10d58b8b7dd8baf83ebc09e9264075302aeff891dcc5a7893767a067ed32af0e1c78aa7dddb60
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 340 BLAKE2B 0a52e605111203d25442f32c8bb53679a74f4306dfdf34ac9032886ee79c1daff3f59a67a203c79bce686ee2c1f64795478e27ad595f8c130b234a29786ea501 SHA512 abc8ba427b02435934c0f672eff7fb91c4987edc67d56698ad55bad6364fcc74414742eff9324b226cb59822d79c6fee40ae28e1dec363cc9f50ad604fc4a21b
diff --git a/dev-haskell/conduit-combinators/metadata.xml b/dev-haskell/conduit-combinators/metadata.xml
index 937381521944..a1de5e8eb364 100644
--- a/dev-haskell/conduit-combinators/metadata.xml
+++ b/dev-haskell/conduit-combinators/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">snoyberg/mono-traversable</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/cprng-aes/Manifest b/dev-haskell/cprng-aes/Manifest
index 8c6265ae968c..564249b15b90 100644
--- a/dev-haskell/cprng-aes/Manifest
+++ b/dev-haskell/cprng-aes/Manifest
@@ -1,3 +1,3 @@
 DIST cprng-aes-0.6.1.tar.gz 4396 BLAKE2B 813773cb6185974e6c3250ce744abbe4ea5dbfa4725320736563fdea6446f246b704e2825e2f8612d35dddb01424cea93ad24a05764713d09d25cfe5afcaeaa7 SHA512 839a3a449edf996b0061a989058ed59625d8a849e852217c047b9d9b59b58504c0efaca699f75beea3ebcad8284f55c1f53b523dbebb10f56e705506bfccb5f5
 EBUILD cprng-aes-0.6.1.ebuild 796 BLAKE2B ff164d03dba793bbb3d734c505dd00d615c9a0c7764312136384e0c043cd1979329e9651d9a6cb0cb1e85036085bbd1a4ab90ae7f3e302a2d302643f53427c10 SHA512 87d0afa217abe27bb73c4f64024f7e82efb6e3c58acee636791e3222e5190fdb41ce42a2a8006f4c62f0bf6cab69b4f0386b193733d8983d0a457cde0f859c07
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 337 BLAKE2B df8c17f151e17c9d2fb7ebf09e4dceca1d79fb74765b90dcccc64d62db407da2a6ff5e87c47833035794b27aceabb61e4c2604638e06d05940fc345f4179ea8c SHA512 02c0d79ae0b1f30b5275e06f86612f3b622c7a7b31d1adeba50f16c4bdcefbc83433fad08d3e36c793a6cbcd4ae40726dd42fc4f8a427943b5cdb9170d6215f3
diff --git a/dev-haskell/cprng-aes/metadata.xml b/dev-haskell/cprng-aes/metadata.xml
index 937381521944..ecbbc91b7874 100644
--- a/dev-haskell/cprng-aes/metadata.xml
+++ b/dev-haskell/cprng-aes/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">vincenthz/hs-cprng-aes</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/crypto-api/Manifest b/dev-haskell/crypto-api/Manifest
index 97fc970a01b2..79e8792aa906 100644
--- a/dev-haskell/crypto-api/Manifest
+++ b/dev-haskell/crypto-api/Manifest
@@ -1,3 +1,3 @@
 DIST crypto-api-0.13.3.tar.gz 48346 BLAKE2B eeec2644fe43218c8e647bd84e3fad31079cb560cb25a078853ae40cb8be617a05fcc55ca844811f1356d8f5a8088583497d79e38f808d12af4695bc05bba7d0 SHA512 1228fe857e235a0d5692916507a42e622f9769325ae9a6a7828270dcb64fe38cc094eec3fc8cad2f28b01bd8de98b1dc637a17aab1db1568a82cb91ebc65c382
 EBUILD crypto-api-0.13.3.ebuild 781 BLAKE2B e6dc93b723671484bdea849d3b58264ab90bc239162bb39d81c6e94d3a384ed8e996736348950cb5feabfa97e86c1fec969a7ebb60dd1368d9c73209f50b2570 SHA512 2496d5e2e9f82cc31c16e06fa01a89c89fded4e610aa6d6bc54d4bc0845963dee7b060ad212edc4edeec596548ba94eb7d1e3ed40450e5924a33fe6e137dcee3
-MISC metadata.xml 855 BLAKE2B 3ba03ed1ab2ee220afbe3521c047761a160c82a8c78cda01d24d93a88ebc1e5836945564fe9cc5030a13b9ee4e110c8667cdc2e3075274389fd62d5c00f9f20c SHA512 d2c1fda37ec84c96c849caae75d627e9b8db2d671844467269d4f9cbb81149dd240645a6694ca544a5d1ffd6edf2490e9a96623cab6e3b574638d63bcc35decc
+MISC metadata.xml 951 BLAKE2B d25f38d5f040786503f71178de3c5e4c622f6b219fd11c9128761b016f4d06ab65cc2fcee6ae16fd79f14c518338186c384e23f207eb71941f97ea841922e0d9 SHA512 d94be1ba9716bf2d9bece5826dee390245709c337d74beab7c401f6d0f153c6b042f9faa401db178a6460e925362cfce9b48d50672bd39cb4caed6ea6888c7ef
diff --git a/dev-haskell/crypto-api/metadata.xml b/dev-haskell/crypto-api/metadata.xml
index be1aa2e99734..1d7d6bf55284 100644
--- a/dev-haskell/crypto-api/metadata.xml
+++ b/dev-haskell/crypto-api/metadata.xml
@@ -19,4 +19,7 @@
 		one cryptographic algorithm (ex: padding) is within
 		scope of this package.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">haskell-github-trust/crypto-api</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/crypto-cipher-tests/Manifest b/dev-haskell/crypto-cipher-tests/Manifest
index 3f664268223b..2a30511c7e93 100644
--- a/dev-haskell/crypto-cipher-tests/Manifest
+++ b/dev-haskell/crypto-cipher-tests/Manifest
@@ -1,3 +1,3 @@
 DIST crypto-cipher-tests-0.0.11.tar.gz 6183 BLAKE2B 6899bfff8cc9654656becb1ec21a7c3792a9b50141858ccc5678050daaec1f195ea5b9826cbb85e127f0e0c3236bb9dad94280a2c49732966453b1c0832b2d33 SHA512 cc8361517e6c2afed1585e7648ed1143e8b4224918fbd8191a970d0afe2a162b759e8e6aee49308a93bdfe0d4d15e2bfb587d4e9f6891766f8e834822553b853
 EBUILD crypto-cipher-tests-0.0.11-r1.ebuild 1075 BLAKE2B 969b14669db2168499a61f817eb1d84eeeb71c0941810f75da38fb50ecca9e93d2e0e5bdddd59ab2dee2d1e408cc051ef6aaf4c3b474e093e9a1158ea80f8817 SHA512 89c16d29da0c5fac27480891e8a06b4ce8e7d789dd35c0b26c5706863d4b8b74d097834e403e07c3e9c5834f58aaa018bdc05d45c0ed7054ddd4826d58bfa771
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 341 BLAKE2B 08b1b586e4ac4186a5da7ddae6ebdddaca33535b31c409570e30c27445eac48686781e5d50a62184d63761f3814b1b86625a10829e702d525697b6589e00d39f SHA512 a28a7a8da6e861eb246c983c73f2ab03118382c25f7dfc6eac46a3d0278399a0292ff55da8da52050f4da5d110e2a18bde673caa4ee02c8db7722bd8aed560c1
diff --git a/dev-haskell/crypto-cipher-tests/metadata.xml b/dev-haskell/crypto-cipher-tests/metadata.xml
index 937381521944..2485d8951fed 100644
--- a/dev-haskell/crypto-cipher-tests/metadata.xml
+++ b/dev-haskell/crypto-cipher-tests/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">vincenthz/hs-crypto-cipher</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/crypto-cipher-types/Manifest b/dev-haskell/crypto-cipher-types/Manifest
index bd1208135004..a23c5a3d8117 100644
--- a/dev-haskell/crypto-cipher-types/Manifest
+++ b/dev-haskell/crypto-cipher-types/Manifest
@@ -1,3 +1,3 @@
 DIST crypto-cipher-types-0.0.9.tar.gz 8073 BLAKE2B 80f5349e31f04b591509382b6c475f0f65095b50646dd5cd785c037eb9be8193a011f060beeee42a37586ccaf69122804124fbb77ef46f894ed985d573481c93 SHA512 9b369dfbe1baa918f8b72dca0a6637634582629ccd46226a3a89813f42cca1e11ee738e1053503a6bc2863c04dd885083e6a09a5bda5a52dbf381e9f133e24cc
 EBUILD crypto-cipher-types-0.0.9.ebuild 647 BLAKE2B e46bcbea38770f0dbb36caca42fe9cc6ae64981d4d51157a36407fa6990d2224917a997f62986b9c632e74239ad2b5c043cc4588bb3bc6dd5599e39ba4c7937c SHA512 d20b1d3de8a8ebf9aa1fd5b6b1260ae80baec1d3d2e0eed8c18d42c9ca719c0f377fc9a08e79e237f352406bc82efc95a48d5edda9e820266ec0dd22d182530f
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 341 BLAKE2B 08b1b586e4ac4186a5da7ddae6ebdddaca33535b31c409570e30c27445eac48686781e5d50a62184d63761f3814b1b86625a10829e702d525697b6589e00d39f SHA512 a28a7a8da6e861eb246c983c73f2ab03118382c25f7dfc6eac46a3d0278399a0292ff55da8da52050f4da5d110e2a18bde673caa4ee02c8db7722bd8aed560c1
diff --git a/dev-haskell/crypto-cipher-types/metadata.xml b/dev-haskell/crypto-cipher-types/metadata.xml
index 937381521944..2485d8951fed 100644
--- a/dev-haskell/crypto-cipher-types/metadata.xml
+++ b/dev-haskell/crypto-cipher-types/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">vincenthz/hs-crypto-cipher</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/crypto-random/Manifest b/dev-haskell/crypto-random/Manifest
index 95c892d97a72..3cd31142125a 100644
--- a/dev-haskell/crypto-random/Manifest
+++ b/dev-haskell/crypto-random/Manifest
@@ -1,3 +1,3 @@
 DIST crypto-random-0.0.9.tar.gz 9256 BLAKE2B f9433a75c7285e92feda4f5d3db165c0f530d59ab95f733755c138bfaa162b0948b84ca912dbf26fc80b06d5cee7670361defa308d1ea5926a0e1cd385d39976 SHA512 07e298e2e3846b48330af92a46ab8550982ad74f6154c59a531762d9282f6712c1e867a48ed6cf4d967f463f52c1af4287a74552aeff0635480ea21cd54a7a24
 EBUILD crypto-random-0.0.9.ebuild 643 BLAKE2B e6a0fcc51226fd0f62777f398ba8150ff1e7d2bd7e4286d5d7c3d231da0ca7b67389c55ef7cb0ac30f1476d9ade45ff589af5e5639fc6fb62b040f394b9b2cde SHA512 47cec1c3fab409113e58ec87103fabbc7597a2f486048b81e5c768333db6f87e7c419a63f09b642af63b9106d64719c4ae52bdd95fd669f366b0163bf925c9c0
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 341 BLAKE2B 3eb4c7f6d2967188f7aa41ccf635dcb31852d67a94f7805608724e664ea5598af6ce79468cf56399050074e7b6856943c8e8a4f87c1bec81ad54c982a2001301 SHA512 386f8c7c2a52d7e122536a54ab96382aac51dfe3e4592a73141639e82d8fd38d34a2ef57230702d290abbb63745fa337e8b2c34d8bcfbb79ea0befc75ee46cae
diff --git a/dev-haskell/crypto-random/metadata.xml b/dev-haskell/crypto-random/metadata.xml
index 937381521944..44cc6c6dcf10 100644
--- a/dev-haskell/crypto-random/metadata.xml
+++ b/dev-haskell/crypto-random/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">vincenthz/hs-crypto-random</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/cryptonite-conduit/Manifest b/dev-haskell/cryptonite-conduit/Manifest
index a749164834b6..ebc86f54b6f4 100644
--- a/dev-haskell/cryptonite-conduit/Manifest
+++ b/dev-haskell/cryptonite-conduit/Manifest
@@ -1,3 +1,3 @@
 DIST cryptonite-conduit-0.2.2.tar.gz 5405 BLAKE2B a2565d0d15863159dbb001584ec9e87eebe69b617efd6d18ab9c8d2ff81ae9e1fa26488f6e0bdeb07c3247aed8c63d0d4fa1376240b0ddcb54cd4a619d053a4e SHA512 5a313d1ff64992fc8f45ebf06f5f439aa5dfe745ce6f2bfc31b3ee06b489b0a145a9e6b5cf00fb557ddbebf1aa5c226dc0add9c591f62a06bd6f8776cf52dbdf
 EBUILD cryptonite-conduit-0.2.2.ebuild 939 BLAKE2B 1ebd874289cf64c6d161e2e1f7d7a0bba0995880fb5e5609a28967a83d58bfe2009ef105d86f8bfe5feef98fb0e4bcc1ed2edcefce285e14129bdeba5ab38870 SHA512 01db0583f62aeac513a1245e13ca4c1fdebf93c260018628f37e9d4622aae8c58f7f1aa7b92452e46003d9499eb168efbe0a428dff497fac6fc1ab0f516323f8
-MISC metadata.xml 478 BLAKE2B f4118ad76a667b298669f5d325b03142e0a48e66de1839606f87557693c14ae0c085bbcba50615566068aeeedc59bc3be822aabac1f5d0c1daa509030859bb70 SHA512 8a5944dc50772611752cc3baae87ebee6db7c33a2ccf23ff0cab99ff04de97c6485f485490fb71189e273684daf525680a828e5daf39de0affa877f6aed6f008
+MISC metadata.xml 576 BLAKE2B dba9501007c2281ed119475f6949e133ab151772e1f0b8d9f9bc16307508ad793dcc9c6e45cbbdffc5d6e2fed1c4775923dbef6c748fad975897afb2f936c375 SHA512 2b2ed16cad637afeca31e975e82fcc843fc048820f79c5a6408baa874f7b917d68bb38bf26a39e672abc5fd80f57a9d1e13daf3b4b65b1af5c2e986c4cd8c0e7
diff --git a/dev-haskell/cryptonite-conduit/metadata.xml b/dev-haskell/cryptonite-conduit/metadata.xml
index 74cb13dc7992..f1f67cdd6f23 100644
--- a/dev-haskell/cryptonite-conduit/metadata.xml
+++ b/dev-haskell/cryptonite-conduit/metadata.xml
@@ -12,4 +12,7 @@
 		with contribution, this could provide cipher conduits too,
 		and probably other things.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">haskell-crypto/cryptonite-conduit</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/css-text/Manifest b/dev-haskell/css-text/Manifest
index c4c9c72c3931..5a3cf40ebd74 100644
--- a/dev-haskell/css-text/Manifest
+++ b/dev-haskell/css-text/Manifest
@@ -1,3 +1,3 @@
 DIST css-text-0.1.3.0.tar.gz 4594 BLAKE2B 0ea86030b7e2a8f015bcc1a122e325948570baa3f72b961ca13d731c8a464ab06360eb451ca826175c73288d2eb4b51715c674151f2f3aaf1750ac2155e451ee SHA512 2f7b4fc758e3e6da7dadbaf48c9174770de8230ef4578d9fda610ca9b7a4ad497284623e382bf55111ddc852550275415f58311a2e726721f050d9f704050628
 EBUILD css-text-0.1.3.0.ebuild 808 BLAKE2B 6eac8831c525d65d02e80c48caeec0d14b5e29625cff88d91c2d3d014c20e5095149a735f448b5f9ca79d6a9b27ae49796f89a5e49990957e2bcfaa61795176c SHA512 5478f01b513ed4eee5a53b0939268f61439c690867083410e9a86b7ff412e85beca8e7fec9aa291a7796f8d5f395344503512b88b5e4b8e782084bc0f61be37d
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 332 BLAKE2B a272adf8e3b75c4765bc67f2a3d26dd62b672c865d71058db67643e72b52cafd2ca82431c46406e89eda10050e447a8ac656b540a886e8beda4e15e2d0cf3448 SHA512 c6311031fd589df6e3acc91d3ae002dbdc9e9a8dca73f3b50b7f19bc10c530cf3e168538eb19498fe4b34ee49ddba43aa583bee6432e8633930ba126e97c34bc
diff --git a/dev-haskell/css-text/metadata.xml b/dev-haskell/css-text/metadata.xml
index 937381521944..6df1c65f3dd9 100644
--- a/dev-haskell/css-text/metadata.xml
+++ b/dev-haskell/css-text/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">yesodweb/css-text</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/dlist/Manifest b/dev-haskell/dlist/Manifest
index 470f2d733142..d4fcd00d273c 100644
--- a/dev-haskell/dlist/Manifest
+++ b/dev-haskell/dlist/Manifest
@@ -1,3 +1,3 @@
 DIST dlist-1.0.tar.gz 18667 BLAKE2B 7ed951b866463c55b7f59d8224096528ee7a1c6a055a6b31e9d2a095409dc68bb3fb9e683922479c7cffe687796ebaf029f51a2da4469beec68b29b2c98ad2f0 SHA512 8985b9e775e8d99c3d8cf59eabfb7ed13c395482186b086831a79afea9b980ee59e386856df82dcc030f430be55cc95fa057e962776fe37a371e8be5ae19abef
 EBUILD dlist-1.0.ebuild 733 BLAKE2B ecb842c6723dccdb83ecbdaf8a54e04331b5f5ceb59b0b06e375303d26be4dd8451019dd207084d7e0bca7d899a6ffa49dc2ea7a06aefa4c1047040b52d4b066 SHA512 98ebc7e346b8956be6a38a9d9d79cde01c3c5076f523fe42dea2588fe1a61bb9c1fc2d8fc06bbb742c02adaa573fcc492a9ce7ce4c23e495d093178447093cf8
-MISC metadata.xml 309 BLAKE2B 4205600860bde8f7f4d57e79640616fe46459837814f2c709cfc87839465fdde45a8a27b89214b22989ccdb2c7976736abf98bafe907ef669b0808c427f706b0 SHA512 7f014123a8ec7b406192c4973b765560973ebdd653cfc78296960d91cbed049d2377306afb23f054dd0d88caa0f7ed6f4b9719d8a6db6467f6fc6a36fd755ca1
+MISC metadata.xml 383 BLAKE2B 429bfe985def81c51417dd66a309e4f954a4f28319d80e774396b815a228eaab5bc4aec6582c2d043889e49a70153036aa74a14abf849ba9ee9c973011adf471 SHA512 1c90822ad3073567dccc2266f159b3d65375939a288dd1ae2afb16ae5ff01b3ea8e2d724a0be2a37c99a18e6703448bf5dcaf71ae99aabd7d41e7cd645c52887
diff --git a/dev-haskell/dlist/metadata.xml b/dev-haskell/dlist/metadata.xml
index b47c460c73a6..a7236f4e18f7 100644
--- a/dev-haskell/dlist/metadata.xml
+++ b/dev-haskell/dlist/metadata.xml
@@ -8,4 +8,7 @@
 	<use>
 		<flag name="werror">Enable -Werror</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">spl/dlist</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/easy-file/Manifest b/dev-haskell/easy-file/Manifest
index 2bf48b28b9a3..6cbdee774d0a 100644
--- a/dev-haskell/easy-file/Manifest
+++ b/dev-haskell/easy-file/Manifest
@@ -1,3 +1,3 @@
 DIST easy-file-0.2.2.tar.gz 12667 BLAKE2B 4f018144e10abe237e03bcf73189dfc0fcdb39afe62ca269c398baf9a4d9e10c2f1409307f331b99ca3c51f3b23bfccef6bca823016de01c9a1731bbd295a48f SHA512 12a11afe54175b21382786b9d7aae59ba068a27857a3ceb934023da7d14a5e9a69e4b4210a97b5e64fbcd6a41251a6a8b5608feb8a3bb212077b08148468576e
 EBUILD easy-file-0.2.2.ebuild 554 BLAKE2B 73d8614605872a91aa659ba8d91af116da0f999c584a7a67dc38aa2c920f7c443ba3ab499a318e9849ec346b2ccedaee901b4ae97eb2f7953894a662a02ad818 SHA512 74f724d6b430aec84dfd007b85d3e0705dddb2777f5a8132266583a9db4603ae9ea16b4f2fdda0e1d726f65bd4156cdcb2813e24897491d752bc943210d71585
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 338 BLAKE2B 6d8cbc1e1226ff1421bcb98dafb74c7f74155821da7d8103c5b2627db9b1f0c13fe5f8e57c6629786a5db2ef0e877a71eb43ad73004cafc570c16b466e24a873 SHA512 194b9b399d1d86d98bee78bbcaa1a33a7b553fe63a35db525bf0724c5947c345cb3f5d072ed32835dc1eebe076455c265b80e13a12cfcebf2ee021368c07b99d
diff --git a/dev-haskell/easy-file/metadata.xml b/dev-haskell/easy-file/metadata.xml
index 937381521944..fcbe62e67545 100644
--- a/dev-haskell/easy-file/metadata.xml
+++ b/dev-haskell/easy-file/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">kazu-yamamoto/easy-file</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/edit-distance/Manifest b/dev-haskell/edit-distance/Manifest
index 765ce7885935..31ff70bde49a 100644
--- a/dev-haskell/edit-distance/Manifest
+++ b/dev-haskell/edit-distance/Manifest
@@ -1,3 +1,3 @@
 DIST edit-distance-0.2.2.1.tar.gz 13228 BLAKE2B a7e57e19f61497cfa24c1a038e860d2b0d616f4a3528db3c315c12f3bd04554e003009f1b07b2fdd6be7a8387b0205dde4d00da8b0a05f5c4b7ab0c17fca159f SHA512 67d19c9f5712191f88641d32ff0b84aaf05c2acd71cfa81a17675690ac9076b34aff687afa8501f8b22ddcece12a439e053265d14b70dc155b0e08406050fdd7
 EBUILD edit-distance-0.2.2.1-r1.ebuild 832 BLAKE2B ff4c07784edbdd7b792764fc1a26d16acc38137f864d5e43ce2cced29d98a71cb1b28d28974c999adae81b58136e51236879fbb6f527e6e6e8e36e04c8dbb406 SHA512 46743d382921b07052bc91065a53c607282c6350480bf67f0b68c3c56f064a72e1bd615ea39a145a633e3b55498f6763ee79bea43c5f3a3d29ea53ccd6b6275e
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 339 BLAKE2B cecf4f3ba161bb5a5c40804a779b1786d1478ea36d322dd63e8eda2baa38d1d71d386ac4b79b2a9e54e058277ca78d8ed1864a5039ffd0c267bc936068cd4fc3 SHA512 c639d830f6dba528e61afe773b0610ae047d7a43e863f8cb52e78fdb417c9192e229cb4de7f76746b75e767b0c9aaed625d3912349fe0934bbb134a35dfcdecf
diff --git a/dev-haskell/edit-distance/metadata.xml b/dev-haskell/edit-distance/metadata.xml
index 937381521944..aeaa481635c7 100644
--- a/dev-haskell/edit-distance/metadata.xml
+++ b/dev-haskell/edit-distance/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">haskellari/edit-distance</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/filemanip/Manifest b/dev-haskell/filemanip/Manifest
index 2bffc515d660..009e30ef7a0a 100644
--- a/dev-haskell/filemanip/Manifest
+++ b/dev-haskell/filemanip/Manifest
@@ -1,3 +1,3 @@
 DIST filemanip-0.3.6.3.tar.gz 10369 BLAKE2B 19f68d3c130ff5d2f40cae100eeee4ae079d86c0d23138e44b7f22d07584c941a8a0ad8cddb04b474a86729872699ac72991a0dcf6c9807377a761570138710c SHA512 5cb6ad4e310c1ae3b038ccfa3154536db73145e4dea4a7be1ae0563ba44565494e378fa8e459f449feac2bcc140f1128b0b3ec915acd2300e73cf012ada85160
 EBUILD filemanip-0.3.6.3.ebuild 636 BLAKE2B c31673424f66584ddec1572abcc29f9fffa3f46b6ae4f8c81a857b72e6dd123f720403262ea28ebaea158b028223f0c3555ad3713f909f20fae124bf063ec670 SHA512 370f25028ce2615b8553b125bd109733017bf2ee535bf00223f2796d0eb25ed8ca6e133a29e611ab3b38e3477573abbef2b67ddc6f1bec0a223a45befeafc56b
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 328 BLAKE2B 9db9f171b66b0fef56ed4336621269b31d1baebe7dfbf7148ccaf916ca58aefcebfe2216c8ad6a324783fe3a3397327b353f6ba9f33167a1519f8eb0e8e7ccd5 SHA512 3515e20119271d33f5feefd3a189f2f248638ddc8a39c7d1eecec036bc69a1c5bee299f0a8f2cd5272f2593b64fedcbad3dbce8e43a422975452ecc389f56c3e
diff --git a/dev-haskell/filemanip/metadata.xml b/dev-haskell/filemanip/metadata.xml
index 937381521944..2e2ee1d112c6 100644
--- a/dev-haskell/filemanip/metadata.xml
+++ b/dev-haskell/filemanip/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">bos/filemanip</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/findbin/Manifest b/dev-haskell/findbin/Manifest
index 1cb274047b7d..5af72d182fa5 100644
--- a/dev-haskell/findbin/Manifest
+++ b/dev-haskell/findbin/Manifest
@@ -1,3 +1,3 @@
 DIST FindBin-0.0.5.tar.gz 2277 BLAKE2B e63fb63739f1418d43fabd919276e9b4fe4ba91e2b8d961df232e824443d0f39ab7dc9ef55f4628f22216e312f1d7a8e81a6d8bb9f748fce8ba17ea6880eadf9 SHA512 427eff520ea9b88bc928d4330d4550d1d7d2254512e63cc8afad5f45b94a58cf4758a704db5b8ca4dd33f5bfced6557965192bd41d621a33eecc0c517548fa9a
 EBUILD findbin-0.0.5-r1.ebuild 623 BLAKE2B 66edc72748573eea0207d1a2843b55c95d8fe1fc0c35c8bea484995b4a04a5c493e75a30e6509d8263540a0dd069f85cfb92895655672af61fb06af0463655ae SHA512 c422908f49eb9050b79fcb6f1f30f4656184563d8afba88e36d15b19df43a29d264c96be61468d3ff84c08c5f1091f8055d04697ef38cdc1aeda088d0252b943
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 330 BLAKE2B 183c6207e0e39c74ef68a01c1e1e1dd1e70ae7987cd39fa2acea1fc91ec1f7301e7109928c9e8711924ca7a9f3f3448b34dbc456bcad85d8bd813edb98464420 SHA512 edf86cb6955728dc2675083077f151093f6670f2f57d2deb5c12cb74a07fca06556c9b830ba1e24195ae2205e5dfd19bb699824f114ca103df32330056b5a33a
diff --git a/dev-haskell/findbin/metadata.xml b/dev-haskell/findbin/metadata.xml
index 937381521944..0675fb9d0bb8 100644
--- a/dev-haskell/findbin/metadata.xml
+++ b/dev-haskell/findbin/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">audreyt/findbin</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/getopt-generics/Manifest b/dev-haskell/getopt-generics/Manifest
index a91a4046f1e8..45ea9194ea97 100644
--- a/dev-haskell/getopt-generics/Manifest
+++ b/dev-haskell/getopt-generics/Manifest
@@ -1,3 +1,3 @@
 DIST getopt-generics-0.13.0.4.tar.gz 19194 BLAKE2B 2c091df40c0c39f5e314367f2eb76aad296b8ead1fd26e84b1f578c1b3347c6961931dbc709a7c5c4374e16b965a573e4fb9c5c7c10f870b75e132ae1c84ff51 SHA512 f053dcd59126932745a98c955eca70dc3f50eda7e5a390bf7e5d7c639d89df9d714a6b449166a5b288a77e69f203207e8d8480ad86484b68c7a609e5f1a03fca
 EBUILD getopt-generics-0.13.0.4.ebuild 891 BLAKE2B 502deec03dd1ab07e130c867b89458c2736c0cbdeefe1770823f0ed24788f2cd75cfd46a37a57c80d44f5eac9bb7312982d66424cfeaffc23632f06534fc01c0 SHA512 8c049a85bd0e73780ed8fcde34b0cde93535ad6ef629c7b44d2687cbd4400857d84b2b7934b69041de31a924fa5d5b21c87ca31b34ee9a5089362a2582280f5a
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 341 BLAKE2B 49d7e9eb982ce135ecc420a9ba0cb59cb8ea601bbc544903dbba2c58014c91129bc64ea56f0cea6ec98ca5a9230c1ff548fa011c6fa2e477792ceff5900a59a5 SHA512 f8b8d37a4a1865b592dc49a0312f09584bde0279bf7cab174c414bc909f91d3ee5844a435c990fd638409f614736f99dfb6f7e364382be7d2406c898e4e7c1ae
diff --git a/dev-haskell/getopt-generics/metadata.xml b/dev-haskell/getopt-generics/metadata.xml
index 937381521944..7029bd0edc65 100644
--- a/dev-haskell/getopt-generics/metadata.xml
+++ b/dev-haskell/getopt-generics/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">soenkehahn/getopt-generics</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/haskell-lexer/Manifest b/dev-haskell/haskell-lexer/Manifest
index 4c7f08b4c2b3..dd66b2114c61 100644
--- a/dev-haskell/haskell-lexer/Manifest
+++ b/dev-haskell/haskell-lexer/Manifest
@@ -1,3 +1,3 @@
 DIST haskell-lexer-1.1.tar.gz 14368 BLAKE2B e06a1399c45511c8f67516fc7abba2eecbdb22a39f6278ec17418ae43a4f2c74bd1e47053f55b06bf45697f9760b2efc3787429674b08554fd2aa51a3203e673 SHA512 7a93d135d8994941ac73feba6b22a82e05b3c124d2aaefeb33851c28d2268714ebf5fac6abea9544097b7afc2cb3945caed600cc08f9867bc819b96fe467b28f
 EBUILD haskell-lexer-1.1.ebuild 549 BLAKE2B 37f6c95eb0c3e5f73363aaa5c801a47694cae7351bbdd12d1944432f076b4c5cdf1b61effaeee2b9c7d1bf637f1b9a47864480d74ddc00f1cfe98f3b0b62e92f SHA512 ac5dffae6af709daff24f092543922c91764ab9aa27e94d27ba17ab5205e0bbca40d4a36422ab964c693362b3e1e652086132ff6a6585fe40885b7cd92cc1cc5
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 332 BLAKE2B 8da8b7cbaa302551cb874e37eb822d0f55a5ec3617b67cf13b2f32be3583cdb33e435ddcbfbf6ee3cdcef3ba959cd328e76c44f2acdb155d554712f3d10cc913 SHA512 147c5b39aec9dc933ed8a3bf8fc774e5894206dda84277e935c4cdd8212074125ab51d4661ddbd012b1ddb6004290b81a48274fcdde7571ce21aba307945a57d
diff --git a/dev-haskell/haskell-lexer/metadata.xml b/dev-haskell/haskell-lexer/metadata.xml
index 937381521944..2c08d6790c93 100644
--- a/dev-haskell/haskell-lexer/metadata.xml
+++ b/dev-haskell/haskell-lexer/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">yav/haskell-lexer</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/haskell-src-exts/Manifest b/dev-haskell/haskell-src-exts/Manifest
index ff3743050182..9313263876ba 100644
--- a/dev-haskell/haskell-src-exts/Manifest
+++ b/dev-haskell/haskell-src-exts/Manifest
@@ -1,3 +1,3 @@
 DIST haskell-src-exts-1.23.1.tar.gz 1264319 BLAKE2B 4ad6fe7e2cd70523b5169569f57493e595e2700866f5c44e8044c84bcafc17f98efc57302beb0e3a7ed385c23e204dd79bb63a30bcf0ae414e66696a832038c0 SHA512 c9e6e4d93c2b4ee84d57707aed526291b5c4e297f06a3921257feb0c1df3bb095addd4b1d9bb187650490364647385ab6322e4fc54f9a7648da439a34329d734
 EBUILD haskell-src-exts-1.23.1.ebuild 836 BLAKE2B 75352ce8963322f7aa86fc7af5be97c02a23a5766e8c6bf3d8cfd47c49ea322a62b8582a4544cc909d040f4575d574646d560b29505e0cde3c43662b22924a75 SHA512 7194c99a7bd83a94e3ee11c02b18d9344aa396314bec2721a5ad8d14ee99bd04dbff7170d74aee87ebbf1f0fc66b31c07aef73d2ab3eb9eb6651b8278fb4ed8e
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 345 BLAKE2B 744ea8b4ac356e171f7f222237504b3e2fad8abbdf2f0db6d8b5ed62b4bb2a205ea0715c01778064106da1c9ebd9881c57debf0247e554e91a0280bf2b5bc972 SHA512 d434655a6f0f4abf361f80061993c78b61c1823189fe687b4b6162c8d96d3a03b81510c8779c4deb4d8624443a2ecb80b3bc71a0f5400e83daa45d1c56024702
diff --git a/dev-haskell/haskell-src-exts/metadata.xml b/dev-haskell/haskell-src-exts/metadata.xml
index 937381521944..135db545c9df 100644
--- a/dev-haskell/haskell-src-exts/metadata.xml
+++ b/dev-haskell/haskell-src-exts/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">haskell-suite/haskell-src-exts</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/hinotify/Manifest b/dev-haskell/hinotify/Manifest
index 9f8cedfbbb8f..f219dce31552 100644
--- a/dev-haskell/hinotify/Manifest
+++ b/dev-haskell/hinotify/Manifest
@@ -2,4 +2,4 @@ DIST hinotify-0.3.10.tar.gz 9193 BLAKE2B 877f98091412732656913f7af9e29e34088d240
 DIST hinotify-0.4.1.tar.gz 9173 BLAKE2B c9baafdb64167f1d4ceb82bb072ee56fd0d9d893b321a8f50c3f125ee2756dddbe7372dbf1eeb8f44ce98e07adaf47e531b07ee0df7332fa141d825d11e4e12d SHA512 2f4627a3604ac6ec5d745ba6f4fd11e39a094ad54a5ab4d5040fe6c7c2a8823e42be575b9be95dc6848db99b421bac70798f8eb5f9ba6841f06f6156afe8797b
 EBUILD hinotify-0.3.10.ebuild 630 BLAKE2B 3f2160ca90129588014971e5eebdb34ee33e5b66a0366ca054c6a2f3617f08f40dcad8fa34286feeac2c631b8a73fd4fdddaf52548863eb6fc7bb7cd83200c7f SHA512 16453d8f0a3b37f8407e8c067e4a6d3b8cb01c7372fc01fe3f74498ec325a4f4ee653bc6cae10773206aaad640bf85612ec42cb8785ef53f8cf4aea7e733fd10
 EBUILD hinotify-0.4.1.ebuild 627 BLAKE2B d0e8f51d6904b43cef89caf7f679cc6df793c2e9457dc737c3206d3d426df5d45aac562348817b30e9053eeef137d48814c016375b1d76a109805c981953cc85 SHA512 04ca65f66a205135d1e10eb3e4c44e9838efda4bbb194afcca6d9aa0813c6f4936e42fced0aa18fae7b2ae0fcb4c2113af99f47aa09a52c5b02876720f36f14a
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 332 BLAKE2B 333c978a7d30566c1583d994581a74ee809c78e5fd9ac54b28e8394f3168c5f59411f7cfe68b33c49d35e2466ebaa6a84da25281da7367f6f90e8ccc5286efac SHA512 dc6041ca3a5188e2b7f73b7766ad3bc65f9489ea1cacda1127d3475ed8af3b4b8060ac93818bba3736d91aa58205d31bce9898335ce6cf8f8879906b6ffcdd56
diff --git a/dev-haskell/hinotify/metadata.xml b/dev-haskell/hinotify/metadata.xml
index 937381521944..2b3b0f1989b1 100644
--- a/dev-haskell/hinotify/metadata.xml
+++ b/dev-haskell/hinotify/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">kolmodin/hinotify</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/http-media/Manifest b/dev-haskell/http-media/Manifest
index b93350d6d993..5805504670fb 100644
--- a/dev-haskell/http-media/Manifest
+++ b/dev-haskell/http-media/Manifest
@@ -1,3 +1,3 @@
 DIST http-media-0.8.0.0.tar.gz 18895 BLAKE2B 3a6db500f6433c6f0bc23f6b51aa5f35b3340a4258b4b5d637bdeafd5161c28af8c2630a013f06a8204a2d37242d5bc880d5c75d32adbf92fb664417872806a2 SHA512 549fa1892c81224e79bad4268993e0cfa324d9d0c9daa0d800ac7cc4eee307405155989672c49adb0e124ca29c2d83cc565ba3c935fd3be4ab4ef0594b012bb5
 EBUILD http-media-0.8.0.0.ebuild 1372 BLAKE2B ae27e8d87a0e8d2b269e733a03654be234ba0986a3a4c209bcfdb5f708de03fd1c52f1266e31850a6bf657ccf0f57f3d83609143d2eea32a3c4503067564cda1 SHA512 3f6e99ea419e431f8974589e760c6edc0efa4f0e07b7834ca6481fffdaeb7a2475d4e562376b35bf3ffdd510ad9555b041b3c51166ca8493a33b355e9b2c9bbc
-MISC metadata.xml 1491 BLAKE2B c9b7839adb9d896f454402bcfa01a7c0e578a5a3c0b327b0ba19e43e0d703fc5293402715dffdd9fb85039236c75fe501a6dc6263ebdd0e001815843707d3862 SHA512 9f312316b9bb9b687491fff9954b81e9938fb74c88f3aa0aa002c991e7cc5025ac7feb7802e35c8a2b68797dc36027d24f74af30c3bdfd99c76b94036f383299
+MISC metadata.xml 1572 BLAKE2B 4e51f09a862a77de432ac14f3ddfb318fcf27eb5615c0a6af86287a5a45e804b6225d4017cfc33a0df71f91e0acef95ac826c2d6e5687874f88d696ff9afb5f2 SHA512 c7c1898a7a1823ebb5a3d6ab18d6e6c93ba687bd95fcd572f82eb2031368842c552374abd026ffd0a3db339514c441276958499eb75806ce1ab62eefb6ef41d2
diff --git a/dev-haskell/http-media/metadata.xml b/dev-haskell/http-media/metadata.xml
index 218cc2160eb0..fee7d2838ce4 100644
--- a/dev-haskell/http-media/metadata.xml
+++ b/dev-haskell/http-media/metadata.xml
@@ -32,4 +32,7 @@
 		
 		The API is agnostic to your choice of server.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">zmthy/http-media</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/ieee754/Manifest b/dev-haskell/ieee754/Manifest
index d53bc3c83ffd..434c0c992c01 100644
--- a/dev-haskell/ieee754/Manifest
+++ b/dev-haskell/ieee754/Manifest
@@ -2,4 +2,4 @@ DIST ieee754-0.7.8.tar.gz 17290 BLAKE2B befc4e9f5f1b69a6ad29a2bde915a6f9115a3074
 DIST ieee754-0.8.0.tar.gz 17564 BLAKE2B 7dcbfc3fcff5fb840bdba9e6fb6e964adf519ad3b6e21e40bbf05c9a4e571f196b9946b8f4bc3b66b1d38720ad9e44bf23c301fbee39c0da7a2766930e0a7262 SHA512 d75b619f0c0b9ac496a68997b6d79b3d7504221f1583e7c35ecc035b6e2b11559e402264f36827153aa89d9eabb27d9383413eb5fd157385b3f41c4f0050a43b
 EBUILD ieee754-0.7.8.ebuild 578 BLAKE2B ef6f9f77af3bf62d1f7bf9c0dd6e05f3721cbcf0ecc34e0f864b3e4c5e4d535a1634a8bc23eabc506458858e63da884779e87a06d1f4c0150ac820931b7b2370 SHA512 abfcfee113144605876a1cf6a5627f94af5057942f15a42cf380748285ce67bc7606ca082dcfd985b185fa3c55a1344f6a1c223d19f79498bc5952bb86b0bb3a
 EBUILD ieee754-0.8.0.ebuild 574 BLAKE2B d5d9c22ed3a2c0870d8e97cf84f8aaba6a9e5b95b4a4ee2576dbeeb5bf33c3cef714291186943f18a8572c1b8883c61feb3ddc8bdb36676ff59163d39de43d74 SHA512 59c159b8d50a71507d10192c763886d6660573ae94569303614d42f1ac75535fece557478b18d34264868b34bc3956f69b5189f6a0d0cc5462bc9e9c96b9d4e0
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 334 BLAKE2B bd1324cacb744fab835c1f9390b9de147a6668962259c4240c8dcd4fcfc498bffbc2f5a5344f459d51bc0aac6b84a395a3407c8749eb7698f4ec3443c6d3d9af SHA512 40ae4dfa6fe98750d2b909c3639d264d9cf0e4b935122fb2d54edc9807d671541ed52d13ee7ef177d76ff26e1c159ee061f47f07722b52aa21aed9a0bb29b83b
diff --git a/dev-haskell/ieee754/metadata.xml b/dev-haskell/ieee754/metadata.xml
index 937381521944..70603691e494 100644
--- a/dev-haskell/ieee754/metadata.xml
+++ b/dev-haskell/ieee754/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">patperry/hs-ieee754</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/js-chart/Manifest b/dev-haskell/js-chart/Manifest
index a72e8e4350cf..bba7d15f8da1 100644
--- a/dev-haskell/js-chart/Manifest
+++ b/dev-haskell/js-chart/Manifest
@@ -1,3 +1,3 @@
 DIST js-chart-2.9.4.1.tar.gz 501058 BLAKE2B 364aff9566b5fcb18cdef88af38ce7832cbe9347dd7aea0a2ef24aee80901d3802b26f6eb81b58894d94e138903b1dfb7381f8e6511294090da6f656ad63e04e SHA512 0e6325e12822d2607e04ac61e91963f4aed77a8700ec3bb3bc0662a9006780b6a60361ce135452a684dff048e6089f6057a85b2a83b093448f19dd4eeaf4ebae
 EBUILD js-chart-2.9.4.1.ebuild 564 BLAKE2B c86cabef9c9a190dcad8170144025089f6f36311565f331bf264c4d831fedd7c4bb53226a7cd6680d2454c3c86e0beb6b27b4578a55bba4dbb83855a0fcf459e SHA512 0320d046c1a0df032bebe28aa517efe1dc0b48cb763a1f7367708912c4250e8b3cfde4fd578b3c66365382b820a3138d1b7e0ccae2f194036875cb4ffe51cc64
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 335 BLAKE2B f28c0814662ac7c090c45daf99923fdc291a9276bfcda332c3bd9f4f71ee66f24e532bb6337467d0c7486d3ecbb5eb96a92c84f4bcd010ca1c93fc517aa4b79b SHA512 cebd1cfe35ee06960621be1d0cda22b04212196b9c46fdb2fa6d0f7803c54058fcedc9dc6aaf0093498687bd2faa073d780afc1d59521a64e02188978638d38e
diff --git a/dev-haskell/js-chart/metadata.xml b/dev-haskell/js-chart/metadata.xml
index 937381521944..3d7fb8281ca6 100644
--- a/dev-haskell/js-chart/metadata.xml
+++ b/dev-haskell/js-chart/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">jonascarpay/js-chart</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/language-javascript/Manifest b/dev-haskell/language-javascript/Manifest
index 156c11d82a6d..19a558f1a5bd 100644
--- a/dev-haskell/language-javascript/Manifest
+++ b/dev-haskell/language-javascript/Manifest
@@ -2,4 +2,4 @@ DIST language-javascript-0.6.0.14.tar.gz 75969 BLAKE2B ca286024545ae1b6ceb841508
 DIST language-javascript-0.7.1.0.tar.gz 76438 BLAKE2B c0e893ba9547a1104afd0397ed3b9439ba78947e6650317d98eeb929c140fbedb1b13d2e2425a71326b795a1b22efddbf93325591313dba9ade2b70acef12909 SHA512 35f935f121cb8aad1a28be50ba8d571ee60bd2c6721eaf9bc7f897cbc4a33b17213e89d84bf9525ddbf555030efd5fbe6b11157c113900354430a7193223516f
 EBUILD language-javascript-0.6.0.14.ebuild 941 BLAKE2B cde9ded998ef42d6796e2ba8b64ab9cd762c2afdfdd54e5275f8eb43541b2fd42c2b3bcd6d817353cd93241e43950bb91c39528f207cd53cb7c596f484c78747 SHA512 79bc50175f546a371313d6778517d2734648bff18c26aaaa0e459a04d28b95f8f923f1ccf42c84d054c2aebac99c00ef6a2edf7246df73434436ddb1a619a1d6
 EBUILD language-javascript-0.7.1.0.ebuild 934 BLAKE2B 057dcc92afa88a3f34f2ff2cdcce0dedd4e775cc9a74b3ca5bc39448b0c7b36f27cd20f8983f57cc3e8f38b3edc5ce3d3a24e3db8e5b2b8f270e1008373a899e SHA512 eceff0293f58955663a56940a02c7329541e41c7c731d2a2cc662f5bf960d7add5c47cbc3967bcf093178583d0d1472ee9f8aeae579237c898b577b818dff372
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 340 BLAKE2B 6403339e1fa639a1c0f369de661f8a2b45338c90e7e19d7050e6f143338dd5dc6bf73abe6bd9e445ec69b9e5227459dab11ed73f4679dbe9daf841d06206e611 SHA512 511f6f9463246198e47d4944edec95c1d03e1ad8004194d7f8481970d45bcd02ffe1b2e1fd517a526a1519ee432e54bf950f2dca3f2de99286b4a3ee8cc1e47a
diff --git a/dev-haskell/language-javascript/metadata.xml b/dev-haskell/language-javascript/metadata.xml
index 937381521944..2f963f44eea3 100644
--- a/dev-haskell/language-javascript/metadata.xml
+++ b/dev-haskell/language-javascript/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">erikd/language-javascript</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/leancheck/Manifest b/dev-haskell/leancheck/Manifest
index 619a43db352c..0f67a1c2f82e 100644
--- a/dev-haskell/leancheck/Manifest
+++ b/dev-haskell/leancheck/Manifest
@@ -2,4 +2,4 @@ DIST leancheck-0.9.10.tar.gz 129134 BLAKE2B d9b6d4cf63eae2e54b327783f6f396d112e2
 DIST leancheck-0.9.3.tar.gz 125801 BLAKE2B 4825d66ddc745a1ba6e20a28c7397ca33bab79e84899d5ed0f28d88f526f8415aad8b707b2e61de25ce482673d47f4771bc2cb1e402b846fff7552df49689837 SHA512 a5591e8f23318ae6097494a62998f1553fe975058827058f4d7400f723e601bcd92060c26fd5d9c60f1c1da51f97d74de0cf380ae5652c8c0721fabc2b4f5027
 EBUILD leancheck-0.9.10.ebuild 572 BLAKE2B 3b9b241a5bd7a7efc0ae4b168617702e5836a5a523afd6e24a5e1b027d65e1fe85dd3471d7113a0278d6fdb8213f5a2d84c2173a83b93da51f878050adda1d80 SHA512 c5abf94cc7a8e4e140a612fe40069c9c490bec401e581de2caa06846c73899a06d11661fb5fed784622638c37d4b498a4e0f870b22ecefd6953701366914d900
 EBUILD leancheck-0.9.3.ebuild 576 BLAKE2B 6afefbbfaaef62b6b76e0527d8fe1f5237bac7c0ef7582fb014969897c3af417653d26cd55e77d059a7e5e81858f19602feeef371ae7360239e67e5e52cc2d19 SHA512 aa639337ff795f9c79043845cb3db7a91876757adddb718f9011b5f7c7f2e5c9bc4ef7ec05d4f76a3b407042c3362ce6701ebe918e7f8ccfeec60bcddf91bb7d
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 335 BLAKE2B 2d80c215e3f1cbc3ce2a0765ccddf386011629950f9546646b9aeecd16198a07f3c170ba19114f1155328081771111328d75c09ac05c2d7b1dd7730816cf35c2 SHA512 a1c19092495040e93b0c135f0a2b1953853b0523757355d2d1ab28c578e4fe8d2932eaad547d384b40e057b2e4b9e9a2f5563adb96b2c646f8af4d4741ffcdf9
diff --git a/dev-haskell/leancheck/metadata.xml b/dev-haskell/leancheck/metadata.xml
index 937381521944..3289bf01f4a6 100644
--- a/dev-haskell/leancheck/metadata.xml
+++ b/dev-haskell/leancheck/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">rudymatela/leancheck</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/libyaml/Manifest b/dev-haskell/libyaml/Manifest
index ae65510ae160..5f6acdd570b9 100644
--- a/dev-haskell/libyaml/Manifest
+++ b/dev-haskell/libyaml/Manifest
@@ -1,3 +1,3 @@
 DIST libyaml-0.1.2.tar.gz 63635 BLAKE2B 36f702016e5646671c4f56d4b717bf99307bc4c27b73f9d136558b1a95c5c1007553a89a256540cf32bed30399d886f18d119cf4a7f7067e318ca2c44f94c991 SHA512 0423fb36f1fdeeb89244a81930558ad272f8ffe8161ced3cc542e180937a1e5f264f188972786830b0bace6851adca796756abe100dffa8cb969eff4cb0e3121
 EBUILD libyaml-0.1.2.ebuild 981 BLAKE2B 3e82263b6e5dd89a6bf71e6993df14d29f3e75c895fdb05b15810b47bcdf79696a590a76e717f258ea1c7a4387ea8c0af7fbf8c6b8d3e7f5eecba979842b2aa0 SHA512 83df031354761176e4b8de00ee6732045f12e7de2faf915c84d3ff3c5ad4f24702191f2a30487f17dd1d9ef40628e1fa206e0575fbcae54c6a60632f7ed70f5e
-MISC metadata.xml 458 BLAKE2B a1ed9968205cb9bf53169239ee75a1f27a55d22803b8147913c5cd9c9cd3f2500a652f27b0d7bfe67c4bdc93ad612b464fa0abdf00b2acf1d44fc6a99fd7103f SHA512 92218086614c60a7254c628195c4962cc1bb7b88ddedcfab8cb93c05cc2b847d221df3462f056b7ee30ddd33ae7a69397443317c04a06b45f3191ca92477a803
+MISC metadata.xml 536 BLAKE2B 8779e9fe88a34401b71f547737aeebc2100ed562fc3b440e373b4f477c3ebda808518a2c77d0df35d46cd0e02319c8337ea7e7e74089184a67a16d335e6eacbe SHA512 da8e7a5d47522fddd18c948bbcc4655fbf22fad5c25b66d2142576fb7a85381b2bc05d5b35ab17d502e718f1ee62a96a87922e314763a29313e5b760d7447210
diff --git a/dev-haskell/libyaml/metadata.xml b/dev-haskell/libyaml/metadata.xml
index dd6483d64c56..8958352628bb 100644
--- a/dev-haskell/libyaml/metadata.xml
+++ b/dev-haskell/libyaml/metadata.xml
@@ -9,4 +9,7 @@
 		<flag name="unicode">Enable unicode output. Otherwise, unicode characters will be escaped.</flag>
 		<flag name="system-libyaml">Use the system-wide libyaml instead of the bundled copy</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">snoyberg/yaml</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/lift-type/Manifest b/dev-haskell/lift-type/Manifest
index 90c266496ad3..b0829346a504 100644
--- a/dev-haskell/lift-type/Manifest
+++ b/dev-haskell/lift-type/Manifest
@@ -1,3 +1,3 @@
 DIST lift-type-0.1.0.1.tar.gz 3133 BLAKE2B 64e27c549960e2a02a1f01431f602d4dc34ac3ad8db430c0e8f473c70a412ebebf31b7da5ea4e6024b3e59df654dbccfc3b9f980b32516d9419476941417c41f SHA512 3555cfc79a317849921306f8766d031dbdf247aa9bec604e20b47c31c4d001c7392b2f47a3463a9699b33826fec4a5d092fbad82c3d6a75f3c3151afa033b372
 EBUILD lift-type-0.1.0.1.ebuild 601 BLAKE2B 08d14976b478429b33094fb3b71659806bfea8b313eb78750f88ae594d40821bb3a1866f260d9953768693f79dd728da3dca2684e55dc8ffb5ff2c070531150f SHA512 20033fd826a1945fe2ca31f28597cbdc8b696aeb18b3fadb135ded2ac7dffc66f603a4400b34dd15b28116e643b0f78289016b64d012324286a62c800b33a422
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 336 BLAKE2B 18b3cccbe300fb1b7fa1f41e6b977aa7baed43ae0bb28d24a27837ef8ffc40bb4a7be13882162a3853c879e42a968276da65b3e86bcfd91815378bbd89ee3700 SHA512 502191aa4d7356eec4878eda8b37c4047594b5ab4f0b1ec8de3f049d1f7fda42b493497f5b578bcc5761e5bedcb689b3b9b766e9b336b3bb793bcb364b68ec7b
diff --git a/dev-haskell/lift-type/metadata.xml b/dev-haskell/lift-type/metadata.xml
index 937381521944..30704d31ed6e 100644
--- a/dev-haskell/lift-type/metadata.xml
+++ b/dev-haskell/lift-type/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">parsonsmatt/lift-type</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/logging-facade/Manifest b/dev-haskell/logging-facade/Manifest
index 9c0197d27f5a..5633658a46d1 100644
--- a/dev-haskell/logging-facade/Manifest
+++ b/dev-haskell/logging-facade/Manifest
@@ -1,3 +1,3 @@
 DIST logging-facade-0.3.0.tar.gz 4016 BLAKE2B 71be7c7616a533f8c97b9da88cf76fe1f8814172a43b190861a53dc0fcfc3a1adf673c7166c2834f20af304b9334f75e2bb0902b5a381c619d67de08bfc2f920 SHA512 3a6fbd7b309f6094224f6af2b98408a2a49519f8c0ca1a26178fc6c0b593af2101769a4981bcf250dab2ed99144ec14b19263a755e8c71a5b01400651076228f
 EBUILD logging-facade-0.3.0.ebuild 686 BLAKE2B c7200d5193f920b5cf3e584c900435b35f6ce14ee4706de75419eb00c31be5bcd0c82523ba354a6fbe72957a819d29dde1e7c2e511b35e51bfbe23b11968aab1 SHA512 393df93f05a7132a5648d71961313981ba1c696ef88bfd7b47dc6de9560f3ab349f0ee3b7eebb66591afb52ba5268f5612cfa5e279c4402bf05c76b114316fab
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 333 BLAKE2B 412b162dee455b8d0fda7560512e1d14683cecf956778efda4926236a9bc55cea17c150167367abd99e75417ed1338f8fbfae380a5c013647123ec3882c1e5f2 SHA512 0c0b1be5d7f708041164d92934c5badbf58dddd445cf47958b1e28cf494bb72a686096374049d3187daa8cc07867ecae97b3d6ebfb6b38d245151d220c30c530
diff --git a/dev-haskell/logging-facade/metadata.xml b/dev-haskell/logging-facade/metadata.xml
index 937381521944..b65d66b23236 100644
--- a/dev-haskell/logging-facade/metadata.xml
+++ b/dev-haskell/logging-facade/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">sol/logging-facade</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/microlens-aeson/Manifest b/dev-haskell/microlens-aeson/Manifest
index cf25853ebeb5..6d2511a6f9aa 100644
--- a/dev-haskell/microlens-aeson/Manifest
+++ b/dev-haskell/microlens-aeson/Manifest
@@ -1,3 +1,3 @@
 DIST microlens-aeson-2.5.0.tar.gz 439908 BLAKE2B 70f9ca0e7d06988cbe8ef63a26333430a00917a36f3df7deabb5a5913a2a728ae82327fd5023d98b4582f57a8e40c1dc0b689012ce12b7d71f605f6b392c05df SHA512 b8f99796045bc5f014b1535380c680a43b2e5dd4e5543cf3b4a9683c40780a54bf4b7904a4f9cc8a6ef2c5b4caa8f74b7d116ef06011201c28b63ceac22790e4
 EBUILD microlens-aeson-2.5.0.ebuild 830 BLAKE2B 77da76e78c6936a661031572511e52a48e70a9e73dfb715ee2eeadeebaf77a99ca73478eb16aad7b64c755df6e55aa037127ad65e51e3c149939148bd3fed84d SHA512 fd7c7b1d376fe25b90ed73c37d1a4ba95cf4fb315ac702e726b6932f873999834e847c49b39088f523ab28a0624514d234d81e86d41b4c2d5583e1645f657b39
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 339 BLAKE2B bd18941a8b0b2ca41270d464e6bc55e97bb248dde8eeee69011a2eff1a57750c3104a52d557ef3f60a912d8360c62d399a35a598a25ee6ed017f2b674a43d929 SHA512 8485dd31537e151f143457e4e5ccac36723f821fc59495c8186ed232df2ed684d5209a615d01d1c4e618df396828e0458fdf16a6a735afb2e854ffabfc528a83
diff --git a/dev-haskell/microlens-aeson/metadata.xml b/dev-haskell/microlens-aeson/metadata.xml
index 937381521944..68f03216cbf2 100644
--- a/dev-haskell/microlens-aeson/metadata.xml
+++ b/dev-haskell/microlens-aeson/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">fosskers/microlens-aeson</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/monad-control/Manifest b/dev-haskell/monad-control/Manifest
index 37887dfa9ff9..92240a9c778a 100644
--- a/dev-haskell/monad-control/Manifest
+++ b/dev-haskell/monad-control/Manifest
@@ -2,4 +2,4 @@ DIST monad-control-1.0.2.3.tar.gz 13864 BLAKE2B c150338e8a585dc045fd23404719fe61
 DIST monad-control-1.0.3.1.tar.gz 13985 BLAKE2B b7dbf0b579ca114190cfe6a5400950d20825f7455a4924154e8416dd475eafa81310c397f3283e5d77ac70e158caf46f34fe5214b989ae2bd051de1968cde704 SHA512 b82ac2d3b2ab1892f79bab1341c9ff17ea89b988438cfd40c246f5ffe4560cb2b77e4a1ed1aa9dc2bb64644b9d6da76eda7b40acf8cc34bb03e77b18127e93a1
 EBUILD monad-control-1.0.2.3.ebuild 885 BLAKE2B 693a08387ad6918a2591890e535981dd4982c5ee4563ce1fb90904bd37e387d88bf934b9d9bc313f49dd12273d56a50e3c1df43ea166a1b0e6a9ee28edb94066 SHA512 2f0364d8c9cc4a1f09e105895915d495f075b1eb8996674e2c3c5bfafbae9c4fb267c05f9212cd4df27df790238137d8f99c3388520ac74118cc9906903f64b8
 EBUILD monad-control-1.0.3.1.ebuild 875 BLAKE2B 532f19653786395ba80417755ef10a75203c6d966bc5600c6c7f056b57e6eb704aa27328ca2ee4d9d446183eb87e73df190f3660340b8d5b7d74c11ff7372ddf SHA512 3f8df577e71339b90b39727fc54b8e0f2310814777b75f89eab22b183fab3a4f92fcb77fc69fe036b7cb4bd6cfce8f0da658e961ea67fe16bae233ba2c1224d3
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 339 BLAKE2B ff53fe88aa25f2884041471b2d9bcc95ab3349de9c34adfe0d923388a3f03fc9f54b0a8ebb5bb0b0242047c18470d6b77daabdf0953458855fbbefa6cda78abb SHA512 1140b8e6f2d7453a07acc210d1c08e7a33dc34cf61ec5f75ec38e04029b65cae2fe7d695e55af13f741022d5c25d96740b4fda1ff8e19cf002ec06d6e8c75975
diff --git a/dev-haskell/monad-control/metadata.xml b/dev-haskell/monad-control/metadata.xml
index 937381521944..e1666433271d 100644
--- a/dev-haskell/monad-control/metadata.xml
+++ b/dev-haskell/monad-control/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">basvandijk/monad-control</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/monad-loops/Manifest b/dev-haskell/monad-loops/Manifest
index d77f89a9e0a4..9a13ac6d7fef 100644
--- a/dev-haskell/monad-loops/Manifest
+++ b/dev-haskell/monad-loops/Manifest
@@ -1,3 +1,3 @@
 DIST monad-loops-0.4.3.tar.gz 4996 BLAKE2B cbe025073cdf7ce193854de927ff34981709a206ee1061cd0dbf26b09a533fe5c3da961e9c5c77ec63bca9963eb4104399eb5d38eaef416df13138a4372dc562 SHA512 41a1314777661a411acf62dfa25cbb1a59fedd5d60d1a2b8566a3dd64dec361ab1fe35827320529a723a612e0443571ce38b17fa900eb8d5289bc52f653d47a5
 EBUILD monad-loops-0.4.3.ebuild 610 BLAKE2B 22d03a93462389b188df0b5a2b6934894ed621822dde903f5965d86bf49b15e1cd84145a874e7c2feec3ceb55fa17cccf808435003ecce14dc57c107ad54ef0c SHA512 208aaa2e88726f83f3ee3a0dd9785ae121fef74806ba3937d8eb6d963a8cb1822dec135b783f958f829e277b67c16553507e1d5464b95d61656eb4dde9aca63d
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 333 BLAKE2B dc0140475994d1437f805629fb17961cb644acbafe908c73122751612128d76b80b96d3686f6e983917ae53500cc809b59a49b4891a1526d3102a634939261a8 SHA512 1045ec08abf4f7ebd96a449f63d292983eb40611f70a3b5dc6525ea95b03be40fe57d61cbce26108bec7126c37f0e825fa969c81363d440e13327f41c536c2e8
diff --git a/dev-haskell/monad-loops/metadata.xml b/dev-haskell/monad-loops/metadata.xml
index 937381521944..554c1d669480 100644
--- a/dev-haskell/monad-loops/metadata.xml
+++ b/dev-haskell/monad-loops/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">mokus0/monad-loops</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/mono-traversable/Manifest b/dev-haskell/mono-traversable/Manifest
index 82241ac73b11..9a6594ad6610 100644
--- a/dev-haskell/mono-traversable/Manifest
+++ b/dev-haskell/mono-traversable/Manifest
@@ -2,4 +2,4 @@ DIST mono-traversable-1.0.15.1.tar.gz 40815 BLAKE2B 432b90de9620b1aadd95e4591f67
 DIST mono-traversable-1.0.15.3.tar.gz 40461 BLAKE2B 07a9ce225bfc60f3cf838f5d683d325844369ec5e5eba791f115ce60f5028a737e203113b20b7ad7686eb1b283d5221443eee0e6ff06ebd0819ea6c550f2465c SHA512 55f469149b84ace246e6c0791de25fcc73317152986e4949c7ae9ae020bd6540586da090d58ba495ef7f251c4a3a02979a796af9fde975a54d3d1541527b7691
 EBUILD mono-traversable-1.0.15.1.ebuild 1007 BLAKE2B c42b547db358cd488fac784d4ca64c6bb066875e35e96a5e9204054a14ff784d22bed4c6cc8eea98f783b65cda186271c489ec2e0657602b01aebebf5447b7cb SHA512 4d92c342daa5654bbf241dbbe73f428f5492a2508b73b6fb8c7273a62a523a5532bf9de6af9dcae991247b9ac43e12e6e879979ae47a3b4149e1a114dcf42ac7
 EBUILD mono-traversable-1.0.15.3.ebuild 959 BLAKE2B 43407f5ce97d815d0ba09af2f59e2432f8412fa56a304728fa5b77d236e866783617b59c6ee1f61dedf4268473a8f5b6c542e9c1961c17a482ab143c6d41aa9d SHA512 b24d723c6b5dc377c49b7ff2c5e531276fa3bec74f0e9fdb3c7f8a923b3580560312fa43d9bf0b495ca45b5b0f50466e46dac1b0e61949e6d325305063bb2c95
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 340 BLAKE2B 0a52e605111203d25442f32c8bb53679a74f4306dfdf34ac9032886ee79c1daff3f59a67a203c79bce686ee2c1f64795478e27ad595f8c130b234a29786ea501 SHA512 abc8ba427b02435934c0f672eff7fb91c4987edc67d56698ad55bad6364fcc74414742eff9324b226cb59822d79c6fee40ae28e1dec363cc9f50ad604fc4a21b
diff --git a/dev-haskell/mono-traversable/metadata.xml b/dev-haskell/mono-traversable/metadata.xml
index 937381521944..a1de5e8eb364 100644
--- a/dev-haskell/mono-traversable/metadata.xml
+++ b/dev-haskell/mono-traversable/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">snoyberg/mono-traversable</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/nats/Manifest b/dev-haskell/nats/Manifest
index 195349a7e58d..1793081816f6 100644
--- a/dev-haskell/nats/Manifest
+++ b/dev-haskell/nats/Manifest
@@ -1,4 +1,4 @@
 DIST nats-1.1.2-r1.cabal 2749 BLAKE2B b0b7406ce0362cfea14dd8cc492b9d0a5a1e34ae4cf5c4aba78d3cd7052a24a3be1c742287d85e6f9699fecbeee491a0eadcdf1994e92ce86e559c6965774cc2 SHA512 0702e4a69cbc368de33993ab49ab5aa458202df538606b73dd9291a6cf61f82ab44e4b12e3e82d2690ba151fe8b1c65e8791ac0f45a24a7f2534abdebd2e87cb
 DIST nats-1.1.2.tar.gz 7776 BLAKE2B ae2012e1e8a433c3802b7470f95a7e4b391f9c7ee50f41b94d2ee9d20b630820e550efa76fb5d64926942e87e761db0702ae4310573d0bca38f52fa419a93390 SHA512 596f11e98fe57893279ddd1f5af11a12e747e0d5e87000c7e20d0f5c2da0f0be9a6b8d19c8d5759716a7fb9a3e77d0e999380af3d5a350fe32a5492dc6077450
 EBUILD nats-1.1.2-r1.ebuild 1026 BLAKE2B 44d9a997cb5cb4cde86b414b797ece2fef7ef19e71e88970491ee5ba6b83bd7400b336d791b9266ed4de3a9239380520ed05c13c2a848210f3d227645abad0ff SHA512 1050dc7427eecc375fcf1ebea9d248f0e0168883be8e65dcdb7c030c112821346ad6f5db4c18a67bbaa2e4164f30bfa61b031c8211ee9040a97cdb6d0f835ae1
-MISC metadata.xml 438 BLAKE2B b1959dea4d16b4876e64792dd32aa257b12339979db4cdffc47280d87b91b64ddd28f3f937877d36356b0063a89e034a2cd221892e13d9c66358d0f0b45e3201 SHA512 b84958bacb4e1709f3c90de7e8c307ec09062ddb11864f0c72e78d248d3f29fdd8ac597406f6e1c49f62dd2d738ce6622d9a197480ae10600ea2a0b9e4626fb5
+MISC metadata.xml 514 BLAKE2B 3b921dbfdad60df7c575fbdbfcbce7a0f004ad7bd6bec081bc7edff760b2251f755a432c5ca2258fee9d06f5a9b709a9de80eff9b5cccb8644350e21d39af4e2 SHA512 7e4c9dc50ae40474f62a8a355ff1d81f434620f593ba0d2214bcd30767c089d51a0e77af75ecfc4b439c38764f2980d18a194ee116410294dd938a35c1f3a1c7
diff --git a/dev-haskell/nats/metadata.xml b/dev-haskell/nats/metadata.xml
index 71c786410ce6..268af54dfd5c 100644
--- a/dev-haskell/nats/metadata.xml
+++ b/dev-haskell/nats/metadata.xml
@@ -10,4 +10,7 @@
 		<flag name="hashable">enable hashable instances</flag>
 		<flag name="template-haskell">enable template_haskell</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">ekmett/nats</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/netlink/Manifest b/dev-haskell/netlink/Manifest
index 2e9cd769c5cb..bc9ace20ad49 100644
--- a/dev-haskell/netlink/Manifest
+++ b/dev-haskell/netlink/Manifest
@@ -1,4 +1,4 @@
 DIST netlink-1.1.1.0.tar.gz 49444 BLAKE2B 620cf5a4b52f86d9410534d5ed0f4ede40961e976e811c0e2f07c46c95b1ceb1452b9b19cdf4f9da9dfd60166fc7899550b060569dea956feadd6c1293c20f6e SHA512 2bb3d3c1a86e2de61e18a50366d9ecfa863df4959533db5ab3b127b4e02853cf4295ce7519a8ba7bbee9af0534c510aae99c567a5b23e8587e8e56113f530da3
 EBUILD netlink-1.1.1.0-r1.ebuild 760 BLAKE2B 4762de99bd4688cb639bb292119d7014773f147e978358c94d5605c728ecf848234bf1aa03c4ef706ea5de78cf261072e25c270050357dd2a9656cac4fbdb8e2 SHA512 659beac17d997e5b2b4fdf01d0bd96110bcfa7b05e266c497014d4c591029da0862402b2200cf6e3cad166ad3ace2ab498200fa5d1203284eb74ca1355a81096
 EBUILD netlink-1.1.1.0.ebuild 761 BLAKE2B f32fe48899d2df5faa633da5b2eabb72c6311c3da45d245afa3a5966f01d2555b3cdd6d0b88e08cd0309f4e72021fe0a555e3c2f91a6cf4ea9931fd2e181890e SHA512 341e55fe658f891889e5bc664adc70ec834b41841781d4b7f3fc207c95ceabd7420ada8ef675761c4de87df0cf9c7e47d8e3dc8f5041866040bc2039657b16ca
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 330 BLAKE2B ebe2c5c5c2a278cc451d24035dad6a89e0fb599fd8d8a32a7eeafa33b00ed10e25f0e4728325e1051afaa3bc15e7c3805b9624642c110d57f1c46d3c23898b7f SHA512 e11b351f857a9c890dc252209c9ddbd570ffb405b230e900aa767c0ea67d687b4f8c8f248acfa101c0f0a64e369cc330324144fbd6c9fcf1fe02bb7555ce7e67
diff --git a/dev-haskell/netlink/metadata.xml b/dev-haskell/netlink/metadata.xml
index 937381521944..11ba1c5afa1d 100644
--- a/dev-haskell/netlink/metadata.xml
+++ b/dev-haskell/netlink/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">Ongy/netlink-hs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/network-bsd/Manifest b/dev-haskell/network-bsd/Manifest
index 914b31bebc60..4239e7228bca 100644
--- a/dev-haskell/network-bsd/Manifest
+++ b/dev-haskell/network-bsd/Manifest
@@ -1,3 +1,3 @@
 DIST network-bsd-2.8.1.0.tar.gz 8584 BLAKE2B 9864cdcab82d77592574983c70ddf262a4e836807d9141cacaa638d109f423e8332d9cb0b7d07661121970d9bd0b0ef9dd292d7e57010dff106a62003592d738 SHA512 b2f66c6705c490e1cbaab6ca88444294bc90b3711da4039046a9279060ed41228ab855b40039f56bd02eabcc0351200de3e043a108a0cdc98192d563702de7f3
 EBUILD network-bsd-2.8.1.0-r1.ebuild 685 BLAKE2B 3d574f9c5451036606b8c963d6bb0416e1afab163d78d8d982fc8827be9fac0dbb96eac2394f63b2c7005a3967a832ec2aabb48f48fafaa73713aa872c946af1 SHA512 6fe5e561e3bbd8bc070e146123b9195d503b912275641b0ce05a8531493c6f52168820741847b952db5c47e321034faf93a94a449b06afd1f29e9a1c45786225
-MISC metadata.xml 556 BLAKE2B 509cd839da9f38223c79b71bffabc2012ab3edc5b794c7705dd1deca6303218695e7af8a7ec8f24385af4e2021cd2aaf4bffd3e2b55713f93dc012d9c92b4716 SHA512 4616cf5781b042e43497e382e43591a4d4982c9ab2b8a21a25860e28dfacfa62e2df524fc07d29df06d4ac24ee937e021883e9a7b9cc88618a49d29d165aad2c
+MISC metadata.xml 640 BLAKE2B df5d570c0c61239f6a1fb3816a10fb6b3b5f04293318765ef794bdd39fd603026515169835b7a2984f00a12e7813bf2f43855e0b717558a6e67a98179311f299 SHA512 7b2fe249f22b2f9cf5c8eb56e9066a25709e1a45cd8053ce1ec4ce4c00c56d342f4ac82ab0cea1aa736b2b0894af5afdaa715c58af0aa8dc84615a3235ba5eb9
diff --git a/dev-haskell/network-bsd/metadata.xml b/dev-haskell/network-bsd/metadata.xml
index f57c90ca3f8d..9dfa95250f48 100644
--- a/dev-haskell/network-bsd/metadata.xml
+++ b/dev-haskell/network-bsd/metadata.xml
@@ -10,4 +10,7 @@
 		
 		See newer versions of &lt;https://hackage.haskell.org/package/network-bsd network-bsd&gt; for more information.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">haskell/network-bsd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/pgp-wordlist/Manifest b/dev-haskell/pgp-wordlist/Manifest
index b7794b676303..12ecb4662679 100644
--- a/dev-haskell/pgp-wordlist/Manifest
+++ b/dev-haskell/pgp-wordlist/Manifest
@@ -1,3 +1,3 @@
 DIST pgp-wordlist-0.1.0.3.tar.gz 10143 BLAKE2B f6523be71399c90e6248b583f5e68a2ad51069d3ecf62609aac09e289a799c15e4f30241cc558f070fae7d68990e1dd4ddd2fd7a30e046902405c7e19189eeea SHA512 b7c6db47c1f9a0b10c5c94ea46b8eee282988e5990ef3dafa2d07a5bfc0718572b04494d23ddab063811ef2452546d6b17010c6490a89031f4b071f1a43d989b
 EBUILD pgp-wordlist-0.1.0.3.ebuild 884 BLAKE2B a12c1102624d1407b3c1aee56917a81635aa432e51782f9a57b773c069bbae641ccc234cf3109575c0934859cae2adb8e08b4472ba183e97c8323d6ce42803f0 SHA512 adc0fb32119a100c06019c65b435b2f95486731f4882388ee13407b07aa7e3119627ff0f4c6e549d750e4cb4305410b77c050048ec00de59dfc1d9cd935c0b4e
-MISC metadata.xml 784 BLAKE2B 62d603ba28bae9d1d78cfe14c2359794004dc824374064f9fe0eb84bc105d0f1d09390f0d366e3c53e3d8af37e87be06f1e7499e322fc5d953ee5a53d2b9361c SHA512 067088f55fd8cc963885d25fcedd40f5d30ac89da81077569ad4509846a72b7bc209daa4d50f123148e69d6ecf3d96abf96cd7c9698c09510df370e920f709aa
+MISC metadata.xml 868 BLAKE2B 991ae6e89e251dfb425fd7c95137ad84ae15c43e54e6fb9db689aaaf89aaed5635eb2af1e9841d464b8c0f986f64ce9342b26dd19f6d1cb2cd883ec01117679a SHA512 f4f11b4cf9a9c9afdb5d334579a1222b556c04504a7f10bbd321bfe66eaa9b05bfe58471114c4fa3a059c015a9ed085b2d796457696644c1d9450ffe49b09d67
diff --git a/dev-haskell/pgp-wordlist/metadata.xml b/dev-haskell/pgp-wordlist/metadata.xml
index 102c2b65a363..9fe7cea78594 100644
--- a/dev-haskell/pgp-wordlist/metadata.xml
+++ b/dev-haskell/pgp-wordlist/metadata.xml
@@ -20,4 +20,7 @@
 		For further information, see
 		&lt;http://en.wikipedia.org/wiki/PGP_word_list Wikipedia&gt;.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">quchen/pgp-wordlist</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/primitive-addr/Manifest b/dev-haskell/primitive-addr/Manifest
index 5d1872e17ac9..6d0a58440815 100644
--- a/dev-haskell/primitive-addr/Manifest
+++ b/dev-haskell/primitive-addr/Manifest
@@ -1,3 +1,3 @@
 DIST primitive-addr-0.1.0.2.tar.gz 2983 BLAKE2B c272cbbdc874f8a297170b363e2b3ea0ab374b6ecc02fddfa1e82eed5a9b75c52e53aa3ca782027cf1d14d91ad826818c71752a778dcd9080994970284ac2c28 SHA512 e025238791271793e91faecba337d04e0cfc1e6b4dd130bd590247e961ef541ac81beca511ef117130eaf5665abb06b73e1985b1ed87705fa4c2704641d60ae4
 EBUILD primitive-addr-0.1.0.2.ebuild 634 BLAKE2B c9d4511219dd3ff5152cb46dbf02b17d133d803ca78ea16b5f7f5cbbfbe46c637f97a584a9490ed41e6c2aedcff367687ecbf6c9dc78dbe934dd9d05288a0cce SHA512 856813ff9f94d62cb994fe79330d870246aeb5d3b657df787284609719c24d457c4ec617a81f0cc2ad1714d808a17b1be6c2acb0cd1206485e58a231b548dc41
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 339 BLAKE2B fc5ea9a564ff2f17c1177b473b61e31357ba457d88189992328f4457e8aa42de9e07a4bfb647eda97ae001f26e6d14b83bbac62d6701ae4d3360419526ac16ee SHA512 b615021e1ab4460bda60c394729171ba7ed462f61c54c06ee9f8e878668c333e53b943ebfa5d2775717124a4a31a39f145ac6e5209dc6c17ad20c0758a09609f
diff --git a/dev-haskell/primitive-addr/metadata.xml b/dev-haskell/primitive-addr/metadata.xml
index 937381521944..e937f72e52d3 100644
--- a/dev-haskell/primitive-addr/metadata.xml
+++ b/dev-haskell/primitive-addr/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">byteverse/primitive-addr</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/quickcheck-classes-base/Manifest b/dev-haskell/quickcheck-classes-base/Manifest
index 8e6d095e7597..cc70f81e1c56 100644
--- a/dev-haskell/quickcheck-classes-base/Manifest
+++ b/dev-haskell/quickcheck-classes-base/Manifest
@@ -1,4 +1,4 @@
 AUX quickcheck-classes-base-0.6.2.0-laws.patch 1639 BLAKE2B d07511518debc5aa09d712c460fd3414665ad0203fff44f42ea49b17db83c44b0095ac17716df76235d01744d75d65a7255ab33a4e3c98dc0444adc90c6f0a94 SHA512 03b78a341a3d81d096e65d8b038edf6e41b5525b8d6c1c2e44647a73c8980cdd199256ab3a717bf5dde43fe575da4211dff76853fd5cd4b353401ba6bdda1cd1
 DIST quickcheck-classes-base-0.6.2.0.tar.gz 26732 BLAKE2B aa3b7be411c66b72eb07c81e9fe2c1accdde254ae8e510080d7b0ea93df0148317a61633f96fe459ab329af112eee3d8243fb728f5416d95d258b90a40d1d9cf SHA512 730255f74582081e65fa8c6b36ab8a2c26991a8e7d8140361151614e7a9619f178e50820cdfc3bf5771f1688dce369f9d71de683bc89481a20f8d2382ae4b58d
 EBUILD quickcheck-classes-base-0.6.2.0.ebuild 1016 BLAKE2B 3767ab0488ef34effdc862be079505fc5388e1bde2e616e373996c324a922ca9503eaeb932089aa756c25e2bf25e67a42db561d0acf474cb5abc60f81350171e SHA512 2159c06656dd3e3a4d1136ae0e6d0591183a6f894ac0522a6afa07889f25e9f15d2766c183c96cb3731c8c5cebbd27666c1793c127f227da9c82c0622b6554b0
-MISC metadata.xml 573 BLAKE2B 3e353c8766ddbd8950aaf92b7368371a918f020d9391dedce627814315c2fb7b8f994a0f4401f8eb58ca6a908f67c98c78d83a42a306d15cfc42fa9e7be9de7f SHA512 ce91640de7d3e0f510964db742b9b8a61bbb4b17d78dcee505bab6a4c1041690dc8da0eed1a580b37c57594416b962ab90056078fbd359aa37b9296eb21e5ed9
+MISC metadata.xml 667 BLAKE2B 5f31781fa79d01175d3cee4a545f816db15f059afe681983f809f7bc4502ace6aa4f2241faa2ea1e7cef0a0b7919ed4a16c350959d29e65b025cc3a88bd6f77a SHA512 33903a546a1742a8f576923733d7f8b71db5664bc4bd1af9b3be79f67a05213965e8d977e77ac7bbcb2b0fc882a190fba123d4316603eb008a8d9a93d1082224
diff --git a/dev-haskell/quickcheck-classes-base/metadata.xml b/dev-haskell/quickcheck-classes-base/metadata.xml
index daab939f5ac3..f4b1db0172f8 100644
--- a/dev-haskell/quickcheck-classes-base/metadata.xml
+++ b/dev-haskell/quickcheck-classes-base/metadata.xml
@@ -9,4 +9,7 @@
 		<flag name="binary-laws">Include infrastructure for testing class laws of binary type constructors. Disabling `unary-laws` while keeping `binary-laws` enabled is an unsupported configuration.</flag>
 		<flag name="unary-laws">Include infrastructure for testing class laws of unary type constructors.</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">andrewthad/quickcheck-classes</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/quickcheck-classes/Manifest b/dev-haskell/quickcheck-classes/Manifest
index ac57970326db..2b0bd7789a2f 100644
--- a/dev-haskell/quickcheck-classes/Manifest
+++ b/dev-haskell/quickcheck-classes/Manifest
@@ -2,4 +2,4 @@ DIST quickcheck-classes-0.6.4.0.tar.gz 19976 BLAKE2B 614ebc6e1be382a942a55a03992
 DIST quickcheck-classes-0.6.5.0.tar.gz 20242 BLAKE2B 6b058b9991ad60bc7f9409d9b85d6f02236174eb39765cad3ced0b633ba1877a2866cccd36968e6902e8bae2b2382c319075ce71922afbc1a9e01a6563378b28 SHA512 d0f894d0357522f59440bd795746b3c17802332e3833982cf1d2d20c2a5dc3e4ac1e54f6b3aeac93c0a1beed9f0f4838e20d8798d99bf161b49fc50bdf1f0670
 EBUILD quickcheck-classes-0.6.4.0.ebuild 1972 BLAKE2B 91808236d2c6e40654efbdba04078e1648a09da71a7cdc1fa098b25462afdfef169e248c95a092edcbd2831c9a08537c558c7ac34d90c68dec2bfea73a557eec SHA512 78480306328a46da5e30b652f5d454df92ee1e517fa0968f5db5d26c4d910b2116d8936d2dccd283e61cd1f27d652bd2bcff2c9a17d05e06d9577cbb9f7ebfd2
 EBUILD quickcheck-classes-0.6.5.0.ebuild 1721 BLAKE2B 3893c2c7262fbac0604114516204c1bf7b934dc8aa11272911c10fd8e0ed480f2a0cd45ee382791e72c651c8fabede071cbeb33314e9c2297a8f17f3558b7aa0 SHA512 1f7937866145a407ff9a2c9b4a5a32cae60b1823260a61d5f5c8ade1816e6260dded2bf95f7d8eb02613b24900b8b68bd6c72c6ce93295314aba0285bc0a8c44
-MISC metadata.xml 1532 BLAKE2B fc8c855d818d2365d1c93334755e36da6b6f3c40f01e86842f6d365da25acba08437a1428bd8506e4adc327dfc65d10dc6163bab6f3d63f28babb1a4f7777ae7 SHA512 3c801ff4cd520618bb3f8c96ac6a73bad8ff148acc9075c7a635ce34d00b35f0b22c1e2588da1014e2d4a5fa5a100037fda3de708b6b0c6faf8d08cc42629f1b
+MISC metadata.xml 1626 BLAKE2B c29f4365efc217e1c89d7ecb5bf39703439b55df22900df436ee89972e40c0d00d9a0849e11fe93b062bdfc30393ced1cfd4944fe29959ab309e103a79d4d790 SHA512 86a73b943e62c3f101ea7bdd48e01ad058e589068b1c8f811879897625d31c9793343ddcfa93cbac5607e134dbf5cc667ff82748ccad556f0f0b590f8650fe20
diff --git a/dev-haskell/quickcheck-classes/metadata.xml b/dev-haskell/quickcheck-classes/metadata.xml
index 1e70ae5d8016..b5d22a614586 100644
--- a/dev-haskell/quickcheck-classes/metadata.xml
+++ b/dev-haskell/quickcheck-classes/metadata.xml
@@ -13,4 +13,7 @@
 		<flag name="unary-laws">Include infrastructure for testing class laws of unary type constructors. It is required that this flag match the value that the `unary-laws` flag was given when building `quickcheck-classes-base`.</flag>
 		<flag name="vector">You can disable the use of the `vector` package using `-f-vector`.  This may be useful for accelerating builds in sandboxes for expert users.</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">andrewthad/quickcheck-classes</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/random-bytestring/Manifest b/dev-haskell/random-bytestring/Manifest
index 6130207206be..c434271e9144 100644
--- a/dev-haskell/random-bytestring/Manifest
+++ b/dev-haskell/random-bytestring/Manifest
@@ -1,3 +1,3 @@
 DIST random-bytestring-0.1.4.tar.gz 79911 BLAKE2B 2d4eb685a231a891a04050a6c2c71c6088b77220872b1aebc02e8db77fd12ab01aeed30f724207f1a544206eb79fab3499222d9997e4ea7ed967a4ea34922492 SHA512 17d7a2a758fbfc88ef1bcf6231f28276ecc5e363521b5fab38b539cf191c80c2dedeefe6d59346b7dff2def87b1e18657f13db8f43cf3c447142909fb3012ed5
 EBUILD random-bytestring-0.1.4.ebuild 758 BLAKE2B ff251c44dd49272213d918fbea41507b6ac07013e2de538bcaacb234b552ea25cff0ba918e592ae5555b664128d1c76afb2cd8c7b05464e16fc19669db82f298 SHA512 e2c4f79501c3a76eb45dabf88860195777b98275204f2ef1dad4618a5eaa7a0a9e663c1e98386fd440c1b19a6b14fe2b8342c60e668fb13262d135c4a18beb0f
-MISC metadata.xml 336 BLAKE2B 1ed66c2fac2c6ff19466606d138cdab05bc4f0c5bb81695aa3905ee69806dca2a729329af60d34d300af134f814d2c0fd04bf09eddc5205c035fbc6525147a04 SHA512 876ca7af6c646495f7d9957b92bbd6c661f2073a3a5934009c16321008c3ba4d78aeceda161d0cc8dc77ae4e37524dd33e61a3680fa1e5d8e50bd3261578f5ee
+MISC metadata.xml 428 BLAKE2B c23c617b60f182ea677c22a62b2c148eb7b70b8939d33d79274d94c6c65c5ddb8e57a3b848ecf5384e10e95abb52672add332cb17441df4f884e3e20abc96d98 SHA512 792130804b38734ba149b592bee13f7f9c353f0e0e7b576412293d11598fdf0f5a51250db3e62d1d5710b1e0fd04fc580d1c89b39b1efbae0c7f06236b2ce58b
diff --git a/dev-haskell/random-bytestring/metadata.xml b/dev-haskell/random-bytestring/metadata.xml
index c78fd78a2d28..20123659e2c8 100644
--- a/dev-haskell/random-bytestring/metadata.xml
+++ b/dev-haskell/random-bytestring/metadata.xml
@@ -8,4 +8,7 @@
 	<use>
 		<flag name="pcg">compile with support for PCG from pcg-random</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">larskuhtz/random-bytestring</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/raw-strings-qq/Manifest b/dev-haskell/raw-strings-qq/Manifest
index b268b9a6d1df..3e35ec8c8b2d 100644
--- a/dev-haskell/raw-strings-qq/Manifest
+++ b/dev-haskell/raw-strings-qq/Manifest
@@ -1,3 +1,3 @@
 DIST raw-strings-qq-1.1.tar.gz 3505 BLAKE2B faa8ec645a0515b35766677050ae236a702783b39de93a178f2d445dad1fe24a7222ee3c70aa675bb45d21e560e161db8d6101760c163e1dc39ba9e9c780e616 SHA512 9daf7acad6619c9d077b49591003f2c42baca060b20202f597c7468da765a59add2b78b90d634bbf785e299fb85d39dba242d070e15ec208391059e64850acbc
 EBUILD raw-strings-qq-1.1.ebuild 597 BLAKE2B cb6c5effbffcded42aabeae092d4c4beea6c83b318285403ae1e36dd273ce4111811e9bcff9c265ec81093e05c3972bc713cc245303e11961955447149c0f82f SHA512 b9db6a89511034d696949e7a0ef0a4bc6d0dcdfe500adf25aef9ad5e2ade20a23d72f8138cf545245d3fdfe6e0533f8ca449ef0350c7ebedc4750e8df53649c5
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 338 BLAKE2B a7f3cb7d63c216991f0691a1c689157f7648c96e5667bd74f57c87c5a8c07f9bd355095230e2815f0971c456dcebb5157ed71fe330f248b8c0e0fe4e0ff88c84 SHA512 e87e765717b35c1c3c440741b2005489cf3ea9cc9cf96b4aa2b1372c7a6eba3630430b5d150bb2ac4f4284c45b40385d775099bb25a43f5a0b522cea29ea3ad6
diff --git a/dev-haskell/raw-strings-qq/metadata.xml b/dev-haskell/raw-strings-qq/metadata.xml
index 937381521944..222aa0dca204 100644
--- a/dev-haskell/raw-strings-qq/metadata.xml
+++ b/dev-haskell/raw-strings-qq/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">23Skidoo/raw-strings-qq</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/regex-applicative/Manifest b/dev-haskell/regex-applicative/Manifest
index e81fd7b793e6..3d1428679666 100644
--- a/dev-haskell/regex-applicative/Manifest
+++ b/dev-haskell/regex-applicative/Manifest
@@ -1,3 +1,3 @@
 DIST regex-applicative-0.3.3.1.tar.gz 14128 BLAKE2B 80488c86dc88b9299384ee6101693567185e4a97defd73398ca1316c813067bf40c4df366b6347628a2f2f40aa42ca6765aed1102a47ef083fd5c193ab78c1bf SHA512 6cef57ef228983b3662616221c6275ffa024bebee4dddf21041e9a8a4efc8b5e905bacdf31534078f9a34b3915a630e823bf0a910c27b11f8a961ee8f87cd9d3
 EBUILD regex-applicative-0.3.3.1.ebuild 707 BLAKE2B a17682ea7577f830ed115a142ccbe46a51cb8930d232a2495660bb59b0e11f057f65d817e50fc0ae758b0c79dc37603f1ce5c4fc2c57fcabe517af413be9b7d2 SHA512 94b2f62ee91f14380ed30719950a2b8df2a63e39fd983a08a2c9fbb7c5d4df9d6e85f4c549835500bdc545f8ce109e27473ff1043d9a5a53b555930218757d45
-MISC metadata.xml 421 BLAKE2B 9b772d16f65bf23da5e0b530e01f27c99149e5b17dc370550f39d0e15c39a0c82a0b7b861860bbe944866fcff6c7c30fa73f854b61d7b480aee80c8aeeafff88 SHA512 f0bb20d35452e53db11a22007e6c36ebe970aba7c715545c17482761d768ead61c5557609996e5c9ec49fb70e0929bb2fe8a3c729aaa2a36174431663cc266af
+MISC metadata.xml 519 BLAKE2B ec05832a7f1acf7534a3ffd3c8cecb1488706e89d0f2a5df1af4eae7ae8d315a04b6f6db1b71a0aa1dc3be0c037ab9f60ab253fda9d1527f2ba3cee8a87c92b1 SHA512 6363b326f41aa61071227f8f60304ae0103297ec2b7440a343d2bdd459c773217313ca38410ed841d863b34df64ca506e5439ea14f71d8631b4afba0b48c36e9
diff --git a/dev-haskell/regex-applicative/metadata.xml b/dev-haskell/regex-applicative/metadata.xml
index 2bf8f53ff20d..8547830270cc 100644
--- a/dev-haskell/regex-applicative/metadata.xml
+++ b/dev-haskell/regex-applicative/metadata.xml
@@ -9,4 +9,7 @@
 		regex-applicative is a Haskell library for parsing using regular expressions.
 		Parsers can be built using Applicative interface.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">UnkindPartition/regex-applicative</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/resourcet/Manifest b/dev-haskell/resourcet/Manifest
index 4d0bfa8788b2..17070535483d 100644
--- a/dev-haskell/resourcet/Manifest
+++ b/dev-haskell/resourcet/Manifest
@@ -2,4 +2,4 @@ DIST resourcet-1.2.4.2.tar.gz 16862 BLAKE2B 041997adc9db44e4e99d878f001191eff853
 DIST resourcet-1.2.6.tar.gz 17196 BLAKE2B e82da2b2cf2329182d46a331b1bbcd8437268a90501c38acc299b80377ccb3a7d53e9c97d07565830c9f993b8cf6e9189e930622d7ede7510e35350b07aa7883 SHA512 2b08c99ad102fd3bef1e1e9363c000f48f03d1ac3e5122c8c764c71f90905697a818a70391f0f67e5074b4cc0b030bd5cfecd3477930e3e4ec64049e10d8fa3a
 EBUILD resourcet-1.2.4.2.ebuild 876 BLAKE2B 5ace74eaed08e1e4d3c1994d98287670e8b018803d18e4d59c8a3b0e28d0c3f4c867cea9cd1b3f808d73f3fffaec76b977031757862d81459f0b0832b1c5c4f6 SHA512 2af562c6da3e972784b872501bc86cdae4d7d874cf16327db3aae9ca863e569076f09f71abb7db28866506bc0036de12e36fe380996c2c8125d75c2f055aa718
 EBUILD resourcet-1.2.6.ebuild 705 BLAKE2B 1817f2fe6c18752aa43217700970968caa2ddd0cd6e2dd888b1d87825ccf5b35b8dae6eac97dd58a5264a1f3a29ab07c3a6757ff8b0f1edf20171fd76fe30507 SHA512 7209e0781423b8e0eeab47207a3183db7e6032d93fe9cd0c7a02469bfbd99a7f87b64303e3cec04a3b3af18243200db8f4309b1450020deb7b8166cade421a17
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 331 BLAKE2B 2f0d614675ec1cb899fb54336e92cab19040fe07a5c74885918dc2374ec1aec20bccd144c62c07674dd7380e7f6e4dca766a515d3f74fbf40485a553f4e2aeff SHA512 8be6ef47e4673b2ffa96e6f58ff358592f9af550d30078c7bf7a35a1aa91390949633afefb75e43155a477801d3af5aa386ada2563d22ac6b06bc6858c0b78a7
diff --git a/dev-haskell/resourcet/metadata.xml b/dev-haskell/resourcet/metadata.xml
index 937381521944..ed3c0820e087 100644
--- a/dev-haskell/resourcet/metadata.xml
+++ b/dev-haskell/resourcet/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">snoyberg/conduit</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/safesemaphore/Manifest b/dev-haskell/safesemaphore/Manifest
index 86438721cd81..e463cb9685dc 100644
--- a/dev-haskell/safesemaphore/Manifest
+++ b/dev-haskell/safesemaphore/Manifest
@@ -1,3 +1,3 @@
 DIST SafeSemaphore-0.10.1.tar.gz 24007 BLAKE2B c11997a1aba15f8357c1518135c7d78bdb27a6def14ef0da2f94b8530e8ba62a4f4031fca3df040be21474edf8b33e7ccc675d08a5fd855b876fc26f56530ff2 SHA512 877731622e1942f45fcc43e2ed8ba7ddfa2c1f4a7ea4f36cdf425a98acc9c2f54c742d98a7d1bb457ff122f20a5af399ac776bff7403b892353f812e42007250
 EBUILD safesemaphore-0.10.1.ebuild 741 BLAKE2B 2a4d8f7a5b2b2197b67d5b4f750d34a284f358392ac0c8a6a20cf202d6a85a44c228122bf8dfa709f36467d916c2d21fd3b1b9065443e02d972556118cd40d63 SHA512 1a7b2a36b4531aad97d30f6c011e0d18bca6a4f1c6eba1766d1c1df71d47c940c5ee1cc998ce2605ffc96037a25ba1dcfef1d37abba7c044a9bcd5f4d7043f50
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 343 BLAKE2B 0763fc481b1700366b10cad9b0944ab57077c5c8aa196a723fbc57ce48538fe9226d5092d11c3511bc430122abedc3bc0a56bbe916359f2d0fa148976c4f8e10 SHA512 4c71689a25730077b86345d6f641371ac98f733b75369a720c4f60f8853a9e2527f5f67e9cd80674a958b9bfb2130eb40bdb11246c0c6d7cae32334ea40813da
diff --git a/dev-haskell/safesemaphore/metadata.xml b/dev-haskell/safesemaphore/metadata.xml
index 937381521944..8020260c76d9 100644
--- a/dev-haskell/safesemaphore/metadata.xml
+++ b/dev-haskell/safesemaphore/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">ChrisKuklewicz/SafeSemaphore</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/semigroups/Manifest b/dev-haskell/semigroups/Manifest
index 64658b2906d0..1b7594c1d2e4 100644
--- a/dev-haskell/semigroups/Manifest
+++ b/dev-haskell/semigroups/Manifest
@@ -1,3 +1,3 @@
 DIST semigroups-0.20.tar.gz 18788 BLAKE2B 8cd5e82bc1af79a5c688e16c1d1c4aeec12923ed3be2fe9e1aa4f6a431a1e5be56f373ca952536054c2c7530da1adb579fccd8382ddc5031eddcce44815d73b3 SHA512 76e61ffb854276a7760619acd093df0c80c17a58a553ba9f9be3148998c4905784ca5840041a9afb800eab220c62b59567d1be95be478c21b4446021bab7b923
 EBUILD semigroups-0.20.ebuild 1000 BLAKE2B 7d078a538845eb859ed2fe15110174364d8ae260a92ffd6cdb15d972490da44601f71881e4e81fb9686db089c60afc746347b2eaeeac6aa8648fa98d18f4b84a SHA512 41bcb9eebbd247b75e68591f6748d2def46e7e990f3eb3f91b5611d386a57b7235cf76d45cc98cbdcae8d86e2d950e6eea5e3ca5f65aa2d61be38c88f3fea889
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 332 BLAKE2B ac4dcc3b3e00b30e0aea0a25dec70ff545fb3c0b9e7c66ec8cca5ca05ce9030ec55bcfde78b35f73947c6bf68c4aa88c8419af953af5db5b6537c3eb0365ef6f SHA512 00973fd8a3897e3f0200798b11c400507d4a296697a3089b81b98e923de079d8473950e71ec28d4f1096ab485e66db2c98ead480d7bc260a22a4f788ae2f6a5b
diff --git a/dev-haskell/semigroups/metadata.xml b/dev-haskell/semigroups/metadata.xml
index 937381521944..084aeb7925f9 100644
--- a/dev-haskell/semigroups/metadata.xml
+++ b/dev-haskell/semigroups/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">ekmett/semigroups</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/should-not-typecheck/Manifest b/dev-haskell/should-not-typecheck/Manifest
index 473480fec0bd..46f33cd7d2ec 100644
--- a/dev-haskell/should-not-typecheck/Manifest
+++ b/dev-haskell/should-not-typecheck/Manifest
@@ -1,3 +1,3 @@
 DIST should-not-typecheck-2.1.0.tar.gz 5229 BLAKE2B 66d08f52a72dc40ef549fdd724889937506d1836eb60fecd8d55801287504586718e14d91d5be8c0e49e6b382281e3eea32757001ba0f4dc446ef063fd024ec8 SHA512 46ba4435a4408e23dfe6e04f827a7efcfd3c94a4a53a0562061d5cd40c11fcbae7569e695329fe98f9d9ecea1999ac68da6594d2ca60c2efccdac2d6d674d65d
 EBUILD should-not-typecheck-2.1.0.ebuild 735 BLAKE2B 95e5d7b5ec41efbac1e2edcddd648677575a5239abcd14a207af8443fd4fb3faa7d6a92c77bd496b8fe6335bb1ca42b8e38ec061b8c6dd1c5730caad6571e3af SHA512 f2362cb9ecddd66075c5b397409db807441bf0b547d974178eb47013a9f6a79479387021720f284b1a8e81d3408c64c5b3e0501d0ee5235aca24b3e9288f9d8f
-MISC metadata.xml 461 BLAKE2B dc3d14ad5170fcc26fad5f413437ebd0bfd95219d7b412b7a9195ac5a58021c70e912ad3a8fb6a66bd041aefb55541285a03a3e50f5b3cc36024fb6c4eb28607 SHA512 d4440a87277b4d1530424f6889ffe27144f38d1ddfed7637d5810777775140a4a63161b855f018173fac11d2f076bb7f6026b79d2944ee4efcf64cddf0efa02c
+MISC metadata.xml 554 BLAKE2B ff34bf12571c0b66e0c64abcc52de9bb2122cdab88d3636ff85a74c9468f4fccd9d61baed465561aec2837c5bbf356cbcd6e7cd3027f6c2174157cbb3c89a3c7 SHA512 219aa7e9c9f7675c2cf0262168bdc87c5d874f8726c23f0080973dea2e406ad78c49f07fea58ae4a4931976bb64ef5925ca3f438f1082fbfe265081e922a0a04
diff --git a/dev-haskell/should-not-typecheck/metadata.xml b/dev-haskell/should-not-typecheck/metadata.xml
index 2d8127f48f65..3358bf72024c 100644
--- a/dev-haskell/should-not-typecheck/metadata.xml
+++ b/dev-haskell/should-not-typecheck/metadata.xml
@@ -8,4 +8,7 @@
 	<longdescription>
 		For examples and an introduction to the library please take a look at the &lt;https://github.com/CRogers/should-not-typecheck#should-not-typecheck- README&gt; on github.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">CRogers/should-not-typecheck</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/skein/Manifest b/dev-haskell/skein/Manifest
index 77cc38079558..f173968a96ad 100644
--- a/dev-haskell/skein/Manifest
+++ b/dev-haskell/skein/Manifest
@@ -1,3 +1,3 @@
 DIST skein-1.0.9.4.tar.gz 134346 BLAKE2B 0161ea5a6de793c7938595d05b98b04f8929f007945fb86ea6c6fc7cef26a7022be00d0546920abbfb0ececcdab3e770acf4a4f468a33582106cd8290e830f2f SHA512 4f449de2db0c9f6a22e3f7375999029c1ab9139ae2e678e5582d5ad05dc8b3c12c99951ede884228579b9acc0243b00b93dca07dd6d1ea314cc0d3d223165c34
 EBUILD skein-1.0.9.4.ebuild 1088 BLAKE2B 31cb203c694ece0853c9d414db9a62e9be7936079a0fe41d0c4dbfc0add67be30be014266e6d8a67682ed4af36205017e6793d813c8b5bbc6384b056344f1fc0 SHA512 b740d343ed8a0d5fc3d477030802235806a0abcfc1dbee576a11bd25ac710aa83e7df1c16ae6b914c38888bf275b5dc374912787ee49fc810b2fe32fd8bde95d
-MISC metadata.xml 1491 BLAKE2B e765f9fa045a1aaaa625d5013e65222ca2f00a71c5bce1855f9f5879ea7dcac7aec08e7439627da11882e2ed70890d4996c5b6c4e0ce08d2c2757e1f097a5445 SHA512 0c0a7971f93f2107254d40a79a776c52da4fec24555cf035e559a017fe7347f22979f1678b35420d45f2d465ebca82198a0f4f79fbdfb77972cad848eb26e4b6
+MISC metadata.xml 1571 BLAKE2B 71b32e65dd677ee874192889165e0ad8be83e26dbc5cf57eb72dbb0dec3569693fe64b7334f18dd1cc76a68ace9ab43d7e5d224d06c9c432ca8d8783032106f9 SHA512 8b6e211f0f128e6bf78efceb325513d209323bb6834576d5d419d453615395cece26bb638cdc9319c92262d37ec7cb080840aa0a6fb4da659da7ff413cb10438
diff --git a/dev-haskell/skein/metadata.xml b/dev-haskell/skein/metadata.xml
index 515ebcee0a7c..44bd9a6c0975 100644
--- a/dev-haskell/skein/metadata.xml
+++ b/dev-haskell/skein/metadata.xml
@@ -31,4 +31,7 @@
 		This package includes Skein v1.3. Versions of this package
 		before 1.0.0 implemented Skein v1.1.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">meteficha/skein</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/smallcheck/Manifest b/dev-haskell/smallcheck/Manifest
index a451e9c3fccc..233f63117071 100644
--- a/dev-haskell/smallcheck/Manifest
+++ b/dev-haskell/smallcheck/Manifest
@@ -2,4 +2,4 @@ DIST smallcheck-1.2.0.tar.gz 19047 BLAKE2B 4ecd56b2e0680b4d4e7f80c1c13b9a3a621ca
 DIST smallcheck-1.2.1.tar.gz 18932 BLAKE2B df248fb94e06eccc1d95ca168a47ecc7ac2853b889b3e778ee36843e5f76caa14dc90182b228610c7a3a24993bb8464ad2ff80f33aa95725b125d54d7b59f6f2 SHA512 42706fb769423bd7f8c2fe7a52d23b8cb4a22bfaabf43b8c29db2923c6413191158801e43d5597258f42ce2430ec81546d172d90246c9d3cf0f9343694eb5eeb
 EBUILD smallcheck-1.2.0.ebuild 716 BLAKE2B 29d9f79a3ffae1830a569163a3d09ec69fd0acc8f30d53ba29c10e3fbf78b043c7d80b4deca7e06543a0e918171d2542c448d2399b1a4412ef1d209614b5cac8 SHA512 0b45d2704bcae8486a78efcf079e67d793b7a779bfd0a72638f81411e86c16154ffff4ccb956d4149d47f6d9a13696ec286785b28e9ee029d6a31cdb0def7932
 EBUILD smallcheck-1.2.1.ebuild 708 BLAKE2B 16e4552fcdda55ea87e3b29c93bdb7cd36927e2de5f2fd077a0b81158ba4c8e02af770805549f6be45944b22d53c50e370f0dce9ff29ae9719e088196505c261 SHA512 6df70f6ccf02808c4b55b6e350bb53ee859e3f949d24655e97c83f6c2a4c2e70b190891497ed8feb89763e2f471736d44d820e58a8761dbc34df1358f23439ed
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 334 BLAKE2B 0068841b99aac8ffec300afebecc95358ff468e7308676ab028fb6b46d1cd84707b8bd919bc2fe7f4d71eb436d051719a1e5f932e40cb8cd44ba8f865faacf92 SHA512 acc79585fd71ee7913354909b1d25c816efa9186e93f8bf40051d0495a182e89b042a218cdc42b42d61b9d1a7481fe26a6b75620ee3d3f0ff95d3c3608cdae80
diff --git a/dev-haskell/smallcheck/metadata.xml b/dev-haskell/smallcheck/metadata.xml
index 937381521944..97abb8fcef64 100644
--- a/dev-haskell/smallcheck/metadata.xml
+++ b/dev-haskell/smallcheck/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">Bodigrim/smallcheck</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/string-conversions/Manifest b/dev-haskell/string-conversions/Manifest
index 55d0cf710e2c..68ce0abafca7 100644
--- a/dev-haskell/string-conversions/Manifest
+++ b/dev-haskell/string-conversions/Manifest
@@ -1,3 +1,3 @@
 DIST string-conversions-0.4.0.1.tar.gz 3759 BLAKE2B d43272aa7c275f34d8735950f922607509e402eeec2b847bd96ddc80e6b4fcbe25885d1a81d2d2aa89f6c8ef4eaf9368c7c9b6caf78d2a4a7c9177b8411fd971 SHA512 8bd015215d1a8a48f01abf95f53bd75f67c83dc48c5b4c4f0731e9da924f99c18e9c6de46fdebdd497f5dc577311db1aa31f5144dfc5b1de539e201b9fc1c9f6
 EBUILD string-conversions-0.4.0.1.ebuild 771 BLAKE2B 8aed1476081dfbe525f5ee8f98b05f5fdfdb450feed4a2160f56dac2e9d458e0847c238ff9a78aad4f7faac8b04a2dbefb198b0233a6bed94bb878b61ed6161d SHA512 32f1aae78c6c14b07c4daa0cd1f5419b90561f91bb21e12b04f42f4970767969510ce3f77977093866df566f13f7f439936bf709afcee01f5a1e6aa7e69685b2
-MISC metadata.xml 407 BLAKE2B 3e648db288c21bc0d90ec0a299abe749a1c278a5eb398720b1127d82a2d3b085f85c89f39a5776a5eae04014b8873d1821905d51a51465985b11d7fea8e69f49 SHA512 1058dc30236fedcbc6ba8f5ddcc22f3ff49dff84e04e1b1766868e48bdd1028b755a3ac9deb3af517ee562c3e851779a9d8ba9b955dbf55ca303e0b5020becf4
+MISC metadata.xml 501 BLAKE2B d357205a77631819e0586e8fed3112035374f9787b8ca6124e82336e4f2d2985e8e9f21ee23788f718794663e5a3ed26340adee7149a51c3a964f604c4997029 SHA512 35d2e6367f60dc6e7f4bbf0c9d149816131764f4bc398f21c48dbf86cd15add3066cb708f87c85759ae1376f7180403d7e6465d1493c30e7be17b2810d857699
diff --git a/dev-haskell/string-conversions/metadata.xml b/dev-haskell/string-conversions/metadata.xml
index b4d5e9b89467..f2e697c128ab 100644
--- a/dev-haskell/string-conversions/metadata.xml
+++ b/dev-haskell/string-conversions/metadata.xml
@@ -10,4 +10,7 @@
 		of different string types
 		into values of other string types.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">soenkehahn/string-conversions</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/tasty-hunit/Manifest b/dev-haskell/tasty-hunit/Manifest
index 1fc96cc254e1..a9ff7be550bc 100644
--- a/dev-haskell/tasty-hunit/Manifest
+++ b/dev-haskell/tasty-hunit/Manifest
@@ -1,3 +1,3 @@
 DIST tasty-hunit-0.10.0.3.tar.gz 7885 BLAKE2B a8e8af2b1fcf575646620ccb4d822e6cbf688372dacf0686a7c3760ad693f2a7d88f280ef9e43eb9cd757f89d2771368adf567a9390b1a35f9b1db5aae7c5d81 SHA512 29adbf499b8079c12c756e031c3bebffa1c312cf623ff77d4fb2e85d3462ac6e71aa8a13c3e161ef04ad5bbf910c3bb5f4b62bc3825a030b690a90eea812b85a
 EBUILD tasty-hunit-0.10.0.3.ebuild 642 BLAKE2B 1f5335d9f8f8ce33b608531124dffe833a0ddfad29306f24eb51cdfc96e6d1d6c771996af60a1dc26d3ce57ea49ef69919a91a2e31d20a76e3bd4f9b073f63f4 SHA512 bc49e39188d6b443fbb14e806f3d326c0a6c30ab8924c1b81b45174e81c271c0626a7d708a5cdfc0886f0d020ae78f8304b72ed1d42b1b39a6bed0516be89ffd
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 336 BLAKE2B f1ab97377f26f8763d1d602af094867966a6e8b76f962e6ba7d7e70f470004a8fdeb556b212e9eb8e2a1fd8cd91b1647c435323d6675ba9b10c97befdabf673a SHA512 7310bb53df52469a2a5d5b5447479ee75e115d0b32b0fde914881a5d3aa82bae22d4c43587b660cf76e903d948a591ae159c28ffb16d45a940dc194b1a8c631a
diff --git a/dev-haskell/tasty-hunit/metadata.xml b/dev-haskell/tasty-hunit/metadata.xml
index 937381521944..d1c3114a5e36 100644
--- a/dev-haskell/tasty-hunit/metadata.xml
+++ b/dev-haskell/tasty-hunit/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">UnkindPartition/tasty</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/tasty-kat/Manifest b/dev-haskell/tasty-kat/Manifest
index e082c8ac1cda..08cb7294b60a 100644
--- a/dev-haskell/tasty-kat/Manifest
+++ b/dev-haskell/tasty-kat/Manifest
@@ -1,3 +1,3 @@
 DIST tasty-kat-0.0.3.tar.gz 6167 BLAKE2B 9ce1e0bfbaabfcbc7757b4b3512be83275d2662d060fe31e9fb4321d6dbac21237822e667b66bdae7126b188cda28a09726883dad349ab810b6129fa8c0c086d SHA512 3a695aaf2cd8d699dd07a58298ef9da12cdc3b56564d5202ec480b6ce099c394fbd7dbe3bbb0664b295d5a4ef6e65ec0a39f0b9479257e87356f67897922c287
 EBUILD tasty-kat-0.0.3.ebuild 693 BLAKE2B 6276ac25bd65936199f5daf834d818ef071307c511099c15fa6732e80ff53a03f280f510e18884dbfa5546fb1620e70432f233653b5502719d5afb8dce786dbb SHA512 ba023a234c809f0becf48499ae4f693fa6c96fc5faace194e70040b03d6295ef40c24e091af7fee66b5c8c2269387539cb04dbd9e8419ebcdfefa2c1dc16a54b
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 334 BLAKE2B c004b769a349b6d2eb290295f641c64d689b796ec3d45c308c08a56ac2841bdba6eebdcaf85e60f7bc30520fc36183bc26a085d2dc42a2294d42bb16818d940f SHA512 8c1087175cd8756e5d671af3edff0e79324c1c4d0fc33678487e9a70f3417cf723d78eaf719643e0787c0273b09f07b20f7e6e1c932fa158336964ee941ca077
diff --git a/dev-haskell/tasty-kat/metadata.xml b/dev-haskell/tasty-kat/metadata.xml
index 937381521944..0897747e1fa4 100644
--- a/dev-haskell/tasty-kat/metadata.xml
+++ b/dev-haskell/tasty-kat/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">vincenthz/tasty-kat</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/tasty-smallcheck/Manifest b/dev-haskell/tasty-smallcheck/Manifest
index a0e5cc0e33f7..d9262c7b73cf 100644
--- a/dev-haskell/tasty-smallcheck/Manifest
+++ b/dev-haskell/tasty-smallcheck/Manifest
@@ -2,4 +2,4 @@ DIST tasty-smallcheck-0.8.1.tar.gz 2690 BLAKE2B e6ccfca50577edc27da4d8f77041e5ee
 DIST tasty-smallcheck-0.8.2.tar.gz 3041 BLAKE2B bb13e2253699f1f064276788254671f74b9e193a35ded683ba6cdd2f3f2e4770a8d78825991ad1d20426adb2437f7c120208aed1c77726d7e1c0969748b98c4c SHA512 ff816280315e26d20210f0dcbf55e32780aa9ef455d8d00b146d9daeed6afec5b6593cd8a8dc0b7c0bc7ff77da75f065f9c7253494f2c47150e2b7a6aa29fc6a
 EBUILD tasty-smallcheck-0.8.1.ebuild 710 BLAKE2B 9ea8b7faf107eee74516f4e8f10da9d980bffba5baf27eb54389ecd838fd0209ab9c4a9b373433b044f6ceea20350c7ada13f9bbeba1a2513c86e61133d0fbe7 SHA512 82a314b341c6e382ef87cd8ceadb33f417a87b4318ff3e9d0929bf6e6c14d1bf840bf0709ebbafef1a3563c6b8856e64ae48cb7f3f7e18299ed0a077a6f99264
 EBUILD tasty-smallcheck-0.8.2.ebuild 728 BLAKE2B 89927d194446a743235af70b8fe52e16795fe2b3abb50f85a1db71f6a4ec7340a5a8ef9833c6a91cc8ecd38a3c730e091817b76f6216828ec5c5710a5d38fb13 SHA512 9eb6311808683b9355a9f6ef1311d01d457b2bd454c4665425725cd09f074998d64b843ba2a830fc6f1216deaff6f63296fc1e7832cfee8c3cf5d97c8f938ea0
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 336 BLAKE2B f1ab97377f26f8763d1d602af094867966a6e8b76f962e6ba7d7e70f470004a8fdeb556b212e9eb8e2a1fd8cd91b1647c435323d6675ba9b10c97befdabf673a SHA512 7310bb53df52469a2a5d5b5447479ee75e115d0b32b0fde914881a5d3aa82bae22d4c43587b660cf76e903d948a591ae159c28ffb16d45a940dc194b1a8c631a
diff --git a/dev-haskell/tasty-smallcheck/metadata.xml b/dev-haskell/tasty-smallcheck/metadata.xml
index 937381521944..d1c3114a5e36 100644
--- a/dev-haskell/tasty-smallcheck/metadata.xml
+++ b/dev-haskell/tasty-smallcheck/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">UnkindPartition/tasty</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/temporary-rc/Manifest b/dev-haskell/temporary-rc/Manifest
index 3f1f8c32d0ca..892348c776ef 100644
--- a/dev-haskell/temporary-rc/Manifest
+++ b/dev-haskell/temporary-rc/Manifest
@@ -1,3 +1,3 @@
 DIST temporary-rc-1.2.0.3.tar.gz 5285 BLAKE2B 4b0d956bb76914077e3124e539e24c49bb4ef1f47480857ab7bac98c1b296b5e9c467205bf32db9fb7a9ea2e975da66cc3e3786354eebef5009c9f49b2e105d5 SHA512 cb57b33403a69058fd2cfbb5f69bf6bbfe0d6b1baeeefcd67b4dcc68c2c6325d0ddc1d68e672509ca7f83fea6b56332d535b7ba4bd607b058070e89c8b0c88fe
 EBUILD temporary-rc-1.2.0.3.ebuild 641 BLAKE2B 927faeab7b98e7300e7efee13f4b9873607eba4aa570651fab67aee3e23d4dd56d16ce460e41ede5338c2d4386b74bbdc2fc8c297e652254d3c78425acdf586c SHA512 eff63cc6b2c3768b20f2b32908bb96b031069260ce3c77d363e9a07bf5aeada8c59640b0263a8ffccd8129ba243a2ed83148493772d40adc30898fb57e9e74b4
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 340 BLAKE2B d06502acb0ed15b90b7b8b5b076e1b54a80d7029b026f0868483c8ecea7fc081382ebcc163edee9cd161784a1cfcc2f53db55cff7a28451203c9dc9d7c9fd4a5 SHA512 c284790c964553aea4e1ee3a7371f43d3c4109eed5b46491c4ead7e89353bec857c2e4a0ffe7448a128a76158e8b085d2b7a02d258fb97e78debe8b1475d3445
diff --git a/dev-haskell/temporary-rc/metadata.xml b/dev-haskell/temporary-rc/metadata.xml
index 937381521944..3c32ab877a53 100644
--- a/dev-haskell/temporary-rc/metadata.xml
+++ b/dev-haskell/temporary-rc/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">UnkindPartition/temporary</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/test-framework-leancheck/Manifest b/dev-haskell/test-framework-leancheck/Manifest
index 8f2a8496f6f6..b63fc1516507 100644
--- a/dev-haskell/test-framework-leancheck/Manifest
+++ b/dev-haskell/test-framework-leancheck/Manifest
@@ -1,3 +1,3 @@
 DIST test-framework-leancheck-0.0.1.tar.gz 8743 BLAKE2B 73c5e42f448d57a0d07c3a21751875f8b97a43aac2ba9c97e0f334d86b3a7e0afea6a753bdfa3253796340d77c12e251316a99f985e3f6166feedbd574cf466a SHA512 51a446c8650b375b893e762ed6d7683540788a57a7f968173556d93d811e7c039251c26e1086ba74546d9b2c834c278c75bc791ce8bacf38c381b01d3875371a
 EBUILD test-framework-leancheck-0.0.1.ebuild 668 BLAKE2B 01ba5cfa39766e7cd78a3442eabeaab53f81bad4380576f4f80a18bfab1480a4ac10ceb9f9fc4c80319f8e9b3d0f624ca09f18d1b3ee30e0120f5050dc28cfcf SHA512 4a7a9015099ab4b747f66677d69cc66c155b1279b60485f6cfe0611f8dbba2e505f696f7dab7d2ac6c98600d0a51ecc4955e97e91290a1623cdd4c609ec8e18c
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 350 BLAKE2B 1f7e8e066889afc1200ec6d554fd4939fd6280f9b9e66fc3b81ee25d9898a116ff2fca0cb5c93290cded678c0622ab09f81a8940f4f2accc773bf7b98fa4c16e SHA512 c88084306ca770db04797d0611bf4b5f2cafa2e441730e2f2554c661c8609acc35e3e05f6c44c43cdacac71a4af69eea0c4b8fe430a963eaeb582d0707534cb3
diff --git a/dev-haskell/test-framework-leancheck/metadata.xml b/dev-haskell/test-framework-leancheck/metadata.xml
index 937381521944..85f1049380c1 100644
--- a/dev-haskell/test-framework-leancheck/metadata.xml
+++ b/dev-haskell/test-framework-leancheck/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">rudymatela/test-framework-leancheck</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/test-framework-th/Manifest b/dev-haskell/test-framework-th/Manifest
index 177ddf56ae5b..ad8d32357fc9 100644
--- a/dev-haskell/test-framework-th/Manifest
+++ b/dev-haskell/test-framework-th/Manifest
@@ -1,3 +1,3 @@
 DIST test-framework-th-0.2.4.tar.gz 2977 BLAKE2B f43f3f964eecfba401db1fb574ab9ef4bf9b575251a60f196ddd451c23f8c29ea44f90d441eae2f5d923d053061a247820fc0a399e59e1eb088ba31abf38ef44 SHA512 0e8b6898eb7bf481bafb0c9ff9caa615dbf768e538e26b15ab899c5c9a1ad6bd6ed76ef93cf9a823706046d41f49fbb0cbe660bf846e59a608a0e5d21e89686b
 EBUILD test-framework-th-0.2.4.ebuild 771 BLAKE2B 134a1f24c7829459ebb3c136fa7d6e03ea7dbd19fbb7db1d03e66284ed90232398e929d021899955156613b4c6918a536e619c2e94412ad945ca068b780b9438 SHA512 dbed436bf8f0f05c91a87b3c2720acc820b70f095ab7efabd76b55f1d8684d318ab4a163b1452c63c89afc93464c2df75f37ab1eaa8da9cf6d44916d6c6f5b5f
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 338 BLAKE2B 97cb5d8cf70d32786b16ab912aad4d3b16bcdbabdbaae16f88a2e4ff46a6ebc3d7ad0c6086b1952268090d4980419d48bb8c0c447d334c9a53113c5b7742bd2a SHA512 6998251518b5f124fe72d13f3d1d6957d8b30a9247d86261bce7d8a69366e412932502b460c839b750bc5e02037231a25c10d4fd9f5147b5e7a42a7486c37931
diff --git a/dev-haskell/test-framework-th/metadata.xml b/dev-haskell/test-framework-th/metadata.xml
index 937381521944..da19a33e5a76 100644
--- a/dev-haskell/test-framework-th/metadata.xml
+++ b/dev-haskell/test-framework-th/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">finnsson/test-generator</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/time-manager/Manifest b/dev-haskell/time-manager/Manifest
index 9a0262088beb..695298eb233a 100644
--- a/dev-haskell/time-manager/Manifest
+++ b/dev-haskell/time-manager/Manifest
@@ -1,3 +1,3 @@
 DIST time-manager-0.0.0.tar.gz 2726 BLAKE2B 911ee2ac8bb028da7bddc472deae76ac4af38c2998e2084bdc5e34567d4a2b367c8ffa9038e20abd41695f0e46a0200c5f95b9693f88cbf6e980d2a0be38cefa SHA512 aa8bd9dc9a66ea097fe2d6a6d9e77eff67debc58a588da7ae1d6fc312b6bb371da58b413b58cdba21623e2da26633595f379ac9e0a7a6dc7281ad42353231054
 EBUILD time-manager-0.0.0.ebuild 572 BLAKE2B 4333835b68ca7bc4e5c74027af6cda55fd2e9dbbbd06f95ad61efe2d51e0d863f737532bf467ccc10b92aa80d03acbea0319b11e35accae8e8eb9ead2a8c271d SHA512 791d272928f0099d2b2ecb8bd98dc438625bd50bdbaa919fe02258f1652fae24a5d93515b54b74cae250fcd7d7e15fcceed321db57d6fbb7395e33c58eeda33e
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 327 BLAKE2B 218e06e8cc3d6ffe2ecfde2149aacd275b343bfd4cc2e4ea5cc59a026f4cc7a137889f9b1fc310724e8a2b8a3293e828cfcbea933913ed1fbc984ce054ab8875 SHA512 16195ffb161bad5d1755577c272cd6d517252d34d548e3246c7f9fc4336fe0d83bd75b8322186c4fd734cfadd8120e147653348f6a4574137024e4b06314c694
diff --git a/dev-haskell/time-manager/metadata.xml b/dev-haskell/time-manager/metadata.xml
index 937381521944..6b5972c48ca4 100644
--- a/dev-haskell/time-manager/metadata.xml
+++ b/dev-haskell/time-manager/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">yesodweb/wai</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/timeit/Manifest b/dev-haskell/timeit/Manifest
index 5f123061e6cc..a17d52d432a6 100644
--- a/dev-haskell/timeit/Manifest
+++ b/dev-haskell/timeit/Manifest
@@ -1,3 +1,3 @@
 DIST timeit-2.0.tar.gz 2117 BLAKE2B 3cb601e87cd77af879572aca0fc495ce6e446d4c402c3e1010b114a18326254f94fc212985df722a47b0a6870d1789424b65620ebc471c177e22b18c6aa7c577 SHA512 3cbe554ddb17fbeb5f8be1f6459144921f8be4db0fa9571678980251ca397fca0700df61d0e5bd8466b0b2cdcedac8473ac53debbd9b4e9c239ebb37bec2845b
 EBUILD timeit-2.0.ebuild 534 BLAKE2B fa6e883885c4a6e85faf8ff5b7f71a734f82d3528c4c8fb320054040db53dcacf616c8f2604b03d0dbac3d09305271a2be0aac2711ef253fb348e4e1d876c6c4 SHA512 3921c2f833c3ffbda5c324e5daade3f1415fbf0bdf1474b691d565232977dc2c746b02e6da1065cb2085e71b28f96a229e02da80da11184b6f3cffcfd8ae2655
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 328 BLAKE2B f780e6f60e727570f836d4fa328824f3d406170cdc6c088c79aba0e2ca3e6d68e5bed2a28f9ca5637cf2eef33e56f530e98d7ba7a3e08649f9133c9ef53de8c4 SHA512 8fe1b183d9e4cf3905885a74bbe9c8477841be2fd288b11269aabb235f197de289eb4f73546e280c07ac73fcaed57e35be34af2c5b3cbcd3036d654c0b4a644b
diff --git a/dev-haskell/timeit/metadata.xml b/dev-haskell/timeit/metadata.xml
index 937381521944..afb59c65e1bb 100644
--- a/dev-haskell/timeit/metadata.xml
+++ b/dev-haskell/timeit/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">merijn/timeit</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/type-equality/Manifest b/dev-haskell/type-equality/Manifest
index 663fa49f7121..fd816ab69f53 100644
--- a/dev-haskell/type-equality/Manifest
+++ b/dev-haskell/type-equality/Manifest
@@ -1,3 +1,3 @@
 DIST type-equality-1.tar.gz 4525 BLAKE2B c93061cbf7ad6a02586770dbbbb8c4e47fdee48240b85cb8fc69f78ee8cd05c493585cc14129969814042d3cde2cd4e9468af86e61cfef486b4c3d424b5f413d SHA512 633675251719afa59c311ae82d18476d6e000fbbdc553a29da598da38a29cf73fffcbcd4b23a70dd397f10734ba6617633390874eea8a563a1e258654a9fe7d8
 EBUILD type-equality-1.ebuild 625 BLAKE2B 30f2c5039ed2b7c981605d311d19c5baea326750c14702fcc69d1bc55d5b3919a76336d86ac5329b422778dac79d398c110b84f6010cbb284cbe037dd10a902e SHA512 696b470ac3fadff687f95f70a08e3184734f0ca25f32911d33b1061fafa960141b7b061032c1ead9ffe666304d24462668246d1de91675ad5772282c7a2bf235
-MISC metadata.xml 680 BLAKE2B e1dd3f93c5a3a2bac2000074cb559704239ce80620ca28a1faa5ac34bbba979380e6d73576d48cea96ada455f5fb03c05147bddc7877ceb937953b421f49ec29 SHA512 a097d15c375c5296b49369e5af625e1a447c2b676133a3f4f49041a2ebc4bd16b193ce57357227898686e8011d6bee4383f3ffe3afd2b6ad4319b855857f2982
+MISC metadata.xml 768 BLAKE2B b1f128778a16820d7243b1a3179db5007f00c597f27e267e484f87bdebebf9155ad607e668cc7a6c7756758e14940571bdd04311a9b83c39f6f7f7999c3b0c99 SHA512 4d5472a1212a59f422dc8b4435dee5deaeaab6f22267e7452235841729e0ef0d32940cb4e9a1ed357b3ff122216034c731413f6cdd0b696df7ea65204a923ba8
diff --git a/dev-haskell/type-equality/metadata.xml b/dev-haskell/type-equality/metadata.xml
index 48f5add4683e..1c5ebbe9daa9 100644
--- a/dev-haskell/type-equality/metadata.xml
+++ b/dev-haskell/type-equality/metadata.xml
@@ -15,4 +15,7 @@
 		producing equality proofs, providing some form of
 		decidable equality on types.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">hesselink/type-equality</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/unbounded-delays/Manifest b/dev-haskell/unbounded-delays/Manifest
index 337074a0b45e..447759ff6b38 100644
--- a/dev-haskell/unbounded-delays/Manifest
+++ b/dev-haskell/unbounded-delays/Manifest
@@ -2,4 +2,4 @@ DIST unbounded-delays-0.1.1.0.tar.gz 4166 BLAKE2B 158b05e35afd4c2b8f33caeea74846
 DIST unbounded-delays-0.1.1.1.tar.gz 4114 BLAKE2B 97ffa71675906f9eef6ae297369f9668273ffcb4cc8d9d7efb43b152b5abbeae888ca67e1f77568636feeb3eb4d1bd8549a1446a4f56c7db5ef5570a43da7c57 SHA512 7439c8976498bd84e966b7e08e8d868d65debe3ffc7fd77dc6de345258b4532f2203415abf9530fdaa5feba0bfdc1031303b343502d1f3dc401058125babd41b
 EBUILD unbounded-delays-0.1.1.0.ebuild 566 BLAKE2B 4ad773d778a71708869664cb4757c7b089c68d466126dce5bf17472ae8d70598c07987e08e686971d0d910de58f367c8a60b918a7b707850e055b424b392a87f SHA512 9f92b8872d856e0c123f67604d794b710b63b42887c7263e3aaebcb13027b3975b8e5dc23399159837f8ab60892e21d60f6874ffae64876cc13d035191d27fd6
 EBUILD unbounded-delays-0.1.1.1.ebuild 568 BLAKE2B 7cf4d12b8b0c5b74dee82778dc95644ffe16b7b878929f626ebfa05d0e2c9bd5f3b4889243cc857542baa4fb12065724795348eef6ba5175a5eb075270e527f6 SHA512 7bf6c38f1d3e77088d4ba7e5343692d6b884d6f14eafe0d9be277f6175a8811f7ef0f154f5e913c9d23d13d168366c5abdc50f2a413721d84d33a2aadf7a3616
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 342 BLAKE2B cb85210cf6f2aa695129aa6ca3eff8cf5baf0a87fd688bceae16a7d3741d97511fff24a51ff25c7e9a3fa9b591c3edfc8aa0e4a85f1eb2ca10462bde468dfb31 SHA512 3d115ced99c6ac9e4582c8e0fbf17c9891334e9bccdf67f8cc033cd6b76676036ce5e219cc0ff22ee6be7a19201fdabd6b2fdde67c9e72e16184fb4e1df84d79
diff --git a/dev-haskell/unbounded-delays/metadata.xml b/dev-haskell/unbounded-delays/metadata.xml
index 937381521944..4bcd2e1d33cd 100644
--- a/dev-haskell/unbounded-delays/metadata.xml
+++ b/dev-haskell/unbounded-delays/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">basvandijk/unbounded-delays</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/unicode-transforms/Manifest b/dev-haskell/unicode-transforms/Manifest
index 32498ffb911f..e3f5d76ec376 100644
--- a/dev-haskell/unicode-transforms/Manifest
+++ b/dev-haskell/unicode-transforms/Manifest
@@ -3,4 +3,4 @@ DIST unicode-transforms-0.4.0.1-rev3.cabal 5923 BLAKE2B 40f63c4dbaa5f1b8a46b12ec
 DIST unicode-transforms-0.4.0.1.tar.gz 648836 BLAKE2B 46193776ed2e2f4cc20fe6304a4cf837b47d847d86869437efb4ffbbc06bec5d5b376ef4080676afdbb06c09b6d49dee10fc95f0597545ae4b531d56c42abacd SHA512 3d1347209d2b50fefac1b8bef3a4a82ab8e5f2addc361a338399225e37c933c1e5495f7a7c658c052d818dcc4bee20b48aa37c351fbfdaa926d98ae80f9dab14
 EBUILD unicode-transforms-0.3.7.1-r1.ebuild 1086 BLAKE2B f8e2a0ef18b1da25bb020c6bc9c828a96ed979b1499d26d641baa35e3be6ca5f60dcddf47f4b91adbf476c991a042265f2c8530ee6f4419542266b73c7b9e7b8 SHA512 4ee5b2ee6a3c38d5e619d147c8796a5e70f91fc5573a45607d25a70c41d12e8b2e43452c1eb38d3bd6d519c14538e025668bb45373fa84c322134bf2a2ea4f13
 EBUILD unicode-transforms-0.4.0.1.ebuild 991 BLAKE2B 591872831998a49700e4f1f29d01574f44386025963df201eed6ee689b435f44bcf4ce6cc033375333077e311bf19dc565a61facdd473af075aa2e60eae65bc9 SHA512 ba6f67945350fd12a4fb3349af88ea55785b834c0227dc4bd4aa8fd5b6dc5dece7b57035ab4315f219cb4948024049ffaa23d2e2b18a0d3cac2dae07c9e83870
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 345 BLAKE2B b6b280b6f5eb7813b70c8d03b2518a5e2559f2c463d194bc1d1e7d18e2be9d12e275c345302fd8760c9ba2b6cf980c843e0eda9be2bfd5a05e11ab5a1b1d10a7 SHA512 c5cf51aa14dbe8bf42be746045abc5c3b7edf31bcad8f0ee687703e26706aeb852e80da65cc528db5d65621c2de68bca8d178963e366cfdbaa88f04da85fae20
diff --git a/dev-haskell/unicode-transforms/metadata.xml b/dev-haskell/unicode-transforms/metadata.xml
index 937381521944..bd8630850590 100644
--- a/dev-haskell/unicode-transforms/metadata.xml
+++ b/dev-haskell/unicode-transforms/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">composewell/unicode-transforms</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/uniplate/Manifest b/dev-haskell/uniplate/Manifest
index fb0ebbbe1e34..5906eeeab898 100644
--- a/dev-haskell/uniplate/Manifest
+++ b/dev-haskell/uniplate/Manifest
@@ -1,3 +1,3 @@
 DIST uniplate-1.6.13.tar.gz 29787 BLAKE2B 345b5c523469ccc4d98ebdf7498fbdfe9ae183af46c4cc1e1fcdc0782d6dd31d40f53e5ee04d652beb048c62c0d0241d6336eefd87cbfc10d4c0d7bb647b29ad SHA512 8cab820d40b318c7483319de4174bdbd3637e1c93f42bc6b796c6a8a1fa93331c0a2ff3b7c77f6a2ec0509fb48bb922ef732c7d79e8e6bcf7987bde949459310
 EBUILD uniplate-1.6.13.ebuild 873 BLAKE2B a6b4db5e68df85fe3472a734b3a7789b5a0ff9f410a553329b6f0d7f920ea099ffa636d12519572af4ec0673f2bedd2c1be127c45329d682e0c2abaf1c82fcd4 SHA512 29c11a5ee698458b551fa2d40feff1971fdaa0f24d3bf1890adc63c91ae9f444d38f5e18bb006a423c76fcdee34afb12d4c9908b0a2db52e2f7187a702b03f0b
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 334 BLAKE2B 532754c0b2aa5e98bb67c6ecea2fed964301c1b2abf7523f33e135e1d5a73fc5adf9d271d0a606827621a34e31c10b31f6d92244edb577df2a87a3ea28a39ea0 SHA512 2ced82226241af2c524479a1d97698d711c806332857509ee298c71469880eaeba4ae88c864d1a6a2a978d30a3e6795140c886244c8f30a195fccc1e6a3f7897
diff --git a/dev-haskell/uniplate/metadata.xml b/dev-haskell/uniplate/metadata.xml
index 937381521944..94d28760eb56 100644
--- a/dev-haskell/uniplate/metadata.xml
+++ b/dev-haskell/uniplate/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">ndmitchell/uniplate</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/utf8-string/Manifest b/dev-haskell/utf8-string/Manifest
index 7e585fc73d86..154e89ed3012 100644
--- a/dev-haskell/utf8-string/Manifest
+++ b/dev-haskell/utf8-string/Manifest
@@ -2,4 +2,4 @@ DIST utf8-string-1.0.1.1.tar.gz 8667 BLAKE2B db2f899e0f78e44700cec859fd71982024e
 DIST utf8-string-1.0.2.tar.gz 10726 BLAKE2B 7790f2c3023944399d1110c90bf4b6ba5bf82db17f02d4b622343f559f2a88e96e590f306cfcb64baa27f5c63b86effbbb87b85ffc28b8d577355ac14b4fae37 SHA512 b20b61e942a77848d12f9105f88790b3f02e3e2835b87e0ce1900b5ea1e97c4b055003603e435415e7fbbc9586f9c6ca2402f86cf5d2b7b6ced2ddcae3968d24
 EBUILD utf8-string-1.0.1.1.ebuild 656 BLAKE2B 79b11b6a5030541df392ed94f719ecf0aa12a41548429a69298fe48938a413c3be2703dec601a6707151873e570181f30ebb757e37ae96d2bc30963841349923 SHA512 e323bc7e5e191ef3ab6dbe0837678f813692e1fcf1cc0e2e8c97bb5d10140d301089397ebadae9e4bc54e796fdbb6e40d7a2596557027d21076893c01bcd71a7
 EBUILD utf8-string-1.0.2.ebuild 655 BLAKE2B e04b76049c7db018cb0388f7b938bde3980c6a1f351bcfed84d1ae4f7d6c4770d41f847b1c89d0e547d8a0d663fe8475027e9f03ec274fa62f4ee30f46f30ef6 SHA512 b57820b03bfb8db6966a6ce4cbd30f634dbf6018ae5211db96e4c76f64c7be1783eaaa4f676c1b018a39dbc9d312ce26971922bd3d62e659a257796b42e256af
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 332 BLAKE2B 83c11a971316eaeb19e471c0f0ee7af6b4992ebb8c1102160573c6ef29245a65aa197a41d6976b5c5249b140d027b7f1075e000f84dedb036ba58dac577fd29d SHA512 a7272c38eb41b792457c05f6601c29432e9585105f05ed283c63b52b93de39e14af0695cf3f854b43ce1a199adec295dfa39d5f4f38b3cfd420f3a47c0d76150
diff --git a/dev-haskell/utf8-string/metadata.xml b/dev-haskell/utf8-string/metadata.xml
index 937381521944..08117f68631e 100644
--- a/dev-haskell/utf8-string/metadata.xml
+++ b/dev-haskell/utf8-string/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">glguy/utf8-string</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/wcwidth/Manifest b/dev-haskell/wcwidth/Manifest
index 3355a4ca6add..38a64c26ec5f 100644
--- a/dev-haskell/wcwidth/Manifest
+++ b/dev-haskell/wcwidth/Manifest
@@ -1,4 +1,4 @@
 AUX wcwidth-0.0.2-fix-build-failure.patch 756 BLAKE2B c18ebd2a4c38875a2ab7120645d88dd62e69ab268bd147090cb0cedece3e4b621bf70c206d79e5e2b6d3991f72188fc2087b09b2345474328b25cbbe67c906f5 SHA512 8c0951b2251002eb3f0e5f56cd06d6571ead53e2a854cc79d1e496d7b0a82792a216a48e85deeef0d1c0b4f330da624729150b77bd444d911f6149c9c4109cb5
 DIST wcwidth-0.0.2.tar.gz 4168 BLAKE2B 4c6f3b490934aacef35b4fcbf8d9cc8f2c93b2d34a705e78dae4750f2adaf37d4d16d89e6595a50bf545d7a7dd486f589b1000f7d2f5b2893b45680ed31f1c4d SHA512 555c38183c7c402a66c151e52bbac9e6c501528cd661ad1708576444b6dc4daa19e0d75c9b79f8590843e0e40b3758d9bea08e426e754688cd32070dfce5a649
 EBUILD wcwidth-0.0.2.ebuild 861 BLAKE2B 9e6c36c311c1d5b268c843b593012e0bdcc23ee9645866120d40bf570fa9dc1d1317095f0129e45219f35f51b4f7d4ec089313aa6300918823e7f104de34372c SHA512 2c8d961687256a5d63a50edd746ba530b86eb89d800cb72cbd0b88765375cd257c358d88656cdc1b01ddeb3cfe33dd94edf7e64108aa0a19f493d115f40d9022
-MISC metadata.xml 574 BLAKE2B 286119410dcb9969a3ad403eb21e81b5a6df68014a7db244b421ad190718726513c293eeec1f55ee61f698b5d383b4fbd633dce3447ca2a28a8f5677796e0484 SHA512 caa37ca486ed34ccf1508dc703fc6d8c50c29e174ddd33aff6674b85a26740dfb9d5c0f188f5893339ccb2e36410f19d1b80620485f4a8eaf1458aa7f5921823
+MISC metadata.xml 657 BLAKE2B a668b8d7307f4b58707323c92b7099be66f4ba2359e6f9ef88281d0d526262473c3f4e894b2b7783c8aae7a18d82140cf48814814d4b9b3f7128af0f207c1843 SHA512 eb2e640860aa0403a70ff6b224a96fb198c294100ceefe7d34093c60014501ddabed1c0c14021ac175642b66a45ff9fdd92c6cfb5e72f07c60e87ab27204c764
diff --git a/dev-haskell/wcwidth/metadata.xml b/dev-haskell/wcwidth/metadata.xml
index 1143fe547af4..1cf9efce533a 100644
--- a/dev-haskell/wcwidth/metadata.xml
+++ b/dev-haskell/wcwidth/metadata.xml
@@ -15,4 +15,7 @@
 		the widths assigned by it. The command line tool can compile a width table
 		to Haskell code that assigns widths to the Char type.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">solidsnack/wcwidth</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/x11/Manifest b/dev-haskell/x11/Manifest
index 39286ad29109..20cbcc078ec5 100644
--- a/dev-haskell/x11/Manifest
+++ b/dev-haskell/x11/Manifest
@@ -1,3 +1,3 @@
 DIST x11-1.10.2.tar.gz 192634 BLAKE2B a42e24aea6287a0af7f1b96fd9603d494fc010c9659a69ffcc46bb8670993271fb67061f5026f201bf730dbe0670d485f2a4197cdba5fc6bbd4f36fca4d6dd8e SHA512 5013dc359e081900193efd201c38c41ca73bc8dae3610e8e3b46e42aad7ae4a5917ecd3219d77e40141be7179963aaa2454032c820945e93ff4310ef359b2df4
 EBUILD x11-1.10.2.ebuild 984 BLAKE2B f57cf4e83387305fcc8da0dfb640dd193434b6d84c49d056945b5570c25939d5782ec0ab9b60cf069b023780d3e20bb45e041a968f615fee8de614141a410bcc SHA512 599747650c4d4aa3e0f265cba384788bd3b5611b5d740032a9a3cdf5a34ba0f7205cbc0466a717138826066f619a9c5674cad8cdf1565d7d7089ad008349f5ed
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 325 BLAKE2B a4b305a76e62a101ba2eb42832c9ddc52c04b80f6522015136cda7f519681ffb925cc84f5f64144aed3281c39d0b591f498c0d29580e779c603740c11e9140bd SHA512 3fd6748fd87ac7dd87f737e3997a78d7fb7601888d09379c0964128cdac52ea7376880d6242e548ef1cb963b97346010e1bbc694e6c3609296f24451fc68ece7
diff --git a/dev-haskell/x11/metadata.xml b/dev-haskell/x11/metadata.xml
index 937381521944..0a2f75a68429 100644
--- a/dev-haskell/x11/metadata.xml
+++ b/dev-haskell/x11/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">xmonad/X11</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/x509/Manifest b/dev-haskell/x509/Manifest
index a38760bb0510..9bcda3ff0e9a 100644
--- a/dev-haskell/x509/Manifest
+++ b/dev-haskell/x509/Manifest
@@ -2,4 +2,4 @@ DIST x509-1.7.5.tar.gz 21457 BLAKE2B 4bc51e63826de27050e254d3f51b8f346a175bfe825
 DIST x509-1.7.7.tar.gz 21707 BLAKE2B 01849ecc3c47e1dde4bd2950e7fc1ee3baa59e8472e3581de26cefd32b65acf6479d230fafa3613bd8a6370673974dbd5b6594fc804be60fabf87ce9d532ac3c SHA512 36f7f703e3bd2e0f2780091901f0558fd49c568c565cabb4a638a7428e212e882aaf8e1ec0de9b1cf97296858293418d7030a4d4fe9eddb5b07656d6ee84eea6
 EBUILD x509-1.7.5.ebuild 1057 BLAKE2B ec25c76b65a3d1ea1da170d4e4d1abf3428d4075b92199f61ef6ad966fda7d0429c92079a7ed793d50ce66e6a471fd43e82cd12e7c7c6cfa46ea4dfaf73944ae SHA512 06af0307e7a5885d7d76ee070500a67a52f841ce9f3d371537b24349546b8dbeff49e036a951f54d41d90c3890e6329f90ca6f06dd64318516cb849c1af335e1
 EBUILD x509-1.7.7.ebuild 1022 BLAKE2B 6628da3f9a77702d55988c5ba73b2a840ffc212235560d83a066b75846b580242a43a5bf5afac98c7961dc3bcfb433fe79a3935ae641ed2e01f8b597f60ae70f SHA512 fab787baf9a12f2295ba5636b85b64244c4db8834c6f46363b06946af26f61cbf8d7042a75a6c5a857ba64ebac190fcbe0feb3056eb653f327af5ee3c1fb2afc
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 341 BLAKE2B df4a363d87c8af80a97eef640188ad5026af175d6c0e55de4655d7c688930bc2c0f82f6bd0741d6db6831f1da9953dd17eab175f78efd18fd32fe1b3d5c983c7 SHA512 f75cea7c7662423d8fb427ed5bd5d8c3381d939b152bd44ef5993d481853ae4f1d7b1e9d0a5150b53a67208c84d75b6ccc6bfa871d0d1e0b3662b35a77baf96f
diff --git a/dev-haskell/x509/metadata.xml b/dev-haskell/x509/metadata.xml
index 937381521944..5c5e731516f8 100644
--- a/dev-haskell/x509/metadata.xml
+++ b/dev-haskell/x509/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">haskell-tls/hs-certificate</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index e7caa67f7cfd..977965c93871 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jtidy/Manifest b/dev-java/jtidy/Manifest
index 152a934ffa7b..c669ec759fca 100644
--- a/dev-java/jtidy/Manifest
+++ b/dev-java/jtidy/Manifest
@@ -1,5 +1,3 @@
-AUX jtidy-1.0-build.xml.patch 998 BLAKE2B 7bd86d87699a784a918e102195e097d3b88bed791af9fd5df929b06609831749a65fb9c7d79aa4aaa86d87c6796872ef1fbc077844a3ec7e431970bc3a094d65 SHA512 18b5679c538aee7821456acd44342a03e79dbb4d5b65ec7f7103a4d2b883f3726f346804d6362e7775b7e2826ea0e002663bfc32c0282a431254bf199791cd9d
 DIST jtidy-1.0.zip 240642 BLAKE2B 96e312f2b938f75124a966ad6ecbae39a6822a0d362e98265226409b6c407cfbd1cf1eac2adac522cb02174159392c25bab3abb18c6dce591a0d398cef367306 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a
-EBUILD jtidy-1.0-r1.ebuild 1051 BLAKE2B d78ac8d23e34f8e0b3398d18517ad8cca15fb7a503f4ff3ba729d2f376356da9ba1404899d18b5149c4cf66d1c5500f73b8d91984f0b1586c6951f67804e6a5e SHA512 fbf988d06410e3215bede2e621c701170ab0566eefcda2071da8c913c962a22c7479e718e2f297380c108cff1bf486f5f1ef94aa01b13c5214858e8009ce9e4b
-EBUILD jtidy-1.0-r2.ebuild 802 BLAKE2B b68ff5a1b23e1e982a390f4845e879f0e176eaa061d3db1e4766900758be4b32185b9432a57dbc5c0ad68eca8bc6ae07cd21cdf5d356edecfb9609c950c73c92 SHA512 432fdeb4ad79684c1763e83be1360067a1ac0b87dedfc568bf3962b0ef70f75105b036032d946a15ca1780c10f13d38ee2043eab151ac85c27ffdc0fa13bc0be
+EBUILD jtidy-1.0-r2.ebuild 801 BLAKE2B dee738b3ece69e0827f35867e3acef0d57dbfff3f906dba670948ed58c83efd8a0dad39a508ebe9ab4d387370d9641af4f5ef02976939f3b361033d1618dd6bd SHA512 6786c92e5a0582bb62b8523a40a542c4f7b270d2ef11f76ad508ea40ddcc04309d0e2b7ee2030b22537031c304c276bd374c2c10fbacf81b24edb4891e2ba9f6
 MISC metadata.xml 312 BLAKE2B 0cefe0ab92f9a89c5728c2d7ceb5079e2942590955ebed76105c11ca6e25064fa5d74ad968bdb922be16ef01348ad9e015e68d501c7da3ee6a807cf3821e5380 SHA512 2f68badf7c7d98f60ca73b9fe7e5b5b12168aaec72605ca780e2478ba49f73f460dc3f8a7b4c6d28e334aac3e3e99d76573c4fb8eb40d92619ccbea845947bdd
diff --git a/dev-java/jtidy/files/jtidy-1.0-build.xml.patch b/dev-java/jtidy/files/jtidy-1.0-build.xml.patch
deleted file mode 100644
index ba5e04a7f976..000000000000
--- a/dev-java/jtidy/files/jtidy-1.0-build.xml.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/build.xml.orig	2015-12-01 21:10:36.689000000 +0000
-+++ b/build.xml	2015-12-01 21:11:05.642000000 +0000
-@@ -9,11 +9,7 @@
- 	<property name="srczip" value="jtidy-${version}-sources.zip"/>
- 	<property name="allzip" value="jtidy-${version}.zip"/>
- 	
--	<target name="clean">
--		<delete dir="${target}"/>
--	</target>
--	
--	<target name="jar" depends="clean">
-+  <target name="jar">
- 		<mkdir dir="${target}"/>
- 		<mkdir dir="${bin}"/>
- 		<javac srcdir="${src}" destdir="${bin}" source="1.4" target="1.4"/>
-@@ -30,13 +26,13 @@
- 		</jar>
- 	</target>
- 	
--	<target name="javadoc" depends="clean">
-+  <target name="javadoc">
- 		<javadoc sourcepath="${src}" destdir="${target}/${doc}" windowtitle=" JTidy ${version} " doctitle="JTidy ${version} API documentation">
- 			<tag name="todo" scope="all" description="To do:"/>
- 		</javadoc>
- 	</target>
- 	
--	<target name="src" depends="clean">
-+  <target name="src">
- 		<zip destfile="${target}/${srczip}">
- 			<fileset dir=".">
- 				<include name="${src}/**"/>
diff --git a/dev-java/jtidy/jtidy-1.0-r1.ebuild b/dev-java/jtidy/jtidy-1.0-r1.ebuild
deleted file mode 100644
index a8f58c01c6ed..000000000000
--- a/dev-java/jtidy/jtidy-1.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PV="r938"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Java port of HTML Tidy, an HTML syntax checker and pretty printer"
-HOMEPAGE="http://jtidy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/JTidy/${MY_PV}/${PN}-${MY_PV}-sources.zip -> ${P}.zip"
-LICENSE="HTML-Tidy W3C"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-CDEPEND="dev-java/ant-core:0"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-BDEPEND="
-	app-arch/unzip"
-
-JAVA_ANT_ENCODING="UTF-8"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="ant-core"
-EANT_BUILD_TARGET="jar"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}"/"${P}-build.xml.patch"
-)
-
-src_prepare() {
-	default
-}
-
-src_install() {
-	java-pkg_newjar "target/${MY_P}.jar"
-	java-pkg_dolauncher "jtidy" --main org.w3c.tidy.Tidy
-
-	use doc && java-pkg_dojavadoc target/javadoc/
-	use source && java-pkg_dosrc src/main/java
-}
diff --git a/dev-java/jtidy/jtidy-1.0-r2.ebuild b/dev-java/jtidy/jtidy-1.0-r2.ebuild
index 4323e2296f88..dc23cf930da6 100644
--- a/dev-java/jtidy/jtidy-1.0-r2.ebuild
+++ b/dev-java/jtidy/jtidy-1.0-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/JTidy/${MY_PV}/${PN}-${MY_PV}-source
 
 LICENSE="HTML-Tidy W3C"
 SLOT="0"
-KEYWORDS="amd64 ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 BDEPEND="app-arch/unzip"
 CP_DEPEND=">=dev-java/ant-1.10.14-r3:0"
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 7836ff026205..be045bb9302f 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -19,9 +19,10 @@ DIST openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz 115353932 BLAKE2B 0cc4ab07808
 DIST openjdk-bootstrap-17.0.3_p7-riscv.tar.xz 113344052 BLAKE2B 69ae326c600ecf1840a0874b1e26545779434b979e195a3bc7975615f873cd9ffce324f291e56a2800edc304447845baec774b2a08964afde274bd8e0dd3f704 SHA512 4a483faa32b26758f6fae605fdb3d3b77814c627a3a560e91ca88e2d36a88543a53f019a59b5a6456b87ca671e8b7129d5766210bd5cd52125cb3a040ec2a23f
 DIST openjdk-bootstrap-21.0.0_p35-ppc64.tar.xz 125375264 BLAKE2B 28802995f393dc76362dae766f8b598fd56085051418075d4c426293e6431b441ea38a2d2e4676fc89173d10324e3aafac52c97a5d9459bb0199168a07807e16 SHA512 cbd3992450c44764373c25313f6ce32f0c8a47abec557e4a10f7f8517435bf450ba5ac9fa9c8cdfb41f1536b55829d733426dc12dc2b5a2eebf5a94e9094752a
 DIST openjdk-bootstrap-21.0.0_p35-x86.tar.xz 120906212 BLAKE2B c3a56f4e51a8aca1c318b9c32bebdb4c09e42d80416ce1843bc80077f09466b7f54627ab6992f9149fdabdb4d5557c3cad6b5e93b37ba3d89d84f736fc07a57a SHA512 40f0cf60adaebd0c6ae11badb6b71727a5cc64c89077731b0f7cc82f203297b9b780ae43ec74eca9dd5a64de1209f519c2ad0f9083c017cf474d1020206f762c
+DIST openjdk-bootstrap-8.402_p06-ppc64.tar.xz 34476368 BLAKE2B 1f896772f5e40a2793c5d9294e65e429c94204f91e91bfd76ff780e1d6318741c2052c3f20e59abcfb7018924983b5c9f386f14f912660e3e86296185f348482 SHA512 7bace068c5ac7604ad9db3ed655a52a4a90195efbf2fc342389cf7929d82d3f7b861fe700c16f513599bf9c064a87c9aa5966d7bd45aa7ed5e55ec317667be6a
 DIST openjdk-bootstrap-8.402_p06-x86.tar.xz 37076244 BLAKE2B bd50f84e8ac2ee9850c158c7e7d9fae9741112230dcd6e314163911921d63e3222cd3f4ab9d08bbaacbf6d9bfce9a1a9336e21088fba6396613489a701b30797 SHA512 fe5719e0bbf9bcd6eb9790ebd4da34e7f6c99fe4b7d41de2b5d00b20ebe76a77d857c726d1a71b7f40657ca2a9aa08eaa9efc1ab4be60016f66af95530b454b5
 EBUILD openjdk-11.0.22_p7.ebuild 8864 BLAKE2B 36030166187064b860ae74f7a11b6ae147e3c43b4251ff4e4e8cdb0136baa0208f2ba825d12f8e9270b0b33dec7a420f51b9f6929561733b685e47a771554fc1 SHA512 7e44978bb48ce996b8603cb5297587c6c3264431bb540b5d7614f4447084464e9bb28460176dd504805d19271b4f4bab3c105c327c21765ebd1dce6968c00c31
 EBUILD openjdk-17.0.10_p7.ebuild 9283 BLAKE2B fcdb81446a814cf213988b4278d3ca2d8e1f751754bd134e5e06f02a30ed9c1152a6b28f08064320f4134db9a1df819f23530eb75e5c339525d1c27320a58f3b SHA512 3b5293ccb458d564cd6dd54000edb397aba05c633b4d5ef47fe571d70570e7e4a08af67c76c492f314321ff2ca80775b551bfb3e3a52f8b09a8a6fd6a6863402
 EBUILD openjdk-21.0.2_p13.ebuild 9251 BLAKE2B e7fd409656211864689d2040d738a45a132d5e3150fc8fa180d7957255aaac6cff2a44dfb87bbcf0f519791f39f09bb6788bbe730738c70778d5f22c85e9fa00 SHA512 73ff9f0d4034dee508403f2ffc1924294265465629a6c0d9c33c4e5df776a474c6a7fae19eb0b446e7861cb30fc24929970b718b3da69ecb446bac994bb22950
-EBUILD openjdk-8.402_p06-r2.ebuild 7765 BLAKE2B 5bb2c8a2b5dcb5ec3ea1e8f265b7a58fcc6208007fdaa3c28087295bb6de2c5d755b19b52fd0284d1882ddf7fcfd2c9e9fd9e2ee8ed11c28d887129cc12a1ffb SHA512 4d4b83283beca2015421ded2b4320052bed4e52fefb66c5d3a80b2bbff3f5ec669529c2775b3b98e8ee7ca3ed7d43afd5029958907be1f2109f6a29ce28d4a06
+EBUILD openjdk-8.402_p06-r2.ebuild 7849 BLAKE2B b140bbfe653b618663d798666e72ee0f5096f74c708d5fa34f58ccfeccc4a918126a2fb6c46cbe9fa55b1edbafa76d8972a9dfb8fc0a9a90a81dca903eee51e2 SHA512 fb0cdfda5a8b2d5a2c1ced6150df3b86bb34971e1f155682cd0e48f558067f35d32b248c2bcb05a2416b179de522d2fb6a7ce1a9084f76ce167d5ea042443681
 MISC metadata.xml 1549 BLAKE2B 5f7caf2330b7d8eb264df12fe6eebbf1e4acf91b04e37a4c6ea6c45101a39f2e84b4d40152d58c93e63a1d2d6fdb5649b096a314f7269d33ce72da263d392c90 SHA512 8fa15bf9544f2665a47185a3701c3a9ce1654ddedf1aebfb344f77f544a71a3bda33c2d4f3c1d5d65d7ea42b6c1f04a6e1dfaaae723c1a5fcaf63ec48d79f3de
diff --git a/dev-java/openjdk/openjdk-8.402_p06-r2.ebuild b/dev-java/openjdk/openjdk-8.402_p06-r2.ebuild
index 2b9037da0174..84a8a1eeb9d6 100644
--- a/dev-java/openjdk/openjdk-8.402_p06-r2.ebuild
+++ b/dev-java/openjdk/openjdk-8.402_p06-r2.ebuild
@@ -18,6 +18,7 @@ SLOT="${PV%%[.+]*}"
 
 # variable name format: <UPPERCASE_KEYWORD>_XPAK
 X86_XPAK="8.402_p06"
+PPC64_XPAK="8.402_p06"
 
 # Usage: bootstrap_uri <keyword> <version> [extracond]
 # Example: $(bootstrap_uri x86 8.402_p06)
@@ -40,12 +41,13 @@ SRC_URI="
 		-> ${P}.tar.gz
 	!system-bootstrap? (
 		$(bootstrap_uri x86 ${X86_XPAK})
+		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
 	)
 "
 
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap selinux system-bootstrap source"
+IUSE="alsa big-endian debug cups doc examples headless-awt javafx +jbootstrap selinux system-bootstrap source"
 
 COMMON_DEPEND="
 	media-libs/freetype:2=
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 481b6a2bbb12..f43445461cfe 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/boogie/Manifest b/dev-lang/boogie/Manifest
index c0c6fd50172e..4a1a786ebf4a 100644
--- a/dev-lang/boogie/Manifest
+++ b/dev-lang/boogie/Manifest
@@ -193,6 +193,6 @@ DIST system.xml.xpath.4.3.0.nupkg 250182 BLAKE2B 8a4177d47af56bc7a6289ed8f2cac41
 DIST system.xml.xpath.xmldocument.4.0.1.nupkg 86933 BLAKE2B 4c03b5a9433c2c954e75d212f9026885aa7514574b73a54880c3d55baee6bd5517abb46b67b22b9b6e63de92a8bc5ab4ff37e3f7e6454a5c5137ae2be6574b75 SHA512 81041a08d3b9158c43dfb48d42f13ec9950d7c2b7f63e1600a779a77786edfb46c522c32d9cc6a44358fbfe11efba0e539e578ef169261867a1905b8121a045d
 DIST system.xml.xpath.xmldocument.4.3.0.nupkg 138523 BLAKE2B ba53f3b5ac0f2d1d1e9120940b302e6960690ed4a44b96ba15b03e16f9159f2c57d6004aa55b796ba2327009d23fc2f10d4d09e948b88eb6af36efa5f76e401b SHA512 f75b6f7c75874ab6053e8942c1662a6e9a3561aa01502437b8d67f3bfcebd1ebf906792801326889ed7acb094c55469766d7d27cd10bc61b46ddaaa94dfc11e3
 EBUILD boogie-3.1.2.ebuild 9318 BLAKE2B 5b979a6e77f86729ac49a7faa04836e5f2f1cdf1644b3b567c4f9e625abcc0e167aac7e171c0c77194989c8a72b8f3d69b5bf29cf25a5a981d36166bad452bc2 SHA512 18df1494f3651cd39a5edcbefc33257e38086eca3a5d9057f65f36b7c8efccc8467ff0aed7dde553b692418821b094d42e563d9fa522c121d87349fdc17543d3
-EBUILD boogie-3.1.3.ebuild 9371 BLAKE2B e2ad13decab6ffbd414b8776b1471b9a92bb8da659ab6db9aab830da47918ac51cd3109d13902679f4a456d078fdc19215f8dc51a495297baa841141ca448ae4 SHA512 e0d9cf21afcab3b8a59392ba173ef307de9f77b0b4d0bd25483fe5337f5fa7163e71b9260afd193f430ee053c5a624f6dfad00f66e80f6e1c11eb4eb9fc834b2
+EBUILD boogie-3.1.3.ebuild 9370 BLAKE2B e233893308e1b7081b849146906fd03dc2e5ebbbefeaa1e689908c6f6e1332740e8212ed8bcc113349d73471b3dd00de65ea9b43be4dbc882bb94a485eb79770 SHA512 921327b53e5e579b2dd8a71182039de0c454aaf19b24bb56fef7af79f18f54f9eac367546ffe859591c5540fda8ed11763b49d707c412049b991d22455eabcb6
 EBUILD boogie-3.1.4.ebuild 9371 BLAKE2B e2ad13decab6ffbd414b8776b1471b9a92bb8da659ab6db9aab830da47918ac51cd3109d13902679f4a456d078fdc19215f8dc51a495297baa841141ca448ae4 SHA512 e0d9cf21afcab3b8a59392ba173ef307de9f77b0b4d0bd25483fe5337f5fa7163e71b9260afd193f430ee053c5a624f6dfad00f66e80f6e1c11eb4eb9fc834b2
 MISC metadata.xml 1102 BLAKE2B 215544658792715aae72787f7c949ed89df9c05ceab5a919a861c02b7938c0d1ee228e0ede55008287b616faf70992a8c1f2854e6e5e1fc909718ae682996bb8 SHA512 b6a626c485e2a5db3390da62c629507a60417eda8b508d7ed8d1c017ac337743d2c4fe0e8554b103f989176dcd2969cc8579e91532b07a22c1b66328ef241e8d
diff --git a/dev-lang/boogie/boogie-3.1.3.ebuild b/dev-lang/boogie/boogie-3.1.3.ebuild
index d7ab20c085a9..a8464716070a 100644
--- a/dev-lang/boogie/boogie-3.1.3.ebuild
+++ b/dev-lang/boogie/boogie-3.1.3.ebuild
@@ -210,7 +210,7 @@ else
 	SRC_URI="https://github.com/boogie-org/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 SRC_URI+=" ${NUGET_URIS} "
diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest
index 8f454ece5ee1..c8fb1ea13dfa 100644
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@@ -15,6 +15,6 @@ EBUILD elixir-1.14.3-r1.ebuild 1075 BLAKE2B f04a8d220a207098a8f529a26522984c0188
 EBUILD elixir-1.14.5-r1.ebuild 1080 BLAKE2B f2ec7a8c04fc85938f0681e7b6d797f1a6fa35b05b3d950689dcb295248e4ff41062a603a057a9b411eda7af461b8ac4b0dd6405194b3f7e81011c634199b5f9 SHA512 c34c112ba9fcea7b5f24dad4f3575fc58495fca55a5f3a123abb12926cdeee439c1b2f2ac47b2dfdc1f74bb4081704065ae75286912107f1f9d30eac2ebff92b
 EBUILD elixir-1.14.5-r2.ebuild 1124 BLAKE2B 9e2db53b75ba926cd48a945155b0688774f344a68237010eeb712d5884504b7156600e97e6ef68ff930a7068de34bc974374cffc5ed857ca3e1e5acbc31be77a SHA512 c26275434d77a2004ab24b0e989f2cf1ffded9e5718b54eeb57e7314b5109c6b5ee50b10f84013157a71867ecab7e60f6a55dfa65dff8ff51c3c32d94b471412
 EBUILD elixir-1.15.6.ebuild 1024 BLAKE2B 23f476a6d1a6b863b5d051844ff42742140c47d7d219e6f8ed6cc1a797a4bd8748cb6e4249c48466128a71d755397b0ed890fb4fabdb3b4472b8f3fd67757935 SHA512 5bcb5ee8f9e4a83f3eaf0db84dfef44eb45a9117f3dfb07d42128f7f2864cac49343c699ee3ce39d41340ecd4d1b534bf2e41d6233f3b1f4a33427629ae790f6
-EBUILD elixir-1.15.7.ebuild 1020 BLAKE2B 5dd05b764a70dcfee0ac0db880e71a26c1e0a118aa4694c4cd7907c256513de0c697f3ca073368c30619dc19800a169275e2bc8ff3cf2a01ece0e6c5b974852d SHA512 fb987e469b1ac8c189684ef0fe7bd7621748ae03c98a60ebe065381e65a883ca5addd5d94105fc391b151ff13cc7a56691633b288fb97af85ba1d444cf468f20
+EBUILD elixir-1.15.7.ebuild 1019 BLAKE2B 548d634aa96e2870d25acb3cc2104b1c0bb4007e7ca7bb72d1f7e4ef665c114b1f305b61f07ec4e7d7daa8a17cd0a2ccdb4b8473b77e31f4f4247642ac147327 SHA512 64a81fb48913bfef71db087c2afb25de826d31311b5df5efbec2be891bfa1669c44723fd3097d00f46b3adb34f2f830e2bb36177f59cdd6b03eed38d47999de5
 EBUILD elixir-1.16.2.ebuild 1075 BLAKE2B ca9d87e6aae7a136196498371425b218ac92bf6650b8d4ee93818f008e89493efefc72090b45a86e7ffebe651d12fbef54ef8e73b1e995a767498e45fd36bffc SHA512 1494c60ebb5073dac82c4d87dd9715869149f6962c7fd5c14cec9ba75c64f2b6973463bc7e13003d7c067ef3373121704ab37802a7b59b8947cce3ec65b32ca5
 MISC metadata.xml 724 BLAKE2B ae59dba7153a9cdbeb0ed45acf54cf733f07ebc1b43896f88ff09686ecbdd56553e92f7733e5f556d01e622cadb85a24da879799b0f742d7e257425db1f300b4 SHA512 43cc4435aa89e2ba8edaf8f4cead814c514fac07a7c0500f3f7dfe35d2da6f75f835df0d21d862be6dcbffbd9c6e5ea32b21296048ec903c1491ccfd4854316b
diff --git a/dev-lang/elixir/elixir-1.15.7.ebuild b/dev-lang/elixir/elixir-1.15.7.ebuild
index 8aaca50d6655..5e2210fd3a54 100644
--- a/dev-lang/elixir/elixir-1.15.7.ebuild
+++ b/dev-lang/elixir/elixir-1.15.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0 ErlPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ppc ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ~riscv ~sparc x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-lang/gleam/Manifest b/dev-lang/gleam/Manifest
index 65e84c642ab5..449aa65a6b59 100644
--- a/dev-lang/gleam/Manifest
+++ b/dev-lang/gleam/Manifest
@@ -1,304 +1,4 @@
-DIST addr2line-0.21.0.crate 40807 BLAKE2B 9796b9a1177a299797902b7f64247d81d63d3f7e0dcc1256990628e84c5f92e3094ee8d753d9b72187b9aaa73b7ca67c0217899f2226ebd1076f8d25b458475b SHA512 afde7660dda30dee240e79df1fb5b92d4572520bf17a134ef3765e2a077af9e13713952d52e27fae420109b40f6e24dbce1056687dbcbead858ffc21cc7dc69b
-DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
-DIST aho-corasick-1.1.2.crate 183136 BLAKE2B 2d4306d8968061b9f7e50190be6a92b3f668169ba1b9f9691de08a57c96185f7a4288d20c64cb8488a260eb18d3ed4b0e8358b0cca47aa44759b2e448049cbaa SHA512 61ef5092673ab5a60bec4e92df28a91fe6171ba59d5829ffe41fc55aff3bfb755533a4ad53dc7bf827a0b789fcce593b17e69d1fcfb3694f06ed3b1bd535d40c
-DIST askama-0.12.1.crate 16976 BLAKE2B 9257c6d292d6399d81a750ff4b55958a0ffbdbd5f96f3e0f2ac1e777a8bc8e11264a89bdd6edea6a6a3d0b3324138c1524b0f00fc2168afd1abd0f4b777e1473 SHA512 b719134fe73080e8360f35ff4ddeb3039ed1c4d20861cd3cae40e20832fcf8b12eb8b04ad82ea49d5c5f5ae6fbb29180aeae7e41be5f72ab97e9abfd60cceb4b
-DIST askama_derive-0.12.5.crate 31218 BLAKE2B 0646c0df57dd6d3d3f48424db2456df37c11cbf1bb159570f7bb3e878b0abce3ebf9e948554f214dd9f77449ed79ade4ffe88511e66274d3d4beea8a8e1b539a SHA512 37fd963d0aab2f29866931858f3235086170133f86953f70b44003e9505a5c716ffa6ed7429601520716259688cf2e4cb17649e89065d210eff28119416773f9
-DIST askama_escape-0.10.3.crate 8875 BLAKE2B 6bb88f18aa0bd05a36e7bf5cfcaed3138ddb96ed366e7da9b9a64c4e0345fba384cfa3e9bfab3674c1697a7722bd59a9428438b78d44bcac78740d4c53c3d3e8 SHA512 1978add567021fac7f086b6091c97de81919877726455828164642c55607d5b5f6f01c0187f8a8a3371c9b3a1ef41f4c3c9e14d9068826c38ee8a6efe2eeb5a2
-DIST askama_parser-0.2.1.crate 20707 BLAKE2B 14d385d906295c892543bf917a835b9b354666927a63cb66c6082b8bd7330b07b89a1cb60a88ce0b8a8a58cc23023587fdea2117329bf384a22c097c0e45aaa6 SHA512 50c2a8a1f08006b375c450275ca7b455209aabcaf2b5a2ed903d1f8cf26920d95985e1ce2b6d77397b8dc32cdcbea6c442a1b4f590af64f92e4e5b47e3a52f75
-DIST asn1-rs-0.5.2.crate 82934 BLAKE2B 6f976d10bc2ba7f844dce346fc4ff20a8400bb1b8e414574c9c6ed6e8ff58c12beab22684bccafe84d587e260cc4f0c43d502f326520e7bb2db3393e16758b42 SHA512 c967a78a197dceb2cc37313319120b8d406220fcd2c32064f65d9fa602db54a08eb0615c7ff1dc301d81ea3fc0a23847ceb71fa4a1aeb413c55f04ba918499bf
-DIST asn1-rs-derive-0.4.0.crate 5220 BLAKE2B 4b17fd9ea052cf23fa9351672007f5dec6fc2a3544582b2d29e5064c0617d5bf1fc472a98c02af836b7c2559849890506e7a08519ff3290edb833022252d13e2 SHA512 23f2ddb17fddc9c605cb2794cfc0e4c017a1f222871e484d2ae9382203129b460934d9820ccb37a80d86fe859587f6f69b8f0796fc9c5ab5e013a8e64461badf
-DIST asn1-rs-impl-0.1.0.crate 2256 BLAKE2B 61025d2e33da89c874a1e08c1ba2595c1bc72577d8db73883e9a5cf274f9a66c31c2945c23cade8fd111a356cdee2db65138022b2d1a276c8e1334c3b8607ca6 SHA512 392854ea63256910131e0596d30ac9a43ce2013d39aedfbab77ac70935a2e8b5524d763b44dde83cd164cabaa5021bf10e5393f83650617a6c119be51893aba3
-DIST async-trait-0.1.77.crate 29986 BLAKE2B f678cea4defa1cc7c0f1571e71f87392c0fdca8ba175bd94be68b92adaf2b4afe13fac9020bd27bfbb2af9a7d5f2f7047e3bbd0b080a7213354a8175e6ccd455 SHA512 7ddadfe6c434267cbb22de62f09373ea83ec3c4eceb7781e0bc438ce422266f30193730e0215411f1c7c9c6d5cc589ed9bbbd71c836e440bbcddf8afd3d8950f
-DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
-DIST backtrace-0.3.69.crate 77299 BLAKE2B 594358f1d9171fc369f50cacffab03b8a10a8fe3da5b915611cb74b0dbad0e048c7dc79c53569d89827db583e0f61fb7269147b6258781a1599a811e642414a8 SHA512 6e86de53e1c5003ef68b6a85479cde1e70bf416bdc50e6e32ead9f9f070fa30ad46de22574041c844ddfeabd5d15de01ef746f19f8cb7f257c491ef0bf071244
-DIST base16-0.2.1.crate 15377 BLAKE2B 76ffbb67f5fba9ae3876b9317c5a490b98723d87a21b3273a97681a37fdcce71e7b5f382d3ec3747adc31fec46b7b7327dcdf0c7325ba83a99defd669447f91a SHA512 673ca1e01af6d168836e43b6b1542f53f2fa96ac88fad4758ef85dbc72cc629d2968b472ff36ff0cb59cd5d896839da6e08564716faed93878b63c52d2036749
-DIST base64-0.13.1.crate 61002 BLAKE2B 3b3a5b26e2ef18e9b4f1ede72b1bd160a1494751878e8441d463f8a514e6cb9ac859231536989e19fb1261fd864617fe31440df1b5855a0ec625521fc6fcef91 SHA512 1eb76aff9a84057f2ccb7082e9c57b015c2d71a28173089b02e7aacd09a7d311bedf0a943529611ada29f8d7b536d7ae4de256d98eee8450003a3a9a652bda4b
-DIST base64-0.21.7.crate 82576 BLAKE2B 25cc8761c14220981ff4ed332058f6179948080cbfa2b225ec1d1602e4af14cd470c969e8b7049117e6fc51a5a24e06b1d27bab844486ecb76409d12e0581d5d SHA512 c6986d88dd9aa081d914f35b4174be4ba874848657ac4b5e63b9b45af765d973289c548ccb5a01584edfc0d8d79ff5be25b51365295d6e7a311bd7f0ae3c0cb9
-DIST basic-toml-0.1.8.crate 50283 BLAKE2B a7f4ed1e7729efc9fd2f681f7203f84edbd02f10e64fbfcccb5b873477a6b8787a6017f5e1b3999308efd94b0504e632c598c875f0ac8dfd6560724bff4686e7 SHA512 c47bb8105d641a56fd2f8a287e7e6718e2d46f399e92b1e5d14fb328330c64cbbef794ceb621dabe6ca7826812487c1b3b5b75f290a9013f7c8dafcbfef21216
-DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f369902d316a4fd1ae4b8edd94e2d4a8cbff0e96646eb29facb04a84b249d74f0781dc3d29c8797ac975aa9f SHA512 49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3
-DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
-DIST bitflags-2.4.2.crate 42602 BLAKE2B 768d4ca52aca73d8acf2f494a66957ed2603eefd5a04332ed0880d230c2cc6ef3bfdc0792fa6f288a0eb132913dbb256793e580bc34f4a40e8200e1fbafe97a9 SHA512 ef4c20e6e78a2ecee97e17189b7100a504d8176c7c15d7f17d62157a116d66f83f8b2bba472a4acf02cd3edbd94b20a7047af918c3f3b371e2e04f7474be0214
-DIST bitmaps-2.1.0.crate 16717 BLAKE2B 817045077c198a84d114f68474b14515309bf56abde29398fcb47d7593d41c3fac069825d8a2aa1a598dea5b4865b94a21e83d03dc8d069672e1b835bc1ad551 SHA512 a423ea009bf61629e6dd7cb954f2781dd3c578d2216cd843957e0db05abc8f8c5971d2cca1915929b2b3c7b712450c817bb1de8d08715a1ca2641ace015a1dc7
-DIST block-buffer-0.9.0.crate 7108 BLAKE2B 42e99ec46c6e43d5f85e8d6d0a8fcef7175c97828758c93e55505c0e18e2646ae77bf264076041bf682532e28268a4978dd9c822c0475347ee3d29c5df2601fb SHA512 2d0f8908f59d4b1cccd1fbca0c1fa3cc4b224f09549669b28a16af5acfd4369b66851e9be8d65e1df71be998fbc42fc130ad32b71e035d6055724e8fa31fbf98
-DIST bstr-1.9.0.crate 380170 BLAKE2B 06ae5065a5d566b6333e911a5b97e3999ad2f0bc19b27023187004c81cd01e5315dcac920ff87a6bb87ccfbb949364f1361dc04d342e24f9f54490b5d44a81d1 SHA512 dc313a16c38ad881128977a20bb390e7c95a96d9530596433a7c4fd7f77d5fffd079d436006dd8d2bfc4aacdd7f0aff229504444250418f6aa3f8d6d4df9abba
-DIST bumpalo-3.15.2.crate 84027 BLAKE2B ef3b9adc5fcf41a6fe33c62c928dc2c751bc9baefc51221b88e20042f581d7f2d03ce562f1d31fba98f7d780706e34ede8679e64c42844391270a087ed374718 SHA512 2acd3ace5faf6215c4d75d99e0ba6bb95b036e6fd186e15fbe5ad9c02a96baedc1b6a1edb06a0a2f308ef1e4fc49fc1b719e4c78a6bbbc50437fc0f8b473b062
-DIST bytes-1.5.0.crate 58909 BLAKE2B 2931f19e813eff73be407677622fa29e45f9b49434d5b3a04104b56563fc0e941fd8c5f996258a1aa660000ef014668d70b683b751af8e48d28d0aea76890c92 SHA512 6654cf41d8f0d7e19b05fd95044b9a3bfccd81f469c797c6aa763a4dd29e1b34064bed2e094548d147045cca7bc4706059de5bcf9f6579189e6068fbbf1c29a3
-DIST camino-1.1.6.crate 30519 BLAKE2B 3696bee362c9a6c7331079f86823aede0df06c1c36fdc2d11c0628267ca7635fd78430cc927cf3b2af34591537d3968b3c5f1cf9d500f3e889c202c944fc6138 SHA512 e777cc6e2a01c95931a81521eb278156d1c50ffd0126f914b21e35dbb7644b835f3c26bbe7a487bbca508d26b4c933bbbb9e051fa42825b154c2fa03c04375b0
-DIST capnp-0.14.11.crate 70440 BLAKE2B 6b8be88a8264cfaaf2fe321f93431636b38145036d66a45ff0f0bdd4133cb46960d5765060a6bd675b7611767a7906f6ff32854abf4b5648f5b753f360d361f5 SHA512 4d05cbb7c613a1b783bdf61fe470902a7111ec4531d76c4e66aa3b4e15edf35f76d201d67eb1d7bb95a5f5c227944a2785ab6f0f87947810784021db29104141
-DIST capnpc-0.14.9.crate 47584 BLAKE2B b4d314fa0a0696e5978c395e3bf1a96f498350efad61fa7fe665adc229718b563c80d1f3151752275901583aa721c8edfc3cf11c1bead1f18166bebbec0b0506 SHA512 2fe73522e740b6be01827193c1c485c01324549a8aab53838dce5b42f12f0acd46d3c83635f00031d3819426dbc55d65846bbd64f83f39013fcc0c8f09450208
-DIST cc-1.0.86.crate 72973 BLAKE2B 9f9f2e974b38d2fa6d4c789342aeea952c41bc475cfb0f6fbb24b63fc1e5766c228d371e975099c1ebff0d7779196f70a95249e94dbe965bfd55931c704135b5 SHA512 00fcbbfd92dcfaf6e2d2792bb5559fd3f9afeeb7083f08a128f468ecb05e961cd53563277f94c97a1bdff700844f2ddcb4db3670cc219bf409ce7489ad284ea1
-DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST clap-3.2.25.crate 219403 BLAKE2B 75a8ee36c52e64cf0ac7ed5604d8a575c41c756a588bd418e6c1edccfb358350cdd831b4176f01b987fe7fa5901ca2bccee6b0f68ccba7dbe40baf85a5f3bdb4 SHA512 557c8932175d7ecd077b32b68904924e52dd46d04fd04ba36b3a9dfd7ab1dbe8c2128fecfd75d0388b21fca4aee55a941794181cc2910a4d4eb3c54e9c7e73ea
-DIST clap_derive-3.2.25.crate 28212 BLAKE2B 8782f6425ed46197c5e5293e2f06fd82b2d17ea3e89206580ef3c6853bed2e8c99ef2528a30276a8287215d7f5505a992dd43c59f26b2915757c8e2f20510843 SHA512 c98098bfedb8b681d72eaedb946d9867fd068d9be31137fe1fb5d821cd68afec48e7d2963adb2099aa760c702d5b75fb0ed45fc62b83d7f26edc8cecc03ea5d3
-DIST clap_lex-0.2.4.crate 9652 BLAKE2B 5120b508dedf52507068c0c369a45ddfbe0369e5c05b65bc5a78c422b2a4bf488f9ef1e0bed4e335450f2c08b80148eb5f7efed678039b5a94b5bd666385939f SHA512 6c05e5fd850befd45be9005af7252385f2304aa28a107413bbe329d97aea835f7acfd0bd169c99f69f466ab93d6e1c35d73a4e48343457a06fe2d6be5bedde0f
-DIST codespan-reporting-0.11.1.crate 48963 BLAKE2B 39deb717a853ffbe3585e20a67fd7a75b62e2d796a66b5004876501fd7476acde9f126804f2ef6220ebab66821a3ccf058d544d689a2705eae44285f34b510cb SHA512 0869789f5c50d3523d3ee16a8fe64756498a13704efbe82bb0845eaa87c7b6b1d075b3b6b80567cd9fce6cb09c5179e9c07e485fd17ce56c8139ade0f8bc6844
-DIST combine-4.6.6.crate 132428 BLAKE2B fb52e724a52f1a551255591fedc134178080ea5efc0c488efbc369e6272f7f2b87dd7d0ce63361754d8ff0cf1b0a59bbc7b0396c50c53210f3e2c28ac965e0e6 SHA512 ff9ef9329de2cfc103271a25ad1fcb7e478f3328843bd8a65653e80b74112728ad4a33326a58ed7ef8cf39eec7c3b797fc287295ba149ee0dccb1de9721b5819
-DIST console-0.15.8.crate 36364 BLAKE2B 467de2c2fbfe31688cea20b338558ae9671e50ba1fd07983d21f32d7eacb73e565ebdd6ec5e78b2ae04446f09615c70983c0ee534e25ca5a28fd1b408acfdf34 SHA512 b05e49ed145785e29631d481885788f0cc5574d4d7c4d90280dfedaee7f8c1515072c9c4cfe6bd2e017230cd228157222af7e7d41a9fce697cd1888095df4de9
-DIST console_error_panic_hook-0.1.7.crate 507196 BLAKE2B 90f2855b54c78258f9e4983849a0c0b41f842990d622bef0ea16ae5e3a93914919022d21b1437bb2ce644333d4e0c6e7b55d960452c4fa437e23bcd0da83a4dd SHA512 49f4fb2175c0068981678f291422ace3737dab7033b1a49d78fd821512c92fdd023c3fe28c7daed88c8f338c30a9c7f82f18bb4583c3fe7839ad8dcd0addd6b9
-DIST core-foundation-0.9.4.crate 27743 BLAKE2B 5b695e671cc833170bc6bad436b2d0d8d386ffb8181bfcf2e92a1d93cee67c3ba1768cf57064fb91b0897c6aec1be7db40b5bd256a052c1bdaf872ec19f6e15e SHA512 82d0878a1b9e3d56b3666fb5a78f92c6f7806d01665c242c06a640bd6b1fd36260211e92dc05e1a16d1430622bfdd650aabb0b5bd8e5592f74abdcf412448e33
-DIST core-foundation-sys-0.8.6.crate 37629 BLAKE2B 683d5a84b6a3816317f87359532a8339f08bb4043f1d70a8588636eb5dbe6ebb3843e2a12d9a7e5fd1637a912c52a5aefbb8d44796330b09593e7adefd3babd8 SHA512 24a8958cb16b081862a9000affb0147b8b3be1a664b834c3dbddbff03e709de3f4060ff4800e5a35453f4392ccf33168e8b864be71b17be38cb264a39b915100
-DIST cpufeatures-0.2.12.crate 12837 BLAKE2B 5b518c58c548d9116f94cefc2214fe2faf87c3aaf3fffbb0bf4085f75372cf7fc5144bc3f827101a3a14a51363d06d8075db94ff5ed853ab2ccffaf597728093 SHA512 52742595702fc3371d4126fb355f3d7a6da514a94e43170f1db041cc6c560027f92115eab7846131dba1018ca5c72003ae36f945c1de88d57a0e7f66331623c6
-DIST crc32fast-1.4.0.crate 38665 BLAKE2B 77398dedfa5e61357fb9abe3415ee53e45d3f1f7aaee959cbc9774f31a10ed324da2a558d20fd7c0674d450c8985b1e9c78b0b65e6ae2d9da6c873fe631c5ce7 SHA512 3e0bf1d2411ad9c651e0242c574cfda09403db24ab4b55560145ee73b31b08be45e5e12ce2db991d165ff056c7f2f67203fb2c048651f1c66ce90ec3276c455e
-DIST crossbeam-channel-0.5.11.crate 90434 BLAKE2B 8666f039a0e4ac6f0f8be2d08ce3349d8ad4aa7d0f38c638dfa6dc6a7f30a1629e42f87757d9e054e836941dff6a8efa53b5337706bc5958d33dee61f38e7bcd SHA512 1d37bae1c946d402c1fce37f22a82037d68896770757aa91d209387f947d39c514df52e0ce94317141513784511ac626482f16099cc3b62ca28a52f387b69c71
-DIST crossbeam-deque-0.8.5.crate 21726 BLAKE2B d97b35e8e8858deaa7fa9a836e836d02914aad29e5c34ab121f52ed65e95213cb2574df82273277365889ea771f04eb40bb2439347c259979f1dd6d5e9853bcf SHA512 0f0c9745763ab156136227cf1415de514952a3f8282ffe413cc249f9f4b345b029940e6a6c87b3be8331a7c783655a35b89c7a2547360ea5ae10aa64ba7ae864
-DIST crossbeam-epoch-0.9.18.crate 46875 BLAKE2B 200c256cad6011a3a14c4664bea6b150fce72d561c4fffc387fa561b08c0480e8756bf51c14874c5fb19f427424547f72d2cd7dd6f56fb8b6666a85f8d52bfd1 SHA512 0a8a199b9d77f4e28e91fe0a0cbff7e0dec58cac283631fd972477fa912d2f6ddfddaed2c695e4978b01cb5440b702822af6333e7c3dfbcb9a2c2086999516b2
-DIST crossbeam-utils-0.8.19.crate 42328 BLAKE2B b2846f569555818fe7a3ef4aa29f68c638f933ee0251713c2c92624bee5f8013def5527027022963f572815991abb98d5e68d0fa00f478b2762133f84ffc84c0 SHA512 6e742fbb0d2a6371db87e81f8ac583259530a288237d0e8347394581c60004703a822318ec945936c410bb44001b115d8d986bb264e5b2d8091bb63a8edd93a9
-DIST ctrlc-3.4.2.crate 14171 BLAKE2B 65bcbaff2a58a78370888e988e52bdf7b8c1dec5963854374a87fa31b4db633f41b7a7e9965027411c14b089680eaaf32db1ab26ceeebaecbe09c0c3b5e1fce9 SHA512 99fc52445a51438bbbefefedf6409efc6b9c8db8f8932bde8eebeda3bfa952d116923b6ea9762e3bd28521ddee17ca1c8fb9b24cf8fe287063ec2ffc696ec408
-DIST data-encoding-2.5.0.crate 20632 BLAKE2B 16ea08dd12f09f2e6f8ba2910b3db07d4e7c9916e6a70d41420ef1a0e5393284b49787c47af0868bceb7f5d3f1fadf203f5a547dc8cb97713d5225dc9181fdef SHA512 b1de8bcfd7cfbfb988091fdb550eb98dfa5739ff58c4b789663e5db0d539c9acf145ccd72d87f7e1cdefd09d5771772d131d2b2e2589ac8f0bc6972c801ee0ae
-DIST debug-ignore-1.0.5.crate 12016 BLAKE2B 708351be41f2d1017bd84ef9e5203cdbe036073d90a66c0307bf0ab28d42707ddeae2a1142f8442a1fd97f6b1826703ea197700d9f154a87d8badeff33d5a3db SHA512 4102696d1a380692e4a0cff5ebba410a8c70306c9ceaba69d90f441ddecec86a0450f46b6d21866daa962eb1a6deb6b46137b4ad5fc8e3c77474c6161f301be7
-DIST der-parser-8.2.0.crate 63495 BLAKE2B 0185de4b21962082eae2fa4d304ee33974226196d0f15c0a9b51183f382282deeeb0eb1e77ea623c7d6f8d24b9bda93f13fcd592bc79d4527a643d20c56e3ee4 SHA512 d4ba78cd60fb7fd1323c812f8c3a16fefebbcaad7228e56c04551bd49c2f7381e3bb51147c08193668f2e8737229340d4e184a46d93986a1c355280a47c555dc
-DIST deranged-0.3.11.crate 18043 BLAKE2B 738d5a88732e227bb0e0d33c04ab8248a699c7c499100666ffcd78673d1f38ad2d740222ab405e3eaa7a0a6f4596cfef90bd581a1baf77c954dca830c22e74f9 SHA512 48485666d3e50eb7976e91bed36bddbaea80fac4ac664723130069bd7d17893b6d1a2b82a4c3dd61677162e4305ba5ea8aec7bc2793d1b8b92dd1666c204fc43
-DIST diff-0.1.13.crate 46216 BLAKE2B 27ceeafb7afd45eabbbe22d1f05667f513a6062762e6b77122e267282a8f2a0bf96384989508bf10c9e13af4856bc9f58f09b10055d6fc2c32681e288ffa9f9e SHA512 45e259c9fe7c23bd9e9454891b42d4aef6d681d35ee039d21fdb05ae9ed5856161a40f29889e7880ac2a2daf85f1b7d752d213b4a99a1a74ed2682c18a3ae7fb
-DIST digest-0.9.0.crate 13247 BLAKE2B c5f2fa8a5bc12021d99ea63f08fa8c8b5b3353d90cf9d58ba84252b3f81b88b52f28c15c24c61fcee44f7d547a0bad11def7fa8f4616d070db163e48f89ab64b SHA512 8637a322c429f51ecb0fa4c3b58fabef01368c1a093492fad65f48eeeec2366fd1b7876e6e47723e089ec5ce11f881bfe4dcebdc605811252b797db027746a45
-DIST dirs-next-2.0.0.crate 11689 BLAKE2B f5022bc51dd50bad4ad0fd05b159a4117aca47afbea66dc42c8306ca58f3a550165afbcf9f5f721ef5ad8d357eaff305c6f6e42789354a910d5f1d05d3b7b7c6 SHA512 6ccb732da8ccf7bf35952c22a3b0caa8238319feb0a6cd3b0957e6be12548a2ce507c69cb6d3cbd2adfb37e13e6521c6229da5999edb0e47a292a41c3ea1a766
-DIST dirs-sys-next-0.1.2.crate 10681 BLAKE2B 71431533dbfd6016cc309c14a842ac8d43577abe768e69bd2caaf7d19d743f3ca95b9b0be1747077282089c64485f3d4e24bec8e56d4d883f25e494d328fbf3a SHA512 b3c40a8e93d4f9f4a890718076e14779aedd67a79da61b466788268c1eaea19aa493f043a7e410f5023a23d5509e639a6fc6681fbee30e252a601091cfffa2d5
-DIST displaydoc-0.2.4.crate 23200 BLAKE2B 91b0ae7018109d407095060b6bbd6aed1cc21120bc30348e8b16b5121f7c35ab72b65e80bf97dbea6cb4ee6b4d5215e8e5c4374f92a569697bc9c862348620cd SHA512 a1de2c200584bfac640f8b84b5103d8687919cd29f59a14898e98d480f476a8e4dc06e3b929af479d536cd02186e2a9be72e6414338bc117b97bc0d160029592
-DIST ecow-0.2.0.crate 25499 BLAKE2B ba4852b00ba3bfc477874b4e964268ef127a4baf1cabf4901a8ead5423f1191deb0ef7a40ccd30b23bbb1195103c19755fc61f670f101d49629ca1091eac68c2 SHA512 1ff62b61a3ecc15bbf3ae6386f1638a6e7a87c74b3c14eed208549c6ee0d46f50b84c04ebc7608fadba218389973178bf84f9008115ac4dedc7294c0a80d7c9b
-DIST either-1.10.0.crate 18334 BLAKE2B ac5d81e0822132846e29f8959671b14ac6047330d54020ea7d4ad790ef985ecb4ddcb96ec7e327b1a66b9c89d37b112dae33c9ac35232c136f60ad9baab7d5a2 SHA512 2de38a37b7f3e61effa89648acadbf220eacfda1ca7c82fb77484e45577769b724f7dbaa297e73e3d355d6b1bd5109373c3e96e4c1a13a918176162b33ea2432
-DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
-DIST encoding_rs-0.8.33.crate 1370071 BLAKE2B 0e81419086ca6e18f2aba5194b87eaba49ddf20493fd6ee09d479db86306e39dff9b23f399594afc42f1fdb33855e070beaa1871794dc0b0371c35d296a6369a SHA512 20d28a4c0ff0710f911f510be56c2bc5e7514b76d370493d2b89b7f25d1c0cd46ffa64862e54fc472f07f928a2cc24cf9d790a37751cafafc81f263705aac4bc
-DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
-DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d
-DIST fastrand-2.0.1.crate 14664 BLAKE2B 7a5812153500170dcc53ca8d66384fef46eeb5a8f970be43863f22f82bf427672d07cb053f4e04b0fea358ca89178399871235680f57223b8561c07b8d21cf13 SHA512 79a1e1b3f39264f037def236afbd87b732f5e0a2154b1d9e721b3c7990c52be45138320e2571fe628f482e0da7e3cf867abb745e3c277b19015fc031fd4410d9
-DIST filetime-0.2.23.crate 14942 BLAKE2B e4d2d9c11745dfa5592903f3c3c6a9871292a02f9862607b610ead7562b5d1fc3b64d37e779cad0630bde8012efda72d86af5e687cd2ef5d3627d8a89bca517c SHA512 8d5ac82482758577d1d0669abbe7b880efc44958687bba745c9ee4a5c16bddb44ec0fbe9c29cf424e7120905f3c3da607f3a7ca1e50287154c0475ddf2148bf3
-DIST fixedbitset-0.4.2.crate 15954 BLAKE2B 91270883db5ad0e999ebbca1123d8729d3040eb936034ab8da3cda72a830e45fcb977b3fe3c2b94e870c1fbc366ee8602357bb77e8b9a40cc41a04afad1b266b SHA512 57c5d756b0a202b2506270f0d5e890f7617a1e0c015b6059ea23fab49cf7af47fd06927eb56feb03b37cb2b6c467e326b3f0da1e32cfcb6339cf11a130a3ccab
-DIST flate2-1.0.28.crate 73690 BLAKE2B c9f141bde0eda6b9c42da0a3ed69322c12c6c29bc522131f51ad56f6e2758646aa5585382407409257a8301f5f07a1825d150838bbb55822f2d49037f6279aa8 SHA512 9db6f3ddc4e1e91960b07c08712beabd911b297d93db8be3ecb97a392a4262e608c75ed8e9e34d87d58c3e67d1b7987734e14ab3d45fd837a2767e8016380284
-DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
-DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1
-DIST fs_extra-1.3.0.crate 31298 BLAKE2B 96dfb4e886767d3d3850d94cc789867c3ed461feb9da0ba90c600b2b41c3119067953ba795cea5e6c8c338adb6fe6426769a6e6894ea3e02eb1ab11794eb8d5f SHA512 090d2ace0517b86dd2f54c5491366cbb6e1677f64cf64f024f7dc6a3c42c4f8c54b215e954572e2df10ae7f0e956890ecf7ccbeebf66b645c7647409484c845d
-DIST fslock-0.2.1.crate 13463 BLAKE2B dca565da8e760d016a659b7b81289034b8c48c416b326e403086a96aa4f50d6b30abe96f3026bc87e9deecbb49d7ee2b8352641f26d99dd9e9b85dfa7640d6ed SHA512 89f69658457994697f090c5ea090fed0699d032e2fa66fdafaab12d545ad6d21a324912e7132dab02e2bb1a09fc7b72d6562004c0321988a0b34332542f061f4
-DIST futures-0.3.30.crate 53828 BLAKE2B 4e595639500f7147ceb994359ef1656ed096ea679409a5721c05ff84ba439fe4e82563a7cf8dca9aed4cd16b03e89ba1385b0a34feed9d4923871225e131b91e SHA512 98fc67bf1047609c8bb0763c00ab9cb39b6a6d0cb7d993bce4966ddc2492a6578b789e98095981b207ddd73ac4b1dfcd5224b352a0e970eed347537c6fbea43e
-DIST futures-channel-0.3.30.crate 31736 BLAKE2B 57461dbb723fd53daa07b2fe6164125508cc3901e0138d2a60da5c814ade415a3611baa45c71487f1853812282ef358c132785ff40c630408e8544d57eee3483 SHA512 689531748821529c528772a6dd0f27362078ff5803d2e0b431ee5a0ecf8787b5a15262d65d52f48486ded46b88f7a9c477ad95cc2c5a3e8f5f9b9f53f367832c
-DIST futures-core-0.3.30.crate 14071 BLAKE2B 76a9fa5aedd0d4ae8dd9db9639839b6b342125759c1b9f9bbf58aacb4ecca316ff1f24ff8f3c15f559ffbf974e4c2cd02a5418cb4c4d7612dac8449c8234eeb8 SHA512 3c7259ddacbe02e47a84178b75e5f13523bd0c8f8bc0b2375f7ecca60b7075695ee0a5cc4e1c1de26665cf250271173be803661e2f2f53e2a3b96380a8efe7c4
-DIST futures-executor-0.3.30.crate 17744 BLAKE2B 927abec40eab31251409149179baa95a8d025f9cdb848afa83f95439c4768abbf6da8e2163291a086ea0b83b0b650d1e19cb8e15f70369b70efdc70eb3121f6b SHA512 fa65c038e5eeee695b2673cd65cf7529713bef47da373290595b554bc287267ee5cd015ddeda5a22169cc8828717987364584a91a69685cdbfc0fc779abd764f
-DIST futures-io-0.3.30.crate 8910 BLAKE2B c9af4290f45a9fd0839e107fbdfa4abff4f9077ff45b61054670419076f1c4508d7d560d4d86f8cd7ce146e436e531b9f5e0abfed2c4f2406c57be209cfdd498 SHA512 077acf5eab1101917b5b4b4b83347d30d533110d9a34c2de6db1411ffae0f0530f457033c5a5c14249119e89375c9f12127790b46e486dcd003a12a6fad48bc2
-DIST futures-macro-0.3.30.crate 11278 BLAKE2B 6311039db4bd31242e4f45bb7c581bec28eec9da850c47ffd9235c4baef5e5f1c72155f49573b2dc942a9cf246949b79c7d35200d04f91a13b0205cbd33d96c0 SHA512 220b5cc61c744617479d7e8ef9888785a17b9bc26c517c9c4445a39e8be21f111f77e53bfb3d143df18dfde23feccee17e349a84b897eb4d86f94d7ae4f714cc
-DIST futures-sink-0.3.30.crate 7852 BLAKE2B dc768e4ec4c9f9dfb22a20c1c977401d859072b9222e6f77978332f495cbd0f764b175a679c9d7c77028d7b56cda5e2d86188ee979c7f323187defa6a0485ce3 SHA512 1c198da8f4118d9a9ab2b597e3f7b4e1ac7094dfa547bb81f3c4148c45216ef55b309255849174a517ebddba6c874283425f1df6e56e2ba5150af091bacf46a3
-DIST futures-task-0.3.30.crate 11126 BLAKE2B c2ded9b9b709fc10c44cfeaa72d4e7477e43331b14f3e72433b25126fef93f2812a09b4fdc3c246b7379d41d3764ba17fa87c3e9c131095864cbb5f54771a204 SHA512 c190fa0acf7ff15fa67fe172911cfae803b2a8c08168570a5518a40767d08134f147259a413ab25c45cac5dbf2f601a9753c77ab0eb2c180cad2fe48cfe3867d
-DIST futures-util-0.3.30.crate 159977 BLAKE2B 9012edf76336952dab02cb61db48dfc74b6cfc17c137c36372709e8d575b306a4d7c4da89328067c9482a645aceb7b44ef57deb21a0c25964a5515e738a039d0 SHA512 7faae5aa35641d858d0f5430e4a69acd4ba9037852ad73c5a890bffeed411d28820883e18bad4ca8f7b0a765f9f4c5dbeaf5d0cfaaf90c2c69846434ae091951
-DIST generic-array-0.14.7.crate 15950 BLAKE2B e74c785e3127095625951da192a018281ea9976aaeb11019f9088c3f27748c5fed1ef25d577150864486dc48b5138d6892e42f99979339f711a66fc70756c82b SHA512 363a7b04e4102f9ca63d429721c1ada6272be6bf0a2e97da681faf76381f73f0e3acb86623b9ce2dae441de9fda704088391779b9769ec02b3c8c9f9f35f897d
-DIST getrandom-0.2.12.crate 36163 BLAKE2B 0afef8504932ea0ea051cde1d14bd5b79edde68d6ebae6fe88fa4aaa532605a16f466d0d9c0d0aa619eaa105600b6d5ee4e191865a3fa041549a78f78ca82396 SHA512 dd97d7dae1a7ba653abdaf2db719e1a9c8eb721b08b4af0f1c45b1ed5079069d1b57e4f6d9d879e7fae3a890763f4b6aea9bc2d945392b98e811e7b348589bee
-DIST gimli-0.28.1.crate 270497 BLAKE2B 4089e0f871295d464e548610ab5f0c2fd863825416109cf58ca827e482897f00eab23b795295758f1e3af16167b52c77c91df6f707f1f445984a6c4bcd68c6ef SHA512 695e46471fc07813dc4a47744458729b097f6efbfceeb57eb3db4165654e99bebb98dde2d73230b90bb5dd7c0ca0c6e77c7c3dc6f2abf70058b830a2fb386d25
-DIST gleam-1.0.0.tar.gz 818255 BLAKE2B ae0fb310f8eaf4e6bdf826057acb8f8bfd64a47ee3c8299101485cc1302a23af963c29e7474e8fff3ec27a432c398fbb0278f753c66c4fd989bee4866004e343 SHA512 97a3e1c1953ad865c9a8612c580b1a57704448febdf9e1d3cab3042ab3d8fb0ba2f0c716ef59478025829560f4c4b0191c9c21275e985e71df1bb3987795fbeb
-DIST globset-0.4.14.crate 25090 BLAKE2B 2c3e6f8384a066ebfa1f36bf03125b5eae79329255674e32c58963451d4b342ada10f17524232a953bee133b3c77b678a141543759ebc622b5fd659fe55622ae SHA512 e83e4f5e42a97609e2579b09f49c2cb0a76a94e7e2975c5871f2c5af5d3b809736e0a7b220404c582f4a0c7eebdbfad6cb432e89b26401b58f2b253f8c0151bc
-DIST h2-0.3.24.crate 167814 BLAKE2B df25fee9f6e39f8ddcb9c1be4775d055328606b3454786a397c50564e3e8340d72d0fd58581239063e29fb80acf92444e1d588b0672817b12cc5c1322652189d SHA512 4741e2732f08c6388c112877f52d6f859088026f75bf928f90b06a521d43e8e8c10f14d088f8a17b42a0a613ee43009882077a68df9300d17365d936400f1695
-DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
-DIST hashbrown-0.14.3.crate 141425 BLAKE2B 23c63a99c6c6b7a6b9b9e8bbbc7f1e342e1eb9d7582fc9eb408d3eec50c99f34502d450170bcfef4da7f2b1e743e1d1619875ec879e4753dffcb84f3c10dc3b2 SHA512 4d344e5c89ce58e04668b80ef10e4e110a3a5daf4d610c52d980577795d0e2050c7d0b151d8ba97128117665e27b92ab0300f85b88bd6e1de943c62d49249356
-DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
-DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
-DIST hermit-abi-0.3.6.crate 14884 BLAKE2B e46434195f0cd710ad215bb740ae5a012a1cd9d9286f43b5922a90ded832d02f82812790a1682ca5211fd22998a86cf9a03d267d71c69fd302a0e3f0c9c55816 SHA512 ab920f843f7061949322597ccc3b6c64f2cd9be106deb71bade5848c379e0964892fe154ab89eda93d767298ad44db7c66604e6e0c065a8921089d873940e66d
-DIST hexpm-2.1.1.crate 417719 BLAKE2B 1dd5c5e27052bcfcb3dc432bc65039d2fd6b7ae2ab84313fa7123b9718f6d4deda0c3fa948fb951c53d902e4d8494b1300b5260c64fc898618628841a47d4dcd SHA512 169e32f5b5361cbe2f8b12283cb0dbda9553d630108117f2a12c67d891600f0665d5c0c44e064a3d44bd50052208cbfbbfe905b3aec206f0b6775a85847c4c31
-DIST hostname-0.3.1.crate 9272 BLAKE2B cafcae4bbfadd51d058e3daba3e63d897bc3418723d8e843fd941d9663dbc89dba131c77d14ce7a5da552650ea3c40c4e418c88d465f1bab2fa20c178596852d SHA512 a90407996353c9bcf5b76be03713e3a0455ac80a50892e77a508744cf436a938ddb87ef97d8cc91ec7dc4353cfb7bca0fd28c90a72f8a9ecd4f29220d174edf2
-DIST http-0.2.11.crate 100478 BLAKE2B 1ef12d67fc52392322c24f79ca49c52fcd7dcad0145b761c8aea21fef38682919d664161f242c606a1f3737987368c08432f33e2abfa53d681c6c2aa5cb000cb SHA512 71d98f5fa55c7bdb9fb31e36f898e8b2b7596dcb30ef9b5df3e34581b7306b66a782e82c2797732e28626eec5c9e432cc0475703e5a0e0e47aa1d6f22235ef51
-DIST http-auth-basic-0.3.3.crate 26096 BLAKE2B 14b5ed2255ba7af3b2b8f251ca533035f19ce8cb236facca89fe11a48a018da258172db767948be776611a100f95b6290291f69e1961ba17cdb2e4b37dcef81c SHA512 a08db96170cc8683e8bb72a80b0872e5b8017599b5215b5c1c32b957de1d58fe838e445fdd9fdee0c70159ef0b3f8a7820294d2b6ea89298481d1cc2a768eb26
-DIST http-body-0.4.6.crate 10773 BLAKE2B 828a43f8ec79a7187cd6f5379edd50127cefa8e80e9bc1205e80c567f506f4778387dcb1d2808e68f1b88bfc7e2d6405ddf9ede9403d35584e31bc62db0b7756 SHA512 fd74fcbd25044aefa183e3caad6cde0967cbb00b6d80addec2589d037b752cdafcdfd02d29d38a12b5c7d87cf1cb5e5ed80488057735b9dd73e03904006a5462
-DIST httparse-1.8.0.crate 29954 BLAKE2B 82c48fdd6d28e94c42df180415ea3e30d471ace2fee09d7d8d33aff0a8e9a15d3029c90f3bb036b4f587c8902094a2ec21e4ca6ca7b654a82562bd84fe208ef9 SHA512 849159d9876e0474c71f3c7aa3a7271699b807b293832d88d52e4326ed410b25f9d7b9ad75a143a51fb5c8ea5016c2513348edbc050d3b62dc9a6737ae98ee8f
-DIST httpdate-1.0.3.crate 10639 BLAKE2B ce0b401c69f76252639c10f6c2e4a823574a58565d7c5cc3633c72837aa4ec3630b34b148de4378ec498db196e3b2e1413ca0e5a4d9247855380fe19a8c20f94 SHA512 0586888fe89f40b838d5ceb083084d0b8058feff1d2933faedb96896dc86eec68b541a0374a508fd11b86eeadab3c62f88568ffe2c53206fad438373a50b2e5a
-DIST humansize-2.1.3.crate 11953 BLAKE2B f5ed4a378fd6692a6241c84657f9ce5422ba7331be6fe79b3d94ec87827ecb8459a1b214f7ff6db00696fbb17bf921c718860de4139b969a0f386d7423c1a4b5 SHA512 0adb6825650fa074a0ff33a4090563987ef311de5ab23e12f715286d8198310d17cca9028f41b8ef0e17d15b939e50d165419853ffde6a7ccf977d33acd920fe
-DIST hyper-0.14.28.crate 197204 BLAKE2B b99c91eaf65947642e217d159372750ce57e332675705cabfdcafdcc9ed3cd90130a9c600118c76e167b927a481b2120d0f4b499772e4fa710803abbec5385cf SHA512 deb26e3815e6315dd193c4db22efe1e73e44bc7c1d400bc7654e950bd074a200b7cbb730ca30faac0940c88529fea60d5737a4fc7ccd4fa24c2ecdb2a0b450a7
-DIST hyper-rustls-0.24.2.crate 30195 BLAKE2B 79d5c6512877c98f3040a6ed26027e5345d42cd55ee9e9bb6e020cb7bdd4345556d910c338ec759a6a9a2907e645aa841d5666879ba8254ac6506a980811a7d9 SHA512 f30e83408376b985ee9df26728f8183a7048d4586c5fa3d797cc837931e13300018929583a087767bd19d4bd60d85ea1c2696601c236fb65be9a6805ef6fc193
-DIST id-arena-2.2.1.crate 12203 BLAKE2B d5cf0da97a7d95e57f2281f7ca64bc1f58578e4796af6cb9d4239dbc60ebed6f6ef0f5d2fb93f9563bab68fb4139672acbbb23ac6c48fabdc835e08def5a9956 SHA512 c07f748b4f1d15f0e84a9c1c3e8c5b1fc95ef34d81751f6830cb57cd1ba445635da0ef50ddb6959e29eafad65865951e14f4655f6bf4cc79608c00fc032db0a2
-DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c
-DIST ignore-0.4.22.crate 55462 BLAKE2B a9a29e5286c9a9c132f2fa319226bfa85c9555150afd18e34bd3b37915250842c46f6079208dce75674fef448450dfd23242858ee2e4e2bdb7eb65f89d689d0c SHA512 9647a4887258dd970c87798dee32a16c1cda75ce3e352829f78d97e1b786d67f74d89b2fd76d48a607fe795213965c04c9dfb47713f8fa80561f87ac465956d9
-DIST im-15.1.0.crate 117169 BLAKE2B 2c0e8445226c3e10a4e680ea85e6579d5390829a79470f5fa74bbe5c938c70234278d12b5185548248fbbf1ee6c3944c0147f9f002766244646485858c5bcecc SHA512 4828019927645e15190347ca79566452fa910a96f4a9f20cb7f2dbec2ad71a820a906ee5078810bc71355b9e7e0c2a42108b96aa7451a81b5caa74e476e99750
-DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37
-DIST indexmap-2.2.3.crate 79019 BLAKE2B cc87bac104efd9aa565e3b8d6071f271b33501e2192b3a478120c41d015537e807bf3ae808ddab930aeb861f353022ac76522e5102e32f72722b93d36d5f2236 SHA512 ddc45ebcfb36d761d8c11b8f61bcef046a51eea71692d89495c897cf9b4cdb5e14287600285297c8a6aab543761d9f5ba3ab45442803837a810b945aa346d48a
-DIST insta-1.35.1.crate 551516 BLAKE2B ccda031c15d7f201c4beaa49a35aebead57ea1b4dd033b039accbd2124d960f8cc5309f8192c68f3245347dc64aacd10325f1d17847405182f38034d247a9061 SHA512 9da49142411eca816a7e5ef5512ce08bde2384ddb8d73d21b36a281fe300696f35546226cf875b32ef45724892579b3e7ea7727870da32af78aaac42fa4f465a
-DIST ipnet-2.9.0.crate 27627 BLAKE2B e7e1c74815b965e9cec1cd37cc3dca76671168feb689620d44d5e635f3a5fa92a7276cb3022f25a9512ffbaaa11b0a8719cc1b838a7dacda71a5beb1a992ecc0 SHA512 8ce429ba2bae53cfdaf8a7d6bf980e10b9dd515446ef3ed4e4e11432043a18e09454260567419818f523bc589fc367194bc345660f2cc808d281db235d3e0b54
-DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3
-DIST itoa-1.0.10.crate 10534 BLAKE2B 8ffcb345d07070cc01651fd44c19f3e0659185eda733c407fd4be0955a301879ae1272dae7f425279dae8dcb7f7dc954465c9a09b5c521938a503d34fecfe2a7 SHA512 fc496be0873e31afa6ddf7f2958030f8fcb517cadb86a48280a0c50ce50460afda189af1e6c26e5ff6f85c750d772c21503864c32b526c4fe4bcdb5b07918538
-DIST js-sys-0.3.68.crate 80764 BLAKE2B 961f58c181f060af37c00e99f55906140a4c8f1729847d6dd7da7e29b715d69ff822853dc6affb185195347e3d3bfeed392b8969c9d15a5ee28e9f01febbc148 SHA512 9b1b59f1688f95f9bd5031f68c18c0bbb8c16519c7b09aa3042e08e57921a3807d86f15407bb4d9d63c49747ac4847aa963f83373fd0d778a7e7962ea6551b6b
-DIST kstring-1.0.6.crate 20728 BLAKE2B 28d5fc4553d44658bcc0eb06e79ac08aa3b2e86971e354ea50e51f349d8e5e74edda491c5c3cfadf9111dbcd19ecc42d73a44f7f3fe0590225342f8f4517ff84 SHA512 e1920ab6da39e414e0f89e0728a1993a516d201149a922e58a326c5392891919746891a61847f0c56b67d9ef5d3bc346cb00b2da1325191dff7d9661a5a12ba4
-DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4
-DIST libm-0.2.8.crate 113450 BLAKE2B fc4a55ecc0d4a558b9014b58861341887679c696af6b6539c7cdb70c033c63219b24f6f30cb8d9b335d15e3af42be6f3a6bd719e189667ca0c43ac818730b674 SHA512 753df71bb2c838abbac360db2e4400c2d931185ecff993da51a979870f2c3f7ac017380fadee4622102fb4b37ebcc1960b0cbd295afc9cd1cb3307524e1f39c5
-DIST libredox-0.0.1.crate 4212 BLAKE2B fecbb90e2842a69f3967bb2a09b0181dce1720b60c5d762a334a279b52c00a9b4b52de72c6484603981c0c3e1cd8e173ef5e15fa290ce8b8888739204956be92 SHA512 31a9234201f5128f1519e108f7424d1740a67699828265cc725304a70f6a51e139f1d0c0e626b487857a7b421f25ad93e81b95b65cf0d3e0ad912388deecfb41
-DIST linked-hash-map-0.5.6.crate 15049 BLAKE2B 0f30e388633c60433dcbee353507f1c6857bd210f0b61a4d166a9b95067bdadaebe49d5fca4fa6ce13072e26037c6f75d46cc30cf8dc3c9cfcb3f33b33630093 SHA512 031a87645381c96beff33572e4bac1a9877e52fd2f99d39918fbede17d72291b35e2eb69e07edec20c3058554c35cc38fe85b8f175c2a3c69366136fcc71f707
-DIST linux-raw-sys-0.4.13.crate 1493855 BLAKE2B 1298a038276e2424eda9873c642fb43d864b343b03b7962446122d2dbea94d58d9fb2b93e890769e6fe4092378755413ed6afba81ce56fd61e512146e44148a3 SHA512 3918da6b667a08ef8a51aa0b087129e2dc5ab101669cbba7690fc98ae2659a36861bf9410a3b87d18522a7549d43ac169b995ea192d3073f7249305a809cac62
-DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e
-DIST lsp-server-0.7.6.crate 12133 BLAKE2B 1858cfa3525d0d0f61c1a988c38a1d02afa593bef53608c9f033861e0df91d833569563acf3266958807e8daadb80f9367f4435fa3f05ae40e362626ccf9c722 SHA512 d9b35963ae171505413f1879879e3d5bec2c36cc50dd2e796f8e209768608b36a7d77ae441128f939f15f743f994c2fa479c7ec1a53296d3b65d44e969bebffd
-DIST lsp-types-0.94.1.crate 66997 BLAKE2B e2d42d50b18ec19cde95cf2e63ed0005b2b9696c4d8c2b8a3e8d405f69a6aefac9681f5c67ed0aff03beb8119fa98a575219f5a37d1a764dfa5c8e174747c09d SHA512 b336c441aad501c5cc80b06ecdc696554c5f76848143da19e534f1915e2390f53d0dc36ad43458e70cafa0ee817aaea1db2eff4949af28553c42cdacd3d2b27b
-DIST match_cfg-0.1.0.crate 7153 BLAKE2B d3f40e5b16761fed337ed18dfa9db9e46aa2ad84ca8cfdc7cf7c72bea7cff8d084d95214ce013b3515bbe5b1ad4b8527bfce692569551e4588fe6f396a8a96ee SHA512 fd36f2b128d70a0f278e708bcb3274d90380229f754aed7ce9b808138b0189d5e1a07e0ba732216f788a530cecddcdd980559b3f71efa371d8805a213ff8f2d6
-DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a61f51674e0df6a571db352b2bbabfb99cdbdcfb4e511ae783165bf0258f5163f240a229b9087f9edbd0df41a SHA512 84214c1a84952d85631aa1ab5115df7cda223ac64e2acf055b6129ba1aa26ddc87615a8b51ca890ce3fee0419053fa7fe1599ae128f1d211b58c07b0c4af3b19
-DIST memchr-2.7.1.crate 96307 BLAKE2B f1a008fbdbfe84852a8ae1d9d9574306b1bf120dd5087903adbcca6af342c9abbb296496eb9bf6cb58915c4444b3edd6ca4e27131ac7d8aed8849815df87a944 SHA512 5120496faa31fc427c8b4178461a262b3a34d70eddb7ad17a19d6db8b9969c9e113d3625b5e6dc677087fc80907377b00ba0421aba9a92cf73ca2849d932f473
-DIST mime-0.3.17.crate 15712 BLAKE2B abb892b75b40657d356b6b53b9a45b2c822a05873453e919f2bbfeed9e5c06104f24db9cef2716f302198020870eaf96b2c62aff55cc11d8ca4f4f614d7c8e17 SHA512 e6d2ca92bb58fc747c1bb65a7f9023e5dbf4b94966003a72e4913bcaaeccdd6752725cdbd5081e0fd69d9e8f364d79664fcbe70061737d5c39e5b3e3a154a0d1
-DIST mime_guess-2.0.4.crate 26399 BLAKE2B 667f9b8009bac2e1d8b835ae8825afaaa2ea6eddd4cebbf18de8f8fcde9318eacaeeb08066bdd611883bef5f8a53fa2506b57dffff543c3a57316e07b525f7f5 SHA512 acfbbfdc5bd725edde43e4915858b8d016e90a5b483664f0bcd5e8d2b0b3684bf0f6020aea147b5bf429f218a7af8080761cea4c5c04b68fa66fd6a676376908
-DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
-DIST miniz_oxide-0.7.2.crate 55731 BLAKE2B e3cbf5983025bee879b8a735fa2912db8975cb60f0499498a73ce4375e7d452c9ed62d4b0b6f6a4fa591aab55e5d7ff20033baa007fd6c839b9d74b31142c0b1 SHA512 2f8f09d7afdb9d78bfc80a228ded85a215fea05e577e907921f1808f84aae30ab118048d7b53295f11aeb5de70ab6cbdec892f3a2417bedf6f53a4576d095432
-DIST mio-0.8.10.crate 102345 BLAKE2B 82bba95cfbb51a02efda75dc85d973825f038f7d23e7fd0a93a60293fbafd304ae064f395a1aeb63a1bc7bc664a0c0dfa3721ac8a553ea5161c0ab2862a6edcb SHA512 680371f7da07824fcdc1e8c10a6771a71b97308c47bb5b295e0338fbcb56e211dfd91e1b400a080984c57055f08db24ca675c167f298a3dd4842a185bde62fb2
-DIST nix-0.27.1.crate 286494 BLAKE2B 63fbe347360ad4b7a86f30bf2f1b27ff1ec581145a90c34160f4d143e9c297a34a2ee72e9de3a48bd3418657fbc9bafd09b704ec15a42b16b3a4187d5304ce77 SHA512 7b35a0f87427eb1b5e1480d7daedafea4609b7f3a4fcf48ca99bdbc2f150865996539f2c51c7ae6a6a13169614681fc838efb306994b020d44b45735a7380010
-DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad
-DIST normpath-1.2.0.crate 20107 BLAKE2B 08a86e545ed8d0f1881645690c45c4a5fff438680a36778d938bda03e489706a1086e91e27429a414b5925b15be93a80d8dd2327cae28bd567a058cbec5b6c3c SHA512 a8e20301909e28d6b46ff388ac77c7b093c3654418f74955aaa185489fb859b79fa75b7cc303c0f6ef93b01efe18fa70628b1e85c123e143cbaee98eeb558e15
-DIST nu-ansi-term-0.46.0.crate 24311 BLAKE2B d2e678e0eab5ad48534e686b1a4af344996d1b07a0fa40839072df3061bd7e5bc9341363403ea3ef8d19c7725ba3b7a8ed540c63e2209123b1b93f69418288b6 SHA512 b4f37786dc85e0596e2b7b261a5a9fe0265bf1651c39efb358dd649b926b12c3093f307b98bf0c4df3899f0a7cb1854f2596bd5c3e22fbbef42f912ab2eb5043
-DIST num-bigint-0.4.4.crate 99369 BLAKE2B 09a44754e3a3d4f949b3714d96ddd7f3915164d611036675e3df421d6c0863e368eb0180978a4ec27fbfff529b4999d2593e411903516670c24c08fbed6a79de SHA512 0dcef3344a933509fdfe87d6adb0bb1bf67af3c692ccaeec5663a8f18ad0a251199ef9c7a24c25b95d1b255b413947e70f0a205669d549b13e54b6f4864ab3b5
-DIST num-conv-0.1.0.crate 7444 BLAKE2B 4f5c4695006aa3ae77aaf5c55999a07d8ddfab294584fe10d73eb6abbb3f551846646156581599f966a28c74d80d3ac4373c49d2099991f7ed9edb56d36feec4 SHA512 7884c0c6599c66e40b9a79435e1bbcec60aa7e68b59686922dfab19ccbcac6a6e54f208cfb3d5a8a12e86e4dd67e09977d60b69ef6940e308a28256733f36100
-DIST num-integer-0.1.46.crate 22331 BLAKE2B d88c9f84e5d803a3aa8f44dfc1bd6d9b5e336e7cbf47231cb3a7de30dfe263c41c62c586d31f0029459c8c240475cd329b3fce79f355be7643bdccf8d56dcbba SHA512 e27986d91f6c6dc3d5a0900defe28ab5f47905cde3f84d0914b7acee076dca8fec6fdb7b631ac94d3a31eb01ecbc5854e51afc3187cd1abfa21e1bfafdc700ae
-DIST num-traits-0.2.18.crate 51930 BLAKE2B 6c40e155d7a52267a7183d8030ef34245492d33f103cc24551b10da3eaa18e3db485062ff87057dc23e6b55e381e5c5d2a2633aaf6f4763c06677a0a0c524f02 SHA512 e395ad9f3b21b0dd1d3a94cefe0d68a42d1b1d429ddb2823696f9cd75042568a635d93d133ddb9497ed357e5b3be5caddb8e4a4af87b65882bbdc60b05c74ebc
-DIST num_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d0845596301266321293b374392898853fb7c313a0b0fd9d22d9dbfe3ccc5cc1e38f38407c89b2e5906eb76caa6ad68 SHA512 a75863afc4a563e63c64d06471c7921615355d98011ea9497b1f1a7dac2bdfc876509136018e8062ac38575ccf476a196d1fd9231e09e90017333bbf2df4615d
-DIST object-0.32.2.crate 286994 BLAKE2B b9085200fe0107ab0f8ddd5c5ac82bc681dc6266c6503e4a803ae4dbdec775ae84ca4a736754b770d858ebb058342af45d485d4c9a41f57966ca1466de40a4c5 SHA512 5d03d998f06dc592c3be141f7163bd72a0e73396f95d22ef1e0ffbfc66489bf727a6f6fb813a32739609b619b8e34a471974b2231dcfa23df8bff52007c25a96
-DIST oid-registry-0.6.1.crate 15068 BLAKE2B 03206bce78c7fef1ca8f06879a9a79a6176091d61f87278acbd10c690c86f3a790ea88b54a600923eb5f914506f5fe335b7d983a857224d5127d22c843643cd2 SHA512 93fe90de87955a0c855d9dd4480280b72e0d559c9e17d864dcd3ee424a38e406a60492393778e01a0e6d3b8cfb9f1c5cd06b90a4db180613c5ffb21530b681ba
-DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
-DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae
-DIST opener-0.6.1.crate 19173 BLAKE2B c235ccc8ca6f1f87a30bcf94b0014b5e1df99c6dfd942d5c3ab02f351afdc8c8fa3f7074ab87450eea939bf682d31e3a08ce90d18dcce88aefaaa7ea61425785 SHA512 bd56a5c23a3d1fc3d5828bbffc3f7df6f3d92f03cf38665587ebb5b16a716e04395ee30b239acfa8fc95f4daa67807e48d9cfcc79817f2926880832c4ea4ba2c
-DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c
-DIST os_str_bytes-6.6.1.crate 27643 BLAKE2B 8440a196a3d3d9c3a584562b6c2a1033f5606998e8851f8ccaeababe58022a42e65510e12ebdbcc7b24d0fcdcf111d68bf00d89b8665ad5cee49180db853789d SHA512 977c0fe9891c021914153d6a081c3789018fcd1830224f5c6768d0c75ac8ac4919638bb0a41949710fd5e699b162d9290a5379cc6251535a127e212f5b86932d
-DIST overload-0.1.1.crate 24439 BLAKE2B acb2dfa6c6c22ea95cf58079f6ec56a2bb5e297a055ce717d40633b789b0d005be2bfd6616448cac61bd032e74aa6eed212f1677461907cea2f7f7cf536c157f SHA512 f79bc3321f45df5e3d0e5fa9c4e60524e4e28dd3729a09956766738adcf99ca42c187a01d48701ebe23d39aee00a19d4a07da798edc781b942e866b339613532
-DIST pathdiff-0.2.1.crate 7142 BLAKE2B 7f9a162c2add4acd69a81171fdb31aa9a67beb4e1be0fe93d76dc46b320729257240fca5d65dee38901f6b6ed1e536e3fff09c93cf3482859e6ba27e7206fc5b SHA512 a646f271ce81d5f6d4a8e0d98a2c802a8796a961cf8fe8177911e7757bdaecd8b156ff22046f1663a9efcd5fef1e6f000e5509d3949dbaeb494126b7e8a546b7
-DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44
-DIST petgraph-0.6.4.crate 185895 BLAKE2B 9ddfb2796c461d2820db8227753113b02024e5dcb694a0bb2826bc1f375f028d8b98a3bd67555485db7fab88eb86043f5b768585dbe0c60703cc655976030a2c SHA512 b5a21572526387af3151dd4f864bd95c94f65eaf0612d96f99926faf646214df205bcc652b98d3b281f2e270779a4c1fdd6a32614ed60b3612e5d594b2bf3f20
-DIST pin-project-lite-0.2.13.crate 29141 BLAKE2B c434a336716c9cdd16ebc297fed393e9106ef167a693c4aa0b12c681e03141b8ba3cdf64c310916cb7d5cc43cbbfcaaeb39bb5fb1e8b3efb9e94a3f72af914eb SHA512 7f12595d751d315de6c0d380e2f501b74154661eb676987d2cab6fdc956091a68c9cac658df45dbff73615e982e6ae2ea138c09ebb708cd6c351f0d18dbbdbee
-DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
-DIST powerfmt-0.2.0.crate 15165 BLAKE2B a3e1ce63f5866f75526eeb749bec6607e42cb495bbb953082cde7e98e6aa429ecaa41889d98ff7ed4cf5031258b4f7e0553ff8fc435b3b6f8b4ef2b6d53d9b61 SHA512 0623f92e4d6ab284b3f6dae58220d79d9185df4a738999d68040c50d72fe0380d70358cb622f079c629bab53bb03c6e085e165d5bddfbeea84245864fed90029
-DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a
-DIST pretty_assertions-1.4.0.crate 78846 BLAKE2B 68583c49f81ab0cf5b90f6de10ef3aae9b525288fec25f9d006f2eed0877c0fa742dad5f878fc78233b54c0cd32dda7ac1f7161bfb475288d8858e8e40aa9e1f SHA512 f76d38c787e91b3739272e3bebeb9763d312b85a43cda5e1311ba8d6b0e4da1ef25bd66208e772b1cf56a34553ee560482b5ad19c5290608b2aaf9c0d0f0e995
-DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
-DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
-DIST proc-macro2-1.0.78.crate 47158 BLAKE2B c56a24fce3faca9e04db7965cab552d2a976c3764df0a84179b5a89d1230ab355c777a82b4c982e3945414f1f0478473a88821dd176c32d6de394d73a26adb9a SHA512 11956fe03a2e77a925cdff2c3c8bc8804dffab4fa1de963a128fa23f4189976fd2e2102bd346b92c33524beae320b71dadaa5213695a3ec638404196e14fa769
-DIST protobuf-2.28.0.crate 167541 BLAKE2B 3db5e11d458f54fe0e121fda6ed4c1949f8fb0488148c48e512e05cdb3ca3e2fea4a0a0e4f22b312eefb75d3bdf0ef30fcf3d865ab5c06caa8d11a8b96f44b32 SHA512 14e87f5e4039eb98d473055634102e7d8f79d294de0e04e0c0423dba6e34abbb28b1f94bc2d96ab16d3e02e770fe876b4c8c3af8835a43a8448514efd0b02312
-DIST protobuf-codegen-2.28.0.crate 40826 BLAKE2B 0e581fc7b1b2d2b28aa10a00493c79053d5b1e507200961cd26a548d4bc46bd56717ffa00b0f2ad5b92059b2fcb39ba18bd4a85449a87943fd623bbe1e8213f2 SHA512 5b23b4987f2a7a080dd93842e63ab58e8b95e4a2d78de3e4af7ef863f8d6c359b989cbc6c0a6e0853803d903f66a43021598814efbe85a8d712320e38f9485eb
-DIST protobuf-codegen-pure-2.28.0.crate 58102 BLAKE2B 32617f212d0a7642661363dcadb8c0c8acd18d4241576bf7a336fa301faeba52e98c66e54413a917571e5dec6911177e987f11521f7afe6b8a93bd4657e3f581 SHA512 f09f04fd04ef06259ca60f1a9ab254cfba27a1ef468a91f29e70bf44ebb1a33632eeaa3b7d0405d12ed2206263d750bb48711ead7d1d51804b043d2cf46c3d07
-DIST pubgrub-0.2.1.crate 53926 BLAKE2B d26c3bcb37ed05772091b6f1967bf5ff37103851612ed52b3e0f71e076bfa0a5af80d8231f136289c7b8a5ed0f3168f5872d8da392971c08c51b085f92d3fe00 SHA512 19753ebc78390f5ac7695fee7a9b4267f811f066e80fcfbdf1c2b1ccd4f24b0e8e3a38634b573852dd7ad10aa0bb73824b2153b4f138c55821a37f459f6cb065
-DIST pulldown-cmark-0.8.0.crate 106330 BLAKE2B bb59298b605993530e2363f3264c3ac1104ec57885c2dd183dcdf3aa9dc613999d24caeb86848ca3542544238aaa4eb49d5a6599d2fdef53af50b5dbead68e22 SHA512 396ade131c0a74cdfb8454e137e41c21f0b81b7cce654ba6ae9ceb132ba0fa0a467a190e6dd69cd7d59a267efbe83f008c9c8a5c9db47665aabc31a4bb9cb967
-DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2
-DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
-DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
-DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79
-DIST rand_xoshiro-0.6.0.crate 17125 BLAKE2B dabdc3641fa85cecaa057d988396f55bbefa57ddc44ec1989958b40ea7dc51ffc4d04cff556fc6182d202cfd61834256f31fbf8c71c40b37a230610095c0b6a1 SHA512 dfdfc6bbeb222f6badc186773f3f3ac7c899d76f7274c33fa7bddf00a1a02b9eb6990f7f37fd37097085cae7a86d21e0819f8dd0d254aebda66fe367b8867b34
-DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d
-DIST redox_users-0.4.4.crate 15438 BLAKE2B 5f44e9ef20f1a6c8b22239838f8f6a6648dbebd5b4386b3a2c417e39add8c4a0dc32e4369b8bb4e0ea17678140f596b9bc981b1d56f06de6a38a503600420481 SHA512 7c208116d1171b1f52f22aedcf8ad00076a3d1f062f4018f4a9f5fb2c38d7ed83258589062d1559f64e43f3e2a9ddf789799f57cf87a49ad8a37463ea09aa269
-DIST regex-1.10.3.crate 253101 BLAKE2B 390ebb00bf5430048412883b672d80737e783fd36f40895343cb38ef2e26e2713418c2fb4d66792bfd3be4c990b4518ba120de229a72cbeb7fd5c2af325fbcaf SHA512 d090898465013b0975a6de87fbdcdf76b4896578056f4da83424bd5e7832547a3d8ace643c379c4f14700a0a88dc95950a38645508d1675306c377879a90cf5d
-DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
-DIST regex-automata-0.4.5.crate 617406 BLAKE2B 21826731ed5439a12cdda5a1ef217dc3239a0884d038170855985bf830f2782bdf4dbfd1b1a8812812db3a2399dadf8c173e75db635dfabc97382fda0561bba3 SHA512 0e9681d5c4529d49ff2555b7b73cf234b1f321a7fc634beccdf76c2bce5094e8501403e8caee2b3a16ac299cbe4701d891f1efa380b54f9dc2d92bbacd4de611
-DIST regex-syntax-0.6.29.crate 299752 BLAKE2B 2408ebfe5f0dd6578c33f18e8ea9a0a7a84388420c5b67adcaedde477f3f67fb3e39ba9fab1f6892c7ae7fff754c4aca51314601529cabc6a8fc43af38a11f88 SHA512 28a58950d15df1f0ac4ff4185c05b535e8f5bf0b75f79fad24e40e17a02570d1c9bd9cfc919eed8756a1069bc489c5fdccfd04f6b8266c83e3412b7b4bdc262e
-DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728
-DIST reqwest-0.11.24.crate 160972 BLAKE2B 7afd1594ff5a146fbcf864f8f03e4f2404d31ad8ee2b56af87b0d056ac36b890af343fddbab6a81bf687765eaecdf3789caa02de5279c25cb5f06f7095544ddb SHA512 cadb9d44f3e82da2ab69eb5cf669a44302b737072632d4ddbb5f11924814acefc318dc13fcc690e581606353344bace46f7f1d3759b9ab968e857dfc622a768f
-DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea030e4d7dcb30574b977f0b0c7e53e09f6e6dbb2d068cdf110262876c48dfaeeef1b691932a056fe149916d934 SHA512 d97d1b08eb796d4c107426ff2c015ab1f221612500c8a57fca8e3f064e8c0f5ae2a5e6071d013313cd9f4be8fed4ba03beae84bd446f56b2b2ca5d483c328191
-DIST ring-0.17.8.crate 4188554 BLAKE2B f531b15cc5cf88f2ef00b1708473a7e98a42dbbd026027ef2c42f2d8bdba0eb1665621fc98db618252f6a131bd54b1493987a0285bf2b9a22eba4c9409ee1cab SHA512 e4966409a4078ee43bfc9cc659d08ad28419effe2a729c8c275361a7fe0620a3c727009bcfb1d0bab265af2bc107b50c19d868a4e80da7a8bb55f97e8b214358
-DIST rpassword-5.0.1.crate 11109 BLAKE2B 4d040a920673de6ad2f2cd55104a7c2dfdd7425368c77aa3c8a1f3f99e51cba4d86b2afb16ee51637d948e444ddf060f7a0c82de5d6f0696023c527e630eeb56 SHA512 bcd20c2920734a2f281b9ff924138605ea409d0bea9721ee96100f45eed14dffe65a8bdc8feed7c36d3564c8d902e78e0d2306b3736d03b8f195a9d212792feb
-DIST rustc-demangle-0.1.23.crate 28970 BLAKE2B 611d2e41a8a9799db2f8bcb8fc8fefcda361d055a417d2bfaaf2dedcce9d6f388c69d905a28c65e6691b4d408d7922ccdc97ce524c87c3cccb8467e314bc87b9 SHA512 8cd29800254b1305ad50f1fc008838c52d9659f97a51a68e9f2bd6d0a60126f3ebdd1c79760f96445b3bf998d0773526ddf663b174acca81babdc0b423247247
-DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
-DIST rusticata-macros-4.1.0.crate 11746 BLAKE2B ef912926df8ff2d3ee64a190d79dde0edacaa0ae8c2442d75a1fae82f97aacd9994f3511605686cd2bf592e71461279776afc63b9f25cd8ab10610d59cf3610d SHA512 8066a2de0d63f82278b33fdb27fba99b0ebc56ffd364ce6361fc9ac6d78f31e3e4418cbc78916365fd0e7735fdcecced21e16aaabe56cd72250bac0cb30151b3
-DIST rustix-0.38.31.crate 375443 BLAKE2B 9e8ba6bb4eb4fdf0bacfbc719124f745f383abbabfeb161bff9908d1948942d358f46191377b90c180a2793a88bb01be20dab556cfabc8da8efa2533af8e460b SHA512 593e0395a7bc5bba949e6f2a5ed9e39ae13140970a598def32ab7d6d91b4ec100752fb05abda407ee2e5e420d950b19e607f963f3974213637423c751df75960
-DIST rustls-0.21.10.crate 284920 BLAKE2B eb4628b6e0384fa7cbb5468c75c11512eb111a8a7dc7c655c6ac6beac72fc3025b1a590324ec3275ba66b632dab14dd78da4d62c1c66b2c2502099ad153900f5 SHA512 3bfcd137e6d4d86c716e8afe75450a39ca055d44557fd1a8d4b6ad4d7c58e2d5fb86ba92c3825a667c9daf5bd7a89a779ffcf8c23d6cd0af05ad47ad437da139
-DIST rustls-native-certs-0.6.3.crate 24438 BLAKE2B 5f019685414f19eb709ad61caf5b3df4c8b498aeac499b1e841d081f3bafbdc66a7f3892c6cfe699d5d2b702c3d1fbc90f0f6720e4cd5bf8366c91f94a02141e SHA512 53a3a4b96f05dd06c575b2eb62eb7b6d026bda539c87c0e2a4bc84fd332c6401a825135fecdda39c489b0c910ffbe4d42c93844fbdd8da4fc2badad400b27264
-DIST rustls-pemfile-1.0.4.crate 22092 BLAKE2B 9a776027d6e43a336ecfdd6713d4b1e6642378f81b73c97752563ee1d2cac5b3988afd48c92d25d55f655a6fa248436954aaa0e0bd9c7c679c987ce7df0cc99f SHA512 bc748ee06f2c101d8e54e8c4555e88c5ca824ac7bb0182f8e49bfe1fc66d418d2a3da8e454f3741697f491ad0c7bc8e924a752697023a191c1bb6eb98c48aa37
-DIST rustls-webpki-0.101.7.crate 168808 BLAKE2B ab7177449be359e17f1f4553193e96e71b8e26e1298a0937af658b1a6f9485f051183d1bf8262d52430ea4c3b96263d1fd903c7a5f046bfe5f87b6b97ebb0672 SHA512 680e3d52f699c9d6200e2e738a4245a5114fc7122546c07d3f15f1e6741a52275061b3e016c2240f1dc3eb9f701f7346193bd82e827274fb73b8e9e0d5af4e68
-DIST rustversion-1.0.14.crate 17261 BLAKE2B db30d01914059a893bdb4c448ed0bf04852085c2d948bfbed8819a1d2317c34133cf609abdd806ad628b86974a9c1ab9d09f79743cb8e13257ef32cd444f49c6 SHA512 466d753c28c4899ab3da3e9f3366f7ecc435d484f51e0c07acfa5f3367af0de27ea3bc75efda22159b4990c976b1466a27e7c31c834c72a87d8234318357454b
-DIST ryu-1.0.17.crate 47537 BLAKE2B 28408e17a4322f1afb6f21bc8d7328c39d07186de4d464f8e9bd63a69757cb4af61b46e558075e14836f310f020ac824d5ffa616fc0a5ffba59b9df0bb66ffc4 SHA512 6dad725c4fb2d3a33ea30107b63cb702eed56bd2f3c16a72265f648f5aaefcd3d5a7b919b1d037af926cc6311bc68ba58c4e0483da2b2e2135c6a7c2d6601af4
-DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
-DIST schannel-0.1.23.crate 41667 BLAKE2B 3f34ecf4cc519f5302f0ab5207907a275c68e6fcbb47630aec4ed5d5f1a1cc7475f6d7a8c22361e9878002f9f54314c1f630ab0c1f77ea309714bdb7ada6c9af SHA512 dfce25e3b8bc09d8dd1fce2783fe02ec83f74697cb24aa212ef9369a628685ba488f821cb3e5f863798e0e59995038c8d748f74b89f7929eb8cfd804d5066b84
-DIST scoped-tls-1.0.1.crate 8202 BLAKE2B 20be49f0546691bcff3f0fc257345e432e200836a60b297ff3fe698699ef6a2fe8a5dc6977902a08f7dc63c578aa27607dae0f1889b849c257c59c48a458e1ed SHA512 342f43d53edd33ea3e2197faf5dce37bfbeb0b20b6f0febad4dc6244c3185df127b2c10488e95561260a0ef968f32707460f2d0d23667cebece19b167c0a0c25
-DIST sct-0.7.1.crate 27501 BLAKE2B 12f63e62f49a0ed0c5a62c1c9b42a83c1df43401ed1de85f993167d8fc52733908e58ea1fe76cd7ff6128d4d6046d7c0335434672ed1865c8ddb1b3fbaecb590 SHA512 6030295b3b11411f5a7e518db1066282bf11a279c27414c5e959cd430e9fcbb7358e5d69bcc68c8bf696d4c1d9579ed7218b7f9dfbb61de2271c4c3d3316fb7e
-DIST security-framework-2.9.2.crate 79295 BLAKE2B 96be139f2d2b9bc2fec7805c9e90f19f68fb6cf3f09a879f1d5952b502951900fd6889451c6866e53394859a0f8a842b4a674c4bfa82cd71f48195c0af365475 SHA512 fdc58c1c12ff849af3acf34208411caee50f30b9d55e20ef9d3922ee37664c606abcf90c4b415e5c22498dff2116fe2b2f374a0bd382c837ae7d281cd1a0a54a
-DIST security-framework-sys-2.9.1.crate 18284 BLAKE2B f1484b6b691f3616192ab363c81eb3d6279ad0bae6bb7fbc4eadfd9fc6b6bcd5ce42fb8edab1eb8934f40a1d42714eeb8ca3616871e8f80c90318834901e8ca6 SHA512 3118d1e982d94c5fc6e8ad6270ba398da98a042c7a2060eafb3b78a54491091c46529bec30d4f871744431f01b828ba2a795f695cd20d008441839f3c4350462
-DIST serde-1.0.197.crate 77087 BLAKE2B 4a4e04ededf5fefaabfcc4e17457db823239e8eeee7631a905ed47800ca10d26a93632e3a9d1b784b83f84168d0d649cfa2e6f5f1e68ab15a68e837cd5b6c699 SHA512 69e42825fce6a0a5d109979785daceacfd6afc5641e202fe83da32e2b1f968416557cce97fa014839e873e65f85c27494c8f8e20e6e9e4fbedf20d0291880410
-DIST serde-wasm-bindgen-0.4.5.crate 17012 BLAKE2B 9f8d4a098a80b25491fb265ce6d776788d22b1587309d3deb5a9d33466e8d6dacff96e6917ff4a7e6616c9ff9c06c28a44706a043c810047e8f39cc52eb3f4dc SHA512 d4f959589b6500e73df9f5b86b633311fe5a8edf3a4cd5880547138f38a4b6dd898812fe4c5d6314c8a5c78b1bf79a79f358663aad732c4abf280cfaa3d7eb85
-DIST serde_derive-1.0.197.crate 55771 BLAKE2B 73708908b6d1e104af4c63b498bd25c5a728e07e22afdf92f15754c0f17636efe44c0560c1f0df1b9a30708e8e8894a62f1ea57c234b6dd861cb9c8dc044eb4b SHA512 669376e248b76a5ee8b9c93fd9fe6d35372e7267fbabc14730539ef28a94e405ee5e9c2cc2846897d59d6153742cdc6799f9e2c87f20b9dad119bd3a86c28994
-DIST serde_json-1.0.114.crate 146986 BLAKE2B 229f0a8e2c0bc35435b49774fab9d4cec4e2323e85e2f97ccaa2a18277ecfb9cff9e9b165786e782cba043e9ac670717364b0f9c145254eefd74582b728f2186 SHA512 2c35cd0e29ee2af6046ce849b5854b82b90f402b51c04ea86b32ce7d67869736f17a4d028dd8245c31201036bcca7a1d3df11d842a92a45b0eaebd809687d436
-DIST serde_repr-0.1.18.crate 9974 BLAKE2B f6a8b2c8bc759bc8cfb3826489faf67da13b1cbe2432c30ec877036924869b9cf7c1ead2809b8e5852e352b51c91f40fa892ca68832ea567e4a7df29f8590a98 SHA512 09d77ccc60a748f8c95998632459f52268cf45949c0e22250f751eeaceb7336c03a457587af7bdc6fbc188cea4e15e77c8bf63d9741a9ae31fd0b8e787cabcde
-DIST serde_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60
-DIST sha2-0.9.9.crate 22247 BLAKE2B 4ac2c92325ad92881f41e777010516870fd001617c2dc1d20495318219167e2622309831ecb9509d7a4b87f936c9e5b2d335bfc1842876a8b2aecedada367421 SHA512 bc267467089ed546edc1caaa7a00f3f769fd1d5deeb655c1968985d284bd32e4fcee4e721cf89c30e8c3cadd2f88ac557b91f90183cab112702c587f753e5877
-DIST sharded-slab-0.1.7.crate 58227 BLAKE2B 9b4c4e4849ed324cf48c2b905f21139d1d65aa5ab13e7fb11817cac9a32ad09f8dbb1e50a93d40cafa0aba872792bc92f7bd2e219f62f80695409e949c07978b SHA512 3be7438d4a75debb14463477f34de6db1ac38abe958ada5d5dae7ae8d5993e245da69fcb989d91aaaffda5f2b085d4bcc88d10e07ec567b7f40a21437de6d4cb
-DIST similar-2.4.0.crate 53147 BLAKE2B b30771e3c26300f9ad691566af22faf4592225de44dd55abb1231aa3641a32ca71c83fe9253dfcfb0c438b6f599c77358595fa03125d5f343cc617e99354dfbf SHA512 6c8f1cb194c165ff6ad64298d37deb6bab0abdd51921e29395e1c86268c65db1b4a67ac03ba37dbc69a0ea35c0f3770e894de7253f0e410be7bfc7845a45ce7a
-DIST sized-chunks-0.6.5.crate 43628 BLAKE2B 961121bd773ea5f0e6c3210b17191e122e90180cb39b35e501b49c41de69ce17f29bdb09617c22db4b4632f11193b2a97072f493707e66b956dd6dea61d5f310 SHA512 c7496094a6ac45003b31d55c61aa42e649eca40a2540e1acc507d541d3c02e5a1801fb517e2685752b81ef5a8c0ee6efdcc93dae9268f22ac8c6eaf1056e9656
-DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40
-DIST smallvec-1.13.1.crate 34952 BLAKE2B e0dcf1d26883564cd4f5d20a588562404e193075b1ae011f7f7542009a9466e5df3ade7768e1a8feb8806774b2cee5f15d31779928f83714e7d4b6ed46af9ab9 SHA512 1259ef947400470b8c9e74c5582dbc1a49753aa46420883c1f7d66f320f67bebe733a15a23cd57ba461020fad4ff337a5b298de82754602a78f5e6cec969652d
-DIST smawk-0.3.2.crate 13831 BLAKE2B 551ed3406db797765034e2ba53d5aa75eec57cce608097eaf0f1a94fd1df8aa8bd248087a8a3b037d844fc91773f74501686180802a6d75165f771ea1f20ba96 SHA512 39f3cab5a6eaaef6f4e7703a6840ce7a805f6175e02968090a58a12d3420f0a144533e5d6542f1e9ec0e36902046a180386548713ef6148064922ff837fa1602
-DIST socket2-0.5.5.crate 54863 BLAKE2B 4237b540dfaa96d3f8a8b9178519e5ea37b6b96480a2aed5287f462845231427a18f5add26756c7b03c18d4d4aa617a5a36c5462258ebd8be326e8fed1c48641 SHA512 afa8df546234d4e8f89289622448aa42d8c2ba74a0a3a4b13c0ff7bc30fa435a7d6d6e8c9e2a6933cfa23ebdfb4908c865e82c657611defbc16e1f1bf66f9f8c
-DIST spdx-0.8.1.crate 843675 BLAKE2B 81d2c5465b11d5cced7f03790b2827572dc66ed96382d4b32a66e9724cbd3dadf90733fa6f63f0f67840e6d9db70496c17870bbf93f4b67dad0443c2f33327e5 SHA512 a94f8e4128d744768ffc3801bdd4f52f9030035304feff0a05ae939107820acfa7ee933237927ba26b60bce4ed2444b5042acc44fa1142da146a1cbeb9184d5c
-DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
-DIST spin-0.9.8.crate 38958 BLAKE2B 8648bf2e48fc618758e3de67f0a493bf3cd22a8d18666164b0d850ed7c0d73650f7b0af783019dd361116bd60c61d24895cdd2c579383cd2700de0e32a23cdae SHA512 b15ad66ba9b308937f34ea166b799676fa45c67224e10cb57530fe33d2a8317ff3e3db3223a3249fa2862cc141c964d2130d3f39910a86ac5ef8aaf8ff4bc6ee
-DIST static_vcruntime-2.0.0.crate 7040 BLAKE2B 3300f646722a73e88285778ab0f63869b8f77c7f085379ab43ede1ea73788d6ee08d1d9b209b478a603dd851e668887f1e204de1a8be9102f1858cd24cbc5c2b SHA512 3a754d1262c8e143014ae2c06bd53eee0c6c124ff8b452f5542bad3bd6e8e72f8e71b1ddfa4112efe142498cb4fbefbf52dde97d43ff57d65ce077b4bd38a6f7
-DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
-DIST strum-0.24.1.crate 5636 BLAKE2B 81959b4ed8b78313bcd370eca0de10dd86b63c27eeacab66afb6e0c620bf1a13b66ee4a06ff90ce09b46dfd29d8ce32218414900a077ddcdbd8debfb05de243c SHA512 d842464b762790f4b785e494f72f7bae47b5a068cd06ddaad7a491d1abff53fa9cde280b06bbbb6b39a3a8f350a2384080ec4b3e4f16226cb076b1df153e6197
-DIST strum_macros-0.24.3.crate 20696 BLAKE2B fa86022cd1f701d8755fbf3e6356a38d46f4f168a1abd19d1d8fa63cbecf41746165791955c8cf1fba86cadf85ddb427ffd17bb360567187b55dfb9a899503c1 SHA512 8276343808afe71d68d7984d5a223a4fc630df0adb5a547cbcc6912fbffcf7e4ad38f115888a2dd3a8443d6fa7b9c7726318d4f5d1ab43f463dd97ec20df9134
-DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
-DIST syn-2.0.50.crate 254314 BLAKE2B a0aebb5fc4d84a6fc22cfd983bfe6f68d1fc6faa2c6878650ba387ae9432281308f188be693ca0b685d8bb2f488cac36d06afd05cb6f0a47615a4e4874cebbc4 SHA512 c09fcce91ba585d24bd6955399152a207b3f02176c02343ac5d079ae30c432d51cf13831278d98f3b614a907813bb0105d82d19798268245f8c280ac4a1a8a5c
-DIST sync_wrapper-0.1.2.crate 6933 BLAKE2B 0ec797ddead298a95bde0a508ae942a4e90943948d3c1e4833fb3ad1cefd3566b7fd1aa0b133d614839707e3f416e3e739099ac73441527213da81b6d1c47d50 SHA512 ca7cd7a6dd242fa420e8dba820117d85b1b11ea6a9fd99c92a5a260f12263cac0c034c9f9fe10090d5830fb5bf5eefc8a5a0d0b5a40f3f809d69e5393693d5c8
-DIST synstructure-0.12.6.crate 18429 BLAKE2B 7666cd83f82910e036e5b57600dec9a1c2e559453ccc2f1201e2ee4ba64f2ee62cfc1046ded5cae64dd183967b9d71cbfe4b60a88bcb93706eedd0c4ab69be4f SHA512 6ec5dd7ade904fb6d79c2be595886289846e064b8c4100f780d8adfcbb41e6ca67f4b1d682212f4673c2169f889a042049b31161ec3cebc3f399751124f01f9c
-DIST system-configuration-0.5.1.crate 12618 BLAKE2B fa75a24f8db6eafe578bcbf162fcd110ca059c58af24916acd64959b48d8541e0aa95ce2c929a8a50c62e7e8a967de9101640d1da7805fce2f76b7c5c86c4544 SHA512 af77ed5be890e826b9b8f975bd2e63f3905adb24a597069a887ff2a861820f1ed40582b918f35c3d4eb063800e179b93e5acd7d5b48b147e9b16e3cf4c12840f
-DIST system-configuration-sys-0.5.0.crate 6730 BLAKE2B e40c4b5e7897cfe30b2fb6daa9b44fe2b83eb2a12d798a1ad8908b51abc735566becb0e001f52f5f8a0d3596f62a9eec631341c3a9cbd132a4f650f988c74b93 SHA512 764168ee5efe1ba82e847ed74a14d1f5f1892735e98657c3ecaafcb4b405d4f779592dfaade252f6a577ca2cfd5cd5e467c0b6326bbdcfa573c3ab01cdc8fc34
-DIST tar-0.4.40.crate 51844 BLAKE2B b51c771611c2c1bc6a36d25493dd775bcb5891a2e4a8ae918781abe66c0335a3da30c5e44281fa5282dace34c09754fd2df840c0d74e5b0b4624a519fd455a8b SHA512 90bde0dfca91b6c304d5bcd4c93c653c066b76592927f5ed3025752d6d0244c0d5786c44af99df94dd6cc7a417663205d86f406a3b60f7307ca3c1757239bc12
-DIST tempfile-3.10.0.crate 33376 BLAKE2B 303e3bbc2492fd965c5e5ca02229868e94de1b1286175a07b3f9767a174c5a83bb6f6ab59d582f963f9cc4f92362be6a8e898e140397e4314bc18bd8d4e13249 SHA512 0f9bb6420105badfaf7e59f9679b53c6e3f875208ad8b08b9bf38cf67a1512742f1e3dc586136ec9cb760d127da6be69e9f9ed55f18722edf1af3a452e7d93fa
-DIST termcolor-1.4.1.crate 18773 BLAKE2B 34676efbde8e242415857d6d40a287ae3459678d8222f5144faefb8c84d635686f640e79588d98635c8f25b7628ec6663a01b16e1e462705b5cba7e8b8e61f44 SHA512 b66aad157c4fa2985f764321d157dfb1f0325fd633811870db7919b5579bf7bc19fefe99e1c706cdfa67504c37dc2ca3d283e11d1bb516edcfaf1eb7747a778a
-DIST terminal_size-0.1.17.crate 9141 BLAKE2B 048d8e8e9dad08aecde12323681d428b9182afb737136cd6699e13d231f7882091c9167cb10a08e5151df912421a6f89132645627e42ccc73d07553cadb1c8cd SHA512 96ec1bc8abd597f01ae59da567036d5d40b422764a4da662e2030c3ef4ce80a983c8b6a4ef1f34d88e649e0b1ea27b206d56a31924bcd2d31ff7e5a2e96d4201
-DIST textwrap-0.15.0.crate 52998 BLAKE2B f6c3057ea6ffde88dd9824cd3159d398316d9d21f327d2af59239ff84d79f893a9d0e96dfbd883aab6c64b631dc99457018e38baf14d40789f02d633425ded86 SHA512 f44271c542c22f17a4e3a459255f95e6c02d999f7d6bc8414d3973fd4ac9353aa4ef436932a45340738126905463d776902715feaa9329371f8a14f14b5a7bfd
-DIST textwrap-0.16.1.crate 56012 BLAKE2B 9b5a7c76eca64d089f4fab7095f2d35624527ca223e53b03cc807c6bfe913a99b55197b973a3102e3e5c4055bcd6ab580a0c9d67657180b61435bd6eb7631211 SHA512 3a8d2036c8e4b88866d68b8066a2991756f6bd4ac5c726e63fdffbc894fbdc03bf8b6e0ece4b96684c8e1facb6413190768d51a8539094efe47977c120d31f1b
-DIST thiserror-1.0.57.crate 20993 BLAKE2B 4eb90b8ee027e39102d6c030176db94510180f2bd2966503501ff89ca6b49afd61e6d9e1ebf18c08d374ff9de4e958dfcb3da8740fdfe31cceace5be456bfe4b SHA512 0ff7e48c3696f4f4c6af29f3142f0a7bb88a07b7a9877ec243e3ea15d89c48f1898b731311da5d4a7c88060628cae3eeea6a4eccf25bd851cb3075920cb1a936
-DIST thiserror-impl-1.0.57.crate 15639 BLAKE2B 2838235c5536fcb16d19382fe286850d6fb882b1d77ca4ade6a62e1d4727ef89f69cf0383cf330996f9e2303226d5fd709557331a45c9a91393db1788fbf4422 SHA512 a850806f09b232546d1e0df5e35cd961a8aa32f1d8ac3b24df360981da53b75325a46dc788c994042c95a5887fdc77234b9f6ee5851242f734a613e579548e3c
-DIST thread_local-1.1.8.crate 13962 BLAKE2B fce2feddaaebde42bdb83d814929868f06387a4fa25d5becc73ff0b983395aabe076268569c6a89e2d90ce6e68d2ebca7c3e0ba1c9159c61b32631ce39289a9f SHA512 6d7e3941f43c43ac091db5d1cf2a8a3892b54b0634d9200426eadeb82015566532f04b6040085dbdcb10580ac724b6ded8416931d764d795a5f923aced66c492
-DIST time-0.3.34.crate 118430 BLAKE2B 6d04a20596c9b0961ca104748d9d360f07b16059719d7410fdf1a7a0d5f2aa02aaebf640999464835964bbded2d3257d79c4b0ca3080fbecf13dd2d0aa6962fc SHA512 3997e1b8d9be2f54184ebc9e1355d4b65f0b7bc9439b2b29e4a4acd86ad3a3aa019261112a24d998d76a7f66b266a86536fa50412279911b14d4d7aa7078c116
-DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52
-DIST time-macros-0.2.17.crate 24443 BLAKE2B 5045af9352961db0c97cae2f6ca3e8d2c4f89a129c7ac2ec1d8d20804292aa9f2901a61f910a564954614b68f39311bd381deeb66fed8bdac423227d077f3d14 SHA512 c81747f0b74e68d3b3f36d378ac5911dece8c6b511e5ac793807f854cc31c812b927d0df941f55ff90d3d67512d0ac6a5f63f2de4322c81b05da42f46b4a661c
-DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
-DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
-DIST tokio-1.36.0.crate 757286 BLAKE2B be9fccb7c41fa6a48f500509ce7b7ce0e1c831a5ee51772ed10fdf054b5872395d0037864f10da4d8cd160d15e8dd8e2445446de75b8e8613debd01e530fd0b8 SHA512 0687980dd375965647c89cd6f569f74ded6400dbbf73318f02d8221e8f49a03151a4f023fced542cf63197d7bb150ca45417c10dfd91517d10bafe0d329d6848
-DIST tokio-rustls-0.24.1.crate 33049 BLAKE2B b061bc5895b9d7e5aef96512667673ac6fb813a4524b1f6620af9e2598425662b15b5e07d3896499b8a24d820462d15b71a2b9cc804886d546c8ac5957f28529 SHA512 93098f34d117107214e2e80e0e6c030423850ba160d1858b5149c165643700d308dacef7723e45b79fc911ba13bc1bf363c89ccac047cc6636e48a9a5a9502fa
-DIST tokio-util-0.7.10.crate 110508 BLAKE2B 073b25e1484d54911bc15fc2a4b3fb7658f24f7f77a2382f9f84c5122871cf8c5d6097d5c784cd75b17a79aa63eca80644ff54bb496b52e53bb89650ce35cab0 SHA512 d77db36cfa5a2ace3090874d8996b9e94058ac31648308da8dd92a7bdc9b9b61adb703dbd2131adfef0b428cd61b4de76fbdb674f718e89b297f762af11ec50c
-DIST toml-0.5.11.crate 54910 BLAKE2B 9ecd5103b33ab47d4be23c897c7095ca381cb79bedcaac4918cddc36fc7cf5d34ab664da52c2273d935f04486e9325241d6b66785d50aac78453c219aab49e1e SHA512 eddb82aeb8fdeb5436579292c6f7a64a90a2c7bb54070beb437bc7890b99795d0505faa8d6451a99e8bcf440f78db8a1b273a697c8ad44275cc4163a9ee49317
-DIST toml_edit-0.9.1.crate 95895 BLAKE2B da4842912b37b182bba9378642639aed7593160948b3c83be48d13dd7ba16268fd9df2d7f43cd7dbecc88826bfc7edde02715dc24bba657d6cce29b93db159c0 SHA512 7a1de36d40894c22671e354d409fc0507ef1f9951b081c25ed72e4d900cf0fb5ee739b53a4084650ba932d74c9cba13457c6c87137c9aefdb9b1d19c32c3ecdf
-DIST tower-service-0.3.2.crate 6847 BLAKE2B d4571704eb4bf7f729f4535a04b7eb94f644d71ba8c5604297843351adf4bcce7ff64ec4e5435783ee6ada1b0a5c97726cfaade391525c6b2bca933cd5e8ec19 SHA512 f4578421603067fa708c4ad9eca5ca096b5262b6d51a404f37d9fbb6c64f027cec6114991e4b7f8324cb756c033971a384f1804add28e00d0cd6b2ee01d9e005
-DIST tracing-0.1.40.crate 79459 BLAKE2B 33693ee71564fe5925a63dca351e838dfd8612b4b1e49a33a70095e56ca63287c13c772661ace0e540d08c92942d7cbdc51ff2cce4f4b372164d9aa20ec05dee SHA512 5622188a45dddc0d6d3a8244a9b12db6221f4180944ce1019d18f4e613e4bd113dae5d45fb57dd0754f6e8e153b047cdf00c8f200782bb2b868bc2d423d99275
-DIST tracing-attributes-0.1.27.crate 32241 BLAKE2B a20af0f50a90dcd64e5318e55779142da294ba18d1cd40059a8aa964fd3c92834e03ee563e41caaeef71a30e3f027e5c8d167d90e2844da79e0774b267e179b4 SHA512 7dc59f4234c3bf3434fb352baed2b81db4e931eeb3ed207c4a204e480da734be40847b167b808058d2807b5583815625bcd5153e2bbe79804cfa6f069a74ffa0
-DIST tracing-core-0.1.32.crate 61221 BLAKE2B a7815c46af9852ce62498083103c6d359351f4d33609b4291330073b6abf4b63f5e1bb1a7dfed3bbf4d6913ad5217e96999416261af8a70609408a29109e4db6 SHA512 164f79cacfcca533a53b7dbbdc2015aaf851a16e00c72fbc4e5f515b6a6dedfa464e964810009b54f08cbcdc5a314e50245ac7b1b01a71fce4c63db135bf5521
-DIST tracing-log-0.2.0.crate 17561 BLAKE2B 701bdadd40f1343f3c4901bd8dd188f1dbc0afcdf50807bd0f6df7539635e239b5095696872103125a4d4cfec24af6336fce6f3931363dd5be4f53a09fa584f2 SHA512 0c1f060e8ffb9ff24cee7b85cc2d7d42c69b2f7623a7faecd7422b23b11ae8d5c7691e4635bae76861d444c369d9701ccb147904668023642b223e442e3c8285
-DIST tracing-subscriber-0.3.18.crate 196312 BLAKE2B bc2f04da63b0313d26073eb4a39b549ae37701e4dbf1fe06a2483279a03d9dde981f0efea6ceb5cd441ab313bfe7eaf812971c3ca60dfd4b5d9cf0d2eb7bacd4 SHA512 72f91855637aa476f03077d5f523cbc94989d40b12d7328167f88b081869ed096e6370450831f6cd5f0686cae5628f14eed4696c06a2ec75f56808b64445e0c1
-DIST tracing-wasm-0.2.1.crate 9372 BLAKE2B 5cdca349f6a4552e2d22812260c7ad94a2f2a4d0e94c9fe7edaea22a840d439e90425ed65ed7f572f46451626689cb1609e85722fac80ea9592746df29d2e5f5 SHA512 9ac4db2c9bd3f19351e5ad40a03da2ec9cf4b7d78c1d6ffd5fe55a4f94524adf90a0acdc9d97ef6e4399b90c70b90c413f2726e5cab9e9c79877105b5d00f342
-DIST try-lock-0.2.5.crate 4314 BLAKE2B e75c6c0d7c975e294e3d723e2fb023067530ad6db3c7bdbe89b9558764606fd1a74f0d1ba787d85266db1912dbeda85408e85646d0f7cb24496d743b7a18c705 SHA512 433db3c52f55d78220db414ef6a7367791dd66eac935f41dcda85ec9200f0eefeab6e8342e70aabe35c300069c0e7b7c4f8d63a2334b52a081cc98416371ef08
-DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508
-DIST unicase-2.7.0.crate 23783 BLAKE2B 2b74b932b45c9d5b984b57bfe8249496c192944e2e66916919177eac81c509e2d7a5d30a85ea58e8cd5a0b47fec746bdb18723f3f14002fc64af3a0d320a9e7d SHA512 c2b05a3bbd8996e1cf65d7458f5ad95de9797c8349484f8db04967bde15c1f057f62b2f7a60e7367871512071ed5076c0da042169dbbdcaf4d6c16cae62da828
-DIST unicode-bidi-0.3.15.crate 56811 BLAKE2B 1f1d372c86ec7444f13eb32baf13dfc8699b52156b265a2b53f40c0d771064876405451120fe54739a2679e6991caaf4f63e0644f03729cab814079fef4868c8 SHA512 7a21d5eb05ea8d691dfd54ce4cf7d3693d08067f7a88ef17b8c3044634f46411176b1bde1516c442577910b254007b247f5e40f9932eb601cd96cd574f9d9db8
-DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
-DIST unicode-linebreak-0.1.5.crate 15324 BLAKE2B dc560d5b36ed01357c22750feb7f09fd0f57fb0ea543180f6e31c0b71b51df4faaa70ac8482f9cd60e5d1faa5bfd4bebfbfd628dd5913c2c4a858ec04beeca3f SHA512 f37be2f7b04b886e95bb7d0f33bd392b78bb940ef9a01cec487062cf31ec0367306650fad7004df556887a324c714eeb28f697044aad9a429ce07b7b7344af60
-DIST unicode-normalization-0.1.23.crate 122649 BLAKE2B 22ea5ce3f5a2b371c3c8782321b1bbbee724db1e4d8c1d43af4e6bd8044b99307c227d93631d178d10fda445a941a485882ae0015a6e3d3c347e4bd465bbe1d9 SHA512 539f04010810d73fde7b0ab314faf813f3e7ecd2e51d7975281554b7cba4a8706e2b5523c4b7840568593652360ca59e9db0e1ce342e71c28db635ff55ffb0f5
-DIST unicode-width-0.1.11.crate 19187 BLAKE2B 6baf7f3b32eb838925e591792abfe11968206d177facefb89ef51daf44c18f3fef1e41c19a47b88b81be50667af626af2024ccc540b240fb6e1d83fdea57076f SHA512 ee06f4144525424327a17578642565f396802f0eea539b3bebc8d9627376a8bc6c5376d83a6ee577068e99fe75815bd765e6d49fb9ab9b253d00594bb15a5ffe
-DIST unicode-xid-0.2.4.crate 15352 BLAKE2B 80c327b39f3b8f2cdb5747cde968cfa1efe7b65b6bee9136adc881fa19f66aa5b1010d9d08de55a61b322d665b5b0cb0395e9ac471f6333c40d8dca5d97e123c SHA512 e67bd1258e1961807d9d5fe583a89ab5b82b2a529ecd32cadfc79aa5331380eb4a2db9fd96b74c8eace47f2f29021587d69bcdbf79f7e2650e92a25f7839d03c
-DIST untrusted-0.7.1.crate 7924 BLAKE2B e0152791e781a4805120e3437b7e0219db3aa0282af4faaf2cfb15718421ff26abc56021c546f6aebb411f5abd27020273ba0f785e012a4b0089e96c2db4faa6 SHA512 5ebe3266912e4e78fdfdd13f9fcc07e9cf489d19d5e9ff346486f47aa58a0aca35278d561612c49eb3cab5a6759ac974d3b92bfabc399e1bc0808428dc347be0
-DIST untrusted-0.9.0.crate 14447 BLAKE2B 8e9c3ae09435af0885bc4a6e3c8943805b48cfc00bdae228c7c43093254e1be15d7005d1026561ff369ec37865d8458203f421a9c89ae3db077f655449621aed SHA512 5929e4079c1c2ff933ae8d8f59a2ecc7a424e71a20d1b8821f75925af68bdf82604b024c008e5464b02e25ff093e561a352b685e755b3d0b27e4c30254689416
-DIST url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb783132b11ef3ad156a03524f4730f188d822dec85169d7474e265099296d6bdd4adf5ffaa0a118821617 SHA512 4aedbc48b85bcc2853189f5fe8265a01c76516b5507f4e958d8d0b860fe2590c69c95f0f4b9fd6fac9b8d5911bcb0a5e9ab7f8e8b600f37a12db1438976ee5c3
-DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387
-DIST vec1-1.10.1.crate 32858 BLAKE2B 4770a1fd2df41d6ea3fa8c865abbec1453a9f1e4418da76734140af5d43df6bf25b478016313720f5e5017624134b1458b3b18ec93379e208bbf098dbb045c05 SHA512 f7f4df99d0b71582504b12815b6c0df548bfd92142103e759e2bea3ecf4d0d5429c1cf38fe686e2b17ac68f3d675b0517a3895a9e9ca670c24eda4dd47c797d7
-DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
-DIST walkdir-2.4.0.crate 23550 BLAKE2B b4298c01cb38be0479b7ddfee627af01f889b6b6ff432e368bb67f65134c3958a4fe271a5a7dd61b19259ae88f5680e5ce8e12e50a872b05fcba68f59b7073ec SHA512 09e1bc852c01b452c95b26a369831a97bc5c9e0ada3111c73774570dd73bb5b9e4735317d5572304fb48dca44ce7b9f77bbd17c418b6b047b2ab17b8bb42d9d9
-DIST want-0.3.1.crate 6398 BLAKE2B bcc1384bbb86db27b5e082b29a8dd4d89c37b40f6cdec4df8a86c8d205b418468b6cd42a78bd14ebaba057b28e151c00b474c098d7596f49a823ce33510c13b9 SHA512 f93f765113f035e134b967e8eb3f4511b8e03e793a47899b614d826afac02348fc02865c298a10410ecec4eb64f35f66c22bcbdbe36ed0c4c1665dca1db4d526
-DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
-DIST wasm-bindgen-0.2.91.crate 182689 BLAKE2B 4ee85709546462be3da2a6f1caa02448fa903c7411eb264894aac402979afae4a0d7f3dbb486266b05d8caa911893ae9bfe9921cd36e03eb5147a8d75d6c17d2 SHA512 80e91e5b6094eddadbafd842a4a1b3284de7bb51bbd795e8716a0adac354dc14ceee0593d7c33090de06aadc8bc61b8eeab8851d066cc4ef4661e64adff1988a
-DIST wasm-bindgen-backend-0.2.91.crate 28345 BLAKE2B 912a0471ac64d61f18d1c1749a3614ab70d08f330fd90b903ce5ef51f18288c7d4ef153f1d8100671c02de8fc499928cf925bdab4da4f0352789268dfae87457 SHA512 7d3c8db4503982fae9c86620c964e8f9a4ce542a79c56f21d9f82d26bb9418e78b7fa9922901663bf78516d58652dc3255ef48d1e1f042d8a3c69210f5804204
-DIST wasm-bindgen-futures-0.4.41.crate 15382 BLAKE2B 4556c439efb311b2624f57fbed58c32f7db1e0ee7fa03d92525e9a82f7397a23e3f2f751774e60fe402977875be2fb665c83b71ed9b121751dea8cf94e8d4fac SHA512 8aba780d8d1c18f78e3d83efeaf83db72382d89ea262112100424dc082110e4d71eb173cee8c6b53f5d872cd74c2e4091770a9af829a45d466a65575b7178636
-DIST wasm-bindgen-macro-0.2.91.crate 13898 BLAKE2B dda8dd5d77dc57324b633f056805bf7892c39c5e70257b6d048c2f8cf885f7306f91f3f17de1b63dc740db66d52fe2250ba981077e03dcc731dcf7c80c047c9d SHA512 6b05e0a2657e7e4f313089787b52cc7f59f5a94be6f716ba007fcbc3bf7c38561225ba3f39245d779e28dd30630b2d4c6be12baa6ea1e6cb47e562ccff48372f
-DIST wasm-bindgen-macro-support-0.2.91.crate 20091 BLAKE2B 337b1b2a9e9e9c1350267df0d9f041291a847cf4faa3bcd6fcc8a96e66fda54685da72f6e64e57cde0d4609409ebdc7851e96781f599470f8b0545018bdc2166 SHA512 1277682520d88cb9529adbc054590a732a8890debe33d1d64ebce332c66c02f84065c0f643fa45c01de8b80534b2daf8333979601323b3ed50dc49553233c39c
-DIST wasm-bindgen-shared-0.2.91.crate 7267 BLAKE2B a9dca2db84a33c650a7abbb6dc552bc4bab1446e66aace751d3709d2c63b878b127748a83cb174aae3ff8c5f5ec017b97623e5e9294e6ebf92d669efc618c357 SHA512 97072a8bdfadde104f6e9e760e1ac5ec665fdaff38a93a0bf601c95e652b35403e58a99fa8c0fefea6e47b38fb97f2e1ffcf52736f9ab890b0b9632efb26cb4b
-DIST wasm-bindgen-test-0.3.41.crate 17595 BLAKE2B 90a53dd0752df24408f0a8ab852ed58de3b798a6e2f7d0d1f5e042e3791f37bd41470910a03773db718c1239eaf4bf1aca89bb6813c442261c9ea4d226ae6c3d SHA512 ab0a67d5c92a80ceb386a79a9fbd1c143862ba093ca888ebd6b3c095780d36dffbce723bfc0262fe310492ff7a141515b0c39cb87c99206a5d946313344fa206
-DIST wasm-bindgen-test-macro-0.3.41.crate 8539 BLAKE2B 05efe3c626beca1b10e444f5a01cdd6a70a242f9b536590a57e1ad43489b0a1670734d885be61dbeb05316e9ea193874239860f6836c9b773b6c2efcf578ecfc SHA512 b29fd455885d0a9f07a17460400f14d773820a7b33d345c156f0d62b1f8670d69775d6b966a465654667c1e202426d1587f57094bfff26e2d965f3f642104ff1
-DIST web-sys-0.3.68.crate 728353 BLAKE2B d0e8d47bb44e83f376b3d3556caf2d243eeeb5f2798fed767ce3cf0eb0c67fa13b74cdd9a9999f48de06fd2f2d720f68b602ba24c20b50fa6e78966e5cc19893 SHA512 f4b537310e9900410bf4a00b382c2bff29317efd2ccfe12b9680dd3ed49a896eb8e8e10d9964d463f1627cc9df1e27dfef1c86693e90b94ce3c488915762d88e
-DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
-DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-util-0.1.6.crate 12234 BLAKE2B b8db8ec9d7ada5532a22a2d070320174c32ece1f48890e9b028708e194fe72a04287b11910dc2ddc7f9c9674a9d8d39449b3e100725e1f59e59e3047a7e3650b SHA512 b1c949f9bcd34c1949a9d3a7bde6ce62fcf3d2cb66df60af41fe67a9d1acb24e571cdd5ac721be9f1ee4b3af5ef5149b5724ad6e02b558e124ef2a4412d12db9
-DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed
-DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03
-DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709
-DIST windows-targets-0.52.0.crate 6229 BLAKE2B 4b1efdd32202f112d3782b586ce60667f5d3b6f97ccae0d7da833aee2ae81ceece88b5ef4126db2448c9019de3f77e4fe66ed4286bb6275d9a5e8ab74725b804 SHA512 0ea09552d89b802ec0d419b640fa02d0af7af602704a0e88ba10f81d123dee0c907460f6ec91224177ec9a948970abd7414740eb219148a4d66c269c2362740e
-DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996
-DIST windows_aarch64_gnullvm-0.52.0.crate 430182 BLAKE2B f23370c62c4ab3fd885e3ee22e8ec2fb5a3a837a57044c1df3f9986dd4e7e9d0a44ec58be1648a41e1ea4d037afa3077f0f03de0204199a82fb8395731815a4a SHA512 b7c3fe0a2ad5149be0df48fc7a4d15879eb130bd9441c58c25fc71b8a91483f0b553fb1bf29a9302acd348e9083a547430a840b059b0cfe19867ecaffcae986f
-DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff
-DIST windows_aarch64_msvc-0.52.0.crate 821663 BLAKE2B e6f772858205f7cd871722136aec4d00daea4793ff9dcae53e6311e74526c46aa11c2b3df7a85e6c577757254cbfa5a713e68c694625ca274b64e7a1c5532c23 SHA512 8446bfe5b9fe538415762c8129ab3bf2fe45482e045bce367475747786602ad4ae1187c6e508dd9d7b6be81bfc8d430e0db9c624e35c7cc52e823023e46f5cf1
-DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a
-DIST windows_i686_gnu-0.52.0.crate 870285 BLAKE2B a7688062a128a1b1394b3978210334e4e2aaa10dce131457c4a11ce0cb3f551e7f4962d1ece1846d8e9526983ced0e0a3ee8c933858e9314b62e76381e086ef9 SHA512 fe993f5bb6e039c257be9b35337e0221f718d23866818bfd19c76aaae236aafc2de4bb5014fcdf919563b5901cdaa14a2136cd086eeed3c83e46a5d02f6aa77e
-DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e
-DIST windows_i686_msvc-0.52.0.crate 888693 BLAKE2B 7a6e9d03e503c8f543e80a8c7bcf3f50cfa7eed462e487ae7b581746d7cc4d871b33e307110d3a3a75226d88e837f9452ac56bf3baf71b66cfab2626cc15558a SHA512 817ac796fd00bed51d80133ec873cf3d3d582ba41fec8a6f6407fbd7544f198e928aa5d710f70c13bbf74a1dde4c91c54e65eb9d3b7518a7f011ea42725eb671
-DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74
-DIST windows_x86_64_gnu-0.52.0.crate 826213 BLAKE2B 3ca03285ef289fc844261142154e710e996c29940b1c0a7dc3016906ff6452fa50b24f8668fce0ca44bf169ab1228c217fece9f7bddac9ab8bdc54fddafaf8a8 SHA512 2d81af56ad0bc9536f6e066776642a546ce6c6d99551edc0603ffcafe6db15d5d5a32a642b204bbfadf34231daa3894ad7897a9c0c575c2b6bc1e3e58a9a3eb7
-DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa
-DIST windows_x86_64_gnullvm-0.52.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534c68d23f3be0fbb6a42b3c5518cee14373e645038526da15e849d14abe45c53766a30c6c2042a626482ba4a05409f325eb6aa36b1 SHA512 e88af35fd1c694dc189783e5c81aafa61aeffbddce4d7130e1125d0ce3d932fafeb345990ffd98477c41b578b7f5090f4f9c0457b02146309b95549c9f8f44f0
-DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
-DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7
-DIST winreg-0.50.0.crate 29703 BLAKE2B db9a968ef96cc07bc1088831affc4627e09c7ab8170a54fdf70a599c2d6180a8a9ac46b6304b61fdd2fac96e01bb004ebd8051940300c7b52c5b7b7975732d11 SHA512 2f52a9e3ab794665263499c88dfdf06009c6477d180a90ebbe86e786ae7f5003c9dc8b3c26224024e79450f3b94688000458f2ea8b1ae1c3691453c3d4df4787
-DIST x509-parser-0.15.1.crate 91123 BLAKE2B 2ceb4174704978413e07b63e15e1b0b28662da2a3623abd5d439657e1c3a310e30dc25855d3c9366b8fc6cb81640e0c7e7a289c06a104d1ed8b62f4f7ca390a3 SHA512 43d5f9c7a76627bc73b045cabb26682e37b3b92e5570e467d508c5aaaabb1eb278043e195fac5c3a2b04d7b2403e49e47b731889ec15915fff3203217138845d
-DIST xattr-1.3.1.crate 12580 BLAKE2B 25c414d761a7fcd23bbe057add62c6da971cf33149066aa024320ab80e0ec8e8e8d5d3d0506e8de954b8f8c178d34c52a00a5fa9aa109510678098a3e3564b7f SHA512 4047abda42b949cf58f820e15ee99850de483857bbaaef737eeee48e1a2132972470f15bb2ddda56438f6a934918be96607a8de518a5a3dcec7c8ee6c00ad280
-DIST xxhash-rust-0.8.10.crate 20066 BLAKE2B 5fca80ff05e00d5f78c2655093a963b08a16d2bd40e74e53c9e48e9812f81d668f9d60cd23872cb76ecb643cd381eddb841da5ba93a5f9fc92e42e6d8bb7e871 SHA512 c5a66c4c7a30dffe9d925dbfa8d0b5ae5b825770cb5d52a0d5de2eadf24c9af1b08b11b2e7a94ce60a30dabb2ce61cd3066cc781d05c90bc6a9d46daa2e04b71
-DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
-DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2
-EBUILD gleam-1.0.0.ebuild 6620 BLAKE2B 2cc19c7446743271956268d49d75677ee85fdd6f8726443ac87522742512bf8bcc7aecc2c5d4f2f97d8d0d61dc78613d2a5cac50f5f6d7171f9f23512ed194b9 SHA512 fc8a4b747f9ced658f3f181bc7f19c4797314f305380502d4d7708609e4a959300b9ff87bdeb3ea197281b2a510aad85b4dc4928a271311867b0d4a37f9e5d68
+DIST gleam-1.1.0-crates.tar.xz 28586380 BLAKE2B edecdff51966a0091bc915d7e3d4f8d1530f62dd4cb6b2b5d235e0512103c614df028351e61b6793bc56a79f469567a95224cbae3dee7b4932df23d21a5f3c5f SHA512 221675cab2b1ca6e61bbe1a87976640d25e741de4578a8d7ed5be3e552d784596bac1905af2ea06d1b3c5c6efb1ec189aa682d3e9e3f6462fd09d8b31af9603d
+DIST gleam-1.1.0.tar.gz 882622 BLAKE2B 7f3ff5ce346e3f1b8d7a13723ea649f5b6e325a563cd3f4e4c0b227f3d9e4643e1e9cd403dbe9c5e8c93e47c2ae6fe1f137250c0155f8b4acbe324fdcf9efc91 SHA512 265867096b758ab554f0b4228d95b40a30d5796499b29775465d8dc3cc3ad37cf517cf979f33d906229dd33e424708e40a13ea6cf9932b54c573cd2335788695
+EBUILD gleam-1.1.0.ebuild 1002 BLAKE2B b3d0103dd43b516f290ef34cf04f384db8884937774c03b308baf93f4c208ec92f09f71cbc387241ea889e556b2d78f95e03f352c950b9a1b7d54e39008efd99 SHA512 cc158df3a11ef0e4a495eaa640ed16778519ca3d9c5796cd43693c4d5e6124292194261bfe3877a76881276b3f0fbc7e4b57d8926d9bad2d9957c1ff9c09fd6a
 MISC metadata.xml 339 BLAKE2B 75c47a1669f737b04e1ca54cb3d222f84f408ad4d24ae8c505dd0d6644b4c0069618cb8ef7f5c773f271c3ac1ae8d6a625e0a4cabadbf23b9eae0c9ab149d3cd SHA512 5f769e170ffff7a528f5de910ba8ff1c525214357e1e421c2b6a922700ef77271b91687c18708787195d6b28179a95dc171082c1e94291bc9fef8771fb7c7086
diff --git a/dev-lang/gleam/gleam-1.0.0.ebuild b/dev-lang/gleam/gleam-1.0.0.ebuild
deleted file mode 100644
index 11a55308331d..000000000000
--- a/dev-lang/gleam/gleam-1.0.0.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	addr2line@0.21.0
-	adler@1.0.2
-	aho-corasick@1.1.2
-	askama@0.12.1
-	askama_derive@0.12.5
-	askama_escape@0.10.3
-	askama_parser@0.2.1
-	asn1-rs@0.5.2
-	asn1-rs-derive@0.4.0
-	asn1-rs-impl@0.1.0
-	async-trait@0.1.77
-	atty@0.2.14
-	autocfg@1.1.0
-	backtrace@0.3.69
-	base16@0.2.1
-	base64@0.13.1
-	base64@0.21.7
-	basic-toml@0.1.8
-	bincode@1.3.3
-	bitflags@1.3.2
-	bitflags@2.4.2
-	bitmaps@2.1.0
-	block-buffer@0.9.0
-	bstr@1.9.0
-	bumpalo@3.15.2
-	bytes@1.5.0
-	camino@1.1.6
-	capnp@0.14.11
-	capnpc@0.14.9
-	cc@1.0.86
-	cfg-if@1.0.0
-	clap@3.2.25
-	clap_derive@3.2.25
-	clap_lex@0.2.4
-	codespan-reporting@0.11.1
-	combine@4.6.6
-	console@0.15.8
-	console_error_panic_hook@0.1.7
-	core-foundation@0.9.4
-	core-foundation-sys@0.8.6
-	cpufeatures@0.2.12
-	crc32fast@1.4.0
-	crossbeam-channel@0.5.11
-	crossbeam-deque@0.8.5
-	crossbeam-epoch@0.9.18
-	crossbeam-utils@0.8.19
-	ctrlc@3.4.2
-	data-encoding@2.5.0
-	debug-ignore@1.0.5
-	der-parser@8.2.0
-	deranged@0.3.11
-	diff@0.1.13
-	digest@0.9.0
-	dirs-next@2.0.0
-	dirs-sys-next@0.1.2
-	displaydoc@0.2.4
-	ecow@0.2.0
-	either@1.10.0
-	encode_unicode@0.3.6
-	encoding_rs@0.8.33
-	equivalent@1.0.1
-	errno@0.3.8
-	fastrand@2.0.1
-	filetime@0.2.23
-	fixedbitset@0.4.2
-	flate2@1.0.28
-	fnv@1.0.7
-	form_urlencoded@1.2.1
-	fs_extra@1.3.0
-	fslock@0.2.1
-	futures@0.3.30
-	futures-channel@0.3.30
-	futures-core@0.3.30
-	futures-executor@0.3.30
-	futures-io@0.3.30
-	futures-macro@0.3.30
-	futures-sink@0.3.30
-	futures-task@0.3.30
-	futures-util@0.3.30
-	generic-array@0.14.7
-	getrandom@0.2.12
-	gimli@0.28.1
-	globset@0.4.14
-	h2@0.3.24
-	hashbrown@0.12.3
-	hashbrown@0.14.3
-	heck@0.4.1
-	hermit-abi@0.1.19
-	hermit-abi@0.3.6
-	hexpm@2.1.1
-	hostname@0.3.1
-	http@0.2.11
-	http-auth-basic@0.3.3
-	http-body@0.4.6
-	httparse@1.8.0
-	httpdate@1.0.3
-	humansize@2.1.3
-	hyper@0.14.28
-	hyper-rustls@0.24.2
-	id-arena@2.2.1
-	idna@0.5.0
-	ignore@0.4.22
-	im@15.1.0
-	indexmap@1.9.3
-	indexmap@2.2.3
-	insta@1.35.1
-	ipnet@2.9.0
-	itertools@0.10.5
-	itoa@1.0.10
-	js-sys@0.3.68
-	kstring@1.0.6
-	lazy_static@1.4.0
-	libc@0.2.153
-	libm@0.2.8
-	libredox@0.0.1
-	linked-hash-map@0.5.6
-	linux-raw-sys@0.4.13
-	log@0.4.20
-	lsp-server@0.7.6
-	lsp-types@0.94.1
-	match_cfg@0.1.0
-	matchers@0.1.0
-	memchr@2.7.1
-	mime@0.3.17
-	mime_guess@2.0.4
-	minimal-lexical@0.2.1
-	miniz_oxide@0.7.2
-	mio@0.8.10
-	nix@0.27.1
-	nom@7.1.3
-	normpath@1.2.0
-	nu-ansi-term@0.46.0
-	num-bigint@0.4.4
-	num-conv@0.1.0
-	num-integer@0.1.46
-	num-traits@0.2.18
-	num_cpus@1.16.0
-	object@0.32.2
-	oid-registry@0.6.1
-	once_cell@1.19.0
-	opaque-debug@0.3.0
-	opener@0.6.1
-	openssl-probe@0.1.5
-	os_str_bytes@6.6.1
-	overload@0.1.1
-	pathdiff@0.2.1
-	percent-encoding@2.3.1
-	petgraph@0.6.4
-	pin-project-lite@0.2.13
-	pin-utils@0.1.0
-	powerfmt@0.2.0
-	ppv-lite86@0.2.17
-	pretty_assertions@1.4.0
-	proc-macro-error@1.0.4
-	proc-macro-error-attr@1.0.4
-	proc-macro2@1.0.78
-	protobuf@2.28.0
-	protobuf-codegen@2.28.0
-	protobuf-codegen-pure@2.28.0
-	pubgrub@0.2.1
-	pulldown-cmark@0.8.0
-	quote@1.0.35
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	rand_xoshiro@0.6.0
-	redox_syscall@0.4.1
-	redox_users@0.4.4
-	regex@1.10.3
-	regex-automata@0.1.10
-	regex-automata@0.4.5
-	regex-syntax@0.6.29
-	regex-syntax@0.8.2
-	reqwest@0.11.24
-	ring@0.16.20
-	ring@0.17.8
-	rpassword@5.0.1
-	rustc-demangle@0.1.23
-	rustc-hash@1.1.0
-	rusticata-macros@4.1.0
-	rustix@0.38.31
-	rustls@0.21.10
-	rustls-native-certs@0.6.3
-	rustls-pemfile@1.0.4
-	rustls-webpki@0.101.7
-	rustversion@1.0.14
-	ryu@1.0.17
-	same-file@1.0.6
-	schannel@0.1.23
-	scoped-tls@1.0.1
-	sct@0.7.1
-	security-framework@2.9.2
-	security-framework-sys@2.9.1
-	serde@1.0.197
-	serde-wasm-bindgen@0.4.5
-	serde_derive@1.0.197
-	serde_json@1.0.114
-	serde_repr@0.1.18
-	serde_urlencoded@0.7.1
-	sha2@0.9.9
-	sharded-slab@0.1.7
-	similar@2.4.0
-	sized-chunks@0.6.5
-	slab@0.4.9
-	smallvec@1.13.1
-	smawk@0.3.2
-	socket2@0.5.5
-	spdx@0.8.1
-	spin@0.5.2
-	spin@0.9.8
-	static_vcruntime@2.0.0
-	strsim@0.10.0
-	strum@0.24.1
-	strum_macros@0.24.3
-	syn@1.0.109
-	syn@2.0.50
-	sync_wrapper@0.1.2
-	synstructure@0.12.6
-	system-configuration@0.5.1
-	system-configuration-sys@0.5.0
-	tar@0.4.40
-	tempfile@3.10.0
-	termcolor@1.4.1
-	terminal_size@0.1.17
-	textwrap@0.15.0
-	textwrap@0.16.1
-	thiserror@1.0.57
-	thiserror-impl@1.0.57
-	thread_local@1.1.8
-	time@0.3.34
-	time-core@0.1.2
-	time-macros@0.2.17
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	tokio@1.36.0
-	tokio-rustls@0.24.1
-	tokio-util@0.7.10
-	toml@0.5.11
-	toml_edit@0.9.1
-	tower-service@0.3.2
-	tracing@0.1.40
-	tracing-attributes@0.1.27
-	tracing-core@0.1.32
-	tracing-log@0.2.0
-	tracing-subscriber@0.3.18
-	tracing-wasm@0.2.1
-	try-lock@0.2.5
-	typenum@1.17.0
-	unicase@2.7.0
-	unicode-bidi@0.3.15
-	unicode-ident@1.0.12
-	unicode-linebreak@0.1.5
-	unicode-normalization@0.1.23
-	unicode-width@0.1.11
-	unicode-xid@0.2.4
-	untrusted@0.7.1
-	untrusted@0.9.0
-	url@2.5.0
-	valuable@0.1.0
-	vec1@1.10.1
-	version_check@0.9.4
-	walkdir@2.4.0
-	want@0.3.1
-	wasi@0.11.0+wasi-snapshot-preview1
-	wasm-bindgen@0.2.91
-	wasm-bindgen-backend@0.2.91
-	wasm-bindgen-futures@0.4.41
-	wasm-bindgen-macro@0.2.91
-	wasm-bindgen-macro-support@0.2.91
-	wasm-bindgen-shared@0.2.91
-	wasm-bindgen-test@0.3.41
-	wasm-bindgen-test-macro@0.3.41
-	web-sys@0.3.68
-	winapi@0.3.9
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-util@0.1.6
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	windows-sys@0.48.0
-	windows-sys@0.52.0
-	windows-targets@0.48.5
-	windows-targets@0.52.0
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_gnullvm@0.52.0
-	windows_aarch64_msvc@0.48.5
-	windows_aarch64_msvc@0.52.0
-	windows_i686_gnu@0.48.5
-	windows_i686_gnu@0.52.0
-	windows_i686_msvc@0.48.5
-	windows_i686_msvc@0.52.0
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnu@0.52.0
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_gnullvm@0.52.0
-	windows_x86_64_msvc@0.48.5
-	windows_x86_64_msvc@0.52.0
-	winreg@0.50.0
-	x509-parser@0.15.1
-	xattr@1.3.1
-	xxhash-rust@0.8.10
-	yaml-rust@0.4.5
-	yansi@0.5.1
-"
-inherit cargo optfeature
-
-DESCRIPTION="A friendly language for building type-safe, scalable systems!"
-HOMEPAGE="https://gleam.run https://github.com/gleam-lang/gleam"
-SRC_URI="
-	https://github.com/gleam-lang/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB openssl"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-lang/erlang:*"
-
-# rust does not use *FLAGS from make.conf, silence portage warning
-# update with proper path to binaries this crate installs, omit leading /
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-
-src_install() {
-	dodoc CHANGELOG.md
-	cargo_src_install --path compiler-cli
-}
-
-pkg_postinst() {
-	optfeature "erlang package support" dev-util/rebar:3
-}
diff --git a/dev-lang/gleam/gleam-1.1.0.ebuild b/dev-lang/gleam/gleam-1.1.0.ebuild
new file mode 100644
index 000000000000..050a8cc09d08
--- /dev/null
+++ b/dev-lang/gleam/gleam-1.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cargo optfeature
+
+DESCRIPTION="A friendly language for building type-safe, scalable systems!"
+HOMEPAGE="https://gleam.run https://github.com/gleam-lang/gleam"
+SRC_URI="
+	https://github.com/gleam-lang/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~matthew/distfiles/${P}-crates.tar.xz
+"
+
+LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB openssl"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-lang/erlang:*"
+
+# rust does not use *FLAGS from make.conf, silence portage warning
+# update with proper path to binaries this crate installs, omit leading /
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_install() {
+	dodoc CHANGELOG.md
+	cargo_src_install --path compiler-cli
+}
+
+pkg_postinst() {
+	optfeature "erlang package support" dev-util/rebar:3
+	optfeature "javascript runtime" net-libs/nodejs
+}
diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index 2f5823bebfc2..b2f7eb44b43d 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -4,6 +4,9 @@ AUX nim-1.6.14-testament-skipfile.txt 1770 BLAKE2B 66f0bad52f0d3f374dfe040ff4ae9
 AUX nim-1.6.6-csources-flags.patch 371 BLAKE2B 903e9738f6c87bc40ef922c5abde50edaff223cdf11befee0ece7b3a472a68b7dc211e1e6347a2181c68fe524693832f20309bf90aeb3aac9d76125f224587c9 SHA512 2753e14ada3093a2208636eb36eb2a79946f7c4858d86945b1d242d424b1a4350403b7d8f58af33c1c43a04b24465748cb7f26b7426e65b91d09cc61167d5de4
 AUX nim-sets.conf 162 BLAKE2B 976422f31cf8a64e1fad537f4db38a07e0022b9460936c63e0220cb3858ba02704857841d5010ad8c7bde0e6192c4c3c1329aeca8080a48a728e8b288cefc0fb SHA512 61a07de9973fc77998515bbb62498ffd1de991241bf32805f4acc0e4325e39d767ac862f2546757763aa8d0a7f35b95a9e1df91e6aa6f241eed6e93c8e3c46f0
 DIST nim-1.6.14.tar.xz 5266632 BLAKE2B f6eadf44365a099f45d1b734dea494e5d098b0427791c19a5e0b7ee6fa8069fee606005920cbcbfd7c88a36ace870949ff797d1e37fc1f84e14d5dd1aeb4bd1d SHA512 6923ea98627ea48b5c939438618caa8e6860f248086e43bc101b543aa78e7c475bc8e56b8acb90dc4a3771ca0d2e27fbdda6a0b477dbb906acda8a7b39c272d3
+DIST nim-2.0.4.tar.xz 7620508 BLAKE2B cf7c737d734c5a468ac9229fb021bcd252c5c4f20ab091ec0ce27eb36ba44be8b438536aa39aa8c583483a7ce15dfbb91b1deb1c19794b3d77506d23096a4460 SHA512 1918b3d4a4fc02714677b2ca5051dc69e1d1daead2cf4dcc9b997076540d07d58ee4fe3049de86a37faa3143de1d3b95bedfa31f31d8463987bb267107459793
+DIST nim-atlas-0.8.0.tar.gz 59097 BLAKE2B 231b238ac3b15cc2c2d9ad927f80ae72d8ae4c649277515f32df6cc04275ccd38db5307d627572af547501e6522c06c86dc279dc3e13b5385f14e24032f6fe69 SHA512 747c13e2c5bd45a1dc6c1426f8c7637f638ada9dd4c9aa3edf4ef8367060e73226dc4bcde6380fac25ed47ebf4097fd223c72fadc3cceba8c71dd0f0571e47eb
 DIST nim-patches-1.6.6_p1.tar.gz 2632 BLAKE2B 64980d9510dc48e3c566473dc618d00cafba04783882d62b12015e8435c9c0515d7726da30f0b74dca6a41aa88a9c9aed2189a65b3325c28839d0051de8a3365 SHA512 7ba251675cd564452669bf5ec3748565db818324f58506f20a5036e4b54df10f4d7c149cece8cb97c853222cfa7d4d8d26856d92aaa25e613e31c6f5c2a8243d
 EBUILD nim-1.6.14-r1.ebuild 4817 BLAKE2B b2b06c8f4a76510b40c1a22f398695adeaa474ff2f86646cc0459291f841f44162914929c7abf541c92322bdc8501a3ed0bb1b97f661a4772d3d9069ae728f52 SHA512 f87df54f333d7fb9842ac7b375d750b006ba91826095ff435859ab059731218da45f4653570e88b01346fe4839e28a2ac2132efab8d2ff4e68fe3dc093d8b1ee
+EBUILD nim-2.0.4.ebuild 4404 BLAKE2B 371cc55c017c86201547ae54492eddfe9533722f0002fed0f30fb114a36972dd40ae8d2fe8412cb5a880aca396ae75bb474c9a1c1f65d24da4961bf6387e87ff SHA512 4b0126e95b7d04e714b41219e208f2818fbd20d269b1b8a8ad8408cc6037731435d19763aad351529eb456399002173b29087c00088f2021c0cea4adbff1e68b
 MISC metadata.xml 2157 BLAKE2B bbbc15b0c5590a22e276056a55ef09957ae5e5b0429122411e9d7570756873a5147bc8a00ee2bc97e887aa0d76668e3ecab10b495d67e5fd10174a0411d02f5f SHA512 b6d3010ddd9a0dc4e5f9698ac832cebe794c1b4b222d561448d9e43d9e3a581e5983c5d771bdad96957a100029efdb2804ff30b8b223b33ba5864e68fdb25519
diff --git a/dev-lang/nim/nim-2.0.4.ebuild b/dev-lang/nim/nim-2.0.4.ebuild
new file mode 100644
index 000000000000..706b0d3df3cf
--- /dev/null
+++ b/dev-lang/nim/nim-2.0.4.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ATLAS_V="0.8.0"
+
+inherit bash-completion-r1 edo multiprocessing toolchain-funcs xdg-utils
+
+DESCRIPTION="Compiled, garbage-collected systems programming language"
+HOMEPAGE="https://nim-lang.org/
+	https://github.com/nim-lang/Nim/"
+SRC_URI="
+	https://nim-lang.org/download/${P}.tar.xz
+	https://github.com/nim-lang/atlas/archive/refs/tags/${ATLAS_V}.tar.gz
+		-> nim-atlas-${ATLAS_V}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test-js test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-db/sqlite:3
+		dev-libs/boehm-gc
+		dev-libs/libffi
+		dev-libs/libpcre:3
+		dev-libs/openssl
+		media-libs/libsdl
+		media-libs/libsfml
+	)
+"
+BDEPEND="
+	sys-process/parallel
+	test? (
+		test-js? (
+			net-libs/nodejs
+		)
+	)
+"
+
+src_configure() {
+	xdg_environment_reset  # bug #667182
+
+	unset NIMBLE_DIR
+	tc-export CC CXX LD
+
+	mkdir "${HOME}/.parallel" || die
+	touch "${HOME}/.parallel/will-cite" || die "parallel setup failed"
+
+	cat > nim.cfg <<- EOF || die "Failed to create Nim config"
+		cc:"gcc"
+		gcc.exe:"$(tc-getCC)"
+		gcc.linkerexe:"$(tc-getCC)"
+		gcc.cpp.exe:"$(tc-getCXX)"
+		gcc.cpp.linkerexe:"$(tc-getCXX)"
+		gcc.options.speed:"${CFLAGS}"
+		gcc.options.size:"${CFLAGS}"
+		gcc.options.debug:"${CFLAGS}"
+		gcc.options.always:"${CPPFLAGS}"
+		gcc.options.linker:"${LDFLAGS}"
+		gcc.cpp.options.speed:"${CXXFLAGS}"
+		gcc.cpp.options.size:"${CXXFLAGS}"
+		gcc.cpp.options.debug:"${CXXFLAGS}"
+		gcc.cpp.options.always:"${CPPFLAGS}"
+		gcc.cpp.options.linker:"${LDFLAGS}"
+
+		$([[ "${NOCOLOR}" == true || "${NOCOLOR}" == yes ]] && echo '--colors:"off"')
+		-d:"release"
+		--parallelBuild:"$(makeopts_jobs)"
+
+		# some tests don't work with processing hints
+		--processing:"off"
+	EOF
+
+	cp -r "${WORKDIR}/atlas-${ATLAS_V}" "${S}/dist/atlas" || die
+}
+
+src_compile() {
+	local -x PATH="${S}/bin:${PATH}"
+
+	edo ./build.sh --parallel "$(makeopts_jobs)"
+
+	ebegin "Waiting for unfinished parallel jobs"
+	while [[ ! -f "bin/nim" ]] ; do
+		sleep 1
+	done
+	eend 0
+
+	chmod +x ./bin/nim || die
+
+	edo ./bin/nim compile -d:release koch
+	edo ./koch boot -d:nimUseLinenoise -d:release --skipParentCfg:off
+	edo ./koch tools -d:release
+	edo ./bin/nim compile -d:release ./tools/niminst/niminst.nim
+}
+
+src_test() {
+	local -x PATH="${S}/bin:${PATH}"
+	local -a -r nimflags=(
+		# Leave only the safe hints enabled.
+		--hint:all:off
+		--hint:User:on
+		--hint:UserRaw:on
+	)
+	local -a testament_args=(
+		--skipFrom:"${FILESDIR}/${PN}-1.6.14-testament-skipfile.txt"
+		--nim:"bin/nim"
+		--targets:"$(usex test-js 'c js' 'c')"
+	)
+
+	[[ "${NOCOLOR}" == true || "${NOCOLOR}" == yes ]] \
+		&& testament_args+=( --colors:off )
+
+	local -a categories
+	readarray -t categories < <(find tests -mindepth 1 -maxdepth 1 -type d -printf "%P\n" | sort)
+
+	# AdditionalCategories from "testament/categories.nim".
+	categories+=( debugger examples lib )
+
+	local test_return=0
+
+	local tcat
+	local checkpoint
+	for tcat in "${categories[@]}"; do
+		# Use checkpoints for less painful testing.
+		checkpoint="${T}/.testament-${tcat}"
+
+		[[ -f "${checkpoint}" ]] && continue
+
+		case "${tcat}" in
+			testdata )
+				:
+				;;
+			arc | gc | ic | js | msgs | stylecheck \
+				| testament | untestable | objects | valgrind )
+				einfo "Skipped nim test category: ${tcat}"
+				;;
+			* )
+				einfo "Running tests in category '${tcat}'"
+				nonfatal edo ./bin/testament "${testament_args[@]}" \
+						 category "${tcat}" "${nimflags[@]}" \
+					|| test_return=1
+				;;
+		esac
+
+		touch "${checkpoint}" || die
+	done
+
+	[[ "${test_return}" -eq 1 ]] \
+		&& die "tests failed, please inspect the failed test categories above"
+}
+
+src_install() {
+	local -x PATH="${S}/bin:${PATH}"
+
+	edo ./koch install "${ED}/usr/lib"
+	dosym -r /usr/lib/nim/bin/nim /usr/bin/nim
+
+	# "./koch install" installs only "nim" binary but not the rest.
+	exeinto /usr/bin
+	local exe
+	while read -r exe ; do
+		einfo "Installing nim support tool: ${exe}"
+		doexe "${exe}"
+	done < <(find ./bin -type f -not -iname nim)
+
+	newbashcomp tools/nim.bash-completion nim
+	newbashcomp dist/nimble/nimble.bash-completion nimble
+
+	insinto /usr/share/zsh/site-functions
+	newins tools/nim.zsh-completion _nim
+	newins dist/nimble/nimble.zsh-completion _nimble
+
+	# Install the @nim-rebuild set for Portage.
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}/nim-sets.conf" nim.conf
+
+	einstalldocs
+}
diff --git a/dev-lang/python-exec-conf/Manifest b/dev-lang/python-exec-conf/Manifest
index c682a2d35f10..25caad525426 100644
--- a/dev-lang/python-exec-conf/Manifest
+++ b/dev-lang/python-exec-conf/Manifest
@@ -1,3 +1,3 @@
 DIST python-exec-2.4.6.tar.bz2 87634 BLAKE2B 7b6de8ad0e0603fafd3284e6e3c5247ad83f145ab4db6728914318ae8e6f5aaa3c0247f4e01238fca11519ef72fb1b11436aea7e2b8c988b8717b3f6a2a43c37 SHA512 e05eaf01b83de196a10933636ab6b1a5489a421592df49b8b58eabd0e732de970f902744cd3a06b5ab530a6d69fe6dfa8f270fbb09b9fe3df4ae04d516828050
 EBUILD python-exec-conf-2.4.6.ebuild 1123 BLAKE2B c4589ac26e5afc7a7f00cd2a68cb3855452a87b80ad44fb5672c44bd8d05a6714c6a6e8ba197b5407efb6434711605b1d030df9c619155dff0c765d8fed793c2 SHA512 3bf981f183a1b171c25ba5a64f9b6470acfd5b5cc98e98ea59b0e4dbd378508fd9689c8aad12d84d7b12de5d3b3ac6f4e24dab9eb690b9423d9e850f36a8783c
-MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
+MISC metadata.xml 324 BLAKE2B 077d48af8dc3ffe26662d4d2eb06c18ffef22b62564e67dc844094da1bfaa913fcd81705c80b43f326e80e8d0e5da584419ed829257a637ec14e8cb857ed6871 SHA512 2bcfc04d59f03cafbc2aa5294895fa11e6375f2e3fc43b6f4026ef4e072caacd50dd77c936eb1d7f884d3c72820a310c4daa455733fbb086f14b72d65d873e47
diff --git a/dev-lang/python-exec-conf/metadata.xml b/dev-lang/python-exec-conf/metadata.xml
index efd7c8c21836..03a31e467193 100644
--- a/dev-lang/python-exec-conf/metadata.xml
+++ b/dev-lang/python-exec-conf/metadata.xml
@@ -5,4 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">projg2/python-exec</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lang/whitespace/Manifest b/dev-lang/whitespace/Manifest
index 089e251675cf..c140921ccca9 100644
--- a/dev-lang/whitespace/Manifest
+++ b/dev-lang/whitespace/Manifest
@@ -1,4 +1,4 @@
 AUX whitespace-0.4-ghc-7.10.patch 814 BLAKE2B f9746fd7bd9e51b7429a14b89d617c256ea76004384a1773b3ef35aeaa8518e96db9d53cf52dba025a96d44b3f97d11b42a3c0fa51bb40c15bfa2dfa65a66d22 SHA512 b0202b848539ef1d04974fce40facc8c0090d35da77d6fc98cb7da296efb89a8b81efda1f3dd045115417fc1471b4298be913992dd4a9772642c31ec5960fa90
 DIST whitespace-0.4.tar.gz 16428 BLAKE2B d5353b05b80a14ed0583513568d2889816c9e8b7fca8d5253bb5def584c5d43cb0ed8fa46943e7c6c0f82b6424dd01879b7beaaad813a5beb6fc3081f4dfd618 SHA512 2a1c932d650f6cfd55bb7c08b8882086143bc9ec2b0f639a7452116d86f12daff1a1268d7451003a6bf8635fbf1ad23e9203410fd423ce16d4239c1b552d7046
 EBUILD whitespace-0.4.ebuild 575 BLAKE2B 32974d1e58186c072619615be75984f53496fe5ffba92c812ec751eb060d5d6c2688f8bea0b98121af5b92782595d2d1524b8767e4d983d09351631b4b700295 SHA512 5e68feaf12b09277d86f27b6c1e17f3c3e99a598edbc495ba5bfee65b647340ae9b876e2307b46805c81faacf2902d27cd3437a9fd8c582704f2da715faf8e68
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 336 BLAKE2B 5194495e56419ea9671dcfe5c7b1366c52542ee3b325cb94d354032477bddf2d2d8ad82d427114ae326ea235a99a08c47587cc866b4e51d35090f2fa53d08793 SHA512 2fd7afd5bdaa809366d9c3edc1ecefd40754458217a5536d8cd7aaa277de28d7b03658169641f5dc789285ed1d2454fcf738a783f1b9fc7d95e845207287f3d7
diff --git a/dev-lang/whitespace/metadata.xml b/dev-lang/whitespace/metadata.xml
index 937381521944..bd23b0d24791 100644
--- a/dev-lang/whitespace/metadata.xml
+++ b/dev-lang/whitespace/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">haroldl/whitespace-nd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index c974e3c197d1..5c4d11a0fca6 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/aws-c-cal/Manifest b/dev-libs/aws-c-cal/Manifest
index 328de110ac95..b56bdd918065 100644
--- a/dev-libs/aws-c-cal/Manifest
+++ b/dev-libs/aws-c-cal/Manifest
@@ -2,4 +2,4 @@ AUX aws-c-cal-0.4.5-add_libz_for_static.patch 362 BLAKE2B 29ad22a54ac0e3749ea3ca
 AUX aws-c-cal-0.4.5-cmake-prefix.patch 535 BLAKE2B cc5a1e62b082eb7ab377e0cd5c5ff8b4a5d03e6346b1f3dbd7cddbc012a979f9d1f122e7b1d4bd6ef0c488f1f574881544cce1e1aba7104773791807ffc8a21c SHA512 439fb27f0332cd87cb93c7b2cefa2f1c15476b70e75142fcf5873f9791193d2ff193b8e74a9d5bcbf98aef36654541951830cc2a595b092fdf54a14c1abe7143
 DIST aws-c-cal-0.4.5.tar.gz 51956 BLAKE2B 8e758cf4ba362efb3721c4b25f8264e3859eb0882d5bd1dc65a1ad7fa6ac5deb80872b214f39f389ad2c4cae620cb3d6535f39e8e6cbd63bceeb6b1ad7fd5bd1 SHA512 b6feb72e607bf9bbd927dda21a6d7e7f99771c5078fad778aa2d858aa86b251726a3797b61ad2d927a5293dad10b8ec97192ed60db652ebf8c664923c2484b6f
 EBUILD aws-c-cal-0.4.5.ebuild 797 BLAKE2B b883272a723c2b89e67aa427f0b83399a5264cb2fbf78b2a4bc9060db12e6d79b9099df29da1a9ab1151cf1d1f5a212a607365949cb217ee731e523c55999c95 SHA512 823044acb911797e835cc891e7a99def5686ef19194fb69a80253ab4114406c32af6915bba0365e8e807c668f4879ac75d31c460ffba4309ac032389146944c3
-MISC metadata.xml 396 BLAKE2B 0566b45de32f9c4a061a636c73ef45dd1b3d3b7fab39b82af86d982613fa818f6a5887b1750096be4bf1c6a9aa6a0664e2d9755488cb600699b809fb2bb180e8 SHA512 765555cc269774be9f1efde6f0152324056b5e66b332afb063504e041c3424eb5c9756cb13173bef516d7d9c63f58f406ecb13e6ae359896383e2566a8604696
+MISC metadata.xml 478 BLAKE2B 43fd48e916c8d02f3c144ec0cbc82dfa9a2518632bda47cb60a67cefa1fa3955e8f3252367fd8b512ddb2a62546c3439524c756b52805ce6bf6db7aa32805079 SHA512 b096fabcda56b321a9e2dd12f29dcb25464070a1428ea4d12b7ce41bb573f35670c29078452781f3c703e6db52e6eb6c9f2f0b9751e1c33315940353fc1dace9
diff --git a/dev-libs/aws-c-cal/metadata.xml b/dev-libs/aws-c-cal/metadata.xml
index b8ec77e47205..304f6cf4a68c 100644
--- a/dev-libs/aws-c-cal/metadata.xml
+++ b/dev-libs/aws-c-cal/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">awslabs/aws-c-cal</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/aws-c-common/Manifest b/dev-libs/aws-c-common/Manifest
index bd5754ad41e8..99aaeb3ada51 100644
--- a/dev-libs/aws-c-common/Manifest
+++ b/dev-libs/aws-c-common/Manifest
@@ -4,4 +4,4 @@ DIST aws-c-common-0.4.62.tar.gz 411263 BLAKE2B b9eb8eab8fceb949adcb96bc98987c318
 DIST aws-c-common-0.5.2.tar.gz 422185 BLAKE2B e2058d523f9739b2d28db6ff26e00326977853a1ccc2468c36ba021619b0e9223e8a5584c06a29b511607741d208ac803023c1e6c17df10cd46227274d885978 SHA512 3e3b639f0387ba0e4ea62a35e57b7f0697a5f829bbffe6758d2e43db45543528615298281b045275c582a8cce9f0f6a36a06b231460ce4e2cc42ac01d7a0e952
 EBUILD aws-c-common-0.4.62.ebuild 695 BLAKE2B 1124eaa7aa68685261060c3964df4b4faec8eae1cdf8638eb0cf3f14019c17b5a9845c80091289fec7bfcaef2e395315b1647e0659c6792b5f3139b4067dc0a3 SHA512 0f81db29d2e71dae2657d7ce272f9c81672638220674c334211ab23dc71c3e3f3ef0ac99f1efc584fe0ca4a0015ea03b42df1b0c7f4b951ed79c1bc9a60e0fc9
 EBUILD aws-c-common-0.5.2.ebuild 613 BLAKE2B 28870a4c73c3b3d6f14fd08400dd459cc0bce12531da82d1226a4054e18ee21dfcbd3bbba2deb3fa7aa70658f0cc2dd007d0004ef07114f851162f67231d40d6 SHA512 642112664c88452cff2c9da6c650a2911cce2f7b1188ea03c2b9d46b48c75dc8624b166e6f85cc375824ce1be7d514d76d0e562438622c370826803e81026fb4
-MISC metadata.xml 563 BLAKE2B 05891966033530426bf57a76c0a0d9491be76607c4294cf97469ca153cd46f4e44dc35704b77b8e115ea23e3175d8b0993b40d2068c203851d7483c11221e177 SHA512 df43e5500f05d7da058e4771d8f032bf534140f00ddee25e45be9e10eca4117a9c06b9aafe3181943cb1281d2ccd7a1afbc11cb0b8935c74dc309f4be55cc47c
+MISC metadata.xml 648 BLAKE2B 034afa38ae41689a7f94aabb59e4bffad134c38a5999b6d793c546b6d1c703e282ce29b2fcb6a8c56dd3c6a1e9feb0176fe1d55b09b2511609405ebeb4c7716c SHA512 75928a5088b509c4628a4ed94368884230e00d66d0edfdc9cc6b2fb1e056f1d830132d41c7b1f671f0308ac06aef0139c9eef5d757b33003f242d8750097283c
diff --git a/dev-libs/aws-c-common/metadata.xml b/dev-libs/aws-c-common/metadata.xml
index e467b78655b3..74ef5bba7d8a 100644
--- a/dev-libs/aws-c-common/metadata.xml
+++ b/dev-libs/aws-c-common/metadata.xml
@@ -9,6 +9,9 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">awslabs/aws-c-common</remote-id>
+	</upstream>
 	<longdescription>
 		Core c99 package for AWS SDK for C. Includes cross-platform primitives,
 		configuration, data structures, and error handling.
diff --git a/dev-libs/aws-c-event-stream/Manifest b/dev-libs/aws-c-event-stream/Manifest
index edd80a30f720..38fe241bce92 100644
--- a/dev-libs/aws-c-event-stream/Manifest
+++ b/dev-libs/aws-c-event-stream/Manifest
@@ -3,4 +3,4 @@ DIST aws-c-event-stream-0.2.5.tar.gz 61949 BLAKE2B baebd87a916fb8440db56afa2b97b
 DIST aws-c-event-stream-0.2.7.tar.gz 63942 BLAKE2B 751199efa1889861b647ca2f59f4a323961aedb9184d8c1293ff8a32096bb6e22de43eb2afbe9eb433f43e07ef8be251c815cfd897eb81cf2041e5f7be230ead SHA512 3ecc9fd80cd37d87df34948a7d7ca344a7b5ff2298e5ecc568d945830f8f8cd88721e0d2c4d11dee06af87e14b9ff13c8f13b8abfee74826ae72c8a280109440
 EBUILD aws-c-event-stream-0.2.5-r1.ebuild 1176 BLAKE2B 660aeb434ab0b4dc912213d5d6465e75b3a13127237fe8854901bf939b492b337c938f3501f4b5b5b3c21f309403fe46162c7a048f8d3294a3ad714a7a193cb8 SHA512 7cefd7d81f0d02140db2b7c9a2a71c739a47412d6deb2c60154d00a6f59caa35748df6b42e39bb15a56460918d1236f5806882d5df0f508518e804ea19d914d8
 EBUILD aws-c-event-stream-0.2.7.ebuild 1101 BLAKE2B d3664088da4f06b2a33063618b8103fbc05634e8473c206aa3f5d84a6cd60bf4980b308a13731154f028a9a717112508a497472952c0767a9cc8ea5154dcb588 SHA512 6da822f7e508cb1bc0530079ed24fbe53020831c4212d5d96da4e08f07f64e923b208bbc999a195759d003e1304a3790c2bdc52d02a39c08dce78e467d69ef00
-MISC metadata.xml 396 BLAKE2B 0566b45de32f9c4a061a636c73ef45dd1b3d3b7fab39b82af86d982613fa818f6a5887b1750096be4bf1c6a9aa6a0664e2d9755488cb600699b809fb2bb180e8 SHA512 765555cc269774be9f1efde6f0152324056b5e66b332afb063504e041c3424eb5c9756cb13173bef516d7d9c63f58f406ecb13e6ae359896383e2566a8604696
+MISC metadata.xml 487 BLAKE2B de4736156d3fb3b52112074b6e049f777497c7101d134c8b664b76d3f55acc0be9585a6fa36e7ad7b4ab2bedd8ed5fba0808be350d11e4d7d8de4762fb9fbbc3 SHA512 a82fb72031951ff4b3e6674cbd00a955723ec501c4edf8125be6b721e52902a1584728c4d0ece6e3ca6f780c0924f0fd19cb4ed17e082052e165ebd15b46a85d
diff --git a/dev-libs/aws-c-event-stream/metadata.xml b/dev-libs/aws-c-event-stream/metadata.xml
index b8ec77e47205..0cde327ac057 100644
--- a/dev-libs/aws-c-event-stream/metadata.xml
+++ b/dev-libs/aws-c-event-stream/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">awslabs/aws-c-event-stream</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/aws-c-io/Manifest b/dev-libs/aws-c-io/Manifest
index 369dbba581bd..5ad0e59479ba 100644
--- a/dev-libs/aws-c-io/Manifest
+++ b/dev-libs/aws-c-io/Manifest
@@ -3,4 +3,4 @@ DIST aws-c-io-0.7.0.tar.gz 561762 BLAKE2B ffe8ac5de9fd5f57e7bc18e1d956f28567413d
 DIST aws-c-io-0.9.2.tar.gz 586055 BLAKE2B 88c1ac516e29af88062f01f5e2e4718964b25d651922b4b54d82b5cef2a7fd997ee31c7b435933fe284b6ed1f80a310fc75d684c3d7969dba1d2fae4902a157c SHA512 09480b2a06ddd8078234c1058223bc04001d3c54d30bb62a150ab4a2776c7a0c805662560d3b086dad047f22a22e97706be44ac8c5b88e2f9d4bb366c68b9fcb
 EBUILD aws-c-io-0.7.0-r1.ebuild 1147 BLAKE2B 36ae862d3e6936d1ea460e50f9c23c91ac6f7348b42ca36f8f7f71a2c5d67fab0a4b430031ddd13cb56d7792427d1706fb140c4b59fd19672ac7dbda1a5be4c9 SHA512 35f5d6af642d83c9388b75a86d1e1caf0c36b838ff68e05244c6234390e513a512f3dd68c0ef3d0476a7e8409b519e5d1c0018c6d796b54293b92f7c15d1b2b1
 EBUILD aws-c-io-0.9.2.ebuild 1079 BLAKE2B d8203d2a699f0205296a549466c52faa136c88646598a45983b7335d8dbf760f35eab39b47abb20e97dd964f08cf68e53bddb0c81b48feceb7a0d4af101aeaa1 SHA512 f596fc38ee499c646a551805adf1fe9145aca75c52111aa2db77c1c0a5867ea6c59b0df9c65a2f197234a5d9dd1eaffd7ea0ab9b21ba46536b0a2f2af4dcc0aa
-MISC metadata.xml 1081 BLAKE2B eb6a21cbb87db57c0e8677f433fcca903edb940aecc42283fb6f3c1faa25ba8d91676643f335d768da581edd1b1007ce5ffa7b32466cdcbcd498cb1ea70a5aae SHA512 3b07f23103ba9c3acb1236c14ca64deaf7f395ae6e98c4859f90e81b352b89cd23609704ec5ff26725589ac3b1c2305911e4687c71c1136746873e92672621f3
+MISC metadata.xml 1162 BLAKE2B 14957ce70ed08d9e9b07b969242bc55458382a4aa0aecb28ac9ee5713b673fa47384ff7d506fa4c8187139081273e056309a0243faca450f1bfddfb680a4e05c SHA512 98009dca2f1ca90d63fe50e61a0593f45fb8920ef156cc7e90baba9f690e9e67290ee86b8e4b5f7e23c4e0aaf1a5d10dc54edf5447739882b20418011e4c6aec
diff --git a/dev-libs/aws-c-io/metadata.xml b/dev-libs/aws-c-io/metadata.xml
index 728259f43230..ccc2c399cc5a 100644
--- a/dev-libs/aws-c-io/metadata.xml
+++ b/dev-libs/aws-c-io/metadata.xml
@@ -9,6 +9,9 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">awslabs/aws-c-io</remote-id>
+	</upstream>
 	<longdescription>
 This is a module for the AWS SDK for C. It handles all IO and TLS work for application protocols.
 
diff --git a/dev-libs/aws-checksums/Manifest b/dev-libs/aws-checksums/Manifest
index 62dfcb6bff43..6ff3a3b16201 100644
--- a/dev-libs/aws-checksums/Manifest
+++ b/dev-libs/aws-checksums/Manifest
@@ -1,4 +1,4 @@
 AUX aws-checksums-0.1.9-cmake-prefix.patch 966 BLAKE2B 5b1db93baf8699786ebb011590dbb5151dcd5210580fa5555b59c7cf28a7ff1336fb308dec393e1fd559d221359550375ec7de820977757495cabbe4aebf1fe2 SHA512 3b436c32ef1fcf1eab933ec4da9eb8952f4f8af9cdd8de4976b142b412bf132b310442e157731fd13ba21cd507ff70c552870e117e1e8a06f5c0830a077f99a8
 DIST aws-checksums-0.1.10.tar.gz 70961 BLAKE2B ef0644b8b6f81ca743955170940b9e152bf6b48d8146ea0ebe11b37eac607fe6544a826d9a14b273575837c842a3e539e4829571df1c4fa61bf9008e44872e8c SHA512 a76eb274f668189cb303f7010311e51551b224d19bf54bb152c3d9346ab837c33300fc6c1e9c35b04922101817cca8b3ea7968f6cdecf1166e7933bf0348edb6
 EBUILD aws-checksums-0.1.10.ebuild 784 BLAKE2B 8523d0367944e24ba6fc7eeef3930cc3441408355e5e9b65372058ad74a51cf85ab70a8a00ef2bdb5f3ae2ef283124f44f56e728651731a6d5f188a060723621 SHA512 819020d8a54aa9a651e065d9d057eb5e7e4aff77c2adc826e8e32a4d80e274444091b6a0328d8d372dc861f8f30bf7c4bc8c28a6a0c31fceafda44e9369435fc
-MISC metadata.xml 591 BLAKE2B 230b47753865b79333ea74a7e9ec9951a5e63d7f465a0e7e962bba173318405b4e13fe7c11229c07af7487a9fcac23cb7f7480245f2cce5a338a488f439b94f0 SHA512 3e20f20ef8787554421c6f39b6ac35aa35c358df03b96ec0b5684f3335447619ed0003f8f371fe8798a4fefa4c9297db0478bb77ca8e3092d575412cd7aa5358
+MISC metadata.xml 677 BLAKE2B 2af0842bc238075859409ca6f6aa17ed2f2d8e52c81bf5b9c1c3d2d1adba5a6780d790e8d519f8d911e21451a5bc493671c7c5e7aacb5ae347036f85986243c5 SHA512 a4eb32cfd40cc6b44cb2dee26dae24ac1db4c1b15023a5427a66aea15a5a99cec0cb3bd460cf3308e35b7b0087c073ae0a8aefee30a31252cc35da76bcd86209
diff --git a/dev-libs/aws-checksums/metadata.xml b/dev-libs/aws-checksums/metadata.xml
index 13271d7199fd..1bbf8de9f110 100644
--- a/dev-libs/aws-checksums/metadata.xml
+++ b/dev-libs/aws-checksums/metadata.xml
@@ -9,6 +9,9 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">awslabs/aws-checksums</remote-id>
+	</upstream>
 	<longdescription>
 		Cross-Platform HW accelerated CRC32c and CRC32 with fallback to
 		efficient SW implementations. C interface with language
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 1bb2fa4d1d09..d7e6bf76df54 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -6,5 +6,5 @@ DIST folks-0.15.9.tar.xz 506044 BLAKE2B e239c0ca3b51a5452620f5abaf37b34413b0a5ee
 EBUILD folks-0.15.6-r1.ebuild 2531 BLAKE2B a94e34e46ee987d7f10d59abf552d4e932280ffa2818625dc95ec0cf4f235e0d8751229320de0e72b6173be2c841fa78d843b6b292fcba955561ced229e91a16 SHA512 89483d61ac8bfb0e6c9e062e32b0b4c6a7979cc8fba52979eeba962df3a8a7958ddd1cd753fdc55bc9cb195b4c40f9499d3e530ba31c182a7c751d30ad6e44e3
 EBUILD folks-0.15.6.ebuild 2316 BLAKE2B 755a2cc016bc6a4152b49f7fc98bd68203bc0b2278eb6750ab6a9d5022a21607cb2ae4448a8a2540f3a3f5c9928c563156a1e4e46d39abba5bb47022d184b1c6 SHA512 befd3a9ef73778806b1b2d5d072c2a8838a8f88197d9164c28f0305e9dc2456db231304fa465d15446180c62178bdc7c2404ae875d566b0d2813d522db95b957
 EBUILD folks-0.15.7.ebuild 2821 BLAKE2B 1697d7450c7bff82f30c893e61bcc75994c2112dc69ca8218bc02620bd3b491e2f7d9d3c14f303aa4ec66e06bf9790ad33e8321de39640aae29cfe9cb45e5eb5 SHA512 a6a165a4902bed9f881d9709ed69cdaafaaff609f005eaea4d23ba36b60c044b0df81d3e728483fd691f0e193b2183fbf398e8b74aea27e5518331b27a0bbb30
-EBUILD folks-0.15.9.ebuild 2490 BLAKE2B 16188966fd8916ab8c2dab4b636ee87a574715f7ccbe056b4fec72e3dd822e3892758a86db7096bc0eeba4cbc8cdde981c45e3a28403df66aaa2170f68061530 SHA512 23df58454269cb5199489cd806e7a621071bece9af44a3811b4d0b2f40110ac74b930dfdebcad6ef8b738e3eae63342105c735327f5b4e33a1f2df24cb5a4311
+EBUILD folks-0.15.9.ebuild 2488 BLAKE2B 845a8cd6b5904c5f043f94ad113af9b160b8ba6c4f632d57f570c849f74c9f6f656e2651cf0ea93216467e82f5c130b684f5a1f39042183555b37cf3151393c7 SHA512 24360c54f9a58ad5487f18e31519b0dc5046da5494a0ae9d7bd5cadc8a3e6e2675ff618040edb7261553e0bd02be77420d8d6f3aa4ec6b7a5bba91ed4c7f2479
 MISC metadata.xml 502 BLAKE2B 7f53a803053323804b7c28f44e2490e4ffa63a26a2c0fc153850043b2b91e75bcbb817fbaf8b9e3af0e8a0735b60c827c34f13b5a567300c4a97918be4e955c8 SHA512 934fd324cb9d464af7cbfc0c6746071d00f0404d716319ce7e2460a0ddb0e60f60fec211cac8d87cf9d7e70c849744a8d62e7268c7774d677f2e8481a30a3a09
diff --git a/dev-libs/folks/folks-0.15.9.ebuild b/dev-libs/folks/folks-0.15.9.ebuild
index 9eec95007c6c..99693b318313 100644
--- a/dev-libs/folks/folks-0.15.9.ebuild
+++ b/dev-libs/folks/folks-0.15.9.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Folks https://gitlab.gnome.org/GNOME/f
 
 LICENSE="LGPL-2.1+"
 SLOT="0/26" # subslot = libfolks soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
 
 IUSE="bluetooth eds telepathy test utils"
 REQUIRED_USE="bluetooth? ( eds )"
diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest
index c8305703b761..3cd96f601ef2 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -1,6 +1,6 @@
 AUX intel-compute-runtime-22.24.23453-remove-fortify-sources.patch 1078 BLAKE2B 933cd6b5b3f9aefde4b416960151458eb7845f422e493ab40257330c88b55e1866cf0ff59338ec708d705750ca88c87d54014d51d9492c3dadba7525b523ab56 SHA512 ee831418acb9ba5deba95dc2e013119a0cfe7db533710108063dc67cd0a4030a4419bbad0a007fdab445eba14036fdcae26ea0b4ce675ebb20f402620b880de8
-DIST intel-compute-runtime-23.52.28202.23.tar.gz 6903413 BLAKE2B ecd16511fc8065cc8e09827a1b333a5d8caa1ec0c815de21b90d896a5d1e6c8225423e748005b5f6012eb0c68da08cf06abaf8431709145bb329a3dd34270222 SHA512 aa33b712af2526f94a3d8508edb3201203c34bf90b0125ed9b9878539066baaedd9b9e1c464b760c38c159b4b4aa3671465ba90c2bdd58626f578e92957093fa
 DIST intel-compute-runtime-24.05.28454.17.tar.gz 6963009 BLAKE2B ca4840dedbea06bba7933ba74658eee602a6de19d35ec4baac1d41d5eb3041f16a4e7e82072f98961d19d2e7f97b9f3ad698ff84532f009537d23d7970162fc5 SHA512 f70967c649e7a17eab7fa550a2b344333357717021c16e3116eb47be45ea806bb0fc64795dad21027e7f055318f1e05c9e726c3e735dc3b7336de1839f6eae8e
-EBUILD intel-compute-runtime-23.52.28202.23-r1.ebuild 1997 BLAKE2B c8afb1716c3cb0ce4000b02464fcbbecd35a63590913f205c9aca89372ee5fcf5244c5e710dbf67be213237efaaa2a0e83b3da2dffc24cde61e5c5259eb0ab3e SHA512 8cd780752013044f4d18c1f00a581f3f97b48b976bb0b3fdc3d1cb62aac112b04a0a75b0ba560ef6c1d902c82b27b74de6219a041213d20943ecf67e4e9687c4
-EBUILD intel-compute-runtime-24.05.28454.17-r1.ebuild 2000 BLAKE2B c36012b74a4ef0055c22f09b73b737b2c8283dd199acd8df8b3abe1915c25d1b081b0fd8a03e4cd3a1d329db7700302512136960d9e4a741b29db15d7ddf4d26 SHA512 d6ad0b906f98c760b3532e3bdfd7c1d744c5c013ab0a933a6af28a2b28648921af853d5fa8cec46560ff255a75f85c3633af5c584213e399b4dfbae4ddef15e5
+DIST intel-compute-runtime-24.13.29138.7.tar.gz 7056376 BLAKE2B e09c0a8e4b3f31b53879430401074f9861dc9384524dfe6c2bd87c9f12cd064688b08da1eefc7f9453141b008181bb66f187e4bf8f1fe0db8df4946b3cca6313 SHA512 01b3ded0d42c439314f83e9eac45dcdaaa401128fa83836d2cee4514351b8b43ae0b19a6485a16f5f08ef0d76595e6ee749fe1fff9a5ee04677e3d5ef33408da
+EBUILD intel-compute-runtime-24.05.28454.17-r1.ebuild 1999 BLAKE2B 3f1163726e50d35f23bb4d6eb48c1729cca0091126a927ce6da38f8462e8c2f419d1e5b6788ab3fad5a1a5b8f57440f630d0b5c6602a2d18880769e9f42faa6f SHA512 7bcd3f7152438c8523dbd2de3bf1bc73b2fb4c8b82641b11ce4c06dea35af11e3a66489bf31e6090816abdf860050d6e233c9729a49c155834c5f3e66a96a08a
+EBUILD intel-compute-runtime-24.13.29138.7.ebuild 2000 BLAKE2B c36012b74a4ef0055c22f09b73b737b2c8283dd199acd8df8b3abe1915c25d1b081b0fd8a03e4cd3a1d329db7700302512136960d9e4a741b29db15d7ddf4d26 SHA512 d6ad0b906f98c760b3532e3bdfd7c1d744c5c013ab0a933a6af28a2b28648921af853d5fa8cec46560ff255a75f85c3633af5c584213e399b4dfbae4ddef15e5
 MISC metadata.xml 1429 BLAKE2B 6c2fde2fda8cd6b9d707c400c5b4d38e3d74dd73617faa9dd80f84100d499182ea959e695a473d32307914e76a26bae531a92677f0e4bedbdf05fc1cbd3095ff SHA512 ac61568ad36df6f6c8470b43f32d048930e4a569ec86d58ff563a86ae748f6bddb8700de487e4967da4998160f1c01517be0817cccc445a821984aff36617b6d
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-24.05.28454.17-r1.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-24.05.28454.17-r1.ebuild
index 717beccf91d2..6cc55d2ef71c 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-24.05.28454.17-r1.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-24.05.28454.17-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+l0 +vaapi"
 
 RDEPEND="
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-23.52.28202.23-r1.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-24.13.29138.7.ebuild
index 69877d079fea..717beccf91d2 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-23.52.28202.23-r1.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-24.13.29138.7.ebuild
@@ -16,12 +16,12 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="+l0 +vaapi"
 
 RDEPEND="
-	>=dev-util/intel-graphics-compiler-1.0.15136.4
-	>=media-libs/gmmlib-22.3.5:=
+	>=dev-util/intel-graphics-compiler-1.0.15985.15
+	>=media-libs/gmmlib-22.3.17:=
 "
 
 DEPEND="
@@ -30,10 +30,10 @@ DEPEND="
 	dev-libs/intel-metrics-library:=
 	dev-libs/libnl:3
 	dev-libs/libxml2:2
-	>=dev-util/intel-graphics-system-controller-0.8.13:=
+	>=dev-util/intel-graphics-system-controller-0.8.16:=
 	media-libs/mesa
 	>=virtual/opencl-3
-	l0? ( >=dev-libs/level-zero-1.14.0:= )
+	l0? ( >=dev-libs/level-zero-1.16.1:= )
 	vaapi? (
 		x11-libs/libdrm[video_cards_intel]
 		media-libs/libva
diff --git a/dev-libs/intel-metrics-discovery/Manifest b/dev-libs/intel-metrics-discovery/Manifest
index c12e70efb4cc..27c465a21314 100644
--- a/dev-libs/intel-metrics-discovery/Manifest
+++ b/dev-libs/intel-metrics-discovery/Manifest
@@ -1,4 +1,6 @@
 AUX intel-metrics-discovery-1.12.170-revert-definitions.patch 1410 BLAKE2B af7ef84fd1181bc10ee890d87121e78559dcfb7b561334e6041b5c20b183d4ebfdd94e6b773e4c604284b5368708b312a23f878a0df7d0b32fad7f1dfdce7044 SHA512 2a66efe9b1f4d78cb053d4621d063ed7bcca061b677ca9a68f589096c4ae1c32c463dd5a598912afd690a96fc3c52aaa8cdc2e7f684870b939a43cd40507eea2
 DIST metrics-discovery-1.12.170.tar.gz 4932048 BLAKE2B c4cf382ff29de4319f44863e0e45a0bb424c3f8af93c198723941c35f579e4d25252c99e6726d724483eae74e50a6315933106aa3e3bba8dad1af9a7ed8284fe SHA512 b4bb4465a059c7222b830ae3541eb1d6171d91f03ec131c1f8a079f6e8b2aed7c9f00899ae23744b986e070897eb135eaa4eff882d1cb173c80d6d2ce1ba3955
+DIST metrics-discovery-1.12.171.tar.gz 5219784 BLAKE2B 3927ad270060543d3dbca9e32abfa83661597313a54bec591098c7f0b48443326d4bc3c13f600b8b53ba4ca2850c15c2c2bee7dc117ca38de9bad3c5b4f8d8b5 SHA512 7c08841e86af29465c2d09788d7230bd9401eb02c35eb0e582db68a389c6e867cbb2f9eb38876cd00ffa519633a16c804454d43efd8c32fb61e39bada202708f
 EBUILD intel-metrics-discovery-1.12.170.ebuild 691 BLAKE2B e562e3a6bcb819f50796babd59a3df56245dde150f218ee5c34937868a98ae85ba7a1c78a3cb8bfcd9225608620519a13f870cb0fa32e89acf5b1aedfbec6e73 SHA512 184d5e63a6f5c1679e2ba3387f4c8c49ca26e6c21f75ae9dabca286fd763f12adc84d144992a7826cd692b983250d23279846c758d91d9d756c055d964250361
+EBUILD intel-metrics-discovery-1.12.171.ebuild 692 BLAKE2B ce278418c6913765dc24fec23f9702912a7a1d48be33421c3918b5ec317c4abdbbcd310e1124c11641f403ee360eee1f74fe2c0aeef5dc1a2a9aae14890f59f5 SHA512 85e96b3889e151df8d38684057058373a3d25acde5ed36343022c4322fdf5d60df0be6add97954952025d76cffe9957534b27431a400c0d18b2f7be989e80717
 MISC metadata.xml 815 BLAKE2B 017d27f513969fab6dd984946f3105d8bf0f2c0f29251976016f3b4aff779a22d66ad876bf00553376314681c2ee33beb53c0537a37a80824692001710164c8f SHA512 76548770278fa9004b250a5e8e6b273e49a0aff112e3e1508653c8b4119ed7ec486191ab39f6d22c425b0b07d77b29fc299d36d8faa7167b8af564bb1418aa6c
diff --git a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.171.ebuild b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.171.ebuild
new file mode 100644
index 000000000000..1aa1fe8dda1b
--- /dev/null
+++ b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.171.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+MY_PN="${PN/intel-/}"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake
+
+DESCRIPTION="A user mode library that provides access to GPU performance data"
+HOMEPAGE="https://github.com/intel/metrics-discovery"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${MY_P}"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+
+DEPEND="x11-libs/libdrm"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-1.12.170-revert-definitions.patch" )
+
+src_configure() {
+	local mycmakeargs=( -DLINUX_DISTRO="Gentoo" )
+	cmake_src_configure
+}
diff --git a/dev-libs/intel-metrics-library/Manifest b/dev-libs/intel-metrics-library/Manifest
index 322507f47e8b..3f469fdcc411 100644
--- a/dev-libs/intel-metrics-library/Manifest
+++ b/dev-libs/intel-metrics-library/Manifest
@@ -1,3 +1,5 @@
 DIST metrics-library-1.0.156.tar.gz 253010 BLAKE2B c00c58c35f83672ad19cdff64f5df8193543de76c071cd6a9c41de434b635051d90f143aa8a8e5b45d36153b73371c2e77c9b3f4df7104ae54bffd784cd37fa3 SHA512 16a50c62c1d87f4e830f5a916ed95882c04d257f8daf3b8d2f8fb7d8887fe899b9f35429fefe19dc99e0b485d6b1e98cfa4082d793cc867f07ceac68284afb81
+DIST metrics-library-1.0.161.tar.gz 250352 BLAKE2B 5b991aadd5ed477a478763111bdac96374b99dd657db58403753b4504214d703e26156fd65c1ce10eae98bd63f117d6e3e83b178aadc610948b3163b91d1cb7b SHA512 0a6b51bcdd24402b47823465739a64d264a24a17ccbbf950b71d3d3374a5a3cc31726cb5918ad67c16d693e21a2f8eba91f1f8815ed1c6d5ef89163cabeefdf9
 EBUILD intel-metrics-library-1.0.156.ebuild 633 BLAKE2B 10d9fbdd4de30327faa87dd340f00ca339a4750910471a31b22da5281ee7d55603d7d503c170686a1775e963e861804e28bbdebee5f3c4d0cc09b3698db371ee SHA512 2b0e123ade3403b8efbc683830ff1c5e6f5e161ef3e7436aa11a697f1d9d4cb99280ac1e97df9cb6adeef5cf83c03e750b5699c9d8769f91e42eb256021056d8
+EBUILD intel-metrics-library-1.0.161.ebuild 634 BLAKE2B 572e75602397b4e39d6bccaf74764af3d822e1781177b9cccadf5b48e618142263d580de949db8ac5bc62023f4b95df27ce0bfe5c024c56c9b5ff601d4c99105 SHA512 5e230e144da1d7c55de3c019c775cfdafd01ac29e418267263ace05d78f49907368931bfd21ae61afb6b240bb6d1321a394c6cb9e0fc34f56578de4d11531a99
 MISC metadata.xml 904 BLAKE2B 9b29e523b88f3d4eef193b4ecd90f03bf74d4e8521d3691bcc3518fc4133e4a97142b2d0f9a1354d86ea913ca79fa74972e99fe63a21eee7bb0fee78dd414e25 SHA512 ea9cd435e8b72549945ca370d318a84d03d8330ea995f726aa29f6c6a8fb1f353c9b5c2eab2fc56a2e89ffa6beb019be2a291f3f64d7a8e5782efc0c3935cebd
diff --git a/dev-libs/intel-metrics-library/intel-metrics-library-1.0.161.ebuild b/dev-libs/intel-metrics-library/intel-metrics-library-1.0.161.ebuild
new file mode 100644
index 000000000000..86657df2d0c0
--- /dev/null
+++ b/dev-libs/intel-metrics-library/intel-metrics-library-1.0.161.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+MY_PN="${PN/intel-/}"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake
+
+DESCRIPTION="User mode driver helper library that provides access to GPU performance counters"
+HOMEPAGE="https://github.com/intel/metrics-library"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${MY_P}"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+
+DEPEND="x11-libs/libdrm"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -e '/-Werror/d' -i CMakeLists.txt || die
+	cmake_src_prepare
+}
diff --git a/dev-libs/intel-vc-intrinsics/Manifest b/dev-libs/intel-vc-intrinsics/Manifest
index bdc47626587d..9038f2fa4eb9 100644
--- a/dev-libs/intel-vc-intrinsics/Manifest
+++ b/dev-libs/intel-vc-intrinsics/Manifest
@@ -1,5 +1,3 @@
-DIST intel-vc-intrinsics-0.16.0.tar.gz 144545 BLAKE2B 9ff71421ec5c45539a5135d8b70eea017a7bc9f788fe0ef760c9cfa58495bd532b371f764208f8c6b077647cd81fbf6c859b075186751129e91e8f7816a82253 SHA512 3fbb828f8c47b36cb33d766f8cb853508b6ffcf71b980465fa3fc7d74383c42cf8f46385f43e1a6180e65eef54c77cf10eff520451e39f6b7ff20fea04c8b894
 DIST intel-vc-intrinsics-0.18.0.tar.gz 145201 BLAKE2B 2260949a134cd5dff9e0c2be3dd594b4e780f69f897c3966abc3c5787f0acc1a21d70d91d5825b6b81a9b64de5c0ae1079cc136dbec638757212c0e21ac9fed0 SHA512 db68f1b95bfa1c861bb2788161f355b196cb7f93d86eb9f8bee4dfe77771660985fd6615fc616b79e5823b0d0712c30597c30b9a4be56f7c5bc46626a87fbcda
-EBUILD intel-vc-intrinsics-0.16.0.ebuild 796 BLAKE2B fdc1026b6b4bbba68c2412679a2261f87f96c6d6efa95f42b10f5b3070e4725f52df76e5bdf0e57919427a286c44018044500970660b717b58feeabb8f4877f5 SHA512 0b288a3f77e9ae21e7348f6e36115b4ee2e31e4720d8bf06b84c45474a69a01d72f34517e81a413260cf5d6247ab22e337b6c41fa7cc448e597fc72552ac45b2
-EBUILD intel-vc-intrinsics-0.18.0.ebuild 808 BLAKE2B 55b3353346387a065c630408547221273e285c769e2964ff202afe1e92b70bc799a8b5594989bc972ab535b40868508b1a51f802376ed63db67324c405c8d204 SHA512 fec69eb53632ca5ce4945536b41b5992755114c35e26749b0d0794295a7145b3248f3cdd60ef831eaf71381424551d804bbda4b4887c9566b7c6058f64155fb1
+EBUILD intel-vc-intrinsics-0.18.0.ebuild 807 BLAKE2B 5e443f5b5fff96def9b8971cd66f7e8ea9ad93772eed1296b12cc6737c58e641363cd4acb4514c2281a2224ad869a3114a7af896542025895abd1f4bfff344c1 SHA512 ad58597486fb232fc326e04336f33d4b6d16535fddc5ec943da78a9c55d31acde27873d552981ae096524ebe1f816a91ecf38005401aa2396762dd561ab6633b
 MISC metadata.xml 778 BLAKE2B 2e8e4d7f56f18f7e4eaa488cdab5d4578e779e8ac75fe96c3e7d5aeae5fc65291401d8ac54a0e89194c44a2146bca4cf9d321917bfab65a93f2118c688422cf4 SHA512 de2fc4d84a08fb98a41bb3e5f11d31535810e6f796aacaeacf784e1ed0fd7d99c5aa3a5e689fe22bbc7149518ea695979b4e66b6dd2b876e4cc9ad126564618c
diff --git a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.16.0.ebuild b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.16.0.ebuild
deleted file mode 100644
index 7afdded993fd..000000000000
--- a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.16.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-LLVM_MAX_SLOT="15"
-MY_PN="${PN/intel-/}"
-MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake llvm python-any-r1
-
-DESCRIPTION="A set of new intrinsics on top of core LLVM IR instructions"
-HOMEPAGE="https://github.com/intel/vc-intrinsics"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-DEPEND="
-	dev-libs/libxml2:2=
-	sys-devel/llvm:${LLVM_MAX_SLOT}
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.18.0.ebuild b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.18.0.ebuild
index 2e67056c8f41..30d735ec61b1 100644
--- a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.18.0.ebuild
+++ b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.18.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="
 	dev-libs/libxml2:2=
diff --git a/dev-libs/level-zero/Manifest b/dev-libs/level-zero/Manifest
index 0fe02d520a90..c34691cb91dd 100644
--- a/dev-libs/level-zero/Manifest
+++ b/dev-libs/level-zero/Manifest
@@ -1,5 +1,5 @@
-DIST level-zero-1.15.8.tar.gz 937224 BLAKE2B b433e5ae2396715cd58bdce508d22b44f6b3083a4686f26dfba8a2117ea7547955bedf454d75c06a66e2c36ab4478da345fc86479486d50290ec96cf751a0b23 SHA512 68e531af5a39c8a6a2e242b25871d9177b2c8079837e0f736829ec0959fdb021eb518849e340a0f94abbe8ef879e3fb33e8b277eb676d2f8889bf2f4c3c10d82
 DIST level-zero-1.16.1.tar.gz 999641 BLAKE2B 845964416526428d4848ccc3beebf0eac426ba39ce292cea3dced13803dbeb1d4393930b46a60fc2c59dc9e2f4bba1188b211a57574c58fb7180c44b7a8a028b SHA512 c53b5663494613b7a536816bf8367895aa055ce74d9abc8e8aacc3efb7c081de60480d03693861e2b348698b7da6224ac21fb590bf9311d342a19ca4f416b051
-EBUILD level-zero-1.15.8.ebuild 708 BLAKE2B 1df2181b8e7096b46b6220eb70fdba8f6defc1c69ff6dd71415c27fa50e8581ae07d40884044dcbee82888a31e6294e2ccc7bb4b888ef4fe398b1de36d4bf415 SHA512 73ac2820957a7a3b508bb1f7472ecdcf9550d091331f63c5e8cffcade3993c33ab69383de5bb6a66a67390e604deb326128c7e608118105eab642d9322a30ad4
-EBUILD level-zero-1.16.1.ebuild 709 BLAKE2B 74b94819f7a5d0f824afe6ad5f333df130edc3a4a553c795611e158a694c656e49b9efaa1bdc62624eda4b22b83adbecb6008a738fad5538e53ac862ee02022c SHA512 2658d573b8ae391ebdceaa0154448d4a9c20502cc02df60ca24c0607d167efc414a68365b33c22c388ebc6fc5787ba476270cb63bc332fa05febf503a8696bd4
+DIST level-zero-1.16.14.tar.gz 1001744 BLAKE2B a02d3b04a127bb43a3b2507c00f6c536d319d11e6196ad347f3d82a22d11f094118b5115589f463945b8763c9fb5c22a09965c637e72b14c7364813f8d69e05f SHA512 8c80d75909398245c0173a4198748d1a1e469e21a09138f60b314061ff556e7f529807e02c6ec1f3a47f2871e17c24b7be6d363810a25fee11e73b5c97c7c62a
+EBUILD level-zero-1.16.1.ebuild 708 BLAKE2B 1df2181b8e7096b46b6220eb70fdba8f6defc1c69ff6dd71415c27fa50e8581ae07d40884044dcbee82888a31e6294e2ccc7bb4b888ef4fe398b1de36d4bf415 SHA512 73ac2820957a7a3b508bb1f7472ecdcf9550d091331f63c5e8cffcade3993c33ab69383de5bb6a66a67390e604deb326128c7e608118105eab642d9322a30ad4
+EBUILD level-zero-1.16.14.ebuild 737 BLAKE2B cf27cf65beac58bd5d745b172780399d6481a8db7563e949fbbea328a8133ee8f04da7c6871c68becdc2bc38a4989a60900292e1b23673ac6b348a816c2b2de9 SHA512 031f720608bab8377c3e54f448bca466c2f1e4fb90a774e9b1b3e36d5dad68cceaacc5c9b6f4b4a81e11c6a2d05b5678ef58296643dd80f6d21cf80da74aa0c7
 MISC metadata.xml 586 BLAKE2B 44eca05640a9276ea9cbddccc0d199dc8c7297a3fbf5ad6b58693c406961efa2aabf99501faaace47ce6bb97736fe371533e89a5a700949b03db66359222b269 SHA512 da9b222b216ed217842f236eeb1991e31ec4f140d86c0a048e9e401a18018d90d6ad8d4f10edec8b71386687bc9481ebf9154a1190bf6969d4fab04bba20100e
diff --git a/dev-libs/level-zero/level-zero-1.16.1.ebuild b/dev-libs/level-zero/level-zero-1.16.1.ebuild
index 5c75496434ba..2633bc02fc74 100644
--- a/dev-libs/level-zero/level-zero-1.16.1.ebuild
+++ b/dev-libs/level-zero/level-zero-1.16.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 src_prepare() {
 	# Don't hardcore -Werror
diff --git a/dev-libs/level-zero/level-zero-1.15.8.ebuild b/dev-libs/level-zero/level-zero-1.16.14.ebuild
index 2633bc02fc74..4afcd285ad24 100644
--- a/dev-libs/level-zero/level-zero-1.15.8.ebuild
+++ b/dev-libs/level-zero/level-zero-1.16.14.ebuild
@@ -11,7 +11,9 @@ SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
+
+DEPEND="dev-libs/spdlog:="
 
 src_prepare() {
 	# Don't hardcore -Werror
diff --git a/dev-libs/libdbusmenu-lxqt/Manifest b/dev-libs/libdbusmenu-lxqt/Manifest
new file mode 100644
index 000000000000..1e1d96f0133a
--- /dev/null
+++ b/dev-libs/libdbusmenu-lxqt/Manifest
@@ -0,0 +1,4 @@
+AUX libdbusmenu-lxqt-0.1.0-cmake.patch 4430 BLAKE2B c8d76059ce1ba821e3dccc012559bdd9ae5cee4c70dcfb946f26b8ab5460c8e35e7ccfb2f8f7c82396a54dde733017baf8bcdccd59b65ceed7b6c7120cd7f0dc SHA512 c1f3b82c54bb0cb82212e2a478740f6578fe7a2b028e9e8ea8ab1da517f7e7be8eb7cbeadf7a7799ac10b6d3dbf64ece139ecf2386f4be3448930e7e75df7882
+DIST libdbusmenu-lxqt-0.1.0.tar.xz 39232 BLAKE2B 7c2741609996a33fb1bffb9aff938130e31ebc6796dcf613ccbb2bbf9bae2290fa09bda9777ebec2b819c7ac2ce04ad086483db409c2809517ce7e41729cd71d SHA512 8c09f9bd4b3c60db1666f5a53ea84c67d2d120b215eca6563c32385387e100fe591cb8653a283750444356c61306cf385507edb6a507b22427eb6f18aa972fb5
+EBUILD libdbusmenu-lxqt-0.1.0.ebuild 528 BLAKE2B 5fb1939446ec7052528e69d4340bb07809124b9438ec5eb2c2b5cd6452d4f56dc56afba5e02e3ca96fee89489d7bdefd798d0ffe4bc5c0b917067e6e8eb460e7 SHA512 4eee81b9dd0c3bd744efd5b4a5163cbd23864b01d675de1e40364720a51b35bda773c8f7f47762672b79c12585df9b22e1fe9ba53b0e1058146bb75b52c9065c
+MISC metadata.xml 431 BLAKE2B d406d2712cc8e8be78b3768b87317cdd298894df8c566b0d5920a426e235cf3d7d043c79612beccf085c317b059631f0e1a0f0cf89da9e2515f1e040c3e0c0a7 SHA512 3691757fde9c3031fd81c0bc26f399b9127dc0f871501125a89548db9bfb30de750f0e87b64961c9d640ebd2c135fbb2e3c5317f00da3548a0160059ac45d71f
diff --git a/dev-libs/libdbusmenu-lxqt/files/libdbusmenu-lxqt-0.1.0-cmake.patch b/dev-libs/libdbusmenu-lxqt/files/libdbusmenu-lxqt-0.1.0-cmake.patch
new file mode 100644
index 000000000000..835e8eb71c86
--- /dev/null
+++ b/dev-libs/libdbusmenu-lxqt/files/libdbusmenu-lxqt-0.1.0-cmake.patch
@@ -0,0 +1,129 @@
+From 1be3710c1032eb8eee9fabc59f05f335aeb2e97c Mon Sep 17 00:00:00 2001
+From: Jimi Huotari <chiitoo@gentoo.org>
+Date: Wed, 20 Mar 2024 21:01:00 +0200
+Subject: [PATCH] cmake: fix pkgconfig libdir path with general cleanup
+
+Also use more GNUInstallDirs.
+
+Adapted from: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.3_pre20160218-cmake.patch
+---
+ CMakeLists.txt                | 14 ++++++--------
+ cmake/modules/FindQJSON.cmake |  2 +-
+ dbusmenu-lxqt.pc.in           |  6 +++---
+ src/CMakeLists.txt            | 10 +++++-----
+ 4 files changed, 15 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3e46428..7bb1e66 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -49,9 +49,7 @@ endif (__DBUSMENU_HAVE_CXX17)
+ 
+ include(CMakePackageConfigHelpers)
+ include(GNUInstallDirs)
+-set(LIB_DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+-set(CMAKECONFIG_INSTALL_DIR "${LIB_DESTINATION}/cmake/dbusmenu-lxqt")
+-set(INCLUDE_INSTALL_DIR "include/dbusmenu-lxqt")
++set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/dbusmenu-lxqt")
+ 
+ # dist targets
+ set(ARCHIVE_NAME libdbusmenu-lxqt-${dbusmenu_lxqt_VERSION})
+@@ -76,7 +74,7 @@ add_dependencies(distcheck dist)
+ configure_file(dbusmenu-lxqt.pc.in ${CMAKE_BINARY_DIR}/dbusmenu-lxqt.pc @ONLY)
+ 
+ install(FILES ${CMAKE_BINARY_DIR}/dbusmenu-lxqt.pc
+-        DESTINATION ${LIB_DESTINATION}/pkgconfig
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+     )
+ 
+ add_subdirectory(src)
+@@ -91,7 +89,7 @@ if(WITH_DOC)
+         )
+ 
+     install(DIRECTORY ${CMAKE_BINARY_DIR}/html/
+-        DESTINATION share/doc/libdbusmenu-lxqt-doc
++        DESTINATION ${CMAKE_INSTALL_DOCDIR}
+         )
+ endif(WITH_DOC)
+ 
+@@ -99,7 +97,7 @@ endif(WITH_DOC)
+ configure_package_config_file(
+     dbusmenu-lxqt-config.cmake.in
+     ${CMAKE_BINARY_DIR}/dbusmenu-lxqt-config.cmake
+-    INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
++    INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/dbusmenu-lxqt
+     PATH_VARS INCLUDE_INSTALL_DIR
+     )
+ 
+@@ -113,6 +111,6 @@ write_basic_package_version_file(
+ install(FILES
+     ${CMAKE_BINARY_DIR}/dbusmenu-lxqt-config.cmake
+     ${CMAKE_BINARY_DIR}/dbusmenu-lxqt-config-version.cmake
+-    DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
++    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/dbusmenu-lxqt"
+     COMPONENT Devel
+     )
+diff --git a/cmake/modules/FindQJSON.cmake b/cmake/modules/FindQJSON.cmake
+index cd007e1..e1371ce 100644
+--- a/cmake/modules/FindQJSON.cmake
++++ b/cmake/modules/FindQJSON.cmake
+@@ -34,7 +34,7 @@ else (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
+     qjson/parser.h
+     PATHS
+     ${PC_QJSON_INCLUDE_DIRS}
+-    ${INCLUDE_INSTALL_DIR}
++    ${CMAKE_INSTALL_INCLUDEDIR}
+     ${KDE4_INCLUDE_DIR}
+   )
+ 
+diff --git a/dbusmenu-lxqt.pc.in b/dbusmenu-lxqt.pc.in
+index d437851..60e81ad 100644
+--- a/dbusmenu-lxqt.pc.in
++++ b/dbusmenu-lxqt.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@CMAKE_INSTALL_PREFIX@/lib
+-includedir=@CMAKE_INSTALL_PREFIX@/include/dbusmenu-lxqt
++exec_prefix=${prefix}
++libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/dbusmenu-lxqt
+ 
+ Name: libdbusmenu-lxqt
+ Description: Qt implementation of dbusmenu spec
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index e0d65e5..90b801c 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -83,23 +83,23 @@ target_link_libraries(dbusmenu-lxqt
+ 
+ # Make sure linking to the target adds dbusmenu-lxqt install directory
+ target_include_directories(dbusmenu-lxqt
+-    INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
++    INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/dbusmenu-lxqt>")
+ 
+ install(TARGETS dbusmenu-lxqt
+     EXPORT dbusmenu-lxqt-targets
+-    LIBRARY DESTINATION ${LIB_DESTINATION}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     RUNTIME DESTINATION bin
+     )
+ 
+ install(EXPORT dbusmenu-lxqt-targets
+-    DESTINATION ${CMAKECONFIG_INSTALL_DIR})
++    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/dbusmenu-lxqt)
+ 
+ install(DIRECTORY .
+-    DESTINATION ${INCLUDE_INSTALL_DIR}
++    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dbusmenu-lxqt
+     FILES_MATCHING PATTERN "*.h"
+     PATTERN "*_p.h" EXCLUDE
+     )
+ 
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dbusmenu_version.h
+-    DESTINATION ${INCLUDE_INSTALL_DIR}
++    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dbusmenu-lxqt
+     )
+-- 
+2.44.0
+
diff --git a/dev-libs/libdbusmenu-lxqt/libdbusmenu-lxqt-0.1.0.ebuild b/dev-libs/libdbusmenu-lxqt/libdbusmenu-lxqt-0.1.0.ebuild
new file mode 100644
index 000000000000..c21b6f45c981
--- /dev/null
+++ b/dev-libs/libdbusmenu-lxqt/libdbusmenu-lxqt-0.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="LXQt DBusMenu Implementation"
+HOMEPAGE="https://lxqt-project.org/"
+
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+
+RDEPEND=">=dev-qt/qtbase-6.6:6[dbus,widgets]"
+
+PATCHES=( "${FILESDIR}/${PN}-0.1.0-cmake.patch" )
diff --git a/dev-libs/libdbusmenu-lxqt/metadata.xml b/dev-libs/libdbusmenu-lxqt/metadata.xml
new file mode 100644
index 000000000000..e11930658310
--- /dev/null
+++ b/dev-libs/libdbusmenu-lxqt/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">lxqt/libdbusmenu-lxqt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index a4e70a872a7b..99884ae87e85 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,5 +1,5 @@
 DIST libgusb-0.4.7.tar.xz 51448 BLAKE2B 126d7723e7f47cf1ee4780aaf627c15e8e04a95a765f5c68578d6a31ec1d69578af05b6687224399e657dfaf2f983bad5415b05c19c3334cfc7fc06a58f0a27e SHA512 38f8d4989e3adc46013a9e8ca42511c5de9bbaf23a11654eb47d7c9a9c64b90f0213b77916f8ebd1e6c246aaafa0e1574bb72a19170ae9efa2af9e3f86a4e210
 DIST libgusb-0.4.8.tar.xz 51632 BLAKE2B f904bb8a0766a61b0e7d6e5e80d7f0eed5c44537065db2b9bf33cd694fcaa58d93a7cdec37802fd278c2eb7ad2e4de79cd492baa1ead373e31e4d75488999e1e SHA512 b6446761ba4a19b8e7b7fc2bcf26064c89a574c328b794eb3f1723ef71b4100447c5b024bd8163c4e42af935ce0b7e11b93b722871061f7115da0003cc14b001
 EBUILD libgusb-0.4.7.ebuild 1752 BLAKE2B bd5ca80976764d5f9ce138e15cd7a3e39561711b4abba0ef73444bdfe016f2217827b5b6dba9d8361ca1471226d523fa4cd5100b4bf933ec792272073e077b72 SHA512 f54d11e4e13c09b48b97ba5625e08c5c358d3c8a00ef40ef2cbc25e516972ac1468a1cf45ac4afad829f5c98e1927088899eb179db4e6dd2e4d505a61a22115a
-EBUILD libgusb-0.4.8.ebuild 1753 BLAKE2B e15e75f8e5dd797a0d0f8786a149a1a4100b181c5adf4f54f845034e74e8053ff8d9858ca4e547f1b51f3807913a293d099b6dae4205756b6e62cb0592150c18 SHA512 66d01e44ec99b705f9ad1799f380f767edd64872b1ccba92842c558a04357ffe3f57d44391fec0bac1047e9263d57de666d7f56e16201d0e130d0bb573ad071c
+EBUILD libgusb-0.4.8.ebuild 1752 BLAKE2B bd5ca80976764d5f9ce138e15cd7a3e39561711b4abba0ef73444bdfe016f2217827b5b6dba9d8361ca1471226d523fa4cd5100b4bf933ec792272073e077b72 SHA512 f54d11e4e13c09b48b97ba5625e08c5c358d3c8a00ef40ef2cbc25e516972ac1468a1cf45ac4afad829f5c98e1927088899eb179db4e6dd2e4d505a61a22115a
 MISC metadata.xml 344 BLAKE2B bd362d7e89ba2d88c2f220ab47593b4ae25bc4ca486bdafda16448407213d7558d7ea807c489e5aafbb8ec83a40e8e339c8ba20d3bfc3957da33a7e7711c6898 SHA512 93166c6dd4d764901c87fc567ab1c67add1c654b7ea1f3326e7144d5c14789bdee2a1e37874f8b6158136e03363372bf1d972f49f96095b0e3e568af89c4af34
diff --git a/dev-libs/libgusb/libgusb-0.4.8.ebuild b/dev-libs/libgusb/libgusb-0.4.8.ebuild
index 1d2fb5b4f7c9..986ca1a121f6 100644
--- a/dev-libs/libgusb/libgusb-0.4.8.ebuild
+++ b/dev-libs/libgusb/libgusb-0.4.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hughsie/libgusb/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 
 IUSE="gtk-doc +introspection test +vala"
 REQUIRED_USE="
diff --git a/dev-libs/libjwt/Manifest b/dev-libs/libjwt/Manifest
index f992c0fe855f..317eb355faeb 100644
--- a/dev-libs/libjwt/Manifest
+++ b/dev-libs/libjwt/Manifest
@@ -1,6 +1,4 @@
-AUX libjwt-1.13.1_multi_ssl_atools.patch 8254 BLAKE2B bc0bdc851ff40e5cc92feb8e09d1f853f639a071a3bf5f0933c3704525ea70828227197f996fa9bce7aa61b66e347edb4ce0c1f832fb92657528741efbaf8b8d SHA512 ba1a06a003206abd316368e39b0a6ce6049dae3af0b98ca7c05a6bb7a483b4068b2644584a43252af723be9e09cf8e863e74eb1bedbcb850abe0a7643b7ce26e
 AUX libjwt-1.15.3_multi_ssl_atools.patch 11660 BLAKE2B 62046f64feca25e5f3ea49bbe650964f38b5185669f320f05f4ae519e54a0300427b481e80d2ca45a0064c30986a6bcd43d4c6ad0b327c0de35d1eee973b2bf7 SHA512 4c7c69b53a62fb3c35c0f008d17ff3391eebc7ae38dee0130bce3080595ecf9ae812cdb50dcd497c40705d023506da5844190f874cb99a82802342ad76cd8bac
-AUX libjwt-1.16.0_multi_ssl_atools.patch 11908 BLAKE2B 683b4ec384191349954ab5dc2c8f7d31a641fc78cfb9041243ae61d6a68083896af7066ecbca49b7234668dee82473dc697f1db7d7a90d8c247e40bdc811ba1b SHA512 22c72fa14056e85c3111725ff3aebd28e3bbd445652e58c2123333252b5998ca78b1ed2487f109570e8cfc82037346feaddaa183d64a043ee2c8e388a4b942a1
 DIST libjwt-1.15.3.tar.gz 108461 BLAKE2B 76b113ba189b23cf254906f85aa16df0a3243554c1930ea8471942072aaa1539814df444e5f1d48693ff5147489b444505358f6bdd84a88928a8ab5f3e036110 SHA512 111052e4a424f3960383ee533503c633b7284e4283e5b50cb8d5ba1fae6012b6f142d58e7230af0ff731329822abc7c3ab551b635b81d1341d3d5025b32dfd9f
 EBUILD libjwt-1.15.3.ebuild 1311 BLAKE2B e3f0aec980e8e37ee3ac4945136eb3015bdf7da3c317602938058c72e3f7e40d66b7a388f6c9bdea5a3cbc328c6b46eff48f3f67aced334500298747a785ef36 SHA512 4233be5f6880833b92d05c33bd4503c777367249a2a7f6e8bf3090b41103431b6db3c1ca3f5d20010305405967eebcdb19b9354f6486bd673e618ac83ae6369b
 MISC metadata.xml 795 BLAKE2B 6fbd23d7527c3cf251e5848aa8809e2969dede5561f5eaafe7e1e791606d45f89904c7871564abefc756f2522570f51ac14f1ace5484f74c8830ff5121d5cc80 SHA512 84be7f21937fdb75a7a7dcbee97496307c23972e1f62c32201162f2d6e7293274b58f7e7abac7030e7b0af6d68313fb14eb7e05cb50648ff7a6980c3744af302
diff --git a/dev-libs/libjwt/files/libjwt-1.13.1_multi_ssl_atools.patch b/dev-libs/libjwt/files/libjwt-1.13.1_multi_ssl_atools.patch
deleted file mode 100644
index 4d92ce0273be..000000000000
--- a/dev-libs/libjwt/files/libjwt-1.13.1_multi_ssl_atools.patch
+++ /dev/null
@@ -1,233 +0,0 @@
-From: https://github.com/dekeonus/libjwt/tree/feat-multi-ssl
-
-Enables multiple ssl implemtations to be installed at the same time
-default libjwt will default to linking to openssl (if openssl enabled)
-
-
-diff --git a/configure.ac b/configure.ac
-index 2b28327..183f163 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -8,25 +8,99 @@ AC_CONFIG_HEADERS([libjwt/config.h])
- 
- AC_SUBST([AM_CFLAGS], [-Wall])
- 
--dnl Prefer OpenSSL unless asked to ignore it
-+dnl Build with OpenSSL when asked
- AC_ARG_WITH([openssl],
--	AS_HELP_STRING([--without-openssl], [Ignore presence of OpenSSL libraries and use GnuTLS]))
--
--AS_IF([test "x$with_openssl" != "xno"], [
--	PKG_CHECK_MODULES([OPENSSL], [openssl >= 0.9.8])
--	AM_CONDITIONAL([HAVE_OPENSSL], [true])
--], [
--	PKG_CHECK_MODULES([GNUTLS], [gnutls >= 3.5.8])
--	AM_CONDITIONAL([HAVE_OPENSSL], [false])
-+	AS_HELP_STRING([--with-openssl], [Build using OpenSSL library]),
-+	[with_openssl=$withval],
-+	[blank_openssl=yes])
-+
-+dnl Build with GnutLS when asked
-+AC_ARG_WITH([gnutls],
-+	AS_HELP_STRING([--with-gnutls], [Build using GnuTLS library]),
-+	[with_gnutls=$withval],
-+	[blank_gnutls=yes])
-+
-+dnl If no with[out]-'ssl' default to openssl
-+AS_IF([test "x$blank_openssl" = "xyes" -a "x$blank_gnutls" = "xyes"], [
-+	with_openssl=yes
-+])
-+
-+dnl emulate previous build, without-openssl means build with gnutls
-+AS_IF([test "x$with_openssl" = "xno" -a "x$blank_gnutls" = "xyes"], [
-+	with_gnutls=yes
-+])
-+
-+AC_ARG_ENABLE([multi-ssl], AS_HELP_STRING([--enable-multi-ssl],
-+		[Enable multiple ssl library implementations]),
-+	[enable_multi_ssl=$enableval],
-+	[enable_multi_ssl=no])
-+
-+AS_IF([test "x$enable_multi_ssl" = "xno"], [
-+	AS_IF([test "x$with_openssl" = "xyes" -a "x$with_gnutls" = "xyes"], [
-+AC_MSG_ERROR([You need to enable multi-ssl to support multiple ssl implementations concurrently])
-+	])
-+])
-+AM_CONDITIONAL([MULTI_SSL], [test "x$enable_multi_ssl" = "xyes"])
-+
-+AS_IF([test "x$with_openssl" = "xyes"], [
-+	PKG_CHECK_MODULES([OPENSSL], [openssl >= 0.9.8], [found_openssl=yes])
-+])
-+AM_CONDITIONAL([HAVE_OPENSSL], [test "x$found_openssl" = "xyes"])
-+
-+AS_IF([test "x$with_gnutls" = "xyes"], [
-+	PKG_CHECK_MODULES([GNUTLS], [gnutls >= 3.5.8], [found_gnutls=yes])
-+])
-+AM_CONDITIONAL([HAVE_GNUTLS], [test "x$found_gnutls" = "xyes"])
-+
-+AS_IF([test "x$found_openssl" != "xyes" -a "x$found_gnutls" != "xyes"], [
-+	AC_MSG_ERROR([Neither openssl nor gnutls was found])
- ])
- 
-+dnl work out default, or only, ssl library
-+AC_MSG_CHECKING([which ssl library to use as default])
-+AC_ARG_WITH([default-ssl], AS_HELP_STRING([--with-default-ssl@<:@=Lib@:>@],
-+		[set default ssl library [openssl|gnutls] for multi-ssl]),
-+	[with_default_ssl=$withval],
-+	[with_default_ssl=yes])
-+dnl note, yes/blank case will require further nesting, if additional ssl lib support added
-+AS_CASE([$with_default_ssl],
-+	[openssl], [AS_IF([test "x$found_openssl" = "xyes"], [ssl_impl=openssl],
-+		[AC_MSG_ERROR([requested default ssl lib openssl, but openssl not found])]
-+			)],
-+	[gnutls], [AS_IF([test "x$found_gnutls" = "xyes"], [ssl_impl=gnutls],
-+		[AC_MSG_ERROR([requested default ssl lib gnutls, but gnutls not found])]
-+			)],
-+	[no], [AC_MSG_ERROR([unsupported configuration --without-default-ssl])],
-+	[yes], [AS_IF([test "x$found_openssl" = "xyes"], [ssl_impl=openssl],
-+			[ssl_impl=gnutls])],
-+	[AC_MSG_ERROR([Unknown ssl library $with_default_ssl])]
-+)
-+AC_MSG_RESULT([$ssl_impl])
-+
- AC_ARG_WITH([examples],
- 	AS_HELP_STRING([--without-examples], [do not build example programs]),
--	[],
-+	[with_examples=$withval],
- 	[with_examples=yes])
- 
- AM_CONDITIONAL([BUILD_EXAMPLES], [test "x$with_examples" != "xno"])
- 
-+dnl should not reach default case, bail out if it triggers
-+AS_CASE([$ssl_impl],
-+	[openssl], [
-+		AC_SUBST([SSL_DEF_LDFLAGS], [$OPENSSL_LDFLAGS])
-+		AC_SUBST([SSL_DEF_INCLUDES], [$OPENSSL_INCLUDES])
-+		AC_SUBST([SSL_DEF_CFLAGS], [$OPENSSL_CFLAGS])
-+		AC_SUBST([SSL_DEF_LIBS], [$OPENSSL_LIBS])
-+		],
-+	[gnutls], [
-+		AC_SUBST([SSL_DEF_LDFLAGS], [$GNUTLS_LDFLAGS])
-+		AC_SUBST([SSL_DEF_INCLUDES], [$GNUTLS_INCLUDES])
-+		AC_SUBST([SSL_DEF_CFLAGS], [$GNUTLS_CFLAGS])
-+		AC_SUBST([SSL_DEF_LIBS], [$GNUTLS_LIBS])
-+		],
-+	[AC_MSG_ERROR([unable to set default ssl library])]
-+)
-+
- PKG_CHECK_MODULES([JANSSON], [jansson >= 2.0])
- PKG_CHECK_MODULES([CHECK], [check >= 0.9.4], [true], [true])
- 
-@@ -46,6 +120,13 @@ DX_PDF_FEATURE(OFF)
- DX_PS_FEATURE(OFF)
- DX_INIT_DOXYGEN($PACKAGE_NAME, doxygen.cfg)
- 
-+
-+AM_COND_IF([MULTI_SSL], [
-+	AM_COND_IF([HAVE_OPENSSL],
-+		[AC_CONFIG_FILES([libjwt/libjwt-ossl.pc])])
-+	AM_COND_IF([HAVE_GNUTLS],
-+		[AC_CONFIG_FILES([libjwt/libjwt-gnutls.pc])])
-+	])
- AC_CONFIG_FILES([
- 	Makefile
- 	include/Makefile
-diff --git a/libjwt/Makefile.am b/libjwt/Makefile.am
-index 9600317..c69b424 100644
---- a/libjwt/Makefile.am
-+++ b/libjwt/Makefile.am
-@@ -8,11 +8,44 @@ else
- libjwt_la_SOURCES += jwt-gnutls.c
- endif
- 
-+if MULTI_SSL
-+if HAVE_OPENSSL
-+lib_LTLIBRARIES += libjwt-ossl.la
-+libjwt_ossl_la_SOURCES = jwt.c base64.c jwt-openssl.c
-+endif
-+if HAVE_GNUTLS
-+lib_LTLIBRARIES += libjwt-gnutls.la
-+libjwt_gnutls_la_SOURCES = jwt.c base64.c jwt-gnutls.c
-+endif
-+endif
-+
- # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
--libjwt_la_LDFLAGS = -version-info 9:1:8 $(OPENSSL_LDFLAGS) $(GNUTLS_LDFLAGS) $(JANSSON_LDFLAGS) -no-undefined
--libjwt_la_CPPFLAGS = -I$(top_srcdir)/include $(OPENSSL_INCLUDES) $(GNUTLS_INCLUDES) $(CODE_COVERAGE_CPPFLAGS) -Wall
--libjwt_la_CFLAGS = $(JANSSON_CFLAGS) $(OPENSSL_CFLAGS) $(GNUTLS_CFLAGS) $(CODE_COVERAGE_CFLAGS) -D_GNU_SOURCE
--libjwt_la_LIBADD = $(JANSSON_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS) $(CODE_COVERAGE_LDFLAGS)
-+libjwt_la_LDFLAGS = -version-info 9:1:8 $(SSL_DEF_LDFLAGS) $(JANSSON_LDFLAGS) -no-undefined
-+libjwt_la_CPPFLAGS = -I$(top_srcdir)/include $(SSL_DEF_INCLUDES) $(CODE_COVERAGE_CPPFLAGS) -Wall
-+libjwt_la_CFLAGS = $(JANSSON_CFLAGS) $(SSL_DEF_CFLAGS) $(CODE_COVERAGE_CFLAGS) -D_GNU_SOURCE
-+libjwt_la_LIBADD = $(JANSSON_LIBS) $(SSL_DEF_LIBS) $(CODE_COVERAGE_LDFLAGS)
-+if MULTI_SSL
-+if HAVE_OPENSSL
-+libjwt_ossl_la_LDFLAGS = -version-info 9:1:8 $(OPENSSL_LDFLAGS) $(JANSSON_LDFLAGS) -no-undefined
-+libjwt_ossl_la_CPPFLAGS = -I$(top_srcdir)/include $(OPENSSL_INCLUDES) $(CODE_COVERAGE_CPPFLAGS) -Wall
-+libjwt_ossl_la_CFLAGS = $(JANSSON_CFLAGS) $(OPENSSL_CFLAGS) $(CODE_COVERAGE_CFLAGS) -D_GNU_SOURCE
-+libjwt_ossl_la_LIBADD = $(JANSSON_LIBS) $(OPENSSL_LIBS) $(CODE_COVERAGE_LDFLAGS)
-+endif
-+if HAVE_GNUTLS
-+libjwt_gnutls_la_LDFLAGS = -version-info 9:1:8 $(GNUTLS_LDFLAGS) $(JANSSON_LDFLAGS) -no-undefined
-+libjwt_gnutls_la_CPPFLAGS = -I$(top_srcdir)/include $(GNUTLS_INCLUDES) $(CODE_COVERAGE_CPPFLAGS) -Wall
-+libjwt_gnutls_la_CFLAGS = $(JANSSON_CFLAGS) $(GNUTLS_CFLAGS) $(CODE_COVERAGE_CFLAGS) -D_GNU_SOURCE
-+libjwt_gnutls_la_LIBADD = $(JANSSON_LIBS) $(GNUTLS_LIBS) $(CODE_COVERAGE_LDFLAGS)
-+endif
-+endif
- 
- pkgconfiglibdir = $(libdir)/pkgconfig
- pkgconfiglib_DATA = libjwt.pc
-+if MULTI_SSL
-+if HAVE_OPENSSL
-+pkgconfiglib_DATA += libjwt-ossl.pc
-+endif
-+if HAVE_GNUTLS
-+pkgconfiglib_DATA += libjwt-gnutls.pc
-+endif
-+endif
-diff --git a/libjwt/libjwt-gnutls.pc.in b/libjwt/libjwt-gnutls.pc.in
-new file mode 100644
-index 0000000..63962ee
---- /dev/null
-+++ b/libjwt/libjwt-gnutls.pc.in
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: @PACKAGE_NAME@
-+Description: JWT C Library
-+Version: @PACKAGE_VERSION@
-+
-+Cflags: -I${includedir}
-+Libs: -L${libdir} -ljwt-gnutls
-+Libs.private: @JANSSON_LIBS@ @GNUTLS_LIBS@
-diff --git a/libjwt/libjwt-ossl.pc.in b/libjwt/libjwt-ossl.pc.in
-new file mode 100644
-index 0000000..98c0ebe
---- /dev/null
-+++ b/libjwt/libjwt-ossl.pc.in
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: @PACKAGE_NAME@
-+Description: JWT C Library
-+Version: @PACKAGE_VERSION@
-+
-+Cflags: -I${includedir}
-+Libs: -L${libdir} -ljwt-ossl
-+Libs.private: @JANSSON_LIBS@ @OPENSSL_LIBS@
-diff --git a/libjwt/libjwt.pc.in b/libjwt/libjwt.pc.in
-index 0c81d36..0bb64f4 100644
---- a/libjwt/libjwt.pc.in
-+++ b/libjwt/libjwt.pc.in
-@@ -9,4 +9,4 @@ Version: @PACKAGE_VERSION@
- 
- Cflags: -I${includedir}
- Libs: -L${libdir} -ljwt
--Libs.private: @JANSSON_LIBS@ @OPENSSL_LIBS@
-+Libs.private: @JANSSON_LIBS@ @SSL_DEF_LIBS@
diff --git a/dev-libs/libjwt/files/libjwt-1.16.0_multi_ssl_atools.patch b/dev-libs/libjwt/files/libjwt-1.16.0_multi_ssl_atools.patch
deleted file mode 100644
index 972b2fdad312..000000000000
--- a/dev-libs/libjwt/files/libjwt-1.16.0_multi_ssl_atools.patch
+++ /dev/null
@@ -1,348 +0,0 @@
-From: https://github.com/dekeonus/libjwt/tree/feat-multi-ssl
-
-Enables multiple ssl implemtations to be installed at the same time
-default libjwt will default to linking to openssl (if openssl enabled)
-
-
-diff --git a/configure.ac b/configure.ac
-index 6061add..447dd10 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -6,27 +6,105 @@ LT_INIT([])
- AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_HEADERS([libjwt/config.h])
- 
-+AC_SUBST([LIBJWT_LTVERSION], [11:1:9])
- AC_SUBST([AM_CFLAGS], [-Wall])
- 
--dnl Prefer OpenSSL unless asked to ignore it
-+dnl Build with OpenSSL when asked
- AC_ARG_WITH([openssl],
--	AS_HELP_STRING([--without-openssl], [Ignore presence of OpenSSL libraries and use GnuTLS]))
--
--AS_IF([test "x$with_openssl" != "xno"], [
--	PKG_CHECK_MODULES([OPENSSL], [openssl >= 0.9.8])
--	AM_CONDITIONAL([HAVE_OPENSSL], [true])
--], [
--	PKG_CHECK_MODULES([GNUTLS], [gnutls >= 3.6.0])
--	AM_CONDITIONAL([HAVE_OPENSSL], [false])
-+	AS_HELP_STRING([--with-openssl], [Build using OpenSSL library]),
-+	[with_openssl=$withval],
-+	[blank_openssl=yes])
-+
-+dnl Build with GnutLS when asked
-+AC_ARG_WITH([gnutls],
-+	AS_HELP_STRING([--with-gnutls], [Build using GnuTLS library]),
-+	[with_gnutls=$withval],
-+	[blank_gnutls=yes])
-+
-+dnl If no with[out]-'ssl' default to openssl
-+AS_IF([test "x$blank_openssl" = "xyes" -a "x$blank_gnutls" = "xyes"], [
-+	with_openssl=yes
-+])
-+
-+dnl emulate previous build, without-openssl means build with gnutls
-+AS_IF([test "x$with_openssl" = "xno" -a "x$blank_gnutls" = "xyes"], [
-+	with_gnutls=yes
-+])
-+
-+AC_ARG_ENABLE([multi-ssl], AS_HELP_STRING([--enable-multi-ssl],
-+		[Enable multiple ssl library implementations]),
-+	[enable_multi_ssl=$enableval],
-+	[enable_multi_ssl=no])
-+
-+AS_IF([test "x$enable_multi_ssl" = "xno"], [
-+	AS_IF([test "x$with_openssl" = "xyes" -a "x$with_gnutls" = "xyes"], [
-+AC_MSG_ERROR([You need to enable multi-ssl to support multiple ssl implementations concurrently])
-+	])
-+])
-+AM_CONDITIONAL([MULTI_SSL], [test "x$enable_multi_ssl" = "xyes"])
-+
-+AS_IF([test "x$with_openssl" = "xyes"], [
-+	PKG_CHECK_MODULES([OPENSSL], [openssl >= 0.9.8], [found_openssl=yes])
-+])
-+AM_CONDITIONAL([HAVE_OPENSSL], [test "x$found_openssl" = "xyes"])
-+
-+AS_IF([test "x$with_gnutls" = "xyes"], [
-+	PKG_CHECK_MODULES([GNUTLS], [gnutls >= 3.6.0], [found_gnutls=yes])
-+])
-+AM_CONDITIONAL([HAVE_GNUTLS], [test "x$found_gnutls" = "xyes"])
-+
-+AS_IF([test "x$found_openssl" != "xyes" -a "x$found_gnutls" != "xyes"], [
-+	AC_MSG_ERROR([Neither openssl nor gnutls was found])
- ])
- 
-+dnl work out default, or only, ssl library
-+AC_MSG_CHECKING([which ssl library to use as default])
-+AC_ARG_WITH([default-ssl], AS_HELP_STRING([--with-default-ssl@<:@=Lib@:>@],
-+		[set default ssl library [openssl|gnutls] for multi-ssl]),
-+	[with_default_ssl=$withval],
-+	[with_default_ssl=yes])
-+dnl note, yes/blank case will require further nesting, if additional ssl lib support added
-+AS_CASE([$with_default_ssl],
-+	[openssl], [AS_IF([test "x$found_openssl" = "xyes"], [ssl_impl=openssl],
-+		[AC_MSG_ERROR([requested default ssl lib openssl, but openssl not found])]
-+			)],
-+	[gnutls], [AS_IF([test "x$found_gnutls" = "xyes"], [ssl_impl=gnutls],
-+		[AC_MSG_ERROR([requested default ssl lib gnutls, but gnutls not found])]
-+			)],
-+	[no], [AC_MSG_ERROR([unsupported configuration --without-default-ssl])],
-+	[yes], [AS_IF([test "x$found_openssl" = "xyes"], [ssl_impl=openssl],
-+			[ssl_impl=gnutls])],
-+	[AC_MSG_ERROR([Unknown ssl library $with_default_ssl])]
-+)
-+AC_MSG_RESULT([$ssl_impl])
-+
- AC_ARG_WITH([examples],
- 	AS_HELP_STRING([--without-examples], [do not build example programs]),
--	[],
-+	[with_examples=$withval],
- 	[with_examples=yes])
- 
- AM_CONDITIONAL([BUILD_EXAMPLES], [test "x$with_examples" != "xno"])
- 
-+dnl should not reach default case, bail out if it triggers
-+AS_CASE([$ssl_impl],
-+	[openssl], [
-+		AC_SUBST([SSL_DEF_LDFLAGS], [$OPENSSL_LDFLAGS])
-+		AC_SUBST([SSL_DEF_INCLUDES], [$OPENSSL_INCLUDES])
-+		AC_SUBST([SSL_DEF_CFLAGS], [$OPENSSL_CFLAGS])
-+		AC_SUBST([SSL_DEF_LIBS], [$OPENSSL_LIBS])
-+		],
-+	[gnutls], [
-+		AC_SUBST([SSL_DEF_LDFLAGS], [$GNUTLS_LDFLAGS])
-+		AC_SUBST([SSL_DEF_INCLUDES], [$GNUTLS_INCLUDES])
-+		AC_SUBST([SSL_DEF_CFLAGS], [$GNUTLS_CFLAGS])
-+		AC_SUBST([SSL_DEF_LIBS], [$GNUTLS_LIBS])
-+		],
-+	[AC_MSG_ERROR([unable to set default ssl library])]
-+)
-+AM_CONDITIONAL([SSL_DEF_OPENSSL], [test "x$ssl_impl" = "xopenssl"])
-+dnl currently unused, for additional ssl implementations
-+dnl AM_CONDITIONAL([SSL_DEF_GNUTLS], [test "x$ssl_impl" = "xgnutls"])
-+
- PKG_CHECK_MODULES([JANSSON], [jansson >= 2.0])
- PKG_CHECK_MODULES([CHECK], [check >= 0.9.4], [true], [true])
- 
-@@ -44,6 +122,13 @@ DX_PDF_FEATURE(OFF)
- DX_PS_FEATURE(OFF)
- DX_INIT_DOXYGEN($PACKAGE_NAME, doxygen.cfg)
- 
-+
-+AM_COND_IF([MULTI_SSL], [
-+	AM_COND_IF([HAVE_OPENSSL],
-+		[AC_CONFIG_FILES([libjwt/libjwt-ossl.pc])])
-+	AM_COND_IF([HAVE_GNUTLS],
-+		[AC_CONFIG_FILES([libjwt/libjwt-gnutls.pc])])
-+	])
- AC_CONFIG_FILES([
- 	Makefile
- 	include/Makefile
-diff --git a/libjwt/Makefile.am b/libjwt/Makefile.am
-index 21ea12d..b837d53 100644
---- a/libjwt/Makefile.am
-+++ b/libjwt/Makefile.am
-@@ -4,17 +4,51 @@ lib_LTLIBRARIES = libjwt.la
- 
- libjwt_la_SOURCES = jwt.c base64.c
- 
--if HAVE_OPENSSL
-+if SSL_DEF_OPENSSL
- libjwt_la_SOURCES += jwt-openssl.c
- else
-+## SSL_DEF_GNUTLS
- libjwt_la_SOURCES += jwt-gnutls.c
- endif
- 
-+if MULTI_SSL
-+if HAVE_OPENSSL
-+lib_LTLIBRARIES += libjwt-ossl.la
-+libjwt_ossl_la_SOURCES = jwt.c base64.c jwt-openssl.c
-+endif
-+if HAVE_GNUTLS
-+lib_LTLIBRARIES += libjwt-gnutls.la
-+libjwt_gnutls_la_SOURCES = jwt.c base64.c jwt-gnutls.c
-+endif
-+endif
-+
- # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
--libjwt_la_LDFLAGS = -version-info 11:1:9 $(OPENSSL_LDFLAGS) $(GNUTLS_LDFLAGS) $(JANSSON_LDFLAGS) -no-undefined
--libjwt_la_CPPFLAGS = -I$(top_srcdir)/include $(OPENSSL_INCLUDES) $(GNUTLS_INCLUDES) $(CODE_COVERAGE_CPPFLAGS) -Wall
--libjwt_la_CFLAGS = $(JANSSON_CFLAGS) $(OPENSSL_CFLAGS) $(GNUTLS_CFLAGS) $(CODE_COVERAGE_CFLAGS) -D_GNU_SOURCE
--libjwt_la_LIBADD = $(JANSSON_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS) $(CODE_COVERAGE_LDFLAGS)
-+libjwt_la_LDFLAGS = -version-info $(LIBJWT_LTVERSION) $(SSL_DEF_LDFLAGS) $(JANSSON_LDFLAGS) -no-undefined
-+libjwt_la_CPPFLAGS = -I$(top_srcdir)/include $(SSL_DEF_INCLUDES) $(CODE_COVERAGE_CPPFLAGS) -Wall
-+libjwt_la_CFLAGS = $(JANSSON_CFLAGS) $(SSL_DEF_CFLAGS) $(CODE_COVERAGE_CFLAGS) -D_GNU_SOURCE
-+libjwt_la_LIBADD = $(JANSSON_LIBS) $(SSL_DEF_LIBS) $(CODE_COVERAGE_LDFLAGS)
-+if MULTI_SSL
-+if HAVE_OPENSSL
-+libjwt_ossl_la_LDFLAGS = -version-info $(LIBJWT_LTVERSION) $(OPENSSL_LDFLAGS) $(JANSSON_LDFLAGS) -no-undefined
-+libjwt_ossl_la_CPPFLAGS = -I$(top_srcdir)/include $(OPENSSL_INCLUDES) $(CODE_COVERAGE_CPPFLAGS) -Wall
-+libjwt_ossl_la_CFLAGS = $(JANSSON_CFLAGS) $(OPENSSL_CFLAGS) $(CODE_COVERAGE_CFLAGS) -D_GNU_SOURCE
-+libjwt_ossl_la_LIBADD = $(JANSSON_LIBS) $(OPENSSL_LIBS) $(CODE_COVERAGE_LDFLAGS)
-+endif
-+if HAVE_GNUTLS
-+libjwt_gnutls_la_LDFLAGS = -version-info $(LIBJWT_LTVERSION) $(GNUTLS_LDFLAGS) $(JANSSON_LDFLAGS) -no-undefined
-+libjwt_gnutls_la_CPPFLAGS = -I$(top_srcdir)/include $(GNUTLS_INCLUDES) $(CODE_COVERAGE_CPPFLAGS) -Wall
-+libjwt_gnutls_la_CFLAGS = $(JANSSON_CFLAGS) $(GNUTLS_CFLAGS) $(CODE_COVERAGE_CFLAGS) -D_GNU_SOURCE
-+libjwt_gnutls_la_LIBADD = $(JANSSON_LIBS) $(GNUTLS_LIBS) $(CODE_COVERAGE_LDFLAGS)
-+endif
-+endif
- 
- pkgconfiglibdir = $(libdir)/pkgconfig
- pkgconfiglib_DATA = libjwt.pc
-+if MULTI_SSL
-+if HAVE_OPENSSL
-+pkgconfiglib_DATA += libjwt-ossl.pc
-+endif
-+if HAVE_GNUTLS
-+pkgconfiglib_DATA += libjwt-gnutls.pc
-+endif
-+endif
-diff --git a/libjwt/libjwt-gnutls.pc.in b/libjwt/libjwt-gnutls.pc.in
-new file mode 100644
-index 0000000..63962ee
---- /dev/null
-+++ b/libjwt/libjwt-gnutls.pc.in
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: @PACKAGE_NAME@
-+Description: JWT C Library
-+Version: @PACKAGE_VERSION@
-+
-+Cflags: -I${includedir}
-+Libs: -L${libdir} -ljwt-gnutls
-+Libs.private: @JANSSON_LIBS@ @GNUTLS_LIBS@
-diff --git a/libjwt/libjwt-ossl.pc.in b/libjwt/libjwt-ossl.pc.in
-new file mode 100644
-index 0000000..98c0ebe
---- /dev/null
-+++ b/libjwt/libjwt-ossl.pc.in
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: @PACKAGE_NAME@
-+Description: JWT C Library
-+Version: @PACKAGE_VERSION@
-+
-+Cflags: -I${includedir}
-+Libs: -L${libdir} -ljwt-ossl
-+Libs.private: @JANSSON_LIBS@ @OPENSSL_LIBS@
-diff --git a/libjwt/libjwt.pc.in b/libjwt/libjwt.pc.in
-index 0c81d36..0bb64f4 100644
---- a/libjwt/libjwt.pc.in
-+++ b/libjwt/libjwt.pc.in
-@@ -9,4 +9,4 @@ Version: @PACKAGE_VERSION@
- 
- Cflags: -I${includedir}
- Libs: -L${libdir} -ljwt
--Libs.private: @JANSSON_LIBS@ @OPENSSL_LIBS@
-+Libs.private: @JANSSON_LIBS@ @SSL_DEF_LIBS@
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 6ca2a46..b64ad20 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -11,6 +11,14 @@ TESTS =			\
- 	jwt_ec		\
- 	jwt_validate
- 
-+if MULTI_SSL
-+if HAVE_OPENSSL
-+include ossl_tests.mk
-+endif
-+if HAVE_GNUTLS
-+include gnutls_tests.mk
-+endif
-+endif
- check_PROGRAMS = $(TESTS)
- 
- AM_CPPFLAGS = -I$(top_srcdir)/include
-diff --git a/tests/gnutls_tests.mk b/tests/gnutls_tests.mk
-new file mode 100644
-index 0000000..a6b4997
---- /dev/null
-+++ b/tests/gnutls_tests.mk
-@@ -0,0 +1,35 @@
-+## for jwttest in $(jwttests)
-+## do
-+## TESTS += $(sslimpl)_$(jwttest)
-+## $(sslimpl)_$(jwttest)_SOURCES = $(jwttest).c
-+## $(sslimpl)_$(jwttest)_LDADD = -ljwt-$(sslimpl) $(CHECK_LIBS)
-+## done
-+
-+TESTS += gnutls_jwt_new
-+gnutls_jwt_new_SOURCES = jwt_new.c
-+gnutls_jwt_new_LDADD = -ljwt-gnutls $(CHECK_LIBS)
-+TESTS += gnutls_jwt_grant
-+gnutls_jwt_grant_SOURCES = jwt_grant.c
-+gnutls_jwt_grant_LDADD = -ljwt-gnutls $(CHECK_LIBS)
-+TESTS += gnutls_jwt_header
-+gnutls_jwt_header_SOURCES = jwt_header.c
-+gnutls_jwt_header_LDADD = -ljwt-gnutls $(CHECK_LIBS)
-+TESTS += gnutls_jwt_dump
-+gnutls_jwt_dump_SOURCES = jwt_dump.c
-+gnutls_jwt_dump_LDADD = -ljwt-gnutls $(CHECK_LIBS)
-+TESTS += gnutls_jwt_encode
-+gnutls_jwt_encode_SOURCES = jwt_encode.c
-+gnutls_jwt_encode_LDADD = -ljwt-gnutls $(CHECK_LIBS)
-+TESTS += gnutls_jwt_rsa
-+gnutls_jwt_rsa_SOURCES = jwt_rsa.c
-+gnutls_jwt_rsa_LDADD = -ljwt-gnutls $(CHECK_LIBS)
-+TESTS += gnutls_jwt_rsa_pss
-+gnutls_jwt_rsa_pss_SOURCES = jwt_rsa_pss.c
-+gnutls_jwt_rsa_pss_LDADD = -ljwt-gnutls $(CHECK_LIBS)
-+TESTS += gnutls_jwt_ec
-+gnutls_jwt_ec_SOURCES = jwt_ec.c
-+gnutls_jwt_ec_LDADD = -ljwt-gnutls $(CHECK_LIBS)
-+TESTS += gnutls_jwt_validate
-+gnutls_jwt_validate_SOURCES = jwt_validate.c
-+gnutls_jwt_validate_LDADD = -ljwt-gnutls $(CHECK_LIBS)
-+
-diff --git a/tests/ossl_tests.mk b/tests/ossl_tests.mk
-new file mode 100644
-index 0000000..83d0a99
---- /dev/null
-+++ b/tests/ossl_tests.mk
-@@ -0,0 +1,35 @@
-+## for jwttest in $(jwttests)
-+## do
-+## TESTS += $(sslimpl)_$(jwttest)
-+## $(sslimpl)_$(jwttest)_SOURCES = $(jwttest).c
-+## $(sslimpl)_$(jwttest)_LDADD = -ljwt-$(sslimpl) $(CHECK_LIBS)
-+## done
-+
-+TESTS += ossl_jwt_new
-+ossl_jwt_new_SOURCES = jwt_new.c
-+ossl_jwt_new_LDADD = -ljwt-ossl $(CHECK_LIBS)
-+TESTS += ossl_jwt_grant
-+ossl_jwt_grant_SOURCES = jwt_grant.c
-+ossl_jwt_grant_LDADD = -ljwt-ossl $(CHECK_LIBS)
-+TESTS += ossl_jwt_header
-+ossl_jwt_header_SOURCES = jwt_header.c
-+ossl_jwt_header_LDADD = -ljwt-ossl $(CHECK_LIBS)
-+TESTS += ossl_jwt_dump
-+ossl_jwt_dump_SOURCES = jwt_dump.c
-+ossl_jwt_dump_LDADD = -ljwt-ossl $(CHECK_LIBS)
-+TESTS += ossl_jwt_encode
-+ossl_jwt_encode_SOURCES = jwt_encode.c
-+ossl_jwt_encode_LDADD = -ljwt-ossl $(CHECK_LIBS)
-+TESTS += ossl_jwt_rsa
-+ossl_jwt_rsa_SOURCES = jwt_rsa.c
-+ossl_jwt_rsa_LDADD = -ljwt-ossl $(CHECK_LIBS)
-+TESTS += ossl_jwt_rsa_pss
-+ossl_jwt_rsa_pss_SOURCES = jwt_rsa_pss.c
-+ossl_jwt_rsa_pss_LDADD = -ljwt-ossl $(CHECK_LIBS)
-+TESTS += ossl_jwt_ec
-+ossl_jwt_ec_SOURCES = jwt_ec.c
-+ossl_jwt_ec_LDADD = -ljwt-ossl $(CHECK_LIBS)
-+TESTS += ossl_jwt_validate
-+ossl_jwt_validate_SOURCES = jwt_validate.c
-+ossl_jwt_validate_LDADD = -ljwt-ossl $(CHECK_LIBS)
-+
diff --git a/dev-libs/libserdes/Manifest b/dev-libs/libserdes/Manifest
index 3cbbdf618a4b..4c66f3256300 100644
--- a/dev-libs/libserdes/Manifest
+++ b/dev-libs/libserdes/Manifest
@@ -1,3 +1,3 @@
 DIST libserdes-5.4.0.tar.gz 62331 BLAKE2B 01f06004e1af2374a9d5d039b9d0a8d53bc1e61bfd4bcc6ae1a4794553903140b73373d7e9d8799069df7369219c579b30b06dab07cbb860b4d42d2cc7e9c0a1 SHA512 3ecddf59c069a4d9ff2b8e718f700e897cad762d0858e34bb4a6a63030226b7e6fe8956431149b59678240d590a2a04f026d49c2052a22f2694fe61037f2e1f4
 EBUILD libserdes-5.4.0-r1.ebuild 469 BLAKE2B 20488849e49382168fc04f75f85e4b925c9e5d04f18d924329eaab2fb00208fbf79f6e0b49b6d8a7ab9f4edac3921a7660cfa09aa8b463637fb588e35385fa2a SHA512 4b9ebc7183ddbafcc81010f82e2731683a29a08c5a807a0632c9e6d193d871f01852daaf4a4439d0a99092402733c1405d04e99302dc18b424d2b8899371e98f
-MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
+MISC metadata.xml 336 BLAKE2B ec70375059b08a84143ca63c71aa20208dfbca2a943b213b53a8c5be96c2d2eab1956a4ad6061b2f50fa74452380fa35e1525cec90405af1abfb0beb5f7057f5 SHA512 b50d52ce204e2cf91042adcc328598329a19ad9975d3ac08d0cb15c22f1cd1c7106440fe87e96a4374ab783472dc7e9f71ee4e63efeac2de52b70468a8011239
diff --git a/dev-libs/libserdes/metadata.xml b/dev-libs/libserdes/metadata.xml
index db463f3eeb66..ad2a4b15b4c8 100644
--- a/dev-libs/libserdes/metadata.xml
+++ b/dev-libs/libserdes/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">confluentinc/libserdes</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libunistring/Manifest b/dev-libs/libunistring/Manifest
index 3d8bb66e3e15..73c2a4145270 100644
--- a/dev-libs/libunistring/Manifest
+++ b/dev-libs/libunistring/Manifest
@@ -7,5 +7,5 @@ DIST libunistring-1.2.tar.xz 2502196 BLAKE2B 606c6fdd93f05b01e9b08b3bd30283afcbf
 EBUILD libunistring-0.9.10-r1.ebuild 989 BLAKE2B a52fb17a04d91cfc7fec461f20f765916687d36ebfdaebc7f5d9ef547ffd4f432803cf8d0d4e94e8c475e330b1b294198affe1f3e0c41a22b9ebf80a3f666d0a SHA512 0734d70551272f24466672da4cd569ee79b3f9714b828902d838ebeb47c4c8ec2a3b8a2b342cb914bb99905c043e6ede7952d321707ca331a0f79fdb7dccdd4a
 EBUILD libunistring-1.0.ebuild 971 BLAKE2B e75f516ec2539588e88c8e5f689f321a9a09711aa286dba7e3a613d7566f756e9be2f0ef9a78c6530cff92b4c096b434c4af1b94cd98307fe2820a399c592430 SHA512 07768d6af0260064e999819da00c6a9eb5a4e2ac31d760b7eccd063e12c254f59172e11169b585dcfb352d0581582b2ba9fc21fc8c716dadfaa27f571a764024
 EBUILD libunistring-1.1-r1.ebuild 1003 BLAKE2B 8ebcc224d2a3b39a92eafdc67a6adb6a0b7f076249a8418a63aff6e355497eff8483f84f94dea4427cb85ee06b1cd2ffe29b9017ce2c7020c3f91d86d3b1aa98 SHA512 d24e03fdbcc079319e45bdf07ad8baa8b0834e54aabe1eb16c60a5406e1c153e8c7355916fea7a3db5082d817988689798793bbdfbf80f9e61dde97466abf05f
-EBUILD libunistring-1.2.ebuild 1097 BLAKE2B 30a157186c38e58e8a3be23698045223d71f27acf07e44c912bb96c06c9c6214ee4c95414fe48218d3851eb4d39eadeebd94ae2433f6c157cc3aad0fe1fbb910 SHA512 d598a9e17f0f69686770def64dfc9c236292641b8fd7f54e9ae5ce12d9e28342eca442de2f5d166c2fe19940160d9231209fd8014489561d0b97ac05d720c6f2
+EBUILD libunistring-1.2.ebuild 1092 BLAKE2B 731d5e73d92bdb8d4c92e188cff7f5803696cf3e60475e1e57922282eb2c53e8fb17927935e03b4a3e7d178eb5c0d4f0fa1114a9821c98ef2e62fd61b0fd349e SHA512 4a780d6d0566f4cb2a8eea9112f7efa2f70ddba84cb5d454bd7b0ce5283eb2522404d09137bca66611da6355f39898585ff19a2aeb661ccfe830c2933514804b
 MISC metadata.xml 1118 BLAKE2B f981284f99d5526eb59d8985d7d67096583d8a3bf49bf008ac9902aa32bc9cc77cfadd5d2ab9efa9157384e38c59629d7f4b322f3f85bbe6bf3acec90d67520a SHA512 9a389d92d315a50653438232128a600c5b1671200534efac85fc891cd902e5652897ca9d316c4feedf618d6c7fc825437a2251843ca1ccab7ab6875f9114e0a3
diff --git a/dev-libs/libunistring/libunistring-1.2.ebuild b/dev-libs/libunistring/libunistring-1.2.ebuild
index 3650da85e1b8..fa766cff69d0 100644
--- a/dev-libs/libunistring/libunistring-1.2.ebuild
+++ b/dev-libs/libunistring/libunistring-1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="|| ( LGPL-3+ GPL-2+ ) || ( FDL-1.2 GPL-3+ )"
 # Check regularly even on "minor" bumps
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc static-libs"
 
 QA_CONFIG_IMPL_DECL_SKIP=(
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index f56463ce6818..170115b57d49 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -7,9 +7,7 @@ AUX opencl-clang-8.0.0-clang_library_dir.patch 468 BLAKE2B 09315ce9250920caf8c84
 DIST opencl-clang-15.0.0.tar.gz 26212 BLAKE2B 02d3a8eb3964b6882bd94b676b4459412c753ac38e1e3012662021e98a8219225eaf6af4f62f4e0e97de428f55b0b698374dc39babff09a0fcc73213d5daacfe SHA512 a2ffce43493793524e9512be2e7bd46c0183b86b35a6f79018d355d07a83303a944e6dacebfb768e88ce75a7020a44939be872a2d4e754544198a9829f4febd4
 DIST opencl-clang-16.0.0.tar.gz 28413 BLAKE2B c99f043171186f5d9e44618d5d637d6a5c7997f22577491f544e78d93edd5afe74ba88eaaea92a931dd87af71fb630fdf03d27f1a9f55d7c3b8bdf53dee54b07 SHA512 bf723edab7dc7a028eb79d01fd2306690a2169472760bf2783d593ffec4eb788f28f184c66b204cc074cb95a4149fcc63a1dcbee5563c620a9dc2c76bb5a2d5a
 DIST opencl-clang-17.0.0.tar.gz 28436 BLAKE2B dd86255e757d290fb0417d966098ad00ceb0440c83fa79d8bdaadc7ee9964b13810d27f93740f4b00b9c0e16e5c9b29213800d98042b6c211b45a9cd1402f038 SHA512 920e19c9c36fef1752bce46a1a240bfc0cdd22c09e5840520508c67ecd965524f5c1ce04d8879af146670377f758d3f457a8263338b84b6833e8916f10566698
-EBUILD opencl-clang-15.0.0-r1.ebuild 863 BLAKE2B c83c694aaea04a078e6c5005113ddd605cc399fcd9c3e4ddc8a345f79372282498c3b7977c54e9bf0b452c4abc0dd49e67ad1818f5755c04ae8c255b2ce26e63 SHA512 052d8d05fc7b7501bc1231e1606017b30f61ecd5101549e9079ebab6452080d3b644d59727ddc1aeb1f895c84bb3d063f1aeef5aa3b80a963cbb5943de78ae20
-EBUILD opencl-clang-15.0.0.ebuild 842 BLAKE2B c516ee1dc3f7e4bb1c1be637b44f151b33a0d36921d907568f561f3be5bd3762d56b88468bb2d146ff57bbc708b6e006e4c10a83825ae536b93ce80edc105d9d SHA512 a12ff19192edfbb5f90adea21510454fc77b387ac44a35e9d70c0c25ded54dc4c9ed327394097a1eeb0f912507bf3354d2b2fe196bac21034e4a4dd05e9eb497
-EBUILD opencl-clang-16.0.0-r1.ebuild 968 BLAKE2B 5199849c0818144c77f3cb65e96b4396e8ab98866039247a7f23ee66656ae1c4952ab40f9b3a2cd0bce53b1c210115cf66292b99b2a96e20804269cae1be7c74 SHA512 a55e6514e098148ee81750f2f2dbe6caf5cadff28fa04a3a969eb58eb6b775ddc29d87d9f8daaf2519c80dc1aa494e7907fd9471fda9dc1b600058655e8603ef
-EBUILD opencl-clang-16.0.0-r2.ebuild 989 BLAKE2B 033087963aaa232655b283ec771005ee45c0c6300202db3d128d304b6c4bc8234a349b19a142402af28eed336bdf78e0d37e9aaf8b618b85ac8caadb74b86256 SHA512 298c58e444f6b10fd48d43544051bc5feec1e6fe713511c985357a5ada9ebefba854e863de8840ed92a062a4413777ff5e70be019b77a9c2021024e701eaaa7c
-EBUILD opencl-clang-17.0.0.ebuild 965 BLAKE2B 69030ac5ccb72a7662292adcb73a9db6e0ac8eb8e8b3d3b57713bc8409dc54b8bb8e56b8f10301a480d8e14d18b97532626d04a3e7579a976a995bb62cb36ddf SHA512 df14b913dd220873b7a65c2c9883ecfef7517066f37472d81a69bfc4b96bbe853acaa3d738db800d2158391f5314240c01524825e14f76ee5b61a5501f0500bf
+EBUILD opencl-clang-15.0.0-r1.ebuild 862 BLAKE2B f8f5d1c1a3190d39d74e97d460bbec8b15aabb7d7a5c428d2ca4c4b32e634c55c6c274bab95c32f5b4eab37fe4aad478e8d22d0e4b683bfccc5c4473cbb798bf SHA512 7fd39946ec37811afb55a58f89ec23acd9c0a50819571151f5de3ac2165f91485fb360aaf81c1f70510e747103d0608990b56df6189096ef83a8acd17c1e7e7e
+EBUILD opencl-clang-16.0.0-r2.ebuild 988 BLAKE2B aaa96bcb131123cc928ebb6ab3ee0f9366ea4ba92504de73b2fa03e6ffb33cd7dcf7c15124a4bf94678d4ceb9a559015a8c8387a5db1b9a6cb972822b236c0e2 SHA512 604f8a98c1e33c7ea59b56e4725c048637b72c3c6c64211895e43c9861f5e4bb261ae3bf6230252f1593f1ff8580c34364bb1a572435d3c40ec4c25bc08f595c
+EBUILD opencl-clang-17.0.0.ebuild 964 BLAKE2B 9ad940ee6800548d863a976f7d542273bc4d461dffc9c8790940ebaad001c53da884f3e4c7cd265ea35c025a5be338bd34660cb86b85d352e164c99ed12fc5ce SHA512 8702d8fcca39a657b7ff9a4f789873ed701d69973c85381a6e59de45e24430229c5fd038ccf8d963245a146364cc8d22ec0ca52a67206bff4dca0d9873ee8e25
 MISC metadata.xml 583 BLAKE2B a16519cc07cd2add030b90218d3cdcf9473c684e0a1a0149e7dd352881213c8579c3ed7ceee69db479264fca10561ac023c01be7451ce689fa6408b81cf8b032 SHA512 d3c3f41c5c5fdb4b6b85c737071540ef8d53e148d5f7e69367eeaa6cbe7cb84563d2381de851cc4da41b5300856dd7e6b1e67454a4fc9a9d890590e3a17526b5
diff --git a/dev-libs/opencl-clang/opencl-clang-15.0.0-r1.ebuild b/dev-libs/opencl-clang/opencl-clang-15.0.0-r1.ebuild
index b8ecb8f410af..3f15a5cc35a3 100644
--- a/dev-libs/opencl-clang/opencl-clang-15.0.0-r1.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-15.0.0-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${PV}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="
 	dev-util/spirv-llvm-translator:${SLOT}=
diff --git a/dev-libs/opencl-clang/opencl-clang-15.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-15.0.0.ebuild
deleted file mode 100644
index 7436266e2cb8..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-15.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT="15"
-
-inherit cmake llvm
-
-DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
-HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${PV}"
-
-LICENSE="UoI-NCSA"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~riscv"
-
-RDEPEND="
-	dev-util/spirv-llvm-translator:${SLOT}=
-	sys-devel/clang:${SLOT}=[static-analyzer]
-	sys-devel/llvm:${SLOT}=
-"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/opencl-clang/opencl-clang-16.0.0-r1.ebuild b/dev-libs/opencl-clang/opencl-clang-16.0.0-r1.ebuild
deleted file mode 100644
index ef8366ddbd2b..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-16.0.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT="16"
-
-inherit cmake llvm
-
-DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
-HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${PV}"
-
-LICENSE="UoI-NCSA"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~riscv"
-
-RDEPEND="
-	dev-util/spirv-llvm-translator:${SLOT}=
-	sys-devel/clang:${SLOT}=[static-analyzer]
-	sys-devel/llvm:${SLOT}=
-"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-16.0.0-clang_library_dir.patch
-	"${FILESDIR}"/${PN}-16.0.0-cxx17.patch
-	"${FILESDIR}"/${PN}-16.0.0-llvm.patch
-	"${FILESDIR}"/${PN}-16.0.0-standalone-build.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/opencl-clang/opencl-clang-16.0.0-r2.ebuild b/dev-libs/opencl-clang/opencl-clang-16.0.0-r2.ebuild
index 8e4cfe79db97..55691f305c43 100644
--- a/dev-libs/opencl-clang/opencl-clang-16.0.0-r2.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-16.0.0-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${PV}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="
 	dev-util/spirv-llvm-translator:${SLOT}=
diff --git a/dev-libs/opencl-clang/opencl-clang-17.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-17.0.0.ebuild
index 65dcb960a1bd..d28584d7b154 100644
--- a/dev-libs/opencl-clang/opencl-clang-17.0.0.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-17.0.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${PV}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="
 	dev-util/spirv-llvm-translator:${SLOT}=
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 015b243e7525..a74eb927901b 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -29,7 +29,7 @@ EBUILD openssl-1.1.1w.ebuild 8233 BLAKE2B 4657e3e413f25f4503dbc5484e3d06e63c25c6
 EBUILD openssl-3.0.11.ebuild 8719 BLAKE2B fa28b31cc2f72147114cdc89b4253603855bd6cdf93b62a124caaff88f927412fdd1811e50ca35adb9885fa3fccb53203a46f231479373047fbd0fe709c8e228 SHA512 b5a46310bc8a5e842cca20c7755494fa6ff1d63eab24efbad516362cd68dce74380790050143beee437808fd724a41f323e04f4815833f6ea535c8022bc12162
 EBUILD openssl-3.0.12.ebuild 8719 BLAKE2B fa28b31cc2f72147114cdc89b4253603855bd6cdf93b62a124caaff88f927412fdd1811e50ca35adb9885fa3fccb53203a46f231479373047fbd0fe709c8e228 SHA512 b5a46310bc8a5e842cca20c7755494fa6ff1d63eab24efbad516362cd68dce74380790050143beee437808fd724a41f323e04f4815833f6ea535c8022bc12162
 EBUILD openssl-3.0.13-r1.ebuild 8556 BLAKE2B 5e6b7dd5cd4a4ddba9e894281d5aab747360774fc2f588d9c026bc01fa850b8ae682f867d32484c206d35e67b19744accc2f090845e586088e106139df3cff02 SHA512 865c22ec6db34e4f7249828bcdfe1cb677ae435fcd50a4007905f4f72b84a4dc0dfd4a039d2d0d1945cd1e8220613b8e4946135f8e918a2619eb9209b5b911ec
-EBUILD openssl-3.0.13-r2.ebuild 8584 BLAKE2B f819883dceceae68ddb9e83133244256a35c1b490c9c2ef98e0764f3c42db81b41db3dc85bf5e730e6f5cedfa64669a45574da4b3d2b5f31a793bbb7d737e060 SHA512 27335fe5f70d30c3c1a7855594fa4924265db955a88f0bf35472d025cd4120dd7516148d8fd10ef7e11ee6849112f646c3491cf41a450c3f39f288d0ab242e81
+EBUILD openssl-3.0.13-r2.ebuild 8583 BLAKE2B 23d5be66e48a3b164db0bb6ea6040557b9227f27dba2dfeeccd8990bdf9561e2c09282f9dc2cfe96d76fee745c76f8ba43af5257822ccd3fc2919d9bc7ee05e0 SHA512 67aa166e2a828c7e86006b9f89b7610d373d54ad84434e09b556466302583cdb0a0b0cc56cd39ebdc802a0e8143862c69d19537b4b847f451f5b894580511202
 EBUILD openssl-3.0.13.ebuild 8487 BLAKE2B f59e012d00584a3d17b51dd8ce6a1e0e77071fbc9a4144f604314e19e8cc57addcc32d12f2d4c03eda2b1e9c8023ad629ca27369f0d7b6d9983d092d53dbf6d7 SHA512 7ccae792fdaae34aec986e59630d64e5dc4ba2916b37093c95dc4649a2d314e701f38018f79c4e10af7eab5a809fa7dbfd1b35ae49bef74327804c6d00170267
 EBUILD openssl-3.1.5-r1.ebuild 8586 BLAKE2B c22d038b5af42c19389048b43618e3aad090062a8b5ca78eccf3572714d5d2469c1535ea3c4801241d313bf508191448dfa7e8bb52efc24f82523d1fc5273f85 SHA512 fa711d41776c086f9b31001143730e7f8524a41f6272d9df11fe7315c666113b8ba817fbaed7cd85482275014112e8f6a95213f0078531b2bd6a9f503c3f96a1
 EBUILD openssl-3.1.5-r2.ebuild 8626 BLAKE2B ae09c41b277f416c8ad0180384fc3fbe7cee002e180ebb4817b6b4b2562a3b4782fe2e9240a275aff8c1a34d22160485dc1e6bac4a03546a3859d454a20b7cae SHA512 d7d687dd36f5839ac75c616f454fb8192d9826057638db17b6ea63dee11da6b5449d89d1a0cf47e0e67a98f51a5a46ca368770e0f03e3d77ce0642b1627d8d5b
diff --git a/dev-libs/openssl/openssl-3.0.13-r2.ebuild b/dev-libs/openssl/openssl-3.0.13-r2.ebuild
index 3482f4e2beed..f24d736cb85c 100644
--- a/dev-libs/openssl/openssl-3.0.13-r2.ebuild
+++ b/dev-libs/openssl/openssl-3.0.13-r2.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 		verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}"/${MY_P}
diff --git a/dev-libs/s2n/Manifest b/dev-libs/s2n/Manifest
index 2a95353f462b..3abb0869eb04 100644
--- a/dev-libs/s2n/Manifest
+++ b/dev-libs/s2n/Manifest
@@ -1,4 +1,4 @@
 AUX s2n-0.10.21-remove_Werror.patch 1292 BLAKE2B 208aab54784a956003c0f23564d07124476149f9a36fce40c6404ea79956479ba2a589bcb75808adae67c4f50ba78ac5fb72d21429248a515c9c84bf5faf5930 SHA512 4f8cbdfeeb7dfa514750083e1be4481f5ffe1e30ff88915b5c7eff2494ae534c454da51a0c56d720be66b5ce50900135a4e17f66a517ec437a027b01c9fc0fd0
 DIST s2n-1.0.0.tar.gz 6211951 BLAKE2B 3714f26ab0dbd53b878c73e0ae0abf9e8a4b85b16a62dd44a3e6264fba1afdfdd7bbffc3b38b494c5cc805b8a9dfe02009d109e308ff13b4752a56594299f374 SHA512 ab5ccc3e73e7f395ef86a5e637b9c2d18110c14b2913990d12e02286f6562497f7e9d45912e9076216e5f595d7932d58a31642e344a5e472259386983ad44bac
 EBUILD s2n-1.0.0.ebuild 1464 BLAKE2B 6e9f8dd8eacb367179f8befe9ccdd7f30d3bc630f7c1a5db625bba4a14c4aefad07f0e7299bf97e119df8a829d82821180c6ca32625828a759875f6323ddf23c SHA512 dfc7be95cbd3f5c25ab2eb7b0b5ca85e44af2dbdba159a32ab8c2559a75f45a3eaa44fafa8710702091da7c1aa50505112edc4b0f53655538fe342b2249dbd1f
-MISC metadata.xml 1569 BLAKE2B e80ea6463de43d3de9170ef9b37abe41fb718ad2c6cbdce4c22c5ccdabcb336c7e579f2644c6aa22eb1cc1bc66d43e16ec528e5e3f0ebc04789f80f3a9e8bc3d SHA512 c90833b553ddb8f199faf7588dc3ff6d94565591b84e54c67f4340364cdd5eb775103c3a29450bfcb28f149111bcd5c2bad4a8933f3a948f1d8f1729b2b35e88
+MISC metadata.xml 1645 BLAKE2B 1f5c0eefe828d47b39e266de409b7ef17256314bcbb0b0dfe29870aa21c58c18149b5c0652f427ff2c2d1c963c6610e140dde05b5e3425e74eac5b1a6897f73c SHA512 65d7a3bda08682049f46eadca23d45e63111ff5dc79fb56811d94cf5921eabfe0e164a44a5e3bb661409686c0a61359b77fcb3e64abb191cb649fd2a54938124
diff --git a/dev-libs/s2n/metadata.xml b/dev-libs/s2n/metadata.xml
index ff907dea8127..2d66499958c7 100644
--- a/dev-libs/s2n/metadata.xml
+++ b/dev-libs/s2n/metadata.xml
@@ -9,6 +9,9 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">aws/s2n-tls</remote-id>
+	</upstream>
 	<longdescription>
 s2n is a C99 implementation of the TLS/SSL protocols that is designed to be simple, small, fast, and with security as a
 priority. It is released and licensed under the Apache License 2.0.
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 017f64e1eb64..cd75bdec54c7 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -3,7 +3,7 @@ DIST weston-11.0.1.tar.xz 1900796 BLAKE2B 33d7d5b3340e7074265885bd54ee039e8b5d44
 DIST weston-12.0.91.tar.xz 1986200 BLAKE2B 368fe795bd6121390f14995d8c5ddfcd585e620bcb54f0818b9e9131bb442e79048f82bcd90cfff563c7ad9968cdc9e4f1d859fdd318f4e9b08fec371c4a62e4 SHA512 8e1ceae599344c305e1b65294403d434c4a6ca740f76bdcc67a9f83afe9d352d75ab9cf8bb5091b889ddece43941adf9c4666767098c4c27cb732f8c7f8f738a
 DIST weston-13.0.0.tar.xz 1986520 BLAKE2B df0e73e451e39b329ed327c370f42bcae01eb5b8fad67711f069fa8f24900ac0c9a9e69b9a6445b67c76ab0ce441dcd2a5a1a8aa3ac0d89a647b9661d575a917 SHA512 8c656cdf24ec9429c76c64ebd2d58351991f5990a6d4b5900ac913243ad8e2c9c0fb1a748f018d177fbfd7e0a8836d0434d97acec287a8f977d47335ae30eacc
 EBUILD weston-11.0.1-r1.ebuild 3670 BLAKE2B 68f602a9146246169076ade491844eb26ec365ba8adeb9d474ce67599b0e7d859b71eb6c1fb9690d1ae78f05b2d860ad2ff3727ef42ff07017dbbe36c8ef9f3a SHA512 b04bded6989a3f08961d801501cfe0682c06144f4826173c295ec0cd208a8926b13bdb22b3d6e0c81cc5a704196e86ec68ad49899dcf6c693fec4bfe9c4f2567
-EBUILD weston-11.0.1-r10.ebuild 3652 BLAKE2B a08893df8ad8b0870b822afb1ea79a02c45e38d22c62ef1f353b22283f4e3991c07451e132fab2fe6f50619ae6e846ba30582b36b50ccf8eaa9c18f3d0026e07 SHA512 d31eba61272bd9b85ce9111a6af3e846410bdf3d54c816c68d70e3e06be506f3553175f110f6e876240f2428cbbbb8a2fcd5737c9064bb48183d3fef1eb0f6e0
+EBUILD weston-11.0.1-r10.ebuild 3650 BLAKE2B 16de29b824bb64cc8db105f7d8cae273ec40c212e593dde7472aeaaf5ae353f4ca7010966e6e09484a6a23e787602cf0917cf1cfd823aaee4b2ee674749b6ed4 SHA512 0cb5db8c60e735de15de65e09b51aaf5285feee0420dfd614bda8195af9f9e9c32aa736a90f8a5bdd45a930e0b028e87482de1e5cdd71ee036ee69e7027fcade
 EBUILD weston-12.0.91-r1.ebuild 3813 BLAKE2B 005ff0fa5f978d48a24d1d0806341825c33125787bb375611fb61157e97e3ec8560ab5e410c126623f48d1c4afd45c2103f232773645488529043f0549f205a1 SHA512 6734c4a61923e5006c8603371ac368d767721d06ec9932b9275d52cf94aeba7bbfd2a46a08b8ba4eda279e16094d5f8cb2ec6fe98ddf5897b9196d47e6c51cf6
 EBUILD weston-13.0.0-r1.ebuild 3813 BLAKE2B 005ff0fa5f978d48a24d1d0806341825c33125787bb375611fb61157e97e3ec8560ab5e410c126623f48d1c4afd45c2103f232773645488529043f0549f205a1 SHA512 6734c4a61923e5006c8603371ac368d767721d06ec9932b9275d52cf94aeba7bbfd2a46a08b8ba4eda279e16094d5f8cb2ec6fe98ddf5897b9196d47e6c51cf6
 EBUILD weston-9999.ebuild 3813 BLAKE2B 005ff0fa5f978d48a24d1d0806341825c33125787bb375611fb61157e97e3ec8560ab5e410c126623f48d1c4afd45c2103f232773645488529043f0549f205a1 SHA512 6734c4a61923e5006c8603371ac368d767721d06ec9932b9275d52cf94aeba7bbfd2a46a08b8ba4eda279e16094d5f8cb2ec6fe98ddf5897b9196d47e6c51cf6
diff --git a/dev-libs/weston/weston-11.0.1-r10.ebuild b/dev-libs/weston/weston-11.0.1-r10.ebuild
index faa796ff9534..4fdb7cce2141 100644
--- a/dev-libs/weston/weston-11.0.1-r10.ebuild
+++ b/dev-libs/weston/weston-11.0.1-r10.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
 	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/uploads/f5648c818fba5432edc3ea63c4db4813/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~loong ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT CC-BY-SA-3.0"
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 18cf87e3cedb..439625c98676 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/dkjson/Manifest b/dev-lua/dkjson/Manifest
index b7e2d5ce8938..64de6e57f987 100644
--- a/dev-lua/dkjson/Manifest
+++ b/dev-lua/dkjson/Manifest
@@ -1,5 +1,3 @@
-DIST dkjson-2.6.tar.gz 15803 BLAKE2B fdb471b94b50d90ac3ca2a6230e8a2f6b5f1362b368a4fbdf2b54b12cfd38762f448a1a752aa6022e1c80806d62d72a861f048e1734edb081d6fc1dbf225a2da SHA512 eea9dfb386672114e4269284eda045161289b43c872b9108971babbb247e686ea1c045bd4f127037e949b356630fa430037fb4b1a1eb7b5cc51f80d144a5add2
 DIST dkjson-2.7.tar.gz 17292 BLAKE2B e3ac57edb6333dee8eeeba9d844ddc9f3fb3d35c6bd61a896ffff928e2d5c4d17be8a0c01c36d83fb0e4694ad38f3233a92f093cf85dc4b7375a72a224f7e0a8 SHA512 8e0cfb27fb2721c57b4fa0e104edc5e3b1f2b375e6ddde486be44f2bd574c19fccbc7c6f629f3d04b16cf652effd0894cb38edf405395488d33577420692246e
-EBUILD dkjson-2.6.ebuild 906 BLAKE2B 4254accdd5fcd85e5d5e2a7f081edb2b98df95741f5116477f747fffb11435c869892514e2bbdd9c0ae21868963e08b7dea370521dd1374ad529b9dbe60aeb36 SHA512 163aba7a97eb2a1e101af6a98ac767c4a2bdf10155da22988dfe7438de2c8375fa6026788f7d3c5672989bb28714022b0e73ba78f81e64363ae631d23f7a767c
-EBUILD dkjson-2.7.ebuild 864 BLAKE2B 3b2f8d4cafba3a5c76aba6262d83762b9a21f0fec2c7d509195b6a53691c36a3bf376f2bfa2382dc55cafc7b2a0a1dc14efae971ac4b6f57bf04ec55cb3eab74 SHA512 b52144f10e928fa9e64ac67e8069f8cd5b0d9ee83b90b6d74e470b44bf9151ca1287264d6d115fbca5d93082eef7fb32313fc72887c848fa43db2f09da912388
+EBUILD dkjson-2.7.ebuild 858 BLAKE2B 45ff6f0648a6d231c8947141b2eb16fd856b9db1449d41e37edf4237a4cc91cfe5a8919be3c04c002d0303ee30aebb9792d068aff68ef412f4517f8ef35566bb SHA512 77f69fee1c33fc26a6a809a4e2aa00833ae2c77bb2e9cc1050ea45a67cae7a627834d3cd6cc10885610ee7d31c1d2b45eb9e7598bfa2f350a22c8eaed6d1c2d3
 MISC metadata.xml 746 BLAKE2B d46085001dee037fae4c52ebde878d53de21f48efba0a5a56b4514649eabd5ff238345f3b685d78432a885172b42f862e37d0e327caa3338feb771a6f1bd5f1b SHA512 8cda2b22f6509c636f38cfaf0dfc4084422d33ecca84627823d87f86bbdef5ca97def3b98bd372c46a509c83f8e0aab4bf74b3661c3119c94245117439eceb01
diff --git a/dev-lua/dkjson/dkjson-2.6.ebuild b/dev-lua/dkjson/dkjson-2.6.ebuild
deleted file mode 100644
index ba668fc5492c..000000000000
--- a/dev-lua/dkjson/dkjson-2.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit lua
-
-DESCRIPTION="David Kolf's JSON module for Lua"
-HOMEPAGE="http://dkolf.de/src/dkjson-lua.fsl/"
-SRC_URI="http://dkolf.de/src/dkjson-lua.fsl/tarball/${P}.tar.gz?uuid=release_2_5 -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
-IUSE="test"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${LUA_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( ${RDEPEND} )
-"
-
-DOCS=( "readme.txt" )
-
-lua_src_test() {
-	${ELUA} jsontest.lua || die
-	${ELUA} speedtest.lua ${PN} || die
-}
-
-src_test() {
-	lua_foreach_impl lua_src_test
-}
-
-lua_src_install() {
-	insinto $(lua_get_lmod_dir)
-	doins dkjson.lua
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-
-	einstalldocs
-}
diff --git a/dev-lua/dkjson/dkjson-2.7.ebuild b/dev-lua/dkjson/dkjson-2.7.ebuild
index a1c66a6fb269..75f1f2875c76 100644
--- a/dev-lua/dkjson/dkjson-2.7.ebuild
+++ b/dev-lua/dkjson/dkjson-2.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://dkolf.de/dkjson-lua/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-lua/lanes/Manifest b/dev-lua/lanes/Manifest
index bcacb1385d75..057680531dde 100644
--- a/dev-lua/lanes/Manifest
+++ b/dev-lua/lanes/Manifest
@@ -1,7 +1,4 @@
 AUX lanes-3.13.0-makefile.patch 2719 BLAKE2B 2ee48812f971a3ed9d6425b115fa7415fb4c47596f25a32efd4c3d5fb8eb7f70839ae21d4970fa2120c5f16847d6bb10a417a228594a7f6eedb6d53a7bd062c8 SHA512 6a511ad7cf2dac9abff275c01c885adac04b40de46fe7d776ebea1663291e9a043d9ced6f470931cafdddc200895006e389a6fb6a2e5164bdef6b6acd2f1d38c
-AUX lanes-3.16.2-musl.patch 918 BLAKE2B 49e549341ae7f1c9324b1c24da04a5149b483b5544ef61c66a836af8778c64912b7a239f525af0ebc12bbba606f91527730ac994dee3751e6a681489dde6067e SHA512 537620dcbbd622a5489cd2f3c222cc0cd465483d1eabba1327200e7352308b84eda19068aed3bf3b7ab2357af451797955a12556e733650a12278584aa4ef84c
-DIST lanes-3.16.2.tar.gz 446113 BLAKE2B 5343ac98f2fac3c92d8afeb6dbbd4875ce93c44715b40b030cbbb03f311b3e358358c1daa295790b0a62113bb15355fc8927a8b7896af079d8e7fe50e2e6b438 SHA512 c7e8037d6f709b31bdb981cbcf70ba51f23823bac51f7ee9ef47881603547a8e1df3c6b7fa35110528cb7547f83048cbe71868aa94c03a59165f1b9d2d5ad08a
 DIST lanes-3.16.3.tar.gz 446289 BLAKE2B 018f470209b534bb84f69f8a38c7decd8011a13926bf7c82a4fc4b0d3f2892562a69c3116dd6fce5d37d9d2b5057ed661cc22bdbfcfac4e267a32dd5f64a47dc SHA512 a3037c0df27e8172ce9ff896079eb4a5ee3a35dc507a8b809c151de21e7600ffd0fccc12113fb64dc3c709e1eff99da350576aef41ac20493ea933fb7dc4c381
-EBUILD lanes-3.16.2.ebuild 1624 BLAKE2B be586986658737210ebd6380b5a30be42ce575103755cc90773ec7d6b9b51bdf25deb252ea94d765e4e9cb8bf3567dacfead8a949e376714f4c1d66467f516bd SHA512 1b40b1dc6fa9548fe426fbf677a9cac3e6f2b570a8722e04eb1480ebbc8e6fdc736d265ebec7dd4d1051920466ccc4b679b0fb280530c0cc24caa8a8661f7187
-EBUILD lanes-3.16.3.ebuild 1586 BLAKE2B 9eb4ac3bb86b448f15f2ff2228a63ecf93ec836ec7f9b2ae3c85935e4c27faa5f6d7f945c481fd78bb7763d059c5d31a5795e8093ecb2c44ba54a7bdf3c34ff3 SHA512 1afc35791eee436fd5808cdb9cd6abe7974b98b1988dcc21dc2f5d027b1ff080b0b7b6c08c32d18bd4e97040dbbf7f1616eb370f7ee4e3ea67fde0f9bd5dc633
+EBUILD lanes-3.16.3.ebuild 1585 BLAKE2B 4a4ee5eaa2d3b1f510c7715c6966c9a180c07eebaf3b5867c87e04a424c1377cc9daa9f69f03126b83d34f113e8cf545862c9462b706ffe7fa004d5a189d3af1 SHA512 10a260228ebbab8c9de24fc7e5df3356498cb05d21755035be1e8198f50098e526d0e946608f6be479185200f68daa9b3a4fe19bf7fe1ede29e5816cb0859d5b
 MISC metadata.xml 439 BLAKE2B 64ca90f83e145d31acd41464d9661aa5ad164df3a9050084d4d272f7a834455bc6a9b7657bf34a3829927208a14ad8fb409a2e12f890be90008d858392f5065a SHA512 a55de988fd5da55fc51cbc3750361b95a7aa1c98e343725416eeaf8fe5c09c12c80f736593abd3bf08840b66602e6087094d9748ea238135de1f08a324a92c0a
diff --git a/dev-lua/lanes/files/lanes-3.16.2-musl.patch b/dev-lua/lanes/files/lanes-3.16.2-musl.patch
deleted file mode 100644
index 05508a57d85d..000000000000
--- a/dev-lua/lanes/files/lanes-3.16.2-musl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0e959e637b6ee85b0710e0608fe5d678ad7e0b78 Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conikost@gentoo.org>
-Date: Tue, 23 Jan 2024 21:58:50 +0100
-Subject: [PATCH] src/threading.h: fix compilation on musl
-
-Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
----
- src/threading.h | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/threading.h b/src/threading.h
-index 3925076..b1706ac 100644
---- a/src/threading.h
-+++ b/src/threading.h
-@@ -113,7 +113,11 @@ enum e_status { PENDING, RUNNING, WAITING, DONE, ERROR_ST, CANCELLED };
-   #include <pthread.h>
- 
-   #ifdef PLATFORM_LINUX
--  # define _MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE_NP
-+    #if defined(__GLIBC__)
-+      # define _MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE_NP
-+    #else
-+      # define _MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE
-+    #endif
-   #else
-     /* OS X, ... */
-   # define _MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE
diff --git a/dev-lua/lanes/lanes-3.16.2.ebuild b/dev-lua/lanes/lanes-3.16.2.ebuild
deleted file mode 100644
index a77abaafcacc..000000000000
--- a/dev-lua/lanes/lanes-3.16.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit lua toolchain-funcs
-
-DESCRIPTION="Lightweight, native, lazy evaluating multithreading library"
-HOMEPAGE="https://github.com/LuaLanes/lanes"
-SRC_URI="https://github.com/LuaLanes/lanes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-# Tests are currently somehow problematic.
-# https://github.com/LuaLanes/lanes/issues/197
-# https://github.com/LuaLanes/lanes/issues/198
-RESTRICT="test"
-
-RDEPEND="${LUA_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( ${RDEPEND} )
-"
-
-HTML_DOCS=( "docs/." )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.13.0-makefile.patch"
-	"${FILESDIR}/${PN}-3.16.2-musl.patch"
-)
-
-src_prepare() {
-	default
-
-	lua_copy_sources
-}
-
-lua_src_compile() {
-	pushd "${BUILD_DIR}" || die
-
-	local myemakeargs=(
-		"CC=$(tc-getCC)"
-		"LUA=${ELUA}"
-		"LUA_FLAGS=$(lua_get_CFLAGS)"
-		"LUA_LIBS="
-		"OPT_FLAGS=${CFLAGS}"
-	)
-
-	tc-export PKG_CONFIG
-
-	emake "${myemakeargs[@]}"
-
-	popd
-}
-
-src_compile() {
-	lua_foreach_impl lua_src_compile
-}
-
-lua_src_test() {
-	pushd "${BUILD_DIR}" || die
-
-	emake LUA="${ELUA}" test
-
-	popd
-}
-
-src_test() {
-	lua_foreach_impl lua_src_test
-}
-
-lua_src_install() {
-	pushd "${BUILD_DIR}" || die
-
-	local myemakeargs=(
-		"LUA_LIBDIR=${ED}/$(lua_get_cmod_dir)"
-		"LUA_SHAREDIR=${ED}/$(lua_get_lmod_dir)"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	popd
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-
-	einstalldocs
-}
diff --git a/dev-lua/lanes/lanes-3.16.3.ebuild b/dev-lua/lanes/lanes-3.16.3.ebuild
index 8baab79dd024..c0d7990b7ae3 100644
--- a/dev-lua/lanes/lanes-3.16.3.ebuild
+++ b/dev-lua/lanes/lanes-3.16.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/LuaLanes/lanes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
diff --git a/dev-lua/luadbi/Manifest b/dev-lua/luadbi/Manifest
index 08ef5dbab285..03f8120f7437 100644
--- a/dev-lua/luadbi/Manifest
+++ b/dev-lua/luadbi/Manifest
@@ -4,5 +4,5 @@ AUX luadbi-0.7.2-mysql-8.patch 1920 BLAKE2B 5b8f65c9a6966df0bd18487e09effc073fb4
 DIST luadbi-0.7.2.tar.gz 36462 BLAKE2B 581c7353bfa36b3f6cabed2df78372f8810300bf4525bf8d370e61d469f9daa5a5c40c58916164a8d0a621a61e983e85c67b23ef03f51212be79f09ad8512047 SHA512 891f99cbc8f1b5327ef820641a1608abf41410f2f28584b975cc3cf65154b9bebf6f1b9ca7d1818b9c965738ad700dd17ae042dfd2a7146cf755871ebae535b9
 DIST luadbi-0.7.3.tar.gz 35753 BLAKE2B ff5fdd144560153fc74733131b48a60a14b7e95de5d6faaa982588cc5df28aa979aa805c5000fdc76fae98b99be4cc4ccb82938c8f6222bcdfe4fca4d12c9bfa SHA512 1122bc9e83cf7071aff8685163a2dc387b40d2fb28aeb57e9c19e14afa6dcb0fb05fa76ea700f69751fdc79b0f1155235195d525041124fed5cefab0d50835bb
 EBUILD luadbi-0.7.2-r2.ebuild 2089 BLAKE2B 4ee61305c6011d5abd02575b6d83f13b66355e6fa28cc6e1e430aff9fd93d6138c121e1e4ab29291d798858adc6ebe1a9726fd83c4d460e0f3c900f6046c4418 SHA512 67bef07f554c91303587f74cd8d86c40e7dce73b0510e01707304dd00de87c77fbaf3d9006726583a7f751c818b67d35243259473fdb565b20aaf32f20a93d69
-EBUILD luadbi-0.7.3.ebuild 1920 BLAKE2B 13c25ef14241aaef8160669db3f600119b1a5831779f3b256b9587fdd1b160828c98cda39a3bad87da52261c689877a3777ce6433c36ad3bb4d549bf9f28ecad SHA512 a343b2bfe87acc50b085022fa16e951e1b1fadf9c870431e1e5f629d60f5b37d39dfeec0b575366bd4be18a4b950a58c0abcd3c0a420f386d2fca024d7abd849
+EBUILD luadbi-0.7.3.ebuild 1917 BLAKE2B 5aee1255ce683d5952d7385e330fa0544929666416907ff63691457ce17b8c4fb91506f67ca6b5c8f8bd20aaa1f699474a61fb8b07ff2f7eb12c6612f2fe596d SHA512 295b48068a731c82fa56b93f7bb1518280236088e29655d331e44efb2f2c34f03987ed38019f84f15935e487dfb5930eb680ab68cb257e4c7e8f8318b9ab309c
 MISC metadata.xml 329 BLAKE2B 63f2efc683cb8c68fc27953c6003708f965328cc4b445e5b62c1cffc85e79c9971ef4bfca6ae6b7a95179c3ad13e9374a2d0f1e06518403902a461d7598ade72 SHA512 c1f454ba961c109a06e0a06e85ad426dc6d6cc5697e6c2ceda3fe003242c1d50ef5c71fa0a84201d0a20b7d22bdf1ab597ff780b681a3a32e08c14457f7a2081
diff --git a/dev-lua/luadbi/luadbi-0.7.3.ebuild b/dev-lua/luadbi/luadbi-0.7.3.ebuild
index ceace5bd8ac6..2b452334267a 100644
--- a/dev-lua/luadbi/luadbi-0.7.3.ebuild
+++ b/dev-lua/luadbi/luadbi-0.7.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mwild1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="mysql postgres +sqlite test"
 REQUIRED_USE="
 	${LUA_REQUIRED_USE}
diff --git a/dev-lua/luarocks/Manifest b/dev-lua/luarocks/Manifest
index 0a9880bc915b..c870b66231c7 100644
--- a/dev-lua/luarocks/Manifest
+++ b/dev-lua/luarocks/Manifest
@@ -2,6 +2,6 @@ DIST luarocks-3.10.0.tar.gz 273518 BLAKE2B 64a9f7d5c9e15b8753e32f080d8f792be37f7
 DIST luarocks-3.11.0.tar.gz 277031 BLAKE2B eadef03badc9b4f0784e67f08f4fbfb4032840e6f7378e20dd2460da6324bba9c6f0210803b42a5e7465a44f0a3cf706c555ba64f622ce3884ac0b49f42304ad SHA512 bec918e98209e5ff5c498c4454b8c8182ecfeb0786cb4cd241d59149f33560e981ff2db8d49785823ccf31643366de15b5f2599c6eef0951d17ba66436b79644
 DIST luarocks-3.9.2.tar.gz 256117 BLAKE2B eebbad38dd71b0318852a177d394df5fd20e807d566893a2338526e76e17daf2436309e512dd50b325914b2d84b90ef857396bfd6d41f22893131ed78931b8ad SHA512 7e93164bdcf35338e993822931a8e59957ab69c6e23236a7a075649c2f7cd173305c4ca6e9d115fc5e282cb76c21754d7adac92b21885006e5ee3bc06a9d0059
 EBUILD luarocks-3.10.0.ebuild 2036 BLAKE2B 3427ddeaa484b3a105ce82c8ffec458ea957f44deb009f9c40e92dc24927ae5e5870a3739e53ee7b0991adb087d0a924a51738c593cde8091e0298c7fd275ad5 SHA512 48337d673725cb494fd6bc79a770fd9a5b67c785d11c7b1a17ff8107b3a05b57229eac079f109a0929df4949baee403e298b3a16c64784b38123a4da4e20fef8
-EBUILD luarocks-3.11.0.ebuild 2036 BLAKE2B 3427ddeaa484b3a105ce82c8ffec458ea957f44deb009f9c40e92dc24927ae5e5870a3739e53ee7b0991adb087d0a924a51738c593cde8091e0298c7fd275ad5 SHA512 48337d673725cb494fd6bc79a770fd9a5b67c785d11c7b1a17ff8107b3a05b57229eac079f109a0929df4949baee403e298b3a16c64784b38123a4da4e20fef8
+EBUILD luarocks-3.11.0.ebuild 2033 BLAKE2B 60e730c96297a5481ae07e706ffd41228c505cfd44c54b63825836f68fa3d2343197399a2b05b020978f231912327ec3cf3e688c4089820d5cdd1e0d4dbf2557 SHA512 a9da6c36a9e1c19d06516ae3f4c0190d63dd7de04ada1c85d7b28d69b5678281c2de7913281f523fcab99e4d31ca8a3948d99207e13c7ba026443d93bfe131e6
 EBUILD luarocks-3.9.2.ebuild 2032 BLAKE2B 734eb895b3d1005336cb528b212e2eb2283b5092fee5566c7479b512f5ff3513860163564b13d233c852bef812c5b6410f95ba7739af57ec6f6dcb270e8cea0f SHA512 3ab41e559dbd2fbab1505981eb98eb159de506f16ba6b239b80db9c23caf95fc2d3f59ee283816573335407df99f10a3d9f93cd91ea559c53e179405f16f846f
 MISC metadata.xml 501 BLAKE2B 0a2a3e7358a2ef2a4cbb79853408dfdf6015d49348bbb879a59253a88c73cf3d96c2ce708076844344468136d70962be74e639d24331a007fbd02ce6ccc18cee SHA512 43f147be67209e542e02733b6a57ce7ee05b61a7eb0d15662c0fb137db4f57c9f519cc98cf5dceb0e6f626f0dc6f04dd5b67da96a155b1e3884dca55896722f3
diff --git a/dev-lua/luarocks/luarocks-3.11.0.ebuild b/dev-lua/luarocks/luarocks-3.11.0.ebuild
index 2319a20303e0..cbefe1c19044 100644
--- a/dev-lua/luarocks/luarocks-3.11.0.ebuild
+++ b/dev-lua/luarocks/luarocks-3.11.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://luarocks.org/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="test"
diff --git a/dev-lua/penlight/Manifest b/dev-lua/penlight/Manifest
index cc0701e1c878..3c57c52b2d0a 100644
--- a/dev-lua/penlight/Manifest
+++ b/dev-lua/penlight/Manifest
@@ -1,3 +1,5 @@
 DIST penlight-1.13.1.tar.gz 434059 BLAKE2B 09a509afc11ad28b88fc92e9f9237fef4d18fc4c5b8c401c6fc8b4e3765941534409e5e5c9c9a08e0ad1a8b08d635d9ef8b453ec602514e4365317e1b31bbf63 SHA512 de0a6a2f585f32bed234ef084d8fca9cee645eed3459aa3c39b885b46a05ae752b5c7ac3bb1957fef9519df2a11e250fc87d6d4d62ee6155be2742ad43a079fe
+DIST penlight-1.14.0.tar.gz 439720 BLAKE2B 22ba9741dfcc446c2ffaa38af26f2a5b5022e316c63acc552ad4b7158c97e9239bdf124f1dc3438bd272f8dc79d8ae090f1aa7ba4b3bbcd5d006ec7244fc4041 SHA512 a83f70716106d6576b27a42222ba897d5d5a7b3918088c582e89283cf091a95a9920fe6d0b8d65e1ffc4c1664166f7d5bc4df3b023539d1b33d7175e585bbe9f
 EBUILD penlight-1.13.1.ebuild 1214 BLAKE2B 2be3e785d471c3c6ea4f139a447de08e01ab49bd359aaa7074a908d50ed06c6b5e386420ba7023e631876c8e756fed55d122b33962eab4e1501ae20c67101a6e SHA512 b6083a46484c1e19bb3154f6bd4e049a14ea66eec6eb0b7ec6ebf485c8732758a4b21d66154cf7a447811bd3f4caaac12fa69b74e2ca8d1de5395f05f24dca57
+EBUILD penlight-1.14.0.ebuild 1220 BLAKE2B d3a42adb286bc7e2ad2b9319cf92105a530eb9d4e4bd2f7359ff1c3c134ee0396bfb6b795916477fc8c180043dc7f725107b5812e5a09d73ff087623793db6b6 SHA512 21ec6dbb2637ba006c85a7678c85619c8ca1862d3308c433096a4162e8ed12a4527b4068d8d6e5a31b21db0ffee5e01f899f5601f00c48f3be1a1b533fae030b
 MISC metadata.xml 735 BLAKE2B a68f6f53a706c2b7c5d6e5407efbdc571d7839f7c5c7f05ece179e798419767562b82e1acab87b8b034392f5f3d77190cfd00a19bbd97d54359aeb127c4fe9c8 SHA512 eb5019d34e384d12cc2d1709c879a3afc2832f4e33ece3a0cdebf4bfd15c1d887a9fabed8c34821ee5c72ceb88111f62de87a4043f0fb0f076137fd4b8acecbc
diff --git a/dev-lua/penlight/penlight-1.14.0.ebuild b/dev-lua/penlight/penlight-1.14.0.ebuild
new file mode 100644
index 000000000000..9dc40907ae10
--- /dev/null
+++ b/dev-lua/penlight/penlight-1.14.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+MY_PN="Penlight"
+
+inherit lua
+
+DESCRIPTION="Lua utility libraries loosely based on the Python standard libraries"
+HOMEPAGE="https://github.com/lunarmodules/Penlight"
+SRC_URI="https://github.com/lunarmodules/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="${LUA_DEPS}"
+
+RDEPEND="
+	dev-lua/luafilesystem[${LUA_USEDEP}]
+	${DEPEND}
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${DEPEND} )
+"
+
+HTML_DOCS=( "docs/." )
+
+src_prepare() {
+	default
+
+	# This is a demo app, not a real test
+	rm tests/test-app.lua || die
+
+	# Remove test for executing a non-existent command
+	sed -e '/most-likely-nonexistent-command/d' -i tests/test-utils3.lua || die
+}
+
+lua_src_test() {
+	"${ELUA}" run.lua || die
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	insinto $(lua_get_lmod_dir)
+	doins -r lua/pl
+
+	einstalldocs
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+}
diff --git a/dev-perl/Cache-Memcached-Fast/Cache-Memcached-Fast-0.280.0.ebuild b/dev-perl/Cache-Memcached-Fast/Cache-Memcached-Fast-0.280.0.ebuild
index 6c29ce748107..a0c37efcb680 100644
--- a/dev-perl/Cache-Memcached-Fast/Cache-Memcached-Fast-0.280.0.ebuild
+++ b/dev-perl/Cache-Memcached-Fast/Cache-Memcached-Fast-0.280.0.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Perl client for memcached, in C language"
 # Bug: https://bugs.gentoo.org/718946#c4
 LICENSE="|| ( Artistic GPL-1+ ) LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=virtual/perl-Carp-1.250.0
diff --git a/dev-perl/Cache-Memcached-Fast/Manifest b/dev-perl/Cache-Memcached-Fast/Manifest
index b92920aad1c2..b109ee9b4e15 100644
--- a/dev-perl/Cache-Memcached-Fast/Manifest
+++ b/dev-perl/Cache-Memcached-Fast/Manifest
@@ -1,5 +1,5 @@
 AUX 0.230.0-parallel-make.patch 436 BLAKE2B 272a6dea999ad674143f50f57570bd7b14cb05bb9bf5cac929fb33e1f77113c752a7ffff9ed54c4ada7cfd424f34d3ecd26a86e2547d46890248a975fa445ad4 SHA512 05ea5189c664b7e98e54f9db186cd4cf3089a3d99acb915770a04ee0f3d2d4e870823b5c701cf4c2d0a4be7624e79cd8b590a274a570219bc59a02ddda4c093c
 AUX Cache-Memcached-Fast-0.270.0-no-flto.patch 499 BLAKE2B 7403d0bed21d8f7c57386891b799c7ee1621edfb0d6b73fab50b931c927bbda7e169814ea4cee2328239baffe41e315ddd10b4c7c95ef29337f36937adc2b571 SHA512 237a300645afcc38992e5cc02aa2161ac3fe5d9cf754982f6e97b0f9853b32e39e16c69b03ef0c85ed7d8866b7b5ef1223e88a13f73b4ce078c0615aef6bd6dc
 DIST Cache-Memcached-Fast-0.28.tar.gz 96175 BLAKE2B f4034869c9e8fdad141f15ad221b858b59d26bde26b93b694194ffc5df69b946504cbda1cc4775b52c661b7359e4b36c7bcb10add2e1525266672a4b7ec2dcbf SHA512 2b7cfd8cb4d97325a116158685b15db55029f157803f91b51d6c2e6fafd153ed8a754605cdcb1c736f95cc83091387433df7464d9a337035d890bc8cc48150f7
-EBUILD Cache-Memcached-Fast-0.280.0.ebuild 1271 BLAKE2B 902d4ee42ff0472f73e7217ed46ba6bd74de221a82c3c1cdf7799bebb841b295623593d3c97534df8c7503e0ba56bd4d83cdd67530071f0a71b9279566f0a521 SHA512 730ad397e3725b9765c20d0db8033d27470d344d7fa8b882772b4f15e136713853611b94d84f89c6207cc707da43cf55f2f3aeac5c8f315ff881dbc790094191
+EBUILD Cache-Memcached-Fast-0.280.0.ebuild 1268 BLAKE2B e1a9fdb0a01b27f9435cda56cd8b8e43580d16da5151f5378bf745ce711341f3d10a9ff15a8cf82fd8ffbfe150924eeb3c08b7894635d27e5d86aa20156807e0 SHA512 7a980a7f5aeb25ceca58ea07133ae46e01d5015a8ac5880b2d8295dd61557079dcb1bdfd1fc931876f043097d455701fbcfd2de8d96cce117ee19caf3621bf6b
 MISC metadata.xml 497 BLAKE2B 8f551912d4c147bc32036fe551d40f84ecd7b81888715fa416be605e96aff2c159763ce3e4e5162a027776b4bb1fa0cbeee342a0abf05403c7f95e07f60e31c6 SHA512 cb7f9b8b1d12c9fa2368730f12fb9de8bb4a168c3c3b3b64796411359eba44f34bc009542f4191d1472c6db804ee361ce3cc103168c38717a38e1237700dbeaa
diff --git a/dev-perl/GD/GD-2.780.0.ebuild b/dev-perl/GD/GD-2.780.0.ebuild
index 30f4e6c635f8..648bef1e5e4f 100644
--- a/dev-perl/GD/GD-2.780.0.ebuild
+++ b/dev-perl/GD/GD-2.780.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Interface to Thomas Boutell's gd library"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="animgif fcgi test truetype xpm"
 
 RDEPEND="
diff --git a/dev-perl/GD/Manifest b/dev-perl/GD/Manifest
index 7b7b88f40925..a058ea55b363 100644
--- a/dev-perl/GD/Manifest
+++ b/dev-perl/GD/Manifest
@@ -1,4 +1,4 @@
 AUX GD-2.760.0-respect-libdir.patch 1416 BLAKE2B 63ee4ce7af705624e7e52f5ccd36d521de5f78d4bb079a79661106d31a726eb64fd5069d6888dcec1e3ae46d83bb44ef88ae6c2fd5ad95a97c92d51d7afd8d07 SHA512 93bced05b6643681a9e566fa12fe259e7345a4de4101b2d9827bf81602544178dc7b17f0918d827ba5135c9e055a92707c802b8989e9518e8ed94e1482aa8df3
 DIST GD-2.78.tar.gz 265773 BLAKE2B a05f9e26c2ea7d9a638cdb8fb6675382f5274e295f530587e1e83990ad5238882300052a4eb270f8881f02df30739783c64af8d2d93680e0e0a12570c6d45a61 SHA512 ef3df42c003f105fd1c313ea9e8b8b1e75912b4fdb274e73f2e4f5664a0adb8479a2e62fae5a493e37c36865f9dc37207d2d31e96316eb18a3c5384e07858591
-EBUILD GD-2.780.0.ebuild 1696 BLAKE2B 17dc4495c20a1a7d9c773c6367107e53ee6abd9717a9c01ee5aced09ad7c2d0f8ab3511191c59cc8662471c9c3425bdd69d130fb96193a546ca71b65c3370bca SHA512 daf86405ec8cfd87c5a97e5a360ac8b0f37cd44c8fa431a3b68453de049b2beb1712c691748e0fffc38b7f94dd35fc33c0462f0fd95b73e8e1d8cf8509eb13fd
+EBUILD GD-2.780.0.ebuild 1694 BLAKE2B 00766fe23dc389c8983406c312a8c70d315467e9cf58ce1dc58553acee5f35d7bcac31fc768ee65a193ac450f18f849bd706ffec9727dc6b78db8b0e844a086e SHA512 252031bed2870e88034b93da39d98de0aaa0878af9a7a178541ad96b0d10d58cda248fe597407a9676924b5f33e37fe7556d90dbfad5486957ce4b62c87ba02c
 MISC metadata.xml 853 BLAKE2B 4332a510e17993dbfe948ad2ab9bd2a87fed7336a9fb536e933ea81d595674b019a4fc4312e61306ed224996fdcc9e9131ced244ede1823d19270b72e7d0e43f SHA512 e96e747f74b628c306f4a28b36d40da109bf6b580c2dcf09426717a77e77620e63f3c559f83662f221e2ba95c9d317856c80e5e0f438edb82ef89b6d1d9879fa
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 3eb81740bd9b..575508bf493c 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Test-Fork/Manifest b/dev-perl/Test-Fork/Manifest
index f04479a52905..b70ea6a1d94d 100644
--- a/dev-perl/Test-Fork/Manifest
+++ b/dev-perl/Test-Fork/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Fork-0.02.tar.gz 4368 BLAKE2B 4e26f2203587a2ca66fede0c864d7f232c58fd0e172a26fdad537af95871784838acc4cc3c8c6485773ea9504778632d0b5e3b7790bb972528698ea7e2d35a7d SHA512 854f92eabc786735dfbc3c7d0ad29e4e65ee8c99bac1bebab79876c064dec60cbdfd7ef1f5a04d7a5f5dc73b633e903d4d68c4caedd5890914707b829bca46fa
-EBUILD Test-Fork-0.20.0.ebuild 395 BLAKE2B 410745506fdb451185856c225d83b047330370a66d17cefdfd02992e23f9be47ad0e52c55b6687a96d428a687d681363e3efdb715e6a86f83ff5c3d2c56ba770 SHA512 907bd43bcc25477bc9df86335187c4c2541686b9f9a50f08a5c0ecbd047aa0edf9225d6de7b6181f4d339aa3fb381fea08d48c8ae2702f5c4ebcce58b0729910
+EBUILD Test-Fork-0.20.0.ebuild 393 BLAKE2B 0b71659e450e5f7d213224e516bfa3e3152a7749eb78d61160f7a4d3e49e91321a9df79684daad73b9f169e19c4e1692d2bb386042d39e91f69d9d78577af566 SHA512 c7c2ebf3135b40dc014c983fc135d6a8eb3c6c4803facd6a67ba3d22e94d80d600ede126e8d03a30ecca0b0579243ca31c816b9632e52c3a0fe6326aa07aa9ad
 MISC metadata.xml 258 BLAKE2B 27875c94f7bc66379335a8c7aa58972855f92cf88390cc368e1fe86ef5af4f370e66725b314e99486428cdd9330b341a6821ed5d3eb19af1950326f252b3eb18 SHA512 496cdc360ed68aacbf268bcd9d904ec27e855e4f70a4c76f4fd99b29d8abc5a41f598144dfa550c8982b6cc57e900aad69a97e32ad363af83e06b50afcb54080
diff --git a/dev-perl/Test-Fork/Test-Fork-0.20.0.ebuild b/dev-perl/Test-Fork/Test-Fork-0.20.0.ebuild
index 95f824177591..1f04b6cf545d 100644
--- a/dev-perl/Test-Fork/Test-Fork-0.20.0.ebuild
+++ b/dev-perl/Test-Fork/Test-Fork-0.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="test code which forks"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/Faker/Faker-24.11.0.ebuild b/dev-python/Faker/Faker-24.11.0.ebuild
new file mode 100644
index 000000000000..4a85c701f3c8
--- /dev/null
+++ b/dev-python/Faker/Faker-24.11.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="
+	https://github.com/joke2k/faker/
+	https://pypi.org/project/Faker/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	!dev-ruby/faker
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=faker.contrib.pytest.plugin
+	epytest
+}
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 0d9f3564c9a9..2cdd22140385 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,6 +1,8 @@
+DIST Faker-24.11.0.tar.gz 1726502 BLAKE2B 52429b5b0db4e1fd55d2a4b30ed007417f37e36fbec8d4fe43dea316920d85877668f4e66107011fef5874b74b25c1465fcfc0990ee3f40810df064622bb5373 SHA512 d5ee8c7c048d113c37b13608406d96966745ab46b095fcb30c9107a27a7af909c9d4d6bf9c7bb478ad7d0604b3cb6b33b93b0ba9e1a321c20870d651f57617a5
 DIST Faker-24.4.0.tar.gz 1724351 BLAKE2B 2eeb2d660462b0f0b55aadd32768c9a5eaaf22a8036ae203dab7538b8c24f0e6fcdf08533c7737fe597dbe395a00a39c8c2d5e3a823133638a90a9ffa8d32f08 SHA512 5ea18faa39cf8506f007557b9a8c84bf2cc21d806a99991bf2fcced3d350f96daf3dd6a0a42dfdb7021b72156eb12ad84a930c669df011f39a17f4c290d08675
 DIST Faker-24.8.0.tar.gz 1725365 BLAKE2B b2646766b993d946bf7965133b7484408370a2e8bed9091b713ffd427d545bb708027066b6787a78cd675659b4d342ac86c9f611aecfb7df3d0565a8066925f0 SHA512 d8fe7e411052bec485b40540317c88ff5aeae8a32ef2e53214816b190d4730c9f5af9157ac2c66aba5fbc887e995d0238f71deefdcf67300e49586c7995b60ff
 DIST Faker-24.9.0.tar.gz 1725521 BLAKE2B 30486824e1e9a33cb9bf018ebbe9845c65c5fbb797fd75c0798f854c487b5e02b30fad83dd1f94ef4650e5e6ec981ef3318e1b3ec7cc64169e2b3fb7f90a42d8 SHA512 18fb6970c90c1048fcfcc9bb3f557eb21374b9e0f128833ac32ad281019059d8a8a3a05a276b72d38bd9bd6315cf0846d7f8111f054191dae1149cdcaf08187d
+EBUILD Faker-24.11.0.ebuild 865 BLAKE2B 003402d2706fd0c094a71b72288598b8fb9b953ba6e3883b5812630102fc0cf063cea84f829518e1e6041c9dd21b3d39b7139ba0d7ba720c48d27fb6e82671a6 SHA512 052f8d09869485c1317fcdb808f3499c322be28e9e851c844b8db8fd740743bb8e3afc965a83bc664e07aea9f70ce24304ffa99252cb1a3a7d0b8eaa59e1b61c
 EBUILD Faker-24.4.0.ebuild 858 BLAKE2B 2e7693b63d3810eadf6c63951eec2c96385940ba69e88ad8ee14cf28f14beb0a0bbe5edeaaabe694832506a24e7e4648ac9fc8469d7ba0f38d9b6c687b69a736 SHA512 c3540187d7ca070be4942be3e2718a980ba85c588409b419d90b9987efc5a2f26f8362ba7350c6df1d28865496dc1256b752d8a44157eb2e6ac78bfcf54a33a0
 EBUILD Faker-24.8.0.ebuild 865 BLAKE2B 003402d2706fd0c094a71b72288598b8fb9b953ba6e3883b5812630102fc0cf063cea84f829518e1e6041c9dd21b3d39b7139ba0d7ba720c48d27fb6e82671a6 SHA512 052f8d09869485c1317fcdb808f3499c322be28e9e851c844b8db8fd740743bb8e3afc965a83bc664e07aea9f70ce24304ffa99252cb1a3a7d0b8eaa59e1b61c
 EBUILD Faker-24.9.0.ebuild 865 BLAKE2B 003402d2706fd0c094a71b72288598b8fb9b953ba6e3883b5812630102fc0cf063cea84f829518e1e6041c9dd21b3d39b7139ba0d7ba720c48d27fb6e82671a6 SHA512 052f8d09869485c1317fcdb808f3499c322be28e9e851c844b8db8fd740743bb8e3afc965a83bc664e07aea9f70ce24304ffa99252cb1a3a7d0b8eaa59e1b61c
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 513a5a2d7175..721346a44145 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 24b8c82a589f..1a5038e43a2b 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,5 +1,7 @@
 DIST aiohttp-3.9.3.tar.gz 7499669 BLAKE2B 0712df73af60cc9cbf12f0a4e063b6aa6da1b19b0668effe16672a4b7ca3f24cc831218ec8d4672cd86acd4335a75e16f94133dbb1bf783baf8ed96e471f3eec SHA512 6236f27b6def0c3bba1b5fc59f4af74f8076aa369cf5c1b9bd9ff9dee1c71ee49387ded812875da9450130e92d2091fd01f0608b25b03ff37e99162b89120fd7
 DIST aiohttp-3.9.4.tar.gz 7500720 BLAKE2B 1f41e481590425c16ef9e797ecc78e08d00fda65b40c38e34226ada969f3114cae3f6953980d23b0e96e284f6e49fd0a84aa93c6b7a666d60690e9a9fd9c41b2 SHA512 e26e7148602d72c77fe46e0596614b448f38a9014834a72c4131d8b315dbbd401ce4e1a403ef35ea7a9ba7fafaddc42031d38b93b45464accdedf26ba99fc960
+DIST aiohttp-3.9.5.tar.gz 7504841 BLAKE2B f051ee88d45952219f72d542f1c6d0cc33c699c6c5fb5dbe3bc054ee4d0e03121b219c8c8524fd1236a8b878329b0997b8afe07d6c66074102d4a2052a8738ff SHA512 da11468a2f131275593395b052700a99cf79055a32d48327dca0f58547ad30add8cd0a375dbd831e2f06fe7a739183251e4ad69c16f3d141799bbed45a8a5dc4
 EBUILD aiohttp-3.9.3.ebuild 3110 BLAKE2B dcd71e7f5efa5bc26ea37d62d53052badd9cf7bef702a7d14bd90311eb771a68c03b8164fa5fb7c655be330b16006d8658a6155428980bb3a540c1536af006dc SHA512 2a9cbd30d313f2a8ee5e4c96b955545047c6838b810e87ea8abba458d28efc0247485311627c05c76b38ad1c9154012ade453a3ce964d747fd18a9a1246e803f
 EBUILD aiohttp-3.9.4.ebuild 2892 BLAKE2B b6067b3c9b71e269203a16a937292d60f8ffdd0205bb2b793ee697d718094c6dca48cb8b98ae5058423e4743f6c59053fc5bf925c1f107af38d8534447a366d4 SHA512 930265edfcd0e6a1ba74a45b83ecf4f2e2e0d3feb1632bb592bcc61656e363d2e06a4384f31e46d7a9bdb1e71fa1892cf9e32c9887b4f2b39abde69b907657b0
+EBUILD aiohttp-3.9.5.ebuild 2892 BLAKE2B b6067b3c9b71e269203a16a937292d60f8ffdd0205bb2b793ee697d718094c6dca48cb8b98ae5058423e4743f6c59053fc5bf925c1f107af38d8534447a366d4 SHA512 930265edfcd0e6a1ba74a45b83ecf4f2e2e0d3feb1632bb592bcc61656e363d2e06a4384f31e46d7a9bdb1e71fa1892cf9e32c9887b4f2b39abde69b907657b0
 MISC metadata.xml 490 BLAKE2B 5233af0b5e2668b1eb62278b05b62f24f1ab90f6d05b20dd9f1c5b54b846919c3fa28b843df28f5bfa320996d46de0e74c7a28bd0bef02aaaca14b1cec52baba SHA512 9b701c5c5a22b6aa94977a67bc40f3dc9df8337556952658a2a17ecaaa471cd7f7b5b8bf3a0088208087677555f0cbb8760c091b03b96ee70affe3e2b84cf6d5
diff --git a/dev-python/aiohttp/aiohttp-3.9.5.ebuild b/dev-python/aiohttp/aiohttp-3.9.5.ebuild
new file mode 100644
index 000000000000..a4d57535e7e2
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-3.9.5.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="HTTP client/server for asyncio"
+HOMEPAGE="
+	https://github.com/aio-libs/aiohttp/
+	https://pypi.org/project/aiohttp/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test-rust"
+
+RDEPEND="
+	>=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
+	dev-python/brotlicffi[${PYTHON_USEDEP}]
+	>=dev-python/frozenlist-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		<dev-python/async-timeout-5[${PYTHON_USEDEP}]
+		>=dev-python/async-timeout-4.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/re-assert[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/time-machine[${PYTHON_USEDEP}]
+		' 'python3*')
+		test-rust? (
+			dev-python/trustme[${PYTHON_USEDEP}]
+		)
+	)
+"
+
+DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# increase the timeout a little
+	sed -e '/abs=/s/0.001/0.01/' -i tests/test_helpers.py || die
+	# xfail_strict fails on py3.10
+	sed -i -e '/--cov/d' -e '/xfail_strict/d' setup.cfg || die
+	sed -i -e 's:-Werror::' Makefile || die
+
+	distutils-r1_src_prepare
+}
+
+python_configure_all() {
+	# workaround missing files
+	mkdir tools || die
+	> requirements/cython.txt || die
+	> tools/gen.py || die
+	chmod +x tools/gen.py || die
+	# force rehashing first
+	emake requirements/.hash/cython.txt.hash
+	> .update-pip || die
+	> .install-cython || die
+	emake cythonize
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# proxy is not packaged
+		tests/test_proxy_functional.py
+		# python_on_whales is not packaged
+		tests/autobahn/test_autobahn.py
+	)
+
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/test_client_session.py::test_client_session_timeout_zero
+		# broken by irrelevant deprecation warnings
+		tests/test_circular_imports.py::test_no_warnings
+		# TODO
+		tests/test_client_session.py::test_request_tracing_url_params
+	)
+
+	case ${EPYTHON} in
+		pypy3)
+			# upstream unconditionally blocks building C extensions
+			# on PyPy3 but the test suite needs an explicit switch,
+			# sigh
+			local -x AIOHTTP_NO_EXTENSIONS=1
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_mock,xdist.plugin,pytest_forked
+	rm -rf aiohttp || die
+	epytest --forked -m "not internal and not dev_mode"
+}
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index 0f422127b03b..b88e67fe5a4b 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -1,5 +1,7 @@
 DIST apsw-3.45.1.0.gh.tar.gz 904083 BLAKE2B 4cf397557bfe36e38fd48d124345de395b77a8dd313ebd77f97624d873123d5ecd82e56b6e134849e00a77f94b0c3ee2fa0cfc888b8fbbddc34b99b3274b8dc8 SHA512 5d754c45881db9e299c70bd0c290211f7e30421da258b25b5aa0d8b3c97a10622f0b75735fc84d687f78403fc257139ffc249d926be611a4101b98caf3c60a3a
 DIST apsw-3.45.2.0.gh.tar.gz 904263 BLAKE2B 4071e2dc24a304f4f08cefc87cce27d617cab8f2699d134134b2c0c2618422139ebdd38dfafcb17e8a6c515fe5e799d6d827ef5099af23cf628f26c18764aa0a SHA512 864cde25cfd15e3cbddbf1df80dbd861e93c2e8ea458a9f16d0ff4a8ecaf17721321f08bf7ab0659c0a18845be5bcc879b6708175ed971b263a0f274c08b05b9
+DIST apsw-3.45.3.0.gh.tar.gz 904570 BLAKE2B 644c884b6f5624c2d8b48f204a43bbb6dd8761979099e1ebad96a30acc7d79f80549e50300279b8d1061f86f8852735fa92c99df4a6c81a364391a3635464ff1 SHA512 73c09aba4ff211e98dfb3365e5f0202f85fa0a05e78f6a35fe08515e84b74ed1576e7bb5c46c77c309ba3e6acacc5681d31e5a4d3d66835d347d82af8feced74
 EBUILD apsw-3.45.1.0.ebuild 943 BLAKE2B e0acc10026d83c72e85dfe259f8e2d2310e34638ceb5fb0d87779b47e14413c27ec419416a1fdf2fa9a6748046732507533a9645482a05060daac73bbb669c1e SHA512 67e148421dedbad8cdaadf1644abb6696f4fcfb2d90c7206f3c64790778ffb3895f297a97e4fb9128ce9b538a674cebc312103738bcce6e724bff6ba12314fa6
 EBUILD apsw-3.45.2.0.ebuild 946 BLAKE2B 4904dee29c74f142565ba3087022f5a5ded0b389aab3a3f7e33669579eb55fbe811b8d17107ab7ad61d8b0873662e344d9b7061dccfeb63efc1db1c15c8cb606 SHA512 3de3346a9980976677977f75708cc1d9a1c0b9ec762445f78dd07f47982e57b289346edc67cfcd067e12e8b4dd9070f1ef94c16f52422baa2703ae09ad0e891f
+EBUILD apsw-3.45.3.0.ebuild 946 BLAKE2B 4904dee29c74f142565ba3087022f5a5ded0b389aab3a3f7e33669579eb55fbe811b8d17107ab7ad61d8b0873662e344d9b7061dccfeb63efc1db1c15c8cb606 SHA512 3de3346a9980976677977f75708cc1d9a1c0b9ec762445f78dd07f47982e57b289346edc67cfcd067e12e8b4dd9070f1ef94c16f52422baa2703ae09ad0e891f
 MISC metadata.xml 700 BLAKE2B 258344a1602daf3e081fdb4c94eda8af6e231def3f02fb80d63691b47d0a503c9caad80893386ce7ef42d6be2985906f3fc5cfedfe5a1044aee04c493f3d0683 SHA512 de73b4eb06d0bcf4c81e544a98ad15231b006d62fe22f6bce7e38740b941b98297fa1a38b00060ff83ae9f3259c5020c7071469f2a3f0d9e4f8f0301cb942081
diff --git a/dev-python/apsw/apsw-3.45.3.0.ebuild b/dev-python/apsw/apsw-3.45.3.0.ebuild
new file mode 100644
index 000000000000..7fe76f0deaa5
--- /dev/null
+++ b/dev-python/apsw/apsw-3.45.3.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="APSW - Another Python SQLite Wrapper"
+HOMEPAGE="
+	https://github.com/rogerbinns/apsw/
+	https://pypi.org/project/apsw/
+"
+SRC_URI="
+	https://github.com/rogerbinns/apsw/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="doc"
+
+DEPEND="
+	>=dev-db/sqlite-${PV%.*}:3
+"
+RDEPEND="
+	${DEPEND}
+"
+
+src_configure() {
+	cat >> setup.cfg <<-EOF || die
+		[build_ext]
+		enable=load_extension
+		use_system_sqlite_config=True
+	EOF
+}
+
+python_test() {
+	esetup.py build_test_extension
+	cd "${T}" || die
+	"${EPYTHON}" -m apsw.tests -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/blurb/Manifest b/dev-python/blurb/Manifest
index 9af977cd0ba6..a6d18bc52174 100644
--- a/dev-python/blurb/Manifest
+++ b/dev-python/blurb/Manifest
@@ -1,3 +1,3 @@
 DIST blurb-1.1.0.tar.gz 25064 BLAKE2B 4fbdd0d068cc7abb1ffa78dff70bd83feccc1bcfbf8ebb085c9f7e77e0f330d3759f10a94a5ca024b465c01f9d659496ae55162a52b7158a06caf2d114d36806 SHA512 9397173e7bf5babf02c96df27983462e7dd2a729e9eb0cacdf23ca3778336902d5c611ab5e2432bbc877344426d7c62ea8ae77719aa08da98f9b44365583b7ee
 EBUILD blurb-1.1.0.ebuild 643 BLAKE2B e5f3d1042de082a92dae514414f61c22756d4c100cdcbfe2b47238e3f9c703f225c0ae8b1cf1e4a067a861e00e923b55bb32425be52aa362fa43d501d9ed7712 SHA512 4d4949329f5f1ec13b535d302613fdfd1f8ce93ed92eb4ce867939f902c79d6dbfccf4582948cded0dfbf5180315099c1aba4eeb0b25a60f4ab42dca45796df4
-MISC metadata.xml 1039 BLAKE2B e723b7324c373cc1f31235b331f2f7f76e549a8b4e335e7db7a624e1b59c7a664440a28348491f9d176b7138cc4899996d23d2206a82d7660b0c2875e6e74e47 SHA512 7781ff5848693ff7ffa750dfaee88b385ba970803399fd967e98f62544cb196e0fcc1a341ff86c989d6da362921ae364ee8aee1824d0d91412562b00ee23b1d1
+MISC metadata.xml 1099 BLAKE2B 6c28398a79e4badbe4e2625c07e2a0741b5b78063505201be4be56a29d1e5251d2a3f0c43644d29dfa14fd170b2b5992c4f0bb719fe5719dcd13e3688774bb80 SHA512 b463282283cbca3d728ec3a6eabb6d25c84d4db7cc3dd6a3f462e82f1335ee9c089c60af8e3cf55d6e9fc0eba21ca724a5b36b34b200b38d73b98bf8b375ffd1
diff --git a/dev-python/blurb/metadata.xml b/dev-python/blurb/metadata.xml
index c3ea630df5a9..afed81257401 100644
--- a/dev-python/blurb/metadata.xml
+++ b/dev-python/blurb/metadata.xml
@@ -23,5 +23,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="pypi">blurb</remote-id>
+		<remote-id type="github">python/core-workflow</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index ac8a696a9608..5cbc07b5717e 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,8 +2,10 @@ DIST boto3-1.34.74.gh.tar.gz 790202 BLAKE2B 4368db3e11d6bda6eee4ccde82bcc0c2c5a6
 DIST boto3-1.34.79.gh.tar.gz 792796 BLAKE2B 97a4f8e6fc33bcfe2817ce353df8ff6354bc89c449e5e29833704e12513aa21129863164c51047b17c7f15a47f0ceb90c60a83071464283292089b2535e8fed9 SHA512 15161face918253eac06dfbeb67adb8ef5ed6902b2eed760feb9fdd3aee0e38da3511aa7d829914b6f80addff7feffae7d3645f7567643a37d3659001d7b6a1a
 DIST boto3-1.34.84.gh.tar.gz 796658 BLAKE2B 76ad7997f92167f1ed2f14a0a780a1a58b4a853ea132ca38797a228382ad8f55264dfaee99ebf6f8e2bea1848ec918f7b3b0943d0bb6a81b3b858e729b2e74c4 SHA512 55988d7ba69a46b986ed2cffd46b37a154baaa3a73ce62d9ee5b4b8b6f8987f714034ae4f3e59ed9907920216eaf8b18edea4c0fbac99037979b8b30e3b71133
 DIST boto3-1.34.85.gh.tar.gz 797539 BLAKE2B b958d009a7acdd541306f41f8708951ed1bf3d303d5e3b3453307415ddc8cf6f6d3c7ed464f350d1a36646729095b1684a865f5982d2ae9b3d7facf596c8b579 SHA512 91295f89896a705c3cbb941fa55e8d227b12dc28290ca15a31ebf60e936ea805233d7b14c6097c9757f6c7ff310159bcc1f2a2e46227d98b6d04adf9c6d44a33
+DIST boto3-1.34.86.gh.tar.gz 797728 BLAKE2B e0ff81aab27782e69e69dedf1ef227d6539f4253df6e9e7f0daa9d3d033a646c359df2a9aa49192350f43ba852384220379e794a3c89f368224bee28b292d371 SHA512 7303cbf0a49d2ec085e5a0798f658c799e1ffd02cf3387ab13ccc403c152009184ee71f73b07bcd6a166b686c530aadd8cd77644eb0c72b517910d2a332959fc
 EBUILD boto3-1.34.74.ebuild 1258 BLAKE2B 7f7ba2672f66400a4c2c202847d4bc7b57a0941b51f4f2f725475c38b6092c6a89687476db8bb701688ff47ccce491ffc435968a407ffc30ef860747573a1f43 SHA512 aebf347c928b4364a045a4bfb20edad39f9530fed5dfeef6b7e684feae0a146b71aa53cbb49f0b79e89671b97402aad447e6971df74ee44fef523ebad23f992c
 EBUILD boto3-1.34.79.ebuild 1205 BLAKE2B 27d096dc4f88c8351e0857e9f8b4195060f3f1218e1734c699a832246cc59e081cda9ee7369e3b44706e7ce8ef390e8792e273aff7f6e92a75c69461fc1136d6 SHA512 cca4aef410e4fb2ef71181a15233da830df39d8b7f1e779b5d6a8df74eb602afee11b8965e0ca9254cb87155a8514b43fcc0de09f681ecec9a384a904f3fe0b2
 EBUILD boto3-1.34.84.ebuild 1205 BLAKE2B 27d096dc4f88c8351e0857e9f8b4195060f3f1218e1734c699a832246cc59e081cda9ee7369e3b44706e7ce8ef390e8792e273aff7f6e92a75c69461fc1136d6 SHA512 cca4aef410e4fb2ef71181a15233da830df39d8b7f1e779b5d6a8df74eb602afee11b8965e0ca9254cb87155a8514b43fcc0de09f681ecec9a384a904f3fe0b2
 EBUILD boto3-1.34.85.ebuild 1205 BLAKE2B 27d096dc4f88c8351e0857e9f8b4195060f3f1218e1734c699a832246cc59e081cda9ee7369e3b44706e7ce8ef390e8792e273aff7f6e92a75c69461fc1136d6 SHA512 cca4aef410e4fb2ef71181a15233da830df39d8b7f1e779b5d6a8df74eb602afee11b8965e0ca9254cb87155a8514b43fcc0de09f681ecec9a384a904f3fe0b2
+EBUILD boto3-1.34.86.ebuild 1205 BLAKE2B 27d096dc4f88c8351e0857e9f8b4195060f3f1218e1734c699a832246cc59e081cda9ee7369e3b44706e7ce8ef390e8792e273aff7f6e92a75c69461fc1136d6 SHA512 cca4aef410e4fb2ef71181a15233da830df39d8b7f1e779b5d6a8df74eb602afee11b8965e0ca9254cb87155a8514b43fcc0de09f681ecec9a384a904f3fe0b2
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.34.86.ebuild b/dev-python/boto3/boto3-1.34.86.ebuild
new file mode 100644
index 000000000000..2c733040b7a3
--- /dev/null
+++ b/dev-python/boto3/boto3-1.34.86.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+SRC_URI="
+	https://github.com/boto/boto3/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index f5c1d195e4d9..096890c6acd3 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,8 +2,10 @@ DIST botocore-1.34.74.gh.tar.gz 12820469 BLAKE2B e9d7a35e82aee30666952ea6f74d8d0
 DIST botocore-1.34.79.gh.tar.gz 12882231 BLAKE2B 56d7d2a1046a164f4f64f375f608b8646e0f7c266b1c7ab37ff7141fd8d8d843ce2890b0a947f051956f61fb2cfc75c2eb3b3cf70305de4ba9ce2e18d8569ded SHA512 00717ad582e23e1c4f4d803eea2069224fc69c6e701d6b4a55d0d99806cebfb1e2c45c7eb65464b84e0cc63399a7b6235b90ba9245e27fe435eca6079b5c29aa
 DIST botocore-1.34.84.gh.tar.gz 12910232 BLAKE2B 3a9f9073e34d203f05ae44f9dc437f4d325084dbe858e59008a7b0c826c53d6e9a1911f6e9203aa476787878de88a1d8a9c1e26cedc3c34bebf6739c9bb10fce SHA512 247578e628e5ea57cfb956a10c0975d7a2caa24617e8572f90ca2a0286c75077a732328cb2dde34c937113d288c4a8a346adc074aae14dcebfa16c309d801a31
 DIST botocore-1.34.85.gh.tar.gz 12919998 BLAKE2B 3c23623bc37f2b2b725b3187faad5860b0e8fe6cd6295503ae2abf45e83a7393fa0613400052a668c7c2781f2ce76b8b1bc725a268020b45df62aaaef317e25c SHA512 797b097a99709d04d294f15ea89039567ceecea1ce16439eda31a659cc2b195d2aca79b9b1be264285f917569127b8ccdfe72d37b174d67fb562dbcf0ba081c0
+DIST botocore-1.34.86.gh.tar.gz 12921497 BLAKE2B c1ef844adcfffa3a2d03a237ee988efbf57271b907b0aa77300ba063952c3c5861f144fc766f6735be79d7e302bdc9c951566ca6a54f925269de535902e436d3 SHA512 7f9049b89e4635b313f60cb376a33363f841118516d740f3e0476b435ee46760a188c78e144500f7c2da8ec50974b1d584a389adf47445ec545729f571455ac9
 EBUILD botocore-1.34.74.ebuild 1477 BLAKE2B 784b43f060f0702808a3894fdab7a15dd4b4feeffc3c1ab2fe24cca762b2dc1310f40ae5b2941db5c4aa9c4ff8b69d858520826027a50ce975d25150132b4d56 SHA512 e86970ec900929641794d61e02f26bc7e7c8af803095dcc5c8fbedac9d79275c596176f2b492061289056c7d29ebbaa6e64344148f22b6349ac4420ab5038dca
 EBUILD botocore-1.34.79.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
 EBUILD botocore-1.34.84.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
 EBUILD botocore-1.34.85.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
+EBUILD botocore-1.34.86.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.34.86.ebuild b/dev-python/botocore/botocore-1.34.86.ebuild
new file mode 100644
index 000000000000..ba6cd2a5d2a2
--- /dev/null
+++ b/dev-python/botocore/botocore-1.34.86.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+SRC_URI="
+	https://github.com/boto/botocore/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+# unbundled packages
+RDEPEND+="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/django-otp/Manifest b/dev-python/django-otp/Manifest
index c67dbeb0f978..9d66eea13cde 100644
--- a/dev-python/django-otp/Manifest
+++ b/dev-python/django-otp/Manifest
@@ -1,7 +1,9 @@
 DIST django_otp-1.3.0.tar.gz 69013 BLAKE2B 4b6143bb8863e6c151df954a3c4ac4ecca770b1f396dd291e8634e8ad5e0755514111dac02307120e74abacf04bc681503a973bba067817c80bcffc8c462c592 SHA512 ef63c5db096ce7d1b10d6b2a99ab6db46b779d4221f509452921fcbf338decbd5c799aec7476587a03b34288ef3f5ff1964dee72105b65f04a22cbd53d445fa4
 DIST django_otp-1.4.0.tar.gz 71690 BLAKE2B 61144122ab6dec438dcc3136e8856b4d66c598e811f1fdd21e5ba77a907ae5bda88fd543a1c87a165d9ba30ce2bcd7415b04d598719ecb46f2f3ddc15a342aa0 SHA512 df4a11d3cb6a55e2506815b81c7e8cc3e9c272afd8d1d9ba94fd1336467b177ea3eb1e89129c3c727d7ce74ce159e5d153a22e0be2d3d638c8357653b22dba56
 DIST django_otp-1.4.1.tar.gz 71847 BLAKE2B 49764cd1957ab2a6644780c1c6a0947b20bb4a0c1ca286907122a8b47f937aca8d1d2e480f7a309b546ac503cb0c3b1ea3e03532e7d6c38fe8db1606406eda71 SHA512 bb041a6ecd93dbad4f83d6593dfbc2f4768e1a3e68df332a61ed9ce483a8ec7090179a6865b128d02a2fc5ba2b42cd63dc16595a7b98e2728733fc274d506b1a
+DIST django_otp-1.5.0.tar.gz 72265 BLAKE2B e2a687a287b5e7b4f5c9370b280bd60b5e9cd62ff6fea4187988acc703ce5cc61f4ee094026c07391343983d87d9c0cb1ff4fa51d10a3e7a4d8da4da182fcb4b SHA512 0169804992b155dfa88fbc0d695091f3f03225f28a104c595e7790f174ff3f4943280b7a3dbb3d4c263cc1bad0ea0370e4749d8d0b1df1e3675881365fc15dfe
 EBUILD django-otp-1.3.0.ebuild 955 BLAKE2B df0c1b4d78c0377b6062bb8a72ea0173d583dcdae11890ccbf776fb2ed38dd1795074d3b66b7a67601e508f7e8dd4ad90799402fc3ea4349ab7d4a20ba1bc6e3 SHA512 29a16deec317c7808f619ed7b4d9799dd008f806bf26d63f7232fcb6cad9347f58fe8b1217fac34795d3cd549b1964d688f86156742a381f4ec1cef039495d13
 EBUILD django-otp-1.4.0.ebuild 955 BLAKE2B 1ba7e209508ebd4b1bcfd1922f5b548aab773ff04075b03ba8516cfab6f91089310cd9e8653eb9b0deeb9fe82386bbd1cd07cfe0894e3a5bd54285fca6d5c088 SHA512 da094d516da07ae3e22c2c66a6e29de0ff2ff888134e2f36f8ffd76a5920793b17b206f1383fafbb23f168556ca1b080a4eb18d48b6bd8df4d2bea75185d621c
 EBUILD django-otp-1.4.1.ebuild 955 BLAKE2B 1ba7e209508ebd4b1bcfd1922f5b548aab773ff04075b03ba8516cfab6f91089310cd9e8653eb9b0deeb9fe82386bbd1cd07cfe0894e3a5bd54285fca6d5c088 SHA512 da094d516da07ae3e22c2c66a6e29de0ff2ff888134e2f36f8ffd76a5920793b17b206f1383fafbb23f168556ca1b080a4eb18d48b6bd8df4d2bea75185d621c
+EBUILD django-otp-1.5.0.ebuild 1001 BLAKE2B abe622cc65429bfaaa9181089f77df04495296f1ba493a51b5ded11a5040eb5a2839f7e9eda1a1017b35393fd783c8c344cd25ce07ad47bb130aa170282ff79a SHA512 649a92904d596624701e5ddf7862f0095049ee522e1dfa7e9f58f1c1405b880b344e80d77374ab77087339c1dd2d1e4bcbece499ffc1276aa690cc10ea0460f7
 MISC metadata.xml 387 BLAKE2B f1be13d8af9a4926d7c82442cb939f1030a8234d4f18917cf8b2b8b204d763974b5f08f8597334238733d6446fc1165ba19d454e13105dc16afacf1fa3a98ea0 SHA512 d85060b9982c55057128a0c7b7fd1537e3eb613f9d44e6c40438283d76f6d65c92db78815005ce44b4096d57c62584659d5997491f003ca1ed8c36f88db8623c
diff --git a/dev-python/django-otp/django-otp-1.5.0.ebuild b/dev-python/django-otp/django-otp-1.5.0.ebuild
new file mode 100644
index 000000000000..50c19176bea3
--- /dev/null
+++ b/dev-python/django-otp/django-otp-1.5.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Django framework adding two-factor authentication using one-time passwords"
+HOMEPAGE="
+	https://github.com/django-otp/django-otp/
+	https://pypi.org/project/django-otp/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-3.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		|| (
+			dev-python/qrcode[${PYTHON_USEDEP}]
+			dev-python/segno[${PYTHON_USEDEP}]
+		)
+		$(python_gen_cond_dep '
+			dev-python/tomli[${PYTHON_USEDEP}]
+		' 3.10)
+		${RDEPEND}
+	)
+"
+
+python_test() {
+	local -x PYTHONPATH=test:${PYTHONPATH}
+	local -x DJANGO_SETTINGS_MODULE=test_project.settings
+	"${EPYTHON}" -m django test -v 2 django_otp ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/hatchling/Manifest b/dev-python/hatchling/Manifest
index c4900a9ee306..f9019bd0bcf1 100644
--- a/dev-python/hatchling/Manifest
+++ b/dev-python/hatchling/Manifest
@@ -2,8 +2,10 @@ DIST hatch-hatchling-v1.21.1.gh.tar.gz 774577 BLAKE2B 31e2b50598b4fe120ecea407a3
 DIST hatch-hatchling-v1.22.5.gh.tar.gz 782757 BLAKE2B 3431ef7c4e5f0754e51507e29d88ed0277b530d220eb75bdeab459d88172ba51de3cf2456074fa88483cc89e72726f3e147b97e995f9ccaf699b6c2699776a8c SHA512 d4e77872e34e3aba3fce286f911861b795005c37550a2ca72a83216cea67d53be891afc8861b11582c66d38748f9c8d4980548d216c0fb21b2b4e1cadc314e58
 DIST hatch-hatchling-v1.23.0.gh.tar.gz 802345 BLAKE2B 571ae18bda737acf05bd830c4d835b2c785a595844cefbed030383e9ede166b0cd8bba2d7a6e0a4c7b504be825fbca4fa89861e9ae265e9a24bc756025da8d07 SHA512 ed504577d856e42b46ab861972cfb1c47589ae85887c2fc0aa78ded7a2f1cc8eaef796b9331d4ff853a86b6d808080b15d11943775c600c5d10b191ae65cb400
 DIST hatch-hatchling-v1.24.0.gh.tar.gz 802778 BLAKE2B d2dc29c551767cf090588533c47d936aeb38cda14154edc1a78496d0dbad3aecab3869e1f8e877c71a798f4a7ad2c853550ab2d7b9748e4d7f6c37e58811bfe8 SHA512 466748bff35acf7556cad6ee42ad2767c1a52734e1de9ac7b60867714e1707f508c27bcc5573100d68ace950aa9e42122235e439d5ea0ff0b713fa713ef503c6
+DIST hatch-hatchling-v1.24.1.gh.tar.gz 803276 BLAKE2B 61966dbc170ef2b130ae49f78e9c99f81eedc69f6d7f30b28c48be8a2d6aa17f128ca08adc3740c3dead0da30581208b967a3b8e02fd5d3f3f46ab9be1813460 SHA512 47c6f93072f82b15c56eb61b342cde44bb34cc23b89ac426120215ae71ea956380a1a66d12a70a11088df921c0df31a448bb40953e2e3bb32c74ed34a94b9640
 EBUILD hatchling-1.21.1-r1.ebuild 2798 BLAKE2B a2ccd1d1b1a435de29fa1ae95d8ceaddd49b7cd600b11e6baa6c261301493c20373051b5997191cd92904be5179d462cf58103b141c56c3879e57de038fabbba SHA512 9c2445c60ab6c7d272d423e1309f12cee8a92c7c5c3c0e1a8ec08731606e385db27eafbb35d06c97486ceca96d64f06b449f99fef9168bdc20c0cbd264f0f50e
 EBUILD hatchling-1.22.5-r1.ebuild 2869 BLAKE2B 1d0439295189cb8be8b4a9d0cd54034e84fbffd9fb86b037cfbe8430c5be90e44f619788b6d08615ba659cd5d3eb9304bad333a853c48e90eb93451f4bcd9a60 SHA512 adeb53b9e718741385bbb875573efa04d819924d191ea010e16c7b46d270268619dcc1485b174b6d93351fdb4c94973f3bf230012c720c5422fc31ae42f122ba
 EBUILD hatchling-1.23.0.ebuild 2869 BLAKE2B 835887ec06d3af4611fa58b84893992be7fc60cce8865af8592126e91c5cabe8b9372e64e5a0eda55a6726e7a830b1e5d50d876420b77b3386bf6475f742a590 SHA512 63d3f14fb6534ef36e428e041b8e9a39ff1f966d0004e82f500854fdbe97834258c1ae1c43397f5e0b725126a5ce08e1187c5c2b3ac4c05592939e1c68cfa868
 EBUILD hatchling-1.24.0.ebuild 2869 BLAKE2B 835887ec06d3af4611fa58b84893992be7fc60cce8865af8592126e91c5cabe8b9372e64e5a0eda55a6726e7a830b1e5d50d876420b77b3386bf6475f742a590 SHA512 63d3f14fb6534ef36e428e041b8e9a39ff1f966d0004e82f500854fdbe97834258c1ae1c43397f5e0b725126a5ce08e1187c5c2b3ac4c05592939e1c68cfa868
+EBUILD hatchling-1.24.1.ebuild 2869 BLAKE2B 835887ec06d3af4611fa58b84893992be7fc60cce8865af8592126e91c5cabe8b9372e64e5a0eda55a6726e7a830b1e5d50d876420b77b3386bf6475f742a590 SHA512 63d3f14fb6534ef36e428e041b8e9a39ff1f966d0004e82f500854fdbe97834258c1ae1c43397f5e0b725126a5ce08e1187c5c2b3ac4c05592939e1c68cfa868
 MISC metadata.xml 365 BLAKE2B 5a40a6cf6df042e6e8387830babd0171c9d8bc5d490fe2175b83d1588d827e826b49044ef29de48553515996b742fc475bb9699dcfa8ec05229162b22e0ed317 SHA512 f11bb25bc12c2bb0b0a0a4691115b9a2af525d9e44b33e0d6db98c7fcef0b49b5989fb7574ee8b27bc88f1dd2543bfdd492a6614de172e2c4edabbee8bf6161e
diff --git a/dev-python/hatchling/hatchling-1.24.1.ebuild b/dev-python/hatchling/hatchling-1.24.1.ebuild
new file mode 100644
index 000000000000..0f7cc99b5b95
--- /dev/null
+++ b/dev-python/hatchling/hatchling-1.24.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+
+inherit distutils-r1
+
+TAG=${P/-/-v}
+MY_P=hatch-${TAG}
+DESCRIPTION="Modern, extensible Python build backend"
+HOMEPAGE="
+	https://pypi.org/project/hatchling/
+	https://github.com/pypa/hatch/
+"
+SRC_URI="
+	https://github.com/pypa/hatch/archive/${TAG}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/backend
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+# deps are listed in backend/src/hatchling/ouroboros.py
+# editables are optional but required for editable installs
+RDEPEND="
+	>=dev-python/editables-0.3[${PYTHON_USEDEP}]
+	>=dev-python/packaging-23.2[${PYTHON_USEDEP}]
+	>=dev-python/pathspec-0.10.1[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-1.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
+	' 3.10)
+"
+# always depend on the newest version available, at least until upstream
+# stops treating unknown classifiers as a fatal error
+# https://github.com/pypa/hatch/issues/1368
+RDEPEND+="
+	>=dev-python/trove-classifiers-2024.3.25[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/atomicwrites[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+			dev-python/httpx[${PYTHON_USEDEP}]
+			dev-python/platformdirs[${PYTHON_USEDEP}]
+			dev-python/pytest-mock[${PYTHON_USEDEP}]
+			dev-python/rich[${PYTHON_USEDEP}]
+			dev-python/tomli-w[${PYTHON_USEDEP}]
+			dev-python/virtualenv[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return
+	fi
+
+	local -x EPYTEST_DESELECT=(
+		# these run pip to install stuff
+		tests/backend/dep/test_core.py::test_dependency_found
+		tests/backend/dep/test_core.py::test_extra_met
+		tests/backend/dep/test_core.py::test_extra_no_dependencies
+		tests/backend/dep/test_core.py::test_extra_unmet
+		tests/backend/dep/test_core.py::test_unknown_extra
+		tests/backend/dep/test_core.py::test_version_unmet
+		# broken if CARGO is set
+		tests/backend/builders/test_binary.py::TestBuildBootstrap::test_no_cargo
+	)
+
+	# top-level "tests" directory contains tests both for hatch
+	# and hatchling
+	cd "${WORKDIR}/${MY_P}" || die
+	local -x PYTHONPATH="src:${PYTHONPATH}"
+	# sigh; standalone test suites are overrated, right?
+	echo "__version__ = '${PV}'" > src/hatch/_version.py || die
+	# tests mock cargo subprocess call but the backend raises if CARGO
+	# is not set and shutil.which() can't find it
+	local -x CARGO=cargo
+	epytest tests/backend
+}
diff --git a/dev-python/hpack/Manifest b/dev-python/hpack/Manifest
index eacd67946787..f7cdab016b1c 100644
--- a/dev-python/hpack/Manifest
+++ b/dev-python/hpack/Manifest
@@ -1,3 +1,3 @@
 DIST hpack-4.0.0.tar.gz 5301419 BLAKE2B 0164f6aafc0d1f17f6c397efe710503a22501faae3c7dbba4e57ca2dc76e4d373bc5e65bf55acda8bc61975d12f8a2084de0e0c4587539e5a3102e3cf66d562b SHA512 f482d086d7a82649393e3cfea55c98966ce57055cb1826bc4dec1ea334661c02708e7903f2e8e588ee1c30df41373e1de9fb960c2e7bbc18d0ace0b8f97b195b
 EBUILD hpack-4.0.0-r1.ebuild 807 BLAKE2B f28d79af668f6eca0d5454360bfadc418983a799bf5d83a8c28d38e8244c718d3d17834154901007eac3900c5f91b33a12bea182e6c8965bab257e36210af4f4 SHA512 53d9968f939cc03dd4a9df609045867b24600d52bcd231063c477a881a91a46e941f56354d9f045edeb58a22afbcc0f47f380f9455ce8b8ea52207c0ea47fa67
-MISC metadata.xml 702 BLAKE2B 55737d2ecb2b628a787b16858cba8fe6a1b5a2a2b5243445284f523797aed25fc6972f978d4348d8974409792629f7a399994b0189781efc8fc212a3c2b84e1a SHA512 2b60f701fa7ab80396a94e48dbed33c72dab3e3539355a20fe387dc2d5ea378bce5e3868a092da7d93604d1ef6422a4ae22c5ddb68d3dfc938920251186bdd1e
+MISC metadata.xml 760 BLAKE2B 92e5149e8ff89c6c93ad504b6e45ed8f8dced123f4042b325ce5cf3edbd9c703a7be8c0097f815db524f777adb93eb218fa23d82f3e41dbe9014787c16f90c9f SHA512 dea5e0d97421b1465659120326d56b1c55a94321a33372a48555ec28afa5d50b7e66639d021ba7133f54a325e90db8be95de32d6843797c8bf87984ebd873ddb
diff --git a/dev-python/hpack/metadata.xml b/dev-python/hpack/metadata.xml
index bf52e22daad9..3c801126a927 100644
--- a/dev-python/hpack/metadata.xml
+++ b/dev-python/hpack/metadata.xml
@@ -11,6 +11,7 @@
 			<name>Cory Benfield</name>
 		</maintainer>
 		<remote-id type="pypi">hpack</remote-id>
+		<remote-id type="github">python-hyper/hpack</remote-id>
 	</upstream>
 	<longdescription>This module contains a pure-Python HTTP/2 header encoding
 		(HPACK) logic for use in Python programs that implement HTTP/2. It
diff --git a/dev-python/jq/Manifest b/dev-python/jq/Manifest
index e1d86729c1d5..6e0ac6b1fa89 100644
--- a/dev-python/jq/Manifest
+++ b/dev-python/jq/Manifest
@@ -1,5 +1,3 @@
-DIST jq.py-1.6.0.gh.tar.gz 2842673 BLAKE2B 5ef2d2c6641483123b030c508b04e8f1574a5ca3168a2bacfd7c5a4ad01344d677f723cc3317677275496bd56412c5ab64370ed87b70dcb91dd1d8328daf65a8 SHA512 91e2c0890cece4f09e362c0ae691c768be64ba0d8e0d7441c9a459be37ff70ee816d179c21759ee053b2b434fc0a6998d90b660ae1f1456d4f506474cb80d88e
 DIST jq.py-1.7.0.gh.tar.gz 1953673 BLAKE2B 861dcb706ef801ff3abb47a6b85fb8aad03988c717a67063d737667ce6853c89dbe10bf61dac517701b8b3e3af6b97d12a15ed03aa0d5a6e6d0d3fa2697e9284 SHA512 918e4537eacf55d0cce888b1946b13acb6d177906d704c99e0b1cc88a55a2929fbeccef7d3fa61daaf0290a97afec581d23a641bdbfc0c700744422135fbcad6
-EBUILD jq-1.6.0-r1.ebuild 955 BLAKE2B fd62f64d5a75a9cb4ee52c2271f3b648aa01f6462c27a9c820bcb0196909344a854f8a24abe1074da6dfe99e2413186babf3defcc163bc75079626b001dabc51 SHA512 dbf8fc172353e27c82ec3c7ca4318b9d5fa80a40ff24a28f7e396d3cbfc6463ddb6ba5d28425c65ec53a28b1dfcc7e670c2951a157219ed56f2f666e64dc3043
-EBUILD jq-1.7.0.ebuild 990 BLAKE2B 711e2edb85af443dac413db552f59f5dd5d3b350007e2daf0868cc85d2b2717665170b5ca0957c4420313a482ca8c9dfdb2927d93f816211ee054682a7a748be SHA512 e416048c7d21a28406a689a3299fc721c880d29598e32da73b4240168d48ffa46c80e6e9d513a24e5a18f3206c11b40afdc3f6da997907a48a1d4e4d801e698a
+EBUILD jq-1.7.0.ebuild 988 BLAKE2B 732aec086c9dc8a390442383e13c70e1f66e24dfec8fad69bdd84ec019e26ebaf09fa195512fad2b929aaf25e63f6774f5e1513089bc27fb0ec1a6d7213439b3 SHA512 7c923621beb31013ba0517d68d0c13987d3387932e1df9a945049f14bf7fa1d9dcbb53a67a60beb55eef5aeb706352f6ffe866d564d5a9c4648040dcc8c3b159
 MISC metadata.xml 367 BLAKE2B b17eb2d9c460774d98ba18faf8a09d1c9c711433d0dfcff08df4f769411db66fdb2241d12ebc706664cdef98d9dbeb290614446112f53ecede571f77aa085174 SHA512 399b63613673deaef747fd380d6bdc086a4e4b57c5509b15fd6e031ea613ccf59641c95064fc7dbbf61f8d879fe03faf7e8298e4e8792a8a0b7a2bb3225e77c9
diff --git a/dev-python/jq/jq-1.6.0-r1.ebuild b/dev-python/jq/jq-1.6.0-r1.ebuild
deleted file mode 100644
index 28c6e6e21da8..000000000000
--- a/dev-python/jq/jq-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-MY_P="jq.py-${PV}"
-DESCRIPTION="Python bindings for jq"
-HOMEPAGE="
-	https://github.com/mwilliamson/jq.py/
-	https://pypi.org/project/jq/
-"
-SRC_URI="
-	https://github.com/mwilliamson/jq.py/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# Minimum versions of jq + onigurama are from setup.py's bundled versions
-RDEPEND="
-	>=app-misc/jq-1.7:=
-	>=dev-libs/oniguruma-6.9.8:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	local -x JQPY_USE_SYSTEM_LIBS=1
-
-	# Cython compilation isn't part of setup.py, so do it manually
-	"${EPYTHON}" -m cython -3 jq.pyx -o jq.c || die
-	distutils-r1_python_compile
-}
diff --git a/dev-python/jq/jq-1.7.0.ebuild b/dev-python/jq/jq-1.7.0.ebuild
index de4242515879..2727438ff8be 100644
--- a/dev-python/jq/jq-1.7.0.ebuild
+++ b/dev-python/jq/jq-1.7.0.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # Minimum versions of jq + onigurama are from setup.py's bundled versions
 DEPEND="
diff --git a/dev-python/meson-python/Manifest b/dev-python/meson-python/Manifest
index 6e9a67b6c351..bf4f4714c34a 100644
--- a/dev-python/meson-python/Manifest
+++ b/dev-python/meson-python/Manifest
@@ -1,3 +1,6 @@
+AUX meson-python-0.16.0-pyproject-metadata-0.8.patch 2372 BLAKE2B 5bd4cde26e7d814699a2757b319817273e6d19ce456d9c9460ae4d2f224fd0fb329fc3bd5e0eaae076039d9224225f02b22592de149b41ec15c71d371b6e949f SHA512 8ddaf35d35966a4f89da4fe123a4985fff296c303a3fbaf7fb849ac4a3f00f72817f5f7e29b0ac2e103ac9163cc2752736fd0a7ebfb86362151653d5a91e4d26
 DIST meson-python-0.15.0.gh.tar.gz 73063 BLAKE2B 280c01b08fb8264d268797d199b59f7d02cac88e49333de4a38f9e22a1e724586b7ffcddc4e9a411c0d660560892134cb742136334aad8caacd9db37580fce8f SHA512 f1fce89bb0a3d279b9900c4ecec78e5f24da92d72f64ebf6c27648b4201a75a65204c3fac08aaa3e8d70dbeef245c3235e39994c7c0b9cba27c0df528211c7f7
+DIST meson-python-0.16.0.gh.tar.gz 74975 BLAKE2B af74d62a4567bc0a7524e815f1bb4ef3ae7290ccea38c00c3b0013f5e7777d6a41c1631b0c1d83fdd930836599752e3bba3c381c137d275103409a986df4e040 SHA512 99ea4304f15e2e13adf031e7c8cacbbc48c0c80f42a81f9d84242b6279ac9c1a13e3f162be5f472a1e498dc7cf3cba6799bf765b3fd441ac10cd87dc0db38678
 EBUILD meson-python-0.15.0.ebuild 1639 BLAKE2B 43147a7bf0595caa174fb7f2c6483165251e4dba06487cedb74a3c87d2375dbb41963a4f3ad33a29855292de4f6e0189885dc885c0753f0e0835c392b83b3f58 SHA512 87fa67dd47f3bf80002a6d1e5b030838e962df055b23e7b41fa77ed8cd52f41333cbe2386c1177efaa449929f353b70f31cd2fe4bed90eebadbb2e2fcc26bdbd
+EBUILD meson-python-0.16.0.ebuild 1214 BLAKE2B c52a37395e661b6739cb66254a00c3c2752cc8408643b1619c48fca01c0257d1a605e0b848313aad8a6a67ea2cda23c8fa0064a2f9bed88c3c654d645a32187d SHA512 a77ec229bea71fb6bbda314e8f08bb1d4c88434f2834b1a021f26877fe8c8c297c3b751d9aee4b25bcafe69fbc32e9a835e2cbcd43ca2e99611a919eff62fb9c
 MISC metadata.xml 357 BLAKE2B c2b5fd8c6ad39e92970a5e6c1db8950b4850660c9a95a84063504ab75e5dd69e3ab844fcef23cb51f33493b7e522a6d26227ff48dd893c92c422badc70f3c962 SHA512 1402ace4da543de7320a1d97f44177593807d5be9f1891d8a53190581877569508c46fe6b4ce63516c7fee2d2165d59d39f44343dde18438570883da3f4ad28c
diff --git a/dev-python/meson-python/files/meson-python-0.16.0-pyproject-metadata-0.8.patch b/dev-python/meson-python/files/meson-python-0.16.0-pyproject-metadata-0.8.patch
new file mode 100644
index 000000000000..834aed4d2fb4
--- /dev/null
+++ b/dev-python/meson-python/files/meson-python-0.16.0-pyproject-metadata-0.8.patch
@@ -0,0 +1,68 @@
+From ba14bfdffceb571a5e8c1406c76b7b77634bcb7f Mon Sep 17 00:00:00 2001
+From: Daniele Nicolodi <daniele@grinta.net>
+Date: Mon, 15 Apr 2024 22:34:36 +0200
+Subject: [PATCH 2/2] TST: Adapt to changes in pyproject-metadata 0.8.0
+
+---
+ tests/test_metadata.py | 8 +++++++-
+ tests/test_sdist.py    | 9 +++++++--
+ 2 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/tests/test_metadata.py b/tests/test_metadata.py
+index 0c278da6..088e82f7 100644
+--- a/tests/test_metadata.py
++++ b/tests/test_metadata.py
+@@ -3,6 +3,7 @@
+ # SPDX-License-Identifier: MIT
+ 
+ import pathlib
++import re
+ 
+ import packaging.version
+ import pyproject_metadata
+@@ -48,5 +49,10 @@ def test_missing_version(package_missing_version):
+     pyproject = {'project': {
+         'name': 'missing-version',
+     }}
+-    with pytest.raises(pyproject_metadata.ConfigurationError, match='Required "project.version" field is missing'):
++    match = '|'.join((
++        re.escape('Required "project.version" field is missing'),
++        # pyproject-metatadata 0.8.0 and later
++        re.escape('Field "project.version" missing and "version" not specified in "project.dynamic"'),
++    ))
++    with pytest.raises(pyproject_metadata.ConfigurationError, match=match):
+         Metadata.from_pyproject(pyproject, pathlib.Path())
+diff --git a/tests/test_sdist.py b/tests/test_sdist.py
+index 6e337617..fb698b53 100644
+--- a/tests/test_sdist.py
++++ b/tests/test_sdist.py
+@@ -3,6 +3,7 @@
+ # SPDX-License-Identifier: MIT
+ 
+ import os
++import re
+ import stat
+ import sys
+ import tarfile
+@@ -30,7 +31,7 @@ def test_pep621(sdist_full_metadata):
+     with tarfile.open(sdist_full_metadata, 'r:gz') as sdist:
+         sdist_pkg_info = sdist.extractfile('full_metadata-1.2.3/PKG-INFO').read().decode()
+ 
+-    assert sdist_pkg_info == textwrap.dedent('''\
++    metadata = re.escape(textwrap.dedent('''\
+         Metadata-Version: 2.1
+         Name: full-metadata
+         Version: 1.2.3
+@@ -65,7 +66,11 @@ def test_pep621(sdist_full_metadata):
+         # full-metadata
+ 
+         An example package with all of the PEP 621 metadata!
+-    ''')
++    '''))
++
++    # pyproject-metadata 0.8.0 and later uses a comma to separate keywords
++    expr = metadata.replace(r'Keywords:\ full\ metadata', r'Keywords:\ full[ ,]metadata')
++    assert re.fullmatch(expr, sdist_pkg_info)
+ 
+ 
+ def test_dynamic_version(sdist_dynamic_version):
diff --git a/dev-python/meson-python/meson-python-0.16.0.ebuild b/dev-python/meson-python/meson-python-0.16.0.ebuild
new file mode 100644
index 000000000000..f75822a30233
--- /dev/null
+++ b/dev-python/meson-python/meson-python-0.16.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Meson PEP 517 Python build backend"
+HOMEPAGE="
+	https://pypi.org/project/meson-python/
+	https://github.com/mesonbuild/meson-python/
+"
+SRC_URI="
+	https://github.com/mesonbuild/meson-python/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+
+RDEPEND="
+	>=dev-python/pyproject-metadata-0.7.1[${PYTHON_USEDEP}]
+	>=dev-build/meson-0.63.0[${PYTHON_USEDEP}]
+	!kernel_Darwin? ( dev-util/patchelf )
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	>=dev-python/cython-0.29.34[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/mesonbuild/meson-python/pull/612
+	"${FILESDIR}/${P}-pyproject-metadata-0.8.patch"
+)
+
+python_test() {
+	unset NINJA
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_mock
+}
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index fab9502b87f0..6bcb99726e21 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,3 +1,5 @@
 DIST notebook-7.1.2.tar.gz 4897634 BLAKE2B c505534f847e58ae40b942a2a4da5105ab60cc81de87d97dd685f63db93af453fcc091d9d488ce73be690e76f5a94497c2bfcc318afbf233440b231eeb8c02e5 SHA512 0319f96d656dab8dd581207b1b396252025618041f5c33c6c36fd66bcb10e3f678869705fcdaa667eea2d9778d969db56e366e6ea260122167903ce372aee3ea
+DIST notebook-7.1.3.tar.gz 4897695 BLAKE2B ed43c72cf9cc3a9c96e71aa62a2079f2fcd7f6eed3469794a78673eeb0afb8bf2cabd3c3f1f9cfed7270ff02d78c6ba10cbc3785cfac82cac5083b8c8194cfc7 SHA512 596a35b718c222f960023f31c9a3c85661622d7aaa901abb81569dc465cfaf5aba137caa1c046b7b18d5e6b5ed59e0bc3849b03e74c3e45f7344adcfdb95f594
 EBUILD notebook-7.1.2.ebuild 1651 BLAKE2B fa84c8c7b0b795853da53a4d9745db7153931a0af0e57a0d9f238c14fcab2355e13a915e602ec10e10c4854f362047cf7316b4193f0b21defda84a502bcce5f1 SHA512 1398c00487da08b7ac516836c198f45349b136e44efd253f59edb544cc6fa5cca77f95d18cc6fb5e82d407a5b9af60e4a820710cf0d95c0b399fb23219f7bc3c
+EBUILD notebook-7.1.3.ebuild 1656 BLAKE2B ae6459fbe449eaaee529d387770c69371a049c4a961ff461bc5ca66059b63853a9e8ab06a01ce5f38cc0577468128c4f315ffce51a1a285cd8f2abd318795aeb SHA512 89c32d7bbb909a8f4ce5a44142cba4ace59f0980b456819d1bec310d30b6dcd891203d71426a0d3271d65f894f7b9c4432c9ad8b2b651c351a008b0043271675
 MISC metadata.xml 525 BLAKE2B 03602bbd7c6b55aaa4c4d6011a91127090359079ed2d7e6b9e3cefe63b2b249b36cd172a40d1ce69234de2440d9248e933dd94a636b95c07f06a658ecb929227 SHA512 18f6bd5cb4b1c90cc228a5ee506cea17c4aa9d60174e00c7cb4df654d5d7158aa20ea6346bf9a0734877402a0e0916aa7f9e82f0bdce0cca78c877c5e87550e3
diff --git a/dev-python/notebook/notebook-7.1.3.ebuild b/dev-python/notebook/notebook-7.1.3.ebuild
new file mode 100644
index 000000000000..31ad57353c3d
--- /dev/null
+++ b/dev-python/notebook/notebook-7.1.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi xdg-utils
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/notebook/
+	https://pypi.org/project/notebook/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
+	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
+	>=dev-python/jupyterlab-4.1.1[${PYTHON_USEDEP}]
+	<dev-python/jupyterlab-4.2[${PYTHON_USEDEP}]
+	>=dev-python/jupyterlab-server-2.22.1[${PYTHON_USEDEP}]
+	<dev-python/jupyterlab-server-3[${PYTHON_USEDEP}]
+	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
+	<dev-python/notebook-shim-0.3[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.2.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/nbval[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index 61bdf24b0aa8..5a35544fc8f4 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,3 +1,5 @@
 DIST openstacksdk-3.0.0.tar.gz 1214285 BLAKE2B f28526732c624ed1417196ea15caecce434a6ec22f716349a3c2df7359fc478302723b4be24db10d502fa153ab7e7ec7d67238efecb98736927cfec4760c9f97 SHA512 33cc81b05a682503add54094da2cd96552c492181c6ea66fe85c5c6f04a98cb2ebaf1234defad95c14861e5dfff11bfa35a4084c4135241c10d719cd61ecb9c9
+DIST openstacksdk-3.1.0.tar.gz 1215965 BLAKE2B 6bf5c3f85dcc2a027af10b675f7a3c7f7cf82bccc20558c0e094def02ff07fca4952ed71240bdf29600c3ef077575c49dce0dccb1683539bef756897813f4d1a SHA512 97ef0610115e1f1534900a6003d699028c6b331af0ef95fadb27babf0bf1467a304a3cc935f07270bf597053e2536e74de79333f67d116cf0b18583a3c8db878
 EBUILD openstacksdk-3.0.0.ebuild 2901 BLAKE2B bfc47df29ed31496779cc5034196b25c93938fe1f0432e86b27f957c650c9d172b688ecc3edd7ca986b55a5fea222d9269619c64e0a4b8eea82832d6ce456bb5 SHA512 e47d8b36d9bf43b76fbd5a2d9ad973118e9bdff20f3d8c9ac4b1d69bcd77ff06e91169a9c6d25d8fcbb1f337325cc21b07947254d3a604adb940c79006591687
+EBUILD openstacksdk-3.1.0.ebuild 2904 BLAKE2B e1d1fb4842f1431eea9a7a65a533a210cbcf8deafe932c7fd942731393a08ff09092784804c23d9bd0fd22a43aa472febab6f2c6aa5c4e26ff6364a9316f8592 SHA512 b9c948cfa0ef63082308153a956fd3d96328307979b747be36a198b301a538573fc306919a7c7afa403e3bcca268787cc8afd90894ff4c38980d1d1abf8818d8
 MISC metadata.xml 517 BLAKE2B 661ad1e9eae06e7b36a5ff753e73bd4434042966cff3fd6fbc11bf70a1acc3eb8de29ad2a033d6d715e1152a5454d84077e99db3b588199b317f925864dc1403 SHA512 e6dbfbb3546c2a62b204b33ebb3bb33611079698212f098bd4da072200fe43e3bb350cc998b255ec4a15aa2ff3a04c89a9553dd7930db48e658dbcaff78526d6
diff --git a/dev-python/openstacksdk/openstacksdk-3.1.0.ebuild b/dev-python/openstacksdk/openstacksdk-3.1.0.ebuild
new file mode 100644
index 000000000000..010c1c968e8f
--- /dev/null
+++ b/dev-python/openstacksdk/openstacksdk-3.1.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A collection of libraries for building applications to work with OpenStack"
+HOMEPAGE="
+	https://opendev.org/openstack/openstacksdk/
+	https://github.com/openstack/openstacksdk/
+	https://pypi.org/project/openstacksdk/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
+	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonpatch-1.21[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth1-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-3[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/prometheus-client-0.4.2[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# Internet?
+	sed -e 's:test_create_dynamic_large_object:_&:' \
+		-i openstack/tests/unit/cloud/test_object.py || die
+
+	# TODO
+	sed -e 's:test_generate_form:_&:' \
+		-e 's:test_create_static_large_object:_&:' \
+		-e 's:test_object_segment_retries:_&:' \
+		-e 's:test_object_segment_retry_failure:_&:' \
+		-e 's:test_slo_manifest_retry:_&:' \
+		-i openstack/tests/unit/cloud/test_object.py || die
+	sed -e 's:test_servers:_&:' \
+		-i openstack/tests/unit/test_stats.py || die
+
+	# unhappy about paths due to test runner
+	sed -e 's:test_method_not_supported:_&:' \
+		-i openstack/tests/unit/test_exceptions.py || die
+	sed -e 's:test_repr:_&:' \
+		-i openstack/tests/unit/test_resource.py || die
+
+	# requires hacking
+	rm openstack/tests/unit/test_hacking.py || die
+
+	# fragile warning-based tests
+	sed -e 's:test_unsupported_version_override:_&:' \
+		-i openstack/tests/unit/test_missing_version.py || die
+	sed -e 's:test_create_unknown_proxy:_&:' \
+		-i openstack/tests/unit/test_connection.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest -b openstack/tests/unit
+}
diff --git a/dev-python/pdm-backend/Manifest b/dev-python/pdm-backend/Manifest
index debb00419b49..462b24338685 100644
--- a/dev-python/pdm-backend/Manifest
+++ b/dev-python/pdm-backend/Manifest
@@ -1,5 +1,7 @@
 DIST pdm-backend-2.1.8.gh.tar.gz 134738 BLAKE2B 5baf6db7193f27de5aa89e41852c714de7d2aa7fd9f75de9b1f1ebd455052bc9d9d47d95dbbed3436e9e9dae79c9a1d0ec54d71a4437036869de38aa035f0642 SHA512 975dad24d128a01b5484f62aece3b209eb3dddf3800c75e422ed1dd0d4cbe15ce60a155d6ed0cec4104eef47cad822e56a2379c877e3f5c8c719dfa86d8800c7
 DIST pdm-backend-2.2.0.gh.tar.gz 135965 BLAKE2B 7e4bfd68fb882caf91c0d7fe4164de9cb37b31ca158b25398a9c129edae42ad8a8ee811fd6819bda861b1412a44ea6c88b2b806b92b2a7bfaf531e947461be58 SHA512 8126b15852c25c27a70f6c39f9067b8617226648578f270c08f8030c2a9c181eb1a9162e17dc9d57a90268c2aad3f02120eb47bc8df674de1060e9de30a05e12
+DIST pdm-backend-2.2.1.gh.tar.gz 136401 BLAKE2B 4d761a689f8e3ff5e5cb300d4a2aa76a3ebd7663e0fa34a5d4a1b7ad26ada07e2d8c128b66549cafaa2d86f714db20b925dd4081226c87ecb8e09c4ee7f1c6dd SHA512 f10048492e33fcf68b94cd24e4e5091b54adb7a848dbf2160b5a8a88e3aac2af8c15a421e4dda8ed14eb9d8e4d6830c5aaace3ec67038786f11d2c37f51ae607
 EBUILD pdm-backend-2.1.8.ebuild 1589 BLAKE2B 32a86540ddc7c3fdae2465e325ee4b3c76fff187fe401765b8fa096a5d264cfd77e29a8a15a225cb2268b0a6bf9c72970d7a82e636c161f383313cb2917b824d SHA512 07759c7b17ccdd173a1e28ed58e8ca4b96d75714f9f26fd85a622d0082212a9f1694a4423c3f342a903c4d7b724c816890c2585093c013f66730f0a65c73131a
 EBUILD pdm-backend-2.2.0.ebuild 1642 BLAKE2B 1317e1691a45118b5ab12fbb5a26e9a59d2282b7be8b93bfe45e60d06a90450e3acd7acb716da8505f13fc552ca80f64d8a7603762ab6989cfd4f42eb759f36a SHA512 780fdb3a737e3f705e51d5fc3bafa0d65ce09fd2aeb89b2e0ae96837ae34b6de2286c95e8683fa0af7182c3503d1c0beb4fd017ce6322e43edcde2a7dde1be52
+EBUILD pdm-backend-2.2.1.ebuild 1638 BLAKE2B 54a745a16a36ad3a725f1fe2a6a451f344fd98057999117143605d8d737d0a54d156808fdd816893da698173ab20ba57d3587e3504061918738f0a3485838d87 SHA512 f758b381494dc38921b53d74e508e66d68e30a1e0e540e11cc8a5741aac9b8ad4c24859d5c8bdd0733b4a4cf7d5e3ea1a67903bc121848a9ca282d315730bc67
 MISC metadata.xml 402 BLAKE2B ac579efc6fd41e67d00ccbba4831c85eed6f5e4341b17533f60c95b666d8a457a5ed683440028c876b8d638fff59af97c5087612b7817dd1a9bd8b9f74cdda0a SHA512 77766986547445c26c7de4bd1d4fb495f8c22e1844fd5b4835b1cabc4aa503a36eae84460e4fceca2f71a87d5f4fc83593b33fda9ae8cafd75f74618d60476cd
diff --git a/dev-python/pdm-backend/pdm-backend-2.2.1.ebuild b/dev-python/pdm-backend/pdm-backend-2.2.1.ebuild
new file mode 100644
index 000000000000..6acf66b19a87
--- /dev/null
+++ b/dev-python/pdm-backend/pdm-backend-2.2.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A PEP 517 backend for PDM that supports PEP 621 metadata"
+HOMEPAGE="
+	https://pypi.org/project/pdm-backend/
+	https://github.com/pdm-project/pdm-backend/
+"
+SRC_URI="
+	https://github.com/pdm-project/pdm-backend/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# see src/pdm/backend/_vendor/vendor.txt
+RDEPEND="
+	>=dev-python/packaging-24.0[${PYTHON_USEDEP}]
+	>=dev-python/pyproject-metadata-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
+
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+# setuptools are used to build C extensions
+RDEPEND+="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	rm -r src/pdm/backend/_vendor || die
+	find -name '*.py' -exec sed \
+		-e 's:from pdm\.backend\._vendor\.:from :' \
+		-e 's:from pdm\.backend\._vendor ::' \
+		-e 's:import pdm\.backend\._vendor\.:import :' \
+		-i {} + || die
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	# this must not be set during src_test()
+	local -x PDM_BUILD_SCM_VERSION=${PV}
+	distutils-r1_src_compile
+}
+
+src_test() {
+	git config --global user.email "test@example.com" || die
+	git config --global user.name "Test User" || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index 8f917161af32..0b051ac373f3 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,3 +1,7 @@
 DIST peewee-3.17.1.gh.tar.gz 918980 BLAKE2B 192bdb4c8ba40c0d65f8182c4d87b6917d7758a8017977144b3455a0abdc96e6dfc2299cb9dfb967092c2619666816886b2f1fc163ee1e0607fb6ddfb6f2ae75 SHA512 7b3515949f862c96c9509edf2b1e7c8fc4947f3371421c5df8ca066f8456000471b0c2af8b906c9d826ea3bdc187b4e8676299b328160bda91ffd7f5a1b95435
+DIST peewee-3.17.2.gh.tar.gz 926852 BLAKE2B e40b049858f693d558e15c63d5bd4d7ad7978769d620f5e744df73d412f6d210c4f3bfa3c99cda9484730a3818e9ac0332131ecdc37224fdeb0ebb22100bfd21 SHA512 eaf495523170400e97416a4c3c6632f722648224f45aeba4ecc486e502324c4947fc0422acb0ba2bc8941c58b2ea920c5f48778e9d9af77aaf795035785dea01
+DIST peewee-3.17.3.gh.tar.gz 926892 BLAKE2B e5d378da37f7fda74c75d3c3998e3fae79e9b8c7d66ca5a17e76a7b855c9d7ae159b4eedb97f68c9ec13cf00f2268f425b36273e7b09fbd001364e748d13bc95 SHA512 d7d0c716c1b6600275c151894ea8738c3393e554627ae4d8cf0d52548be99cfaf31e5553f51762cedc7f9e66a779ddef60d305a3797e3db71ac1a2178bb45468
 EBUILD peewee-3.17.1.ebuild 1043 BLAKE2B df4d0a91b426ce84a7a8bb0bf5572a4d27797a3615b517b2e980b00bbb8ec80921e0f6d9709b629535d7e8091aeef8d9c07ad0955536c474ae4671bc46dab352 SHA512 be4d9e39ab2392aba00533379cdb035ea7f4c55a3cf0c2e874ea9b14874869d39e5e06c940e07a23765de8ae5f425e2de41640b34f0607025b4813dd5204a0f7
+EBUILD peewee-3.17.2.ebuild 1363 BLAKE2B 4aec4e63c18a05176508301480377e29be4ef47c1c5406a60dc44c9b28e3d6ff647bf88b5428a5e00aaf82c76f73e01af5fba74699800dd7d96ad22769a4ce4d SHA512 9a9bfbaefcaf5522e94da73573c34456b65cc1d9fd99b273be7f063b2a72caaacd7aeb9d956e2a4c0a7dba5e27c61a6487da116c8ba31a56d5b8be3bf395c622
+EBUILD peewee-3.17.3.ebuild 1363 BLAKE2B 4aec4e63c18a05176508301480377e29be4ef47c1c5406a60dc44c9b28e3d6ff647bf88b5428a5e00aaf82c76f73e01af5fba74699800dd7d96ad22769a4ce4d SHA512 9a9bfbaefcaf5522e94da73573c34456b65cc1d9fd99b273be7f063b2a72caaacd7aeb9d956e2a4c0a7dba5e27c61a6487da116c8ba31a56d5b8be3bf395c622
 MISC metadata.xml 493 BLAKE2B 60dbc97d8a2acf239b6ae84ae48153ec7985399ef588de5fd3d5e06db137353ba8440eeb811fe90edb66aef70550c514c23f53cf8ee2c5e8146504dae71cef19 SHA512 28227e81ad41534f8dc80dc478cb72e116aa3d5259bb91dd20121fcadd803a04715a986e21d4302a0c8129a4fcafbd71645636b0e5b3384a661f3ee93d41fde2
diff --git a/dev-python/peewee/peewee-3.17.2.ebuild b/dev-python/peewee/peewee-3.17.2.ebuild
new file mode 100644
index 000000000000..1db76107559a
--- /dev/null
+++ b/dev-python/peewee/peewee-3.17.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Small Python ORM"
+HOMEPAGE="
+	https://github.com/coleifer/peewee/
+	https://pypi.org/project/peewee/
+"
+SRC_URI="
+	https://github.com/coleifer/peewee/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="examples +native-extensions test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	native-extensions? ( dev-db/sqlite:3= )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-db/postgresql
+		dev-python/psycopg:0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme
+
+src_compile() {
+	if ! use native-extensions; then
+		local -x NO_SQLITE=1
+	fi
+
+	distutils-r1_src_compile
+}
+
+src_test() {
+	initdb -D "${T}"/pgsql || die
+	pg_ctl -w -D "${T}"/pgsql start -o "-h '' -k '${T}'" || die
+	createdb -h "${T}" peewee_test || die
+
+	local -x PEEWEE_PSQL_HOST="${T}"
+	distutils-r1_src_test
+
+	pg_ctl -w -D "${T}"/pgsql stop || die
+}
+
+python_test() {
+	"${EPYTHON}" runtests.py -v 2 || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && DOCS=( examples/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/peewee/peewee-3.17.3.ebuild b/dev-python/peewee/peewee-3.17.3.ebuild
new file mode 100644
index 000000000000..1db76107559a
--- /dev/null
+++ b/dev-python/peewee/peewee-3.17.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Small Python ORM"
+HOMEPAGE="
+	https://github.com/coleifer/peewee/
+	https://pypi.org/project/peewee/
+"
+SRC_URI="
+	https://github.com/coleifer/peewee/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="examples +native-extensions test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	native-extensions? ( dev-db/sqlite:3= )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-db/postgresql
+		dev-python/psycopg:0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme
+
+src_compile() {
+	if ! use native-extensions; then
+		local -x NO_SQLITE=1
+	fi
+
+	distutils-r1_src_compile
+}
+
+src_test() {
+	initdb -D "${T}"/pgsql || die
+	pg_ctl -w -D "${T}"/pgsql start -o "-h '' -k '${T}'" || die
+	createdb -h "${T}" peewee_test || die
+
+	local -x PEEWEE_PSQL_HOST="${T}"
+	distutils-r1_src_test
+
+	pg_ctl -w -D "${T}"/pgsql stop || die
+}
+
+python_test() {
+	"${EPYTHON}" runtests.py -v 2 || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && DOCS=( examples/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/plotly/Manifest b/dev-python/plotly/Manifest
index baae9b2322cd..0e35552c3acd 100644
--- a/dev-python/plotly/Manifest
+++ b/dev-python/plotly/Manifest
@@ -1,6 +1,8 @@
 AUX plotly-5.8.0-fix-versioneer-import.patch 541 BLAKE2B 51ff6cbab8d9124243445f758aa4b976b7c26e1d3ce633e943bff133b81c0a7587feeb9d5e98a63f319c6afed8dc06e06fafe765ffd51fec245215c849fb4955 SHA512 db4743e538dddfe66e4c9c766698844af4d09c68188afefe92b6419adfe7cc0b1e9c1266d702d590b0b8dfc14bffbc8f08262ead0bff4dae3b5c71fa1259a4b9
 DIST plotly.py-5.19.0.gh.tar.gz 30892237 BLAKE2B ef93c54bdc40a5f25448a7e68dc40b3642c8be60945edc39e3e590eb97973896cb0df54cd8ea9928a2553d50de1bf17997b41947711baaedce075e31709581ce SHA512 a97f5d130fd56b49087e7b10c34cfe2aa21f00afd1f252215f7cec2215d9031f5f6204a6445ea7a69d7aed0c6838b3d76f981c076af93fa9406ff37a0020e4e7
 DIST plotly.py-5.20.0.gh.tar.gz 30896587 BLAKE2B ef8deee791b8fdc94dcd3dae1189fc04569d9156593f13bd44715bc4f7b2846642eab19a1bb6084647ed15b1c961ffb207f19369f94cbba3e999e970c0b7cfe7 SHA512 db73334bf32fcd54f717aa0e04378278045fabba3824d645e4e289cfd559655141f350624196d8e55d988befc27a4a64d741b11a84925969aadc720c6c15bee3
+DIST plotly.py-5.21.0.gh.tar.gz 30912188 BLAKE2B 2c193cad821a94a58d3c72ade06f8cc752d7490290a9abd44733ca80c38fcf1af94af0d5f76b80f1542e959dd2d8fa02752cebf8aa9ea28abd1a568073683c14 SHA512 38841fae844452550004fd22126c12c19fa65dae8985e8449eb5ff5be53dcb04a20658afc13a675c6086db2c623e0902e4138cd28f3b4c9d0a9a0013c1465c13
 EBUILD plotly-5.19.0.ebuild 3388 BLAKE2B af70d758c974e10af6b52cfb299d00dab3c05f2a8614050231686916ce4b6943803aec8bc379169a5f4a10923328610c2c8226989a409c5bfed907c9a3a1cf33 SHA512 0d9d8eaa17c176663a4a46311e04f7831c85efe7134e52f98434231fa4ae823e72400893eae10b059aad9bab9bc7a6f9f4194b9b809d205c1efde39f8b26d0ee
 EBUILD plotly-5.20.0.ebuild 3388 BLAKE2B af70d758c974e10af6b52cfb299d00dab3c05f2a8614050231686916ce4b6943803aec8bc379169a5f4a10923328610c2c8226989a409c5bfed907c9a3a1cf33 SHA512 0d9d8eaa17c176663a4a46311e04f7831c85efe7134e52f98434231fa4ae823e72400893eae10b059aad9bab9bc7a6f9f4194b9b809d205c1efde39f8b26d0ee
+EBUILD plotly-5.21.0.ebuild 3388 BLAKE2B af70d758c974e10af6b52cfb299d00dab3c05f2a8614050231686916ce4b6943803aec8bc379169a5f4a10923328610c2c8226989a409c5bfed907c9a3a1cf33 SHA512 0d9d8eaa17c176663a4a46311e04f7831c85efe7134e52f98434231fa4ae823e72400893eae10b059aad9bab9bc7a6f9f4194b9b809d205c1efde39f8b26d0ee
 MISC metadata.xml 627 BLAKE2B 453adb04f4caba9790fe5223635245c8bca7ca5c6dc1930f09537045580b88b5fa1649e47158b13be6cc5cb09b4479a47690e37ef13208b47a95f82d14793a91 SHA512 a5183e9d217d1312e8d383ccb4ade66b92575492b6c8ed8987e3af18e9e456836b62b2d572ce62f9e01aae47b4a2bcbd12f79b4bb6acabfe69c2b63b20315bd3
diff --git a/dev-python/plotly/plotly-5.21.0.ebuild b/dev-python/plotly/plotly-5.21.0.ebuild
new file mode 100644
index 000000000000..2907cb22ae91
--- /dev/null
+++ b/dev-python/plotly/plotly-5.21.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+MY_P=plotly.py-${PV}
+DESCRIPTION="Browser-based graphing library for Python"
+HOMEPAGE="
+	https://plotly.com/python/
+	https://github.com/plotly/plotly.py/
+	https://pypi.org/project/plotly/
+"
+SRC_URI="
+	https://github.com/plotly/plotly.py/archive/refs/tags/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/packages/python/plotly"
+# The tests are not included in the PyPI tarball, to use the GitHub tarball
+# we have to skip npm, which means that the resulting install will
+# unfortunately lack the jupyterlab extension.
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-6.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/jupyter[${PYTHON_USEDEP}]
+		dev-python/jupyterlab[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/shapely[${PYTHON_USEDEP}]
+		dev-python/statsmodels[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+		dev-python/scikit-image[${PYTHON_USEDEP}]
+	)
+"
+
+# README ends up a broken symlink
+DOCS=()
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.8.0-fix-versioneer-import.patch
+)
+
+EPYTEST_IGNORE=(
+	# Needs porting to newer numpy
+	_plotly_utils/tests/validators/test_integer_validator.py
+
+	# kaleido not packaged
+	plotly/tests/test_optional/test_kaleido
+
+	# plotly-orca not packaged
+	plotly/tests/test_orca
+)
+
+EPYTEST_DESELECT=(
+	# Also needs porting to newer numpy
+	plotly/tests/test_io/test_to_from_plotly_json.py::test_object_numpy_encoding
+
+	# kaleido not packaged
+	plotly/tests/test_orca/test_to_image.py::test_bytesio
+
+	# Fails if not already installed
+	test_init/test_dependencies_not_imported.py::test_dependencies_not_imported
+	test_init/test_lazy_imports.py::test_lazy_imports
+
+	# Minor matplotlib incompatibility
+	plotly/matplotlylib/mplexporter/tests/test_basic.py::test_path_collection
+	plotly/matplotlylib/mplexporter/tests/test_basic.py::test_legend_dots
+	plotly/matplotlylib/mplexporter/tests/test_utils.py::test_linestyle
+
+	# In python 3.11 the produced error is slightly different
+	plotly/tests/test_core/test_errors/test_dict_path_errors.py::test_described_subscript_error_on_type_error
+
+	# TODO
+	plotly/tests/test_io/test_to_from_plotly_json.py
+
+	# two subtests that require 'vaex' and 'polars' respectively
+	plotly/tests/test_optional/test_px/test_px_input.py::test_build_df_from_vaex_and_polars
+	plotly/tests/test_optional/test_px/test_px_input.py::test_build_df_with_hover_data_from_vaex_and_polars
+)
+
+# There are sphinx docs but we are missing a bunch of dependencies.
+# distutils_enable_sphinx ../../../doc/apidoc
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Do not try to fetch stuff with npm
+	export SKIP_NPM=1
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	mv "${ED}"/{usr/etc,etc} || die
+}
diff --git a/dev-python/ply/Manifest b/dev-python/ply/Manifest
index 38a74e376111..dda45edf52f3 100644
--- a/dev-python/ply/Manifest
+++ b/dev-python/ply/Manifest
@@ -2,4 +2,4 @@ AUX 3.6-picklefile-IOError.patch 681 BLAKE2B 2aacef3639c9ec920d6cfc5e56ead129234
 DIST ply-3.11-py3.12-assert.patch.xz 3832 BLAKE2B 5872a2f6c71ee093dfcb12a3a9b80c54091ba2a3d331948ccd88918fd263569a413e87962c607368f23f79abefd0f98738f1e1a33413832983ff3057c1ea021b SHA512 bc145cef28a0947773ee13df4a86fd60b04ebe8a06e563059a32eff55475f54bb99fb7cf7ef73c463d92b8795013b7c9f1aebcdf5a6c4f98d71675710f496b97
 DIST ply-3.11.tar.gz 159130 BLAKE2B 58c50b9dad445ad83a64aaa8174ed4602b36f5c8df33a7d62590a92388c4a21c9800599c1d4e4db6f02630e8dee4c8482611e26498e4aa8ccdb2cf3453ae1db4 SHA512 37e39a4f930874933223be58a3da7f259e155b75135f1edd47069b3b40e5e96af883ebf1c8a1bbd32f914a9e92cfc12e29fec05cf61b518f46c1d37421b20008
 EBUILD ply-3.11-r2.ebuild 1187 BLAKE2B 12fbf3f0804f208a8c3ab4213d3acd130d058ef75addd46eb42314e45ea8a7da2299869c7ffe94094a42442737ef88a8e08604ef2d378d2bb96db3d89056401d SHA512 3bb37145e9528440a475ea55bce8ac1a5536a1cf6e02284dce9842d59220d238ebd1b8c0c8b4b52ef8c87333cead9a4343343deb90de8587d2b2c2a75a3646c5
-MISC metadata.xml 1443 BLAKE2B 5df93b13433b1ca18c3a92e1af58fd7f05adacfdb9653b237f927c9c9216400171cab22a1cdaea179a7bbced8b069906fc896dcdf738ab3519ba0f359a07a575 SHA512 9938bfb031ca1108d7abec644936def11a1fc7142947c40b95386376ec6b157a73f81a918ffeca4146b524e254a2d9262be1409033cffa991fe4674a20beeda8
+MISC metadata.xml 1493 BLAKE2B 652847939ee8d1c628f6f6e8cdb30468709b851c4e864ab827352d88013a9157e08fb4cdc43dadda0bf50a375ed4a6173bb8bbc541f33affd65b48c8f5829639 SHA512 a59c743981a109b21a038bfdba1c95742ac05f68c6ca50b0e848c817fd48683e900391c153f842c06c2af5f26c8fa11b0beb6b4bcbb7096097bc3450ce88bcd5
diff --git a/dev-python/ply/metadata.xml b/dev-python/ply/metadata.xml
index 2a34109ebcf1..5cbef0a9f520 100644
--- a/dev-python/ply/metadata.xml
+++ b/dev-python/ply/metadata.xml
@@ -21,5 +21,6 @@ PLYはLexとYaccの有名なコンパイラ・コンストラクション・ツ�
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">ply</remote-id>
+		<remote-id type="github">dabeaz/ply</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyaml/Manifest b/dev-python/pyaml/Manifest
index 25e1cc70745c..27072f33b3d3 100644
--- a/dev-python/pyaml/Manifest
+++ b/dev-python/pyaml/Manifest
@@ -1,3 +1,5 @@
 DIST pyaml-23.12.0.tar.gz 26308 BLAKE2B 89dad4c3b2a39179389c1b2e5ea6e3d93292c86f7fe5c1b55cc136f9b5a68cf7a86c6fb75a2fe44408738e53615c0062bb72511e605a8713d4381a7dff02f8fa SHA512 f1f03baf2b0a469ffbe7d6eea806cf7623a28c96221bc710873d548d8f416160bf566f44a3a42ca3572085834889e1dd394fc9bdeefe14fe23177b61573df12c
+DIST pyaml-24.4.0.tar.gz 27204 BLAKE2B f0f7c43ffdfd648945bfb20c589ab3e48000ac98a602192ba75fd1a611e12877bbc848f79b070864ac10f59b9c1796d89f35521314e827c5a7951995de86a657 SHA512 d2c1ae1f29f61d210cb822c2c1b3fa3ace81a4b863c7dfec5d75c5418537256828ee54ca545edc9ce30995ba272dfd064f7ed6009dae00910a081ffc0270546e
 EBUILD pyaml-23.12.0.ebuild 600 BLAKE2B 37de342eb95eed8d04de1be1d351fd3725ecc6bd751879bab8b5574c7bd8bbf343b9e84f970425643c1fa633cb052414058f2deb7e1a6b26428a9b458e66f0d1 SHA512 116f78b61ff81d9b6f857f71214a68e8c5182f4216e2f3464cf35f51708040583c320de817e385d12e9b7763b8f9336fccb24dfa094fb34e93459d253d9dd9f4
+EBUILD pyaml-24.4.0.ebuild 604 BLAKE2B a8b8956aeb738f93315bf1f033ae8caaad72a12f213098cdb7e8c2043d78d3b7b6552482ec000b05398c1beb4e6f1c253111e99843544db5fd092696442ec5ff SHA512 3ace4230ebf75d42c7c4ab91374df704a273c413497847043367d482895224f7facd8de8df177104ab63a1a76d170f380edf9f2968bb22b0a10db7ce02910cd8
 MISC metadata.xml 470 BLAKE2B 725657a34cdcbddf146ea3163af81fd22f78b895281e7dc2192b8c1f49fa9ec868e41a38bc371ce61160535ad0c5c1d8741109858cb8e3eafb40a77d623c3ecf SHA512 c64f440d674396b0a750780cbc5ab1a5003be1d3357b39a792cb9490870c768ab740266575cf6780f173252a893f6fa93fe9d4f414647274e520c4bd4b579c67
diff --git a/dev-python/pyaml/pyaml-24.4.0.ebuild b/dev-python/pyaml/pyaml-24.4.0.ebuild
new file mode 100644
index 000000000000..98e353a45699
--- /dev/null
+++ b/dev-python/pyaml/pyaml-24.4.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="PyYAML-based module to produce pretty and readable YAML-serialized data"
+HOMEPAGE="
+	https://github.com/mk-fg/pretty-yaml/
+	https://pypi.org/project/pyaml/
+"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/unidecode[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index a602a08bc388..5657cbc4c022 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,5 +1,5 @@
 DIST pyOpenSSL-24.0.0.tar.gz 183238 BLAKE2B 93c75bd323ceb65945fa57a586403c2166b949ce0d4d158b94dc6c40b49373f63e38b0a2cdf2478ab8f6d5d12feeb261324fa13f06040f91b92fffce408d1071 SHA512 32503eeb8b03d9f7dc580c9a2fbbc009a1498b444d17751253bccf8344897408e6d99043dae01385d00bd56fa5aa7d486a43fdc81b1d14cc59fa372c9e58c4e8
 DIST pyOpenSSL-24.1.0.tar.gz 179671 BLAKE2B d49139e9604e854427005adb17cbc8926fa4e10390b36446f9c95dbe81802bb8b97c2e6f1ea8f91dfd74733631292c88536c4f9772647e6d4b449b4d01ed6355 SHA512 acb07025f085d2fe9338e5ce5f65937001b1a8376c41ac532e9b0548668ce05c844e3e28c58efad812a034becf8e24aa9504165ff6af4c3b085cf463fa4d2fb6
 EBUILD pyopenssl-24.0.0.ebuild 1516 BLAKE2B 2d6900ddd13cb6d1cb1014f993afe0b22189141f7fa30bb438683d0637438cba03c6605f9b724cb5a397920ddde10383d96a1c7351458887b59a79bdd4544b7f SHA512 377f52c56c25e786172bce0539661d947fbb7210130166b3f18f3a6df30f2fabadadcb90e0f299182a7d7f7c4b24fd0f3ccf677ec175681375a967ca1988e4f8
-EBUILD pyopenssl-24.1.0.ebuild 1536 BLAKE2B c802c7345aeff9c93ebb9c672d5a4449e834fa31709d4676113fcf1d499eb62ee33b1fcd50712a12cd876043e92e991c5b07bd1027d989850965e04d15e5f226 SHA512 280eedc7348f6fd29cc2c2934e62f31e106b6366df18877320feb82df80fc216e438e80c7beffc28912abbba8178ce4483add1b25ce87a49a49c63ae08f51c52
+EBUILD pyopenssl-24.1.0.ebuild 1535 BLAKE2B 6e96c1a4646cc9d933f04b1741103c50d09ff57d02e8cbfdc01d8395ed99adfae1c492160512fbf5a6f17fc992b07328903ced77d42a54aebc554a55adc2bd06 SHA512 d454ae203fa1cdc301a3dfeca32409d21db4b342db23f8fbdb1680895dd8f68bc698db8c134f09e49e569e0377e8ab0bf1080947f5c2242aa752af7831b16aab
 MISC metadata.xml 536 BLAKE2B 86db822042b6fb3e965ece87b6b15dcabf76cdfbfa76ba285a491208ad5c6a2a196ca7144a1a73b152decc4df1641ad4c57a1cbde9f90d09d25eef1f6f4da39a SHA512 996d0e20291e744c6c20b38fd750d242920541aca7d92de63ca5b1dcc2f1c10308545797ccf499f38e50dfd04db2bb031e93b02c7c1705908f2363c813294ff1
diff --git a/dev-python/pyopenssl/pyopenssl-24.1.0.ebuild b/dev-python/pyopenssl/pyopenssl-24.1.0.ebuild
index 22abe66ebc2c..0348c6fc65ef 100644
--- a/dev-python/pyopenssl/pyopenssl-24.1.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-24.1.0.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	<dev-python/cryptography-43[${PYTHON_USEDEP}]
diff --git a/dev-python/pyproject-fmt/Manifest b/dev-python/pyproject-fmt/Manifest
index 33956373d267..7ab20b966cfa 100644
--- a/dev-python/pyproject-fmt/Manifest
+++ b/dev-python/pyproject-fmt/Manifest
@@ -1,3 +1,5 @@
 DIST pyproject_fmt-1.7.0.tar.gz 16358 BLAKE2B 944ca460a002caebb98d06588bc89d8cd5c041f7ced200afc9748c6c47f6641dc1e3857cb426c13fc7a1f65738c9d2cbd5d0a575b11e9897be4875d3aff86316 SHA512 f69ade0e9b617a5ccf59b401220cbc95dcae006eb64ff92380ad5f0df598f5f7e8283d96666ffbdd4d2f9acc900923795c2a11496eda8842bcf1d8d1c9113bf8
+DIST pyproject_fmt-1.8.0.tar.gz 16696 BLAKE2B 1614fd6da4bb7be818825138b69b826b7141ae0fcada4414daa54b1c883ec3bbdbe95377155869d0c393b1b9646b69ebb009fe47f1c530b1f1c9f02c8ba8f57d SHA512 0731ffbe514cf8788bf1cfcca506591fefce3b98b1c6d014a8e17825ab6c73edc4ad8e7214cd8f6fc9124ed2ff362d03b328d47e96a6246165b4dd9fdd68299f
 EBUILD pyproject-fmt-1.7.0.ebuild 1037 BLAKE2B 120635fc4b4c78fdb6b15bf12f809ac4995b21cf8b94f2e24aac3de1954e4be196194488d30c1f63dd07f879dac062c01f38cbc64a2a9270692523eaf0fedde4 SHA512 02712a401d49dadcca45255119759a3a86d0eb2bbb01e30c950d223cd4da80f8a6d38327fd0a9f9993785aec0fc8a21e0a8ad83ac567b1ffed39cea4173d4e55
+EBUILD pyproject-fmt-1.8.0.ebuild 1045 BLAKE2B bac8b260411f44e4ea4096216cb1e0e69ad6870b4005a78f2c61b7105f4a06dd051749377b7f656c5a667ffb4997b2fb709c8bec6f7c38e19705cbc802c0b2fa SHA512 5167fd3515cf4067cb2ad533821a21cedc23ba4ddf544096527035ae4260038f33f09cf6fbdcc5c75dc30c4ce7880729c7fcadbeb6b6062257aca5436df87dde
 MISC metadata.xml 380 BLAKE2B f139b3f6c22d40d7c91b9b35db262813e299d1a3c1a1f8d6129e457fac62e3e7029a05315a3bddd9c4542764a33160c89b58b3b62f457efb088a7ae7cd86a936 SHA512 38bd0633defb67ee1831480c8b3896e158d0735ec74057b13b3c389cf26bd6ecb878f21d172f83293789d81ca2c30afedab8eaeb4ab1774b39972fdd5f805a81
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-1.8.0.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-1.8.0.ebuild
new file mode 100644
index 000000000000..876042525ab4
--- /dev/null
+++ b/dev-python/pyproject-fmt/pyproject-fmt-1.8.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Format your pyproject.toml file"
+HOMEPAGE="
+	https://github.com/tox-dev/pyproject-fmt/
+	https://pypi.org/project/pyproject-fmt/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/natsort[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+"
+# tox is called as a subprocess, to get targets from tox.ini
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pytest-mock-3.10[${PYTHON_USEDEP}]
+		dev-python/tox
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# upstream lower bounds are completely meaningless and copying them
+	# to the ebuild is a horrible waste of time
+	sed -i -e 's:>=[0-9.]*::' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pyproject-metadata/Manifest b/dev-python/pyproject-metadata/Manifest
index 42eddef9069f..27c8e74efd01 100644
--- a/dev-python/pyproject-metadata/Manifest
+++ b/dev-python/pyproject-metadata/Manifest
@@ -1,5 +1,9 @@
 DIST pyproject-metadata-0.7.1.gh.tar.gz 14138 BLAKE2B 901e0b0b07d035ee220cfdba840a2b05ec1b1dfa3184ab614621c462b049bdbe484aa2d9abc42a54964c163d360028a00ff1db2c502504d11fb6d2837bd60552 SHA512 a4cb97b6646b765016f047f8d3da388ab758dbf8acf5a8ee6ccb017c764a90c069e04effbef21f878be7f4b01a5090f24252372300ce7e3a0410a6eea5d98b66
+DIST pyproject_metadata-0.8.0.tar.gz 14862 BLAKE2B 03c9a7fc9c53c56b27ea5c72789db10aa045d239c81bf30e926c0ed44d6b61028a27c4dbe02a40eb4ae7ce4a93efb24c63dd4b66f2e98f185fc68d96e96c350a SHA512 e3ec79bcb066fd952a7e88b62534775746b20a52b9952a303e80466c465e394264b8984ca30a1461cd8437334ae7b1a299be7d8036e99e3dcf59828d70650442
 DIST pyproject_metadata-0.8.0rc1.tar.gz 14781 BLAKE2B 38489f2b927ac3e65221be56b76dc8742c366776e26edddb29b7dd3e916d6ff342a6e48ac32a1718aecd81b1661cde8dac2c3f474d0de7780b77808c4927ef23 SHA512 d7280eb3537a6a497f09b75edd1c1fe2be8f1d8e0f7289c880e6b73020e73f1b7a8999e9787d88373dbe553d3b5fca054f06a1fac3651c25100bf83b367ec390
+DIST pyproject_metadata-0.8.0rc2.tar.gz 14865 BLAKE2B cba92b62020ac139f71cb5cec60f50153ce10ff4d3c3d1609a41881dc26036c2b0df51bbd77ed732e820ef42ea03d1a9f0d3d8f299b06cdbdf13ebfbc935eb0f SHA512 7c11f089e6061d7f75dde27ba04695d363f1ed2063e8b11ac508c3b587e76a5b4c50aa4ebbfdf9ab524b75986edb1562ed27526c352eba54c5981e70c165fa0d
 EBUILD pyproject-metadata-0.7.1.ebuild 830 BLAKE2B f02b8c30bede7083a945a26e90db244f46bf4acfdb880b04f6cd270cb6d21098d2bf0243460d2d6619d3c59b56eb430ef5f1050df5051c78cb616efea89fccca SHA512 7d0cdd26062887a0999b6d7a76cf96199500b79ae4664169c5836480eb88022bdde919c30922ebda6389c3ed923c199bc8627cbba05ae3599bc86b4f7e6dbb51
+EBUILD pyproject-metadata-0.8.0.ebuild 699 BLAKE2B 697ff669a5fc4905553a6c6b360ab93d8232382fb6d30477ca61af540cd0df7bc86fe4cc26f2ebadbb942df5e483879d75b7b9f3026b53825ad5b69b8c7f3083 SHA512 3e297ac518a5b3de7aa5f7dd79dd33afafcb7af013633a4d60d4f2d623cef8f042d7c58391198fce1ac658a028b12fa9f3f72a3fea9438ca8acf205f3211d053
 EBUILD pyproject-metadata-0.8.0_rc1.ebuild 699 BLAKE2B 697ff669a5fc4905553a6c6b360ab93d8232382fb6d30477ca61af540cd0df7bc86fe4cc26f2ebadbb942df5e483879d75b7b9f3026b53825ad5b69b8c7f3083 SHA512 3e297ac518a5b3de7aa5f7dd79dd33afafcb7af013633a4d60d4f2d623cef8f042d7c58391198fce1ac658a028b12fa9f3f72a3fea9438ca8acf205f3211d053
+EBUILD pyproject-metadata-0.8.0_rc2.ebuild 699 BLAKE2B 697ff669a5fc4905553a6c6b360ab93d8232382fb6d30477ca61af540cd0df7bc86fe4cc26f2ebadbb942df5e483879d75b7b9f3026b53825ad5b69b8c7f3083 SHA512 3e297ac518a5b3de7aa5f7dd79dd33afafcb7af013633a4d60d4f2d623cef8f042d7c58391198fce1ac658a028b12fa9f3f72a3fea9438ca8acf205f3211d053
 MISC metadata.xml 363 BLAKE2B 839cd97f8677c84c0a8a488467a2919224cf43e0ff4d21f2aa448581167d7136fab5a957e0ac801d0de5a0d10da02b33096dfc14f1b02bf5dcdbd9a0f6db1323 SHA512 ec1fab3e8f72af86fba0ff1aa6a9005ba5100118371a738360e254bf0684dc785b3a38eac4bc40088eda332814a7a95b5cc8127319309780a173138409c2a41e
diff --git a/dev-python/pyproject-metadata/pyproject-metadata-0.8.0.ebuild b/dev-python/pyproject-metadata/pyproject-metadata-0.8.0.ebuild
new file mode 100644
index 000000000000..2115e63ad7e0
--- /dev/null
+++ b/dev-python/pyproject-metadata/pyproject-metadata-0.8.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="PEP 621 metadata parsing"
+HOMEPAGE="
+	https://github.com/pypa/pyproject-metadata/
+	https://pypi.org/project/pyproject-metadata/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+
+RDEPEND="
+	>=dev-python/packaging-19[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
+		' 3.10)
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyproject-metadata/pyproject-metadata-0.8.0_rc2.ebuild b/dev-python/pyproject-metadata/pyproject-metadata-0.8.0_rc2.ebuild
new file mode 100644
index 000000000000..2115e63ad7e0
--- /dev/null
+++ b/dev-python/pyproject-metadata/pyproject-metadata-0.8.0_rc2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="PEP 621 metadata parsing"
+HOMEPAGE="
+	https://github.com/pypa/pyproject-metadata/
+	https://pypi.org/project/pyproject-metadata/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+
+RDEPEND="
+	>=dev-python/packaging-19[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
+		' 3.10)
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyside6-tools/Manifest b/dev-python/pyside6-tools/Manifest
index ed52b7a1960d..c679e704d1ab 100644
--- a/dev-python/pyside6-tools/Manifest
+++ b/dev-python/pyside6-tools/Manifest
@@ -1,5 +1,3 @@
-DIST pyside-setup-everywhere-src-6.6.2.tar.xz 13975896 BLAKE2B b4572e58613e5446692e8c4cef28156fd0126ecda0c6334652ce49c6c7ce4614dbf2400c693addaa38e9b6cca9e331b9fe84c83ddb26e7014b8603afe2c54ad6 SHA512 1d23d27a4cbe74434ec5d391172416d324b4c92181401444821b456b4e27dabbdb3dcaad685a22b62c09f750555a4e626bbb6406a2fbde1cf4ec5c8bbb64cda5
 DIST pyside-setup-everywhere-src-6.7.0.tar.xz 14382456 BLAKE2B 607e496cdeb7e55166b4f0dc15662a8792c7d8925856e8edbb927dfdc33342d158f430e3433d3d4a78ea33740e333fb2422ea1f4332408c3c6214f92d31bdd0d SHA512 7801d564d8d359edec431dc0e6f170538b9fc6f834cb7ab8eff41c1989bffb619c446d4d62d65db2a5b7592c0bff5d450d42de2797726658fe1a8f53df8a4c14
-EBUILD pyside6-tools-6.6.2.ebuild 1769 BLAKE2B e39ab8e2f78185ddda6c105e46a5c83f202d3519650c0f60841f52c4fe0f25f5fab5520902bb65eeab821ad76cd6e44bf65dfff09973202c2ca257933f250cbe SHA512 c03557c98b267a1753956268e810b03116e6b7b017ccaef071a7925a679bbabfa35ec9f25c76dde647c3a14ff2303c276389bf64a40c2311a406b1a934681c34
-EBUILD pyside6-tools-6.7.0.ebuild 1769 BLAKE2B 5f295757abefe2252ad1e68710ff45e5fdd7165f430633789ecd8f77d122d6ea8c58cd6c83accfb05ecfedf74644c561d04d103a82b35f8b7d5ec7d7f629bfb7 SHA512 fd5d96d82dae0fb6a76a4e4428aa3c46513c59bf743943449372f5f8ca5e735154992dece29b032cd4a3d4653a23b4ede1166fc14a8cfcc8745eed9331b4d270
+EBUILD pyside6-tools-6.7.0.ebuild 1768 BLAKE2B 4a94b652a82da7599befdee3cdebb36289686cd8efa983856dbbcfde184dc862d48b9edc2db9acf79f1bf343e63ff7582eb880002ffc3912156bebd5b9d10fac SHA512 28d1ef915e520ff7b2fe635a63b313076d2b8af4ccdd916d064d977d54c05637c1c0d9eb924b3657f2f03cad3abee1780639cb112196404c81c600d24b9c01d2
 MISC metadata.xml 402 BLAKE2B 28348df442d189eadb56e04dfda71c1d5a56868aae85611a7d77ecdc7651e34ce02563c8da1270aad55758e2dd4301de44434e0bbdb010ef484e240068602ede SHA512 a54866110e38c24d67d60286c64b63dc0b537c55eb201b84b9173b47710b6e8a840d9072ca46fbef969bf481e43e1d8824b20655d7fe6b300cfd5333c3f74a41
diff --git a/dev-python/pyside6-tools/pyside6-tools-6.6.2.ebuild b/dev-python/pyside6-tools/pyside6-tools-6.6.2.ebuild
deleted file mode 100644
index e7411d54de28..000000000000
--- a/dev-python/pyside6-tools/pyside6-tools-6.6.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{10..12} )
-
-LLVM_COMPAT=( {15..17} )
-
-inherit cmake llvm-r1 python-r1
-
-MY_PN="pyside-setup-everywhere-src"
-
-DESCRIPTION="PySide development tools (pyside6-lupdate with support for Python)"
-HOMEPAGE="https://wiki.qt.io/PySide6"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_PN}-${PV}.tar.xz"
-S="${WORKDIR}/${MY_PN}-${PV}/sources/pyside-tools"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	~dev-python/shiboken6-${PV}[${PYTHON_USEDEP},${LLVM_USEDEP}]
-	~dev-python/pyside6-${PV}[quick,${PYTHON_USEDEP},${LLVM_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
-		sys-devel/llvm:${LLVM_SLOT}
-	')
-"
-
-src_prepare() {
-	cmake_src_prepare
-
-	python_copy_sources
-}
-
-src_configure() {
-	pyside-tools_configure() {
-		local mycmakeargs=(
-			# If this is enabled cmake just makes copies of /lib64/qt6/bin/*
-			-DNO_QT_TOOLS=yes
-		)
-		cmake_src_configure
-	}
-
-	python_foreach_impl pyside-tools_configure
-}
-
-src_compile() {
-	pyside-tools_compile() {
-		cmake_src_compile
-	}
-
-	python_foreach_impl pyside-tools_compile
-}
-
-src_install() {
-	pyside-tools_install() {
-		# This replicates the contents of the PySide6 pypi wheel
-		DESTDIR="${BUILD_DIR}" cmake_build install
-		cp __init__.py "${BUILD_DIR}/usr/bin" || die
-		rm -r  "${BUILD_DIR}/usr/bin/qtpy2cpp_lib/tests" || die
-		python_moduleinto PySide6/scripts
-		python_domodule "${BUILD_DIR}/usr/bin/."
-	}
-
-	python_foreach_impl pyside-tools_install
-
-	einstalldocs
-}
diff --git a/dev-python/pyside6-tools/pyside6-tools-6.7.0.ebuild b/dev-python/pyside6-tools/pyside6-tools-6.7.0.ebuild
index 397cdc6492c3..252c19d63653 100644
--- a/dev-python/pyside6-tools/pyside6-tools-6.7.0.ebuild
+++ b/dev-python/pyside6-tools/pyside6-tools-6.7.0.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_PN}-${PV}/sources/pyside-tools"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pyside6/Manifest b/dev-python/pyside6/Manifest
index e1eb59628b8e..ee35ac48da11 100644
--- a/dev-python/pyside6/Manifest
+++ b/dev-python/pyside6/Manifest
@@ -1,7 +1,5 @@
 AUX pyside6-6.3.1-no-strip.patch 953 BLAKE2B f88bac603a584213a864fcfc7c528f1d236ebdbfb653c3877316cd0b95c30c2f7288b1c81c6a90a3e4228536da4aa63552991fefa952f450b0b852b3e2aed94a SHA512 2920075a26fc059bdebc8eb5fa7c15de74729b7f8d1eb59197f7426afa7a65f1f78a8ebb76e946b2dfaf5817dbf090744bafaed2f2156f2d1548c2932a7ce61a
 AUX pyside6-6.6.0-no-qtexampleicons.patch 221 BLAKE2B d45b4ebcd780a0151b793b5b21f5d7599ee5c427372ef19f518ac1c94306938178b0bfb603d9755aae9bddc4c31c35bb4648617c793f8e399f0f8dcce0d1f3bb SHA512 1da97be74142402454ef5384c58d2b2a792fea53b4155d7b5ede6d145496b45e4fd56723f8f7716150c2bba448ce816c6740059d7d38ae53d5cdf7c38c4acd7b
-DIST pyside-setup-everywhere-src-6.6.2.tar.xz 13975896 BLAKE2B b4572e58613e5446692e8c4cef28156fd0126ecda0c6334652ce49c6c7ce4614dbf2400c693addaa38e9b6cca9e331b9fe84c83ddb26e7014b8603afe2c54ad6 SHA512 1d23d27a4cbe74434ec5d391172416d324b4c92181401444821b456b4e27dabbdb3dcaad685a22b62c09f750555a4e626bbb6406a2fbde1cf4ec5c8bbb64cda5
 DIST pyside-setup-everywhere-src-6.7.0.tar.xz 14382456 BLAKE2B 607e496cdeb7e55166b4f0dc15662a8792c7d8925856e8edbb927dfdc33342d158f430e3433d3d4a78ea33740e333fb2422ea1f4332408c3c6214f92d31bdd0d SHA512 7801d564d8d359edec431dc0e6f170538b9fc6f834cb7ab8eff41c1989bffb619c446d4d62d65db2a5b7592c0bff5d450d42de2797726658fe1a8f53df8a4c14
-EBUILD pyside6-6.6.2-r1.ebuild 10205 BLAKE2B 7478e09d29a1b506ea81370cbd3ccf8718068824aca2019bf3da3b9f299a9cc231f8e39990e76c331646eec39478cb64da279bc39438e6995a5090479f7fd4e2 SHA512 15d44a498751f0f674ce844d08fcfdfb82ebb4ca56c794996f31e824aed2ae54989cc20781b8780870a630b446e3b3df23afdc9f2b4b999049c015519ff393d9
-EBUILD pyside6-6.7.0.ebuild 10170 BLAKE2B adabcd02d063c0f42801d3b8b2ca88b313231431e5c836f7a54a33ed923efe2efb8e19718b0b9d356d0ee5e30cf9d416ef40790f5c4b464e56c232e87909138d SHA512 e925b05802ef60dcb973d8c95e3faf5ca630e423ab4dd46cf22ec5ce237ab415acd303062c152b1d29ca36b475c46dd3f2ccf2ba551c1caa5ac05fe32eb7030f
+EBUILD pyside6-6.7.0.ebuild 10169 BLAKE2B c87fb84f29ad6004f98971ab6e67cab50368d337ef5aaca034f64c40fda422e7f359d636b9482b1896bb225b0fd540e54fd85ddfd2eec6c0dc3a7e762ac1c1a2 SHA512 c2a22f5f2765521fe5fe9f2e17ac1485dcba0f985e2c89503f558fc75c40e17f7a8a23dfe8b5bd786b0e2177127b6eddaf24913d1eda0d69d1b6fab44be21763
 MISC metadata.xml 2370 BLAKE2B 4135d3d10c96b39c55d9609a096a62a638c2c2e4f15c8b097631baaec111e4c197584f66db8d6151b25404cf51de7b3254c3c853ce6ba0e5c832d4dcb59936f0 SHA512 3ef85f4d14c69cf9fbccd62056e806ac3afbc49ee4ab31652b51bed3582d492d631d2c1370fa59af6ed6a8c32cb337108f9f2bd5dd7feb4a7402a046b9bb0ceb
diff --git a/dev-python/pyside6/pyside6-6.6.2-r1.ebuild b/dev-python/pyside6/pyside6-6.6.2-r1.ebuild
deleted file mode 100644
index 2acf60cc8c25..000000000000
--- a/dev-python/pyside6/pyside6-6.6.2-r1.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{10..12} )
-
-LLVM_COMPAT=( {15..17} )
-
-inherit cmake llvm-r1 python-r1 virtualx
-
-# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects"
-# USE flag after an external "dev-qt/qtremoteobjects" package has been created.
-# TODO: Add conditional support for apidoc generation via a new "doc" USE flag.
-# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once
-# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support.
-# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note
-# that the "PySide6/QtGui/CMakeLists.txt" and
-# "PySide6/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by
-# testing whether the "Qt5::Gui" list property defined by
-# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation
-# time contains the substring "opengles2". Since cmake does not permit
-# properties to be overridden from the command line, these files must instead
-# be conditionally patched to avoid these tests. An issue should be filed with
-# upstream requesting a CLI-settable variable to control this.
-
-MY_PN="pyside-setup-everywhere-src"
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://wiki.qt.io/PySide6"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_PN}-${PV}.tar.xz"
-S="${WORKDIR}/${MY_PN}-${PV}/sources/pyside6"
-
-# See "sources/pyside6/PySide6/licensecomment.txt" for licensing details.
-# Shall we allow essential modules to be disabled? They are:
-# (core), gui, widgets, printsupport, sql, network, testlib, concurrent,
-# x11extras (for X)
-LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="
-	3d bluetooth charts +concurrent +dbus designer gles2-only +gui help location
-	multimedia +network network-auth nfc positioning +opengl pdfium positioning
-	+printsupport qml quick quick3d serialport scxml sensors spatialaudio speech
-	+sql svg test +testlib webchannel webengine	websockets +widgets +xml
-"
-
-# Manually reextract these requirements on version bumps by running the
-# following one-liner from within "${S}":
-#     $ grep 'set.*_deps' PySide6/Qt*/CMakeLists.txt
-# Note that the "designer" USE flag corresponds to the "Qt6UiTools" module.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	3d? ( gui network )
-	charts? ( gui widgets )
-	designer? ( widgets )
-	gles2-only? ( gui )
-	gui? ( dbus opengl )
-	help? ( network sql widgets )
-	location? ( gui network positioning quick )
-	multimedia? ( gui network )
-	network-auth? ( network )
-	opengl? ( gui )
-	pdfium? ( gui )
-	printsupport? ( widgets )
-	qml? ( network )
-	quick? ( gui network opengl qml )
-	quick3d? ( gui network opengl qml quick )
-	spatialaudio? ( multimedia )
-	speech? ( multimedia )
-	sql? ( widgets )
-	svg? ( gui )
-	testlib? ( widgets )
-	webchannel? ( qml )
-	webengine? ( network gui printsupport quick webchannel )
-	websockets? ( network )
-	widgets? ( gui )
-"
-
-# Tests fail pretty bad and I'm not fixing them right now
-RESTRICT="test"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-3)*:6"
-
-RDEPEND="${PYTHON_DEPS}
-	~dev-python/shiboken6-${PV}[${PYTHON_USEDEP},${LLVM_USEDEP}]
-	=dev-qt/qtbase-${QT_PV}[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?]
-	3d? ( =dev-qt/qt3d-${QT_PV}[qml?,gles2-only=] )
-	bluetooth? ( =dev-qt/qtconnectivity-${QT_PV}[bluetooth] )
-	charts? ( =dev-qt/qtcharts-${QT_PV} )
-	designer? ( =dev-qt/qttools-${QT_PV}[designer] )
-	gui? (
-		=dev-qt/qtbase-${QT_PV}[gui,jpeg(+)]
-		x11-libs/libxkbcommon
-	)
-	help? ( =dev-qt/qttools-${QT_PV}[assistant] )
-	location? ( =dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( =dev-qt/qtmultimedia-${QT_PV} )
-	network? ( =dev-qt/qtbase-${QT_PV}[ssl] )
-	network-auth? ( =dev-qt/qtnetworkauth-${QT_PV} )
-	nfc? ( =dev-qt/qtconnectivity-${QT_PV}[nfc] )
-	pdfium? ( =dev-qt/qtwebengine-${QT_PV}[pdfium(-),widgets?] )
-	positioning? ( =dev-qt/qtpositioning-${QT_PV} )
-	printsupport? ( =dev-qt/qtbase-${QT_PV}[gui,widgets] )
-	qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	quick3d? ( =dev-qt/qtquick3d-${QT_PV} )
-	scxml? ( =dev-qt/qtscxml-${QT_PV} )
-	sensors? ( =dev-qt/qtsensors-${QT_PV}[qml?] )
-	speech? ( =dev-qt/qtspeech-${QT_PV} )
-	serialport? ( =dev-qt/qtserialport-${QT_PV} )
-	svg? ( =dev-qt/qtsvg-${QT_PV} )
-	testlib? ( =dev-qt/qtbase-${QT_PV}[gui] )
-	webchannel? ( =dev-qt/qtwebchannel-${QT_PV} )
-	webengine? ( || (
-		=dev-qt/qtwebengine-${QT_PV}[alsa,widgets?]
-		=dev-qt/qtwebengine-${QT_PV}[pulseaudio,widgets?]
-		)
-	)
-	websockets? ( =dev-qt/qtwebsockets-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
-		sys-devel/llvm:${LLVM_SLOT}
-	')
-	test? ( =dev-qt/qtbase-${QT_PV}[gui] )
-"
-# testlib is toggled by the gui flag on qtbase
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.3.1-no-strip.patch"
-	# References files not present in our dev-qt/qtbase
-	"${FILESDIR}/${PN}-6.6.0-no-qtexampleicons.patch"
-)
-
-src_configure() {
-	# See collect_module_if_found macros in PySideHelpers.cmake
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DAnimation=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DCore=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DExtras=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DInput=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DLogic=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DRender=$(usex !3d)
-		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Bluetooth=$(usex !bluetooth)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Charts=$(usex !charts)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Concurrent=$(usex !concurrent)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6DataVisualization=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6DBus=$(usex !dbus)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Designer=$(usex !designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Gui=$(usex !gui)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Help=$(usex !help)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6HttpServer=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Location=$(usex !location)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Multimedia=$(usex !multimedia)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6MultimediaWidgets=$(usex !multimedia yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6NetworkAuth=$(usex !network-auth)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Network=$(usex !network)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Nfc=$(usex !nfc)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGL=$(usex !opengl)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGLWidgets=$(usex !opengl yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Pdf=$(usex !pdfium)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6PdfWidgets=$(usex !pdfium yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning=$(usex !positioning)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6PrintSupport=$(usex !printsupport)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Qml=$(usex !qml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick3D=$(usex !quick3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick=$(usex !quick)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickControls2=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=$(usex !quick yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6RemoteObjects=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Scxml=$(usex !scxml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sensors=$(usex !sensors)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort=$(usex !serialport)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SpatialAudio=$(usex !spatialaudio)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sql=$(usex !sql)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6StateMachine=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Svg=$(usex !svg)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SvgWidgets=$(usex !svg yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Test=$(usex !testlib)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6TextToSpeech=$(usex !speech)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6UiTools=$(usex !designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel=$(usex !webchannel)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineCore=$(usex !webengine)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick=$(usex !webengine yes $(usex !quick))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets=$(usex !webengine yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebSockets=$(usex !websockets)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=$(usex !widgets)
-		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WinExtras=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Xml=$(usex !xml)
-		# try to avoid pre-stripping
-		-DQFP_NO_OVERRIDE_OPTIMIZATION_FLAGS=yes
-		-DQFP_NO_STRIP=yes
-
-	)
-
-	pyside6_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
-			-DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}"
-		)
-		cmake_src_configure
-	}
-	python_foreach_impl pyside6_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE
-	python_foreach_impl virtx cmake_src_test
-}
-
-src_install() {
-	pyside6_install() {
-		cmake_src_install
-		python_optimize
-
-		# Uniquify the shiboken6 pkgconfig dependency in the PySide6 pkgconfig
-		# file for the current Python target. See also:
-		#     https://github.com/leycec/raiagent/issues/73
-		sed -i -e 's~^Requires: shiboken6$~&-'${EPYTHON}'~' \
-			"${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die
-
-		# Uniquify the PySide6 pkgconfig file for the current Python target,
-		# preserving an unversioned "pyside6.pc" file arbitrarily associated
-		# with the last Python target. (See the previously linked issue.)
-		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl pyside6_install
-
-	# CMakeLists.txt installs a "PySide6Targets-gentoo.cmake" file forcing
-	# downstream consumers (e.g., pyside6-tools) to target one
-	# "libpyside6-*.so" library linked to one Python interpreter. See also:
-	#     https://bugreports.qt.io/browse/PYSIDE-1053
-	#     https://github.com/leycec/raiagent/issues/74
-	sed -i -e 's~pyside6-python[[:digit:]]\+\.[[:digit:]]\+~pyside6${PYTHON_CONFIG_SUFFIX}~g' \
-		"${ED}/usr/$(get_libdir)/cmake/PySide6/PySide6Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die
-}
diff --git a/dev-python/pyside6/pyside6-6.7.0.ebuild b/dev-python/pyside6/pyside6-6.7.0.ebuild
index 12bf25538fbe..7b434f1e8db9 100644
--- a/dev-python/pyside6/pyside6-6.7.0.ebuild
+++ b/dev-python/pyside6/pyside6-6.7.0.ebuild
@@ -39,7 +39,7 @@ S="${WORKDIR}/${MY_PN}-${PV}/sources/pyside6"
 # x11extras (for X)
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="
 	3d bluetooth charts +concurrent +dbus designer gles2-only +gui help location
 	multimedia +network network-auth nfc positioning +opengl pdfium positioning
diff --git a/dev-python/pywlroots/Manifest b/dev-python/pywlroots/Manifest
index 622c61df5c6a..acbccb46dbe5 100644
--- a/dev-python/pywlroots/Manifest
+++ b/dev-python/pywlroots/Manifest
@@ -1,6 +1,8 @@
 AUX pywlroots-0.15.24-no-import-version-check.patch 592 BLAKE2B 24ef9a82a3a7c62e8b0669cd25e6cd984a633ebf8f276436f48d54f6064119cceffe400a8c386e6407f3063fa678bab10d4151e0a5976041eab0ff36a16b7c6b SHA512 4a93ebad7670ba6ff41e68030b33a15d7545f244fa5b982fc3dd12c3a349e70f2e59267c9d6f2383a80e2376243118cc46bb4b3d9027abbe3cd9d69d1be5ebf8
 DIST pywlroots-0.15.24.gh.tar.gz 85570 BLAKE2B 0c7ba0be6159152488785298028bb1feec20e2380357060a850dab417b3fb1fccb4a9e6cc6564d2b7f124bf4fc454789549267e9036b0b4559e5fcd4c6f06196 SHA512 b29b76cf18a65b2ef19d15ecf018a9ba44119d60ee61435967d17f06d5f7544d2117f2e9a81574734c71591a237b00c8584a5cc6d6adb928f39f11170f21ee94
 DIST pywlroots-0.16.6.tar.gz 91625 BLAKE2B d8784add8266958745fb9d9ca25d47b3bd52957cef22a70b30b051aa53996a8b870d436a44c75f8a16fd7346b7ff2c00a70eb86b376294f3928ecd8807b6646e SHA512 31588ebccbd269e45374cd42067738c23bd76ea8a0304d17aff9da33c7686a5fb9c83a676575f0ad034afd2827cb8bea7eb9334e96badcc83ffede56fbf75a1b
+DIST pywlroots-0.16.7.tar.gz 98542 BLAKE2B bcc20d31e4423c6f486f6bcbfecb1db1995cc3d58e98205f63468b4b93b3f386f67ff22e8a99cd419b7b31f7c0287a61f8c4e1fed6e7af525244e94895ba55d6 SHA512 05e75f70ca6e9fcf7cfd18fb55411fbf3ef9d0b95d11afdab0ad95f2016623ac4e097b600e3d7a6f880be0edc6a1ccfaa48364ec02bd3c46c44f7c0de3fe96ac
 EBUILD pywlroots-0.15.24-r2.ebuild 1003 BLAKE2B 19a6ce2c6c9fff501e2a4274ac1254d6cf22b693b1451c7e3e61d09f4d8ff1b93b98ef6242c683e4f48527b0d022f971bcb3b016541ad7a352c28c3cd8bf9060 SHA512 83343df9d58b79b6abd76d9706ddfd236eae1a05bb975dcfdf0561371f43687f3c34c9c194ebb8a363e005ea9c54ce84d12f70893f80d1593741425ecca81c21
 EBUILD pywlroots-0.16.6-r2.ebuild 1201 BLAKE2B 01ffa126ca8a48b653b9218bbd680fcb56d052c61ef960bf82895ce3f2a135aea9f21a439cb50ff1d5f0c48d3794c3d1b25bd066cb553d14285f257653c80509 SHA512 2543ef20f1882f6246b866f4894e7f3604cfd3de9a9573aaf06523181563a4c3156096f21b7b99c32810e7c32b7b63625ea35db45ef7be9a18a7a1ed14292b81
+EBUILD pywlroots-0.16.7.ebuild 1202 BLAKE2B 7d5ee5ffd72e9e234b1b24df277e7886461e3223fdec7b9b0c0ca4ef078f3b29c4022dd6a2e929d30c170d978a5663e24c42007eed7bdca4985e7cee3edf4eb9 SHA512 546faadd4e1b23d63a6eef7283866d8dd911a18f73f60a265a9ee7c4ffbbbe080eb5698147af73697f1c12d8ca6d23ce7d9ab25252c2223e3ee4fdc9bbd6d200
 MISC metadata.xml 351 BLAKE2B 8c8ef3ef1d58928c0a15fcd756e4d1c94b2793626c9b4e9cbeb31443119cb47fa4975063547065cbc6e06f327ec7d36beb5e74973fd3d372ad4f7feeac3410ea SHA512 b4840e4149647c29e358b64d3de99a0f2b148a4d7d123d7ef7df67cf918a3f599d3e199ed7ef4d0d39bf8ccc8e4630058db4ae3a2260119ce1c5d255bf2dd9c8
diff --git a/dev-python/pywlroots/pywlroots-0.16.7.ebuild b/dev-python/pywlroots/pywlroots-0.16.7.ebuild
new file mode 100644
index 000000000000..9a4044ba719c
--- /dev/null
+++ b/dev-python/pywlroots/pywlroots-0.16.7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python binding to the wlroots library using cffi"
+HOMEPAGE="
+	https://github.com/flacjacket/pywlroots/
+	https://pypi.org/project/pywlroots/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="X"
+
+# See README for wlroots dep
+DEPEND="
+	dev-python/cffi:=[${PYTHON_USEDEP}]
+	>=dev-python/pywayland-0.4.14[${PYTHON_USEDEP}]
+	>=dev-python/xkbcommon-0.2[${PYTHON_USEDEP}]
+	=gui-libs/wlroots-$(ver_cut 1-2)*:=[X?]
+"
+RDEPEND="
+	${DEPEND}
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-0.15.24-no-import-version-check.patch
+	)
+
+	# override automagic detection and caching that's completely broken
+	# by design; https://github.com/flacjacket/pywlroots/issues/132
+	cat > wlroots/_build.py <<-EOF || die
+		has_xwayland = $(usex X True False)
+	EOF
+	sed -e "s:return.*has_xwayland$:return $(usex X True False):" \
+		-i wlroots/ffi_build.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	rm -rf wlroots || die
+	epytest
+}
diff --git a/dev-python/qstylizer/Manifest b/dev-python/qstylizer/Manifest
index d738ae815447..43f990368f68 100644
--- a/dev-python/qstylizer/Manifest
+++ b/dev-python/qstylizer/Manifest
@@ -1,3 +1,5 @@
 DIST qstylizer-0.2.2.gh.tar.gz 20752 BLAKE2B c5442821389863bc03bb0659b528322cc12f5be8137f74746e3ec7a18bf89d2822d533d13cc23842daf32a0077ad84d0e7b5dc62f231e75e57388064bd08e5fc SHA512 682f10462965a93b36f0e44b75885b9d60b4d3cd03369976b977c9b928afed4e930b6b7ef26850bdb7b40ef2a31db35a9778738582dae8715f54c1f00a957fb3
+DIST qstylizer-0.2.3.gh.tar.gz 20813 BLAKE2B edb19f9bcadee3229a1d98cc7170ba7bbab266fea74ab42987380dd8aec0ba4d02dda0fb7522f2cfbc52feb5646e44ee1603528d3331315ddcbcc18095a9ca76 SHA512 ba5188f702d4fbd43d963be206c75d55710bfe63accc84aea3bfd03ad06a0cb484d50b538c2d1d6a7ce21055d0b2eefb2cb35a732b929f5477033a8ddea945c0
 EBUILD qstylizer-0.2.2.ebuild 1211 BLAKE2B dcb9d1df622e2218fb9e496f213f1af7fed96f16cf56b34a4fd8c44f150221a0586354f8697ad77548b8feeddfa29f8c70912e04333a23802cc6d9a4b8c2d671 SHA512 f3e04e19b88fc65ae1e6e14511299fde5bad49aa1689479f308e5aeec0d37afed806aefdf0bd3c854bb43a11886ecb08d8ad4a07ac668cd851958d198752f09d
+EBUILD qstylizer-0.2.3.ebuild 991 BLAKE2B dfa99f600900465726dde96b1486febb478c103d692ddf0b9f71ae064289a75c2bbe7429972dbd5797113436f133f298b67b8f87aab821b4ca1986be2a8931b8 SHA512 e96820a68fcf54802ef554e40afaef0cd487a0809c7cc33fae315cd752f6947d55d068656ad15901ca8cb597d3d25ef0b71109b265c175681114700661b6f523
 MISC metadata.xml 415 BLAKE2B 451dfb7201a39eb121ef90a7c2ebb89dac9efffa47c7fe9b7470b8bdfe50e9fa0355fd6a16755423c067436e1a9777a7e36ccc4e0ea85f9b40fba1abf03dc590 SHA512 926ce3660ca54d4678987b339506daa3af21c49acedf474c1bbe3a5b79864d27f56867eeacd02bcdca312cf1edadc0bd9889c691414ba504c447aff0a2b6060e
diff --git a/dev-python/qstylizer/qstylizer-0.2.3.ebuild b/dev-python/qstylizer/qstylizer-0.2.3.ebuild
new file mode 100644
index 000000000000..c33b9390d668
--- /dev/null
+++ b/dev-python/qstylizer/qstylizer-0.2.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Stylesheet Generator for PyQt5/PySide2"
+HOMEPAGE="
+	https://github.com/blambright/qstylizer/
+	https://pypi.org/project/qstylizer/
+"
+SRC_URI="
+	https://github.com/blambright/qstylizer/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/tinycss2-0.5[${PYTHON_USEDEP}]
+	<dev-python/tinycss2-2[${PYTHON_USEDEP}]
+	>=dev-python/inflection-0.3.0[${PYTHON_USEDEP}]
+	<dev-python/inflection-1[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc \
+	dev-python/sphinx-rtd-theme \
+	dev-python/sphinxcontrib-autoprogram
+
+export PBR_VERSION=${PV}
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 8e5a48f65ba2..f6b49fa39301 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,5 +1,7 @@
 AUX regex-2021.4.4-pypy3-fix-test_empty_array.patch 1103 BLAKE2B 2498de0ebaa68fcb99653a40bfbb9a1009519a79244fa3193ca43b9b8b3ef714f066fdac68f32d7f24c275690cb24bd1deca6b30120519b99a3402db7b4d4d48 SHA512 d55643d7ca251f465d14d8cffab60e6f2c8fb18ec6f9032a5318fab17a8b8e5ae5c98d22e0eff28aacd5bb8ec2ff606022921f73f3c9f7e54ee0853de262cfa7
 AUX regex-2021.4.4-pypy3-fix-test_issue_18468.patch 1078 BLAKE2B 3545ee5167790fbb1d068afdac3f6dbba28ea92d6c1d4ef31b60a8406061deb8609d7fd9a659b45715d4af0f2deb1da0ef9865aebe58919c2b392e2a1a833cae SHA512 182628709ef0f373037acf197c2ade3215684b2c805a96a600a3dfcb092e6fd134c261330ed76c7c248e72f439e464ccde432444bfe4a9610bd36c777bf45c9d
 DIST regex-2023.12.25.tar.gz 394706 BLAKE2B 742abe3a3515b527465d81df8fd9404aaa6aa1545e3e6a8c4a87d72d41138caf7f63bceae8bf06b3576656a6b5577bfec51629a60fe837ad2f3a4cd60a08ac06 SHA512 ecc5916633e2acb8d8a0c5ccfdc1c612f673546c42271d5627aa92a163fa6c8fd5a30ed734a02c23fa64807aaf2f883fa51175b7f482888631f699e77d1c0e15
+DIST regex-2024.4.16.tar.gz 394724 BLAKE2B 75df2f861116ebf37845abdb0883774ac53d7d61e4cdf18128c74b4c1d5a55b86bfd447616cdb8fc14239c0a5aeaa2c7e59cb0b2b365b57185d785a3728e6dce SHA512 15da80751f1a4b000e4ea59887963aec939fc6431a672391a7f882e05ff15934b89e191d19fd388b9dd6032d2ea44f8511c0ce238e5f1d8db102a89d1866f456
 EBUILD regex-2023.12.25.ebuild 1025 BLAKE2B 16326df8fa7bdde8e12a9fffd24e7f649ce394daad21a2b0a94e3a49151425970d464e69a9deaff80f773fd3768065cd090c9b599e292314888850d67872e2ec SHA512 538ec38186fddb6c9c7ddadf4902a80ea532e025dd2e80a76dc931b402659a8069a8f034ed94fd7f813f50626b842faada6b5ec95cb9edf2b020478602f3e793
+EBUILD regex-2024.4.16.ebuild 1033 BLAKE2B 079835db10bf40b07388abf03c610a148de097ef2ae747594ff9e6d52883bf02ecb37e35c1db735cc81b5cf7e3dd8c28cef29e5a8f65c1f9aaf1eb21320cf076 SHA512 6a4ec89c64aef28a64aad8ed97aae9313e2716aeea9a9f98235cf317fd3366d2a21edd5cdab6d56e8302bb07e7e5f27455e8ad5790b17a9fe24b1ec921fbc2e4
 MISC metadata.xml 448 BLAKE2B ce92d069195d11c558d338d4f21cc9bb48e50f21a44aacee610f88283aeae0319b9a31b987fc1b6206832f7b251bb1f64b0d9bccd3eefd6c54953192911eb5e9 SHA512 a9b18af0c107005e8a9e0e7bc4e1dd44891faa9a5234365ddc39ecac2e3dc197c58b31087b4d97d94b48644be7c984d773e50ddb03063c6c95b1f94884483dfc
diff --git a/dev-python/regex/regex-2024.4.16.ebuild b/dev-python/regex/regex-2024.4.16.ebuild
new file mode 100644
index 000000000000..af00003fff6e
--- /dev/null
+++ b/dev-python/regex/regex-2024.4.16.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+# pypy isn't supported upstream because of its UTF8 representation for strings
+# See https://github.com/mrabarnett/mrab-regex/issues/521#issuecomment-1936260187.
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Alternative regular expression module to replace re"
+HOMEPAGE="
+	https://github.com/mrabarnett/mrab-regex/
+	https://pypi.org/project/regex/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+IUSE="doc"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
+)
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/Features.html )
+	local DOCS=( README.rst docs/*.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/serverfiles/Manifest b/dev-python/serverfiles/Manifest
index c21db211e4e5..73c29704d6c7 100644
--- a/dev-python/serverfiles/Manifest
+++ b/dev-python/serverfiles/Manifest
@@ -1,3 +1,3 @@
 DIST serverfiles-0.3.1.tar.gz 11726 BLAKE2B 5e075a816d510301af38642175530bed7fb785da4ada682b1249f993a5e8974a89f301e63ed307b4882df867641fa123065ae249dc6e48b1210665fac283d3c5 SHA512 424b99e3f0bcf97120aaab5ffcb6e08284d9a5f5caf614f4dbc41871b6aa637e39bcb5696ea593a09387c41621617079da939b6ebb183e64f878656b4d8071a9
 EBUILD serverfiles-0.3.1-r1.ebuild 590 BLAKE2B 545306700e53ded502a18f8d3c896b5a161f053a20236b80f5817549042f27be85968096dff6b607f3f13bcc9721b8fd8333b6a45c7f269bb5955cd712540834 SHA512 f701646b8b72033c442c960d69a59449f5b9b1d1d3ef2df2ab79ef123ef1608e13a0580af6ac09a5b68fecee5f62ab396775ae30ce7ada5da28a5b8f7f16d086
-MISC metadata.xml 417 BLAKE2B 18c672c3f26977a59fe0dbb70da8e1261ec044ee25c4bc703baeea41675f1b5040171093797249e8235dff3d1c6e8269a2acb76f44dc4abb7314db50db93add5 SHA512 bb6ef62f259df7f40869a959eaf979662a20718eb2c9ec700ec242f96a19b4b009d5e16183b2083f005e390786ec3a58d7e507370446fc44fee8fc7cd3fa7cfa
+MISC metadata.xml 475 BLAKE2B 27845a98f6e8ab08dd3c4cad971f405d85d007637f839dda1a8508ef6e244227395df211655ab376009ee16bbc315586bdb4ccfdcce4068df82c7583ee0fd022 SHA512 c1c7cbf97f7e3135759e0207ad4bf9c20dd2a1951fb62d3623743e0320ac1e831836dee670c4e7bc099b2c7d0e59c8ef1d04e55e59f51c8b40a4e3a45385241d
diff --git a/dev-python/serverfiles/metadata.xml b/dev-python/serverfiles/metadata.xml
index a80a5ad08f21..825728901be7 100644
--- a/dev-python/serverfiles/metadata.xml
+++ b/dev-python/serverfiles/metadata.xml
@@ -11,5 +11,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">serverfiles</remote-id>
+		<remote-id type="github">biolab/serverfiles</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/shiboken6/Manifest b/dev-python/shiboken6/Manifest
index 532b33933356..9b603287c2a3 100644
--- a/dev-python/shiboken6/Manifest
+++ b/dev-python/shiboken6/Manifest
@@ -2,5 +2,5 @@ AUX shiboken6-6.3.1-no-strip.patch 1001 BLAKE2B c486f9423d4934c2305e8f3109f017db
 DIST pyside-setup-everywhere-src-6.6.2.tar.xz 13975896 BLAKE2B b4572e58613e5446692e8c4cef28156fd0126ecda0c6334652ce49c6c7ce4614dbf2400c693addaa38e9b6cca9e331b9fe84c83ddb26e7014b8603afe2c54ad6 SHA512 1d23d27a4cbe74434ec5d391172416d324b4c92181401444821b456b4e27dabbdb3dcaad685a22b62c09f750555a4e626bbb6406a2fbde1cf4ec5c8bbb64cda5
 DIST pyside-setup-everywhere-src-6.7.0.tar.xz 14382456 BLAKE2B 607e496cdeb7e55166b4f0dc15662a8792c7d8925856e8edbb927dfdc33342d158f430e3433d3d4a78ea33740e333fb2422ea1f4332408c3c6214f92d31bdd0d SHA512 7801d564d8d359edec431dc0e6f170538b9fc6f834cb7ab8eff41c1989bffb619c446d4d62d65db2a5b7592c0bff5d450d42de2797726658fe1a8f53df8a4c14
 EBUILD shiboken6-6.6.2-r1.ebuild 6679 BLAKE2B 1ec39580ed7a65bb04a76b105c4d14009d881466d8a9484e79721122a6526a7a699ed7faf80d44047bbe63bbb81b7d87855cbbf5aa693d91b296cf96f4d1f871 SHA512 bef6b9f610e772d88bd16f9c920dec99f54c1cf29178fa4feb4c697eb071d386f800562d6155c08f051b3d7d36d89a324cd9299d914dae0fb51e393706e35d03
-EBUILD shiboken6-6.7.0.ebuild 6644 BLAKE2B e49d00898e1e064c422d9e2d2ef100ce92e5dd23482c0ff748f901909b7b267bfe37677f35bc5dfe5c7bf4bb90c5b5a2543e4dc9160f66ce6aec036686e01804 SHA512 b5c2df0719d1451ed9c0804e7b28dd62647b0f2ebcaacf9f16f07c816c76127bdb88402b58b6a63bdd2e95b0b4645e3c496dc855bc35a5475718b930184c4055
+EBUILD shiboken6-6.7.0.ebuild 6643 BLAKE2B 38ff1bb399b524cf002d286d3fce0ddb46d2693a6e06f3dbafcbb66d21076377c322d3d94de9a1ee9cfc301794c51c8336bc1b76bf10d2ceef1f9e4e2e0d2bf1 SHA512 ef1786d3cce0288384f3aa0a10d76d514b7952f5ff63a5ce2fe0df5ba7a1613fe6401445ed90be3b170c4287540570da1e798ca43fc9a66eafb9cb2a9377a96b
 MISC metadata.xml 730 BLAKE2B 33e7e589d02ec0517e134aa50407ecb97c6800be3ab7b69174d65776f62c1f25c2b2209d51299d9e0110b5f5e9322ee2c0b43dc89e6b12c40ea322ca9bc8eb3f SHA512 cc4ecdd9bc86ce59c2027c6f87307d32bd76d5d2cd8c07edb6c60cc5317ea52a96136c7597a179d75f1632db2999300d8b8f0567679ba3fc562804774fcdcc98
diff --git a/dev-python/shiboken6/shiboken6-6.7.0.ebuild b/dev-python/shiboken6/shiboken6-6.7.0.ebuild
index 1ef71d57974f..faac009c177a 100644
--- a/dev-python/shiboken6/shiboken6-6.7.0.ebuild
+++ b/dev-python/shiboken6/shiboken6-6.7.0.ebuild
@@ -31,7 +31,7 @@ S="${WORKDIR}/${MY_PN}-${PV}/sources/shiboken6"
 # arbitrarily relicensed. (TODO)
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+docstrings numpy test vulkan"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
index a5201e606294..bc238590fd2a 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -1,3 +1,5 @@
 DIST sphinx_autodoc_typehints-2.0.0.tar.gz 37951 BLAKE2B 55fc5bd4a430095b9b80b7313da96ac177f55d8e31068ded7c740cc2757580b611bfdb0aa53cc8344564cf01b052518854ea040a70ea568bd098505f8c2dfca8 SHA512 e37839b8f9393334f43b2b97f3d9ade4a2e11182e634c4ee37a916bcf4425c624376edcd3b25b054a23e15624393e3a79fdbc1775f6b3808e09bc8a85a2262d5
+DIST sphinx_autodoc_typehints-2.1.0.tar.gz 39386 BLAKE2B ccf6b618fc3db2a576a2d9a36a575087cdc3c7c5cf59a6057a956478a12715b1623dc4bc1ae3f7c30deab317a15fa187faf19f9d050fa61c293dc20bee41effd SHA512 59c5b4c682fadc1d0ec62a5aa639bb87d6e4710db89793824c348c7598d73b144f0b083ce6462ea32d958b1ed7fd2fb96c2a92780267adef03b625e64c08c412
 EBUILD sphinx-autodoc-typehints-2.0.0.ebuild 986 BLAKE2B 9b4d052ad40e2460fafcea60a01f959095616fca9c3662c6b5b7d146be39e8f25663b07ad8e35e023d3064908150bb4d9037a4c3a45b630f5c8e3fb63bebc21d SHA512 161e77c0009d0f0d5cfe606e855b975b3ae78e4a5b06fc5fadcea7636c150a9c5c20912b2dccfe869da6808362f1a0c5042ff213f2ff32f51a962683fc464580
+EBUILD sphinx-autodoc-typehints-2.1.0.ebuild 1093 BLAKE2B 0ba9a809e6526d715dfa2b4a882251f46d185a8f33760b2337b6b6ad3c904b82931441894917183baa4eb9c6a7195d900c25d69ba1c7f5a6d389aaa04e0b4135 SHA512 aa79c2d8ff962cca99ed348eac4f8d827c96d7975ec9c6c74bcfc2d592381cdfb9dc1405b8764ebfb4abc9e7228103cbd4e2418391de752dda531fd6ad950712
 MISC metadata.xml 682 BLAKE2B f8b48894f28411a17c73956bb75d43906c893b33d3dc611dfcc46e7a71ac43824aa54f660ab4f49c9870248b2b9ff405a2a3229f92975337e69201868eed3378 SHA512 87a0ea2b2e4cb2b5f0d1593b2c4bd96b46dabb8baae71a6ba18cfd83dedb2a1d5f0ae0f8711144967a5d44015e9ae7ca013dc0aa54e20604633ae062d95649ef
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-2.1.0.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-2.1.0.ebuild
new file mode 100644
index 000000000000..dc13f14770e4
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-2.1.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Type hints support for the Sphinx autodoc extension"
+HOMEPAGE="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/
+	https://pypi.org/project/sphinx-autodoc-typehints/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/sphinx-7.1.2[${PYTHON_USEDEP}]
+"
+# skipping optional test dep on dev-python/nptyping as that package
+# is horribly broken and on its way out
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/sphobjinv-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/typing-extensions-4.5[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# this package is addicted to Internet
+	tests/test_sphinx_autodoc_typehints.py::test_format_annotation
+	# TODO
+	'tests/test_sphinx_autodoc_typehints.py::test_always_document_param_types[doc_param_type]'
+)
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 44ac68011544..852914a5fa2d 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,11 +1,7 @@
-DIST SQLAlchemy-1.4.51.tar.gz 8521574 BLAKE2B 216550225c11d5367e5a50ec321a09078b4677973cf33eee1874beb9f855cfeb629a6df4d05e8ecc5b22052628de5cae2e468d18d50502a4560bd4ca7d85ab7d SHA512 be27a41f442428cdb5cc6a20af2de9424384457475d16a7d7167b718256e208766e2ba8d53bef2b314aafe87b3d9b0c5f9af6e4c03f53fb194671cfaca6e50b5
 DIST SQLAlchemy-1.4.52.tar.gz 8514200 BLAKE2B b41fccb885ce6761e29621a654c97537610a1875d66302ba56fac560f5c85db35b14595efd903aebfd0186ee39b75a8666e1304cdee6a6ec6eb9923bc602b9e5 SHA512 afda6a3503c9d2baba8c1dd9e7216d5ac1561f52f5f11009c41a1a98ac998643c980c60cf8ba4d84c4af8808be26ead9fd2e7a2c8bf15b2fdb521b4e5de7748e
 DIST SQLAlchemy-2.0.27.tar.gz 9527460 BLAKE2B 06c3649c00fad1a82305502fce00938b85098a6e283eccc5992bc6b1df564a2947557db6bbd3633f96096fabca1fcf8fb1edee125b86be3a31508d6878fcc3be SHA512 78f0aeda4352e05282b86bdcaaf369804e4294e10f944a15cacd518b3741cf6359880d7400ec689e234ad6f8227d32822aa9073ed33f40825c3542102ebcada5
-DIST SQLAlchemy-2.0.28.tar.gz 9531010 BLAKE2B bd989adcdfe9640d001a97f48d782628ae307fd24d74ad227cf8e767bf0cfcb71b95f8a3506768146477b09f5196323e435092899d4ecc139a422849fc787a52 SHA512 83745aaf2d0b469dbbb28960eef4a1e23fb8fe8a2f4b8cb055cc06c5bd4ccb2f365a2b55c7ca76be2d809d4127e16ace06f4e50f59f63d946e3225375499f4f0
 DIST SQLAlchemy-2.0.29.tar.gz 9543967 BLAKE2B 04425618b6e0bcf98a7a32a4a6b1c092120a9f3eb55761879b072ac3a3e08c8f1b97fb4d2df4b35b2fd810e11146f4d83cf67cd8ec23fb4d96c5d6cfff7657af SHA512 d1143c65fb26335d652083b9a90afaecf78ed312cea5c26f989380204e909c341c1bc3bb1e07274353e1c409d21737fad4d7391f186b2d2373814582d3baaf78
-EBUILD sqlalchemy-1.4.51.ebuild 3436 BLAKE2B 60b2e39902de5052fefb003514f3fb232cfd23ade139e8c5fc4d2b625d8fd65a40b22d6ae2593c7ee6ea12d1ce1dd4b192dc95cde3485671f292d96e3bd8999f SHA512 1c3c8bbd5459690c689ada1cfa9c89cf58298c6ade58117b9331ce99f3a7df8307f8976baaf03911ba3c828da05cd6c8b743cd2bd5120a7dbcf9e42b35fcc7a1
 EBUILD sqlalchemy-1.4.52.ebuild 3436 BLAKE2B 60b2e39902de5052fefb003514f3fb232cfd23ade139e8c5fc4d2b625d8fd65a40b22d6ae2593c7ee6ea12d1ce1dd4b192dc95cde3485671f292d96e3bd8999f SHA512 1c3c8bbd5459690c689ada1cfa9c89cf58298c6ade58117b9331ce99f3a7df8307f8976baaf03911ba3c828da05cd6c8b743cd2bd5120a7dbcf9e42b35fcc7a1
 EBUILD sqlalchemy-2.0.27.ebuild 3954 BLAKE2B 9bce2efb81f5909ecb56762d4ab38fa16384109148131c76389b5bdf4f7644e1a6ed01a388d11a1cc975d7b55380e17cc7256bd38237f3b1cfe3c4634067ae97 SHA512 b655ead9dbfd58766b379a9f6f546185fd497ef478de0e323a5d87d8d5bd5698e5d503cb151a5c57c3b60241800826d53ec9779a38a2f4ac629b567809379c33
-EBUILD sqlalchemy-2.0.28.ebuild 3955 BLAKE2B 988449063437a2478db4ba705d66e863ed4a9f8724a8751cc73248e61fc50ece848b61a13815a3e5faaee0674487d9c15bc6bb236579018498b543c942ae5198 SHA512 7d7bca67701ccf7474f91c711c7e3c9e94a8d43662ce0c45410c7ff5ca3aa87445ae7c2d3a9e0490923751d40122d3441c3517a11347b7cf86aee35d12799d2b
 EBUILD sqlalchemy-2.0.29.ebuild 3955 BLAKE2B 988449063437a2478db4ba705d66e863ed4a9f8724a8751cc73248e61fc50ece848b61a13815a3e5faaee0674487d9c15bc6bb236579018498b543c942ae5198 SHA512 7d7bca67701ccf7474f91c711c7e3c9e94a8d43662ce0c45410c7ff5ca3aa87445ae7c2d3a9e0490923751d40122d3441c3517a11347b7cf86aee35d12799d2b
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.51.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.51.ebuild
deleted file mode 100644
index f49b7af7463a..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.51.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 optfeature pypi
-
-MY_PN="SQLAlchemy"
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="
-	https://www.sqlalchemy.org/
-	https://pypi.org/project/SQLAlchemy/
-	https://github.com/sqlalchemy/sqlalchemy/
-"
-SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}")"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-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"
-IUSE="examples +sqlite test"
-
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# hardcode call counts specific to Python versions
-	test/aaa_profiling
-)
-
-src_prepare() {
-	sed -i -e '/greenlet/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# warning tests are unreliable
-		test/base/test_warnings.py
-
-		# TODO
-		'test/orm/test_cache_key.py::EmbeddedSubqTest::test_cache_key_gen[memory-_exclusions1]'
-
-		# deprecations
-		test/engine/test_parseconnect.py::TestRegNewDBAPI::test_wrapper_hooks
-		test/engine/test_parseconnect.py::URLTest::test_component_set
-		test/engine/test_parseconnect.py::URLTest::test_password_custom_obj
-		test/engine/test_parseconnect.py::URLTest::test_update_query_dict
-		test/engine/test_parseconnect.py::URLTest::test_update_query_string
-	)
-	local sqlite_version=$(sqlite3 --version | cut -d' ' -f1)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
-		# https://github.com/sqlalchemy/sqlalchemy/issues/8762
-		test/orm/test_query.py::YieldTest_sqlite+pysqlite_${sqlite_version//./_}::test_yield_per_close_on_interrupted_iteration_legacy
-	)
-	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[False-True]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-True]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
-		)
-	fi
-
-	# upstream's test suite is horribly hacky; it relies on disabling
-	# the warnings plugin and turning warnings into errors;  this also
-	# means that any DeprecationWarnings from third-party plugins cause
-	# everything to explode
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=
-	# upstream automagically depends on xdist when it is importable
-	# note that we can't use xdist because it causes nodes to randomly
-	# crash on init
-	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
-		PYTEST_PLUGINS+=xdist.plugin
-	fi
-	epytest
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "asyncio support" dev-python/greenlet
-	optfeature "MySQL support" \
-		dev-python/mysqlclient \
-		dev-python/pymysql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.28.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.28.ebuild
deleted file mode 100644
index 0ea36df4e9dc..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.28.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 multiprocessing optfeature pypi
-
-MY_PN="SQLAlchemy"
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="
-	https://www.sqlalchemy.org/
-	https://pypi.org/project/SQLAlchemy/
-	https://github.com/sqlalchemy/sqlalchemy/
-"
-SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}")"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-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"
-IUSE="examples +sqlite test"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/greenlet/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		test/ext/mypy/test_mypy_plugin_py3k.py
-		test/typing/test_mypy.py
-		# hardcode call counts specific to Python versions
-		test/aaa_profiling
-	)
-	local EPYTEST_DESELECT=(
-		# warning tests are unreliable
-		test/base/test_warnings.py
-	)
-	local sqlite_version=$(sqlite3 --version | cut -d' ' -f1)
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
-				test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_multi_elem_varg
-				test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_one_elem_varg
-				test/engine/test_processors.py::PyDateProcessorTest::test_date_invalid_string
-				test/engine/test_processors.py::PyDateProcessorTest::test_datetime_invalid_string
-				test/engine/test_processors.py::PyDateProcessorTest::test_time_invalid_string
-				"test/dialect/test_sqlite.py::TestTypes_sqlite+pysqlite_${sqlite_version//./_}::test_cant_parse_datetime_message"
-				"test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_${sqlite_version//./_}"::test_{delete,insert,update}_single
-				test/base/test_utils.py::ImmutableDictTest::test_pep584
-			)
-			;;
-	esac
-	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[False-True]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-True]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[has_terminate-is_asyncio]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[not_has_terminate-is_asyncio]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True]"
-		)
-	fi
-
-	# upstream's test suite is horribly hacky; it relies on disabling
-	# the warnings plugin and turning warnings into errors;  this also
-	# means that any DeprecationWarnings from third-party plugins cause
-	# everything to explode
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p rerunfailures --reruns=10 --reruns-delay=2 \
-		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "asyncio support" dev-python/greenlet
-	optfeature "MySQL support" \
-		dev-python/mysqlclient \
-		dev-python/pymysql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/statsmodels/Manifest b/dev-python/statsmodels/Manifest
index b524134c8047..aba7ee38ce22 100644
--- a/dev-python/statsmodels/Manifest
+++ b/dev-python/statsmodels/Manifest
@@ -1,3 +1,5 @@
 DIST statsmodels-0.14.1.tar.gz 20309647 BLAKE2B ef9b70671b78eb45b48997c5a8ea35828b7722b31a6c77d55b81f4aad6ddb3608305a3319a0d284797654ef2bbd5f25416459450a6b26be56b9e3e3137fccac8 SHA512 e382ca807205e2aeff76dd22b42e7824914472588ea040d90835fd46e0c993e155828c58e81f53f9539ad9bdf195bbbd1a49a45658187498d60287374112fd68
+DIST statsmodels-0.14.2.tar.gz 20352531 BLAKE2B 65053842ab979b6c2541baddc09f9ade4f55ca988451218b2e4fd2caf7af0e7891eaccf317e9715f35c3d002f8976ea637712173d58db1b5b7822658bdfc79dd SHA512 0a38482bccac61081ff0c8de3b9fcf81689ec15437c53d79a8949df058e0ac8a4e93136a50a37a06577108dc29f1a51e0d00e041ee7e8f9dff93b6e8cf1f0f16
 EBUILD statsmodels-0.14.1.ebuild 2179 BLAKE2B fc7cf4dbfbeb2524927f133078dacb201927d942e28a281eed4a8defb175918008b603409248ecb3c83251c93f1ed0df3866d2e124d8a646b0c5a5c0ab516e25 SHA512 0f7ee90e18e0d7d6c236f5929f880918152433133cd2d377a5ef3f1fe16802230d89fd2091b07f4481645910710a3615efb168317cf49d68ed650c3cb1d031fe
+EBUILD statsmodels-0.14.2.ebuild 2096 BLAKE2B 7cbab7689074541c82e140d79cfcb149f0dbd67181d223cf818967a1fb8f04c33ad0ec2cdb930390f0725931ee10416f8bd63173591e3f10095d9dac31baa3ff SHA512 471859e9b273f98d1ca0eac13129b065208273b81d517604c18db708576f10795e9fbdd53927b84aa918f05e3440d899a90ef976e47b0486737dbf00025d1dfc
 MISC metadata.xml 1088 BLAKE2B 285d326203e509fd04364777ffe96f085951fdb7be661e6773f329392c0fa0fc16b1527239586b3abb80458359d15ab00d5eb402b739f947b78dca612ede94ca SHA512 35192e332c6d2aecd1ac611a96ebb13cded9a8f8bdfdd7f0c10b50654d1dda411015444511a69643ee8450742c8f02f5e0bfc5e4ab4ef4da81ffce9231658f4f
diff --git a/dev-python/statsmodels/statsmodels-0.14.2.ebuild b/dev-python/statsmodels/statsmodels-0.14.2.ebuild
new file mode 100644
index 000000000000..5144fa7daad7
--- /dev/null
+++ b/dev-python/statsmodels/statsmodels-0.14.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="Statistical computations and models for use with SciPy"
+HOMEPAGE="
+	https://www.statsmodels.org/stable/index.html
+	https://github.com/statsmodels/statsmodels/
+	https://pypi.org/project/statsmodels/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~s390 ~amd64-linux"
+IUSE="examples"
+
+DEPEND="
+	>=dev-python/numpy-1.22.3[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.8[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/pandas-1.4[${PYTHON_USEDEP}]
+	>=dev-python/patsy-0.5.6[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${DEPEND}
+	>=dev-python/cython-3.0.10[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-8[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	'dev-python/ipykernel' \
+	'dev-python/jupyter-client' \
+	'dev-python/matplotlib' \
+	'dev-python/nbconvert' \
+	'dev-python/numpydoc'
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	export VARTEXFONTS="${T}"/fonts
+	export MPLCONFIGDIR="${T}"
+	printf -- 'backend : Agg\n' > "${MPLCONFIGDIR}"/matplotlibrc || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x MKL_NUM_THREADS=1
+	local -x OMP_NUM_THREADS=1
+	local EPYTEST_DESELECT=(
+		# note that test path should be without "statsmodels/" prefix
+		imputation/tests/test_mice.py::TestMICE::test_combine
+		stats/tests/test_mediation.py::test_mixedlm
+		"stats/tests/test_corrpsd.py::test_corrpsd_threshold[0]"
+
+		# new warning from pandas
+		tsa/base/tests/test_tsa_indexes.py::test_instantiation_valid
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	epytest statsmodels
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Plotting functionality" "dev-python/matplotlib"
+}
diff --git a/dev-python/tifffile/Manifest b/dev-python/tifffile/Manifest
index feb408e2b3b6..9064ab162e55 100644
--- a/dev-python/tifffile/Manifest
+++ b/dev-python/tifffile/Manifest
@@ -1,3 +1,5 @@
 DIST tifffile-2024.2.12.gh.tar.gz 344964 BLAKE2B 13b1697258daa6643f87d7d8a44f638789b3182029ac1d97b1695ac9add3bee4f295d1485b35273a031ce17b0c41b5fdb12d43f03765d96960869bb82c78adb8 SHA512 0cb1f33b879047b311d4ba7b8a00164230935bbd1403f33d3a1a44bedf1797e5f4b066fae865ae990da5356c0a868e4a5722f1da36ff77d8cd9b550d58286552
+DIST tifffile-2024.4.18.gh.tar.gz 346262 BLAKE2B d281e14a4bf9f29c81973a3b6bb52205b2657945b41592862a07f306957a5aa3bd8cab40db8ed5872f8544fc293deb247dbc765e94ef2d70bfefa4b5592f4d6d SHA512 bcd7f23979595d1c74a0aabe94429d6952e3a86d135b78eda0219254664a557cab13efad05ce52b9d9b60b96d8f088af7e5cfd0f07f001da5488ad6758a421bf
 EBUILD tifffile-2024.2.12.ebuild 1483 BLAKE2B 83e6ba6e2de1ae9f2b3fd547158d7c704d297114fdbfb9eabe18367c11229b2067afcb5fbea36d9cb1e4daead28d3bc5100389443184168a1ffe1bc1556b3acd SHA512 45299ed858a744be8f3dc458ff9da321b171b52d12a76da21d94d7aa161c38fb736664279efb5da9228a359c25c7e00c050622ef455588e1351e3408f6912a23
+EBUILD tifffile-2024.4.18.ebuild 1483 BLAKE2B 83e6ba6e2de1ae9f2b3fd547158d7c704d297114fdbfb9eabe18367c11229b2067afcb5fbea36d9cb1e4daead28d3bc5100389443184168a1ffe1bc1556b3acd SHA512 45299ed858a744be8f3dc458ff9da321b171b52d12a76da21d94d7aa161c38fb736664279efb5da9228a359c25c7e00c050622ef455588e1351e3408f6912a23
 MISC metadata.xml 346 BLAKE2B 8cecb51fe01826a2a190c4e3020836f5706a918515a3ef5b4624fc3e9985411a8fd3c261fb7b6d8ad4f4486164487d11bdc2b071eeb5a95083db4c5323ae2dbe SHA512 81f8f6f5231d6cc9a8e7f95416a63cc52027f58fa54ce16bacfaa0ae285a48c5a3850d83d5ab50ca89be248ce386528db32811b23d61fa0d0e1e0cc737150465
diff --git a/dev-python/tifffile/tifffile-2024.4.18.ebuild b/dev-python/tifffile/tifffile-2024.4.18.ebuild
new file mode 100644
index 000000000000..d58751a45db4
--- /dev/null
+++ b/dev-python/tifffile/tifffile-2024.4.18.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read and write TIFF files"
+HOMEPAGE="
+	https://pypi.org/project/tifffile/
+	https://github.com/cgohlke/tifffile/
+	https://www.cgohlke.com/
+"
+SRC_URI="
+	https://github.com/cgohlke/tifffile/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/dask[${PYTHON_USEDEP}]
+		dev-python/defusedxml[${PYTHON_USEDEP}]
+		>=dev-python/fsspec-2021.5.0[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Internet
+	tests/test_tifffile.py::test_class_omexml
+	tests/test_tifffile.py::test_class_omexml_fail
+	tests/test_tifffile.py::test_class_omexml_modulo
+	tests/test_tifffile.py::test_class_omexml_attributes
+	tests/test_tifffile.py::test_class_omexml_multiimage
+	tests/test_tifffile.py::test_write_ome
+	tests/test_tifffile.py::test_write_ome_manual
+	# requires tons of free space
+	tests/test_tifffile.py::test_write_3gb
+	tests/test_tifffile.py::test_write_5GB_bigtiff
+	tests/test_tifffile.py::test_write_5GB_fails
+	tests/test_tifffile.py::test_write_6gb
+	tests/test_tifffile.py::test_write_bigtiff
+	'tests/test_tifffile.py::test_write_imagej_raw'
+)
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index f268680c0356..cdc407780235 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,14 +1,8 @@
-AUX urllib3-2.2.0-pytest-8.patch 4439 BLAKE2B 5f67936952395f46e5732579a9e8bbb051d76f136f93912c3b355b7dfe15df6490c7bca702dc74184e33dc729f31aa73297729075bd2d28d895473998e5506b7 SHA512 a8249f76754df1b94e66cef679622734968e02911607ee5b86386b4f3e98a3d90c8b4410d9ec54da994695b0bca30a51e84ea923d36634c0e6ca1e785044e876
-AUX urllib3-2.2.0-revert.patch 1984 BLAKE2B 8cd784e62d797e2bb256ac0a4f64b6e738113486bc3a691823f7e0376662b26d05218d40bc71cc9c6a8641868457026992a3e2b7233b6329a090af662a3cb799 SHA512 c1a33b9ae738cf9269224937bd8531e4bb97b6f8cf9a21da4598c4ae3fa5eb470d0f4d54dbea2706f9fdab6073151cb7607170204de4e8ac07a4efa930693ac3
 DIST hypercorn-d1719f8c1570cbd8e6a3719ffdb14a4d72880abb.gh.tar.gz 156216 BLAKE2B fcb5f49653401e6e4079e1c770d3cd407602d4d6764437b735bd4ec04191dec59cdc930822fa2aff726ee25cddd0f71fd457dedf31026bff1da121d93af8b768 SHA512 62d6787d88a2e716f0ac04fc49f6cdc586e473a660ee754ff66961922ae78bcc75d1f78b091e78557dd60f006e8e480114738c7b4ff71beac804e4fc9603240b
 DIST urllib3-1.26.18.tar.gz 305687 BLAKE2B f2f673761a8d80eee715a8726ba36ab6b09800fd4a4f03f27438553c36072e2abb5ff26cff71dcf30fd114f4d28c4ad9907533965b83c8a0581d3d4661904b70 SHA512 c89e93a032bf6b11375c06ef7c5abc1868f93e7655cfdca09e9bd939ad415d206ea159fe151ecd2e5f725e0e18a831c7a5382ad01dbc32264154fc8af7aec156
-DIST urllib3-2.0.7.tar.gz 282546 BLAKE2B d4fbb9e1d0b6d1f3c3d71efc3fc479c7b1c49f87ca849c387701fb0c8b4124082de6d83d958c8b2afc225a84b80e7665df857e7b0918ba50e4ad1431f8facc4d SHA512 ca21dd330cfc7f53e6f00a92be1df1d24acbe61b6ca31c52a272dccd6f50d1bb797eece9132860adc84c21a9bebc3030a12816081451fcb8384c11a6cd2d1e8b
 DIST urllib3-2.1.0.tar.gz 263900 BLAKE2B 9e0438a11b7178c5004c1253179bb6bfcb1fa8711db47084377bb14c5834f7b88b04a5560b99bf6fff5f1f4622d4b1998d19dd517ab6b7453fd53c832ee7fefa SHA512 33d6eafd9b6ecd97ee2dca8a4f1612a6fcc584961bcfd3a0a188f557a73f4c1576f98dc525c3b2feecb2d676f4bf4364aafeef093d6686e4b3ef2043726561a8
-DIST urllib3-2.2.0.tar.gz 287152 BLAKE2B 126949265c6558e8743f8e2e05e80fd211845c67436db096796f453ed248d348dcc73d3822c77bb94b55b711eb4b10899b60808be1f4981159f772a2066d5e39 SHA512 8fa2735ff623ec549802290a2317d3d24cdd18e43b8b0702dcee03ecba31428bd0dd12e5b8e129135a3f254bcf5bcd6a8b608c3a43192b50e3a815c73906f6cd
 DIST urllib3-2.2.1.tar.gz 291020 BLAKE2B 4bd6e26e1adfba99856db082d0bd3ea136a2367fa53c2d0c7990f6325e8145b2d080a8d59705c43acd97b26be65a309f83d1906d85bd72bfb479b7404972b042 SHA512 dfadba099db678ee1567ee95aa11a72fcea0a76df094d04dd4bd7ed5df4ea2fda6917cc122a1e2bfa4f5303916f93a7e1c881fbbf3cbb9415a25bd7eca1b14b3
 EBUILD urllib3-1.26.18.ebuild 2312 BLAKE2B 9c1155aa93102ea0b118b2980142c07b9bb98b08ebb779861ecf182ffcedd542bb816e1f9a1976cdd09760ad2d0c931bc1d4fe8050ab2a93d9ded82ba0b4966d SHA512 9c4d385c148f5ba5e1a2f0792e1059aece3aff14baf2236edeee36e31fc6f83ff7b6401b6100d3d3f35ad631eb2bbbe4eec95e31dfb0948e2a4833c38c234a73
-EBUILD urllib3-2.0.7.ebuild 3297 BLAKE2B aa93e50875380bda0b91543451be2d3425d0ab8c77650a9c84fff90c889ddf812ae66b78fed95ef820a68a510eb952716fea459f7dcef8b41db8156e0b5d3cb0 SHA512 790d5c7d1fb6838be75ecb3802cda5975ffe5a45c57cd67d6fe264de4bf47b9511b897233f8057298721665366f1da5bb89fbb58bf255b4659b8afc4f95224d4
 EBUILD urllib3-2.1.0.ebuild 3297 BLAKE2B aa93e50875380bda0b91543451be2d3425d0ab8c77650a9c84fff90c889ddf812ae66b78fed95ef820a68a510eb952716fea459f7dcef8b41db8156e0b5d3cb0 SHA512 790d5c7d1fb6838be75ecb3802cda5975ffe5a45c57cd67d6fe264de4bf47b9511b897233f8057298721665366f1da5bb89fbb58bf255b4659b8afc4f95224d4
-EBUILD urllib3-2.2.0-r1.ebuild 3114 BLAKE2B 7c6f0f27381c8058dc4bf97b4fc60517fd612a6b6d54b76ee81c8d4f0b99cdaf8848ed84c097f4b77c9566ea68457ca8c003f3e6ac9b53cf75e770c16d38bacf SHA512 8491d260e6b7f32646e4beef876dd481ab5d6843b96ddd3221bc3d500d8aee9417e2ed82d0fdf1f0e31fe4ccb9d404ff2eead22651cc88102808de10ed3d04a6
 EBUILD urllib3-2.2.1.ebuild 2980 BLAKE2B 002df9a9ae2a68187552c73205a072a895674e9b6679eed85e68b12c93d3cf199cd7459d1767f96f53c75fcdf8f562aea648c63bfb5aefa3f33da31bed6dc108 SHA512 ceec50d3e4a4cc12631be02fd7bdbc69b5bbfbf5a4a9b0ea85389ce27eea6862e72f73072663892ab7453b14c97676902ebd0ba7fbca7a12e4873fc1f3722eaa
 MISC metadata.xml 449 BLAKE2B 45df5a0e80d7b229058be52fd8feb3ba2efe8d981b5b34216e4b9cb35d332588c4b3efade8e8d06bdf1f13159dfcd937458e5cf4d0cea5e07b6c1011cc8592cb SHA512 312b41031a9cbf6341f537fef94137420ca49ab609e7d4c325a998e328be415b381aa50e7b5600483d1a7583b72675a044b5dd80cb84a52539ab23271f1b096c
diff --git a/dev-python/urllib3/files/urllib3-2.2.0-pytest-8.patch b/dev-python/urllib3/files/urllib3-2.2.0-pytest-8.patch
deleted file mode 100644
index 9baa3379a7c9..000000000000
--- a/dev-python/urllib3/files/urllib3-2.2.0-pytest-8.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From aa8d3dd2535cc125e123e5c2bca38738d6864b2a Mon Sep 17 00:00:00 2001
-From: Ruben Laguna <ruben.laguna@gmail.com>
-Date: Mon, 5 Feb 2024 15:29:35 +0100
-Subject: [PATCH] Fix ssl_version tests for upcoming migration to pytest 8
-
----
- dev-requirements.txt                |  2 +-
- test/contrib/test_pyopenssl.py      |  1 -
- test/with_dummyserver/test_https.py | 35 ++++++++++++++++++++---------
- 3 files changed, 26 insertions(+), 12 deletions(-)
-
-diff --git a/test/contrib/test_pyopenssl.py b/test/contrib/test_pyopenssl.py
-index b4799ce802..eaca77ba6f 100644
---- a/test/contrib/test_pyopenssl.py
-+++ b/test/contrib/test_pyopenssl.py
-@@ -38,7 +38,6 @@ def teardown_module() -> None:
- from ..test_ssl import TestSSL  # noqa: E402, F401
- from ..test_util import TestUtilSSL  # noqa: E402, F401
- from ..with_dummyserver.test_https import (  # noqa: E402, F401
--    TestHTTPS,
-     TestHTTPS_IPV4SAN,
-     TestHTTPS_IPV6SAN,
-     TestHTTPS_TLSv1,
-diff --git a/test/with_dummyserver/test_https.py b/test/with_dummyserver/test_https.py
-index aa22f11879..b8353d758b 100644
---- a/test/with_dummyserver/test_https.py
-+++ b/test/with_dummyserver/test_https.py
-@@ -65,7 +65,7 @@
- CLIENT_CERT = CLIENT_INTERMEDIATE_PEM
- 
- 
--class TestHTTPS(HTTPSHypercornDummyServerTestCase):
-+class BaseTestHTTPS(HTTPSHypercornDummyServerTestCase):
-     tls_protocol_name: str | None = None
- 
-     def tls_protocol_not_default(self) -> bool:
-@@ -83,11 +83,17 @@ def tls_version(self) -> ssl.TLSVersion:
-     def ssl_version(self) -> int:
-         if self.tls_protocol_name is None:
-             return pytest.skip("Skipping base test class")
--        attribute = f"PROTOCOL_{self.tls_protocol_name.replace('.', '_')}"
--        ssl_version = getattr(ssl, attribute, None)
--        if ssl_version is None:
--            return pytest.skip(f"ssl.{attribute} isn't available")
--        return ssl_version  # type: ignore[no-any-return]
-+
-+        if self.tls_protocol_name == "TLSv1.3" and ssl.HAS_TLSv1_3:
-+            return ssl.PROTOCOL_TLS_CLIENT
-+        if self.tls_protocol_name == "TLSv1.2" and ssl.HAS_TLSv1_2:
-+            return ssl.PROTOCOL_TLSv1_2
-+        if self.tls_protocol_name == "TLSv1.1" and ssl.HAS_TLSv1_1:
-+            return ssl.PROTOCOL_TLSv1_1
-+        if self.tls_protocol_name == "TLSv1" and ssl.HAS_TLSv1:
-+            return ssl.PROTOCOL_TLSv1
-+        else:
-+            return pytest.skip(f"{self.tls_protocol_name} isn't available")
- 
-     @classmethod
-     def setup_class(cls) -> None:
-@@ -797,6 +803,10 @@ def test_tls_protocol_name_of_socket(self) -> None:
-     def test_ssl_version_is_deprecated(self) -> None:
-         if self.tls_protocol_name is None:
-             pytest.skip("Skipping base test class")
-+        if self.ssl_version() == ssl.PROTOCOL_TLS_CLIENT:
-+            pytest.skip(
-+                "Skipping because ssl_version=ssl.PROTOCOL_TLS_CLIENT is not deprecated"
-+            )
- 
-         with HTTPSConnectionPool(
-             self.host, self.port, ca_certs=DEFAULT_CA, ssl_version=self.ssl_version()
-@@ -964,6 +974,11 @@ def test_default_ssl_context_ssl_min_max_versions(self) -> None:
-         assert ctx.maximum_version == expected_maximum_version
- 
-     def test_ssl_context_ssl_version_uses_ssl_min_max_versions(self) -> None:
-+        if self.ssl_version() == ssl.PROTOCOL_TLS_CLIENT:
-+            pytest.skip(
-+                "Skipping because ssl_version=ssl.PROTOCOL_TLS_CLIENT is not deprecated"
-+            )
-+
-         with pytest.warns(
-             DeprecationWarning,
-             match=r"'ssl_version' option is deprecated and will be removed in "
-@@ -977,25 +992,25 @@ def test_ssl_context_ssl_version_uses_ssl_min_max_versions(self) -> None:
- 
- 
- @pytest.mark.usefixtures("requires_tlsv1")
--class TestHTTPS_TLSv1(TestHTTPS):
-+class TestHTTPS_TLSv1(BaseTestHTTPS):
-     tls_protocol_name = "TLSv1"
-     certs = TLSv1_CERTS
- 
- 
- @pytest.mark.usefixtures("requires_tlsv1_1")
--class TestHTTPS_TLSv1_1(TestHTTPS):
-+class TestHTTPS_TLSv1_1(BaseTestHTTPS):
-     tls_protocol_name = "TLSv1.1"
-     certs = TLSv1_1_CERTS
- 
- 
- @pytest.mark.usefixtures("requires_tlsv1_2")
--class TestHTTPS_TLSv1_2(TestHTTPS):
-+class TestHTTPS_TLSv1_2(BaseTestHTTPS):
-     tls_protocol_name = "TLSv1.2"
-     certs = TLSv1_2_CERTS
- 
- 
- @pytest.mark.usefixtures("requires_tlsv1_3")
--class TestHTTPS_TLSv1_3(TestHTTPS):
-+class TestHTTPS_TLSv1_3(BaseTestHTTPS):
-     tls_protocol_name = "TLSv1.3"
-     certs = TLSv1_3_CERTS
- 
diff --git a/dev-python/urllib3/files/urllib3-2.2.0-revert.patch b/dev-python/urllib3/files/urllib3-2.2.0-revert.patch
deleted file mode 100644
index 14175ecec58b..000000000000
--- a/dev-python/urllib3/files/urllib3-2.2.0-revert.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 49b2ddaf07ec9ef65ef12d0218117f20e739ee6e Mon Sep 17 00:00:00 2001
-From: Quentin Pradet <quentin.pradet@gmail.com>
-Date: Fri, 16 Feb 2024 11:35:30 +0400
-Subject: [PATCH] Stop casting request headers to HTTPHeaderDict (#3344)
-
-While this was done to fix a mypy error, we did not notice the
-consequences:
-
- * This breaks boto3 that subclasses HTTPConnection because
-   HTTPHeaderDict does not support bytes values yet.
- * When proxying, headers are still a dictionary by default.
-
-We can decide to reintroduce a forced conversion to HTTPHeaderDict in
-urllib3 3.0 if the above issues are fixed.
----
- changelog/3343.bugfix.rst     | 1 +
- src/urllib3/connectionpool.py | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
- create mode 100644 changelog/3343.bugfix.rst
-
-diff --git a/changelog/3343.bugfix.rst b/changelog/3343.bugfix.rst
-new file mode 100644
-index 0000000000..4f2df9e7a4
---- /dev/null
-+++ b/changelog/3343.bugfix.rst
-@@ -0,0 +1 @@
-+Fixed ``HTTPConnectionPool.urlopen`` to stop automatically casting non-proxy headers to ``HTTPHeaderDict``. This change was premature as it did not apply to proxy headers and ``HTTPHeaderDict`` does not handle byte header values correctly yet.
-diff --git a/src/urllib3/connectionpool.py b/src/urllib3/connectionpool.py
-index 1036f0d718..bd58ff14dd 100644
---- a/src/urllib3/connectionpool.py
-+++ b/src/urllib3/connectionpool.py
-@@ -751,8 +751,8 @@ def urlopen(  # type: ignore[override]
-         # have to copy the headers dict so we can safely change it without those
-         # changes being reflected in anyone else's copy.
-         if not http_tunnel_required:
--            headers = HTTPHeaderDict(headers)
--            headers.update(self.proxy_headers)
-+            headers = headers.copy()  # type: ignore[attr-defined]
-+            headers.update(self.proxy_headers)  # type: ignore[union-attr]
- 
-         # Must keep the exception bound to a separate variable or else Python 3
-         # complains about UnboundLocalError.
diff --git a/dev-python/urllib3/urllib3-2.0.7.ebuild b/dev-python/urllib3/urllib3-2.0.7.ebuild
deleted file mode 100644
index e5dc381b44ca..000000000000
--- a/dev-python/urllib3/urllib3-2.0.7.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_TESTED=( python3_{10..12} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="
-	https://github.com/urllib3/urllib3/
-	https://pypi.org/project/urllib3/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="brotli test zstd"
-RESTRICT="!test? ( test )"
-
-# [secure] extra is deprecated and slated for removal, we don't need it:
-# https://github.com/urllib3/urllib3/issues/2680
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	brotli? ( >=dev-python/brotlicffi-0.8.0[${PYTHON_USEDEP}] )
-	zstd? ( >=dev-python/zstandard-0.18.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/freezegun[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-rerunfailures[\${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[\${PYTHON_USEDEP}]
-			>=dev-python/tornado-4.2.1[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=dev-python/zstandard-0.18.0[\${PYTHON_USEDEP}]
-		" "${PYTHON_TESTED[@]}")
-	)
-"
-
-src_prepare() {
-	# upstream considers 0.5 s to be "long" for a timeout
-	# we get tons of test failures on *fast* systems because of that
-	sed -i -e '/LONG_TIMEOUT/s:0.5:5:' test/__init__.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x CI=1
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# take forever
-		test/contrib/test_pyopenssl.py::TestSocketSSL::test_requesting_large_resources_via_ssl
-		test/with_dummyserver/test_socketlevel.py::TestSSL::test_requesting_large_resources_via_ssl
-		# stupid test, next bump please verify if they fixed it
-		test/test_poolmanager.py::TestPoolManager::test_deprecated_no_scheme
-		# fails with newer secure SSL configuration, which removes TLS 1.1
-		test/contrib/test_pyopenssl.py::TestHTTPS_TLSv1::test_verify_none_and_good_fingerprint
-		test/contrib/test_pyopenssl.py::TestHTTPS_TLSv1_1::test_verify_none_and_good_fingerprint
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1::test_verify_none_and_good_fingerprint
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_1::test_verify_none_and_good_fingerprint
-		# TODO: timeouts
-		test/contrib/test_pyopenssl.py::TestSocketClosing::test_timeout_errors_cause_retries
-		test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries
-		# warnings, sigh
-		test/with_dummyserver/test_connectionpool.py::TestConnectionPool::test_request_chunked_is_deprecated
-	)
-
-	# plugins make tests slower, and more fragile
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# some tests are very fragile to timing
-	epytest -p rerunfailures --reruns=10 --reruns-delay=2 \
-		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
diff --git a/dev-python/urllib3/urllib3-2.2.0-r1.ebuild b/dev-python/urllib3/urllib3-2.2.0-r1.ebuild
deleted file mode 100644
index c8abe317fa22..000000000000
--- a/dev-python/urllib3/urllib3-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_TESTED=( python3_{10..12} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1 pypi
-
-# The package has a test dependency on their own hypercorn fork.
-HYPERCORN_COMMIT=d1719f8c1570cbd8e6a3719ffdb14a4d72880abb
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="
-	https://github.com/urllib3/urllib3/
-	https://pypi.org/project/urllib3/
-"
-SRC_URI+="
-	test? (
-		https://github.com/urllib3/hypercorn/archive/${HYPERCORN_COMMIT}.tar.gz
-			-> hypercorn-${HYPERCORN_COMMIT}.gh.tar.gz
-	)
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~riscv"
-IUSE="brotli http2 test zstd"
-RESTRICT="!test? ( test )"
-
-# [secure] extra is deprecated and slated for removal, we don't need it:
-# https://github.com/urllib3/urllib3/issues/2680
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	brotli? ( >=dev-python/brotlicffi-0.8.0[${PYTHON_USEDEP}] )
-	http2? (
-		<dev-python/h2-5[${PYTHON_USEDEP}]
-		>=dev-python/h2-4[${PYTHON_USEDEP}]
-	)
-	zstd? ( >=dev-python/zstandard-0.18.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/freezegun[\${PYTHON_USEDEP}]
-			dev-python/h2[\${PYTHON_USEDEP}]
-			dev-python/httpx[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-rerunfailures[\${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[\${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[\${PYTHON_USEDEP}]
-			dev-python/quart[\${PYTHON_USEDEP}]
-			dev-python/quart-trio[\${PYTHON_USEDEP}]
-			dev-python/trio[\${PYTHON_USEDEP}]
-			>=dev-python/tornado-4.2.1[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=dev-python/zstandard-0.18.0[\${PYTHON_USEDEP}]
-		" "${PYTHON_TESTED[@]}")
-	)
-"
-
-src_prepare() {
-	local PATCHES=(
-		# https://github.com/urllib3/urllib3/commit/49b2ddaf07ec9ef65ef12d0218117f20e739ee6e
-		"${FILESDIR}/${P}-revert.patch"
-		# https://github.com/urllib3/urllib3/commit/aa8d3dd2535cc125e123e5c2bca38738d6864b2a
-		"${FILESDIR}/${P}-pytest-8.patch"
-	)
-
-	# upstream considers 0.5 s to be "long" for a timeout
-	# we get tons of test failures on *fast* systems because of that
-	sed -i -e '/LONG_TIMEOUT/s:0.5:5:' test/__init__.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTHONPATH=${WORKDIR}/hypercorn-${HYPERCORN_COMMIT}/src
-	local -x CI=1
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# TODO: timeouts
-		test/contrib/test_pyopenssl.py::TestSocketClosing::test_timeout_errors_cause_retries
-		test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local EPYTEST_XDIST=1
-	epytest -p timeout -p rerunfailures --reruns=10 --reruns-delay=2
-}
diff --git a/dev-python/uv/Manifest b/dev-python/uv/Manifest
index 030e1f3d871c..0bbdd513dba6 100644
--- a/dev-python/uv/Manifest
+++ b/dev-python/uv/Manifest
@@ -11,7 +11,10 @@ DIST uv-0.1.31-crates.tar.xz 64759920 BLAKE2B 9404847d0a4bdaf77778fe7e75de4a6167
 DIST uv-0.1.31.gh.tar.gz 938923 BLAKE2B c6be91911b557260df546bd708e572d4ea6688e40a0c978a598070e71bb989b77fdace1e5507dcc829e9e21714962c8e76ee2ec5dc95ae10a1ccaa562e4c70e7 SHA512 687f622bc93a0b4c967d53ab068d3f5442f7a3566495f89da252d3beb41a17be3dcf410f260f7e68bb1f5595f633ea61da7a68423f190d879e809c25e9e297cb
 DIST uv-0.1.32-crates.tar.xz 64975300 BLAKE2B cb07eb6ed0c65b538554cd2fdf455a25cddbefe07e3718f83820c1faf40795c0da6397a31e138c6f01dad9fb4e48dbe1a2fd4be76f1ab94f096e915d34ec1ac7 SHA512 83e208e54322d467cedd1463157d413ad8a5a6012a8d0219aa31b5213466fc4caef86a22e90bc0695811ab1f5e7428f3306a8845785f472e941a758242e775db
 DIST uv-0.1.32.gh.tar.gz 976905 BLAKE2B c59f4a76a3a9335429ddfa1a6fc96a13ba68ad2950a5664762d6b48c3dc67c78ee075ff723fd049733bc3240924a5ede522ce973ab37b44784f54322f6c8039f SHA512 fefd8cac2630c1c061a54abf5ad7bfe34f93176dd5fa69fc8ba39e6cea6a786527cd7e22481449d987dbd567ee4f59b3ef2a13620de3049f7066aaddb1ee4593
+DIST uv-0.1.33-crates.tar.xz 65532672 BLAKE2B 9e3499eef5cf746287f725ab3f2c2a35441d851ba734305abd7f8d9ebcb6bd8f857f6ec5371108cc4f1b5c9043424a3583a62093d84f596a522db59e9d50a133 SHA512 01b150770074880436db8e34ec4f2416c2948a43828ee84ca05ad1c244927022aa503b4e03b6bd525932bcde12eb961228877af232589d5c57a121cee66fb5a1
+DIST uv-0.1.33.gh.tar.gz 987063 BLAKE2B 56dfc8e7a1bfb63e0a6278499cb62ef764b4734af14bf01a213b7a11d442d4629d440ac218a4bc2750405c402236b382b07560919211b51c300e07c3c15a9496 SHA512 a05a38f8c1abc572ad2c6823f74a2c076ad267636f5f435f04bf8a02b059c25b82b5fa3b5250137d4077ff721294b34c6d2d57ac0e0c907e211e8cfdcdc8169c
 EBUILD uv-0.1.24.ebuild 2164 BLAKE2B 3caf382115984e87a0f44b5e8f619f38b3a7503ac12738519d0edff253eafbc7474924aa1997e332738ffe316da40dd199b906b1c560f1a00a53c805a39edc75 SHA512 c0c83640c43d073a1447228993e8384eee6a4adf73760d651456899ba285d25cc83f0611f6196123125f94fa9fa5d85710308ccf603e7261a699efc2f927dad7
 EBUILD uv-0.1.31.ebuild 2205 BLAKE2B c01ef5156ecdbdf4fc161adc036f396efa7e5c73ce00afabb45738c2bebfad99bcc199c5aac0c7b05d1b952011854cfad787bc6fe17942f3cd46e88f7f74c0a8 SHA512 d8adefcd0c9184a00bcfe5a10b0b1997deedd7ba9258bbdb215eb63117d9d62d075249c1db765321a7530960b400624ebd8fbee709318cad1891306b35ffc5a9
 EBUILD uv-0.1.32.ebuild 2255 BLAKE2B 2011c15e4960441062b24453242f565c420d4d83421125d4b1dde5bccc72efd8f3c8c84a25ed06811f7f8f4cd96d04dfe88976704f988158fc55520dd6fc5925 SHA512 0fbfc156b6e9aca60e64dbd7146f20869740658a51b60938b5d47ceab0da3c2d855acb0046f3280c97ece4213be3da799537e832122e8ae4a08e178d447746b6
+EBUILD uv-0.1.33.ebuild 2094 BLAKE2B 37e23e4dc916b7dbdbc6a749601a3d363fe6b4d4f3f83cff1dfc8ba9c7444c3798fdde8422136f62e02629de599aefc5118aa51cfae819cb756eda525ce54daf SHA512 3e1094213e116c2de3bd650c8fe05b0b9b0b4d12b6db19c22378677965e6659b5c50d46260136406bf04a3c3bf422f66687fb9f829030bdfb6af38cc293a3a44
 MISC metadata.xml 336 BLAKE2B 4b5933e24e3e9450dde5da099185dcdf3afb5916b55cffa7c2f3f6fac77e439197cbe4ba529a87f83442d8f87d238e8abef06dc052ce9a62659060ffea9fdb47 SHA512 9910fd10ebbc395b9c330774b74798c9ffdba3bb368347658380a22e01d6dc9d1961ea50fbfb4a904c9db84b94c713c054e418a7294425b86ff41a607fd3e310
diff --git a/dev-python/uv/uv-0.1.33.ebuild b/dev-python/uv/uv-0.1.33.ebuild
new file mode 100644
index 000000000000..793b60d2c541
--- /dev/null
+++ b/dev-python/uv/uv-0.1.33.ebuild
@@ -0,0 +1,111 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+"
+
+declare -A GIT_CRATES=(
+	[async_zip]='https://github.com/charliermarsh/rs-async-zip;1dcb40cfe1bf5325a6fd4bfcf9894db40241f585;rs-async-zip-%commit%'
+	[pubgrub]='https://github.com/astral-sh/pubgrub;c26e485213e39582c6f2e4d45c0328422670e7a7;pubgrub-%commit%'
+)
+
+inherit cargo check-reqs
+
+DESCRIPTION="A Python package installer and resolver, written in Rust"
+HOMEPAGE="
+	https://github.com/astral-sh/uv/
+	https://pypi.org/project/uv/
+"
+# pypi sdist misses scripts/, needed for tests
+SRC_URI="
+	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+if [[ ${PKGBUMPING} != ${PVR} ]]; then
+	CRATE_P=${P}
+	SRC_URI+="
+		https://dev.gentoo.org/~mgorny/dist/${CRATE_P}-crates.tar.xz
+	"
+fi
+
+# most of the code
+LICENSE="|| ( Apache-2.0 MIT )"
+# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
+# Dependent crate licenses
+LICENSE+="
+	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
+	MPL-2.0 Unicode-DFS-2016
+"
+# ring crate
+LICENSE+=" openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+DEPEND="
+	dev-libs/libgit2:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=virtual/rust-1.77
+	test? (
+		dev-lang/python:3.8
+		dev-lang/python:3.9
+		dev-lang/python:3.10
+		dev-lang/python:3.11
+		dev-lang/python:3.12
+	)
+"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+check_space() {
+	local CHECKREQS_DISK_BUILD=3G
+	use debug && CHECKREQS_DISK_BUILD=9G
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+}
+
+src_configure() {
+	local myfeatures=(
+		# from upstream defaults
+		flate2/zlib-ng
+		python
+		pypi
+		git
+		maturin
+		# skip tests that require specific patch version of the interpreter:
+		# python-patch
+	)
+
+	cargo_src_configure --no-default-features
+}
+
+src_compile() {
+	cd crates/uv || die
+	cargo_src_compile
+}
+
+src_test() {
+	cd crates/uv || die
+	cargo_src_test --no-fail-fast
+}
+
+src_install() {
+	cd crates/uv || die
+	cargo_src_install
+}
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index bb5daa0c0098..900f50951960 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,5 +1,7 @@
 DIST virtualenv-20.25.1.tar.gz 7152341 BLAKE2B 7d3ecaca89cb4106f97fb5565331b257017d756742f9c90972a01a86296e81d509d2f4a7869d3bc7a299c1c2f01cc08999eddc258f1bd46acf88999d0732794e SHA512 c0791de2aed7893658316199696906b1aed650460f3b53e0dbd13e695d16bc14d8974cd72fc8dcc010ff7ba10036121929ce9a608f97d7d2cd9f972144a3a1f0
 DIST virtualenv-20.25.2.tar.gz 7289618 BLAKE2B 9217dadaa00521b5109a7efdaadd99663898931aee57d34e1fae0484cf997cb06d7a6f87bd971802fae9539435eae69c4f3f4f6a5e0771d08926fd8151ec0810 SHA512 080fe3b02d08f9c55a2eea7b68022de935e0887826d52511c768ef4fb72b0278d99413f5f08288fd22c5925d362588af0afbbf7f2c51dcc47c8bce1485d6ae19
+DIST virtualenv-20.25.3.tar.gz 7289627 BLAKE2B 9edd92a238af78d4178f7c7b553f4b86206815fad3cd5f257b9fe35552835ab916849a07e06248f880335dc9a356364154ea689c08d64274eab4df36a81c05db SHA512 3933ed6dfa393a2f6cb6f996d8830f60204d5bf8953d61726afc5cc9b079bd1723c3e9044e33d3a584725ba80b93d9ac5a5d11c7304d0234303ce49c33ca1a9e
 EBUILD virtualenv-20.25.1.ebuild 5086 BLAKE2B 110d3947c5d4dfac5c5832ef43bc7a7df88362608acc377413f2e2273e3a0bd131290e6e25d3ced856b2f1f2790a5d42051470f5b2d1fb77bf20973abdab3269 SHA512 75cd5a639ae4a73c61a4b0c26c571471f02efc2a0750f3b665ec1fc4b8b38c9006a29c1ca60d61f8c14c7a3601557cb6a0e32ac304139b74c9a5bea1ce95b0ff
 EBUILD virtualenv-20.25.2.ebuild 5094 BLAKE2B 922dffd1c92beec43bdb7d7fe47823f946b34d0168fc5f91cd7eeac583168b4e9dab237a284fb83bbbe6e3921ab787d65863db11eb629b74e6127d29815005ef SHA512 515af17ba9a956818d0b71a0ee537294befb4088913a11fc6f0206111814b66490c2fef121a2fa7d806a99d84e932007222e884e81db60e2d257d8d366bf98e7
+EBUILD virtualenv-20.25.3.ebuild 5114 BLAKE2B 6d4b47a66be98d2967c8ac3c42db923257e5110dcca3028f5d3075b4b16c096efdbff17fa88211ae64f1ef32dbb65f2f1404149e5fb7e2bcd905e379e8426f77 SHA512 ef927ba361db9b8ede24fc80b254e652bfe8cc8d5b0dc39a7cfdb8a7de0bd8688a27af00c5406c304b508545df71ef365f43704f74da0eae1028d79474f97ca7
 MISC metadata.xml 406 BLAKE2B 97fee04c2662c5c36b6e16538284def46eb2454424770f42edf2567ed804ca15c4e969c714c57573f897b0946246577ab6e35204ed1f3f1735713d8ab5d24667 SHA512 356d42db463b63a3b3a55c1e98eb661de0a10aa6a5fde4f8b3f888ec73020c6679e86efd8dbb0b3e4a5a720af95e658612ba460fe548e081a90beec75fb9c1b2
diff --git a/dev-python/virtualenv/virtualenv-20.25.3.ebuild b/dev-python/virtualenv/virtualenv-20.25.3.ebuild
new file mode 100644
index 000000000000..17590a856722
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.25.3.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 multiprocessing pypi
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3.12.2[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-3.9.1[${PYTHON_USEDEP}]
+"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}]
+		' pypy3)
+		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/setuptools-67.8[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/time-machine[${PYTHON_USEDEP}]
+		' 'python3*')
+		dev-python/wheel[${PYTHON_USEDEP}]
+		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_TIMEOUT=180
+distutils_enable_tests pytest
+
+src_prepare() {
+	# workaround test failures due to warnings from setuptools-scm, sigh
+	echo '[tool.setuptools_scm]' >> pyproject.toml || die
+
+	# remove useless pins
+	sed -i -e 's:<[0-9.]*,::' pyproject.toml || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+		# tests failing without python2 installed
+		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
+		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
+	)
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+				'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+				'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+				'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+				'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
+				'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
+				'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
+				'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
+				'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
+				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
+				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
+				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
+				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+			)
+			;;
+		python3.12)
+			EPYTEST_DESELECT+=(
+				tests/unit/create/via_global_ref/test_build_c_ext.py
+			)
+			;&
+		python3.11)
+			EPYTEST_DESELECT+=(
+				# TODO
+				tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x TZ=UTC
+	local plugins=( -p flaky -p pytest_mock )
+	if [[ ${EPYTHON} == pypy3 ]]; then
+		plugins+=( -p freezegun )
+	else
+		plugins+=( -p time_machine )
+	fi
+	epytest "${plugins[@]}" -p xdist -n "$(makeopts_jobs)" --dist=worksteal
+}
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index c8dd841c0315..94a00983c252 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,7 +1,9 @@
 DIST xmlschema-3.1.0.tar.gz 566760 BLAKE2B d8d1dc61e5eb6897d128ba9ed5257b65190af948946b7ac5d5b9b5fdeb14df42e8a298bc0ed7cdec58cabd237e0c950465bf58be702610496a16000a2f23f354 SHA512 26d6586ede499907bc2b7f0b58c75460d4bfa3761bc029a042e32ede2237234daa8be7b4602da7dec2e28aa945f24e1726fd445189ec31ce4af89c9c5762e1ef
 DIST xmlschema-3.2.0.tar.gz 570442 BLAKE2B 0910a417a608e99850874a15ed608b0e33abb4a3a76c0bd0101eb3fdef89087f1f1c44ca59bc08ee6992eee24ed433bb602626fef0ffe76b671f8a5b33d662a7 SHA512 90d3e6b92054ec9eaead6c79543dceb819b75e94c19e2991671708443cb713fc9b7925d1ae09fe40d1522a27369b729528ab758087b9de0cc0157227abb95f3a
 DIST xmlschema-3.2.1.tar.gz 571883 BLAKE2B 1c5202af6f3e1aca99898442f0efb47fd72c0f32e42d0ad4d527e5f4849195b8298656ba214c8578ed5a3cabca3232102e778667062139955fbae39610d90559 SHA512 ea65d79c628eca1b4becefee0f8a79e5a5c9a43072747d7b5b312e152c953a45727e3945bd2755a37ef28e2f010148879ca32a42516254eccba0bc3bb371c2ff
+DIST xmlschema-3.3.0.tar.gz 573034 BLAKE2B 1d403483ee4b80ddcfae3ece41ba2b8edb3e0297ac7ad8d531fdfdbc4b4eb50736b728b0aefde08bd8d06e7f6b0636762b098095b06c6ad1c03928d102e4d23f SHA512 3c07d740f26901d4dc481bd83566fed1c48e48b542f14601d30b3c593a606854939052a6b6af20755e0ff6b56dbeb23b4a96519e1d91abc7145d80745f5478b4
 EBUILD xmlschema-3.1.0.ebuild 830 BLAKE2B 3cf2ecf19b24d4bccf9bd7c44f829884611ef7eefd092312744da36d7f129c24a112e8dc1d21315f4bcc657619a277532f446373dbb2abc6a58a0bbf74cf5d2a SHA512 3b9f2d7ac96c321b162ebfc34da432c9480001e94b1b5b0f4964656c36b5b741de42aac0af990e63b573c5ce9b8473f056dac7af5d2c1911ae3a33ad90f6ae5d
 EBUILD xmlschema-3.2.0.ebuild 838 BLAKE2B 179f362d50683944907ebf62068db3dc3cea713a010a09705121d89965444d42a4d87785c1e247fc0c37efc325e21fe9484935a62895c9f24ea15c85ccafa08a SHA512 6a5814d898b7ae62fc60d8c88aaf22a93eec49cbba93aff044fe9e24f93f8435e6afa96329252510a7e05d1184964c4f73572979e46081baa590de608234a9b2
 EBUILD xmlschema-3.2.1.ebuild 838 BLAKE2B 179f362d50683944907ebf62068db3dc3cea713a010a09705121d89965444d42a4d87785c1e247fc0c37efc325e21fe9484935a62895c9f24ea15c85ccafa08a SHA512 6a5814d898b7ae62fc60d8c88aaf22a93eec49cbba93aff044fe9e24f93f8435e6afa96329252510a7e05d1184964c4f73572979e46081baa590de608234a9b2
+EBUILD xmlschema-3.3.0.ebuild 838 BLAKE2B 179f362d50683944907ebf62068db3dc3cea713a010a09705121d89965444d42a4d87785c1e247fc0c37efc325e21fe9484935a62895c9f24ea15c85ccafa08a SHA512 6a5814d898b7ae62fc60d8c88aaf22a93eec49cbba93aff044fe9e24f93f8435e6afa96329252510a7e05d1184964c4f73572979e46081baa590de608234a9b2
 MISC metadata.xml 376 BLAKE2B 6aa6c0ef38b17f49452a3db71c7f449dfda8951e2196b904235592921620b6a2064021aae7a1a30639e637c3b9bdb46bcaebec1903a081a41832bd0c5199dde9 SHA512 b814209cd4b87ad5cb8bc447f1d485043d8386339607f39575faf2d26c19b69befa9fd7b7eb2d3fca4b5e60499091a59c1466cfc2f0d9651430949893e2edaeb
diff --git a/dev-python/xmlschema/xmlschema-3.3.0.ebuild b/dev-python/xmlschema/xmlschema-3.3.0.ebuild
new file mode 100644
index 000000000000..d38ccad42ce5
--- /dev/null
+++ b/dev-python/xmlschema/xmlschema-3.3.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="An XML Schema validator and decoder"
+HOMEPAGE="
+	https://github.com/sissaschool/xmlschema/
+	https://pypi.org/project/xmlschema/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/elementpath-5[${PYTHON_USEDEP}]
+	>=dev-python/elementpath-4.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	"${EPYTHON}" tests/test_all.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/xmlsec/Manifest b/dev-python/xmlsec/Manifest
index d60a4600bfd7..311d5236f72d 100644
--- a/dev-python/xmlsec/Manifest
+++ b/dev-python/xmlsec/Manifest
@@ -1,4 +1,6 @@
 AUX xmlsec-1.3.11-fix-xml-testfail.patch 879 BLAKE2B 3d655b40a67b44a4abd65188c6d719e12063e857942fdb112b47da38977864252e3d250e0bbaf5c86f4688bb7701aae89df444c4fef0e3f0eaffc98fe5b6b856 SHA512 8c8f9af415dc9207e5c0599ee958dff6558618f94a9cb3c583b1c9eb6d1de251d714edf1afdee581cb33c7543f88c54d36af9b6f903fe31994a86f1b602e4c75
 DIST python-xmlsec-1.3.12.gh.tar.gz 77722 BLAKE2B b5ecece8063b823cdbe4d58967d10026bdc6f3774954021a3739d579ba3c5a08130af1792921c7892e6bc3d00f88ac83ab30e862775e419e0dad40b990b10cbe SHA512 19c5e3bf58b4b0f8a1cca3e60c08348b02ae298620f8c02b8cfb325aecf0313cb2bd1af89507b754ebe4c35af3b031e232d15ddcd42deae0821c9c0d7571aa7c
+DIST python-xmlsec-1.3.14.gh.tar.gz 80643 BLAKE2B b256ad1aa18b5a746148ff4b2e8b3136a31105e1bb64d2dd686d5e62c16c183187432ee06f0f8b9da0bdba3b96c3c1e7fb6f51148bb5d5d60e54083841973399 SHA512 7a28695bf122a9c04ed20e4a6a09f9428372c908857b1dd983251a7b890cc50e92a6fbaa7f062cd58d86dda14257720e9c9554b2b54d840f9180110d93145335
 EBUILD xmlsec-1.3.12-r4.ebuild 1334 BLAKE2B 2dde1931060b8975a41b33fbf9f1caa338dd79c1d11a7d82024654d5da6d70fff3738af4e2b1e554e1022f3a6603980f7d15c45619e9fdb483fc24f79738f16c SHA512 a7835c119f771c115412b249ddeca88f2cd33c2b4aa79854da1f8a3feb8184e27331a83680d029494ff87a7966b952f2a90a4e2265bdec5de1f3d4ce4e1fa174
+EBUILD xmlsec-1.3.14.ebuild 1290 BLAKE2B 0a7574ba28b005a1359012712033c325241a7beec4b03e3c790421667e34c143c5b3445350494c2276d4ad3809b4d235ade233498a5215c6ba5f634f75a74b0f SHA512 1d0a79dad59b48c41c88201adc6cb938183f5496a1dffa15a1e9c6b9f1bcbf9a5f214b23841c945b5d3f038808578690ac44beec034cec9ce278e42da7524aa7
 MISC metadata.xml 480 BLAKE2B 17abd324963ad808438f7c04a5785ab72e280a5ba8b132737d89c06fd17fc20e96478b4684ae84864bd03690bda6e865200a8eacf3bd0c23ceca4f0230bef1a5 SHA512 82d2b54886ba9d2eeba17aa04e2946c9dda8d30a5bea9a9ba7a5041b559971466c33ceb67ed35c9f865c052df09fb9fd057b46efd4d3d4314f456c8b1c0aaac7
diff --git a/dev-python/xmlsec/xmlsec-1.3.14.ebuild b/dev-python/xmlsec/xmlsec-1.3.14.ebuild
new file mode 100644
index 000000000000..5372479ee926
--- /dev/null
+++ b/dev-python/xmlsec/xmlsec-1.3.14.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+MY_P=python-xmlsec-${PV}
+DESCRIPTION="Python bindings for the XML Security Library"
+HOMEPAGE="
+	https://github.com/xmlsec/python-xmlsec/
+	https://pypi.org/project/xmlsec/
+"
+SRC_URI="
+	https://github.com/xmlsec/python-xmlsec/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	dev-libs/xmlsec:=[openssl]
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pkgconfig[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# Fragile based on black version?
+	tests/test_type_stubs.py::test_xmlsec_constants_stub
+)
+
+distutils_enable_tests pytest
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+	export PYXMLSEC_OPTIMIZE_SIZE=
+	if use debug; then
+		# we don't want to use PYXMLSEC_ENABLE_DEBUG envvar,
+		# as it forces -O0
+		export CPPFLAGS="${CPPFLAGS} -DPYXMLSEC_ENABLE_DEBUG=1"
+	fi
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 956076c6458b..8df2a7388c20 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index cb815c76749a..6d5242f5d214 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -5,7 +5,7 @@ DIST nokogiri-1.16.3-git.tgz 11014282 BLAKE2B fbda2a863374e25a9dae0e7ab145419b75
 DIST nokogiri-1.16.4-git.tgz 11014494 BLAKE2B c07d75af189a8f897b885c111bb43258d039c31c8134df4dff65162fb5d3c24c48ec1194af24d816d8c5cc405b8384ae6430ffdce0a8687504f1de2b784b70dd SHA512 76a179fa7c907d5ffd548e472b9d03d02ba1afbd80c58f8c2760a0e342c2d3db75bd973e7a2f3751c671b68dd63ea3da95a6631f4963e18f85d5c5e7b9b877f4
 EBUILD nokogiri-1.15.3.ebuild 2702 BLAKE2B 8934088d9edfb342b53b74f5fcabf397cf9cdb050c5c8d5ebac1686a15070ae4c1d22d3320de67ac0d055d18384f177353ffa05683e0ba17663c1cba2ae2f9e7 SHA512 3add6c7af7cc8bee29064e8fed1cea2237b401381f6451f5b5938728df1f60046ea4e342cad334630a5e00ccc54fe39a31d8c59a8f10051a56c3219c83e62f9a
 EBUILD nokogiri-1.15.5.ebuild 2725 BLAKE2B 6591c0f404c0c06fa1e832b18dd5839871d0c9b82f3f7a010f37040b598685cbe5d638b2f71bbc0f2e06496919633e4715e0a5a0ba94bfffa94e069800061156 SHA512 7ade4f7015c07f15fad0ae776cb06e9acddf0f3b8e1e0288b614adca1ea03d7506fd8a9471b6a419d2e5e11ccb76274d6b5472332c1c772ed43b982aab677185
-EBUILD nokogiri-1.16.2.ebuild 2727 BLAKE2B 5bbd5dc1a28d112bfbf361c955500343e6b49244031aa07bce967768ced693ce43993f1dd6d3772d511e919a43f2dd2b1c7367eef6c069aa79a61e6022a02243 SHA512 aed9ffdf2e989f22c3262ca01b13d9b5c6d71a7f920dfdd15572b1455162c26f9c9458f0ccf7e9b1f1be6fabf049265fe98bcc98e83a6e5a01283b307f84b427
+EBUILD nokogiri-1.16.2.ebuild 2725 BLAKE2B b4cb761c77111b4f3abf8bd0626c9f866ac6e5aa6edf078f43173d9c79eeb1293e7fb90479825c0ac93650a9ec2de0b290985bdbb876507130ac83652ce206fc SHA512 778595850b73d5d9639f03bda58e7f5b94a764275768916f28e2b6c19c81cb61a1c722672627bad92e3ce7b4fb6849448fa511c0b32405453194216416060292
 EBUILD nokogiri-1.16.3.ebuild 2727 BLAKE2B 61241258e2b01fbfdb35676fc482a093afabf1d9f0cade0a0391a5aabd19c37e6d85e1ae4853cefb60a6cc70a180c69a53d574ed2d4090d44cc0c394ff1cbc96 SHA512 7f231f67cf38a765a44dc89dd7862f8754be8c143db2a74d32d16ff690f8941a931c1ad5314d1588e61fc6164318a90bb73193d333420d05ad7a8055e8bb8d0c
 EBUILD nokogiri-1.16.4.ebuild 2734 BLAKE2B 905c3c8b0fee9cdd41e8c54772d5395ffc4e5e742ae02b8863bf8b0ba088cd325f51b725d704fd9d6930141b89606dcccd1674faacc6f6c4ee6160026fd33046 SHA512 0acbd5a3c24ad15bd4352f2c14cc385217e4ba090ee5d1898502399ac009c6dff29e5db45d924325924fa70be9a3435f1d6d4a9b5e37e682a24ab3cf37603534
 MISC metadata.xml 349 BLAKE2B 824094b81182da6ed2c43f55f8697dbf614662e1e032ed62bcf8ec4ef8fb6e6a1bf346f90863a8cb7d6cfaf2696f0be70fd3027d6d01e583bba0c1334252447d SHA512 9ab17ab504279d8d1ea584f7a6f411fe778b89564016dc0d596ec7f714cf9ad80ed5e30c179ec6aa190bafe8a8b72bfdc5a964d213a8024783da246bbb817629
diff --git a/dev-ruby/nokogiri/nokogiri-1.16.2.ebuild b/dev-ruby/nokogiri/nokogiri-1.16.2.ebuild
index 64d7dd3b0f24..6842350c158e 100644
--- a/dev-ruby/nokogiri/nokogiri-1.16.2.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.16.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://nokogiri.org/"
 LICENSE="MIT"
 SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index e82f864d7e60..a87dfb38dae4 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -3,5 +3,5 @@ DIST rdoc-6.6.2.tar.gz 765932 BLAKE2B 39bcb0f1af6ee4d53b9011179556d8f1a6b09e2071
 DIST rdoc-6.6.3.1.tar.gz 766103 BLAKE2B 15cef9df763e40e105155d49c6c0c1a449c366ac35ab6036c43773c52114f00b19109b056033366b873b5b3317a3bf11c574dd76094d8f606fa0916a84257d0a SHA512 c6f3aae83e895e2de28e5a7c27456160dd53007ceb4464a045e0211473eb3d51f49a7c2ac28f2e44e807c5b36447140d15eadff65bfa52335e94adc9c8b56d2e
 EBUILD rdoc-6.5.0.ebuild 2732 BLAKE2B 254a80d4442f1179852aaed6a98aa7ff488c1f87cc8c37ecde832f4954979091ea17b9b6e9bcc12fb649cb257803e58a5aed549e37664458be9c5672d5a41fc2 SHA512 1d5db6b03b09668ec089ca199cbe0a1b7ded3d7a1bd5e3abd40e2ce67381289f16e88d056eaf8ca2c5d446e714c066d98edc299a84f8bc68b705640ad04f86f6
 EBUILD rdoc-6.6.2.ebuild 2733 BLAKE2B f859027cb05db8bbc6904bbe093f7c8be893986a7c1ea397db826f16957b964b16c67c2aab1ca0050b7e1832507dc8ecb999611d0abe0ec23a0bbaa0ae3e5482 SHA512 710cc66d453aa88622f1c0890bab5cd439c2c9ca2e95e868f3ff720bd77a2d3fed936d26d30062e671e3b268fcab743c09f9b6a500c5ea2fb01b8e9a7402a837
-EBUILD rdoc-6.6.3.1.ebuild 2732 BLAKE2B 2c463cc8fda17146af69807332360694fd6506cfa1a1eb9fa95774f3f8594fd76c618c233f3bcc356b7617885711fde628663237c482bd3c488644940d9d872a SHA512 5da033e0f616abdd98e5bd5336392a85017925e56a570861c2e51e1ca1937e60a8a76862e46f12d8b07f4b0a07e72cce9075dc4edda663c4d82325f724950226
+EBUILD rdoc-6.6.3.1.ebuild 2729 BLAKE2B 8c3576a9625de74fab97d6f3858f6e8ffa3e04f71dd89a8dc3126e1e129d63a50ca38ac2f2d0050f167a0e5866b69acdb40119f40605018122c2e32595eb0e56 SHA512 976ec0a03ef6f651be3a3a088ebb03fc5270a87fb0c17cff708d9f21306eb4be159a320dcb49d0cd07a74e63e7d1ffa832179bf708793bc5f4c0d282ff5d7d6c
 MISC metadata.xml 336 BLAKE2B 142894745c624081f44dfccc6509273287120a43ceb8d7471634d92ab970bbc7747ce12b3a770b085c8c55a30f2c52ee34e0f27ba4be804ee2056150fb3b035f SHA512 438973812b1541e96ffd4add9422bd19e2c09f3f5b8ddc3ef86a670827c6bce9ed9c1bf9df0601927c959584b63a9d0986d0377807856ab8301fc8a8176922e1
diff --git a/dev-ruby/rdoc/rdoc-6.6.3.1.ebuild b/dev-ruby/rdoc/rdoc-6.6.3.1.ebuild
index 17159524cabf..05be012bb1d5 100644
--- a/dev-ruby/rdoc/rdoc-6.6.3.1.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.6.3.1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/ruby/rdoc/"
 SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 Ruby-BSD )"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 45cac0542308..9b7de14a45aa 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/gauche/Manifest b/dev-scheme/gauche/Manifest
index 150874dfd8ae..683089c069a3 100644
--- a/dev-scheme/gauche/Manifest
+++ b/dev-scheme/gauche/Manifest
@@ -1,7 +1,6 @@
 AUX gauche-ext-ldflags.patch 384 BLAKE2B 57b7463086c0763413b8fda3d7688c6a61bd4456b3209a80b6eabed088e0c71eb5ae4c53b18fb0e6b7468ac03fe33f7884f265ab1ea998e8457b0ef126e6e841 SHA512 df42c5f25adc5a67ad049ab78aeaa4f565d18818dd6dfff5a64a78e9e3101595a4279d72e8f946e4f7da7be30f9f11c089c7f4a65d2eb2135980414c3d6e9cbb
 AUX gauche-gauche.m4.patch 964 BLAKE2B f02f2a1fad5d2ce923d1f9a8af4506908afea5b24c65d30ac2dbc6402c826f1ee374bfbb0ac7e9896a980fa352620f7ef8d2d79fe1b0ccb4915e3ceb86dfd90d SHA512 81bd71285f9f7f7f6b310347905fa2b0c7b708a0bb8bfa33414b14591d5849f0b42d9a6f01f22abb307417778181c292d8ff7e42be259b7d4de09356ea1692ab
 AUX gauche-info.patch 3621 BLAKE2B 85a28948e25d9af2d086925e60e32cc03ec1b2e69fdce275e1d9df93e45215363ac9da5ba14c122346feefc36043a18937cfbf503918ef596470fc9c8b3c53b8 SHA512 0ee0fd886c80a7dfa0f2e3c1fb5d85f948482c9f067c6632b030c1d644f0dc348d365cd3e4a65812ab7828eff5ca9cf2e911d49fa956741d535a48dfc0321baf
-AUX gauche-rfc.tls.patch 277 BLAKE2B 91e745207e64ba3c83a1252be6fa63c486a3ebf148149b5772720a862299fa9bbf122a75ed8a537a29b78d75cf785ccc72de3194969931c62b52a7c1b7007208 SHA512 6aceaf321a1593765c91a83b14e057b2ee514e768299fa43c71bbe5f04b8b60a0537fd68cb8b4b5a61b091d5c4f50dc227bde2637d6be33956089dc0e40ab968
 AUX gauche-xz-info.patch 1220 BLAKE2B 88133f0cfda992fbba45875c6f872cb928a554a7d51001ee6614ec199bdae8316b5b35c41ca3609e35b8d99821483c5377c23608f151b3cbad2ef1fe5b3a838e SHA512 f4a6bb582403648a1b0f005fa6eb2db728180543c70ddfd28829cf3dcf679535b507f87ce3f48729d0180ce1c321706e3744156b8d83221208bea8106c929ab6
 DIST Gauche-0.9.14.tgz 9352431 BLAKE2B cb747a16037167a95a543e324b53a48e3cb4dd372e9f6cc00603b7072b902c839248fbf3e9926360a2732fcf4bc0caa16a4ea1ad757e84d5d597ef4bdfa2592f SHA512 3dd9dc8627fe1c5e518731a17dd984120485b36d6c2bb2d0d54a8b5f6778f45efd02640abe4699466eec2eb18dd4474d9525848029468128974c13c615087662
 EBUILD gauche-0.9.14-r1.ebuild 1185 BLAKE2B a17848d993cc171aa3e330a24abafcaba096401003222abfd50fc70baed8a61254c69d1af383276fa72a4bac2d8d7d5aae04d876df2f6cbd2b3e7cf4a4b5caa9 SHA512 e1fa12db1923bcc90fae1b0a054c1adf4f4a9dd01ce18633111c458c62a87d52b2e10937f3579c7c6a8f9aefd30f88843e115f515413356c182ad9768e7562f5
diff --git a/dev-scheme/gauche/files/gauche-rfc.tls.patch b/dev-scheme/gauche/files/gauche-rfc.tls.patch
deleted file mode 100644
index 5eb3b991d3b7..000000000000
--- a/dev-scheme/gauche/files/gauche-rfc.tls.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/ext/tls/ssltest-mod.scm
-+++ b/ext/tls/ssltest-mod.scm
-@@ -87,6 +87,7 @@
-         #/\.\.\/ssl\// srcpath-replace
-         #/openssl /    kicker-replace
-         #/system\s*\(/      "safe_system("
-+        #/(s_server) / "\\1 -4 "
-         )))
- 
-   (p "#include <errno.h>"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 4af564386373..dab6f75cabc3 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 120b660d2556..deed8a4ffe42 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -2,6 +2,6 @@ DIST diffoscope-257.tar.bz2 3112404 BLAKE2B cdd7901bdb7cfddb77d165d0084bfc4d9ad1
 DIST diffoscope-263.tar.bz2 3139927 BLAKE2B 6d13b9a657c4a7618d24487096a0fb94034f4ea2b84384b388dc8441ebe68f8de12dd7a34ec0075bd03ca3d437e65a23fc086184ba7c3764682390f6290a17e4 SHA512 41c5495bd4d4f4a0c340bac444f3cbc4a9b6180227efc02d593590a50b47acd06dc755875419da3a52d8aa831733d76450388c29e856d428b159d3c2c793de1b
 DIST diffoscope-264.tar.bz2 3141558 BLAKE2B 28e50c327b606053d378633bfabd262d12fe8d34778bb1451e7d34d6525ddc9ea3e72907cb948072a8466c36841a9b4d70041b7fbd099924e1dd61a472a7bac8 SHA512 e79e8db1a3a6503f871ed2686110434d1c8b43758d3eb3fd1c98bb6dabe2792297712950470134c592bb6efc4ca741277f3158597381bbdea23945de6adfa1aa
 EBUILD diffoscope-257.ebuild 3681 BLAKE2B c4f1f1661fd97e6b04eff67c1aae1db9893df9b5e91aa54aed8fedd4fa1ef7fa071f799c76377db3687f0c7b073be41eabac629118e38e063d8f29d8493e996c SHA512 0f24c5d7d22c8bbeae42d3cab7f7e25c347ac1f3d80320a92e22b33c3447b439a3794e443f939fa3861c82a2c0170b1ac2a6f98f20312a800147d03ce6a22dba
-EBUILD diffoscope-263.ebuild 3682 BLAKE2B 9416955c1c9414ea2bcfb9ca5138638a3963dc71ec5443d6d993e3d132a566f62e613dd6dea2e38f26b3af6a176d620da2fabbe2159a8f979d2f8d91ae49332f SHA512 6a1cf8404cb306e7ddba0d19e591f62b622e616118f60285612a75991df02270d772eb647d1649f720da5c709312a4c18ad1eb86d9941c7f8512339fba7904d4
+EBUILD diffoscope-263.ebuild 3681 BLAKE2B c4f1f1661fd97e6b04eff67c1aae1db9893df9b5e91aa54aed8fedd4fa1ef7fa071f799c76377db3687f0c7b073be41eabac629118e38e063d8f29d8493e996c SHA512 0f24c5d7d22c8bbeae42d3cab7f7e25c347ac1f3d80320a92e22b33c3447b439a3794e443f939fa3861c82a2c0170b1ac2a6f98f20312a800147d03ce6a22dba
 EBUILD diffoscope-264.ebuild 3682 BLAKE2B 9416955c1c9414ea2bcfb9ca5138638a3963dc71ec5443d6d993e3d132a566f62e613dd6dea2e38f26b3af6a176d620da2fabbe2159a8f979d2f8d91ae49332f SHA512 6a1cf8404cb306e7ddba0d19e591f62b622e616118f60285612a75991df02270d772eb647d1649f720da5c709312a4c18ad1eb86d9941c7f8512339fba7904d4
 MISC metadata.xml 2086 BLAKE2B b05c2c3c425a990f64aea25e9dda3e1afb410068d90e034d5d9df7c76363613d309f8bc57c70284f2e607a3e2096a0132724dddba8df487bda3046d8ed7aefa1 SHA512 8c86ddad7fda722956931d73a6f5dfa8e43c25623edb3b20bf3e68765b04ed4d20ba31b68315812978a9546b3c678597fd41132a4a6ad4658ba9fa5f79cfc90d
diff --git a/dev-util/diffoscope/diffoscope-263.ebuild b/dev-util/diffoscope/diffoscope-263.ebuild
index 7db31ced97d2..7191da7ed124 100644
--- a/dev-util/diffoscope/diffoscope-263.ebuild
+++ b/dev-util/diffoscope/diffoscope-263.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://diffoscope.org/archive/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
 IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
 find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
 mono opendocument pascal pdf postscript R rpm sqlite squashfs
diff --git a/dev-util/fq/Manifest b/dev-util/fq/Manifest
index f4ff0937c9e5..7084ea3e81f5 100644
--- a/dev-util/fq/Manifest
+++ b/dev-util/fq/Manifest
@@ -4,7 +4,7 @@ DIST fq-0.11.0-deps.tar.xz 12384484 BLAKE2B 5b60f1f5d0189ab9d734f24a119a67529fff
 DIST fq-0.11.0.tar.gz 17696740 BLAKE2B 6f1bd80bdc13a3c271311440869905dbadee229af6243e6121216604e55216deba7fa02838cf7f0bdef9cfc3202ae3132eb60ad90b6b75f3e5731fd2ce076f9c SHA512 a953046f1d12e6bd519d8f54521e3d48a727b8acfb0f3ff63cee139f97b35e54399e16158a1dda719f2068322fe377eff11200870e4db28992176598ee2b4efe
 DIST fq-0.9.0-deps.tar.xz 12255984 BLAKE2B b14169dd1f6889ee7c8460d11e5e8306ff96b85c68865d4335bb2cb42df85eb3f30423e55647ba3e4568115f6d68fab576a369a3662614d51c17355ca927f52b SHA512 ffed1929c17c6397df2a4845034014a8d33400caa6579e79e637818a03340be47c449ec258174dc980cbbc3abab3d691449430b23da790ff860999122412b461
 DIST fq-0.9.0.tar.gz 15107174 BLAKE2B 4ab47ff8e726d1af9785cf9d83e628235cd43ef659c93a5a15759f7844f5c323e0e4ae82dea45b7b9c756f9cb264c0f7164a9fbe6fecdde1478f94c6a3301784 SHA512 4b8fdf25cd4aa255d4f689d612c1f43997e277fa4b4f522a0b346ec55ebdbeef93a20fdfb78a2c23df16a475c70abebec507145f0fb8d2ca1d3f564076b2ddad
-EBUILD fq-0.10.0.ebuild 860 BLAKE2B e8f33b4a1409f813422eae843c51776884b55150465abbb339f96b1c47d50ab6ed258afef64953e68dadcb96a0f62e3bb8fb179aed0bf0c04bb5ee9db003294e SHA512 40aa0b30d7b87545b2b7834cb69790763a7565cba2dade3e33236cba0bd49e987bf2e67302e0dc5fc04122308d599b7c4490598a1aeb4ed88e9efedf1eb4c6f6
+EBUILD fq-0.10.0.ebuild 859 BLAKE2B 3fa0bbb43631ca808c7817c2dda53c836adc925048a15512f186a260e2dc406459867208382f6af135b9ce6004edb9bc6b1dd4710169d2b6f304d7e84f0a419c SHA512 1be83a100054634ab68b41d527e16804e0165ca9fac145c67703459f04e8d586870b3b73211bef7ec9a90ad0ef50c1646dc8cb0c823085d6b5ce1b9d8c3563ab
 EBUILD fq-0.11.0.ebuild 860 BLAKE2B e8f33b4a1409f813422eae843c51776884b55150465abbb339f96b1c47d50ab6ed258afef64953e68dadcb96a0f62e3bb8fb179aed0bf0c04bb5ee9db003294e SHA512 40aa0b30d7b87545b2b7834cb69790763a7565cba2dade3e33236cba0bd49e987bf2e67302e0dc5fc04122308d599b7c4490598a1aeb4ed88e9efedf1eb4c6f6
 EBUILD fq-0.9.0.ebuild 859 BLAKE2B 3fa0bbb43631ca808c7817c2dda53c836adc925048a15512f186a260e2dc406459867208382f6af135b9ce6004edb9bc6b1dd4710169d2b6f304d7e84f0a419c SHA512 1be83a100054634ab68b41d527e16804e0165ca9fac145c67703459f04e8d586870b3b73211bef7ec9a90ad0ef50c1646dc8cb0c823085d6b5ce1b9d8c3563ab
 MISC metadata.xml 313 BLAKE2B 49888cd21e49fca7d7913fbd265cbffd73dcfaa5080e09ccd1f5b9c62804e5b9fb1de1e21df96609079c18c481b2847897b4fe1a9fc499d0e6dc2559e677a27f SHA512 1d125e77b24aeffe27b0d54b8b9f247e1e2b62037bdb127f232d3089d63e1b92c2062e37446067850defc382d7e49785152e9af86cd46f44827e2e037dd291a7
diff --git a/dev-util/fq/fq-0.10.0.ebuild b/dev-util/fq/fq-0.10.0.ebuild
index e41588bcdc59..6830d05644b5 100644
--- a/dev-util/fq/fq-0.10.0.ebuild
+++ b/dev-util/fq/fq-0.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar
 
 LICENSE="MIT BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/gitlab-ci-linter/Manifest b/dev-util/gitlab-ci-linter/Manifest
index a0900aef17e6..724dcfb3eabe 100644
--- a/dev-util/gitlab-ci-linter/Manifest
+++ b/dev-util/gitlab-ci-linter/Manifest
@@ -2,4 +2,4 @@ AUX gitlab-ci-linter-no-strip.patch 508 BLAKE2B e7c41901cdaef662218fb5e1631971ef
 DIST gitlab-ci-linter-2.2.0-deps.tar.xz 24021948 BLAKE2B 34f31d80477e7d8b54c5ed18cddec8414c5f85edfebe9659768f67cde9fb5db784eaa94c8b33a33612beb66056656dfe6414a515109f719b6448e94887575dc3 SHA512 ecee1ec2188a9c8d6ec1ef4f4302a5278fa146fa059050d5da37fed550025277b86ea748629ab425be03b8382a71decb30998b41d0b10d6c0fc5717b61c18a38
 DIST gitlab-ci-linter-2.2.0.tar.gz 38488 BLAKE2B 78d4083ad10cb43cf2d2f1a57f6e37ca7cb99acc60da751bcfe44d728affb70dfd9dcd62d37def09f7d1b26fcf9f04e8bdd06bcfee7aaa891f387b038c985bed SHA512 3d63b7f73ebf5ba1885f8d56e9d8179f3854b45a6129cbbd2db0e8b3f4b2ee33ab1f3f2403f227aec667108fa56b4b1018cd1cd43c912599ba772dbaa1b0e036
 EBUILD gitlab-ci-linter-2.2.0.ebuild 661 BLAKE2B fabe81bcb66ec14a9a6ff97537b3616bd772dc8456ee84a4c931706feac906b418270097ebf272bac84cfe97e083dd1132ab98b0dbe0fb39869c7c74c75cd1e9 SHA512 c37b6d581b3217d3b0f6c6b58ae159e8d7ae1cd51d343508ab0a2737091ba2e99a33a65c7684fa6cfd0f3e0b3b4a3ac59c8843192ecdeb5430ab91e68d903ffc
-MISC metadata.xml 258 BLAKE2B 14fff3c5ded754d49480aaad0bf53ddb8cc4d824c072af60647f5bc179aebe8902564c877b9ac0199384d2823b1950a6c48cd2c6297c604e0d2f92c276a9768d SHA512 2d2417fd604c1e3dd12bcb46d06e08b1acdf2117eea460d115f66f0114a6daf2a3dbaae7af7ae74625398d336f5759a6e5456f4f1d0104bcae4e74265f6a0e54
+MISC metadata.xml 340 BLAKE2B bf2d8898eef5dd6ed46fca771454f1d353af3b62f0ae70321be0c8b3b33d629f9efa5e013b277549ba3adb864330eb538dfc1498309a98d6b56073087f096cc9 SHA512 b2883b99912d02eb073d91a54a8a61bde30c5dc42c3a82caabe36003d815240379d4ef513e5ed42168781d5a4ab69845427fcfc7e0d5fcebbba70fb18c05db32
diff --git a/dev-util/gitlab-ci-linter/metadata.xml b/dev-util/gitlab-ci-linter/metadata.xml
index 4c21c4755715..3587e164aad4 100644
--- a/dev-util/gitlab-ci-linter/metadata.xml
+++ b/dev-util/gitlab-ci-linter/metadata.xml
@@ -3,6 +3,9 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>williamh@gentoo.org</email>
-			<name>William Hubbs</name>
-				</maintainer>
-					</pkgmetadata>
+		<name>William Hubbs</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">orobardet/gitlab-ci-linter</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 20727e7f88c5..bf1871ec609e 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,8 +1,8 @@
 AUX intel-graphics-compiler-1.0.8173-opencl-clang_version.patch 1807 BLAKE2B ec6aac8c78d7584e043a258585cbae6218fd8aa167d853e1eea96313298df7347ab7652ec2bf83199129e07e534d52fcd200858036e3d0af2c4f79ff249104f2 SHA512 1a0db341aab280aa205965dfc82d17b29f681bde76932f8291243afad985523f601c7279b1fb772ebc4d9197e5016941a1ad07cea2b6d7199710a7ee22fd81dc
 AUX intel-graphics-compiler-1.0.8365-disable-git.patch 1140 BLAKE2B f870def1128c30c3e50a71e9eac39eccbcc9bc798be574324016c6c31ed3a3f82e1499f1aada5a2c475bd6b6c467b1b236635fdd6b5145904bc63dc53f8d75e5 SHA512 d1d53a6f4a47031ec4cdcf3f57c059536ccf571a72929da3d9070487686f91f4202d20c4d626da616250f66b31815b61fafa82b903b1f5157a226ee748097bda
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
-DIST intel-graphics-compiler-1.0.15770.15.tar.gz 9105504 BLAKE2B 6b5bbb0b32dabcc93c62b8d0f53a4c3fc0a2830e4ab685e471902ae3cff2f30ced5df5cada015f19be500972b982334f1a3b5ce4befc72de207b83420cdc8768 SHA512 4da1882834338c6dd51aa10f64eb6cdadc65ed2c5772c0c9083dcc378df62adfe1fd8fd0d7e8623bf9447112e76d334334689ed03a84b1680a858f29c0036ffc
 DIST intel-graphics-compiler-1.0.15985.15.tar.gz 9175100 BLAKE2B b6d184d22f38e576ddde21b624cb438f997ce5f0549d3db65f73c755c6200dc73928c1961e081954948b4a7e5f2b8c5451998a5aca34a993876e8b08db7512a8 SHA512 98edc835a76ea4d4be5a0732c45656406ddb2eeaa5e0ef0d7e2fbf6cbb0866afb406cc2dee95c9581f2191659344dc771403ded0cf4a4b5609a535efffc4ece6
-EBUILD intel-graphics-compiler-1.0.15770.15.ebuild 2827 BLAKE2B 32965b9946ecf65edd76589c2722b54951c31d2805e62db62fcd5a181af80d0564121019110af3980648d5f0b741f7e60a933f61a1d6661b0919d550a6d127a3 SHA512 813b904125301cc5162b5b50ba5bf23ee4bc85ddc876b5cf70dd084a21104f0bbca4700cefefee51ff8f97125b1837fe1aaedebdb30fef39b59364d3cf89c243
-EBUILD intel-graphics-compiler-1.0.15985.15.ebuild 2834 BLAKE2B c773c2df03ef0732383a32ccd84e59a0413a766cfbba7bfda0e45d0b42573224bf4eeb63bd05964042856b99ce7bf79892d42c9ea5496cbfe9b2094c57c394a0 SHA512 944b1dbd115c3f008931e07a60f56f6cbb5fe69900879bd6513d9cfa5e0e1c1cdccc400301eafd6098533c902ea7569b3b22183f618696257d3a8e4d35329914
+DIST intel-graphics-compiler-1.0.16695.2.tar.gz 9525078 BLAKE2B abfc63f5c4ec257879b3279b113bca3fe612ba4c4b2eae02a736690eedf5ed0639e86482607998fd01be0331c45abf230d65ff38aa2ea5276d23a32bed170a40 SHA512 e8146083ade89cbaf3db7bb9cb345c6a887715259821ed51f91a0aad58354bca3412c4fd22dc71cf38e668b6bceb176fc4c5fb568056823b88bd8e389cc91ca1
+EBUILD intel-graphics-compiler-1.0.15985.15.ebuild 2833 BLAKE2B 93cab9759e547b6ff4380116be36de3ccbfbbd86683ba7ca2ba95ff500e0cca01cc09c734bd1d308d0d18e3dd49b20dc61368d0330db96075d01939e72f83cd3 SHA512 a5e469ac2717e783c189a85467e4a88b6dfa48515e54afbc514b980b999f493e25032094e51e1bd58924f64175c8ea99958a2d0585676f0b5e473476114f80eb
+EBUILD intel-graphics-compiler-1.0.16695.2.ebuild 2834 BLAKE2B c773c2df03ef0732383a32ccd84e59a0413a766cfbba7bfda0e45d0b42573224bf4eeb63bd05964042856b99ce7bf79892d42c9ea5496cbfe9b2094c57c394a0 SHA512 944b1dbd115c3f008931e07a60f56f6cbb5fe69900879bd6513d9cfa5e0e1c1cdccc400301eafd6098533c902ea7569b3b22183f618696257d3a8e4d35329914
 MISC metadata.xml 682 BLAKE2B c5e74bbb1a5aca5eed7cb75a19820dc9d78d7ef7a15687924d16863a82a535403ca67103ac458d4b86f380244e726a3bd20fb496f8048f999abdf89950a7092c SHA512 d5a35d2104e9aa5caaf903a9f61ca8a8c4f8b5bff3e993c9964dd63196e64b88e3e7bde2e0cff9dcee9c66bdda0cabb43c5ac8c121796626bb0e7f4013929fb3
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15985.15.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15985.15.ebuild
index 8a1eb1385c0e..90b406a314e6 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15985.15.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15985.15.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="debug vc"
 
 DEPEND="
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15770.15.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.16695.2.ebuild
index e0ea95be051e..8a1eb1385c0e 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15770.15.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.16695.2.ebuild
@@ -4,12 +4,12 @@
 EAPI=8
 
 CMAKE_BUILD_TYPE="Release"
-LLVM_MAX_SLOT="15"
+LLVM_COMPAT=( 15 )
 MY_PN="igc"
 MY_P="${MY_PN}-${PV}"
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit cmake flag-o-matic llvm python-any-r1
+inherit cmake flag-o-matic llvm-r1 python-any-r1
 
 DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
 HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
@@ -18,17 +18,19 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="debug vc"
 
 DEPEND="
-	dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
+	dev-libs/opencl-clang:15[${LLVM_USEDEP}]
 	dev-util/spirv-tools
-	sys-devel/lld:${LLVM_MAX_SLOT}=
-	sys-devel/llvm:${LLVM_MAX_SLOT}=
+	$(llvm_gen_dep '
+		sys-devel/lld:${LLVM_SLOT}
+		sys-devel/llvm:${LLVM_SLOT}
+	')
 	vc? (
-		>=dev-libs/intel-vc-intrinsics-0.16.0
-		dev-util/spirv-llvm-translator:${LLVM_MAX_SLOT}=
+		>=dev-libs/intel-vc-intrinsics-0.18.0[${LLVM_USEDEP}]
+		dev-util/spirv-llvm-translator:15=
 	)
 "
 
@@ -36,7 +38,7 @@ RDEPEND="${DEPEND}"
 
 BDEPEND="
 	$(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
-	=sys-devel/lld-${LLVM_MAX_SLOT}*
+	$(llvm_gen_dep 'sys-devel/lld:${LLVM_SLOT}')
 	${PYTHON_DEPS}
 "
 
@@ -51,7 +53,7 @@ PATCHES=(
 )
 
 pkg_setup() {
-	llvm_pkg_setup
+	llvm-r1_pkg_setup
 	python-any-r1_pkg_setup
 }
 
@@ -64,7 +66,7 @@ src_prepare() {
 
 src_configure() {
 	# Get LLVM version
-	local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
+	local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_SLOT})"
 	local llvm_version="${llvm_version%%-r*}"
 
 	# See https://github.com/intel/intel-graphics-compiler/issues/212
@@ -77,8 +79,8 @@ src_configure() {
 	! use debug && append-cppflags -DNDEBUG
 
 	local mycmakeargs=(
-		-DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
-		-DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
+		-DCCLANG_SONAME_VERSION="${LLVM_SLOT}"
+		-DCMAKE_LIBRARY_PATH="$(get_llvm_prefix)/$(get_libdir)"
 		-DIGC_BUILD__VC_ENABLED="$(usex vc)"
 		-DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
 		-DIGC_OPTION__CLANG_MODE="Prebuilds"
@@ -93,7 +95,7 @@ src_configure() {
 		$(usex vc '-DIGC_OPTION__VC_INTRINSICS_MODE=Prebuilds' '')
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DINSTALL_GENX_IR="ON"
-		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
+		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/include/LLVMSPIRVLib"
 		-Wno-dev
 	)
 
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index b8f589eb154f..f954e912b54c 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -4,8 +4,12 @@ AUX jenkins-bin-r3.logrotate 188 BLAKE2B 0dc1f24b3f6f709060dcc4d758c4aa7b1555309
 AUX jenkins-bin-r5.service 509 BLAKE2B 570167d1949e072aadb03f570166a5c35de71260e3707da2c7258f9d39667be71bb9ede116fccd8d54f02f1769facb076e83ae0102fb65c1f376c37fc4b0d38a SHA512 5f9075977c8df0788cde4fbdfa9e84c4ca23c8927d5b88ab82109fab1326465ddea18b8f99831155a9c5b0fd902d204bd083c0bdf811b83c73eac8ab3ebd9ad9
 DIST jenkins-bin-2.440.1.war 86502820 BLAKE2B 8f94e12aaab5dea9c50169d9ecfd036528db5698c2d9214ab850175be51bd6c4a3d33be38202f099cb375870e2a8bd09863d0ec79eb803d25e39c9d425f88428 SHA512 0c7505204ab7af52dd229eef73e9bcc7c0fea62192eafe6b347a174e1f430a319c135af94fa070e6c0a7ff4ad0957901b14564a7debf76b365de1d2bc9507fc0
 DIST jenkins-bin-2.440.2.war 86482142 BLAKE2B 7afe45a79c2852fcf0a3d047f7227e6e7bd55fc0877be1c419ee60e476e455d6bf10dd213a6e82db51c5e15decc977e774be0fb138442dac7d59910050a528d0 SHA512 590bd2d781671f91401922ee09aee5d2973d6d6a67fedd46b0073dd24a1826822f5beb8f266094055566bcc848b5e88ebd589562e0ddd49f398037919cb92fc0
+DIST jenkins-bin-2.440.3.war 93489042 BLAKE2B 23f7471b8ce5813b7a7018c033b96874e7e040ea900e810dfa6879ee96c6b98bc6b87aa9f09b4874cede44bf40f07bf8a4a57a909530aaa8d12a9ce3f0ab73fb SHA512 e44f0dcbdef443fed38962966e1e6a231e3ab2c070f7f3c197d5c18971ffb7886fca6b684e34608f26d71500662546ec53ea1edd24b3fe15cb624d644fd7dd7e
 DIST jenkins-bin-2.446.war 86466583 BLAKE2B 088bd894bee34fb83700053c3fa598d7ac72d3b3c99e21ced77e64a4564508b214d1fa3ce2ea751e0367579dd7ce45b97b1db90fcc3b7efa1bfc5c08616cb5db SHA512 d1a2d8bb261850bdc2b1a982083570696709e61d492a516d15ce60338cd77cdf5852a5471d41aadcf961af63732dc08237741c716947bc2667e266255ef6bd35
+DIST jenkins-bin-2.454.war 93687808 BLAKE2B 9f52eedaf53d671997bc40816c8d63e1cd8b464c5bb240e0ea01271cdb7a9734899ce3c8c909c3e431220e2a23a4a78a1012e1487bf35639c7b394893a9e4cb2 SHA512 52ed14e3e8edcafd8a192d7ea06bf68d16e6eee9b0da35f5fe2ba258c28701b9ceaff233737f2bdbe525638d1dc1bf613aa5d8b5c6c880e98946ae908a26c777
 EBUILD jenkins-bin-2.440.1.ebuild 1112 BLAKE2B b628bb0d28d7eeda4a34ced43413d4a179fb09e27b980f6c9111facf952096e4412c23dd9e0c69826f116d3a89718520a1ba94adaf71d90ff56da33ef6fd0bd3 SHA512 9df68d08f50d712bdee5ec75ac3729a3ad7674f610c50964bf6b814dd3b65c180f3ca51e77087165ff3454ca338ae9af7299f59970fbd843fb5e20ace8b0f849
 EBUILD jenkins-bin-2.440.2.ebuild 1112 BLAKE2B b628bb0d28d7eeda4a34ced43413d4a179fb09e27b980f6c9111facf952096e4412c23dd9e0c69826f116d3a89718520a1ba94adaf71d90ff56da33ef6fd0bd3 SHA512 9df68d08f50d712bdee5ec75ac3729a3ad7674f610c50964bf6b814dd3b65c180f3ca51e77087165ff3454ca338ae9af7299f59970fbd843fb5e20ace8b0f849
+EBUILD jenkins-bin-2.440.3.ebuild 1112 BLAKE2B b628bb0d28d7eeda4a34ced43413d4a179fb09e27b980f6c9111facf952096e4412c23dd9e0c69826f116d3a89718520a1ba94adaf71d90ff56da33ef6fd0bd3 SHA512 9df68d08f50d712bdee5ec75ac3729a3ad7674f610c50964bf6b814dd3b65c180f3ca51e77087165ff3454ca338ae9af7299f59970fbd843fb5e20ace8b0f849
 EBUILD jenkins-bin-2.446.ebuild 1105 BLAKE2B 54b6c37d361b48403144b1c6bc4685b08cae8d7998c3dad138b7476a904fa69d7cf8aa073545ec25aee71f0da324800b9335ecff047a81caf3e6d0157dc21967 SHA512 539382470b34a88d6fe17b6837c0bf97189278ea52e8ce4057ce8dc6661c66dbf93df47fdf87f49fad89c855f7f5afc8b46d6d7fa67dc71166e1847334aa3dea
+EBUILD jenkins-bin-2.454.ebuild 1105 BLAKE2B 54b6c37d361b48403144b1c6bc4685b08cae8d7998c3dad138b7476a904fa69d7cf8aa073545ec25aee71f0da324800b9335ecff047a81caf3e6d0157dc21967 SHA512 539382470b34a88d6fe17b6837c0bf97189278ea52e8ce4057ce8dc6661c66dbf93df47fdf87f49fad89c855f7f5afc8b46d6d7fa67dc71166e1847334aa3dea
 MISC metadata.xml 398 BLAKE2B 371ef010b09278ac9185194c2431f7026039445de0d9b353b560d4e69a52452b275a5739332bc33029b678c91b76b65f377ea4417ef52cfd242aca91dd505b53 SHA512 f071cbac4947308e68d23ce4d3a14a61deccc1633a31f28d464ebac7d566ff8fb300246fec1a1603823dc2d9f0a13a47cfa84f5423eae3f08e683a4a183699cc
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.440.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.440.3.ebuild
new file mode 100644
index 000000000000..ee2930a81a40
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.440.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="The leading open source automation server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="https://get.jenkins.io/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+SLOT="lts"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+
+DEPEND="acct-group/jenkins
+	acct-user/jenkins"
+
+RDEPEND="acct-group/jenkins
+	acct-user/jenkins
+	media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	|| ( virtual/jre:17 virtual/jre:11 )"
+
+S="${WORKDIR}"
+
+src_install() {
+	local JENKINS_DIR=/var/lib/jenkins
+
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r3.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}-r3.init jenkins
+	newconfd "${FILESDIR}"/${PN}-r1.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}-r5.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.454.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.454.ebuild
new file mode 100644
index 000000000000..4d3377af21c0
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.454.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="The leading open source automation server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="https://get.jenkins.io/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+
+DEPEND="acct-group/jenkins
+	acct-user/jenkins"
+
+RDEPEND="acct-group/jenkins
+	acct-user/jenkins
+	media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:lts
+	|| ( virtual/jre:17 virtual/jre:11 )"
+
+S="${WORKDIR}"
+
+src_install() {
+	local JENKINS_DIR=/var/lib/jenkins
+
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r3.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}-r3.init jenkins
+	newconfd "${FILESDIR}"/${PN}-r1.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}-r5.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/local-log4j-vuln-scanner/Manifest b/dev-util/local-log4j-vuln-scanner/Manifest
index 8d31a7b2e68c..39c14a40956a 100644
--- a/dev-util/local-log4j-vuln-scanner/Manifest
+++ b/dev-util/local-log4j-vuln-scanner/Manifest
@@ -1,3 +1,3 @@
 DIST local-log4j-vuln-scanner-0.10.tar.gz 50824 BLAKE2B eec2aac401baf935f86ee267d5cb2c7da97353200a543c8d05bb653c34173f07e277e8425f3b2bdef27cc9f9410daa859ab8bda4b814aae6a73de7e5ae4d674c SHA512 47e17fd733f7dd2b218f9f93cd3787f01942d790fefa0cb20fa9c0db35eb0214039c608a5d152df190db19273c1dd0dc0e94ea428e6cc95e89e8c8744fb7f6fe
 EBUILD local-log4j-vuln-scanner-0.10.ebuild 590 BLAKE2B 5e78c6d957d40f690e7264a0140fb8e9eb75850ff79e3f52111aaabf0bc26671cabf6541bd703d9cff88a58c4b899afb4bbb6fb2cdb47833c5a7bfd274fee25d SHA512 1c0798ebb783d05e75179a620e40cee7acbe7ee8c6b06bb674a66dc65c9458a20f5c9ce60e124311a8f4dbe1173cf018dda55c87f8732b2ff6118234d754a8f0
-MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
+MISC metadata.xml 344 BLAKE2B 7f604cbbb23242a90ded164df7bc369a9ecfc85870fd0f8e10bfa1f38bd26d0c0a0faa056db1ce5475d9606d880f4f0ef8ca8db31c280fa2568365f2dd2be3a3 SHA512 0963ab3d0c4cce93588e033af364852316473d7277521492219913a820929cfddf1c5f764a2d622880dcfe09162bb1ed3756b35af7b7969c55aaf2bfd8ceaf7e
diff --git a/dev-util/local-log4j-vuln-scanner/metadata.xml b/dev-util/local-log4j-vuln-scanner/metadata.xml
index db463f3eeb66..1c314e6bcae8 100644
--- a/dev-util/local-log4j-vuln-scanner/metadata.xml
+++ b/dev-util/local-log4j-vuln-scanner/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">hillu/local-log4j-vuln-scanner</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/lockrun/Manifest b/dev-util/lockrun/Manifest
index 65716fbbb4ca..dd5c72f16f77 100644
--- a/dev-util/lockrun/Manifest
+++ b/dev-util/lockrun/Manifest
@@ -1,3 +1,5 @@
 AUX lockrun.c-20120508 7025 BLAKE2B fe577a1e360c0595a2448ed03f7af1a049327e21b6f4caba6d69659e557a527c16f07e80b2591d4dfa1633e1a77a78bb1cd9f231ca4fec3ef261cbadf284c4ca SHA512 f800e96d41d11c9b6f7e28c5bd1f2b59b824ccba5f093574d8f4df8e737f2df47c3f8e89a08eee81b9c3fb46377e62be9c5ddf83df253fd0ab3a25a85a8bee0b
+DIST lockrun-20240415.c.gz 4150 BLAKE2B c70bf08859bf7e2026702b2adc0d3a4224f5a62d25ebeb12359ba34f120300bb7bb1b93a6412696bbf0c0b2f50a958f25beb10a43d45f1dccd148c314fa452eb SHA512 3c7af9bba00018d6ca47c9b737028fb01bd9b7fdd3f29cec89a7c3451eb35fda3bf00f4fe6df8f64b8dcbb2d92f2b7647406bb805dfa3ac78e0ecaf94e95ef05
 EBUILD lockrun-20120508-r2.ebuild 596 BLAKE2B 2c613df88e73ff40785d70f4a921d78d12317cd8b01952bd82300307f7f0ad1f171ffd02b0d8c85460ebb02bb7e9b684147b5ca032b5b975ee7b2cd684e11f3e SHA512 d5d137587cd835ff92a09c1677f671a2f06d524685cc2ee4d5ee9019b6d3ed619e4d9efb64f015d60135d05a04fdd88d4ae6bc289fbe451e2a206aeb85395993
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+EBUILD lockrun-20240415.ebuild 941 BLAKE2B 9f9bff49bc8f429865f67c06c11c03d213723846ae3f6428598bb6ce958808a54bce5d427612029824e3b1b5a2f757a457df10c3a3960d777328f76bed3c1117 SHA512 7e40365151d22227d65c29ae699b76b18de0539737cbe56dc20b24bbe84bdbb65655ebb6876ce96c4c42db73831bb4d26067fc4db48e8545f41c199af38eab76
+MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
diff --git a/dev-util/lockrun/lockrun-20240415.ebuild b/dev-util/lockrun/lockrun-20240415.ebuild
new file mode 100644
index 000000000000..4c6a71c8ec22
--- /dev/null
+++ b/dev-util/lockrun/lockrun-20240415.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Run cronjobs with overrun protection"
+HOMEPAGE="http://www.unixwiz.net/tools/lockrun.html"
+
+SRC_URI="https://downloads.uls.co.za/gentoo/lockrun/lockrun-${PV}.c.gz"
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+
+src_prepare() {
+	default
+	mv "${P}.c" "${PN}.c" || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" ${PN}
+
+	# The below tries to extract the first comment block from the source code
+	# which represents the official "readme" from the project.  Delete first
+	# three lines, then everything from (including) the first comment close at
+	# the beginning of a line before removing ' *' from the beginning of the
+	# remaining lines.
+	sed '1,3 d; /^[[:space:]]*[*]\//,$ d; s/^ \*//' "${PN}.c" > README || die
+}
+
+src_install() {
+	dobin ${PN}
+	einstalldocs
+}
diff --git a/dev-util/lockrun/metadata.xml b/dev-util/lockrun/metadata.xml
index 85e4ed814fa2..6aebbc46f559 100644
--- a/dev-util/lockrun/metadata.xml
+++ b/dev-util/lockrun/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>jaco@uls.co.za</email>
+		<name>Jaco Kroon</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/log4shelldetect/Manifest b/dev-util/log4shelldetect/Manifest
index 9da020c6a6c1..9cb14dad76fb 100644
--- a/dev-util/log4shelldetect/Manifest
+++ b/dev-util/log4shelldetect/Manifest
@@ -1,4 +1,4 @@
 DIST log4shelldetect-0.0.7-deps.tar.xz 2091460 BLAKE2B 56c46d28360fba2cb817c26596558678bbc774a6b42e099ccb4fb83e853481a6c1c0c4582a0c123b57768dc2d486d8eef4d0a41a8f8f08c8d3455b6d9ce4fd48 SHA512 0f3926b24d6e70591b11f55b4480f84886a6d5428b4974256e7e94d0b73741552f5791c686a40e52dc190844414183beea6735004dfa17d9141a3fa1d7fd29b4
 DIST log4shelldetect-0.0.7.tar.gz 12524179 BLAKE2B 4646572de44a910cc467f8d0f17f40a10a30be32fbf594726c57d7a31bee69fec0b6473219fd89452fe35d670ce8b878299f4d409d3f1d86e6311c87c9fc6975 SHA512 3bb4ec886047bda07dac3303c8f589e5d32db99aaa86da82cc8ad8bfc217ac265b080f9e29b8c5b6a57b6b3f6963a9d8e1429f334e61b3c3fc5170098d2b7145
 EBUILD log4shelldetect-0.0.7.ebuild 524 BLAKE2B b87f785b8419619b001fa1fc7b163bad5f5bca108c69474e8343376272d9a55729bea6ea58e88d6aea85b89166f79d7a839991f3728b5f128a0450b9d98bfe6a SHA512 44f0a8998bf400cfb05be2ca0a56c9a72ddb87dc76c8392c8d4fa769844848ec54df98027770aef07b1c2bff887a0f24f340155015fb8857da57f121a4677ae7
-MISC metadata.xml 243 BLAKE2B 63665ae2020bc799fa6ebd6e1fca6755be6498803fdbc17cc630f9f4ffa03fbd46a9ad396e70adc3bc1c32b0a746fe4bab1c6291f32e68e636251207bca9e95c SHA512 78eab20831018fcf4957171a83aaaca9ced53380e01f083c07450c30fa1adfc02dd50ff2fa9f491dd62802f6e779264add1c47a09ade0a35cda558c1d5529ad0
+MISC metadata.xml 345 BLAKE2B 6277009684faed61f10bf98255d7fa981971fa86cbe31e34a37f7c59bd55a5f1cc0e2dc030cc3b97cdccfda7d80d7528f6bf04296e898ac1282cfaf77fc4cb87 SHA512 3dd067bcb8ab6c8dd073e67915468f729444759fd06e38cee5dba11a82569b1d933732d0be7cd26ea1223fa90206d445524468303367d8993cb0b4e64cf02250
diff --git a/dev-util/log4shelldetect/metadata.xml b/dev-util/log4shelldetect/metadata.xml
index 3b2a9c591010..0460b95fbb05 100644
--- a/dev-util/log4shelldetect/metadata.xml
+++ b/dev-util/log4shelldetect/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>williamh@gentoo.org</email>
-<name>William Hubbs</name>
-</maintainer>
+  <maintainer type="person">
+    <email>williamh@gentoo.org</email>
+    <name>William Hubbs</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">1lann/log4shelldetect</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-util/shelltestrunner/Manifest b/dev-util/shelltestrunner/Manifest
index 70feedbfa573..8b134545f932 100644
--- a/dev-util/shelltestrunner/Manifest
+++ b/dev-util/shelltestrunner/Manifest
@@ -1,3 +1,3 @@
 DIST shelltestrunner-1.9.tar.gz 39538 BLAKE2B 45dc5acbfd35d65a818938382e62eacc7aa3798e8f0ab9cdd4d4a358f470de9854bedbd2335bae6b4195ea05b2305de84e0b13c86206ac0e53039726fbc59354 SHA512 bdb5476e30189f0997f3a9505d954a828475a5d95e1220dc9ed342e96100f4dfa0cfadc1afd9a5758223cf1a659d1f77d7d0a0533c32bd80b325c9a7ad48178d
 EBUILD shelltestrunner-1.9.ebuild 1441 BLAKE2B 51c961ca38ec5eb01b60eb2f6466c7dc328c2211a58fa9ae3f3f40ba703e482224e0db7852391180d5e81fcf94973149e9fa7bb464f7530100c9b160c570c76d SHA512 97f8751f54288fea6f45dae46d2ecf863b9948a9ede469a29ffd59df3cfa7a59fea2968e0ce38a3f73e667463451a486c9267f625b2b2380e30dcd6592a86309
-MISC metadata.xml 636 BLAKE2B 5b6582234f95bbdcd237d07b32648d3800ea8162f6879fc71924ec74f6fdffa6ba0737cc00534407f08fb2064104b8c242428ee7a7b42b1db69a2859f3f7655a SHA512 4a6ce0971a5f80f0836f5b1d11343165e38517aec895aea56ff29dee844fc83b1e5f7a69cb2eb878a03750a25e61285939fdee0c332f7023367cc19f38e1de4c
+MISC metadata.xml 729 BLAKE2B f494a4bab1be4de8c3da4ba435033f97a3942ea4717d38f6dd0d1eda106a6232983024d18a69aafcc7afa5515a19da23fa6a06d80317e941f385ccbdab61f137 SHA512 be0f6aafb585a3f5d515b9c27d29e454a779e0edebc8bc07d1d93ecc7398bda06a4663ba23e1d085b82368fc9734d6f6379b341dd882910b15660cea7ac17a73
diff --git a/dev-util/shelltestrunner/metadata.xml b/dev-util/shelltestrunner/metadata.xml
index 1deea4034ae0..fbef788a8e90 100644
--- a/dev-util/shelltestrunner/metadata.xml
+++ b/dev-util/shelltestrunner/metadata.xml
@@ -12,4 +12,7 @@
 		and exit status.  Tests can be run selectively, in parallel, with a
 		timeout, in color, and/or with differences highlighted.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">simonmichael/shelltestrunner</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index b2f103606f4b..9cc87c461ee0 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 2a74e6f165df..690b21c22d8e 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -406,6 +406,12 @@ if tc_has_feature d && tc_version_is_at_least 12.0 ; then
 	BDEPEND+=" d? ( || ( sys-devel/gcc[d(-)] <sys-devel/gcc-12[d(-)] ) )"
 fi
 
+if tc_has_feature rust && tc_version_is_at_least 14.0.0_pre20230421 ; then
+	# This was added upstream in r14-9968-g3e1e73fc995844 as a temporary measure.
+	# See https://inbox.sourceware.org/gcc/34fec7ea-8762-4cac-a1c8-ff54e20e31ed@embecosm.com/
+	BDEPEND+=" rust? ( virtual/rust )"
+fi
+
 PDEPEND=">=sys-devel/gcc-config-2.11"
 
 #---->> S + SRC_URI essentials <<----
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 4d9e6f1979c0..51a7d54f0ed1 100644
--- a/games-server/Manifest.gz
+++ b/games-server/Manifest.gz
diff --git a/games-server/bedrock-server/Manifest b/games-server/bedrock-server/Manifest
index 86e7c38385d3..b91b549d47e8 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -1,6 +1,6 @@
 AUX bedrock-server.confd 317 BLAKE2B 47308c295519e0c92653a738aafd3044120c8f86d70050d639a0a1b05cf3cc1c8858bab713cc3b63cabb61c821d8292e95c9011c7af6593a4d8070722733f49d SHA512 9f6300b46680663b5a58a9b873fbbfd912c04fb3272a5528b64b6a32e5492ff1b66e9eafea65d17ff36defa006727b307ac130461846cd6742512bad3061db58
 AUX bedrock-server.initd-r5 1924 BLAKE2B 23cc0671510b17d3a24f2c11688d18111b5e6a38918ea1c9c0973bc8fa26b58f4b59d8a48d68d84b16b89ebccb5da56c986e98ff8b637fb13512804c6c74f8f1 SHA512 7eee4d085a7377e72cd5e9b8e8445beabb322c4d13f9564e5ccd45a76c91b209a4fbc00f08ecaecb1091e4a3d62354b83fe6999b2839f9d3c63b6cdbb78bd757
 AUX bedrock-server.service 1045 BLAKE2B 3db6cd6ac572a1f1ae47d6d4f38ce9a9a206f1a6aafe7fc329861b9037cfdb05f903f3458cc8244d5b9539d74d3cd12accd391c99fc3bf08afa3a0122a1ed14e SHA512 575a621e69a297ee02d9b5d846320f598363fd48f9d58dceafd24f21e5c31dd5609dc4af110f36954787bb537907e9b36d43bce8c8f0f4025528f58685d5438d
-DIST bedrock-server-1.20.72.01.zip 124750745 BLAKE2B 4a64b3b27f9e6ea907d3d53744dfef3a2fd09d5a280fb2d489a43b86dc7ffa9720cc3ae37226808ecabbddb6a47bfe0ac47b6a72ef796d6a38f1a93109f2c124 SHA512 c38327f90850474214d12fec3ddaaf4280a5b3dba3981f9b152c405522ca1d3c28e91ecb925beeda1ddc56f83e1eba9c9d7cac577c015eee3f0f5f1f0f684544
-EBUILD bedrock-server-1.20.72.01.ebuild 1146 BLAKE2B 2448cf23ab4d899ff7b9328b5e92dd7558f7c610a4f45efe15339164d57687907a4f814d7b4a30025961ec6b780e0ef3cfed8223fe99a749b00ec023b2e7c213 SHA512 d0d1e168b5320cd81b848603ef35d8775a4c1ce3421b80958894d12cfa5d37f832855736af33c40350f623578e4db33adc70e3c6110a8de647ced586397a3724
+DIST bedrock-server-1.20.73.01.zip 124751837 BLAKE2B 9139beee156c461ddfd9f9421a412b40e4cfd56885ec3bfbeb32962624f5aa41f52cc3843c75ced8ff8d0223efa7e52296dab413a674b2e4d1902a8992457bc0 SHA512 a2c2bac1c662af5db20dbe752842ffb626f9b1c18a7c1b05b2a8626515c3d3220c9b992d4e88bb354626b4862181ac4dbc5eec8c0f27429312bd1a16ca585a05
+EBUILD bedrock-server-1.20.73.01.ebuild 1146 BLAKE2B 2448cf23ab4d899ff7b9328b5e92dd7558f7c610a4f45efe15339164d57687907a4f814d7b4a30025961ec6b780e0ef3cfed8223fe99a749b00ec023b2e7c213 SHA512 d0d1e168b5320cd81b848603ef35d8775a4c1ce3421b80958894d12cfa5d37f832855736af33c40350f623578e4db33adc70e3c6110a8de647ced586397a3724
 MISC metadata.xml 676 BLAKE2B ae3d24e16c5da237df029cc571c6f7099c0e292524633990f92a16075a901191b0aade76429014bb02c95d8032b08436d79599eaafa4fea16345e63dd9180b94 SHA512 df3a66bb13e34ed64a3c5a7974a1aa6b5b4d8b9589a4f9bc08ac74a6cf6f7f8886373963b4d5532a3ca86a2ca48bd7a6f58500622741109273e8ec670ca290f7
diff --git a/games-server/bedrock-server/bedrock-server-1.20.72.01.ebuild b/games-server/bedrock-server/bedrock-server-1.20.73.01.ebuild
index 16edcd9b2772..16edcd9b2772 100644
--- a/games-server/bedrock-server/bedrock-server-1.20.72.01.ebuild
+++ b/games-server/bedrock-server/bedrock-server-1.20.73.01.ebuild
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 19a58e4886bb..f1390dd012b4 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index be7123de3628..bbb5a40505d2 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -4,19 +4,20 @@ AUX openrct2-0.4.1-gtest-1.10.patch 269 BLAKE2B 40e85e87627ca627faff555248a46307
 AUX openrct2-0.4.7-musl.patch 1834 BLAKE2B f2d939c659f0fedef6f7a0078d745e3163e488adc71f3ce1cb2dc0ec52ead5e887d8ad35417468d5c11e88d223fb0c9d180685d0d30c45ddc123000c34731674 SHA512 1004b8a8660e27c86872e7245da7c0bc93fc3547bb95d8d6d017ae9c4c296577f4401bc6721aeecd6732ecdb7dd998c96576074679238f421bfd77faec4bb3cb
 AUX openrct2.confd 415 BLAKE2B 08c22a6940f07d89b6414917d5438d2926b71397c1aa590db805fea67fe6857ccd7e00117edb0f8135fd055d741ec071e3cd439bd62f516142151ef3af76b2a4 SHA512 d2f6863c507389eab1117497edca2a21121c115b7fd06f59bc358f0a610ebf58b8df3be7683aaf105cc481c27647c4cfa36893c33b3a1da0624325927b5e3d9b
 AUX openrct2.initd 1424 BLAKE2B 0b5940000d0d7ebf0ad14d2326fc6342380fe9fd5266a49610d4c62686062ce2fbaca7c3211f0026d3c8bda6ad8bc7526838734571266da745e2d67ca8be9ec8 SHA512 3c1ebbe9874ecda50b9420d1cb27633a9ddec57f5afab39ceac0845e44c7fdfd0fd0dd9799a14b09f45d3c7e85a93cd994515d495c3b2f1d4e8012e5716f1409
-DIST openrct2-0.4.7.tar.gz 21677290 BLAKE2B 934f26bd2117f4c5be1a20e5eff10a07a260a5f01d1df2f95f2a4b66adf603868e5ea33a88398857f35851575c38f28e6c98b7912ebe0cc3c97b745cbb280b02 SHA512 704007298d35b90cba592719649d066a2e8e546044f39ca0edddebd4c9e8e864ef8d1314e3bc5eaadf38fb2df54d9cb33ee9cb1cba3defd099aa34ea2a985a90
+DIST openrct2-0.4.10.tar.gz 21854907 BLAKE2B 001918bf436be79a96b222971cdbb9118f26c5350c027360b749588c2112e8a12ae9aa435f6111dec1cb5c3f03d53560ca8b429c7ef0cccb4a5fe12eaf01c9ba SHA512 5ed9a6c790d5603fd1605669294a56908f493f347517d4c3bc8403df91b3678996d76980a42e9e3076b02fba598ee0bd33f2ad080762898cee7c40a865eed89d
 DIST openrct2-0.4.8.tar.gz 21699121 BLAKE2B 07517be3430f70001001866aee3c488aa5618c48f342c2b93ccfd29f69f4ea73b769ffea70c11a8f8f0dafd143569852469dc7b074524f2f17957927eb804661 SHA512 5035eff3cef4f05e60d3ac0ab76648cbda4553068ba44c81faec2344e6665c5bf6319ddb5f336c20f49369cefd0378aa725da10824217d6af5be81b99f660b9f
 DIST openrct2-0.4.9.tar.gz 21819673 BLAKE2B 32fa5b3a8a8e0b4a7031fcbca6ad419e5efe0812713d58d9e40880e3747671ca70ef6285536a335eba59aba41e3c9a238b55577796bd1c931b8e3c1fb99fff38 SHA512 711254007f8ed7377d6ceedcedf6e75d5a07033844dba891cc5c1f457d60a45ae4430d57f17624a5dce6d157d7ed269d235c53eedd46d58c433791d749953d85
 DIST openrct2-objects-1.3.13.zip 4708920 BLAKE2B 16540805a0a9413de96837d23787ed47a84e570b2fa2480c89f4f9a644033c39ffa9167838c164511308942401fd054f2091362491a395c207bb3b779e7a740c SHA512 9e285cf922adb5b4d7c79f06cc7445e05bc755968099dc83fc62b411875bfe1e39a087559dc1730b44e78133f4c642da316fd94e7f0877189c59517e8bc1038f
 DIST openrct2-objects-1.4.0.zip 5314707 BLAKE2B ae934f91f1de376851f37d37227049e90dcf644eab1bde4544b3a02ba1b678a3f27c49e106860db0f6817986301b95a1121be4827be06e05faf2c1b1583e953f SHA512 996cd4f6b5a3df1acd8258c68a123968e436b41e667e0d1f3a3e5b53d9f1788d1f8b3b87b4e8bbe3b1aff856449eca3bf04916e6a2bdca497e0de89807b90b3b
+DIST openrct2-objects-1.4.3.zip 5391619 BLAKE2B 0e84f5b520c2c46503e3b1ea46ce6eebbc4960101b30405f7b29c3c8b2e76d45ff807e0a632b262a30a1d9f2acd11ed7870b81e0a3afd5357637ff946ef5a0e6 SHA512 cd5ac250f2e2ad89da1febc7d2f3486be0dd8ea442693b037f3f36b254a5216d9288fb17264c7821d5ec648571c6f5bb6c5f86c421c68f7913d1af0ccb290a3a
 DIST openrct2-openmusic-1.5.zip 40548101 BLAKE2B 11cf46a54716097038e134ae11aeb23823097ca96189dabeb0e43d7050d5e776aa309c38de247da15b1eec7ed6be6299d5673a92df1323cc3a4a5bbc4f48d567 SHA512 55d4afb854eaa5a69c42e7f0b26669c8fb58b2eba3e2892c655e76d8fab82e2734f39981d7f5ac69e11dc87d06c89795da2468feac3bc53ef6cfdd992e3924f3
 DIST openrct2-opensound-1.0.3.zip 3820122 BLAKE2B 74265800595e36ac943bf2ee5d9c8f6cb3bbd5be3713d9590cb81faac4a75154dfbf9806b1b55e9c2426c84e3cf313a6271fc378ebfd4fa94821683157be5470 SHA512 89784703fb2cda67b5440e06381b44e59ce4a42a88004761c76f0c2b23f78be3692e5fe5e2c8655943e04f7a45e479cfcbc2c3998202222dab16a092b9a73195
 DIST openrct2-opensound-1.0.5.zip 4012384 BLAKE2B 7ddb1437d7e68373f05bd60d77f03971b8a1d6f4280d008d5bf3e86b5d2cb46001a04edddeeb04a06a37801c3afbd35926beb54fe5a72c7fa88b50d0a0b18535 SHA512 fc46ffb3f6243b3d783a280481ce373a8ddc8cf1fd28bfeceecf6223b72b38f1d49d0c95eea3376308a61a77c50c7a06252b6d72248cfecc493b63b65bd6512a
 DIST openrct2-replays-0.0.78.zip 1829988 BLAKE2B cf11a05f6ba5a2808cd4c016ac3c7537a0b49b67fd5ef5ab705aebd4ddc64dd4a82ea12d9c082fe66cebb57437c0d81052bcddfb94a0c9f7aab024a82c2e2ca8 SHA512 c6ff18c2206192ed4fb56535732137229f9bced96da00037d691bc64dcdb102cffe37f180054319e7c8ef8dbbd7de49792c3a7e845199fa180612ed97a149b32
 DIST openrct2-replays-0.0.79.zip 1934633 BLAKE2B 4b5c4d96be91055ceff8f5f5f1a894cc2544659983e61ac2f42d655229357b6a368553c1ee45d147cb360c8d54bb0ca78b61a9716efa8d1d7f37cd7c5ba50fa7 SHA512 04acde4d60c8fa949b298dd15e38fe0421659357fa214dffb0577574e0b0ac218a01ce998f4e12e3ab13a88fbbba8096392462fda29c68a6215bc0875aaae9b2
 DIST openrct2-title-sequences-0.4.6.zip 2547725 BLAKE2B 5f7b36cd1372106923000775307ea7ff8c142c3b1d026d84b86f255a629b0a2ac16a682300999789229a8833d4c7327c858c04710ecddfb97af1858ff121a5c4 SHA512 bd7d0f25047540572be75a4a8886e8dabdceb7a3e11fdeb5473b66fe804d829acdb763d34ec7cfa656df9bc527268a3e0e7ca09c699995804b22ff2a529ad5da
-EBUILD openrct2-0.4.7.ebuild 4608 BLAKE2B b7d3b73081a63f74b7b67f8f6fd8e3313ca2b3cadd4f0499a708b5364ebb1fc1a036133ae6cfc47007b81f41a8418f3bf9a62983704e5dd4d10cb5efadd50541 SHA512 a63ae01738783096ec03f9ac5fe7b6dfd0d517e6bd4ac566251299e1164741a558fcfe9ae85ef5b548bf13c8e7afc310ef58f64627c3dda5359ccc7398355596
+EBUILD openrct2-0.4.10.ebuild 4573 BLAKE2B 867f2bfc95b1cfbe218b8434bd68cf52477d8efca31c249f853b6e98941bab9af609ed3a82ad9d3e4c3d1d32901265ebe047db58b169ebc63533386a28d183aa SHA512 ce4a63ce78abd0fa6db12a17945831f2e11dcd9698cf65e329bca0813e7954bd33322c0f5b6e5b3460905551793962e843079b36108a4e7cbfc2f20e5ae5f9d0
 EBUILD openrct2-0.4.8.ebuild 4570 BLAKE2B 8702b9cbe8c7b9c3b7f005e285d9aa0fc28f293d8e1195f3327ff6b0f70693fc3849a8be0f7ed6fb13bd9037fc26394d6bca99337c3b4909ea66b44da36656ef SHA512 fe13349e133f3e7a786b853cd409b7acb9755365bc2f0fea873572e2c6e37a5c2c9372a86ed880bb53557dc8d55dd8ab7beeafb60af4235ed1691ecadfafcc74
-EBUILD openrct2-0.4.9.ebuild 4573 BLAKE2B e7d0475e49ae9f85f2429d3a27ac5030435f2a0532733eff53e2dd58803fd9659a835800fad36d354d832500985ac7272300afaadf444542f56f90b5832e30bf SHA512 68a37acc8289c4cfd9bc81e503bcbb165fa5d6694c82fe38841cc367c9555472d0b4a8e3f35c80f89ce00b8085a756db7251cdf36e9ab0bf04dfb1e3a498620a
-EBUILD openrct2-9999.ebuild 4497 BLAKE2B 80fe565bb0108d6f7ed3fed97382f243a159eb6ea759d9093de1a5a951b5d10aad43918a5617381af889c65403a86b5b3cd3d2652374a157904bf7344150661a SHA512 b56f28dc871e4758b3167c712a7c3c97b7ee64c6aaeb1a676e3f996fd300a4bb2063137c01441f9a39d99a5190570dcf2f7b43b4ba0a71ae5da5895601a2fda5
+EBUILD openrct2-0.4.9.ebuild 4570 BLAKE2B 0c7602b16c586c7e5fba0d87f22b8c96c023dce05e1ffb4c447d0ab9075abc6bc8817c6629fffdb02f80a271447bc991a0bb3bb13f496f54eecb5ddd10fd6f5a SHA512 d7567873dbd1859116a32ba83513d0015aa6887db72f1c3b79c56deb4a23019895af6b840faea79559286d165bfb00cf0f5a9cbf61795521d35c403571d0f0df
+EBUILD openrct2-9999.ebuild 4497 BLAKE2B dadb12e3fe3e854fd738684c218252b3399ce32799752e7a5c332028815353cc7610919a71d9b19470844fa0b084d3b977d71738254c344e1cec56059b6a0d09 SHA512 c9900a255816ede594f69368d92c146cb68e578a594a70a9ac10fc60bfa890e54bd5933e7b5d4f8464c90175ea29fa7a81ab2c9fb224d09015f03e9ba8b97841
 MISC metadata.xml 1200 BLAKE2B 7a2ca04e6e757efd12cbf00558372a19d10833fbd11d105f14bf68662ea6c64cbac3b01b4f5abba1473c4c184cceeadc26b38ef91e9edc3a40ee94415f868ff6 SHA512 97c181f7f3d97bf8ef90c1666497397c8ad87b23b536d1be6af7133e85e1e331813ee2247b3e0dfe887c0328f0b35184f1e9738ba7a7bb53b80813c23565c61e
diff --git a/games-simulation/openrct2/openrct2-0.4.7.ebuild b/games-simulation/openrct2/openrct2-0.4.10.ebuild
index 4079ebfec246..c4d567c37205 100644
--- a/games-simulation/openrct2/openrct2-0.4.7.ebuild
+++ b/games-simulation/openrct2/openrct2-0.4.10.ebuild
@@ -12,9 +12,9 @@ MY_PN_RPL="replays"
 MY_PN_SFX="opensound"
 MY_PN_TS="title-sequences"
 MY_PV_MSX="1.5"
-MY_PV_OBJ="1.3.13"
-MY_PV_RPL="0.0.78"
-MY_PV_SFX="1.0.3"
+MY_PV_OBJ="1.4.3"
+MY_PV_RPL="0.0.79"
+MY_PV_SFX="1.0.5"
 MY_PV_TS="0.4.6"
 
 DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2"
@@ -31,7 +31,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="dedicated +flac +opengl scripting test +truetype +vorbis"
 RESTRICT="!test? ( test )"
 
@@ -79,7 +79,6 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-0.4.0-include-additional-paths.patch"
 	"${FILESDIR}/${PN}-0.4.1-gtest-1.10.patch"
-	"${FILESDIR}/${PN}-0.4.7-musl.patch"
 )
 
 src_unpack() {
diff --git a/games-simulation/openrct2/openrct2-0.4.9.ebuild b/games-simulation/openrct2/openrct2-0.4.9.ebuild
index 6b9a88415823..dcedf34a3632 100644
--- a/games-simulation/openrct2/openrct2-0.4.9.ebuild
+++ b/games-simulation/openrct2/openrct2-0.4.9.ebuild
@@ -31,7 +31,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 IUSE="dedicated +flac +opengl scripting test +truetype +vorbis"
 RESTRICT="!test? ( test )"
 
diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index 0ed494c19096..906b38f4dba9 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -15,7 +15,7 @@ MY_PN_RPL="replays"
 MY_PN_SFX="opensound"
 MY_PN_TS="title-sequences"
 MY_PV_MSX="1.5"
-MY_PV_OBJ="1.4.0"
+MY_PV_OBJ="1.4.3"
 MY_PV_RPL="0.0.79"
 MY_PV_SFX="1.0.5"
 MY_PV_TS="0.4.6"
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index b251baf340a8..c0cc552cb998 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 57571988d500..721b8283c13e 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -8,5 +8,5 @@ DIST gnome-control-center-gentoo-logo-dark.svg 14293 BLAKE2B 570e9326b8abe45849c
 DIST gnome-control-center-gentoo-logo.svg 14288 BLAKE2B 371fc68b1015c8672db3e3858ae9077b1e3a9937e6add8690c39db36302ec031391c4d35e0c0b87094ca474a00c4187849e2d7111df34f43bc5bd7be52678527 SHA512 cf88933546de54ca15e2e830ac1086a78c4150f0ff59b8091e7e1cade5961c4e4cb83120a818a960b77841353ce3584ddc8f36b6edbde05543600283a143ad7b
 EBUILD gnome-control-center-44.3.ebuild 6847 BLAKE2B 4efed8be7ec86008ee9261c78f5346159fd4064c79d3e1c50d39eb85f75f487d17e769fbc7f97358609e3b6fdc19c9c051f55b7c69c81e63a9ecbff31bce070c SHA512 1e0c490b2611acb4b085371cfcefefea2317ce4a6f3c5dad06db6cfb5b4759b77ca32a583107864ce31b9311af6894bcc77e3036cf67696230595461630c7085
 EBUILD gnome-control-center-45.2.ebuild 7127 BLAKE2B a99a4d68c56dacdf5cb287ec639cd0d27590eb3833cae5760b6b0bed41a8e4a54891b905797b1fa43bb0b143b4c24380a543151713d1cb3dd0c840ed91b33a48 SHA512 545f10842e0902f6e05b4a6c64896f88570002ffd7f0f38e3a2f046b65a56016e74bcfeb62452b03dfa039f6392bb873b2f45c869cbd8710825d55e4f64032eb
-EBUILD gnome-control-center-45.3.ebuild 6993 BLAKE2B 8ebb879aba511c9a0541fe93681e1d05327b6e542c56515280f98d552ea22418cd0503cb5286292ec0e8ac9dd58ba1b37544b6424847c622c5228e4b8f96b4c0 SHA512 fe19dbc64ed9ae2ec6bc186a777b0015c42e665b23c60af90b98ef6155ea0cbfff74202066ce238856ccec5832872ce816ddb1af3c47453d99c20587e34e3abb
+EBUILD gnome-control-center-45.3.ebuild 6992 BLAKE2B 599b14248c4359ddec8a6ad85a39d549c196bf3a10cb0747f73a7e1ebb08f9ba1e91ecf1f621f454cc9f494b142646f427bd1c8c0f2f4a43af1ea0c083b5962d SHA512 ca3067a4a61190350d9b56acadcbb135baed18f7cced5171be7756ead330cb6f416996e5041f6cd13730407cf0a2c1a3fed3d7ab28f9e6a4e238a12170e22712
 MISC metadata.xml 610 BLAKE2B 33cb646209b89a151b412f3a5be10b29cf85cde070e8a55b50f18417b02806763f940a1f56684ec8f494f9bd07258e9219b4dc2dc01ef6710aedc03bb609d42e SHA512 1d1fd521a3901c3601d3bd4ab78ac95c44d058fc0de2506df38c5ad8ba5156ff04c4b112b7a801a13f5ed9c37243c64629cf7038ca156196fa5f3229606a1f9c
diff --git a/gnome-base/gnome-control-center/gnome-control-center-45.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-45.3.ebuild
index 996c9440ab56..6d304112ae08 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-45.3.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-45.3.ebuild
@@ -20,7 +20,7 @@ REQUIRED_USE="
 	^^ ( elogind systemd )
 " # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime,
 #   but needs testing if handled gracefully enough
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 
 # kerberos unfortunately means mit-krb5; build fails with heimdal
 # display panel requires colord and gnome-settings-daemon[colord]
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 159c6f382d0d..5457016c8043 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index b2b807c5c2b0..863f00748a1b 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,5 +1,5 @@
 AUX gnome-calendar-45.1-c99.patch 713 BLAKE2B abbf128c1527b2c0996ceab29ae0fe8a77bcbaff57b5069a92ea9cadac3d72aee8d6ce443cdda6a070f4229ac660e999096b2a7b8eb35ffa5bfb910e000eba65 SHA512 4e7bc0ea05629ae95885edaf288a4571aad41113ef6c0a9c71174322efe7f5de75dd3c6090bbef87351003ad31b4fb123fae4560015fbdef3049b3950c1797e1
 DIST gnome-calendar-45.1.tar.xz 456436 BLAKE2B 7d095314887c055834c6cbba13a6070eedf521b737976b46c184f09d1fd40ac1f07a436fd8d72174d0ea4cf070bc6acd6e0d81e2630839bd3774cdf751cdf1a4 SHA512 372abcf94c7b49980c9d1a5f7ee6cea1e34760337f2ab8886fdb3207fd3d87f4c45feecfa9156f6f8596f395af8d02469c2db53acf6b718735db94221af8c623
-EBUILD gnome-calendar-45.1-r1.ebuild 1055 BLAKE2B 122404380c4260d0db2b188da617a8f00ce43a11da0edf9cb78d19b4d203a3f9d78539f7e60e3877267adca057f30a42c82781ce2e6f0a673bae53c702eeccab SHA512 c7be2164104ba49ecd611298a4cf8af4c277e54cab66c81dd045f42b63d3ae6c59b0c0474e010db53a60d9578962ac8faab1dd0eed9995b765756aff54543684
+EBUILD gnome-calendar-45.1-r1.ebuild 1053 BLAKE2B f42b9dc97917bd6c91d4adf3513d98483e7179a5ef1f2f413924a71881c4c722bb83565a37d16a3bbff113590ed467805a77cbb53a5d48171a4546ab22a06c23 SHA512 7ef6541d96aebb45ff0b23f9e2a09c7774d99b20ab44f855071f830e7bb64528410c2ec779580fe01eec57ad9f1389518d361bd7b23f1ebb947b687e293c31f9
 EBUILD gnome-calendar-45.1.ebuild 995 BLAKE2B 493851027d027874fba596e3aadab902b0df238859dc17fc78fc4f770ee0e4a72cc29ee005e4ad75ee6ca6b4487a95d79e8b33fa8341e5e00aa88313bdc37303 SHA512 6050374b376b4cdcea9ae10f8cd2d570a250f3732f7f24e2752ea75abb4984172b1cc7c3e2e02ddb1fd7fb71d782063fcf819dabd98b04794bab300c1d28a6d4
 MISC metadata.xml 641 BLAKE2B 5cdd6f1f7445a7120c135c9401ea6bacaa6386ab797191e293ce6fddb1ecd2f7829c6854f39d5ca085ae6c7c0c6f737d59da26fa8104398e3ca81c451430510a SHA512 9bd92483720db367fdeee389c7b5a0ef7c2a8c3c9970bac891ef3978c0cfd3357588b5df1cde8276763742d3f4f81dc41ea221e74a4b03618f2a5f2bb2226432
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-45.1-r1.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-45.1-r1.ebuild
index 521c85f84c0f..b66fe322a3fd 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-45.1-r1.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-45.1-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 
 DEPEND="
 	>=dev-libs/libical-1.0.1:0=
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index 5a7113ea77ed..9302cac366ec 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -2,5 +2,5 @@ AUX 45.1-clang.patch 9749 BLAKE2B 3c3b7adb794af29faff2b5cf4b4caff3957b7af103072c
 DIST gnome-contacts-45.0.tar.xz 401156 BLAKE2B cce302b780717963083b4b0725d9f5e0fd2ec0eeafabdf247fb2e3a099cde84441563a70b7bdf22efa8f20358baf10be015f1e7524139beb8e6074bd12c28e6d SHA512 691cbd9fc1ff0e9e7a2549f522ea7ef5b73eee976fb48b2b250b8be9775737938d9fd0ffa66374dc20028d764e96605caae1be7c32689371a58ee5e78bd7c28b
 DIST gnome-contacts-45.1.tar.xz 402748 BLAKE2B 02cb3fd3ebcfd4e33add4706b1746940a14d680697ddaf54f9e006a14c15e7a11f791af2704b40573b59c6348ba3f1e1e216b514b1bc5fed990f0e8eaf1dc45b SHA512 87fc5b235e955ca347950306d37d0d8aea71dbcdb0f8d5c45d96da3a316f5e40da6004d6c5ab3674acdf7237f81bd508486c90130d01b045ee0c0582b04ba8aa
 EBUILD gnome-contacts-45.0.ebuild 1591 BLAKE2B 515299d34261050b2ff9f8d4eb3501630afd8758d97fdd06031e69bd77521022a13c8cfdf713aca5078d7281719aa2d74e6a3357e94227e49d46538265818b9a SHA512 f05b6ffefec4637a33ec1a68b4da99468f5ca551b9b9ba948a05fb6acda05624c7016344ff8b8f09201f10c7e86fea6ccb1913f7a07c124e32a3c59854389cef
-EBUILD gnome-contacts-45.1.ebuild 1671 BLAKE2B 999ba58cd27ce064d5bc056d8912e3af411878359a2a8c55a66f78c8ebc4a586804dcf57b03b015b6457103403fd4863a92763c6cbcc8d04b0736b243f50b630 SHA512 a8eb445b277ebb2ec9e20a3880ecc32f79e820b12165582182c274f461244900a4c15330de9737f805fa4020cbaf0b3190c3768c9b0d3ad1a9ecbf8fe1b13971
+EBUILD gnome-contacts-45.1.ebuild 1670 BLAKE2B 21e7d4f40e3618afc4f07c5bd12267dc5feed1c74405db0f138cebfc20af3fc840b82d2e8dacb7ed29552d4edd47901f19d9d5fb28539ada61ae1bd319db3925 SHA512 e36b31b7737ba87fde5b9b62f397e9bf7a7d050ea795f48776ac7af79aa15ae5f059014679ec0513a2c2a37d9504590e47f02e726be99923db35f43a31aebade
 MISC metadata.xml 504 BLAKE2B 876846abc81450936c89143571a1b26cd48f095c22aa76632e3aa8d860fc77fd8cf5f9aa6f39ecc37f02d53964aa2cbc35f74acc1ecf7a947cef4568b8b5a1dd SHA512 2241ed2d7e0c42276ac709c76085ec62c743cafde605494a5ffd5314a7c1d555d2463104c6487bb3ae4a0360d3f68220b910dfd0c40ea4f52c748a727b1aa0f5
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-45.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-45.1.ebuild
index ef1fb7abc1cf..b8fe1c677bab 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-45.1.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-45.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="+gnome-online-accounts"
 
 VALA_DEPEND="
diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index 1cf6c59e9e57..e6fd381ea0df 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -3,5 +3,5 @@ DIST gnome-tweaks-45.1.tar.xz 738484 BLAKE2B c3ffb102ffc9025f2b43816888090345e3f
 DIST gnome-tweaks-45.2.tar.xz 738788 BLAKE2B 55c0cc91d137dab1d39701660e6be987b87957601c9c315599eac4b0d4e478a7c07bd0fe24d8ce72a7c3224c6a466dcdd5608adde28527b3ff31865c90399b3a SHA512 b07d99f53de990de04f1d2aefed932633253cb2584d719bdd7bb197e431d622e777f911bc3f454a336e0fce3bf93a8ae55744b09e99e9f014d244bf82e5118f9
 EBUILD gnome-tweaks-45.0.ebuild 1216 BLAKE2B ad9b623bb666517f549587da3caf6cf2115fa266cb97b7e60045a0dba756ddd98ff9d7559fb5c07372cb0b53368b030d16bf9eca8f8f2c350be6510f160101ba SHA512 ff8255f0a2be5b8a723afc336614fbd7fcc3d0ceae1623771291bda123317092abd39bc9abf5e553322b1b8669c34bf339396412071dc926d2a6868b63bd55d4
 EBUILD gnome-tweaks-45.1.ebuild 1219 BLAKE2B ebffa44e5d6b85ab7d7659ea3e5fc25ef277f71b83c12055e381d52de3635e7de6ffe2430a61de4d956c4ad7ce50f0a13bbcede2a81bc287f4ae17f650c3aad1 SHA512 bf157c1cdbee9a1642e2f5918a6d5a5bb33f986722ae962133cf28c5af5209c74613d41e11b3385a17f3661cfa1ac39ec359710164e49428c6d1a6ebc0b609cf
-EBUILD gnome-tweaks-45.2.ebuild 1218 BLAKE2B a295fd1440543a5ca8059877771178d9ef4d4f9763d1bf681c958d68785b4d7113f0ea7d16645d69ac13c7b554ac2d75897bd13396f8466135a36779edd7613d SHA512 eae343be3ff1206c71f91303f3b00f9f2427e8189e2951ed211b36a218dfa9e6ae058a2d5a49d520d13a9e60e3a7ba643d79ff0cd79d1208fbdf719491b07974
+EBUILD gnome-tweaks-45.2.ebuild 1217 BLAKE2B cecd106acf598b68920986153aed504a24cbbf5ab319009391e2f5cad2ae87f99263d96873b5cae0fb0f97c9068e441856b6078c0e52bf9f3ec80f5239d1e2dd SHA512 38610dea19db37b251ba3e9507a46f6e54f13dde7d9a33985465c21bce0ba4355a1e4f2522137ac474b2e43760c314cd93b25fdcd620245140bb26c755a74fd4
 MISC metadata.xml 680 BLAKE2B 0262d35712bb1b29428738120e961ed7128b381ed0f0ced9546d35fcbdff179575906b910055ec3e616d7bf7860c4d1f0d66c50aded1500c9f24ba9ad0c34c1b SHA512 16ae57ccf79658fd5a717f7fbad121ba5f48f0bd63ad882e1055897d14eec3ca3dd6467179110689066ddde0d21f1c3f12fcf46f97dc81dc9091d758d37a0913
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-45.2.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-45.2.ebuild
index d4c1cf2a20b2..b5975a29111d 100644
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-45.2.ebuild
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-45.2.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
 
 DEPEND="${PYTHON_DEPS}"
 # See README.md for list of deps
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index cc795b503eb5..bd2462b85f29 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index 56ac370e31b7..38a2ba6a7c00 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -2,6 +2,70 @@ AUX disable-auto-update.policy.json 53 BLAKE2B f8df63721191d84d8f1ceec263f63c44f
 AUX gentoo-default-prefs.js 362 BLAKE2B d3f08c4ac1ae1941e2a805175dd0621756a7aa44f2dc0daf90762a0307c56eb1777e0acd572c6e131e5494c6586c4af2154e0980d25c0f4d4ab3cf4df1747892 SHA512 924313eb0e23b3609b27e3984cc39545122fdecf69d6382d11f18e92962d7a2018a1846404329f21b5880b7baed9491c7506fec998081413fc7c2c4c6c4e6bd1
 AUX icon/thunderbird-bin-r2.desktop 909 BLAKE2B b7e555dee5baf53cae48cecac514d222d24a67f6a7bbc406a6c1699a86ccbb4ccd87b477a453cd2d39d239f00337d9d20fa621bd19ee40df911c51880e924aa6 SHA512 ac80c279082f88e3e2763b07f28d2bcc67f9ea9c730a1c984f102bc092f171921a1748473bb164d97a47a6f8bb5d7cac76dc544ee322add7654056a0a14af718
 AUX thunderbird-bin-r1.sh 2674 BLAKE2B 724c45ead31ba09110a30c2e36efef96314654873717c8da9236c12fae33b873bb034ea050ee4bc46e34e3325817f8bfc839be3098828d14fd66a80d82cfe0ba SHA512 aec35b1f7df0d4d94af03e248a68c13867b05eea73bb61bf1bb5a6a50fffa123808ab8635c2c2b627748568c9addb9298cfb22a25919715dea935f0a999fca8d
+DIST thunderbird-115.10.0-af.xpi 549702 BLAKE2B 90e5d60a6e55de4079b41f9136e7c3ab73336b2ae18a31e06476037e3c940051d0a4f803d22a875252baf7f74ae166344f633b65f607d1fc666171e6a003a8a6 SHA512 b3d32a631f43788cff5b69e4202e303762b7c2ffe6a02920fb224eeef15146de5b962f0de5964f99b6e4af2c0480e897566417b54b5a4dae04b2aaee761dc55a
+DIST thunderbird-115.10.0-ar.xpi 666362 BLAKE2B 30ff6035013ba7aabc6ab92bb4c5ff0999b861c842762380bb640619b2d316408d929e008cacbadc764d6767664b1ffa7c02db43158dd87e7bd65b454b341345 SHA512 a88388f3f4c46b526d26cac16417f6ca2defcdcb3ac3ccf573fee2568f43c8f7265e7c15ade56b37615e8fa1e1f3dd5db040881e7f1816999190eaac5f1bbc9c
+DIST thunderbird-115.10.0-ast.xpi 568313 BLAKE2B e207c613fdab8ae4b585351acf2cd614da54c04c538fad5ea00542ba63550a621821d813b02433f163b632e324f69bf9711dfc1db3b6da378a090ba999363932 SHA512 9e76a5af0708e4f0f040bfcd6165c03200a3297ef6962fc6aa594c80e7a75b73fc33c1f9ae1885954cbbbd7ab79a19bdb36e8af3b921bf51114ab0e7b497747a
+DIST thunderbird-115.10.0-be.xpi 724046 BLAKE2B 79ba5e63b9fcade19a824e01a959a9d7effb8a028132bf27264401828948aae0ca3d1231a285c1a504d07420667d34337425f247b9578c6ea6d513143bf9e1fd SHA512 7033684ddc017bb9b931847a5eb7c58cd91ac9e9ab67662d63fae23666712aa4bc8ae8a49f3b213c03dada0c903923a9e7e93bf989d270e4b6cf97eab2f72d66
+DIST thunderbird-115.10.0-bg.xpi 780171 BLAKE2B 959bfe95e8feff5fe6d8c30c13c4284d583ca936de9ef591b4819792f3304f5521355dee767419e3ecba1ae008ee507385c73efd824da5591de016dd9b99ec2e SHA512 2da368135f3d0b94616d8f789369f349aead528b712594a42db66839aace8d03bc05107b689168ab83cb55d08d7f03b71c346bd95cb9c1ef87a2569416203b92
+DIST thunderbird-115.10.0-br.xpi 642273 BLAKE2B 924dce07099575e15bc68fde5c3edd13d099486100f195e6c737cd40ab747bca3237de1c609bac04f788ed1e3067d11e5988103271a558ee0f20b86eef890e1c SHA512 51c18e080ac55b116adc9c8d0c9cc5546fe3c9fdebfbd4752722243cbdf37b33ec30636290d697854a661b9d5c7a554d204ab1d8bd68d0773f56922d4c62a1cc
+DIST thunderbird-115.10.0-ca.xpi 685713 BLAKE2B 333fc128b5ff5bb7f421a1a292beeb8da9e4055cb162024ff7f19813228f4e44832f510f3fd66eaee7f86d62b0d2b2ebcefe4125543056fc1a9321bee8faa5bd SHA512 07a8fd01074fdb96154681efa2dd01596adccb0f19c2e44412658a9b553e214199f89be6998896fa942c85b53cc93fbf792b74db4994fddb20b94bf81da37e37
+DIST thunderbird-115.10.0-cak.xpi 667768 BLAKE2B 49327e05bcb3aaf0a93692eacca71b2dfa46a55896c8d63f46c6bfd873690ca6f1a17fb5465845568bfd8dba2964bb9baf3648b0b67468f2ac36d93f984dd37a SHA512 96ca73272aecbb339bfdd943912263cbc36474d1f9c3e9a847b7d31661d7755e6281c3129a22a0893dc8b4d134c5fa0a63c7a9e1cba02e18985de96b6145192b
+DIST thunderbird-115.10.0-cs.xpi 760405 BLAKE2B 40012ea70d9f7b151628a5935f717346717670b0bb8b80455df7c8d48c4a5dc61c087adf255225520fc5174d6a23e8154024cd22ef6ff5ba1501e087f86be68c SHA512 9b8048927180e62fb3b6e96b89ba17749554c882a7f82c012c269b12f24f8988814d9e38d0cf2f91a015d75ac12e65c1817a4a87f8da6fc6c155cc8c3b788ed0
+DIST thunderbird-115.10.0-cy.xpi 726867 BLAKE2B 883ec25226bc1145e3cee7e3a6c9c45c36e20363d98068a809e77e772e7dbb015b87468dbc02ed4058e3a380a43d744d012b8a4d5cccf8a20e8158d6be73b1bc SHA512 27f823b7714a7fff56403ef5a4d53403a4b9c7bc3d1032df4451d94a6128d0b60228b5cf1f40f2b5a08bd5490e1491e816c6fd928f3e4a67b04ac3b2baf59663
+DIST thunderbird-115.10.0-da.xpi 712438 BLAKE2B 0670ac8d2ee100d97eae5975cc2105504ba3d98d956a0aa70da0e4dbeffd465d5897f9894e1e1cb7a473b032a26f7240c31cf3ee71bbe783152e5f477ef7fef6 SHA512 cb1091e7e29e0b6a99d217f7f4fb32d47e1afb73c42a421c103464a25900f7d6f03c7114f5aa4001844611f8a02395f2c3f59c44d5fa352f9b748943a9e556d3
+DIST thunderbird-115.10.0-de.xpi 742717 BLAKE2B 1fa44e0a6f4e7c604cef4d423aa319224dce9ba52d64c11d87e081f1e1b03da1545c8a97ea27a83277b8c42726d7b3525a4e138f4007ed452bb7ef88e732c2fb SHA512 4ca47066fa77b74e3c1405803a19cc92a9ad5982439969d94e3da53f80bf67ee526b88930aa1a0d97aeb0a28a21e1ef3dd4b3ac4153fa3b73a200ad45043a995
+DIST thunderbird-115.10.0-dsb.xpi 760923 BLAKE2B 58f0f9f9ab9e73ec82c4ed4c3f9537e7f1758258de1361dc33d2f4a679d6b42a6042b2542987ce140909f6ef7af00c15daf1082e450c1dd5dfd9517b0c2d03e0 SHA512 31698ac1fb8c9f9748dd91e4ddbba170101223693f0bd2d74e120f8cc93ff6e96a8e0c5dcd0a841d79b6e893c9d26ac1048bbc8692d588a7f183088cf299863e
+DIST thunderbird-115.10.0-el.xpi 864315 BLAKE2B 53cc3c59ab7d9f10edf83fb713b58535f1e5090771a3c4f7d8705799bd99d4fa671c4ba0c71592f200a349f6ef59aae3150e3e3f5b1cf3767ff37ad8994d4302 SHA512 5ef73e8af45122478b6b15e7f858658bcd9d3e60884bbdf7698c4736fc44f2bb2eff1421ed44c456f2c3cf27610a8c22f49185593b1368ffe81ee795f7ed0414
+DIST thunderbird-115.10.0-en-CA.xpi 673871 BLAKE2B ebc51d893aefb2af0107d4acf9c8973ed0c3547136a0611b072511fe3c300a5e07167feeb1b404fa7e2772b5e124e650cc151a410497db4e52b0a20af1c15d1e SHA512 333ddbf5ad5ee6edb852f7794b2d81c481f959f1f275ada11dcadc34a5aa05ff2884301ccfe25c93b2067d05eba7de83a33ea743d585738f6333e211537606f1
+DIST thunderbird-115.10.0-en-GB.xpi 682957 BLAKE2B 2ca75b5e6b18b926bc8443c36046b2406d563d77a3563680f4fe8ba0f648b6ac44f2f0ecf5e063b65422ddfe0862781a814199a3f42523d8f53453887174d6c6 SHA512 1da92114e37dd59c1c20f43e16252e4070639ff41a9b8a246f25643f13760f17d7cf98a55dcc540d69f520e6b9062baa95b43bd6f2a232312ad441c069d919d0
+DIST thunderbird-115.10.0-es-AR.xpi 736788 BLAKE2B 34f71f4f2fdb2565a25ac0378e82d38028d5d4d29023c21b672e08971413299817e980346743c37959ffdd0062a5b32a14d029bc633041fb2fc06212cec13ed5 SHA512 cf52eb4302a007cde9cea0eb0ff0b30091fc611a3b96a916ad8cc6f2a8a309f70bcd89cf9dfcc475c616419e3f81969b48f74e9c0cd83ac35961fa72cf0e0315
+DIST thunderbird-115.10.0-es-ES.xpi 698386 BLAKE2B 447eef105299afb236b76f8f9213af4ebe4ed1aa9c9cac7862c491c7214441c0a04b3d36c1d202e730e959839e3f3a22df2e197b929ca9d547b485ccee035052 SHA512 10b50502b301ee1c166cb9b23119cd3e307079ef1774dfa3ecafa50aaed6fa70cd5a34cc01eb12bba3b3cc06c42a43db2689d31c5eb3898293cdb867c092b1b2
+DIST thunderbird-115.10.0-es-MX.xpi 719673 BLAKE2B 9e8daf5b8dcc21db2793c8455e6cefaa605f32511c7b0d0d53c9677c05be725e8aaba215d0cbee2d52d8604dc4eebf9adae5eb98275a36b38b091c86f15ef5f8 SHA512 a61e978be6a32016cf0907f50ae0aa0561aa026d53a27a02d359f2aa0043e6f8b6cf9aa5b3dfa069d2cec9c001e715ff3dfeb02b315bead1858d6da7e39cbe4f
+DIST thunderbird-115.10.0-et.xpi 679915 BLAKE2B eaa2d8e790165b8ef457aaa3b0e04d29b8c2d929111517c451732242c53b0d3c1e7fc2a23609d6fbe41ad04245ef754367fefe3c5d911babca0ec461156ffe5b SHA512 956457315b6feda6a49cae8da2e19b0e391439f6f5749cc6739558a299e18957f3ae7e90ae07eb4fafa060748666842ebb6752c34876d34ebc86639e2314e6b2
+DIST thunderbird-115.10.0-eu.xpi 708669 BLAKE2B ade8df663a0bec5b5c5eac3f7201928a9e5a240d5cb497e6dd01bd86f4fbe066767cd02ce7557170bba79c5e4630e21cb5b416275be128d0ba3dd3acce113f8d SHA512 8d71b9a5a4b1894c6753afd71106317783a1070dce31b96ba3c5da117b01f98c9c5083bb14ae58ce21b9fc4b9023e6dc3446cde0b184380e3d9b0cfb153c20fa
+DIST thunderbird-115.10.0-fi.xpi 713736 BLAKE2B 9db49a30987cf4e22a7741125186ed6d072e59e8e9f12991ee835a0f2678db6e99ceefaeca4fa10abbdf0283460b4870639b7c86ce3ddc65c2191abde9f14ed1 SHA512 0c6d97e177decd5b95cf10e4bb696bd3410ecb83669fc1941366d4f4b7fdf20a09a30bf908865664154c603bd37cc3b4398b0c5e575b042b4b6ce1c813b6ec6a
+DIST thunderbird-115.10.0-fr.xpi 747641 BLAKE2B dc07db0949681c4bf645fd4f843256eb021c3c60f407db7ca3d6cb43a1f491ac9cb63d2e46c14ebea30da7cf6aa2d203f3be0188e7a76d4c23cdbbd75c394428 SHA512 e0ebdba77475988e00ba8a9269777dd0e503c1c978a02595d2e6f326b4a672681f90762a6c201bb388797cb2dfe596779b40fe0db1cf84c75da9fa0f6a79e83a
+DIST thunderbird-115.10.0-fy-NL.xpi 730433 BLAKE2B dda26eaa088d3ceac3122a0451113221d169498bc2fb8179be581cf36f7382eaa45acbf81ed6dcb247ade18f135d31b80e8c9772b01e0db3c984358d51627db1 SHA512 2748440864a3ac6d017ae3f6f983031f87bd44463a029800bd6d90d80bb7e0abee83fde5d833cc2d1609851d3f408ee95a8f42fb2ff7f486e7239a85f2d31d64
+DIST thunderbird-115.10.0-ga-IE.xpi 609798 BLAKE2B 09a0e1fb908a1bedcf2d90fbe07f1e1eac0dbd514d3031b9dbf25ee7faa5cdf72948431f4878c1d1eb621ce34d8fc07cbca7477913cfa6b119e725a68e7564a1 SHA512 487238f420602787c0989472c615af954ba3f9512601a76e03f414fc071bff5178b934d0005a1543122aa0e5a6bea9110098aa08b52551360346962f8eb2c370
+DIST thunderbird-115.10.0-gd.xpi 712353 BLAKE2B b97c3b35f9a8ef59cc33e953ea837bceff833656d95502a64b1b909228a9672b92b6079a350a995bd4b5b6535c2fa01cbef939e9e865d4c2a42c1ec9acd53f88 SHA512 9e922bad705d8456688c16d38e689d970db781f76cef56bac206cbddc00e3a4d08d73e597713e21807981c55a3a7dcd6abc6694e4933e59fc6e8a05ca10d0ac3
+DIST thunderbird-115.10.0-gl.xpi 719943 BLAKE2B 95fcbe0934c7d3dd8ecc297adcf19cde92c4015ca1cfa0fcb706a9e2b980e077ac751933d51958680d2734e66a936c9c5707e11ca49e0c8512b8fffc6bb89bb7 SHA512 235bae4c01e9ab9ef7218848cb9cfec75bab1d4d450ffb730aa8db6767ce4df4be9c27858efe3b90c33154cff71e5c7e64b8abcd4515d507055aa5056884f282
+DIST thunderbird-115.10.0-he.xpi 686151 BLAKE2B c9d353317ab35b17fad1d0acdc8b094f5dd30474b43a437c7c80c88f920a651eaf8bb874d30eb14a46424eb9fa5a9c2f2b014b27cd2cb62241965a3e50ae3ffb SHA512 4d93ea45811431721c468b312f85b2b8534c751bb1fc297ae5bfbb6de2bd329740e542f9da38e69be7b14e2de659cec6140234beae7ca752a9028c98e35aef37
+DIST thunderbird-115.10.0-hr.xpi 687322 BLAKE2B a82a332038d8e47aa5c7d5271f9e7091e26f64f2054aebfd656298c6fe16a281ca6386314bbe62baadbdc8f88bf746e690a5e7d86fe197e3f793c9a2dcdac83f SHA512 d84cf338b0290e6934d5d7437fe827bc41e5a1e43ecdf2f23a8d07405ff6a29aded6dfa6b6b10438028632a09c11a9f0e3eecdf716436e6573b368a35445575a
+DIST thunderbird-115.10.0-hsb.xpi 758012 BLAKE2B 8494658410a3a19c593182b6ad198bcddbba1664bc32b703c704e64c847a2e769314f4d264e41c8192b2aba79e485ce91fcccdcbfce63c30c51fd077b01e0fa5 SHA512 853d22a9354129df196e8ddb1bf082c584d046aef0451a2838b6f75484d238288f67232d4487bb3b6860f506418cacfe714b6899efd3f9ea76f8d8b7837b1818
+DIST thunderbird-115.10.0-hu.xpi 759402 BLAKE2B 7f188fb6a2efed99bc5efc4e7e07d3656521c09701e964d5db1bdc41676dafd2f8d1317a4f244056593898b4151471b3f6464f1afe364359e6e48b621a66b8c3 SHA512 ddd72550eec6c8f8154cab953dfdd4709f1004fc5eb7a1b11db107a36c24f664e7faafd7afdb6cc48a35e858db6ea8fd7c945b2b3d8eab6facddcb5baf85245c
+DIST thunderbird-115.10.0-id.xpi 651341 BLAKE2B 6d49914a4f21df4f99b4b36b312062cd7234f6359d4ef29e1729bee4a6abc300b123b28ce308ad358eff0bc47625c76dceea855974ef4a47291214d96b6adac4 SHA512 0afc455e7865c45633d90c3512106f965649ff796646683e3d24d925962d8cd11259dc537fd1bab878696ba97582f4768991a07a1122739f162263ed40221aba
+DIST thunderbird-115.10.0-is.xpi 720710 BLAKE2B a251b8ab5e725c78f802487a93f2ce0176dbb47b263850564ff99aa7cf0fb71152245d9937901b4006f1b7d188861940668355e4644e40f1bf794eed89d50fc1 SHA512 51b76e947f40d78e61ded13ae617b493d4b07df5d206b6c829dd4edd0f1a1b30cb79e908c11191e268901a0b4845e5e5c6de4b601752c1035208d15da5e5dec4
+DIST thunderbird-115.10.0-it.xpi 668945 BLAKE2B 31d3d9e641bc6fc283bad12e327651f03fd68a731434532ead1211739f44c6e7f080abc43039a1a49d5e601cc1be485cfe67e5b1b848e207dea38184151dfa31 SHA512 a8588a71a2e80a365aae01cdffa3abd016942b06ed75a000fd42306c1cde6b1920f0a692302043d9f485c4c8f13c280643ed4087adc6a380aa183cceafedaf10
+DIST thunderbird-115.10.0-ja.xpi 795682 BLAKE2B b13641a13c4b083d3dce6d47b49bfcb61c593888749c49cc7e39487a41785b014a130d5d51861e60fec44a3ae9957d099ef2c1186ebdeccdd4f7d867e4c441ef SHA512 50bec19e317eecf7df2a47037bcdfb9f6c3f84290d8bb28814b868ddf4602d0039796255f90f6afe1ff9cd5c4fcf4df191b79a684ff3e7bd609e2ae481a4a92c
+DIST thunderbird-115.10.0-ka.xpi 783166 BLAKE2B cc62281fb54091dde850a20bf1e847350d4a3e46732c8bfb14edf30bf7ebaf76e6ed9f48dbe5c4b171b45572e263890c89df4fa146139a266bfe07c4f3cf9503 SHA512 5bea1b442207bf4c73c2c31cb2ec1efe8adca99f65fc29101def62cb1f277e790dcad0273740bd1107eaec7b6f979c8214f3abe49b32e4a4657ec2039561fb2e
+DIST thunderbird-115.10.0-kab.xpi 711299 BLAKE2B 65436fce7e2aca3a2acb7eaf70994b442f4475243ee3c1455c3b0c9d1b152f8c9c56e7f4d64695a6d03258ec6da67d429d0ca9e94368a68eb4a38641c307fd7d SHA512 d603208058b630ede4f1bee32bee59e2918cf0b3213d5dce5e127aa650f4d290a3ab0fc1c3898cf97815b261989fbe814a0aff8c3d6a2f89bb2e36dd7055cd03
+DIST thunderbird-115.10.0-kk.xpi 833792 BLAKE2B e661a1bbbab3b3a74e2170e8fc5ac1918314ade32d781e8656e58e897a62e2e6aeb877cf86a2f343dc113529b9dfa7b9f1dc22fb33370efff710c43c3d4f0ac4 SHA512 1a0722fdc8e1bd68cb6c1c6a97ec9a9a8e0cf57623bdf0e0d7612b61476abbe9c08b232e0f95c0d2f865eb4ee5cf9882b4ca7ccfcc71e7a6da6bd8b600b606f1
+DIST thunderbird-115.10.0-ko.xpi 737552 BLAKE2B 7564cdfa1fed76179dffdd52e514403f4299c736a9cc758165c6244932cdae0a9b406cbba8e6f5c6436daa24cc1fb6869907db780e76242f2386627600f30583 SHA512 3c564b43a967314c49deb6d48169eb926b98e9b1d7b0c020bfb45b1d44844af493753e96eef62a9d42fe409c0e3fee5db2d00273255e1361735394910b591801
+DIST thunderbird-115.10.0-lt.xpi 688630 BLAKE2B a1dad6a6661ff17550a70be5092975d9621e55df3f5e19ce0fc1e55e93d4e9762be402a0d6a3d6b623256557c585beef121a2db7b43555ba2275ea28d86a4b68 SHA512 966d135233ffc519d3dea9328b61f798836916fe539911d12d0f48120ac43f51da8709623ab717bf4080c05db9aec5fceca9ad0e0c794519a4990fc60ec975a2
+DIST thunderbird-115.10.0-lv.xpi 613042 BLAKE2B 353f58f221275ad04a81a5c53e726bf432508e33f47fe6758153ad59bd324a5d01b2885ab618846ea372f0fee7fed094bf1e4fe75955d1bf4aef1c59e17f835f SHA512 417a9608c9c3b1ebfd966a29eeadb5a0da73575ddb5d13ecdbfe537f0ad53c8a73d475d2e9aedc28f0acd546daea92a559b8946c51bd655449346b3ebbbe5bef
+DIST thunderbird-115.10.0-ms.xpi 573631 BLAKE2B 74657fd80af5440f31d85d47e0a57b4bd02a54ba095f878a3dc2d9e6fb9de4c9e4a90ac457c72ab334070a3679666b48d1f3ab86a505b10bbefa9b08f6819ad1 SHA512 d398318cd157ddecfd68d50f3b6ac24d61c89e2b17019727a27f0f3001d1fe1019a2a76273a8da05dfae965a9ce931d97a3d28607ed927da0b03302df421e085
+DIST thunderbird-115.10.0-nb-NO.xpi 686240 BLAKE2B 185311c96c9ceb74e39c2a83c97c97f4df21f83c688b1cae73123b0f243da49da2f24f7baa91b8c868b2eb4b8996ca931dfcb9be5ba2186c50319a628efeda68 SHA512 91f5ba61496ec8ea29a7ff2c24b26c61009bc551efab42c7ab20adede788b0f0628c38b32b1f8fe55284dbaff1c944179a0a71859316c17f3e4dcaaa6c4846b0
+DIST thunderbird-115.10.0-nl.xpi 721723 BLAKE2B 7a3d11f3072d6722efa5561b8697166b95bf141518e84bbb08530fc87230c16b77b9acf2f4271799d42cd9e2c4df1ba7d08b1c6c74ef2068cf4f2f37f27e30ae SHA512 fc2f6fbc31bd8857c0005705b3c6d535da6a0e5ea8fdec9d389398d5f86632777e3133fb6c95126d413dddc71554f7943b530f835dae5feba054307ac63e11fe
+DIST thunderbird-115.10.0-nn-NO.xpi 691748 BLAKE2B 785e89d3b386e2466cb8205faba353d48aa5b153ebd85f1de9d4044d867d0045bec09106decc5b461c726359135916b8a4e9a3e9bf1c642d9fbc27beff1699e5 SHA512 d973dbb742b72f5f5f8c308b6e0f5a60c683a18753735f2321cfc1b3dfd96c87efa2a652f6dd8b8db6fdb9cc4e9b411a4135d9b358370df1312ae393cd077668
+DIST thunderbird-115.10.0-pa-IN.xpi 678306 BLAKE2B d271ece94e7310b387f5deff4ebe7a900920099f1f1af98522143244d4dbcebce861113d73c3f80ab2de19a24456d5948f7d20aa20f1d6a0b5c430a236e63fdc SHA512 a8a7839cec0274a1b96cdba5dd1d909ca1983be291bad638749028f0b920d77c5bfd75d53a5aec48f8e5be351cba1e7935cc76489197df3705296539ff4aa325
+DIST thunderbird-115.10.0-pl.xpi 740535 BLAKE2B ba4ccf3bbfe7666a9b7fbce051a1521691484e20f202df904d83f953b3456365d60c83e2d976f5cef430d56da513dc9b26762d600d44cdeda03981d1660d4e07 SHA512 a4453f43848e523280c4b73bfa4cb8533a76ea5a80bac053ac4c2bd3f9a7aaae3028aaf2dfe8cb502c6b3ec0fc29c01a70083e4585528afefc83a7f227854026
+DIST thunderbird-115.10.0-pt-BR.xpi 729748 BLAKE2B 3f137c2a755a2e5406ffa97107668bf7d5362bc84b782ac5c27d5eaeb59819bca843caea38d262cbbb8cc77f998f234e9dc3c94b0a78e58b4f061e8f073c859c SHA512 de3c8067459b39812b0770a4817266db4ab913e6bab68ec4a26b2fe570981df227346938affa41160f7ffdbb8f2e91f8c0fcf0ffa5011cb55fab670febbdc1ec
+DIST thunderbird-115.10.0-pt-PT.xpi 714398 BLAKE2B 2991d9b5e54a9c1199cba6f8484832f0616e0a7c9dcdc6e40a4171d024304e8ccb238c8fd490b12c5926f30299780153a84fb5f15ab9b795904e5c9f5825ab8d SHA512 a0fb399e6c78b8ea312fe5a74b44dba37dd9476c2469f8f4b2c2630b1ab61e5f3e6c7baca123db8328f73befcc1e8360be40f9f2e85b70f09df4c66d1e308c9b
+DIST thunderbird-115.10.0-rm.xpi 725082 BLAKE2B 532e906a1567fcdb4beb4b0de43c7370f15a35f42a0a72070ee98bf319c5558632341592dd6c57c058cc551c700539d2a8c44ce8295bd5f1b654cb7796d69fc1 SHA512 dad1ff486dd16597de3cffa165669a16871ec99b456987d55a4d5e7ff049b2a0420e46e1c88a6ac72b9967bb5f9d4b8edb60902240a13f35ed86d1aedc538731
+DIST thunderbird-115.10.0-ro.xpi 659863 BLAKE2B c760f56b43458abed13f53f70d180831299cc0717248c98cdfdd44e79f314b4f8655add0d9331f708579292c9fada6e70640335a85803c2d7982e98c1ec81d61 SHA512 a07dc2d40477c4f761c3d3b0714b65b8004b34a288bdb87f88e869616b6def5d7e16b498f7a5645efd5abc8be20aa2eccb88a4dec4d219dd91571c0cbe4f8bca
+DIST thunderbird-115.10.0-ru.xpi 847866 BLAKE2B f93ff29042cbb77b6683b3be27d4ea244c87efdaf3505e1e873caa73a5a4b7a42df57ef6f7e3afb863eb0688b8416591bd8a5668ee289a1f2ac9dbce280fe14c SHA512 1b92d75781c605dfb6412c8867446f5c68d2f523cbcfddbd50f443730dac7cebbcc214cc08d9adfd6ce3cdd338f2eac473b3187ab6bbaf388c9de4ee3bb5c176
+DIST thunderbird-115.10.0-sk.xpi 759889 BLAKE2B 0a018869e6b1a812ade417f565493d2d4e9bce4f16f97ad8425f6bd3d5d1f106d11c8621476a6a2bb663262c77aa17a89656396e424f5a895bec92cb958496be SHA512 7fce68b00875123fb36a32ec4d944c63674b554229d94d6c6fac1af34a227004ac2ffe6de7305afc3d216c16cfd208a899c21b1b4ef50cef8d72d036b08ff741
+DIST thunderbird-115.10.0-sl.xpi 722595 BLAKE2B c826c7c0c2727e033e8a41385e9a1654446d130c2a4d0e34e8f90fd2ae34864b26353b843b80b446dc373e64c635146f07d5fe4928c5eb482275a9ed658cd9a2 SHA512 114eef8c874301c01e41ce9a421cad2e47eeadc0ca1317e3ead0638802b695aa34426b8a9c2ec25d8481ee1a34d795d7058195044daaf7ee464b27b6cf6229d3
+DIST thunderbird-115.10.0-sq.xpi 743541 BLAKE2B ac4d4eb10a4dd98cdb176a50583d526dd602990f0485dc62a632910bfd4dae2a886f1c05590acbaa19aef1321a145d8981cb3cccb34e3626187267224ef01a95 SHA512 abe10c64c455ed5d7bc23b522ff2a900f016f8ef298bf039317baa69d36b16c16c3dda8d15176eb3b547727a9ebcf8a74cab9fc7b58a97f5964655d65213940d
+DIST thunderbird-115.10.0-sr.xpi 755433 BLAKE2B ddf1406de418d69ebf8ba8d5dd4482b63c81238a64c3549ed6010b9b12fe2efdd47b379c378b91b47b33af45a900991a958c0eb3d4679da34e0caf7300f39152 SHA512 5d852a8225dbb2ffecdb9421097b4079df451522ca298931c140c729fc5750854d8d59a84946274c41cc2d5d01fad970aaee02fade39895d9a07866607324317
+DIST thunderbird-115.10.0-sv-SE.xpi 725854 BLAKE2B 4f229657083df2f5d89790c21ef8667ab1ac005ce08a737d1ef2df25e3d73145da13f5ee55cbeb74c8ffca6aa9d1976f1a4bcb9222e9f3202ba5e91c881752e0 SHA512 0e4c43cf0e9cd6a4002c089e46566877ed752a29733773fc3a42ea67fc9301d1d0d4f5ea3f5b20ccd82a69eff5640448584e720ba24c49aa6de5eed88c92bc06
+DIST thunderbird-115.10.0-th.xpi 793889 BLAKE2B 2456d26b6c989db426e7a9d2b5d8b2caddcaca2514d768e4add505519676c0d7c925bc597fe2e6d794142161cb518ec29d04eec704403b21701f9c2087f4e325 SHA512 f061b6143063e6454982a92f6702c78a94c4a65a9c39ccb98a11f7c032e84dd5d9aaba29aa0c786343e268e0d819b095ae588af1fda4340cb09d0dc2d22932b5
+DIST thunderbird-115.10.0-tr.xpi 735253 BLAKE2B 5d5a418559215fdab440acc031e3754e2dfd442215e0efc56e43337a2f96a83ada4d1bfd53c03539a0e61c594d141294a68bec581c946e93157e722616df8f97 SHA512 4690d988b0f1b0f6dbea4c24cc127a8200bad792706474498d0915433280866355f035af67734073f9931edf8de368d4716a97c1c367bf7c8e2fc6d566305721
+DIST thunderbird-115.10.0-uk.xpi 839177 BLAKE2B 24b7c476310411e008a44ad86bf2022cae29637221436785b638f4bc71a63ae57bd8553dbd14159427b72a1ea0d62bc64806528b742e115aadd5aef743355b8a SHA512 2263c8673734cf432e608c02a3272b8e620cef02dfa758277ba9cc435f3bad5bff9a6e343aa441eeac62e61a8c6e02fc4a2f8d692f0b886eb27aaaa2581da523
+DIST thunderbird-115.10.0-uz.xpi 587157 BLAKE2B 03b439d9325dc93679cd0aff19bd063ea2d4958503c13553193487b4125eb00e6a125860b800f8474eeae3f9c1677a018625c59ecd562b67053ce53f73d8e1a9 SHA512 bb892968d299aaba6c4f3128fb64bc09ec5b4868fd152cd32ae27961d54a6a94c79f79471370fbede0566a1ab617a99570dcaad3487ebb1c03b4f13a40cf680a
+DIST thunderbird-115.10.0-vi.xpi 765459 BLAKE2B d29626701e1077b11bdde1dc09f9fedf593733e952dedf13ae0cb79f539e3a4929dc6822630a69a818b405a69e8cd88d464c016e950c138176872ce6ac44adac SHA512 64f6401bf26e690cdc297b4a3ef3c4db65353e531dcb199a8266036dcc54e0944ae6ab83c8597c01b0ca9d3d840a25fa8feb5574e091896d1e0166a1d97d8798
+DIST thunderbird-115.10.0-zh-CN.xpi 762149 BLAKE2B ab904359a06db5fcc63d986dad6270fb43dc6a530662121b7b4313a08bc9e9c2600188eb2c553976c2f7b90d7043181cebca65fb3b059a6d2d4888dd2855fb52 SHA512 1873535c281684c09c6b11a591d593a66d04861bc358c27fc6fd9fc9f47e2f789ca07ac0464fd0f1831e5ed747184e58b59fd37a4882af9f4ed01b719ff8997f
+DIST thunderbird-115.10.0-zh-TW.xpi 767911 BLAKE2B 4dc6b232d34af6c54f6b94d933570a3ababf12ac5afa37ec5601eb422ba45ce192e9092df7244bf6921ab5a58c957b12081f9701195b66baa069432de5eeaf12 SHA512 a60026790ebaca7525f378e6fe0225c352e88b796582b60722858458f95c86621059255d2d572f07d15e1d23ef057ea0a9ed54ea20dae601dd69bed23b0cf04d
 DIST thunderbird-115.9.0-af.xpi 549702 BLAKE2B 9f94dd3e4989589cc205508d370c256c3c75c2071e0a701271afad6a93cc582785f209b41bb4dea11bfdb2ee390952b55e2b0e2d2262cf60ebe04e3b827ddb2d SHA512 39342e9dcd988abc03600bc6a52d9e5d42f7007069b48eb901fa1e12c124374cdc18535d8e6f8b0a74a6729dbc56497a73f923f8f188da6df51206ab6b9f4783
 DIST thunderbird-115.9.0-ar.xpi 666362 BLAKE2B 0874f7eb9f313b5b0ff3f002efec12a39186f5d6d6d5fe98835f5c9c149f97efc82c4d51d3f59c96855e81d625a90f2616e3a88757ffd3b2342dfc6e5670aea1 SHA512 09d52a96edf92084029c60fc134b6b6240cfc8e7bc962b05fe8c8d55e3fb67ede84c6151b67704b3c95504e2bb9b0326a4b77e356977f68f02acfc5b6d7a8f38
 DIST thunderbird-115.9.0-ast.xpi 568310 BLAKE2B 662ce2e70c1ca0eb444d9fd4849b5052e8aff603beb5949ecff6a22f6051f9451e52cf7e494286cc247763f631605ddb577a879715b4687caa7e408f4227a240 SHA512 acf20bad025d74d158e0a0b4fa16a6afacea89401a4a7ddcbc09247a275d85d6628955c7fc3b5f14e11f5f2f878901c706b0f0143e33d88bbcfef3953370c0a3
@@ -66,7 +130,10 @@ DIST thunderbird-115.9.0-uz.xpi 587157 BLAKE2B 9a42e3d67c12906a0b44ded1daa7e03da
 DIST thunderbird-115.9.0-vi.xpi 764700 BLAKE2B 099eb82588cfe4277e34868736008f386bb8c913a399756555fd9e0cdae61186057ec54d3505ad8e9ff33de93fcd639852b4e80ac642f5c5af4eba58c3a04a72 SHA512 2a54f295db3f6890976ab90e399789d8f29d6466f77e31ffb05972f20d45f2723d9b7b346734637edef097cad426bb010b40877f641c13b6b40c2b0fa21dfdf2
 DIST thunderbird-115.9.0-zh-CN.xpi 761848 BLAKE2B a47b71e6826a4e22076352a1dddda91b7ea1c93b910da09fbe379c60d363bf03967c041f59a257c8efd103f2f788126ecb96c965dc9b0d793b44eac89b588743 SHA512 9f8559e09d2fea0ee62d20cd6f0f41b31867f505d704d00395c341f3dd9cc404e9c103845e717e45fd50e1baabd0009dd37583a891edccf8129018dbe1db293e
 DIST thunderbird-115.9.0-zh-TW.xpi 766758 BLAKE2B c1247c43eaf286a9f4a60853d9606d611f302dad984f676cd5ec5f3ecc6f757737455253cbd217323ccc7e3c1b66c43b6a5b509e6ba4e291498b6d92ae6837a5 SHA512 a2bdd7260a52c1e3be0bec043d4d62ba2a2831f327c431da7121df987600348e97ab3cc239de5612cca1783b163d2973554db29d91a9352d31c53509374571de
+DIST thunderbird-bin_i686-115.10.0.tar.bz2 83033160 BLAKE2B b4a3de3b1576554b8e17ae18bd4568e2d7a29d33a14e26fe3bcd322f991743af616111f01e2061c0a74244f78d4457614bc90abe5cfc51ec7ba9c2fb3d447574 SHA512 d9b772e83e3a322d5fcfdd41d003133ef8b392077e029dea332ab406947e3f41712bf582f8545ca8c927e47ef284d9f08f8f5ee689e1cc0cbe768ff72dc1456b
 DIST thunderbird-bin_i686-115.9.0.tar.bz2 83080461 BLAKE2B 29da31f77cee4f2fd819b425f1eb4d753acb756d3b8500b6781ef14d4b2afe3de6b0f7763917f9613d628788f95e3376248695d59a576ba5085f48939ee417e0 SHA512 747d007aa7f7b70b6da7f465abd72f7a6cedf3542cda882261148b8d7ef04b71d54972716fc8472078701cbd9f68e5d3168bd87b1344db89e341500a9125d396
+DIST thunderbird-bin_x86_64-115.10.0.tar.bz2 80595590 BLAKE2B f2bb271545237fafc3cbf912850712ab844a5146cc3d7de3577f19b9c2e6168329d0d5012b00dbedfa69861c1c8cd5c662723875e8ca9653e613fe66b408da30 SHA512 5a2e2345025db9a4732938521144f91446a8bd6675756f2df19985ade1c996ac579bb196a1a07950a9c5141e016e0dd66efb5182b5310fb3282e47b45b34b484
 DIST thunderbird-bin_x86_64-115.9.0.tar.bz2 80629396 BLAKE2B 6a2687c0be7aa80deee212a09db770e359320c8b9f98a280df05ff1335746110c3c598840da90098e15200756fee1869eb9ebb04fbc07dd278482cb428822efc SHA512 cb700993848a9a74afc57d822daf773b526e142a6927d5392ac44527fc0be218f4ed5343d4b9c36e2f7e7c6662d3c4af423116c3a6cd7b31d64f73adca0b16d7
+EBUILD thunderbird-bin-115.10.0.ebuild 9025 BLAKE2B b920c9d10cd4ab8c4e9167f777fef46e6cd254c8a7c41955bf68bfa609b3f81170147b2e46910a29db50b9cc655200421524f2918b63ab7c43f370362432830a SHA512 93b42f57a301b7bc9433a7c93d042e7f8728f6bdf004cd5e3d9ba64f18059adce79cf534ee3686246534ab3509ff5cd4a2f5fc20cd9945071431f0ac675a520f
 EBUILD thunderbird-bin-115.9.0.ebuild 9025 BLAKE2B b920c9d10cd4ab8c4e9167f777fef46e6cd254c8a7c41955bf68bfa609b3f81170147b2e46910a29db50b9cc655200421524f2918b63ab7c43f370362432830a SHA512 93b42f57a301b7bc9433a7c93d042e7f8728f6bdf004cd5e3d9ba64f18059adce79cf534ee3686246534ab3509ff5cd4a2f5fc20cd9945071431f0ac675a520f
 MISC metadata.xml 255 BLAKE2B f54493c82293ca95a1ffd16d6199055650b0aaa18234716339235bab3f14a87327cb04fac6b543f973b3fef8047412e54edf72bf0b8a9424f4aa1d2eb0feec30 SHA512 28c0ab3671ed2c65cd9694181f7f9c4a8bea53dee0a0a06f0d9086166317a87611017b105d5150167597c45a7dd8921182fd6bf9d1b3fc7408c0e94f36189e33
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-115.10.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-115.10.0.ebuild
new file mode 100644
index 000000000000..0ddec45f3444
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-115.10.0.ebuild
@@ -0,0 +1,327 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit desktop optfeature pax-utils xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_SRC_BASE_URI}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="https://www.thunderbird.net/"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0/$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+alsa +ffmpeg +pulseaudio selinux wayland"
+
+RESTRICT="strip"
+
+BDEPEND="app-arch/unzip
+	alsa? (
+		!pulseaudio? (
+			dev-util/patchelf
+		)
+	)"
+DEPEND="alsa? (
+		!pulseaudio? (
+			media-sound/apulse
+		)
+	)"
+RDEPEND="${DEPEND}
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.26:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	sys-apps/dbus
+	virtual/freedesktop-icon-theme
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.11:3[wayland?]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libxcb
+	>=x11-libs/pango-1.22.0
+	ffmpeg? ( media-video/ffmpeg )
+	pulseaudio? ( media-libs/libpulse )
+	selinux? ( sec-policy/selinux-thunderbird )
+"
+
+QA_PREBUILT="opt/${MOZ_PN}/*"
+
+MOZ_LANGS=(
+	af ar ast be bg br ca cak cs cy da de dsb
+	el en-CA en-GB en-US es-AR es-ES es-MX et eu
+	fi fr fy-NL ga-IE gd gl he hr hsb hu
+	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
+	pa-IN pl pt-BR pt-PT rm ro ru
+	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	mkdir "${S}" || die
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			MY_SRC_FILE=${_src_file}
+		fi
+	done
+}
+
+src_install() {
+	# Set MOZILLA_FIVE_HOME
+	local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	dodir /opt
+	pushd "${ED}"/opt &>/dev/null || die
+	unpack "${MY_SRC_FILE}"
+	popd &>/dev/null || die
+
+	pax-mark m \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN} \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin \
+		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
+
+	# Patch alsa support
+	local apulselib=
+	if use alsa && ! use pulseaudio ; then
+		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
+		patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/defaults/pref"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/chrome/icons/default"
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^} (bin)"
+	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
+	local desktop_filename="${PN}.desktop"
+	local exec_command="${PN}"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" \
+		|| die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@MOZ_FIVE_HOME@:${EPREFIX}${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" \
+		|| die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+
+	local HAS_AUDIO=0
+	if use alsa || use pulseaudio; then
+		HAS_AUDIO=1
+	fi
+
+	if [[ ${HAS_AUDIO} -eq 0 ]] ; then
+		ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"
+	fi
+
+	local show_doh_information
+	local show_shortcut_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_shortcut_information=no
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 91.0 ; then
+				# Tell user that we no longer install a shortcut
+				# per supported display protocol
+				show_shortcut_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	if [[ -n "${show_shortcut_information}" ]] ; then
+		elog
+		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
+		elog "each supported display protocol.  Instead we will only install"
+		elog "one generic Mozilla ${PN^} shortcut."
+		elog "If you still want to be able to select between running Mozilla ${PN^}"
+		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
+	fi
+
+	optfeature_header "Optional programs for extra features:"
+	optfeature "desktop notifications" x11-libs/libnotify
+	optfeature "encrypted chat support" net-libs/libotr
+	optfeature "fallback mouse cursor theme e.g. on WMs" gnome-base/gsettings-desktop-schemas
+}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 26eafd928f4a..41df9b2999d3 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -5,6 +5,71 @@ AUX gentoo-hwaccel-prefs.js 162 BLAKE2B c5f2dfb727081e2d538c262f12c0cfdda31cbda5
 AUX icon/thunderbird-r2.desktop 882 BLAKE2B eb9c2e381b67319d9cd53f26e9b406f55de86b716b28a3df6470594a612e07acda4c7dcdb48b6d55930972592f7f01afbbf14f09ccc4b20265d3c18554a01a2c SHA512 689c9fa5c37a1e6ee80a3dfaebec2a185d91508537c35ce2fb35d13d89b16ae0cf3c640c3115a52c0e4b7a7624aee6a8f8c52679a0073c94dea25cc779ce624b
 AUX thunderbird-r1.sh 2896 BLAKE2B 140047417b24e959fe6388c4913457f8e3e786158b7394abf7442b0d2e83de21238e58983845a23b855e1aab60c9289e1a12af430eac9a8b2d9929da97de2852 SHA512 f9b989152a8a3ac274033722c77ec19374085654ad6c85ea4db6f8af8f4b2066d6d9f82b610be2db341c8ac867547f54f806ca6571258ed98dd9e2527d21b357
 DIST firefox-115esr-patches-09.tar.xz 16660 BLAKE2B 1dcdf62f35013b82dd70bf00c0505394b9277affcd1b1cbde92421778f4fcc146f536a546c2db8d6a70f92d40e4b1c96927fedec54383e6bb80bd9806d9b4461 SHA512 e003d0a2a5304dcdd0851b57ceb11993333326c8221d5d99555cd0c64090d5eda1bdb2a2a52e605f6094a3214ffa2238e43d57ff64eb7d424ff54b8125c16f5c
+DIST thunderbird-115.10.0-af.xpi 549702 BLAKE2B 90e5d60a6e55de4079b41f9136e7c3ab73336b2ae18a31e06476037e3c940051d0a4f803d22a875252baf7f74ae166344f633b65f607d1fc666171e6a003a8a6 SHA512 b3d32a631f43788cff5b69e4202e303762b7c2ffe6a02920fb224eeef15146de5b962f0de5964f99b6e4af2c0480e897566417b54b5a4dae04b2aaee761dc55a
+DIST thunderbird-115.10.0-ar.xpi 666362 BLAKE2B 30ff6035013ba7aabc6ab92bb4c5ff0999b861c842762380bb640619b2d316408d929e008cacbadc764d6767664b1ffa7c02db43158dd87e7bd65b454b341345 SHA512 a88388f3f4c46b526d26cac16417f6ca2defcdcb3ac3ccf573fee2568f43c8f7265e7c15ade56b37615e8fa1e1f3dd5db040881e7f1816999190eaac5f1bbc9c
+DIST thunderbird-115.10.0-ast.xpi 568313 BLAKE2B e207c613fdab8ae4b585351acf2cd614da54c04c538fad5ea00542ba63550a621821d813b02433f163b632e324f69bf9711dfc1db3b6da378a090ba999363932 SHA512 9e76a5af0708e4f0f040bfcd6165c03200a3297ef6962fc6aa594c80e7a75b73fc33c1f9ae1885954cbbbd7ab79a19bdb36e8af3b921bf51114ab0e7b497747a
+DIST thunderbird-115.10.0-be.xpi 724046 BLAKE2B 79ba5e63b9fcade19a824e01a959a9d7effb8a028132bf27264401828948aae0ca3d1231a285c1a504d07420667d34337425f247b9578c6ea6d513143bf9e1fd SHA512 7033684ddc017bb9b931847a5eb7c58cd91ac9e9ab67662d63fae23666712aa4bc8ae8a49f3b213c03dada0c903923a9e7e93bf989d270e4b6cf97eab2f72d66
+DIST thunderbird-115.10.0-bg.xpi 780171 BLAKE2B 959bfe95e8feff5fe6d8c30c13c4284d583ca936de9ef591b4819792f3304f5521355dee767419e3ecba1ae008ee507385c73efd824da5591de016dd9b99ec2e SHA512 2da368135f3d0b94616d8f789369f349aead528b712594a42db66839aace8d03bc05107b689168ab83cb55d08d7f03b71c346bd95cb9c1ef87a2569416203b92
+DIST thunderbird-115.10.0-br.xpi 642273 BLAKE2B 924dce07099575e15bc68fde5c3edd13d099486100f195e6c737cd40ab747bca3237de1c609bac04f788ed1e3067d11e5988103271a558ee0f20b86eef890e1c SHA512 51c18e080ac55b116adc9c8d0c9cc5546fe3c9fdebfbd4752722243cbdf37b33ec30636290d697854a661b9d5c7a554d204ab1d8bd68d0773f56922d4c62a1cc
+DIST thunderbird-115.10.0-ca.xpi 685713 BLAKE2B 333fc128b5ff5bb7f421a1a292beeb8da9e4055cb162024ff7f19813228f4e44832f510f3fd66eaee7f86d62b0d2b2ebcefe4125543056fc1a9321bee8faa5bd SHA512 07a8fd01074fdb96154681efa2dd01596adccb0f19c2e44412658a9b553e214199f89be6998896fa942c85b53cc93fbf792b74db4994fddb20b94bf81da37e37
+DIST thunderbird-115.10.0-cak.xpi 667768 BLAKE2B 49327e05bcb3aaf0a93692eacca71b2dfa46a55896c8d63f46c6bfd873690ca6f1a17fb5465845568bfd8dba2964bb9baf3648b0b67468f2ac36d93f984dd37a SHA512 96ca73272aecbb339bfdd943912263cbc36474d1f9c3e9a847b7d31661d7755e6281c3129a22a0893dc8b4d134c5fa0a63c7a9e1cba02e18985de96b6145192b
+DIST thunderbird-115.10.0-cs.xpi 760405 BLAKE2B 40012ea70d9f7b151628a5935f717346717670b0bb8b80455df7c8d48c4a5dc61c087adf255225520fc5174d6a23e8154024cd22ef6ff5ba1501e087f86be68c SHA512 9b8048927180e62fb3b6e96b89ba17749554c882a7f82c012c269b12f24f8988814d9e38d0cf2f91a015d75ac12e65c1817a4a87f8da6fc6c155cc8c3b788ed0
+DIST thunderbird-115.10.0-cy.xpi 726867 BLAKE2B 883ec25226bc1145e3cee7e3a6c9c45c36e20363d98068a809e77e772e7dbb015b87468dbc02ed4058e3a380a43d744d012b8a4d5cccf8a20e8158d6be73b1bc SHA512 27f823b7714a7fff56403ef5a4d53403a4b9c7bc3d1032df4451d94a6128d0b60228b5cf1f40f2b5a08bd5490e1491e816c6fd928f3e4a67b04ac3b2baf59663
+DIST thunderbird-115.10.0-da.xpi 712438 BLAKE2B 0670ac8d2ee100d97eae5975cc2105504ba3d98d956a0aa70da0e4dbeffd465d5897f9894e1e1cb7a473b032a26f7240c31cf3ee71bbe783152e5f477ef7fef6 SHA512 cb1091e7e29e0b6a99d217f7f4fb32d47e1afb73c42a421c103464a25900f7d6f03c7114f5aa4001844611f8a02395f2c3f59c44d5fa352f9b748943a9e556d3
+DIST thunderbird-115.10.0-de.xpi 742717 BLAKE2B 1fa44e0a6f4e7c604cef4d423aa319224dce9ba52d64c11d87e081f1e1b03da1545c8a97ea27a83277b8c42726d7b3525a4e138f4007ed452bb7ef88e732c2fb SHA512 4ca47066fa77b74e3c1405803a19cc92a9ad5982439969d94e3da53f80bf67ee526b88930aa1a0d97aeb0a28a21e1ef3dd4b3ac4153fa3b73a200ad45043a995
+DIST thunderbird-115.10.0-dsb.xpi 760923 BLAKE2B 58f0f9f9ab9e73ec82c4ed4c3f9537e7f1758258de1361dc33d2f4a679d6b42a6042b2542987ce140909f6ef7af00c15daf1082e450c1dd5dfd9517b0c2d03e0 SHA512 31698ac1fb8c9f9748dd91e4ddbba170101223693f0bd2d74e120f8cc93ff6e96a8e0c5dcd0a841d79b6e893c9d26ac1048bbc8692d588a7f183088cf299863e
+DIST thunderbird-115.10.0-el.xpi 864315 BLAKE2B 53cc3c59ab7d9f10edf83fb713b58535f1e5090771a3c4f7d8705799bd99d4fa671c4ba0c71592f200a349f6ef59aae3150e3e3f5b1cf3767ff37ad8994d4302 SHA512 5ef73e8af45122478b6b15e7f858658bcd9d3e60884bbdf7698c4736fc44f2bb2eff1421ed44c456f2c3cf27610a8c22f49185593b1368ffe81ee795f7ed0414
+DIST thunderbird-115.10.0-en-CA.xpi 673871 BLAKE2B ebc51d893aefb2af0107d4acf9c8973ed0c3547136a0611b072511fe3c300a5e07167feeb1b404fa7e2772b5e124e650cc151a410497db4e52b0a20af1c15d1e SHA512 333ddbf5ad5ee6edb852f7794b2d81c481f959f1f275ada11dcadc34a5aa05ff2884301ccfe25c93b2067d05eba7de83a33ea743d585738f6333e211537606f1
+DIST thunderbird-115.10.0-en-GB.xpi 682957 BLAKE2B 2ca75b5e6b18b926bc8443c36046b2406d563d77a3563680f4fe8ba0f648b6ac44f2f0ecf5e063b65422ddfe0862781a814199a3f42523d8f53453887174d6c6 SHA512 1da92114e37dd59c1c20f43e16252e4070639ff41a9b8a246f25643f13760f17d7cf98a55dcc540d69f520e6b9062baa95b43bd6f2a232312ad441c069d919d0
+DIST thunderbird-115.10.0-es-AR.xpi 736788 BLAKE2B 34f71f4f2fdb2565a25ac0378e82d38028d5d4d29023c21b672e08971413299817e980346743c37959ffdd0062a5b32a14d029bc633041fb2fc06212cec13ed5 SHA512 cf52eb4302a007cde9cea0eb0ff0b30091fc611a3b96a916ad8cc6f2a8a309f70bcd89cf9dfcc475c616419e3f81969b48f74e9c0cd83ac35961fa72cf0e0315
+DIST thunderbird-115.10.0-es-ES.xpi 698386 BLAKE2B 447eef105299afb236b76f8f9213af4ebe4ed1aa9c9cac7862c491c7214441c0a04b3d36c1d202e730e959839e3f3a22df2e197b929ca9d547b485ccee035052 SHA512 10b50502b301ee1c166cb9b23119cd3e307079ef1774dfa3ecafa50aaed6fa70cd5a34cc01eb12bba3b3cc06c42a43db2689d31c5eb3898293cdb867c092b1b2
+DIST thunderbird-115.10.0-es-MX.xpi 719673 BLAKE2B 9e8daf5b8dcc21db2793c8455e6cefaa605f32511c7b0d0d53c9677c05be725e8aaba215d0cbee2d52d8604dc4eebf9adae5eb98275a36b38b091c86f15ef5f8 SHA512 a61e978be6a32016cf0907f50ae0aa0561aa026d53a27a02d359f2aa0043e6f8b6cf9aa5b3dfa069d2cec9c001e715ff3dfeb02b315bead1858d6da7e39cbe4f
+DIST thunderbird-115.10.0-et.xpi 679915 BLAKE2B eaa2d8e790165b8ef457aaa3b0e04d29b8c2d929111517c451732242c53b0d3c1e7fc2a23609d6fbe41ad04245ef754367fefe3c5d911babca0ec461156ffe5b SHA512 956457315b6feda6a49cae8da2e19b0e391439f6f5749cc6739558a299e18957f3ae7e90ae07eb4fafa060748666842ebb6752c34876d34ebc86639e2314e6b2
+DIST thunderbird-115.10.0-eu.xpi 708669 BLAKE2B ade8df663a0bec5b5c5eac3f7201928a9e5a240d5cb497e6dd01bd86f4fbe066767cd02ce7557170bba79c5e4630e21cb5b416275be128d0ba3dd3acce113f8d SHA512 8d71b9a5a4b1894c6753afd71106317783a1070dce31b96ba3c5da117b01f98c9c5083bb14ae58ce21b9fc4b9023e6dc3446cde0b184380e3d9b0cfb153c20fa
+DIST thunderbird-115.10.0-fi.xpi 713736 BLAKE2B 9db49a30987cf4e22a7741125186ed6d072e59e8e9f12991ee835a0f2678db6e99ceefaeca4fa10abbdf0283460b4870639b7c86ce3ddc65c2191abde9f14ed1 SHA512 0c6d97e177decd5b95cf10e4bb696bd3410ecb83669fc1941366d4f4b7fdf20a09a30bf908865664154c603bd37cc3b4398b0c5e575b042b4b6ce1c813b6ec6a
+DIST thunderbird-115.10.0-fr.xpi 747641 BLAKE2B dc07db0949681c4bf645fd4f843256eb021c3c60f407db7ca3d6cb43a1f491ac9cb63d2e46c14ebea30da7cf6aa2d203f3be0188e7a76d4c23cdbbd75c394428 SHA512 e0ebdba77475988e00ba8a9269777dd0e503c1c978a02595d2e6f326b4a672681f90762a6c201bb388797cb2dfe596779b40fe0db1cf84c75da9fa0f6a79e83a
+DIST thunderbird-115.10.0-fy-NL.xpi 730433 BLAKE2B dda26eaa088d3ceac3122a0451113221d169498bc2fb8179be581cf36f7382eaa45acbf81ed6dcb247ade18f135d31b80e8c9772b01e0db3c984358d51627db1 SHA512 2748440864a3ac6d017ae3f6f983031f87bd44463a029800bd6d90d80bb7e0abee83fde5d833cc2d1609851d3f408ee95a8f42fb2ff7f486e7239a85f2d31d64
+DIST thunderbird-115.10.0-ga-IE.xpi 609798 BLAKE2B 09a0e1fb908a1bedcf2d90fbe07f1e1eac0dbd514d3031b9dbf25ee7faa5cdf72948431f4878c1d1eb621ce34d8fc07cbca7477913cfa6b119e725a68e7564a1 SHA512 487238f420602787c0989472c615af954ba3f9512601a76e03f414fc071bff5178b934d0005a1543122aa0e5a6bea9110098aa08b52551360346962f8eb2c370
+DIST thunderbird-115.10.0-gd.xpi 712353 BLAKE2B b97c3b35f9a8ef59cc33e953ea837bceff833656d95502a64b1b909228a9672b92b6079a350a995bd4b5b6535c2fa01cbef939e9e865d4c2a42c1ec9acd53f88 SHA512 9e922bad705d8456688c16d38e689d970db781f76cef56bac206cbddc00e3a4d08d73e597713e21807981c55a3a7dcd6abc6694e4933e59fc6e8a05ca10d0ac3
+DIST thunderbird-115.10.0-gl.xpi 719943 BLAKE2B 95fcbe0934c7d3dd8ecc297adcf19cde92c4015ca1cfa0fcb706a9e2b980e077ac751933d51958680d2734e66a936c9c5707e11ca49e0c8512b8fffc6bb89bb7 SHA512 235bae4c01e9ab9ef7218848cb9cfec75bab1d4d450ffb730aa8db6767ce4df4be9c27858efe3b90c33154cff71e5c7e64b8abcd4515d507055aa5056884f282
+DIST thunderbird-115.10.0-he.xpi 686151 BLAKE2B c9d353317ab35b17fad1d0acdc8b094f5dd30474b43a437c7c80c88f920a651eaf8bb874d30eb14a46424eb9fa5a9c2f2b014b27cd2cb62241965a3e50ae3ffb SHA512 4d93ea45811431721c468b312f85b2b8534c751bb1fc297ae5bfbb6de2bd329740e542f9da38e69be7b14e2de659cec6140234beae7ca752a9028c98e35aef37
+DIST thunderbird-115.10.0-hr.xpi 687322 BLAKE2B a82a332038d8e47aa5c7d5271f9e7091e26f64f2054aebfd656298c6fe16a281ca6386314bbe62baadbdc8f88bf746e690a5e7d86fe197e3f793c9a2dcdac83f SHA512 d84cf338b0290e6934d5d7437fe827bc41e5a1e43ecdf2f23a8d07405ff6a29aded6dfa6b6b10438028632a09c11a9f0e3eecdf716436e6573b368a35445575a
+DIST thunderbird-115.10.0-hsb.xpi 758012 BLAKE2B 8494658410a3a19c593182b6ad198bcddbba1664bc32b703c704e64c847a2e769314f4d264e41c8192b2aba79e485ce91fcccdcbfce63c30c51fd077b01e0fa5 SHA512 853d22a9354129df196e8ddb1bf082c584d046aef0451a2838b6f75484d238288f67232d4487bb3b6860f506418cacfe714b6899efd3f9ea76f8d8b7837b1818
+DIST thunderbird-115.10.0-hu.xpi 759402 BLAKE2B 7f188fb6a2efed99bc5efc4e7e07d3656521c09701e964d5db1bdc41676dafd2f8d1317a4f244056593898b4151471b3f6464f1afe364359e6e48b621a66b8c3 SHA512 ddd72550eec6c8f8154cab953dfdd4709f1004fc5eb7a1b11db107a36c24f664e7faafd7afdb6cc48a35e858db6ea8fd7c945b2b3d8eab6facddcb5baf85245c
+DIST thunderbird-115.10.0-id.xpi 651341 BLAKE2B 6d49914a4f21df4f99b4b36b312062cd7234f6359d4ef29e1729bee4a6abc300b123b28ce308ad358eff0bc47625c76dceea855974ef4a47291214d96b6adac4 SHA512 0afc455e7865c45633d90c3512106f965649ff796646683e3d24d925962d8cd11259dc537fd1bab878696ba97582f4768991a07a1122739f162263ed40221aba
+DIST thunderbird-115.10.0-is.xpi 720710 BLAKE2B a251b8ab5e725c78f802487a93f2ce0176dbb47b263850564ff99aa7cf0fb71152245d9937901b4006f1b7d188861940668355e4644e40f1bf794eed89d50fc1 SHA512 51b76e947f40d78e61ded13ae617b493d4b07df5d206b6c829dd4edd0f1a1b30cb79e908c11191e268901a0b4845e5e5c6de4b601752c1035208d15da5e5dec4
+DIST thunderbird-115.10.0-it.xpi 668945 BLAKE2B 31d3d9e641bc6fc283bad12e327651f03fd68a731434532ead1211739f44c6e7f080abc43039a1a49d5e601cc1be485cfe67e5b1b848e207dea38184151dfa31 SHA512 a8588a71a2e80a365aae01cdffa3abd016942b06ed75a000fd42306c1cde6b1920f0a692302043d9f485c4c8f13c280643ed4087adc6a380aa183cceafedaf10
+DIST thunderbird-115.10.0-ja.xpi 795682 BLAKE2B b13641a13c4b083d3dce6d47b49bfcb61c593888749c49cc7e39487a41785b014a130d5d51861e60fec44a3ae9957d099ef2c1186ebdeccdd4f7d867e4c441ef SHA512 50bec19e317eecf7df2a47037bcdfb9f6c3f84290d8bb28814b868ddf4602d0039796255f90f6afe1ff9cd5c4fcf4df191b79a684ff3e7bd609e2ae481a4a92c
+DIST thunderbird-115.10.0-ka.xpi 783166 BLAKE2B cc62281fb54091dde850a20bf1e847350d4a3e46732c8bfb14edf30bf7ebaf76e6ed9f48dbe5c4b171b45572e263890c89df4fa146139a266bfe07c4f3cf9503 SHA512 5bea1b442207bf4c73c2c31cb2ec1efe8adca99f65fc29101def62cb1f277e790dcad0273740bd1107eaec7b6f979c8214f3abe49b32e4a4657ec2039561fb2e
+DIST thunderbird-115.10.0-kab.xpi 711299 BLAKE2B 65436fce7e2aca3a2acb7eaf70994b442f4475243ee3c1455c3b0c9d1b152f8c9c56e7f4d64695a6d03258ec6da67d429d0ca9e94368a68eb4a38641c307fd7d SHA512 d603208058b630ede4f1bee32bee59e2918cf0b3213d5dce5e127aa650f4d290a3ab0fc1c3898cf97815b261989fbe814a0aff8c3d6a2f89bb2e36dd7055cd03
+DIST thunderbird-115.10.0-kk.xpi 833792 BLAKE2B e661a1bbbab3b3a74e2170e8fc5ac1918314ade32d781e8656e58e897a62e2e6aeb877cf86a2f343dc113529b9dfa7b9f1dc22fb33370efff710c43c3d4f0ac4 SHA512 1a0722fdc8e1bd68cb6c1c6a97ec9a9a8e0cf57623bdf0e0d7612b61476abbe9c08b232e0f95c0d2f865eb4ee5cf9882b4ca7ccfcc71e7a6da6bd8b600b606f1
+DIST thunderbird-115.10.0-ko.xpi 737552 BLAKE2B 7564cdfa1fed76179dffdd52e514403f4299c736a9cc758165c6244932cdae0a9b406cbba8e6f5c6436daa24cc1fb6869907db780e76242f2386627600f30583 SHA512 3c564b43a967314c49deb6d48169eb926b98e9b1d7b0c020bfb45b1d44844af493753e96eef62a9d42fe409c0e3fee5db2d00273255e1361735394910b591801
+DIST thunderbird-115.10.0-lt.xpi 688630 BLAKE2B a1dad6a6661ff17550a70be5092975d9621e55df3f5e19ce0fc1e55e93d4e9762be402a0d6a3d6b623256557c585beef121a2db7b43555ba2275ea28d86a4b68 SHA512 966d135233ffc519d3dea9328b61f798836916fe539911d12d0f48120ac43f51da8709623ab717bf4080c05db9aec5fceca9ad0e0c794519a4990fc60ec975a2
+DIST thunderbird-115.10.0-lv.xpi 613042 BLAKE2B 353f58f221275ad04a81a5c53e726bf432508e33f47fe6758153ad59bd324a5d01b2885ab618846ea372f0fee7fed094bf1e4fe75955d1bf4aef1c59e17f835f SHA512 417a9608c9c3b1ebfd966a29eeadb5a0da73575ddb5d13ecdbfe537f0ad53c8a73d475d2e9aedc28f0acd546daea92a559b8946c51bd655449346b3ebbbe5bef
+DIST thunderbird-115.10.0-ms.xpi 573631 BLAKE2B 74657fd80af5440f31d85d47e0a57b4bd02a54ba095f878a3dc2d9e6fb9de4c9e4a90ac457c72ab334070a3679666b48d1f3ab86a505b10bbefa9b08f6819ad1 SHA512 d398318cd157ddecfd68d50f3b6ac24d61c89e2b17019727a27f0f3001d1fe1019a2a76273a8da05dfae965a9ce931d97a3d28607ed927da0b03302df421e085
+DIST thunderbird-115.10.0-nb-NO.xpi 686240 BLAKE2B 185311c96c9ceb74e39c2a83c97c97f4df21f83c688b1cae73123b0f243da49da2f24f7baa91b8c868b2eb4b8996ca931dfcb9be5ba2186c50319a628efeda68 SHA512 91f5ba61496ec8ea29a7ff2c24b26c61009bc551efab42c7ab20adede788b0f0628c38b32b1f8fe55284dbaff1c944179a0a71859316c17f3e4dcaaa6c4846b0
+DIST thunderbird-115.10.0-nl.xpi 721723 BLAKE2B 7a3d11f3072d6722efa5561b8697166b95bf141518e84bbb08530fc87230c16b77b9acf2f4271799d42cd9e2c4df1ba7d08b1c6c74ef2068cf4f2f37f27e30ae SHA512 fc2f6fbc31bd8857c0005705b3c6d535da6a0e5ea8fdec9d389398d5f86632777e3133fb6c95126d413dddc71554f7943b530f835dae5feba054307ac63e11fe
+DIST thunderbird-115.10.0-nn-NO.xpi 691748 BLAKE2B 785e89d3b386e2466cb8205faba353d48aa5b153ebd85f1de9d4044d867d0045bec09106decc5b461c726359135916b8a4e9a3e9bf1c642d9fbc27beff1699e5 SHA512 d973dbb742b72f5f5f8c308b6e0f5a60c683a18753735f2321cfc1b3dfd96c87efa2a652f6dd8b8db6fdb9cc4e9b411a4135d9b358370df1312ae393cd077668
+DIST thunderbird-115.10.0-pa-IN.xpi 678306 BLAKE2B d271ece94e7310b387f5deff4ebe7a900920099f1f1af98522143244d4dbcebce861113d73c3f80ab2de19a24456d5948f7d20aa20f1d6a0b5c430a236e63fdc SHA512 a8a7839cec0274a1b96cdba5dd1d909ca1983be291bad638749028f0b920d77c5bfd75d53a5aec48f8e5be351cba1e7935cc76489197df3705296539ff4aa325
+DIST thunderbird-115.10.0-pl.xpi 740535 BLAKE2B ba4ccf3bbfe7666a9b7fbce051a1521691484e20f202df904d83f953b3456365d60c83e2d976f5cef430d56da513dc9b26762d600d44cdeda03981d1660d4e07 SHA512 a4453f43848e523280c4b73bfa4cb8533a76ea5a80bac053ac4c2bd3f9a7aaae3028aaf2dfe8cb502c6b3ec0fc29c01a70083e4585528afefc83a7f227854026
+DIST thunderbird-115.10.0-pt-BR.xpi 729748 BLAKE2B 3f137c2a755a2e5406ffa97107668bf7d5362bc84b782ac5c27d5eaeb59819bca843caea38d262cbbb8cc77f998f234e9dc3c94b0a78e58b4f061e8f073c859c SHA512 de3c8067459b39812b0770a4817266db4ab913e6bab68ec4a26b2fe570981df227346938affa41160f7ffdbb8f2e91f8c0fcf0ffa5011cb55fab670febbdc1ec
+DIST thunderbird-115.10.0-pt-PT.xpi 714398 BLAKE2B 2991d9b5e54a9c1199cba6f8484832f0616e0a7c9dcdc6e40a4171d024304e8ccb238c8fd490b12c5926f30299780153a84fb5f15ab9b795904e5c9f5825ab8d SHA512 a0fb399e6c78b8ea312fe5a74b44dba37dd9476c2469f8f4b2c2630b1ab61e5f3e6c7baca123db8328f73befcc1e8360be40f9f2e85b70f09df4c66d1e308c9b
+DIST thunderbird-115.10.0-rm.xpi 725082 BLAKE2B 532e906a1567fcdb4beb4b0de43c7370f15a35f42a0a72070ee98bf319c5558632341592dd6c57c058cc551c700539d2a8c44ce8295bd5f1b654cb7796d69fc1 SHA512 dad1ff486dd16597de3cffa165669a16871ec99b456987d55a4d5e7ff049b2a0420e46e1c88a6ac72b9967bb5f9d4b8edb60902240a13f35ed86d1aedc538731
+DIST thunderbird-115.10.0-ro.xpi 659863 BLAKE2B c760f56b43458abed13f53f70d180831299cc0717248c98cdfdd44e79f314b4f8655add0d9331f708579292c9fada6e70640335a85803c2d7982e98c1ec81d61 SHA512 a07dc2d40477c4f761c3d3b0714b65b8004b34a288bdb87f88e869616b6def5d7e16b498f7a5645efd5abc8be20aa2eccb88a4dec4d219dd91571c0cbe4f8bca
+DIST thunderbird-115.10.0-ru.xpi 847866 BLAKE2B f93ff29042cbb77b6683b3be27d4ea244c87efdaf3505e1e873caa73a5a4b7a42df57ef6f7e3afb863eb0688b8416591bd8a5668ee289a1f2ac9dbce280fe14c SHA512 1b92d75781c605dfb6412c8867446f5c68d2f523cbcfddbd50f443730dac7cebbcc214cc08d9adfd6ce3cdd338f2eac473b3187ab6bbaf388c9de4ee3bb5c176
+DIST thunderbird-115.10.0-sk.xpi 759889 BLAKE2B 0a018869e6b1a812ade417f565493d2d4e9bce4f16f97ad8425f6bd3d5d1f106d11c8621476a6a2bb663262c77aa17a89656396e424f5a895bec92cb958496be SHA512 7fce68b00875123fb36a32ec4d944c63674b554229d94d6c6fac1af34a227004ac2ffe6de7305afc3d216c16cfd208a899c21b1b4ef50cef8d72d036b08ff741
+DIST thunderbird-115.10.0-sl.xpi 722595 BLAKE2B c826c7c0c2727e033e8a41385e9a1654446d130c2a4d0e34e8f90fd2ae34864b26353b843b80b446dc373e64c635146f07d5fe4928c5eb482275a9ed658cd9a2 SHA512 114eef8c874301c01e41ce9a421cad2e47eeadc0ca1317e3ead0638802b695aa34426b8a9c2ec25d8481ee1a34d795d7058195044daaf7ee464b27b6cf6229d3
+DIST thunderbird-115.10.0-sq.xpi 743541 BLAKE2B ac4d4eb10a4dd98cdb176a50583d526dd602990f0485dc62a632910bfd4dae2a886f1c05590acbaa19aef1321a145d8981cb3cccb34e3626187267224ef01a95 SHA512 abe10c64c455ed5d7bc23b522ff2a900f016f8ef298bf039317baa69d36b16c16c3dda8d15176eb3b547727a9ebcf8a74cab9fc7b58a97f5964655d65213940d
+DIST thunderbird-115.10.0-sr.xpi 755433 BLAKE2B ddf1406de418d69ebf8ba8d5dd4482b63c81238a64c3549ed6010b9b12fe2efdd47b379c378b91b47b33af45a900991a958c0eb3d4679da34e0caf7300f39152 SHA512 5d852a8225dbb2ffecdb9421097b4079df451522ca298931c140c729fc5750854d8d59a84946274c41cc2d5d01fad970aaee02fade39895d9a07866607324317
+DIST thunderbird-115.10.0-sv-SE.xpi 725854 BLAKE2B 4f229657083df2f5d89790c21ef8667ab1ac005ce08a737d1ef2df25e3d73145da13f5ee55cbeb74c8ffca6aa9d1976f1a4bcb9222e9f3202ba5e91c881752e0 SHA512 0e4c43cf0e9cd6a4002c089e46566877ed752a29733773fc3a42ea67fc9301d1d0d4f5ea3f5b20ccd82a69eff5640448584e720ba24c49aa6de5eed88c92bc06
+DIST thunderbird-115.10.0-th.xpi 793889 BLAKE2B 2456d26b6c989db426e7a9d2b5d8b2caddcaca2514d768e4add505519676c0d7c925bc597fe2e6d794142161cb518ec29d04eec704403b21701f9c2087f4e325 SHA512 f061b6143063e6454982a92f6702c78a94c4a65a9c39ccb98a11f7c032e84dd5d9aaba29aa0c786343e268e0d819b095ae588af1fda4340cb09d0dc2d22932b5
+DIST thunderbird-115.10.0-tr.xpi 735253 BLAKE2B 5d5a418559215fdab440acc031e3754e2dfd442215e0efc56e43337a2f96a83ada4d1bfd53c03539a0e61c594d141294a68bec581c946e93157e722616df8f97 SHA512 4690d988b0f1b0f6dbea4c24cc127a8200bad792706474498d0915433280866355f035af67734073f9931edf8de368d4716a97c1c367bf7c8e2fc6d566305721
+DIST thunderbird-115.10.0-uk.xpi 839177 BLAKE2B 24b7c476310411e008a44ad86bf2022cae29637221436785b638f4bc71a63ae57bd8553dbd14159427b72a1ea0d62bc64806528b742e115aadd5aef743355b8a SHA512 2263c8673734cf432e608c02a3272b8e620cef02dfa758277ba9cc435f3bad5bff9a6e343aa441eeac62e61a8c6e02fc4a2f8d692f0b886eb27aaaa2581da523
+DIST thunderbird-115.10.0-uz.xpi 587157 BLAKE2B 03b439d9325dc93679cd0aff19bd063ea2d4958503c13553193487b4125eb00e6a125860b800f8474eeae3f9c1677a018625c59ecd562b67053ce53f73d8e1a9 SHA512 bb892968d299aaba6c4f3128fb64bc09ec5b4868fd152cd32ae27961d54a6a94c79f79471370fbede0566a1ab617a99570dcaad3487ebb1c03b4f13a40cf680a
+DIST thunderbird-115.10.0-vi.xpi 765459 BLAKE2B d29626701e1077b11bdde1dc09f9fedf593733e952dedf13ae0cb79f539e3a4929dc6822630a69a818b405a69e8cd88d464c016e950c138176872ce6ac44adac SHA512 64f6401bf26e690cdc297b4a3ef3c4db65353e531dcb199a8266036dcc54e0944ae6ab83c8597c01b0ca9d3d840a25fa8feb5574e091896d1e0166a1d97d8798
+DIST thunderbird-115.10.0-zh-CN.xpi 762149 BLAKE2B ab904359a06db5fcc63d986dad6270fb43dc6a530662121b7b4313a08bc9e9c2600188eb2c553976c2f7b90d7043181cebca65fb3b059a6d2d4888dd2855fb52 SHA512 1873535c281684c09c6b11a591d593a66d04861bc358c27fc6fd9fc9f47e2f789ca07ac0464fd0f1831e5ed747184e58b59fd37a4882af9f4ed01b719ff8997f
+DIST thunderbird-115.10.0-zh-TW.xpi 767911 BLAKE2B 4dc6b232d34af6c54f6b94d933570a3ababf12ac5afa37ec5601eb422ba45ce192e9092df7244bf6921ab5a58c957b12081f9701195b66baa069432de5eeaf12 SHA512 a60026790ebaca7525f378e6fe0225c352e88b796582b60722858458f95c86621059255d2d572f07d15e1d23ef057ea0a9ed54ea20dae601dd69bed23b0cf04d
+DIST thunderbird-115.10.0.source.tar.xz 529687584 BLAKE2B 87c570fc8bab59485a0d8bb7951c365be7cefe98d07a5bad6cd9d31771134176be0f31e8d2d39fa8dae2dbe54048cf894a110b1738320f910b7d50f4826f1d50 SHA512 35188cab32502ff2451834358f486a095ccef0a7330ee35d116c335555ebaf267e01f7084a6480b7af85436741c8591f08d6ed9a01c1be52d3f147f913c1b5a4
 DIST thunderbird-115.9.0-af.xpi 549702 BLAKE2B 9f94dd3e4989589cc205508d370c256c3c75c2071e0a701271afad6a93cc582785f209b41bb4dea11bfdb2ee390952b55e2b0e2d2262cf60ebe04e3b827ddb2d SHA512 39342e9dcd988abc03600bc6a52d9e5d42f7007069b48eb901fa1e12c124374cdc18535d8e6f8b0a74a6729dbc56497a73f923f8f188da6df51206ab6b9f4783
 DIST thunderbird-115.9.0-ar.xpi 666362 BLAKE2B 0874f7eb9f313b5b0ff3f002efec12a39186f5d6d6d5fe98835f5c9c149f97efc82c4d51d3f59c96855e81d625a90f2616e3a88757ffd3b2342dfc6e5670aea1 SHA512 09d52a96edf92084029c60fc134b6b6240cfc8e7bc962b05fe8c8d55e3fb67ede84c6151b67704b3c95504e2bb9b0326a4b77e356977f68f02acfc5b6d7a8f38
 DIST thunderbird-115.9.0-ast.xpi 568310 BLAKE2B 662ce2e70c1ca0eb444d9fd4849b5052e8aff603beb5949ecff6a22f6051f9451e52cf7e494286cc247763f631605ddb577a879715b4687caa7e408f4227a240 SHA512 acf20bad025d74d158e0a0b4fa16a6afacea89401a4a7ddcbc09247a275d85d6628955c7fc3b5f14e11f5f2f878901c706b0f0143e33d88bbcfef3953370c0a3
@@ -70,5 +135,6 @@ DIST thunderbird-115.9.0-vi.xpi 764700 BLAKE2B 099eb82588cfe4277e34868736008f386
 DIST thunderbird-115.9.0-zh-CN.xpi 761848 BLAKE2B a47b71e6826a4e22076352a1dddda91b7ea1c93b910da09fbe379c60d363bf03967c041f59a257c8efd103f2f788126ecb96c965dc9b0d793b44eac89b588743 SHA512 9f8559e09d2fea0ee62d20cd6f0f41b31867f505d704d00395c341f3dd9cc404e9c103845e717e45fd50e1baabd0009dd37583a891edccf8129018dbe1db293e
 DIST thunderbird-115.9.0-zh-TW.xpi 766758 BLAKE2B c1247c43eaf286a9f4a60853d9606d611f302dad984f676cd5ec5f3ecc6f757737455253cbd217323ccc7e3c1b66c43b6a5b509e6ba4e291498b6d92ae6837a5 SHA512 a2bdd7260a52c1e3be0bec043d4d62ba2a2831f327c431da7121df987600348e97ab3cc239de5612cca1783b163d2973554db29d91a9352d31c53509374571de
 DIST thunderbird-115.9.0.source.tar.xz 535516012 BLAKE2B 435d7b0236092a1a29bb490a41ccdaa97247ae96152cfab35a6ad5d8d9c15c9b816c581a487867b897d92b03f2353224f2e99bd1fa84bfd22ac28978c28a4cf7 SHA512 8ff0bed6e6d7f337ebae09011a10b59343ae7a8355ed1da2d72ec0d4218010adfae78e42565e5b784df26cef4702f313dc9616ac5ca5530fb772d77bdf7f2ea4
+EBUILD thunderbird-115.10.0.ebuild 39245 BLAKE2B dec364a2be88f964ff68b57bf94fbac47a29a02d20af01cd250c2662075c812593632906785692a5eb9d10822c3295866671bc7a7f3ab5a29255cf773e07d0e9 SHA512 3f018222564617b414646f6708075c1bb265a202f7d7842399613f8714c3ac5f5f0fea3537722f7271adb1f8c13eaad22e21dc0ccbd79679791d47b5b2d846ad
 EBUILD thunderbird-115.9.0.ebuild 39245 BLAKE2B dec364a2be88f964ff68b57bf94fbac47a29a02d20af01cd250c2662075c812593632906785692a5eb9d10822c3295866671bc7a7f3ab5a29255cf773e07d0e9 SHA512 3f018222564617b414646f6708075c1bb265a202f7d7842399613f8714c3ac5f5f0fea3537722f7271adb1f8c13eaad22e21dc0ccbd79679791d47b5b2d846ad
 MISC metadata.xml 2387 BLAKE2B 3602296d8cca60f79ea66089332dbce63b9da3625e476659e0a663966e65bc060e67b263c8fdcdbf8fa5545adf7b8f958cc36f9011459c715ee31bb494e7ce5e SHA512 e51ee84ed715cba36beb240db27265ac37b8df684c0e98f3b81ccf7785c1f465f1bbe3729c1c01717445e787129b449c009815f62a7455ea3fc4db8d1d9e82c3
diff --git a/mail-client/thunderbird/thunderbird-115.10.0.ebuild b/mail-client/thunderbird/thunderbird-115.10.0.ebuild
new file mode 100644
index 000000000000..ecb7939f2ef7
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-115.10.0.ebuild
@@ -0,0 +1,1341 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FIREFOX_PATCHSET="firefox-115esr-patches-09.tar.xz"
+
+LLVM_MAX_SLOT=17
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="manual"
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
+	llvm multiprocessing optfeature pax-utils python-any-r1 toolchain-funcs \
+	virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~juippis/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="https://www.thunderbird.net/"
+
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+
+IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
+IUSE+=" jack libproxy lto +openh264 pgo pulseaudio sndio selinux"
+IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp"
+IUSE+=" wayland wifi +X"
+
+# Thunderbird-only USE flags.
+IUSE+=" +system-librnp"
+
+REQUIRED_USE="|| ( X wayland )
+	debug? ( !system-av1 )
+	pgo? ( lto )
+	wifi? ( dbus )"
+
+TB_ONLY_DEPEND="!<x11-plugins/enigmail-2.2
+	selinux? ( sec-policy/selinux-thunderbird )
+	!system-librnp? ( dev-libs/jsoncpp )
+	system-librnp? ( dev-util/librnp )"
+BDEPEND="${PYTHON_DEPS}
+	|| (
+		(
+			sys-devel/clang:17
+			sys-devel/llvm:17
+			clang? (
+				sys-devel/lld:17
+				virtual/rust:0/llvm-17
+				pgo? ( =sys-libs/compiler-rt-sanitizers-17*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:16
+			sys-devel/llvm:16
+			clang? (
+				sys-devel/lld:16
+				virtual/rust:0/llvm-16
+				pgo? ( =sys-libs/compiler-rt-sanitizers-16*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:15
+			sys-devel/llvm:15
+			clang? (
+				sys-devel/lld:15
+				virtual/rust:0/llvm-15
+				pgo? ( =sys-libs/compiler-rt-sanitizers-15*[profile] )
+			)
+		)
+	)
+	app-alternatives/awk
+	app-arch/unzip
+	app-arch/zip
+	>=dev-util/cbindgen-0.24.3
+	net-libs/nodejs
+	virtual/pkgconfig
+	!clang? ( >=virtual/rust-1.65 )
+	!elibc_glibc? (
+		|| (
+			dev-lang/rust
+			<dev-lang/rust-bin-1.73
+		)
+	)
+	amd64? ( >=dev-lang/nasm-2.14 )
+	x86? ( >=dev-lang/nasm-2.14 )
+	pgo? (
+		X? (
+			sys-devel/gettext
+			x11-base/xorg-server[xvfb]
+			x11-apps/xhost
+		)
+		wayland? (
+			>=gui-libs/wlroots-0.15.1-r1[tinywl]
+			x11-misc/xkeyboard-config
+		)
+	)"
+COMMON_DEPEND="${TB_ONLY_DEPEND}
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/libffi:=
+	>=dev-libs/nss-3.90
+	>=dev-libs/nspr-4.35
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/mesa
+	media-video/ffmpeg
+	sys-libs/zlib
+	virtual/freedesktop-icon-theme
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/pango
+	x11-libs/pixman
+	dbus? (
+		dev-libs/dbus-glib
+		sys-apps/dbus
+	)
+	jack? ( virtual/jack )
+	pulseaudio? (
+		|| (
+			media-libs/libpulse
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	libproxy? ( net-libs/libproxy )
+	selinux? ( sec-policy/selinux-mozilla )
+	sndio? ( >=media-sound/sndio-1.8.0-r1 )
+	system-av1? (
+		>=media-libs/dav1d-1.0.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-gfx/graphite2-1.3.13
+		>=media-libs/harfbuzz-2.8.1:0=
+	)
+	system-icu? ( >=dev-libs/icu-74.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
+	system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	wayland? (
+		>=media-libs/libepoxy-1.5.10-r1
+		x11-libs/gtk+:3[wayland]
+		x11-libs/libxkbcommon[wayland]
+	)
+	wifi? (
+		kernel_linux? (
+			dev-libs/dbus-glib
+			net-misc/networkmanager
+			sys-apps/dbus
+		)
+	)
+	X? (
+		virtual/opengl
+		x11-libs/cairo[X]
+		x11-libs/gtk+:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libxkbcommon[X]
+		x11-libs/libXrandr
+		x11-libs/libXtst
+		x11-libs/libxcb:=
+	)"
+RDEPEND="${COMMON_DEPEND}
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )"
+DEPEND="${COMMON_DEPEND}
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libICE
+		x11-libs/libSM
+	)"
+
+S="${WORKDIR}/${PN}-${PV%_*}"
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang && ! tc-ld-is-mold ; then
+		if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
+			einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
+			einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
+				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+MOZ_LANGS=(
+	af ar ast be bg br ca cak cs cy da de dsb
+	el en-CA en-GB en-US es-AR es-ES es-MX et eu
+	fi fr fy-NL ga-IE gd gl he hr hsb hu
+	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
+	pa-IN pl pt-BR pt-PT rm ro ru
+	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_clear_vendor_checksums() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -ne 1 ]] ; then
+		die "${FUNCNAME} requires exact one argument"
+	fi
+
+	einfo "Clearing cargo checksums for ${1} ..."
+
+	sed -i \
+		-e 's/\("files":{\)[^}]*/\1/' \
+		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
+		|| die
+}
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+mozconfig_add_options_ac() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_add_options_mk() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_use_enable() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_enable "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+mozconfig_use_with() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_with "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+# This is a straight copypaste from toolchain-funcs.eclass's 'tc-ld-is-lld', and is temporarily
+# placed here until toolchain-funcs.eclass gets an official support for mold linker.
+# Please see:
+# https://github.com/gentoo/gentoo/pull/28366 ||
+# https://github.com/gentoo/gentoo/pull/28355
+tc-ld-is-mold() {
+	local out
+
+	# Ensure ld output is in English.
+	local -x LC_ALL=C
+
+	# First check the linker directly.
+	out=$($(tc-getLD "$@") --version 2>&1)
+	if [[ ${out} == *"mold"* ]] ; then
+		return 0
+	fi
+
+	# Then see if they're selecting mold via compiler flags.
+	# Note: We're assuming they're using LDFLAGS to hold the
+	# options and not CFLAGS/CXXFLAGS.
+	local base="${T}/test-tc-linker"
+	cat <<-EOF > "${base}.c"
+	int main() { return 0; }
+	EOF
+	out=$($(tc-getCC "$@") ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -Wl,--version "${base}.c" -o "${base}" 2>&1)
+	rm -f "${base}"*
+	if [[ ${out} == *"mold"* ]] ; then
+		return 0
+	fi
+
+	# No mold here!
+	return 1
+}
+
+virtwl() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	[[ $# -lt 1 ]] && die "${FUNCNAME} needs at least one argument"
+	[[ -n $XDG_RUNTIME_DIR ]] || die "${FUNCNAME} needs XDG_RUNTIME_DIR to be set; try xdg_environment_reset"
+	tinywl -h >/dev/null || die 'tinywl -h failed'
+
+	# TODO: don't run addpredict in utility function. WLR_RENDERER=pixman doesn't work
+	addpredict /dev/dri
+	local VIRTWL VIRTWL_PID
+	coproc VIRTWL { WLR_BACKENDS=headless exec tinywl -s 'echo $WAYLAND_DISPLAY; read _; kill $PPID'; }
+	local -x WAYLAND_DISPLAY
+	read WAYLAND_DISPLAY <&${VIRTWL[0]}
+
+	debug-print "${FUNCNAME}: $@"
+	"$@"
+	local r=$?
+
+	[[ -n $VIRTWL_PID ]] || die "tinywl exited unexpectedly"
+	exec {VIRTWL[0]}<&- {VIRTWL[1]}>&-
+	return $r
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has usersandbox $FEATURES ; then
+				die "You must enable usersandbox as X server can not run as root!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6600M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm_pkg_setup
+
+		if use clang && use lto && tc-ld-is-lld ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
+				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		python-any-r1_pkg_setup
+
+		# Avoid PGO profiling problems due to enviroment leakage
+		# These should *always* be cleaned up anyway
+		unset \
+			DBUS_SESSION_BUS_ADDRESS \
+			DISPLAY \
+			ORBIT_SOCKETDIR \
+			SESSION_MANAGER \
+			XAUTHORITY \
+			XDG_CACHE_HOME \
+			XDG_SESSION_COOKIE
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if use pgo ; then
+			# Update 105.0: "/proc/self/oom_score_adj" isn't enough anymore with pgo, but not sure
+			# whether that's due to better OOM handling by Firefox (bmo#1771712), or portage
+			# (PORTAGE_SCHEDULING_POLICY) update...
+			addpredict /proc
+
+			# May need a wider addpredict when using wayland+pgo.
+			addpredict /dev/dri
+
+			# Allow access to GPU during PGO run
+			local ati_cards mesa_cards nvidia_cards render_cards
+			shopt -s nullglob
+
+			ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+			if [[ -n "${ati_cards}" ]] ; then
+				addpredict "${ati_cards}"
+			fi
+
+			mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+			if [[ -n "${mesa_cards}" ]] ; then
+				addpredict "${mesa_cards}"
+			fi
+
+			nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+			if [[ -n "${nvidia_cards}" ]] ; then
+				addpredict "${nvidia_cards}"
+			fi
+
+			render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+			if [[ -n "${render_cards}" ]] ; then
+				addpredict "${render_cards}"
+			fi
+
+			shopt -u nullglob
+		fi
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
+			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
+		fi
+
+		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
+			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
+		fi
+
+		# Mozilla API keys (see https://location.services.mozilla.com/api)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
+			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_prepare() {
+	if use lto; then
+		rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die
+	fi
+
+	if ! use ppc64; then
+		rm -v "${WORKDIR}"/firefox-patches/*ppc64*.patch || die
+	fi
+
+	if use x86 && use elibc_glibc ; then
+		rm -v "${WORKDIR}"/firefox-patches/*-musl-non-lfs64-api-on-audio_thread_priority-crate.patch || die
+	fi
+
+	# Workaround for bgo#917599
+	if has_version ">=dev-libs/icu-74.1" && use system-icu ; then
+		eapply "${WORKDIR}"/firefox-patches/0029-bmo-1862601-system-icu-74.patch
+	fi
+	rm -v "${WORKDIR}"/firefox-patches/0029-bmo-1862601-system-icu-74.patch || die
+
+	# Workaround for bgo#915651 on musl
+	if use elibc_glibc ; then
+		rm -v "${WORKDIR}"/firefox-patches/*bgo-748849-RUST_TARGET_override.patch || die
+	fi
+
+	eapply "${WORKDIR}/firefox-patches"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Make cargo respect MAKEOPTS
+	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
+
+	# Workaround for bgo#915651
+	if ! use elibc_glibc ; then
+		if use amd64 ; then
+			export RUST_TARGET="x86_64-unknown-linux-musl"
+		elif use x86 ; then
+			export RUST_TARGET="i686-unknown-linux-musl"
+		else
+			die "Unknown musl chost, please post your rustc -vV along with emerge --info on Gentoo's bug #915651"
+		fi
+	fi
+
+	# Make LTO respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure \
+		|| die "sed failed to set num_cores"
+
+	# Make ICU respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/intl/icu_sources_data.py \
+		|| die "sed failed to set num_cores"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
+		|| die "sed failed to set toolchain prefix"
+
+	sed -i \
+		-e 's/ccache_stats = None/return None/' \
+		"${S}"/python/mozbuild/mozbuild/controller/building.py \
+		|| die "sed failed to disable ccache stats call"
+
+	einfo "Removing pre-built binaries ..."
+
+	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Clear cargo checksums from crates we have patched
+	# moz_clear_vendor_checksums crate
+	moz_clear_vendor_checksums audio_thread_priority
+
+	# Create build dir
+	BUILD_DIR="${WORKDIR}/${PN}_build"
+	mkdir -p "${BUILD_DIR}" || die
+
+	# Write API keys to disk
+	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
+	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
+	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	local have_switched_compiler=
+	if use clang; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+
+		local version_clang=$(clang --version 2>/dev/null | grep -F -- 'clang version' | awk '{ print $3 }')
+		[[ -n ${version_clang} ]] && version_clang=$(ver_cut 1 "${version_clang}")
+		[[ -z ${version_clang} ]] && die "Failed to read clang version!"
+
+		if tc-is-gcc; then
+			have_switched_compiler=yes
+		fi
+		AR=llvm-ar
+		CC=${CHOST}-clang-${version_clang}
+		CXX=${CHOST}-clang++-${version_clang}
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain,
+	# AS is used in a non-standard way by upstream, #bmo1654031
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	export AS="$(tc-getCC) -c"
+	tc-export CC CXX LD AR AS NM OBJDUMP RANLIB PKG_CONFIG
+
+	# Pass the correct toolchain paths through cbindgen
+	if tc-is-cross-compiler ; then
+		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
+	fi
+
+	# Set MOZILLA_FIVE_HOME
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set state path
+	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	# Initialize MOZCONFIG
+	mozconfig_add_options_ac '' --enable-application=comm/mail
+	mozconfig_add_options_ac '' --enable-project=comm/mail
+
+	# Set Gentoo defaults
+	mozconfig_add_options_ac 'Gentoo default' \
+		--allow-addon-sideload \
+		--disable-cargo-incremental \
+		--disable-crashreporter \
+		--disable-gpsd \
+		--disable-install-strip \
+		--disable-parental-controls \
+		--disable-strip \
+		--disable-tests \
+		--disable-updater \
+		--disable-wmf \
+		--enable-js-shell \
+		--enable-legacy-profile-creation \
+		--enable-negotiateauth \
+		--enable-new-pass-manager \
+		--enable-official-branding \
+		--enable-release \
+		--enable-system-ffi \
+		--enable-system-pixman \
+		--enable-system-policies \
+		--host="${CBUILD:-${CHOST}}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--target="${CHOST}" \
+		--without-ccache \
+		--without-wasm-sandboxed-libraries \
+		--with-intl-api \
+		--with-libclang-path="$(llvm-config --libdir)" \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system \
+		--x-includes="${ESYSROOT}/usr/include" \
+		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
+
+	# Set update channel
+	local update_channel=release
+	[[ -n ${MOZ_ESR} ]] && update_channel=esr
+	mozconfig_add_options_ac '' --update-channel=${update_channel}
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		mozconfig_add_options_ac '' --enable-rust-simd
+	fi
+
+	# For future keywording: This is currently (97.0) only supported on:
+	# amd64, arm, arm64 & x86.
+	# Might want to flip the logic around if Firefox is to support more arches.
+	# bug 833001, bug 903411#c8
+	if use ppc64 || use riscv; then
+		mozconfig_add_options_ac '' --disable-sandbox
+	else
+		mozconfig_add_options_ac '' --enable-sandbox
+	fi
+
+	# Enable JIT on riscv64 explicitly
+	# Can be removed once upstream enable it by default in the future.
+	use riscv && mozconfig_add_options_ac 'Enable JIT for RISC-V 64' --enable-jit
+
+	if [[ -s "${S}/api-google.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
+	else
+		einfo "Building without Google API key ..."
+	fi
+
+	if [[ -s "${S}/api-location.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-location-service-api-keyfile="${S}/api-location.key"
+	else
+		einfo "Building without Location API key ..."
+	fi
+
+	if [[ -s "${S}/api-mozilla.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
+	else
+		einfo "Building without Mozilla API key ..."
+	fi
+
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libevent
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-png
+	mozconfig_use_with system-webp
+
+	if use system-librnp; then
+		mozconfig_add_options_ac "+system-librnp" --enable-compile-environment
+		mozconfig_use_with system-librnp
+	else
+		# This controls the backend of the bundled librnp. Choices are "botan" and "openssl".
+		# RNP Upstream recommends to use botan. In Gentoo it's preferred to use system-librnp.
+		mozconfig_add_options_ac "+bundled librnp backend = botan" --with-librnp-backend="botan"
+	fi
+
+	mozconfig_use_enable dbus
+	mozconfig_use_enable libproxy
+
+	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+	fi
+
+	local myaudiobackends=""
+	use jack && myaudiobackends+="jack,"
+	use sndio && myaudiobackends+="sndio,"
+	use pulseaudio && myaudiobackends+="pulseaudio,"
+	! use pulseaudio && myaudiobackends+="alsa,"
+
+	mozconfig_add_options_ac '--enable-audio-backends' --enable-audio-backends="${myaudiobackends::-1}"
+
+	mozconfig_use_enable wifi necko-wifi
+
+	if use X && use wayland ; then
+		mozconfig_add_options_ac '+x11+wayland' --enable-default-toolkit=cairo-gtk3-x11-wayland
+	elif ! use X && use wayland ; then
+		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland-only
+	else
+		mozconfig_add_options_ac '+x11' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	if use lto ; then
+		if use clang ; then
+			# Upstream only supports lld or mold when using clang.
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+			fi
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+
+		else
+			# ThinLTO is currently broken, see bmo#1644409.
+			# mold does not support gcc+lto combination.
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		fi
+
+		if use pgo ; then
+			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
+
+			if use clang ; then
+				# Used in build/pgo/profileserver.py
+				export LLVM_PROFDATA="llvm-profdata"
+			fi
+		fi
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# lld is upstream's default
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+			fi
+
+		else
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "linker is set to bfd due to USE=-clang" --enable-linker=bfd
+			fi
+		fi
+	fi
+
+	# LTO flag was handled via configure
+	filter-lto
+
+	mozconfig_use_enable debug
+	if use debug ; then
+		mozconfig_add_options_ac '+debug' --disable-optimize
+		mozconfig_add_options_ac '+debug' --enable-real-time-tracing
+	else
+		mozconfig_add_options_ac 'Gentoo defaults' --disable-real-time-tracing
+
+		if is-flag '-g*' ; then
+			if use clang ; then
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
+			else
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
+			fi
+		else
+			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
+		fi
+
+		if is-flag '-O0' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
+		elif is-flag '-O4' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
+		elif is-flag '-O3' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
+		elif is-flag '-O1' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
+		elif is-flag '-Os' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
+		else
+			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
+		fi
+	fi
+
+	# Debug flag was handled via configure
+	filter-flags '-g*'
+
+	# Optimization flag was handled via configure
+	filter-flags '-O*'
+
+	# Modifications to better support ARM, bug #553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
+				--with-thumb=yes \
+				--with-thumb-interwork=no
+		fi
+	fi
+
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
+
+		if ! use system-libvpx ; then
+			sed -i \
+				-e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build \
+				|| die
+		fi
+	fi
+
+	# With profile 23.0 elf-hack=legacy is broken with gcc.
+	# With Firefox-115esr elf-hack=relr isn't available (only in rapid).
+	# Solution: Disable build system's elf-hack completely, and add "-z,pack-relative-relocs"
+	#  manually with gcc.
+	mozconfig_add_options_ac 'elf-hack disabled' --disable-elf-hack
+
+	if use amd64 || use x86 ; then
+		! use clang && append-ldflags "-z,pack-relative-relocs"
+	fi
+
+	# Additional ARCH support
+	case "${ARCH}" in
+		arm)
+			# Reduce the memory requirements for linking
+			if use clang ; then
+				# Nothing to do
+				:;
+			elif use lto ; then
+				append-ldflags -Wl,--no-keep-memory
+			else
+				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+			fi
+			;;
+	esac
+
+	if ! use elibc_glibc; then
+		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
+	fi
+
+	# Allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	# Make revdep-rebuild.sh happy; Also required for musl
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+
+	# Use system's Python environment
+	export PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
+
+	if use system-python-libs; then
+		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="system"
+	else
+		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
+	fi
+
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# Portage sets XARGS environment variable to "xargs -r" by default which
+	# breaks build system's check_prog() function which doesn't support arguments
+	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
+
+	# Set build dir
+	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
+
+	# Show flags we will use
+	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	# Handle EXTRA_CONF and show summary
+	local ac opt hash reason
+
+	# Apply EXTRA_ECONF entries to $MOZCONFIG
+	if [[ -n ${EXTRA_ECONF} ]] ; then
+		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
+		for opt in "${ac[@]}"; do
+			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
+		done
+	fi
+
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
+		[[ -z ${hash} || ${hash} == \# ]] \
+			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
+		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
+	done
+	echo "=========================================================="
+	echo
+
+	./mach configure || die
+}
+
+src_compile() {
+	local virtx_cmd=
+
+	if tc-ld-is-mold && use lto; then
+		# increase ulimit with mold+lto, bugs #892641, #907485
+		if ! ulimit -n 16384 1>/dev/null 2>&1 ; then
+			ewarn "Unable to modify ulimits - building with mold+lto might fail due to low ulimit -n resources."
+			ewarn "Please see bugs #892641 & #907485."
+		else
+			ulimit -n 16384
+		fi
+	fi
+
+	if use pgo; then
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+
+		if ! use X; then
+			virtx_cmd=virtwl
+		else
+			virtx_cmd=virtx
+		fi
+	fi
+
+	if ! use X; then
+		local -x GDK_BACKEND=wayland
+	else
+		local -x GDK_BACKEND=x11
+	fi
+
+	${virtx_cmd} ./mach build --verbose || die
+}
+
+src_install() {
+	# xpcshell is getting called during install
+	pax-mark m \
+		"${BUILD_DIR}"/dist/bin/xpcshell \
+		"${BUILD_DIR}"/dist/bin/${PN} \
+		"${BUILD_DIR}"/dist/bin/plugin-container
+
+	DESTDIR="${D}" ./mach install || die
+
+	# Upstream cannot ship symlink but we can (bmo#658850)
+	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
+	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
+		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/distribution.ini distribution.ini
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/defaults/pref"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
+
+	# Set dictionary path to use system hunspell
+	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
+	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
+	EOF
+
+	# Force hwaccel prefs if USE=hwaccel is enabled
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
+		>>"${GENTOO_PREFS}" \
+		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
+
+		if use wayland; then
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel wayland prefs"
+			pref("gfx.x11-egl.force-enabled",          false);
+			EOF
+		else
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel x11 prefs"
+			pref("gfx.x11-egl.force-enabled",          true);
+			EOF
+		fi
+	fi
+
+	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
+	if use system-harfbuzz ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
+		sticky_pref("gfx.font_rendering.graphite.enabled", true);
+		EOF
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${S}/comm/mail/branding/thunderbird"
+	local icon_symbolic_file="${icon_srcdir}/TB-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^}"
+	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
+	local desktop_filename="${PN}.desktop"
+	local exec_command="${PN}"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" \
+		|| die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" \
+		|| die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# does not need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		einfo "APULSE found; Generating library symlinks for sound support ..."
+		local lib
+		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# A quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+
+	local show_doh_information
+	local show_shortcut_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_shortcut_information=no
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 91.0 ; then
+				# Tell user that we no longer install a shortcut
+				# per supported display protocol
+				show_shortcut_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	if [[ -n "${show_shortcut_information}" ]] ; then
+		elog
+		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
+		elog "each supported display protocol.  Instead we will only install"
+		elog "one generic Mozilla ${PN^} shortcut."
+		elog "If you still want to be able to select between running Mozilla ${PN^}"
+		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
+	fi
+
+	# bug 835078
+	if use hwaccel && has_version "x11-drivers/xf86-video-nouveau"; then
+		ewarn "You have nouveau drivers installed in your system and 'hwaccel' "
+		ewarn "enabled for Firefox. Nouveau / your GPU might not support the "
+		ewarn "required EGL, so either disable 'hwaccel' or try the workaround "
+		ewarn "explained in https://bugs.gentoo.org/835078#c5 if Firefox crashes."
+	fi
+
+	optfeature_header "Optional programs for extra features:"
+	optfeature "desktop notifications" x11-libs/libnotify
+	optfeature "encrypted chat support" net-libs/libotr
+	optfeature "fallback mouse cursor theme e.g. on WMs" gnome-base/gsettings-desktop-schemas
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 71d3dd1588b2..17a1cd492e93 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/curtail/Manifest b/media-gfx/curtail/Manifest
index c8790a951812..3f54e16ac0ed 100644
--- a/media-gfx/curtail/Manifest
+++ b/media-gfx/curtail/Manifest
@@ -1,3 +1,5 @@
 DIST curtail-1.8.0.tar.gz 228988 BLAKE2B c04ad5aaebe8ceab1215937bb3d76ad6b2ca8cb9331011af2c6d3c8d33ee0a898fe3de0e24c0a6303b54ad0a7dd0d811f9b32321b50bbfea6b8063244be464a3 SHA512 6a8a081c0fe1b780b50c55a90f70c4d4514c49941eb9fd5924897e3961aa718af71010e8d210030e1b6028c2e33d0d19dcca5cbdcf51463b5a24d6d2e86c196c
+DIST curtail-1.9.1.tar.gz 199785 BLAKE2B 689aa8f61f3c48ed51a85c35bbc6bee136a20064cd2d03c48f630fd80c8c85b64421e77327a71a41f266bd8f9d6f0dcdc197c15657159ae74056e1b52cc8ef12 SHA512 7ff0ff10068c5ff2694f6674376edf84957759b6274740d47d11a584943b026183b13a59b777c27569b6997c3cb358694fa93c55a1136b9d1fab08e768d1a1a4
 EBUILD curtail-1.8.0-r1.ebuild 1307 BLAKE2B 54bd24a1f9ba26b0405bfa8257eabab3e196f86c30a3a3fb3ec3d665461b117ab3ac0c824ca630e4405e9d58145a88cdd047d2970d479b8a8ea5e1740a52e5c8 SHA512 3a70c2b738aead5a2c879fe8ef01481425378177c9483c08ad32301d91861237d7c48f4550731431d78bbe90cbf7259860fa9d53dcfb1ca9916ceeeb2f42565c
+EBUILD curtail-1.9.1.ebuild 1309 BLAKE2B c2677116ab6a40d0e9d6a4a09631ac54293bb54f0a6239900396bc5158cdfc8edc4cb95798d8b4c6d8cb4176e932f2188f4a38709f4b84698969d2b492fbff22 SHA512 f317cb1daafba30f68627ed8fd5b24d767b0988e320945f8e1d752f85b91889ed5b7b32315841aff8683b6f1b8e49927117d6eb4238a5a47173b33994fbbfef9
 MISC metadata.xml 817 BLAKE2B ea01ae4c58024699aae770d6e7f21a03adfc8da5f5f658a0b1708824bfda730a2fce4557de4fbccbc079c66a11ab08d6faef020bf897d47870f6581b5e0d68e6 SHA512 3d573feda8c750a08903203c1d2f2e1385e17242356c6f319e29944e530b2199a27e4e432a806dfe1f2c8c783dd67c4fe347d5160d4df99911f67623a3168eee
diff --git a/media-gfx/curtail/curtail-1.9.1.ebuild b/media-gfx/curtail/curtail-1.9.1.ebuild
new file mode 100644
index 000000000000..222e4969754c
--- /dev/null
+++ b/media-gfx/curtail/curtail-1.9.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="Image compressor, supporting PNG, JPEG and WebP"
+HOMEPAGE="https://github.com/Huluti/Curtail/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Huluti/${PN^}.git"
+else
+	SRC_URI="https://github.com/Huluti/${PN^}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${P^}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="test"  # Just desktop / schema / appstream file validation (fails).
+
+RDEPEND="
+	${PYTHON_DEPS}
+	gui-libs/gtk:4[introspection]
+	$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+"
+BDEPEND="
+	${RDEPEND}
+	dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+"
+RDEPEND+="
+	>=gui-libs/libadwaita-1.3.1
+	media-gfx/jpegoptim
+	media-gfx/oxipng
+	media-gfx/pngquant
+	media-libs/libwebp
+"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	sed -i "s|@PYTHON@|${PYTHON}|" "${S}"/src/${PN}.in || die
+
+	default
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 31f2523ff173..06fdbed0ae97 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index 50de8b6184b3..20adcc5184ee 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -1,6 +1,5 @@
 AUX libjxl-0.8.2-backport-pr2596.patch 2017 BLAKE2B 3155febe7e02fc34dfdf692821028e16f97272f751176ef22126151e8edf18e2c7d9da88d9bc8334cd4737d36037a5a04eb7360a41fde39605db62942c52e62c SHA512 4f8cd6f2a70077b8e52b084a4c76f5a029e3e13e578d28bb2d9d3470ae89fa6867d541bacd079bd55b76eb17a1c2f3d845715fc0d4c9e2a199618d8a6871d1a1
 AUX libjxl-0.8.2-backport-pr2617.patch 2853 BLAKE2B edeafa5bfa85f9868d98f4ee38be2dd4a5d747517e6aec59688d5314f1b6ede74bc3d20a11d08e3e2e2e87e8da987730a8a8cafcecce69369fdfa7bcb8ef2828 SHA512 ad8ddbe50d23895a3127d11bf36832ad1a1762e9b54bacc5f4d881accb5c81801618254b9b56afc4b145a7fb19bab8ca739974ff3bcb498e7db812d3a6cf004d
-AUX libjxl-0.9.1-backport-pr3138.patch 1775 BLAKE2B 3bc8ec83f1104fabec0966dffd85719ed6eea5c89a10d7ffc490aaf767815dbfd7c6543a0058664b16a8d52cafb53b3137414403dbb5db844a0ae9366fe4b6bd SHA512 0a9262008daa2d118c4eab85102de8f05b265f3a3a8f45088f28ef844fd7c93740a69aa6a1d93bc5d1808c3158527d8b9b8c4543256c1a2988e8a03bff19486a
 AUX libjxl-0.9.1-backport-pr3143.patch 1065 BLAKE2B acc6ab904994f42cffe19296966587dbbf316289277d91e1a17cd635161b51eed770ab95fc682d93b8693d50def9bb205290c3eb534effdfdc2cd057db36647c SHA512 d5eeca764e13175eb64ba5ee47a9bf03080d0830395ba9b626b7144674a5ce8fbb694705a4d2c55f3b52507a59c5793e21e9c99dded65803857a0859a1f9f466
 DIST libjxl-0.10.2.tar.gz 1912303 BLAKE2B 9677d0d35d877ce269c9958accfbb5ee55d446dc0e8fa64df9323c1db3993613752803aae63a48c18eeb72ae91c2a044a1fab0a83ddf28fdf8395ddb67a72414 SHA512 1d19f30c0ae94e212326a15dc128612bce207e619c55c2a020401a27d01a933de71bb35e907521dc8fd853dd5578d74d74f7a5a282f0083fd22cf9cb07ccb96e
 DIST libjxl-0.8.2.tar.gz 1612062 BLAKE2B 2b5e65cde6c85881c5f26f676afec825c974f6919c3cc3f056ca4a9679162e89f2de35ab7d0b2a60782d39eca1f4ddad779f8d25d3f520417f6d9dea71e854db SHA512 769f102c46755d11a705ce47ae9e2ef49627ae708f416693bf1293aeeb713934baf4466e45b9c70b04ec1fc8b4a00d5ca7688c8ca03f0a91c9a15252c522a887
diff --git a/media-libs/libjxl/files/libjxl-0.9.1-backport-pr3138.patch b/media-libs/libjxl/files/libjxl-0.9.1-backport-pr3138.patch
deleted file mode 100644
index 0da0a9ba8ab8..000000000000
--- a/media-libs/libjxl/files/libjxl-0.9.1-backport-pr3138.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://github.com/libjxl/libjxl/issues/3137
-https://github.com/libjxl/libjxl/pull/3138
-
-From 5e5dda47aee0a6f480984cf13cfc2be0044316e4 Mon Sep 17 00:00:00 2001
-From: Moritz Firsching <firsching@google.com>
-Date: Mon, 15 Jan 2024 13:43:01 +0100
-Subject: [PATCH] disable tooling test when not JPEGXL_ENABLE_TOOLS
-
----
- tools/conformance/CMakeLists.txt | 25 ++++++++++++++-----------
- 1 file changed, 14 insertions(+), 11 deletions(-)
-
-diff --git a/tools/conformance/CMakeLists.txt b/tools/conformance/CMakeLists.txt
-index 5766612abf9..36249048c59 100644
---- a/tools/conformance/CMakeLists.txt
-+++ b/tools/conformance/CMakeLists.txt
-@@ -4,15 +4,18 @@
- # license that can be found in the LICENSE file.
- 
- if(BUILD_TESTING AND CMAKE_EXECUTABLE_SUFFIX STREQUAL "")
--# Script to validate the tooling.
--find_program (BASH_PROGRAM bash)
--if(BASH_PROGRAM)
--  add_test(
--    NAME conformance_tooling_test
--    COMMAND
--        ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/tooling_test.sh
--        ${CMAKE_BINARY_DIR} ${JPEGXL_TEST_DATA_PATH})
--  # Skip the test if dependencies are not available.
--  set_tests_properties(conformance_tooling_test PROPERTIES SKIP_RETURN_CODE 254)
--endif()
-+  # Script to validate the tooling.
-+  # Only add it when djxl being build.
-+  if(JPEGXL_ENABLE_TOOLS)
-+    find_program (BASH_PROGRAM bash)
-+    if(BASH_PROGRAM)
-+      add_test(
-+        NAME conformance_tooling_test
-+        COMMAND
-+            ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/tooling_test.sh
-+            ${CMAKE_BINARY_DIR} ${JPEGXL_TEST_DATA_PATH})
-+      # Skip the test if dependencies are not available.
-+      set_tests_properties(conformance_tooling_test PROPERTIES SKIP_RETURN_CODE 254)
-+    endif() # BASH_PROGRAM
-+  endif() # JPEGXL_ENABLE_TOOLS
- endif() # BUILD_TESTING
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 1b0a439ca412..e283a5b63fec 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -3,5 +3,5 @@ DIST mesa-24.0.4.tar.xz 20057744 BLAKE2B 6de755081f7e9dd9303af791e1a405203388787
 DIST mesa-24.0.5.tar.xz 20096384 BLAKE2B c4c5f493206f761a7171f19c6549dc791559a1fdbcf49aea98016f98c10f9130081a16df6b780062621495a42dc49ef5f0800bda64058e8ba60106f6a046ccef SHA512 9476af4b9ac8db5dce397084ef169927d10b28adea7e74aa5b3136810b499ac98ddf7ab564e7d1ff81c887208c8ebab3ad2d4e27e7f46136609b5c67527018eb
 EBUILD mesa-24.0.4.ebuild 11622 BLAKE2B 21b8abb688e9ebb187ecc7a961ce851a83c5b09c58d3a51a3dd1151e927322c85a8ab44c5f6108dd4d02ca665eccdb2ade4d1604abe78c48eaee747b82c37329 SHA512 9eea957f1ec9db156c8fd9210214b566991524d3422fb411ec3758088b9851f8499e28c7284911f153ab64e1ec25088bf9b6485e2a7b406950edea9a0557c43a
 EBUILD mesa-24.0.5.ebuild 11630 BLAKE2B 4c0b8bee298f59954db6759e92464530c0fd7684425ebbbd4985e0d7f87e004f1c0990ec5468266ee9773833fc00f6287ef162d9abaca1ebeb553fe0d26bc19f SHA512 0854e76a64cc3bb2bcd873805a1c92a46bb82cbba2a107cfd43af676da0eab5b755646155164182dedd8a3dc26a6b73a11e8c366ba8067e142b49ac6d48ec4f4
-EBUILD mesa-9999.ebuild 11440 BLAKE2B 30dae1ddaf02fc912792b4ed84226b5403ad0519267a7849e5ce39915ee3c0020cf71f84351e26d278319f578a71ddb559152937c845e703c2e256c4fff8ed16 SHA512 a3117f30efce1d231a9b541c619df2973a85ff05ee0afea41e611161b0403b5679f5c09843077005152f6316498021a0555a43109fd5bdde9d5d6126820d90bd
+EBUILD mesa-9999.ebuild 11440 BLAKE2B d15749e785f0e13a662f889803d71466185d905205a077d730ea8df71d2936d6035b76c670e8ff20834df5d2f9a09d220bbc7ae8505ed8ef6aa837cf9caf2004 SHA512 9fbde7f466ef10a8a453fc1e3d5fc0f254031aa1c484519e5c9b79279f9c8b692f605c25902d5b3ffa1981ff26e74b213cab0b2c6e97383542de2d49c810f827
 MISC metadata.xml 1435 BLAKE2B 53690878512b86ce0b8dce38b083684c85ad5c1a655d5a69cb3265e156869845263eb16f271691b66c9f0cd76e97b56908acf7a1792d6abac0ec99447826cbb5 SHA512 842106e5d6eb60ff33c8cae7f0d52983c4f7e104152718b50fc790cbcb2506551a6fc7841fe8e3c7963850c238f77505b0e49b10a3a936baf459e1acaf73e07f
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 98fed4a9ad0e..1b84a142e107 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -102,7 +102,7 @@ RDEPEND="
 		>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.17:=[${MULTILIB_USEDEP}]
 		x11-libs/libXfixes[${MULTILIB_USEDEP}]
 		x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
 	)
diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest
index a1829b5a312f..0f9d08c2c3fe 100644
--- a/media-libs/raspberrypi-userland/Manifest
+++ b/media-libs/raspberrypi-userland/Manifest
@@ -1,9 +1,4 @@
-AUX 04raspberrypi-userland 80 BLAKE2B cf3b819e4cd50f50b9efaf95c654567f607e0bc36e341ec705ebe449f99817bbb39d166013e60de8705024cb6f56cb6ba18e33f4417c5607a058147f7777cc1b SHA512 fc934a7aa367dcd787c9158d07f59866b8e04034928303a949b2c4fa45577afcc0b31c5a3e7b08defcfc040e601a51728fc5ccd9a6c0dd60e2c1cb2fd00107d9
 AUX 92-local-vchiq-permissions.rules 142 BLAKE2B 962d9eb744717cf7a685fb7ab8a0e68f964a3ca7c0d49d2b93102d66bb3d20d84a433097fc7b510f609b8b762ae0f7ede32954b9c2ec055d5dbaa4d07b06af81 SHA512 b0e430adf65ccde1c3199c59e876293ffa1821a70f7d60057bb4990108fe21604e6d8c11dbdd74de50ad1fd5fad5e579ad35fb172a62ccef26bd2ff9bed5aba4
-AUX bcm_host.pc 338 BLAKE2B 2afdd23a6b200a04650c4ea0b669b14e4f6aac9f2fbcbc77a606615cd17b9a4651b4bba8d367ea7dfc1366873cdc9aef41baae5723f610b462ee58fbc3e3e7cc SHA512 d13ebe21288fc8cb29643a3564415006899490334c8a2d4601632d5a7b681e1f1ee97cc7b8d6b8840b28432dc8dd0b090e0c592dc07c99e3cc72ad9fbce0933b
-AUX egl.pc 227 BLAKE2B e3b205358a0891f58d95fbd0494e6d6a07c550363b60373c0f3b14686b5c3967dfa7e76fb2a65ca703c770f7bd9e5ba2232e1932ebebdd799fb99555afa55402 SHA512 15e2cdf73be35640a951a7e841963902bb056d96025b52c1551359ec7671baf710699c642a08a5543d52d27f424d900e2fd1d584976a056a54a20116b59a21f6
-AUX glesv2.pc 230 BLAKE2B eb3405f7e867b7e8d1ecde9498ac396c11931dac0bb03ae1e78a3bb6ed376b468917ed6363f08341934f1b97ed3df00bfc9c0af22e6e5aa7c91def517df586e7 SHA512 a821afcf22d52ea48b4b94b3f4317553bed2ed2e1aadee2862b4d925ee3c78cc0d3a023c62842758de5c2b168dfc8b1ba6838ccb9b0749aef9fc782aa33fa8ec
-AUX next-resource-handle.patch 12535 BLAKE2B b7dbf4152f92ce7bbbf9d2b8b72fddc8cf2f32e576b2d8096b0b17ac89a4cc8ab2cfd0e11137b8da3b2c7b7414d02855a14e1dbffd77d26e087989184ab88001 SHA512 f0368ffff54f989f2541f1891fe3b244d9ff4f2fc464adf2387c04045aca2f1e1f35622d2bd6c6d42e9581c45c417d1961e235b063d892b17e7dbe3e4724f5c5
 AUX raspberrypi-userland-include.patch 1484 BLAKE2B 7563874b54b168bd4858ecb65112ef48a7e010feae7a68c22f6d3f47dc1b855222df124df808fd6be427fea5763a9afd4c55ae2e3223c7bd55aa95333e55fe88 SHA512 fe73bcd1182b36e8ccaf81f0d7717f299a482545f08b352af8ead80f134a7be0f5269adb6972a1979a390046b9b94cab55c7a50a493740c72c5084e0e4995baf
 AUX raspberrypi-userland-libdir.patch 12348 BLAKE2B ed0dcc454b13589244204cf2cb26d9e38b75887c2d4d1ec4db02e7d4a206661f0ae4fc9d06467e353310a6b69f49a72a53b2882acab6a3959d57c7c0d34434b5 SHA512 213f04d859a0134143cf0e98650ed69096934c1600577d28bb24d62272f9da7ca12d0f3b59a19d3ff06a5fc67547f8e5a8684738b534bfa6e429722b320fee9f
 AUX raspberrypi-userland-libfdt-static.patch 724 BLAKE2B 1e2901c69d9bf855c1db9e7f5776041d9d83e9e3025a31ab54fa136bfd67dd944ed631017de33ef15a948324b1392711fb2535b65fea4e4d5a59177b866114ea SHA512 1841061596a98157d7ed25f358e5d63d78f7f808f777b909c271c0b4aa9b45c4dfa498d5623bc53466d9b81e5c064ae45423910d180816b7e39563cedb1809d8
diff --git a/media-libs/raspberrypi-userland/files/04raspberrypi-userland b/media-libs/raspberrypi-userland/files/04raspberrypi-userland
deleted file mode 100644
index 17b493b1814e..000000000000
--- a/media-libs/raspberrypi-userland/files/04raspberrypi-userland
+++ /dev/null
@@ -1,3 +0,0 @@
-PKG_CONFIG_PATH='/opt/vc/lib/pkgconfig'
-PATH='/opt/vc/bin'
-LDPATH='/opt/vc/lib'
diff --git a/media-libs/raspberrypi-userland/files/bcm_host.pc b/media-libs/raspberrypi-userland/files/bcm_host.pc
deleted file mode 100644
index 7627ae87105b..000000000000
--- a/media-libs/raspberrypi-userland/files/bcm_host.pc
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=/opt/vc
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: bcm_host
-Description: Broadcom VideoCore host API library
-Version: 1
-Libs: -L${libdir} -lbcm_host -lvcos -lvchiq_arm
-Cflags: -I${includedir} -I${includedir}/interface/vmcs_host/linux -I${includedir}/interface/vcos/pthreads -DUSE_VCHIQ_ARM
diff --git a/media-libs/raspberrypi-userland/files/egl.pc b/media-libs/raspberrypi-userland/files/egl.pc
deleted file mode 100644
index 56bf1e07e93b..000000000000
--- a/media-libs/raspberrypi-userland/files/egl.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/opt/vc
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: EGL
-Description: Fake EGL package for RPi
-Version: 10
-Requires: bcm_host glesv2
-Libs: -L${libdir} -lEGL
-Cflags: -I${includedir}
diff --git a/media-libs/raspberrypi-userland/files/glesv2.pc b/media-libs/raspberrypi-userland/files/glesv2.pc
deleted file mode 100644
index 04d61c21cea3..000000000000
--- a/media-libs/raspberrypi-userland/files/glesv2.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/opt/vc
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: GLESv2
-Description: Fake GL ES 2 package for RPi
-Version: 10
-Requires: bcm_host
-Libs: -L${libdir} -lGLESv2
-Cflags: -I${includedir}
diff --git a/media-libs/raspberrypi-userland/files/next-resource-handle.patch b/media-libs/raspberrypi-userland/files/next-resource-handle.patch
deleted file mode 100644
index 45e1a494b2c8..000000000000
--- a/media-libs/raspberrypi-userland/files/next-resource-handle.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-From 825c3236e5908ff003644abd870bfe98e82722b2 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <dc4@broadcom.com>
-Date: Tue, 9 Jul 2013 09:26:26 -0400
-Subject: [PATCH] Allow applications to set next resource handle
-
-This patch adds provisions in userland to
-let apps callers set the next rendereing dispmanx resource.
-It's useful for implementing, say, a buffer carousel.
----
- interface/khronos/common/khrn_client_rpc.h |  2 ++
- interface/khronos/common/khrn_int_ids.h    |  2 ++
- interface/khronos/egl/egl_client.c         | 30 +++++++++++++++++++++++++++---
- interface/khronos/egl/egl_client_surface.c | 24 +++++++++++++++++++++++-
- interface/khronos/egl/egl_client_surface.h |  3 ++-
- interface/khronos/egl/egl_int_impl.h       |  5 +++--
- 6 files changed, 59 insertions(+), 7 deletions(-)
-
-diff --git a/interface/khronos/common/khrn_client_rpc.h b/interface/khronos/common/khrn_client_rpc.h
-index 418aa67..a7557a8 100644
---- a/interface/khronos/common/khrn_client_rpc.h
-+++ b/interface/khronos/common/khrn_client_rpc.h
-@@ -683,6 +683,7 @@ static INLINE void rpc_call18(CLIENT_THREAD_STATE_T *thread, uint32_t id, uint32
- static INLINE void rpc_call13_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id, uint32_t p0, uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4, uint32_t p5, uint32_t p6, uint32_t p7, uint32_t p8, uint32_t p9, uint32_t p10, uint32_t p11, void *out)               { rpc_begin(thread); RPC_CALL(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11);      rpc_recv(thread, out, NULL, (RPC_RECV_FLAG_T)(RPC_RECV_FLAG_CTRL | RPC_RECV_FLAG_LEN)); rpc_end(thread); }
- static INLINE void rpc_call14_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id, uint32_t p0, uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4, uint32_t p5, uint32_t p6, uint32_t p7, uint32_t p8, uint32_t p9, uint32_t p10, uint32_t p11, uint32_t p12, void *out) { rpc_begin(thread); RPC_CALL(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); rpc_recv(thread, out, NULL, (RPC_RECV_FLAG_T)(RPC_RECV_FLAG_CTRL | RPC_RECV_FLAG_LEN)); rpc_end(thread); }
- static INLINE void rpc_call15_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id, uint32_t p0, uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4, uint32_t p5, uint32_t p6, uint32_t p7, uint32_t p8, uint32_t p9, uint32_t p10, uint32_t p11, uint32_t p12, uint32_t p13, void *out) { rpc_begin(thread); RPC_CALL(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13); rpc_recv(thread, out, NULL, (RPC_RECV_FLAG_T)(RPC_RECV_FLAG_CTRL | RPC_RECV_FLAG_LEN)); rpc_end(thread); }
-+static INLINE void rpc_call16_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id, uint32_t p0, uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4, uint32_t p5, uint32_t p6, uint32_t p7, uint32_t p8, uint32_t p9, uint32_t p10, uint32_t p11, uint32_t p12, uint32_t p13, uint32_t p14, void *out) { rpc_begin(thread); RPC_CALL(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14); rpc_recv(thread, out, NULL, (RPC_RECV_FLAG_T)(RPC_RECV_FLAG_CTRL | RPC_RECV_FLAG_LEN)); rpc_end(thread); }
- #endif
- 
- #define RPC_CALL1_OUT_CTRL(fn, thread, id, out)                                               rpc_call1_out_ctrl(thread, id, out)
-@@ -700,6 +701,7 @@ static INLINE void rpc_call18(CLIENT_THREAD_STATE_T *thread, uint32_t id, uint32
- #define RPC_CALL13_OUT_CTRL(fn, thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, out)      rpc_call13_out_ctrl(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, out)
- #define RPC_CALL14_OUT_CTRL(fn, thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, out) rpc_call14_out_ctrl(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, out)
- #define RPC_CALL15_OUT_CTRL(fn, thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, out) rpc_call15_out_ctrl(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, out)
-+#define RPC_CALL16_OUT_CTRL(fn, thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, out) rpc_call16_out_ctrl(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, out)
- 
- # if !defined(__SYMBIAN32__)  //use functions defined in khrpc.cpp
- static INLINE uint32_t rpc_call1_out_ctrl_res(CLIENT_THREAD_STATE_T *thread,uint32_t id, void *out)                                                                                                                       { uint32_t res; rpc_begin(thread); RPC_CALL(thread, id);                                     res = rpc_recv(thread, out, NULL, (RPC_RECV_FLAG_T)(RPC_RECV_FLAG_RES | RPC_RECV_FLAG_CTRL | RPC_RECV_FLAG_LEN)); rpc_end(thread); return res; }
-diff --git a/interface/khronos/common/khrn_int_ids.h b/interface/khronos/common/khrn_int_ids.h
-index 8378f4a..ec961e0 100644
---- a/interface/khronos/common/khrn_int_ids.h
-+++ b/interface/khronos/common/khrn_int_ids.h
-@@ -367,6 +367,7 @@
- */
- 
- #define EGLINTCREATESURFACE_ID            0x4000
-+#define EGLINTCREATESURFACE_ID_V2         0x4100
- #define EGLINTCREATEGLES11_ID             0x4001
- #define EGLINTCREATEGLES20_ID             0x4002
- #define EGLINTCREATEVG_ID                 0x4003
-@@ -377,6 +378,7 @@
- #define EGLINTMAKECURRENT_ID              0x4008
- #define EGLINTFLUSHANDWAIT_ID             0x4009
- #define EGLINTSWAPBUFFERS_ID              0x400a
-+#define EGLINTSWAPBUFFERS_ID_V2           0x410a
- #define EGLINTSELECTMIPMAP_ID             0x400b
- #define EGLINTFLUSH_ID                    0x400c
- #define EGLINTGETCOLORDATA_ID             0x400d
-diff --git a/interface/khronos/egl/egl_client.c b/interface/khronos/egl/egl_client.c
-index fd07eb6..e902d19 100644
---- a/interface/khronos/egl/egl_client.c
-+++ b/interface/khronos/egl/egl_client.c
-@@ -162,6 +162,17 @@
- void egl_gl_flush_callback(bool wait);
- void egl_vg_flush_callback(bool wait);
- 
-+#include "interface/vmcs_host/vc_dispmanx_types.h"
-+/**HACKHACK - give us the ability to inject a DispmanX 
-+ * resource handle into the CreateWindowSurface and 
-+ * SwapBuffers calls */ 
-+static DISPMANX_RESOURCE_HANDLE_T next_resource_handle;
-+
-+EGLAPI EGLBoolean EGLAPIENTRY eglSetNextResourceHandle(DISPMANX_RESOURCE_HANDLE_T handle)
-+{
-+   next_resource_handle = handle;
-+}
-+
- /*
- TODO: do an RPC call to make sure the Khronos vll is loaded (and that it stays loaded until eglTerminate)
- Also affects global image (and possibly others?)
-@@ -643,7 +654,8 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreateWindowSurface(EGLDisplay dpy, EGLConfig c
-                                 false,
-                                 EGL_NO_TEXTURE,
-                                 EGL_NO_TEXTURE,
--                                0, 0);
-+                                0, 0,
-+                                next_resource_handle);
- 
-                if (surface) {
-                   if (khrn_pointer_map_insert(&process->surfaces, process->next_surface, surface)) {
-@@ -888,7 +900,7 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferSurface(EGLDisplay dpy, EGLConfig
-                              mipmap_texture,
-                              texture_format,
-                              texture_target,
--                             0, 0);
-+                             0, 0, 0);
- 
-             if (surface) {
-                if (khrn_pointer_map_insert(&process->surfaces, process->next_surface, surface)) {
-@@ -1030,7 +1042,7 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurface(EGLDisplay dpy, EGLConfig c
-                                    false,
-                                    EGL_NO_TEXTURE,
-                                    EGL_NO_TEXTURE,
--                                   pixmap, ((server_handle[0] == 0) && (server_handle[1] == (uint32_t)(-1))) ? NULL : server_handle);
-+                                   pixmap, ((server_handle[0] == 0) && (server_handle[1] == (uint32_t)(-1))) ? NULL : server_handle, 0);
- 
-                      if (surface) {
-                         if (khrn_pointer_map_insert(&process->surfaces, process->next_surface, surface)) {
-@@ -2302,6 +2314,18 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surf)
- 
-                vcos_log_trace("eglSwapBuffers server call");
- 
-+               if (next_resource_handle)
-+               RPC_CALL7(eglIntSwapBuffers_impl,
-+                     thread,
-+                     EGLINTSWAPBUFFERS_ID_V2,
-+                     RPC_UINT(surface->serverbuffer),
-+                     RPC_UINT(surface->width),
-+                     RPC_UINT(surface->height),
-+                     RPC_UINT(surface->internal_handle),
-+                     RPC_UINT(surface->swap_behavior == EGL_BUFFER_PRESERVED ? 1 : 0),
-+                     RPC_UINT(khrn_platform_get_window_position(surface->win)),
-+                     RPC_INT(next_resource_handle));
-+               else
-                RPC_CALL6(eglIntSwapBuffers_impl,
-                      thread,
-                      EGLINTSWAPBUFFERS_ID,
-diff --git a/interface/khronos/egl/egl_client_surface.c b/interface/khronos/egl/egl_client_surface.c
-index cda5943..0be56c5 100644
---- a/interface/khronos/egl/egl_client_surface.c
-+++ b/interface/khronos/egl/egl_client_surface.c
-@@ -314,7 +314,8 @@ EGL_SURFACE_T *egl_surface_create(
-    EGLenum texture_format,
-    EGLenum texture_target,
-    EGLNativePixmapType pixmap,
--   const uint32_t *pixmap_server_handle)
-+   const uint32_t *pixmap_server_handle,
-+   DISPMANX_RESOURCE_HANDLE_T next_resource_handle)
- {
-    KHRN_IMAGE_FORMAT_T color;
-    KHRN_IMAGE_FORMAT_T depth;
-@@ -473,6 +474,27 @@ EGL_SURFACE_T *egl_surface_create(
- #endif
-          uint32_t results[3];
- 
-+         if (next_resource_handle)
-+         RPC_CALL16_OUT_CTRL(eglIntCreateSurface_impl,
-+                             thread,
-+                             EGLINTCREATESURFACE_ID_V2,
-+                             RPC_UINT(serverwin),
-+                             RPC_UINT(buffers),
-+                             RPC_UINT(width),
-+                             RPC_UINT(height),
-+                             RPC_UINT(color),
-+                             RPC_UINT(depth),
-+                             RPC_UINT(mask),
-+                             RPC_UINT(multi),
-+                             RPC_UINT(largest_pbuffer),
-+                             RPC_UINT(mipmap_texture),
-+                             RPC_UINT(config_depth_bits),
-+                             RPC_UINT(config_stencil_bits),
-+                             RPC_UINT(sem_name),
-+                             RPC_UINT(type),
-+                             RPC_INT(next_resource_handle),
-+                             results);
-+         else
-          RPC_CALL15_OUT_CTRL(eglIntCreateSurface_impl,
-                              thread,
-                              EGLINTCREATESURFACE_ID,
-diff --git a/interface/khronos/egl/egl_client_surface.h b/interface/khronos/egl/egl_client_surface.h
-index c99d44c..b5bf70a 100644
---- a/interface/khronos/egl/egl_client_surface.h
-+++ b/interface/khronos/egl/egl_client_surface.h
-@@ -322,7 +322,8 @@ extern EGL_SURFACE_T *egl_surface_create(
-    EGLenum texture_format,
-    EGLenum texture_target,
-    EGLNativePixmapType pixmap,
--   const uint32_t *pixmap_server_handle);
-+   const uint32_t *pixmap_server_handle,
-+   DISPMANX_RESOURCE_HANDLE_T next_resource_handle);
- extern EGL_SURFACE_T *egl_surface_from_vg_image(
-    VGImage vg_handle,
-    EGLSurface name,
-diff --git a/interface/khronos/egl/egl_int_impl.h b/interface/khronos/egl/egl_int_impl.h
-index 8a5734c..51b3580 100644
---- a/interface/khronos/egl/egl_int_impl.h
-+++ b/interface/khronos/egl/egl_int_impl.h
-@@ -56,7 +56,8 @@
-    uint32_t config_stencil_bits,
-    uint32_t sem,
-    uint32_t type,
--   uint32_t *results))
-+   uint32_t *results,
-+   DISPMANX_RESOURCE_HANDLE_T next_resource_handle))
- 
- FN(int, eglIntCreatePbufferFromVGImage_impl, (
-    VGImage vg_handle,
-@@ -110,7 +111,7 @@
- FN(int, eglIntFlushAndWait_impl, (uint32_t flushgl, uint32_t flushvg))
- FN(void, eglIntFlush_impl, (uint32_t flushgl, uint32_t flushvg))
- 
--FN(void, eglIntSwapBuffers_impl, (EGL_SURFACE_ID_T s, uint32_t width, uint32_t height, uint32_t handle, uint32_t preserve, uint32_t position))
-+FN(void, eglIntSwapBuffers_impl, (EGL_SURFACE_ID_T s, uint32_t width, uint32_t height, uint32_t handle, uint32_t preserve, uint32_t position, DISPMANX_RESOURCE_HANDLE_T new_back_buffer))
- FN(void, eglIntSelectMipmap_impl, (EGL_SURFACE_ID_T s, int level))
- 
- FN(void, eglIntGetColorData_impl, (EGL_SURFACE_ID_T s, KHRN_IMAGE_FORMAT_T format, uint32_t width, uint32_t height, int32_t stride, uint32_t y_offset, void *data))
--- 
-1.8.5.1
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 377d2846a04a..ccd3ed29e9a0 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 48308d1c437e..1003fe60e9b9 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -6,11 +6,8 @@ AUX audacity-2.4.2-fix-gettimeofday.patch 338 BLAKE2B f9deed24aca404693a0094b83e
 AUX audacity-2.4.2-fix-libflac-undefined-references.patch 2255 BLAKE2B a1c90b3b712ef558d74edc0f8e2a4db71a8b8292b633e24a9808587923a012d0935e35e574b76ad94ade95779d917419459b83d5cf5eeb90a696ca7cc3102814 SHA512 d3cc5fd18b3869047112b930aadcf912911ed6bda0299dc3a9a284db28a56aa4545629df567844735c8c5a4c641e21e6c39f42838c41d406ac18758a74760621
 AUX audacity-2.4.2-fix-metainfo.patch 468 BLAKE2B 87133634ca1be0ce0392b044d60a1632c6a963ee11a1893064c41c9d8093adf081bc3fd6a2e2dcc909573bd22d1d21e8cb58c8bbf9e464058780cfce839d6c06 SHA512 a2cdabecf53c03b77434ddbdbfb7606eb52f8e52b67d62bd206799eb0e9399345967106d7644784de338ef68d3e87c26952c491e775b1a323e1e2a91e41fe200
 AUX audacity-2.4.2-fix-vertical-track-resizing.patch 462 BLAKE2B 3f6fe748506f39ca64b72449853bc396389c2760767d916301298951aaa7b82cc1379c2b7d9860b4579a964dedc6806c85120cd3f4f1aa2b726ae5846bae1df2 SHA512 dc7c2cb3ae1e47e00f473b0943994e352275dc41d41255b2b1ba2e042d9bd6ab046f2088cda81dbc22f2ffeb13a97d28073ce078e35bb29e868f6fa2e8b9e0df
-AUX audacity-3.2.3-allow-finding-rapidjson-pkgconfig.patch 677 BLAKE2B 3d29197b3e73784ce6bb844188fe207c4c19ac48670589a98a7a3b198c1220be0da47535402cfc234ffc82bb3b97c44660caaa8a794d249b83250b182bb2913f SHA512 2755d34cf38ce79609a6f64b0e35e5c4f05c262d588efdf4f8e47049017d21e8712e425ab9a63faba2af5369b1f9cd36a98c2bae51e6e01afe7a3b0751d4cad3
 AUX audacity-3.2.3-allow-overriding-alsa-jack.patch 1683 BLAKE2B bd8081283dfc87e5e8a3c4826b1a57daed5f28a70a45ff86834d2f3ccf9fa699301cee953c2b3b51095b7bd163247efd9e07bc8548f1195a43e3e5c069a59bfc SHA512 a83ce313094533f7308bfc7c847e5fe908f3e4182c5a86f13b53f3f4df7a63ae6778a85f85c84e348b7db702f07066f4e8d552319a84e4edc459ea6751b73878
 AUX audacity-3.2.3-disable-ccache.patch 850 BLAKE2B 0f8fab52e0f8205c90b0ed798d1793cbde1395715445ac66e6d9b612fd825650f38dc95759b56d0d7455f45202e901de4d2cea3c54ede17356f3ff4f1c8c61ff SHA512 468676dfeff2aa40a3ccbab3c4eb5cf04a8dae0db2772c580d6455b93b4feb9665b3badab7ea8085a6bce1ab243e7c8b0fc2974ab7b2c703db7c49f757bdd48e
-AUX audacity-3.2.3-fix-rpaths.patch 5961 BLAKE2B d48471ba4cea8103fd1caef6e3e13356e9c8103b7edb239a55e89975e455eb82efa6c0bf348aa2be6eedb10ae95753d3f104d7646cbe21a7dcc45e1274928e2a SHA512 b1f7449d13961f3e5d073f2f8cc0443f5e050733d76cbd94dc2dd764b7b1438339cc9155765637767f692c6781760a8b3776bbdaf36c57f4af7cbc7ca51d81fd
-AUX audacity-3.2.3-remove-conan-threadpool.patch 1681 BLAKE2B d5b32185ae961c1ab49fd28410de857b7e3eddaeebf2435dd77c526912ff06a604500c8af2357dc8c601fc032823c74beec4c207cca58fa074d950de6cace6fb SHA512 4a4ee937be644587114e9e097178859ae369e3519475224ea22095ecf51971215b7873b3d9f05ff4f6dcb12c31741448381621c250e159824c818fa61238f0c1
 AUX audacity-3.3.3-Findlibmad.patch 1758 BLAKE2B c1e0ef6734f925127b0be9abc84fb1b6411d15b8b973683f84f54d9c0e557c7b4dcc786baa9962ff039529f9306144008f1f12b1edb8f519df5a0f0c4d06d9de SHA512 0724cabecd37e2c740227fdc6f0144d97d68bd9846609aea25dfaa41289e8eea790487af320e784e1e6e8c3c2e27689af9643bcc2114c9e5f9d09d679f4ed754
 AUX audacity-3.3.3-fix-includes.patch 1764 BLAKE2B ea7f73f60b8b5ffc42218b65d8148273689d2460b97e4728adf878cb3980762375615cf6b29e205945b69dd36f17b760e949d8805f4bd2d867d0b37133290c6e SHA512 d3dd1c39bfda4146b315f923fb6ecda07ad30d77dae7d930e315a4aae8e2a45de04c217b982aa719d8579c3933bd3843ca42095c1ddc161860a204f8d94dcb12
 AUX audacity-3.3.3-fix-rpaths.patch 3819 BLAKE2B 29079fb4fd63b383546b1f82c08fb98b16eba0588da99b936f7de104bcb826fd6a0dc7f63fd379e44ace9d80ea612d86deda9f68980e3cd5c0874f1925b35b91 SHA512 d05868e7adf91c613534aa965059da5e393582bbaee0b49605c2e270d528dfd8fa882ce356e5fed38752afbbb09539165ea566b13c13df4bc949ed8c5f2617e1
@@ -28,6 +25,7 @@ DIST progschj-ThreadPool-20140926.h 2612 BLAKE2B 54d050ad443512e60e5c99449dd7133
 EBUILD audacity-2.4.2-r3.ebuild 3926 BLAKE2B b62459d874285eabace837ac9b2f324574ea1418a6d6396c27de531177c3f9e20511488b7d8fd22e4d8febb75ff3c706eccfd26053ec64e43f82f6906a5bc06b SHA512 0036524556974517dc0ea9427664db5564e8f9312c627a8ddf70850ba457beef51b46666fb3693cbc67b75c3775c86b90a500d7d50a515fafb6536c592d1e49b
 EBUILD audacity-2.4.2-r4.ebuild 4101 BLAKE2B 165c11e5773b0bfb80b93c3860331ca78cacbda755edff4ba8ba0e7d953e3bd39f34988aa27e586b2be885b915218a181895ab2906de9c321de49fb8b6efa10c SHA512 30952598e25cdef0ad003d1857174244b28b6cc81bc7d194386290666ab6f34da75cfd4cbbddd994d2915e113faaccfbd65b66fc92ff4302f51601f5980a7513
 EBUILD audacity-3.3.3-r1.ebuild 7417 BLAKE2B d2765f71208c5c1df301fd33d04e880e34133e364e1789e723082c144cc4ca1138b5edb6541dc8d30f74041a5c365fccdea965e6d3b6cefb778c700e3bbc216a SHA512 57a8168d6dcc83c8412881eda35df1e17b0bd2592ca9a95dbd7366c4902b6e0ac59cf4f9709e86be5993ef8d50abe790d7a360fe37b60ba31c4024401c521d4d
+EBUILD audacity-3.3.3.ebuild 7247 BLAKE2B d13edb80efb3cc7da04706b30972265594527b09003be5c690e1a4f3c8fa3b918fea751eec1fc6bd29d3810547204fcc4421681ed657be63847b341e38d58708 SHA512 6120da23d94e41ceb840a3cc6e9a6295e4da03674fffce158625ab671eca780ba77985916396af40c0a19eb99facd9a4e31fda7b6ef6aff79b2f4a9d1ffa4888
 EBUILD audacity-3.4.2-r1.ebuild 6906 BLAKE2B 460e973e2b6870b7c3afe8eb56bbf0b5e5c596cfd5c421ef078e1358076a285324d3d19b5faf882870e89370162c0f33bac12aa87f9abb3d8222b2d5a6c3021d SHA512 500dffe96ac7ad1b0a0f911cbb81cd2dcae0723834020c54257be5d493a9fb85313893320c27839a587b7fd37b27431cfd743a540b87988503ecd010d8efe891
 EBUILD audacity-9999.ebuild 7048 BLAKE2B 6c661ade492cc7d7287d7c69be4b4475b3f5fcfae01b29922842c8364260c3f05293679fd225d6a578d2a509e4b932bf0cac3b8910505bc91d5a5741b673b134 SHA512 9418de04b75ce522bc0b3d08278cae3802491a67e2a74ad120e3bf4b1dcc1d2b7c965e97773d5b4e44ef3fd029f135bfa4ccbcc53d79bd2f425199456cdc5ece
 MISC metadata.xml 1642 BLAKE2B fc334dbb1c31f732eb26bc00279966ca1ddd5c60bcac5ba4cfe49101ea4b34962befc66bb151f68289a8e5f2e06a9afe9ab88d8a159ad9b47ad6c304927b2521 SHA512 d68acc20cc56c6fe5ef879d881d92843761561a8e276eb56ea0a543336c197606d8c808e11c8dee33f12bcaf8847a51c623e5dbad75e709a9d87b8a9486f253b
diff --git a/media-sound/audacity/audacity-3.3.3.ebuild b/media-sound/audacity/audacity-3.3.3.ebuild
new file mode 100644
index 000000000000..2cba5da71a87
--- /dev/null
+++ b/media-sound/audacity/audacity-3.3.3.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+
+inherit cmake flag-o-matic wxwidgets xdg virtualx
+
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="https://www.audacityteam.org/"
+
+# A header-only thread pool library, without a build system, about 100
+# lines of code.  Probably not worth packaging individually.  Check
+# cmake-proxies/CMakeLists.txt and search for "ThreadPool".
+MY_THREADPOOL_DATE=20140926
+MY_THREADPOOL="https://raw.githubusercontent.com/progschj/ThreadPool/9a42ec1329f259a5f4881a291db1dcb8f2ad9040/ThreadPool.h -> progschj-ThreadPool-${MY_THREADPOOL_DATE}.h"
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/audacity/audacity.git"
+else
+	KEYWORDS="amd64 ~arm64 ppc64 ~riscv ~x86"
+	MY_P="Audacity-${PV}"
+	S="${WORKDIR}/${PN}-${MY_P}"
+	SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz"
+fi
+
+SRC_URI+=" audiocom? ( ${MY_THREADPOOL} )"
+
+# GPL-2+, GPL-3 - Audacity itself
+# ZLIB - The ThreadPool single-header library
+# CC-BY-3.0 - Documentation
+LICENSE="GPL-2+
+	GPL-3
+	audiocom? ( ZLIB )
+"
+SLOT="0"
+IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg
+	opus +portmixer sbsms test twolame vamp +vorbis wavpack"
+RESTRICT="!test? ( test )"
+
+# dev-db/sqlite:3 hard dependency.
+# dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
+#   cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
+# sys-apps/util-linux hard dependency, from cmake-proxies/CMakeLists.txt
+#   for libuuid
+# portmidi became non-optional: building without it results in build
+#   failures, even with some of the Debian patches.  It's probably not
+#   in our best interest to fix that as a patch series.
+# glib, gtk and gdk are all directly relied on in the source, not just
+
+# Libraries used at runtime via dlopen:
+# - dev-libs/{serd,sord} - for LV2 support
+# - media-libs/{opus,sratom} :: For Opus and LV2 respectively
+# - media-sound/lame :: For MP3 export
+# - media-video/ffmpeg :: For generic FFMPEG export
+#   This one has the interesting property of many versions being
+#   supported at runtime.  See: libraries/lib-ffmpeg-support/impl
+#   Current support grid:
+#   - Lavf - 5[789]
+#   - Lavc - 5[789]
+#   - Lavu - 5[2567]
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/expat
+	dev-libs/glib:2
+	media-libs/libsndfile
+	media-libs/libsoundtouch:=
+	media-libs/portaudio[alsa?]
+	media-libs/portmidi
+	media-libs/portsmf:=
+	media-libs/soxr
+	media-sound/lame
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	sys-apps/util-linux
+	alsa? ( media-libs/alsa-lib )
+	audiocom? (
+		dev-libs/rapidjson
+		net-misc/curl
+	)
+	ffmpeg? ( media-video/ffmpeg )
+	flac? ( media-libs/flac:=[cxx] )
+	id3tag? ( media-libs/libid3tag:= )
+	lv2? (
+		dev-libs/serd
+		dev-libs/sord
+		media-libs/lilv
+		media-libs/lv2
+		media-libs/sratom
+		media-libs/suil
+	)
+	mad? ( media-libs/libmad )
+	mpg123? ( media-sound/mpg123 )
+	ogg? ( media-libs/libogg )
+	opus? ( media-libs/opus )
+	sbsms? ( media-libs/libsbsms )
+	twolame? ( media-sound/twolame )
+	vamp? ( media-libs/vamp-plugin-sdk )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+	test? ( <dev-cpp/catch-3:0 )"
+BDEPEND="app-arch/unzip
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="
+	mad? ( !mpg123 )
+"
+
+PATCHES=(
+	# Equivalent to previous versions
+	"${FILESDIR}/${PN}-3.2.3-disable-ccache.patch"
+	# From Debian
+	"${FILESDIR}/${PN}-3.3.3-fix-rpaths.patch"
+
+	# Disables some header-based detection
+	"${FILESDIR}/${PN}-3.2.3-allow-overriding-alsa-jack.patch"
+
+	# For has_networking
+	"${FILESDIR}/${PN}-3.3.3-local-threadpool-libraries.patch"
+	"${FILESDIR}/${PN}-3.3.3-upstream-fix-rapidjson.patch"
+
+	# Add Findlibmad.cmake
+	"${FILESDIR}/${PN}-3.3.3-Findlibmad.patch"
+
+	# Fix includes
+	"${FILESDIR}/${PN}-3.3.3-fix-includes.patch"
+
+	# gettext 0.22
+	"${FILESDIR}/${PN}-3.3.3-gettext-0.22.patch"
+
+	# Allows running tests without conan
+	"${FILESDIR}/${PN}-3.3.3-remove-conan-test-dependency.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	local header_subs="${S}/lib-src/header-substitutes"
+	cat <<-EOF >"${header_subs}/allegro.h" || die
+	/* Hack the allegro.h header substitute to use system headers.  */
+	#include <portsmf/allegro.h>
+	EOF
+
+	# Keep in sync with has_networking and the ThreadPool.h SRC_URI.
+	if use audiocom; then
+		mkdir -p "${S}/"/lib-src/threadpool/ThreadPool/ || die
+		cp "${DISTDIR}"/progschj-ThreadPool-"${MY_THREADPOOL_DATE}".h \
+		   "${S}"/lib-src/threadpool/ThreadPool/ThreadPool.h || die
+	fi
+}
+
+src_configure() {
+	# -Werror=strict-aliasing
+	# Reportedly also -Werror=odr but I could not get that far.
+	# https://bugs.gentoo.org/915226
+	# https://github.com/audacity/audacity/issues/6096
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	setup-wxwidgets
+
+	# * always use system libraries if possible
+	# * options listed roughly in the order specified in
+	#   cmake-proxies/CMakeLists.txt
+	# * USE_VST was omitted, it appears to no longer have dependencies
+	#   (this is different from VST3)
+	local mycmakeargs=(
+		# Tell the CMake-based build system it's building a release.
+		-DAUDACITY_BUILD_LEVEL=2
+		-Daudacity_use_nyquist=local
+		-Daudacity_use_pch=OFF
+		-Daudacity_use_portmixer=$(usex portmixer system off)
+		-Daudacity_use_soxr=system
+
+		-Daudacity_conan_enabled=OFF
+
+		-Daudacity_has_networking=$(usex audiocom on off)
+		# Not useful on Gentoo.
+		-Daudacity_has_updates_check=OFF
+		-Daudacity_has_audiocom_upload=$(usex audiocom on off)
+
+		# The VST3 SDK is unpackaged, and it appears to be under a breed
+		# of a proprietary license and the GPL.
+		-Daudacity_has_vst3=OFF
+		-Daudacity_lib_preference=system
+		-Daudacity_obey_system_dependencies=ON
+		-Daudacity_use_expat=system
+		-Daudacity_use_ffmpeg=$(usex ffmpeg loaded off)
+		-Daudacity_use_libid3tag=$(usex id3tag system off)
+		-Daudacity_use_ladspa=$(usex ladspa)
+		-Daudacity_use_lame=system
+		-Daudacity_use_wxwidgets=system
+		-Daudacity_use_libmp3lame=system
+		-Daudacity_use_libmpg123=$(usex mpg123 system off)
+		-Daudacity_use_libmad=$(usex mad system off)
+		-Daudacity_use_wavpack=$(usex wavpack system off)
+		-Daudacity_use_libogg=$(usex ogg system off)
+		-Daudacity_use_libflac=$(usex flac system off)
+		-Daudacity_use_libopus=$(usex flac system off)
+		-Daudacity_use_libvorbis=$(usex vorbis system off)
+		-Daudacity_use_libsndfile=system
+		-Daudacity_use_portaudio=system
+		-Daudacity_use_midi=system
+		-Daudacity_use_vamp=$(usex vamp system off)
+		-Daudacity_use_lv2=$(usex lv2 system off)
+		-Daudacity_use_portsmf=system
+		-Daudacity_use_sbsms=$(usex sbsms system off)
+		-Daudacity_use_soundtouch=system
+		-Daudacity_use_twolame=$(usex twolame system off)
+
+		# Disable telemetry features.
+		-Daudacity_has_sentry_reporting=off
+		-Daudacity_has_crashreports=off
+
+		# See the allow-overriding-alsa-jack.patch patch
+		-DPA_HAS_ALSA=$(usex alsa on off)
+		## Keep watch of PA_HAS_OSS in lib-src/portmixer/CMakeLists.txt;
+		## AFAICT it introduces no deps as-is, but that could change.
+		## Similar goes for PA_HAS_JACK.
+
+		-Daudacity_has_tests=$(usex test ON OFF)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Remove bad doc install
+	rm -r "${ED}"/usr/share/doc || die
+}
diff --git a/media-sound/audacity/files/audacity-3.2.3-allow-finding-rapidjson-pkgconfig.patch b/media-sound/audacity/files/audacity-3.2.3-allow-finding-rapidjson-pkgconfig.patch
deleted file mode 100644
index d36f51bc2098..000000000000
--- a/media-sound/audacity/files/audacity-3.2.3-allow-finding-rapidjson-pkgconfig.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0a786020046c9d608f1e2f463575d4ca8febf909 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
-Date: Sun, 18 Dec 2022 13:41:06 +0100
-Subject: [PATCH 3/3] Add pkg-config fallback for RapidJSON
-
----
- cmake-proxies/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cmake-proxies/CMakeLists.txt b/cmake-proxies/CMakeLists.txt
-index 7568bb32f..db40dcf63 100644
---- a/cmake-proxies/CMakeLists.txt
-+++ b/cmake-proxies/CMakeLists.txt
-@@ -289,6 +289,7 @@ if( ${_OPT}has_sentry_reporting OR ${_OPT}has_audiocom_upload )
-       RapidJSON
-       rapidjson/1.1.0
-       REQUIRED
-+      PKG_CONFIG "RapidJSON"
-    )
- endif()
- 
--- 
-2.39.0
-
diff --git a/media-sound/audacity/files/audacity-3.2.3-fix-rpaths.patch b/media-sound/audacity/files/audacity-3.2.3-fix-rpaths.patch
deleted file mode 100644
index 2f1578211c9c..000000000000
--- a/media-sound/audacity/files/audacity-3.2.3-fix-rpaths.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From: Benjamin Drung <benjamin.drung@canonical.com>
-Date: Thu, 22 Sep 2022 19:52:43 +0200
-Subject: Fix rpath for private libraries on Linux
-
-Installing audacity on Linux will produce private libraries that have
-`RUNPATH` set to the build directory instead of the installation
-directory.
-
-The root cause is that the library directory is copied to the
-installation directory without touching the libraries. The cmake wiki
-says in RPATH handling caveats [1]: "Since install-side RPATH tweaking
-is an operation that is done by target-specific installation handling,
-any target that should have its install RPATH changed (e.g. to
-`CMAKE_INSTALL_RPATH`) needs to end up in the installation via an
-`install(TARGETS ...)` signature and not via directory-based copying."
-
-So replace `install(DIRECTORY ...)` by individual `install(TARGETS ...)`
-for the libraries and modules. Then cmake will replace the `RUNPATH` to
-`$ORIGIN/../lib/audacity`, which is still incorrect. Therefore set
-`INSTALL_RPATH` explicitly.
-
-Fixes: https://github.com/audacity/audacity/issues/3289
-Forwarded: https://github.com/audacity/audacity/pull/3671
-[1] https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling#caveats
-Signed-off-by: Benjamin Drung <benjamin.drung@canonical.com>
----
- CMakeLists.txt                                      |  1 +
- cmake-proxies/cmake-modules/AudacityFunctions.cmake | 19 +++++++++++++++++++
- modules/CMakeLists.txt                              |  7 -------
- modules/mod-script-pipe/CMakeLists.txt              |  1 +
- src/CMakeLists.txt                                  | 10 ----------
- 5 files changed, 21 insertions(+), 17 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8428c8c..b9ff631 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -389,6 +389,7 @@ set( INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" )
- set( _LIBDIR "${CMAKE_INSTALL_LIBDIR}" )
- set( _DATADIR "${CMAKE_INSTALL_DATADIR}" )
- set( _PKGLIB "${_LIBDIR}/audacity" )
-+set( _PKGMODULE "${_PKGLIB}/modules" )
- set( _PKGDATA "${_DATADIR}/audacity/" )
- set( _MANDIR "${CMAKE_INSTALL_MANDIR}" )
- set( _MODDIR "${_DEST}/modules" )
-diff --git a/cmake-proxies/cmake-modules/AudacityFunctions.cmake b/cmake-proxies/cmake-modules/AudacityFunctions.cmake
-index 47682eb..a8f144f 100644
---- a/cmake-proxies/cmake-modules/AudacityFunctions.cmake
-+++ b/cmake-proxies/cmake-modules/AudacityFunctions.cmake
-@@ -338,6 +338,17 @@ function( canonicalize_node_name var node )
-    set( "${var}" "${node}" PARENT_SCOPE )
- endfunction()
- 
-+# Call install(TARGETS...) only on Linux systems (i.e. exclude MacOS and Windows)
-+macro( install_target_linux target destination )
-+   if( NOT "${CMAKE_GENERATOR}" MATCHES "Xcode|Visual Studio*" AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
-+      install( TARGETS "${target}" DESTINATION "${destination}" )
-+   endif()
-+endmacro()
-+
-+macro( install_audacity_module target )
-+   install_target_linux( "${target}" "${_PKGMODULE}" )
-+endmacro()
-+
- function( audacity_module_fn NAME SOURCES IMPORT_TARGETS
-    ADDITIONAL_DEFINES ADDITIONAL_LIBRARIES LIBTYPE )
- 
-@@ -382,6 +393,7 @@ function( audacity_module_fn NAME SOURCES IMPORT_TARGETS
-          PROPERTIES
-             PREFIX ""
-             FOLDER "modules" # for IDE organization
-+            INSTALL_RPATH "$ORIGIN/.."
-       )
-       if( CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin" )
-          add_custom_command(
-@@ -423,6 +435,7 @@ function( audacity_module_fn NAME SOURCES IMPORT_TARGETS
-             PREFIX ""
-             FOLDER "libraries" # for IDE organization
-             INSTALL_NAME_DIR ""
-+            INSTALL_RPATH "$ORIGIN"
-             BUILD_WITH_INSTALL_NAME_DIR YES
-       )
-    endif()
-@@ -525,6 +538,12 @@ function( audacity_module_fn NAME SOURCES IMPORT_TARGETS
-    endforeach()
-    set( GRAPH_EDGES "${GRAPH_EDGES}" PARENT_SCOPE )
- 
-+   # Note: Some modules set EXCLUDE_FROM_ALL afterwards to not be installed.
-+   # Therefore only install libraries, but not modules here.
-+   if( NOT REAL_LIBTYPE STREQUAL "MODULE" )
-+      install_target_linux( "${TARGET}" "${_PKGLIB}" )
-+   endif()
-+
-    # collect unit test targets if they are present
-    if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tests")
-       add_subdirectory(tests)
-diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
-index d464383..15dead4 100644
---- a/modules/CMakeLists.txt
-+++ b/modules/CMakeLists.txt
-@@ -16,12 +16,5 @@ foreach( MODULE ${MODULES} )
-    add_subdirectory("${MODULE}")
- endforeach()
- 
--if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
--   if( NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio*")
--      install( DIRECTORY "${_DEST}/modules"
--               DESTINATION "${_PKGLIB}" )
--   endif()
--endif()
--
- #propagate collected edges up to root CMakeLists.txt
- set( GRAPH_EDGES "${GRAPH_EDGES}" PARENT_SCOPE )
-diff --git a/modules/mod-script-pipe/CMakeLists.txt b/modules/mod-script-pipe/CMakeLists.txt
-index 5ee1862..ccfd50f 100644
---- a/modules/mod-script-pipe/CMakeLists.txt
-+++ b/modules/mod-script-pipe/CMakeLists.txt
-@@ -15,3 +15,4 @@ set( DEFINES
- )
- audacity_module( mod-script-pipe "${SOURCES}" "Audacity"
-    "${DEFINES}" "" )
-+install_audacity_module( mod-script-pipe )
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 7b90c1b..c5f30ad 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1621,17 +1621,7 @@ else()
-                DESTINATION "."
-                RESOURCE DESTINATION "${_APPDIR}/Resources" )
-    else()
--
-       install( TARGETS ${TARGET} RUNTIME )
--
--      install( DIRECTORY "${_DEST}/${_LIBDIR}/"
--               DESTINATION "${_LIBDIR}"
--               USE_SOURCE_PERMISSIONS
--               FILES_MATCHING PATTERN "*.so*" )
--
--      install( CODE "set( _LIBDIR \"${_LIBDIR}\")" )
--      install( SCRIPT "${CMAKE_SOURCE_DIR}/scripts/build/linux/fix_rpath.cmake" )
--
-       install( FILES "${_INTDIR}/audacity.desktop"
-                DESTINATION "${_DATADIR}/applications" )
-       install( FILES "${topdir}/LICENSE.txt" "${topdir}/README.txt"
diff --git a/media-sound/audacity/files/audacity-3.2.3-remove-conan-threadpool.patch b/media-sound/audacity/files/audacity-3.2.3-remove-conan-threadpool.patch
deleted file mode 100644
index 1940ec8a6d9f..000000000000
--- a/media-sound/audacity/files/audacity-3.2.3-remove-conan-threadpool.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 7b5f56ec441fb472b61bae14e1efa353db4d7aca Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
-Date: Sun, 18 Dec 2022 13:37:35 +0100
-Subject: [PATCH] Allow using local dependency for threadpool
-
-We pull it in manually.
----
- cmake-proxies/CMakeLists.txt | 27 +++++++++++++++++++--------
- 1 file changed, 19 insertions(+), 8 deletions(-)
-
-diff --git a/cmake-proxies/CMakeLists.txt b/cmake-proxies/CMakeLists.txt
-index 81bbf2efd..474814f07 100644
---- a/cmake-proxies/CMakeLists.txt
-+++ b/cmake-proxies/CMakeLists.txt
-@@ -258,12 +258,22 @@ if( ${_OPT}has_networking )
-       set ( curl_ssl "openssl" )
-    endif ()
- 
--   add_conan_lib(
--      ThreadPool
--      threadpool/20140926
--      REQUIRED
--      ALWAYS_ALLOW_CONAN_FALLBACK
--   )
-+   if ( ${_OPT}has_threadpool STREQUAL "local" )
-+     # Gentoo: Hack in Portage-downloaded ThreadPool.h.
-+     # This follows somewhat-like-upstream conventions, except it doesn't use
-+     # the proxy library mechanism because there's no library.
-+     add_library ( ThreadPool::ThreadPool INTERFACE IMPORTED GLOBAL )
-+     target_include_directories ( ThreadPool::ThreadPool INTERFACE
-+       ${CMAKE_SOURCE_DIR}/lib-src/threadpool
-+     )
-+   else()
-+     add_conan_lib(
-+       ThreadPool
-+       threadpool/20140926
-+       REQUIRED
-+       ALWAYS_ALLOW_CONAN_FALLBACK
-+     )
-+   endif()
- 
-    add_conan_lib(
-       CURL
-@@ -276,8 +286,9 @@ if( ${_OPT}has_networking )
-       CONAN_OPTIONS
-          libcurl:with_ssl=${curl_ssl}
-          libcurl:shared=True
--   )
--
-+       )
-+else()
-+   set(unused "${${_OPT}has_threadpool}")
- endif()
- 
- if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin|Windows")
--- 
-2.39.0
-
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index 9105b35d1fc0..9fdd6135735c 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -2,6 +2,6 @@ DIST easyeffects-7.0.7.tar.gz 3359508 BLAKE2B 16c4fd322eefcd16bb8a83a5443e482689
 DIST easyeffects-7.1.3.tar.gz 3426093 BLAKE2B 62ff40388df2a3452d23968881ab7d247c5504abc4524564e919cc520700e64978914248f00fb8b3ae251b895850d9a4dee763576baf2c43af3cd1105d2b62d5 SHA512 9e277b0c432f5015b33d4ac6961d5eec4cbf498dd2e947d231a9c13d8c7b7680f7ded7bf3d55d2c72ebf46de94308447a0b1e3b8cbbb13ce96c3a79bf027ffa3
 DIST easyeffects-7.1.6.tar.gz 3505689 BLAKE2B fbb1dd05b2e5f8e3224653ddebf49175af1d6b39d034d6446750e780ec0f8f8a4d58b085c019767a121641d8b5176f0a6a0d828c3537aa2c3803223015fe6826 SHA512 7c70aeb66fc2242011c96d44b4a007cdec4733c968195089ec62968ee1dcb96ec6460ac67a2eb8baa104120bc13798792236fb677ac3f56557bfb05109b43f02
 EBUILD easyeffects-7.0.7.ebuild 2046 BLAKE2B eee6f202ac140bb8a0235a9319a9c7c0b1554fd5750c4a672699abbaf0b4d02d40e491e99f22b237e424126869cece8763d95d1d29e41f88d289c8a8738c56df SHA512 c0acf5b74a42b5f8b229f52c110b35ae8bb6742bc77bb685e34291ebb55f35bb367e434f471b1a5b24845b304e70f9eeb43ad45d477bde9014c9f717217b5cb6
-EBUILD easyeffects-7.1.3-r1.ebuild 2066 BLAKE2B c1b7b9231f2f43fbb5ce22c84a043b9134f7f28603fd49c404bf1e8661f227b476a28dc23ddaec4ce22e1627a42836b331af319cb1a5ff1ff837adddec1b8213 SHA512 32383e61d92ab6e0dfc5b1c97af7062da052ba8ba59215a2fe4b341fdc4ad3beaa9d373ebcde36e2cd52eb4db795fd500db6fced7ce3c2f21dc6f9f21973fed6
+EBUILD easyeffects-7.1.3-r1.ebuild 2065 BLAKE2B f71f3eb3955f62d1d65b96e8e7e7c4f7602e014a1e9e17edd69f17ea841276d3c4fd14aaeef80146b21442e4ededf7c6953e382476214965a80f81b59f63c525 SHA512 e87e42d3d0b3698ec2cbcd93d02ca9f615b9a9e54601a8f720bf90960ea2683c732cd07e873f062020d84a9f05752a968ee764b4b23197e42d3938d103db434a
 EBUILD easyeffects-7.1.6.ebuild 2066 BLAKE2B 5cde09b7538663c7a1d40bd57a87321c8dea3ba664e203fa257b74eb9ac91cd1036fa187ecdd0a9b491fb1cf2bbcd8d266fc77dccf1b9bfec988036ae7ec51b7 SHA512 30318074bba0b3b1f71e477688e320061cbd1db696517deabefebc68a6ddf8dc67ef482255d71856c8657aad878e50f8a7e3adcc0eb52f16f588cb5c7044467c
 MISC metadata.xml 839 BLAKE2B d3fde7fe66f301f320a4fc3adb4a5fb5e5f84405b015209b696045eaffe251f7d1531efdb2d9fab6512647dac991290b622bf411dff36ecf304c9b063567c03c SHA512 fc68f37398082f885a2c7c5d117191fc37d1c1a51381439cefe1ae798b7b019598e81f5c5f1832950669cef340d418220024993b95aeb911dfd9fa1df0eb82fc
diff --git a/media-sound/easyeffects/easyeffects-7.1.3-r1.ebuild b/media-sound/easyeffects/easyeffects-7.1.3-r1.ebuild
index 08ade2ec84a7..941aab00f2ea 100644
--- a/media-sound/easyeffects/easyeffects-7.1.3-r1.ebuild
+++ b/media-sound/easyeffects/easyeffects-7.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
 else
 	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index bbd4deec8ae7..7cdea70c47e3 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-music-45.0.tar.xz 1662996 BLAKE2B dedcb905ad135bd9bff569cb1168062e0f451479e00cddc3ac56dc506b938a090c1189495ee79b563a7e045e45cde40eb5095f4085c0a7de36fa1b876bc312f9 SHA512 9f919a3dd63826e7c31c57d62fbdd0dad463d401e213ca8aa119357d7203449ddd5b10b03d3ac66008399fadd6afcb3f7ae52b21fa9bf3f5c79eca6e859f67cc
 DIST gnome-music-45.1.tar.xz 1666152 BLAKE2B 27403070735003df5d907fae2675b67f5b907e10e55e2ed3b31e369e146c03a2d7c95371092043862d83968fc45131ddb7643e34634b0a98d686402fdf676118 SHA512 6cc123eda769d524e5c215c7167248b15ac21fd99a1ac385069c8bac8a03652d458460438adec5853daf329f61d70339f5765b938badc862151b655ba64a80cf
 EBUILD gnome-music-45.0.ebuild 1859 BLAKE2B d6fa7efe5ed942144f001da61e5d4a245a9663d4f8b9938ca99e2e626b73e2bc97083749b9fe75a6f355e09d86592cb1c1046ce2fb60cbb0de005f416b2bfcf7 SHA512 251f75405b129ef2d8f8151581dba351ccfac7b58c1ef56ebc548f0e2128a023917d709fdbb76ec52627329b0ddd90e4b2ef1795dcf2ebdf6e103b40f25958fb
-EBUILD gnome-music-45.1.ebuild 1862 BLAKE2B 812e1fae41c9799d38986c828b35cd13608232f83858b479b45356d3e29efb28e4ac7860bba66adb0c8d7dc4b4a9780611c24d01afe31f06b478b9589ae0a271 SHA512 d1e611fca73b69d7f6a346b0c91c697a3bcccdcefe3abf18ffe956c71e0cfb5075d9ad471c1a34b30414220b04f7cf849c4d56589a5f356ef1f6aa8a9a0b43f9
+EBUILD gnome-music-45.1.ebuild 1861 BLAKE2B 3436b7a25216fd9626f86d3a6208a8108cf32ff30097b264744956836689ac6caea758a4df0e103fbc3fdefadea65773d03ec275cbb67b2aab7174d1848626b5 SHA512 5932c5eb9e40876e0f535a4c785c57700f8703d9f55a58e7f743b3ab3203246530fa42d1575571ac0382f22a2bc8256a1c1b2d35bad0bd3dbdcb60abd9267b81
 MISC metadata.xml 352 BLAKE2B 8f9983c2cfeccb1a920be308931a9eef0700560f7c7a249fbf0a8d450467d77b670c6de9e3a3ef470933fd10a4e9190314c7a98470064addef7667dc2d19c92e SHA512 eaa3bfbb8fb4078c94f9b0300d3574345138899056cb3e9ba114448728f347a0cbdc45aea2b3501bb85dc459eeccc4e2f1f56212a4982d99d9113732bc17998c
diff --git a/media-sound/gnome-music/gnome-music-45.1.ebuild b/media-sound/gnome-music/gnome-music-45.1.ebuild
index 7e4b95198c37..06df37f3b778 100644
--- a/media-sound/gnome-music/gnome-music-45.1.ebuild
+++ b/media-sound/gnome-music/gnome-music-45.1.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 DEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.67.1:2
diff --git a/media-sound/gtick/Manifest b/media-sound/gtick/Manifest
index 3c29bcb9e24b..b99e213c6cc6 100644
--- a/media-sound/gtick/Manifest
+++ b/media-sound/gtick/Manifest
@@ -1,4 +1,5 @@
+AUX gtick-0.5.5-autotools.patch 708 BLAKE2B 30ad04f116470bd8b7cc2d240f79e6611523d2381222905d7d031dd00b6535055c665835f18ef43ea02e3c1484cadb4b5f129689ad09c940577b0459fa263e6b SHA512 3a107fa8920d45e3731b41e98357e30df54a7a75fc67e66566d4162aaa41b0ef3ae85d9b0e6fb913af1c9bdabce4b2786ffb1e7e43fb3aaa52e0ed2ecf7ccb97
 AUX gtick-0.5.5-desktop.patch 776 BLAKE2B 945b1eaff7d480e092d93b1cce83653aaa474e36172df20233f5e09cfc07ede22260cff87664ae767a39ab05e7c83b7bc401b8cf5a85539fdcd9338a78556ce4 SHA512 d61fc78e86e4bfd47e23987236108ca36bd19df90363c2bd625f4668e9a325ce082c423d90fdf0600900d391e6da21d719c620203c5052b54d9eb5f20c9d948b
 DIST gtick-0.5.5.tar.gz 659596 BLAKE2B 74e40cd20bf24ef8a9cb9f6abf49d885bb5e660a6b4faa40fa18a10153edad1e522ca555c802e9b5364abbc94f79989e4dfdfd2d19a038f4c6f63895a287dc12 SHA512 8f308c312f6cc59bb8b786af09b1498c76adc1b2692369886e85fa97524b417bf3a5e075ba20061f009b36cb4fe12cd455befe7e466d8215620640229ebbdb87
-EBUILD gtick-0.5.5.ebuild 1059 BLAKE2B bb414004dc67ae6fb55f93ff74ee7ddaebaa664fd41b728ae6c581195bd2691447199d8f628ec78e57af7d1ebdda667fdc554720b9ad1d2b19dc09a65f3b4a7c SHA512 0bffaf48f5fb97b45eaeffb06a62edff89a6cc5af8db6b3c444daff34cbc2a040c8d3786915927685c601cc5661b951b743cce89ef81843e22ba8228091e99fc
+EBUILD gtick-0.5.5-r1.ebuild 1152 BLAKE2B 9d23bd93b97f5711922789bee7c6d86cca5e2008f2d40aef1cb0e38a850d3fa231283a1990038959d54f9de090fa6a5728bba73c54a474b7d36c4cbf0ed86799 SHA512 3b248ecbf4a45ab0ba35e0a85d6bf38e1fb4a50223e56769d175010cf7962e4c1efc04ce49e327640b4f60352ef8e3e7db388faf581a323953f76662cb7dff50
 MISC metadata.xml 509 BLAKE2B dafb146badb262716849dc12a3ac529f36d783acc43b88faa01d13fdede3f76f1b9621f856c7aa7bebdf57ad61be6f4d3be7b93c7fcfdc460568a8a7259ec35d SHA512 37041603f706b7105593dabb169bcf4042a54661065df81a2413863441331d8fe7096049fe736a2de8d718bcfbeb430c2427aee4e5d015e11b67c92052dfbfc8
diff --git a/media-sound/gtick/files/gtick-0.5.5-autotools.patch b/media-sound/gtick/files/gtick-0.5.5-autotools.patch
new file mode 100644
index 000000000000..e1b8b16d5b96
--- /dev/null
+++ b/media-sound/gtick/files/gtick-0.5.5-autotools.patch
@@ -0,0 +1,27 @@
+--- a/configure.ac	2020-05-17 13:08:52.000000000 +0300
++++ b/configure.ac	2024-04-18 07:54:45.000000000 +0300
+@@ -24,7 +24,6 @@
+ 
+ # Checks for libraries.
+ AC_CHECK_LIB([m], [floor])
+-AC_CHECK_LIB([sndfile], [sf_open])
+ AC_CHECK_LIB([check], [fail_if])
+ AC_CHECK_LIB([dmalloc], [dmalloc_debug])
+ 
+@@ -71,7 +70,7 @@
+ fi
+ 
+ # GNU gettext
+-AM_GNU_GETTEXT
++AM_GNU_GETTEXT(external)
+ AM_GNU_GETTEXT_VERSION(0.19.8)
+ 
+ # directory containing configuration support files
+--- a/Makefile.am	2014-07-27 21:32:03.000000000 +0400
++++ b/Makefile.am	2024-04-18 07:54:01.400000000 +0300
+@@ -1,4 +1,4 @@
+-SUBDIRS = doc intl po src testsuite
++SUBDIRS = doc po src testsuite
+ 
+ EXTRA_DIST = config.rpath \
+ 	     autogen.sh \
diff --git a/media-sound/gtick/gtick-0.5.5.ebuild b/media-sound/gtick/gtick-0.5.5-r1.ebuild
index f3a3e28b5666..2d7dec66d23a 100644
--- a/media-sound/gtick/gtick-0.5.5.ebuild
+++ b/media-sound/gtick/gtick-0.5.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit desktop xdg-utils
+inherit autotools desktop xdg-utils
 
 DESCRIPTION="Metronome application supporting different meters and speeds ranging"
 HOMEPAGE="https://www.antcom.de/gtick"
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="nls sndfile"
 
-RDEPEND="media-sound/pulseaudio
+RDEPEND="media-libs/libpulse
+	virtual/libintl
 	x11-libs/gtk+:2
 	sndfile? ( media-libs/libsndfile )"
 DEPEND="${RDEPEND}"
@@ -24,14 +25,17 @@ BDEPEND="virtual/pkgconfig
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-desktop.patch
+	"${FILESDIR}"/${PN}-0.5.5-desktop.patch
+	"${FILESDIR}"/${PN}-0.5.5-autotools.patch
 )
 
 src_prepare() {
 	default
 
 	sed -i 's:^\(appdatadir = .*/\)appdata:\1metainfo:' \
-		Makefile.in || die
+		Makefile.{am,in} || die
+
+	eautoreconf
 }
 
 src_configure() {
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index 5a2de553d854..98e1d37d2e42 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1,6 +1,9 @@
 AUX guitarix-0.45.0-fix-flto.patch 381 BLAKE2B 1a0d782d3ecd653c1beaf63faa7ef2e649b669dada3934f8c304663f0a774c00c4ec0e93479e5a1d9bd7307aa3fd1f015038c8d050c960560d660f113e455c43 SHA512 498371093849c5e3e53f3196d2e2ea7e8d28a187e4c4671f03f59ea33597482c54f56d047a02f221d73ebab0f1161c4115eea057daad8406a93f366bea7a654c
 AUX guitarix-0.45.0-nostrip.patch 1107 BLAKE2B d50c7e2694920dfb011a21777ab4582910d455d26d3bd9561180d80e823ee841ea470a5bc8b79e6f7e12fab6752326f9d00af0b94d0d8980a6b9d17fc79293fa SHA512 3570027b6e16d74082a2203b06d8283319c48a026150d4d8609a70c245ff91d6c40a85c236c6390a6925e4c863752f70c4e31c977440e75fd8bf3d15a8670d11
+AUX guitarix-0.46.0-nostrip.patch 1064 BLAKE2B 3f44dcd75d2d7f90c8d5b430b3d1b1d9d89df5f7c741b5e78d934b8d9703ac651d2040408aa3e0d7135d09d39b0e28c3e117909d9072d03e5c5122ba93e1e032 SHA512 e75a985755fde32127e917d2fedabf9c2ec486e4fbebed682a390e1da7f70d5bd4e78608cffde81d08585ae70f52f8c9e98d0f040479837d16f7fd4f2f8c493e
 DIST guitarix2-0.45.0.tar.xz 75575216 BLAKE2B dfe65b3cdab6cf30c808b65d4d9280617d5b9b9d0227bb6b60b68ac52e64fb34903fdfb3084ebf790630b60a54cfd1f0b170b209b8dfb5c0f23f1d8084e3c342 SHA512 be894076f5b016cb8feb243294e8277f893f7e7054c91353f1a82e9b41ef1bc8c97714c4b6cf9765ee6ab1cff91d02f3a0abe525985922dcde788011a88b9cf4
+DIST guitarix2-0.46.0.tar.xz 77670776 BLAKE2B b650d53f4e73539419bbe194e07ee770494f80b547d407f5a269c035b91fbf3e0fe078a9e82da21f773d69395523f70fc179be7942f08e2b8689b220414c9925 SHA512 cdb8eccdd230bade493cf0b7fd2a6e748fcaf3c3fd6b5ed5fbd6134d08be9518c93400625d63e386b436fcef3e1738cae543256b09941445436d7f2bf41649a0
 EBUILD guitarix-0.45.0.ebuild 1959 BLAKE2B 1010ac5aed8e8178a559ea184ea1850496ed6a7e90c9e36921f2c602c7a5fc42acb4ad21ded65b6c9cc451abeaba12a79ab10d9c0c61a04db84ed8af6e83c901 SHA512 c953e63774a45e52c6483a0b49087f67f151b92c6b19e88d35cbb84dfcc8762b29a298a443884c091ba043265f6bda99c8948baf23c9494fd96a822ef2b4d39c
+EBUILD guitarix-0.46.0.ebuild 1902 BLAKE2B 842f4c44c718b0881b37d5f5d0d552e10967eacec98695fa88edbde42a7044bc6886c0049bb800bc7e5bdeef589de8f7e87a2477bd9e32416b041b2db73406fb SHA512 9dcbc31e4790b4208a6bb4553867134c6c4c32e9062b86e2bf40e414cbc76c75b77611ad6a644150b5056267e556dcda4b1ae07f8631700faeba14c4ba6b8eba
 EBUILD guitarix-9999.ebuild 1950 BLAKE2B 64757e3d79c108eb8527a694ffa3f7ce17053859f6b7a520c75f5bd615ed809ce359c47ff6b36793134f94b0d2fd800e9e05a2a01393200223eda861d47e3772 SHA512 2fa5d8b501f080fb670b9a3d73c016539a39810427c78cc6c283d9fc9e3d9a7f6659e519cdb49eba889d6018d5252c68278ef9dc9ce9f1696fb938b1cfb74cfd
 MISC metadata.xml 785 BLAKE2B 6336ddc95e9ef9c46a0e16b963abc12b4fd9fd2048712fbc041901f7c4940c18d010df3dd23092717a4635522bec8486ca18e4d1728c4cfd12fffaf0fe591c83 SHA512 4ec6c6198959646bb85147109a1d9c9af6f1ed296486f4d573524733a06434832daa817964c8e3c28db0ec317b6991840ca3232ee64473cd73aca16803a9b573
diff --git a/media-sound/guitarix/files/guitarix-0.46.0-nostrip.patch b/media-sound/guitarix/files/guitarix-0.46.0-nostrip.patch
new file mode 100644
index 000000000000..7bb46c88eb16
--- /dev/null
+++ b/media-sound/guitarix/files/guitarix-0.46.0-nostrip.patch
@@ -0,0 +1,30 @@
+--- a/waftools/lv2.py
++++ b/waftools/lv2.py
+@@ -40,7 +40,7 @@ def lv2_add_common(tg, target, install_path, defines=None, linkflags=None, cxxfl
+ @Configure.conf
+ def lv2(bld, *k, **kw):
+     lv2_base, dst = get_lv2_base(bld, kw)
+-    tg = bld.shlib(features='strip', *k, **kw)
++    tg = bld.shlib(*k, **kw)
+     cxxflags = []
+     if not bld.env['OPT'] and bld.env['SSE2']:
+         cxxflags = [ "-msse2", "-mfpmath=sse"]
+@@ -57,7 +57,7 @@ def lv2_gui(bld, *k, **kw):
+     if not bld.env['LV2GUI']:
+         return None
+     lv2_base, dst = get_lv2_base(bld, kw)
+-    tg = bld.shlib(features='strip', *k, **kw)
++    tg = bld.shlib(*k, **kw)
+     lv2_add_common(tg, lv2_base+'_gui', dst, ["LV2_GUI"], bld.env['OS_LV2_CXXFLAGS'])
+     return tg
+ 
+--- a/wscript
++++ b/wscript
+@@ -404,7 +404,6 @@ def configure(conf):
+     conf.env['DESKAPPS_DIR'] = os.path.normpath(os.path.join(conf.env['SHAREDIR'], 'applications'))
+     conf.env['BIN_NAME'] = APPNAME
+     if opt.lv2:
+-        conf.gxload('strip')
+         conf.gxload('lv2')
+ 
+     conf.gxload('cpu_optimization')
diff --git a/media-sound/guitarix/guitarix-0.46.0.ebuild b/media-sound/guitarix/guitarix-0.46.0.ebuild
new file mode 100644
index 000000000000..bd63bf337a24
--- /dev/null
+++ b/media-sound/guitarix/guitarix-0.46.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit multiprocessing python-any-r1 waf-utils xdg
+
+DESCRIPTION="Virtual guitar amplifier for Linux"
+HOMEPAGE="https://guitarix.org/"
+SRC_URI="https://github.com/brummer10/${PN}/releases/download/V${PV}/guitarix2-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="bluetooth debug lv2 nls nsm +standalone zeroconf"
+REQUIRED_USE="|| ( lv2 standalone )"
+
+DEPEND="
+	dev-cpp/eigen:3
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:3.0
+	dev-libs/glib:2
+	media-libs/libsndfile
+	media-libs/zita-convolver:=
+	media-libs/zita-resampler
+	net-misc/curl
+	sci-libs/fftw:3.0=
+	x11-libs/gtk+:3
+	lv2? ( media-libs/lv2 )
+	standalone? (
+		dev-libs/boost:=
+		media-libs/liblrdf
+		media-libs/lilv
+		virtual/jack
+		bluetooth? ( net-wireless/bluez )
+		nsm? ( media-libs/liblo )
+		zeroconf? ( net-dns/avahi )
+	)
+"
+# roboto fonts are required for correct ui rendering
+RDEPEND="
+	${DEPEND}
+	standalone? (
+		media-fonts/roboto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	standalone? (
+		dev-lang/sassc
+		nls? (
+			dev-util/intltool
+			sys-devel/gettext
+		)
+	)
+"
+
+DOCS=( changelog README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.46.0-nostrip.patch
+)
+
+src_configure() {
+	export -n {CXX,LD}FLAGS
+
+	local myconf=(
+		--cxxflags="${CXXFLAGS}"
+		--cxxflags-debug=""
+		--cxxflags-release="-DNDEBUG"
+		--ldflags="${LDFLAGS}"
+		--enable-lfs
+		--lib-dev
+		--no-desktop-update
+		--no-faust
+		--no-ldconfig
+		--shared-lib
+		--jobs=$(makeopts_jobs)
+		$(use_enable nls)
+		$(usex bluetooth "" "--no-bluez")
+		$(usex debug "--debug" "")
+		$(usex lv2 "--lv2dir=${EPREFIX}/usr/$(get_libdir)/lv2" "--no-lv2 --no-lv2-gui")
+		$(usex nsm "" "--no-nsm")
+		$(usex standalone "" "--no-standalone")
+		$(usex zeroconf "" "--no-avahi")
+	)
+	waf-utils_src_configure "${myconf[@]}"
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 82e2acc66f89..78fd56b2c6ca 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index 9d829be25f9b..6b86e2077fcb 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -14,6 +14,6 @@ AUX 3.3.3/aegisub-3.3.3-support-system-gtest.patch 2932 BLAKE2B e05519e4734f7532
 DIST aegisub-3.2.2_p20160518.tar.gz 7438734 BLAKE2B 3a57e5d6fafac2ca95d64d60e8d68b48177aaa0c5fd1438d0b0a133757ef95443c16324fb7effb41506f2b1eb70aab9d34845a91beef0ef81a3658444e24be07 SHA512 8d8775ba0a12735a9756b9abfd65c89519dae4e21afcaedbd18985d1c1021975b1ae909b3bef1121b707c626e1711d56f1823f3b4746eab49e8386536a5e84e6
 DIST aegisub-3.3.3.tar.gz 6580314 BLAKE2B b6a6b6d9a805fb1aec943f00452e5f074c050d7d8970e0fa57da54a7a3c12b86241eafafd957577625bcce395c9f909fe60a22c9d76fcf8f018a4ea03921dacf SHA512 19e44667ad8742560559387c15f6c00339194cd26e1140624c63f34c6b4da6bb0b80be0f636a2d1cd0b15f1598e0580218d648e0622635b12eeaad3a40df9abc
 EBUILD aegisub-3.2.2_p20160518-r105.ebuild 4277 BLAKE2B a0f15d4785fe42e9da2b4d76066130d0df1e08f230c1a1651496ca437fefb453d9765089b9131b1b0de965ccda32a12fe1cb1a97347b7d3be1c20488632c111b SHA512 f990a74d8a767584482eea686eeebf24e8cb5116b59313a346b9cbe56fe7f0bc2fbc79b3d9526d85f064bd4cb93eaf5344c500c21138a7dd971a3c6f61bbdfc3
-EBUILD aegisub-3.3.3.ebuild 3916 BLAKE2B 77bbc524d8eb967298a909557556233bbe9ae91be08488f48a56f16a800356be8715b0d22870ff9e9c575c0bb27452dd1cdca8c7c9ea123d92d9d3396f5b1493 SHA512 f7b497f12a0daf4cca0dbfa48386713c1768b78af4a22ea2f0f4a159401f9461bbda78443f1cf039cd150c1944beacd87b6ed6e8adedbc103e882afe03cf24f8
+EBUILD aegisub-3.3.3.ebuild 3915 BLAKE2B e23ce10ea46e06315826b446d3f4f00368271432e9ad3d235c7d413c69cf83bebf65e43de5354bb5f52cce57be10963346d6c3abf42713ea10f4a66924d7fad3 SHA512 ddf52ad9a4bb353a048a6c5b406173d6389a65ab1fd5e5765acf785e0f48dcd57f7397ffcafe1153a928e9e225e9bbef76fa1b44d30577f93bf296fecc54e224
 EBUILD aegisub-9999.ebuild 3917 BLAKE2B 3bcc249ae52755ed55e06bc5422532bf460988af45b0da1028e4f22e5531e1d806962a0b13e506e2ba88283edcec550d68bf2dc37882752feb6ad4b6dd334e9c SHA512 648b0a44500379c6be599acef5b53a5dbc5af283b46c783aaeacdf2e4da2844007c41648be3da9c673341675f986d1407c5efa86e98cb8114702f6b2b5f95397
 MISC metadata.xml 490 BLAKE2B dd77320afb5975e48eae5240c165ed9470fe5ae1ed917b8ba022a9c63d1b446c75b820eafef914c885afb9c32c8634bf6ee55e1340a1efce91d0fe019a589cc8 SHA512 deee9b5cbcbd3fa37a665b333094334c3a298face98c7deb992127191d77cbe0f7781945fd8297ce9f26ca34988539a4abc27877c4dff79228d64dc1c4bfeddd
diff --git a/media-video/aegisub/aegisub-3.3.3.ebuild b/media-video/aegisub/aegisub-3.3.3.ebuild
index 945367504a5d..1fcbd9356d02 100644
--- a/media-video/aegisub/aegisub-3.3.3.ebuild
+++ b/media-video/aegisub/aegisub-3.3.3.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/wangqr/Aegisub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 LICENSE="BSD MIT"
 SLOT="0"
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 0e322c34c46c..b2efb3c80e17 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,7 +1,9 @@
 AUX mpv-0.37.0-drm-fix.patch 1444 BLAKE2B e0645e9b12ebbd0088b10aed34cabadbdb1b06d9cab14c40e9108c09d068c1ccba133dd91ba4c1d0735c67d0a8010003c77b85466343504cb220498fa24ac964 SHA512 8ce946f6043abb274b3051e787f5445ad40a3ea404cb2effcf9a4415a589483861381e54762e31f72d03c4975d01b67b662b6fb8a8a9194d7cd7d8acb4cab084
 AUX mpv-0.37.0-ffmpeg7.patch 1656 BLAKE2B 05826bd93c8c63d8114195a9ba595d93ce3fc9a03cc09c4dff364ca72f7ce934576c76b5841b0f45db4e9a85796ced590d2bf2cb34c22774ecbb87f75a383f43 SHA512 3a387c8b985a5aa02c1f7d4d1fba776731a820f057a9121d0ea6f2e95336755fdf3144c3f826ea452c6a5e135e006e3636f0b12c1c02ae6bd5f1eead36018d92
 DIST mpv-0.37.0.tar.gz 3384190 BLAKE2B 31d8d47ed7ae94540189fe05b7ea63f5b0d5c987a22191f931e4bd90664d05dca4c7e0bd0e05fcdf48b977e38e5f8eec0d2572265f2cf4a969a8a9a9dbf83d68 SHA512 a2f7fb3837312ec59c50427af7be3b2b1b6175a53ccc7463e81503284fc4047dff32cb105d665d80be77ee1ae775d4512b71584f324d6d202c9a7fc1fab53257
+DIST mpv-0.38.0.tar.gz 3419741 BLAKE2B 3ff59d30bc305394f58a1fff4f24540aa3be9412bc3cad27bec0c3478f4b7c13190e26847f38edc52996bb9f9a36dd6832c6fccebd6d873058acf78a320e42e4 SHA512 b5b2af59039ef4711814f94bbdfedb37f8ce914301670e42d4ed05fe1900025a3d3a2f3d5e69628a8aad115a647a27c386718959e2df1a18740468b3a84f8975
 EBUILD mpv-0.37.0-r1.ebuild 7034 BLAKE2B c951ca2938728125be40ae09e176e9cd1b489f15895ca4321b6221c93d3694f6e1fcf90e833ba4999bdf3eaa7930eb40c39d8625489a9ac28d28816e0a20cf36 SHA512 267e971f5717e7299b833adc0f974dcafa55695d3fb137cafbe4533f67bb1b6d59c318fe68d4506e81f1c4fac93e9be05dcb3d30724219bd5f80db1e4c1f0d56
 EBUILD mpv-0.37.0.ebuild 7087 BLAKE2B 322689b3988e47e41ae050e596518ca46d9f12048568d5d8920c98fe92f48adc28430a6fd92734cbf06ee9d01c74dea7f6aed133a9c8eb7aed50e2ffd2b5c0fb SHA512 b38640e3fae2cdaa8db042779516ce4143af50162af42548e49129c259d44bf76b217744d8541a7cc223f4385f1f9c55ba2fc8e7ea1c257a9034994a3b7f859d
+EBUILD mpv-0.38.0.ebuild 6881 BLAKE2B d440452a44439fb4f0a74ff6a3e221a98c80b8a910a5f0230fd8425c34580f4f4fdcf0a3a587f92d564e207d4db087952e7aa99815b60bc82ab52dc970395bda SHA512 c20624072cc97e353589793e1fee3da0edc49fc95d041c67cfa396fa54fe1bebd166425d5f51a17b81cc5045c9d8307e59673fe820f01e965c6b4a74def90087
 EBUILD mpv-9999.ebuild 6881 BLAKE2B d440452a44439fb4f0a74ff6a3e221a98c80b8a910a5f0230fd8425c34580f4f4fdcf0a3a587f92d564e207d4db087952e7aa99815b60bc82ab52dc970395bda SHA512 c20624072cc97e353589793e1fee3da0edc49fc95d041c67cfa396fa54fe1bebd166425d5f51a17b81cc5045c9d8307e59673fe820f01e965c6b4a74def90087
 MISC metadata.xml 2248 BLAKE2B 384962e209948418c928a4a8d903f57a226116929db253847e7977d0febbf3fc23b18f947e9896b5a16e816267eb06c0e64145fc15270f66dca4fe7321c36897 SHA512 c4f1191adacde565a5d6ff6fdf10a9dedc84fae3d04792baac456e37fabcd80f04858031f442dcf1dd07c3d59e2343319c955969b23d0aef456c2d927a76bcbf
diff --git a/media-video/mpv/mpv-0.38.0.ebuild b/media-video/mpv/mpv-0.38.0.ebuild
new file mode 100644
index 000000000000..a79aeac37bd3
--- /dev/null
+++ b/media-video/mpv/mpv-0.38.0.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit flag-o-matic lua-single meson optfeature pax-utils python-single-r1 xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+else
+	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
+fi
+
+DESCRIPTION="Media player for the command line"
+HOMEPAGE="https://mpv.io/"
+
+LICENSE="LGPL-2.1+ GPL-2+ BSD ISC MIT" #506946
+SLOT="0/2" # soname
+IUSE="
+	+X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb
+	dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv
+	+lua nvenc openal opengl pipewire pulseaudio rubberband sdl selinux
+	sixel sndio soc test tools +uchardet vaapi vdpau vulkan wayland xv
+	zimg zlib
+"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( cli libmpv )
+	egl? ( || ( X drm wayland ) )
+	lua? ( ${LUA_REQUIRED_USE} )
+	nvenc? ( || ( egl opengl vulkan ) )
+	opengl? ( || ( X aqua ) )
+	test? ( cli )
+	tools? ( cli )
+	uchardet? ( iconv )
+	vaapi? ( || ( X drm wayland ) )
+	vdpau? ( X )
+	vulkan? ( || ( X wayland ) )
+	xv? ( X )
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	media-libs/libass:=[fontconfig]
+	>=media-libs/libplacebo-6.338.2:=[opengl?,vulkan?]
+	>=media-video/ffmpeg-4.4:=[encode,soc(-)?,threads,vaapi?,vdpau?]
+	X? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+		x11-libs/libXext
+		x11-libs/libXpresent
+		x11-libs/libXrandr
+		xv? ( x11-libs/libXv )
+	)
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive:= )
+	bluray? ( media-libs/libbluray:= )
+	cdda? (
+		dev-libs/libcdio-paranoia:=
+		dev-libs/libcdio:=
+	)
+	drm? (
+		x11-libs/libdrm
+		egl? ( media-libs/mesa[gbm(+)] )
+	)
+	dvd? (
+		media-libs/libdvdnav
+		media-libs/libdvdread:=
+	)
+	egl? (
+		media-libs/libglvnd
+		media-libs/libplacebo[opengl]
+	)
+	gamepad? ( media-libs/libsdl2[joystick] )
+	iconv? (
+		virtual/libiconv
+		uchardet? ( app-i18n/uchardet )
+	)
+	jack? ( virtual/jack )
+	javascript? ( dev-lang/mujs:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	lcms? ( media-libs/lcms:2 )
+	libcaca? ( media-libs/libcaca )
+	lua? ( ${LUA_DEPS} )
+	openal? ( media-libs/openal )
+	opengl? ( media-libs/libglvnd[X?] )
+	pipewire? ( media-video/pipewire:= )
+	pulseaudio? ( media-libs/libpulse )
+	rubberband? ( media-libs/rubberband )
+	sdl? ( media-libs/libsdl2[sound,threads,video] )
+	sixel? ( media-libs/libsixel )
+	sndio? ( media-sound/sndio:= )
+	vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] )
+	vdpau? ( x11-libs/libvdpau )
+	vulkan? ( media-libs/vulkan-loader[X?,wayland?] )
+	wayland? (
+		dev-libs/wayland
+		dev-libs/wayland-protocols
+		x11-libs/libxkbcommon
+	)
+	zimg? ( media-libs/zimg )
+	zlib? ( sys-libs/zlib:= )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-mplayer )
+	tools? ( ${PYTHON_DEPS} )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	X? ( x11-base/xorg-proto )
+	dvb? ( sys-kernel/linux-headers )
+	nvenc? ( media-libs/nv-codec-headers )
+	wayland? ( dev-libs/wayland-protocols )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	cli? ( dev-python/docutils )
+	wayland? ( dev-util/wayland-scanner )
+"
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	if use !debug; then
+		if use test; then
+			einfo "Skipping -DNDEBUG due to USE=test"
+		else
+			append-cppflags -DNDEBUG # treated specially
+		fi
+	fi
+
+	mpv_feature_multi() {
+		local use set
+		for use in ${1} ${2}; do
+			use ${use} || set=disabled
+		done
+		echo -D${3-${2}}=${set-enabled}
+	}
+
+	local emesonargs=(
+		$(meson_use cli cplayer)
+		$(meson_use libmpv)
+		$(meson_use test tests)
+
+		$(meson_feature cli html-build)
+		$(meson_feature cli manpage-build)
+		-Dpdf-build=disabled
+
+		-Dbuild-date=false
+
+		# misc options
+		$(meson_feature archive libarchive)
+		$(meson_feature bluray libbluray)
+		$(meson_feature cdda)
+		-Dcplugins=enabled
+		$(meson_feature dvb dvbin)
+		$(meson_feature dvd dvdnav)
+		$(meson_feature gamepad sdl2-gamepad)
+		$(meson_feature iconv)
+		$(meson_feature javascript)
+		-Dlibavdevice=enabled
+		$(meson_feature lcms lcms2)
+		-Dlua=$(usex lua "${ELUA}" disabled)
+		$(meson_feature rubberband)
+		-Dsdl2=$(use gamepad || use sdl && echo enabled || echo disabled) #857156
+		$(meson_feature uchardet)
+		-Dvapoursynth=disabled # only available in overlays
+		$(meson_feature zimg)
+		$(meson_feature zlib)
+
+		# audio output
+		$(meson_feature alsa)
+		$(meson_feature coreaudio)
+		$(meson_feature jack)
+		$(meson_feature openal)
+		$(meson_feature pipewire)
+		$(meson_feature pulseaudio pulse)
+		$(meson_feature sdl sdl2-audio)
+		$(meson_feature sndio)
+
+		# video output
+		$(meson_feature X x11)
+		$(meson_feature aqua cocoa)
+		$(meson_feature drm)
+		$(meson_feature jpeg)
+		$(meson_feature libcaca caca)
+		$(meson_feature sdl sdl2-video)
+		$(meson_feature sixel)
+		$(meson_feature wayland)
+		$(meson_feature xv)
+
+		-Dgl=$(use egl || use libmpv || use opengl &&
+			echo enabled || echo disabled)
+		$(meson_feature egl)
+		$(mpv_feature_multi egl X egl-x11)
+		$(mpv_feature_multi egl drm gbm) # gbm is only used by egl-drm
+		$(mpv_feature_multi egl drm egl-drm)
+		$(mpv_feature_multi egl wayland egl-wayland)
+		$(meson_feature libmpv plain-gl)
+		$(mpv_feature_multi opengl X gl-x11)
+		$(mpv_feature_multi opengl aqua gl-cocoa)
+
+		$(meson_feature vulkan)
+
+		# hardware decoding
+		$(meson_feature nvenc cuda-hwaccel)
+		$(meson_feature nvenc cuda-interop)
+
+		$(meson_feature vaapi)
+		$(mpv_feature_multi vaapi X vaapi-x11)
+		$(mpv_feature_multi vaapi drm vaapi-drm)
+		$(mpv_feature_multi vaapi wayland vaapi-wayland)
+
+		$(meson_feature vdpau)
+		$(mpv_feature_multi vdpau opengl vdpau-gl-x11)
+
+		$(mpv_feature_multi aqua opengl videotoolbox-gl)
+
+		# notable options left to automagic
+		#dmabuf-wayland: USE="drm wayland" + plus memfd_create support
+		#vulkan-interop: USE="vulkan" + >=ffmpeg-6.1
+		# TODO?: perhaps few more similar compound options should be left auto
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	# ffmpeg tests are picky and easily break without necessarily
+	# meaning that there are runtime issues (bug #921091,#924276)
+	meson_src_test --no-suite ffmpeg
+}
+
+src_install() {
+	meson_src_install
+
+	if use lua; then
+		insinto /usr/share/${PN}
+		doins -r TOOLS/lua
+
+		if use cli && use lua_single_target_luajit; then
+			pax-mark -m "${ED}"/usr/bin/${PN}
+		fi
+	fi
+
+	if use tools; then
+		dobin TOOLS/{mpv_identify.sh,umpv}
+		newbin TOOLS/idet.sh mpv_idet.sh
+		python_fix_shebang "${ED}"/usr/bin/umpv
+	fi
+
+	if use cli; then
+		dodir /usr/share/doc/${PF}/html
+		mv "${ED}"/usr/share/doc/{mpv,${PF}/html}/mpv.html || die
+		mv "${ED}"/usr/share/doc/{mpv,${PF}/examples} || die
+	fi
+
+	local GLOBIGNORE=*/*build*:*/*policy*
+	dodoc RELEASE_NOTES DOCS/*.{md,rst}
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "URL support with USE=lua" net-misc/yt-dlp
+}
diff --git a/media-video/popcorntime-bin/Manifest b/media-video/popcorntime-bin/Manifest
index 4953cafb328c..c295dc8ac0ef 100644
--- a/media-video/popcorntime-bin/Manifest
+++ b/media-video/popcorntime-bin/Manifest
@@ -1,10 +1,9 @@
-DIST Popcorn-Time-0.4.8-amd64.deb 101235940 BLAKE2B a967efc4805e14f4292cf6b4652f2c6d9e3050c55789499b055b8cdac39d25d7e3f875f1e2dab79a9eb7199d93bcdf50507ff1eee5e065495d644945a1ac73e5 SHA512 a2f5be372908ae383e23b8f11c49d43865c8b1e3cd6acff1191809fd96e7f8fc8062cffa7b33bde4a8c91436acce75ad89461fb185d23bc0d96d3c81699f1bbd
-DIST Popcorn-Time-0.4.8-i386.deb 104249328 BLAKE2B 46e8b8f34d5d18e6106f0fb32cf5a70a8b0e1f8583838af81a5fd731caf04648e82516152ec4f346f2251b8d23c5c0aeed18b88e6fd7e9fc2f9ff766a19cfd18 SHA512 1719527b038bc170d3fa4659e11ca095753410a5ddc2922e2ebd78dacc1a252522e37be8d9916b95232f175ac9e50ea04eb83bda5e63ec7ca21433282d75501a
 DIST Popcorn-Time-0.4.9-amd64.deb 101129244 BLAKE2B a36d4ef4702ec9dd6b353ad0c0dd1c967d3a95eaf18ceb7c18c1e7f8418d7f8c0336a1d6c6b28c6f53bf657af8b00094c72b9729b91cb275ab5539f6450626ff SHA512 7a837d11bbe4a7b51e1996dc4ff579e860285f3589bb8938e44ecfaf4f435b657832286f700c74126bfd4f94c485138eb6a32f65cdc36f90a7efbbd2f00a9586
 DIST Popcorn-Time-0.4.9-i386.deb 104225348 BLAKE2B d162f6afc7f57b2cc1ddf8d14a044cdb23a010b6949432418092b1ddfc778197298e61e3e1f0778ddf8becd57ecb72be78a55e39ef02bf6981c0d9e02844a08a SHA512 5513a0e6a7e49a54ce4bca2cd16e82c763cc16a7d92bf6661e18ee6eecceb3d61043c3e106136ad286c85921de86033371abcc602112a3781b1a9e12ce73c660
 DIST Popcorn-Time-0.5.0-amd64.deb 154055688 BLAKE2B e099038e6cd6f3a214209243c0ab3791b607b2c127ea92b8f1a024f64b0ad1fbea7d1f108619a64a40f4531b5b8e1f0cce3371abc30beadf1b4a4decedf7e3dd SHA512 b81ab4c9a2af1dde80b1fea883d481a64ab04babfc3faa5eec993a8f07ab09f0b6bab7c36292988de375cd70f3ce03f325cd833f083072f2aa900191ef0092bf
 DIST Popcorn-Time-0.5.0-i386.deb 159146908 BLAKE2B 2eebf6bd8c473b68dbd8019ae85155b85f249d9b2e5ec74d467606dc6b455b5e03413d6394d2b220eb70326a6b45bd25386a04fc8de546256b49af6b4774cdcd SHA512 6a45fe9c977fbadeb21133a67fb16fa0795b2e7d7af24e5a0e72c57963d11674de03fec89880d61cd7a2f218efc6db8666a1878e12628b346e4f5b6afc03bfa5
-EBUILD popcorntime-bin-0.4.8.ebuild 2125 BLAKE2B 9cf5b628d2bc3b70562ac4b7fc9a311cd0c626426f462dd578f9d405b4e2cee74df56d5891827ab06b3ecbfd15aabcd50e047224c0f706c6d0b6ecba08044714 SHA512 629058224e66dccb5201b2b9f9b32c5f1e1858ea4fd7904da1fc23203f8f2d60ad8d8d46751cad4d9bb3bca876797a05219bacb5f9ed02790a7d1cf2419e3f46
+DIST Popcorn-Time-0.5.1-amd64.deb 150323412 BLAKE2B 6c15e01ba8d9a1f6efac0b663b6112a52a5c5aa82b93e627bacad4e1c8e3c29b81898769dc16e58cc0adc6f4f1684c66063a2ded8b6236adebd8c5f3f0168f67 SHA512 ad6646b8f1e6f4ffa40ab4276fabb957a418c764442bca3a775df4af4a6621e9514ef22ceaf435025d8aa515e9bf7a8490f285faacc824c3f26ccf6e5dfe5f79
 EBUILD popcorntime-bin-0.4.9.ebuild 2125 BLAKE2B 9cf5b628d2bc3b70562ac4b7fc9a311cd0c626426f462dd578f9d405b4e2cee74df56d5891827ab06b3ecbfd15aabcd50e047224c0f706c6d0b6ecba08044714 SHA512 629058224e66dccb5201b2b9f9b32c5f1e1858ea4fd7904da1fc23203f8f2d60ad8d8d46751cad4d9bb3bca876797a05219bacb5f9ed02790a7d1cf2419e3f46
 EBUILD popcorntime-bin-0.5.0-r1.ebuild 2437 BLAKE2B 416ffbc51bfe9f98460a17e6c468292f9d4236da3bd3b21718de46a4321106da8c2fbc0d2d7334e984beba06b419cec00377fb6247fb7924ca931c9e6f99736c SHA512 92c365bb534c1db9575196320d98f3f55dead82132c7acfa43d86b15d875543f73cc90b9d9df8b1b56db6ae84befefd977ecfc480fba6da4e32eeb2878e2a822
+EBUILD popcorntime-bin-0.5.1.ebuild 2303 BLAKE2B d1fc024f454d6c78974a1a460cfa846cb45445487859b80ad19ea6a10b54597429bab559319f44a66b1305259cdf5fead8871b10169d17a668d8e2de55807a75 SHA512 2d23fcbfa87b4d6d5f330d25e180dde2bdfacd178fb49373fe2ba13b6992a336de7ebdb49ccf98d2c8cfc108a01895cf8f1d3c6043bc3fd35319c521424ac926
 MISC metadata.xml 436 BLAKE2B da1f7867d1f3a3b6a04a0975899b592976adb0299e2c370fa613d025993aeed81f719d1bde50565f3e8da15cfdd4ed6cd7f1bf4abb77c3d9371fdcfe7f4e9d13 SHA512 fec3c45b96ed58c61fb5454edc2351384b67bb52e156542bd0d71ce51f36b5943c1bee083a05c5c99917630da6ca5ffe0b87cfacde3a07d521a3c2032e42985e
diff --git a/media-video/popcorntime-bin/popcorntime-bin-0.4.8.ebuild b/media-video/popcorntime-bin/popcorntime-bin-0.5.1.ebuild
index 194dd26d3375..1a57d5895207 100644
--- a/media-video/popcorntime-bin/popcorntime-bin-0.4.8.ebuild
+++ b/media-video/popcorntime-bin/popcorntime-bin-0.5.1.ebuild
@@ -1,36 +1,32 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 CHROMIUM_LANGS="
-	am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
+	af am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
 	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
-	sw ta te th tr uk vi zh-CN zh-TW
+	sw ta te th tr uk ur vi zh-CN zh-TW
 "
 
 inherit chromium-2 desktop unpacker xdg
 
 DESCRIPTION="BitTorrent client that includes an integrated media player"
 HOMEPAGE="https://github.com/popcorn-official/popcorn-desktop"
-SRC_URI="
-	amd64? ( https://github.com/popcorn-official/popcorn-desktop/releases/download/v${PV}/Popcorn-Time-${PV}-amd64.deb )
-	x86? ( https://github.com/popcorn-official/popcorn-desktop/releases/download/v${PV}/Popcorn-Time-${PV}-i386.deb )
-"
+SRC_URI="https://github.com/popcorn-official/popcorn-desktop/releases/download/v${PV}/Popcorn-Time-${PV}-amd64.deb"
 S="${WORKDIR}"
 
-KEYWORDS="-* ~amd64 ~x86"
 # Electron bundles a bunch of things
 LICENSE="
 	MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2
 	unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
 "
 SLOT="0"
+KEYWORDS="-* ~amd64"
 RESTRICT="bindist mirror"
 
 RDEPEND="
-	app-accessibility/at-spi2-core:2
-	dev-libs/atk
+	>=app-accessibility/at-spi2-core-2.46.0:2
 	dev-libs/expat
 	dev-libs/nspr
 	dev-libs/nss
@@ -43,6 +39,7 @@ RDEPEND="
 	x11-libs/gtk+:3
 	x11-libs/libX11
 	x11-libs/libxcb
+	x11-libs/libxkbcommon
 	x11-libs/libXcomposite
 	x11-libs/libXcursor
 	x11-libs/libXdamage
@@ -66,6 +63,8 @@ src_prepare() {
 	default
 	# cleanup languages
 	pushd "opt/Popcorn-Time/locales" || die
+	# No l10n use entries for these langs
+	rm ar-XB.pak* en-XA.pak* || die
 	chromium_remove_language_paks
 	popd || die
 }
@@ -83,10 +82,21 @@ src_install() {
 	local DESTDIR="/opt/Popcorn-Time"
 	pushd "opt/Popcorn-Time" || die
 
-	# Copy all the things in
-	dodir "${DESTDIR}"
-	mv * "${ED}/${DESTDIR}" || die
+	exeinto "${DESTDIR}/lib"
+	doexe lib/*.so
+
+	insinto "${DESTDIR}/lib"
+	doins *.json
+
+	exeinto "${DESTDIR}"
+	doexe Popcorn-Time nwjc minidump_stackwalk chromedriver chrome_crashpad_handler
+
+	insinto "${DESTDIR}"
+	doins *.pak *.bin *.json *.dat
+	insopts -m0755
+	doins -r locales src node_modules
 
 	dosym "${DESTDIR}"/Popcorn-Time /opt/bin/Popcorn-Time
+
 	popd || die
 }
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 67910dbfdda1..469138e416cb 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -10,7 +10,7 @@ AUX vlc-9999-configure-lua-version.patch 1840 BLAKE2B 1b9f11c05ed58e12616732c73a
 AUX vlc-9999-fix-libtremor-libs.patch 480 BLAKE2B 86102dc088705f546185023b2f941520b5435f852e0b0e7cdb8763e15df645cdc794087c188fb17ee331be7ba4d953311276583886e3fe0f93d6de32e63e3207 SHA512 93893a0accecc3470f33e505ef2ce86aeb5f2a3a6524adc7de354366bb8e51def2d67957be4ea705ff20c1510e7274691e587e70740d4b3657b35f5c91de7280
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0.20.tar.xz 25596392 BLAKE2B 4537d6b4b3445a28366cdb7ed7e12d0dc864e19a53d34efcdc0a62226642ec8653cf8d5b74d4aea30c9f324c34166e8fa71653b3b298f5abdebe29c4f21f2865 SHA512 02e58fb52dd75bf483ac4b298aecf86463b13d4782173d164adba6e4552d9262ff5e2ee1cbe1bce2c8a809801b79f328c6a8c475d34ae62aefaea02ae5ade406
-EBUILD vlc-3.0.20-r10.ebuild 13716 BLAKE2B 5dde869c99973da51cfa8537797278dfaeb08431005fcffd348eff32aeae997ac74939f9f015888f381852ebf156b16a4f6c93817662bf4f091c6806e21be330 SHA512 79f21d2955bf282acc7f9e043eebac5675cce2900de68663e18f439930b560ad6891d7bed24c75c17cc2cfebd24d5f768b15b4dad4336c1699b939d0b32c0d13
+EBUILD vlc-3.0.20-r10.ebuild 13714 BLAKE2B 6e307dda7ae1f520935574b27c5ebc196bb4d1f69b090f379910a1c95513c4046fcf77eb11fca9372e5c6e82028537266f5b9d86617795dee194e47c0bb29dab SHA512 26506e9779559f6f9aba04d0ee2af42f2bb7b6390b23c1ea2e3b38bf4eada5c6fe372b1dc855c44c185302158aeaaa36003af4e135486389476146441878a224
 EBUILD vlc-3.0.20-r5.ebuild 13695 BLAKE2B 2d7be752bd34bc9235cb04755b349a737357d2e38737c71f7b3dd6b1c01389d2542bbb208caeed86c8ba8b509b24486c20eff0f378d3de9d1954dc32a89ba335 SHA512 4598328236de70aeec4164f922a9f731be4e6ddd394df28a7dcb38cdf3d9008c96ef1395a90ea9c27dd21beeeedcbb5f8f9f795438a42d431a314b420b4fb7fa
 EBUILD vlc-3.0.9999.ebuild 13640 BLAKE2B 046e11a9895755093d585a379064ceffbce7b25342d0636b4cbd9cb2dabf186899b1244ec0ab7b9c24127a87b4758f882a0fd684216a36c89a64fc7d5c911b6b SHA512 fbaedcb6ba8d47dc39dbba7ec68ef69ee26d041af171eb94c3e76d6ef306e874c21fa0cb160fdd70014982ac96a9e9b47855962a72d8abfc14a249d0f3777493
 EBUILD vlc-9999.ebuild 13468 BLAKE2B 9368b716f838feffe9ffbed08cf002ed5c5ccca0244dad4d5a51f2dd9f942ff3fc9662388391339083a8d4d0b1047dcb0750b22bf924b320dfceda7a3f5b58f9 SHA512 c3c5353ebf8e99a860b6b862a5002f833c35875f26885ed63fc784dc252d15edfa6ff1143123ee5066def0f34763932ce64dfecb15ecbf19e008f82afde648bd
diff --git a/media-video/vlc/vlc-3.0.20-r10.ebuild b/media-video/vlc/vlc-3.0.20-r10.ebuild
index da88b4a407ee..64dab832d372 100644
--- a/media-video/vlc/vlc-3.0.20-r10.ebuild
+++ b/media-video/vlc/vlc-3.0.20-r10.ebuild
@@ -20,7 +20,7 @@ else
 	else
 		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	fi
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv -sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv -sparc x86"
 fi
 inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index d99b8bb11ed3..5d41579c9b03 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 08c985ed928c..6f2fad3383fb 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 17 Apr 2024 10:41:41 +0000
+Thu, 18 Apr 2024 10:40:23 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 9773b7eac36e..43642f52eb2a 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 569494 BLAKE2B 475196fd0ff28d6023f45e6c22284bded2028bbe891778e3828fb75c3727438168bcd5ab63fe48683bb5874710c096e12470eee93163ae90c07d1f9d79810710 SHA512 94822c7f83b3b68b28e1885c442c2d9b5794eb5f861b8a0862162601a2c2b03cdc2bb6144d8b4a1d61befedf2ff1952e540c518e34c7f15ff5af14b7dc567fcb
-TIMESTAMP 2024-04-17T10:41:45Z
+TIMESTAMP 2024-04-18T10:40:26Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYfp2lfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYg+JpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCimhAAphKeTgGw7/PI4of72MvbAv7umBiYNwB3zb2NNlWDobnLfRjNXNrzdyXh
-fcON57Wmh5WUDYw3CdG+Bq4a6bpadayGV3DOsEr6HrXmYvSNQKmwsCnZFxTcrcVQ
-OY4SJw0nOUJy7iG28AqlQjwk6qyvLLI+opDEaWpDy39dwTeRme38vyKHBGwgMAee
-X1xbuf1sRsFDF7YdA78GujTtiYI8vntEkwYV27tW+03U9VEzHEeCCb+z9uHuJWto
-XQoSvhNwqlwub43FwiOcMKXgV5LBbMU4deEJk+h5SWvdDUaE8FlhS2JSnQxa0I38
-geOhoiyWvNxKCnk//neLamT5IFArbGiTJlcxAfoqfKxcSUTOk0oN+0akeWe0o+/y
-vKbi2rZ4bko7VSNCT0fa89DoVTaU2u5S9FDESCIVusu7HvOYWbdmGTFs7CA00v23
-iWOhv90IWgfF62RAYZCDZBmfb0uoopSQ2VFNHGefRIbEPs1O2N6lWZYrDnev0+oG
-UJCpamuEn+vhbdyutg+cG+sixOPmLn+CFGy0oUPvTo3guOitay73MA7eey2zyTq0
-4XEe3pSCdnFxgUaVTlOMgTpcNVF6JspSqujQFdaqgYSGlHqtT6nEay4EtgZ5W72P
-2YK+tXkdjwfA+bWUyI0QFGMZRKVSPwUn6gZS3HdL/jG2hIofK/U=
-=HH5n
+klD0Yw/9HFTtjk83Gj+o92WxTeNpbE/8hih31hVYpoJr2mcUjtJ8EkfBF8+efnTP
+akfpIurnQmRCWjiL4vjCnjV8J+9YKnThQNK2D7zU6DtHgvYnFe0Vte+sawolZV8u
+WuE7tZZUUkCkK2kasHOkJobltlpbomlt3t8JJmaoPDsHHWFWfr7GMOqa0pwIi8/Z
+WSZwXycTj6IM9qxJz90I9qkbiwcBQXaj5L5FRmaAhFMkw3YYY6bU/H1XykCI2diU
+MQHWcP4ce8dgrZxJEA7mGhunXUJnK0jmLokJfG0S1JyivYXnmSSMhZf7u++CMCjW
+kYePRk/EydIMxTtK0o+tlDWc5WaBHJEjTyhTV08okUjV1tIxbPDnpwRBrORzObkC
+rzEzXujM2PrLSMcsSQnfVVgaJehk/OqDR3Yz1LJCMJcyXBoNPylUVRm98sP8Lt09
+4taXh5FI9ymPT16OgFf0qjSR6nA0EUJxlVBn1cuSgIKaDbF+eQ8D9iG1b1Wi/Hdm
+SV4DxBrIcydvV+sOZojDPhkuIH6pYEmPd2qE5TiZQUAOzuP/HEnI2zdFavenlOYG
+HIyCXpt31JWWdsOrbbOLNNc69c+kVCcIIAI9fijKaSrfFQt63VeyKyiE4w+vWySk
+Vvsk5af2CYp/JOFxkkf6NCOdC7Jy9IsVKkRVU8eRaiEhJCRFrb4=
+=kiJZ
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 50a5b5320265..6f2fad3383fb 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 17 Apr 2024 10:41:42 +0000
+Thu, 18 Apr 2024 10:40:23 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index f97bbf477878..25aea5d59941 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 c3ae0d820c2a..8805fefb67de 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/awscli-1.32.86 b/metadata/md5-cache/app-admin/awscli-1.32.86
new file mode 100644
index 000000000000..5dd242c373be
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.32.86
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/botocore-1.34.86[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
+INHERIT=bash-completion-r1 distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.34.86[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !app-admin/awscli-bin python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.32.86.tar.gz -> aws-cli-1.32.86.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=26d79af710d57f697ff897857cc16d28
diff --git a/metadata/md5-cache/app-admin/keepassxc-2.7.7-r2 b/metadata/md5-cache/app-admin/keepassxc-2.7.7-r2
index b3e652318a82..b6b09a3c664d 100644
--- a/metadata/md5-cache/app-admin/keepassxc-2.7.7-r2
+++ b/metadata/md5-cache/app-admin/keepassxc-2.7.7-r2
@@ -7,7 +7,7 @@ HOMEPAGE=https://keepassxc.org/ https://github.com/keepassxreboot/keepassxc/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake flag-o-matic xdg
 IUSE=X autotype browser doc keeshare +network test yubikey
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1 GPL-2 GPL-3
 RDEPEND=app-crypt/argon2:= dev-libs/botan:3= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= sys-libs/zlib:=[minizip] X? ( dev-qt/qtx11extras:5 ) autotype? ( x11-libs/libX11 x11-libs/libXtst ) yubikey? ( dev-libs/libusb:1 sys-apps/pcsc-lite )
 REQUIRED_USE=autotype? ( X )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/keepassxreboot/keepassxc/releases/download/2.7.7/keepassxc-2.7.7-src.tar.xz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=eb70f189089c037736c682c66993e767
+_md5_=e6d831f49ea9b38d03e4b47a7d50c7b4
diff --git a/metadata/md5-cache/app-admin/linode-cli-5.48.4 b/metadata/md5-cache/app-admin/linode-cli-5.48.4
new file mode 100644
index 000000000000..41e791deb21f
--- /dev/null
+++ b/metadata/md5-cache/app-admin/linode-cli-5.48.4
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Linode Command Line Interface
+EAPI=8
+HOMEPAGE=https://github.com/linode/linode-cli https://www.linode.com/
+INHERIT=distutils-r1 pypi
+IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-python/boto3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/linode-metadata[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/openapi3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rich[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/urllib3-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/l/linode-cli/linode_cli-5.48.4.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=99bb477b968caad937df99324a478d73
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index e81c3f47be33..3cc3b390b415 100644
--- a/metadata/md5-cache/app-antivirus/Manifest.gz
+++ b/metadata/md5-cache/app-antivirus/Manifest.gz
diff --git a/metadata/md5-cache/app-antivirus/clamtk-6.17 b/metadata/md5-cache/app-antivirus/clamtk-6.17
deleted file mode 100644
index 3b2b25a3eae2..000000000000
--- a/metadata/md5-cache/app-antivirus/clamtk-6.17
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext )
-DEFINED_PHASES=install postinst postrm setup unpack
-DESCRIPTION=A graphical front-end for ClamAV
-EAPI=8
-HOMEPAGE=https://gitlab.com/dave_m/clamtk/wikis/Home
-INHERIT=desktop perl-functions python-single-r1 xdg-utils
-IUSE=kde nautilus nemo +nls thunar python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=app-antivirus/clamav dev-perl/File-chdir dev-perl/Gtk3 dev-perl/JSON dev-perl/LWP-Protocol-https dev-perl/LWP-UserAgent-Cached dev-perl/Locale-gettext dev-perl/Text-CSV dev-perl/glib-perl dev-perl/libwww-perl virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-Encode virtual/perl-MIME-Base64 virtual/perl-Time-Piece nautilus? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) dev-python/nautilus-python[python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] )
-REQUIRED_USE=nautilus? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
-SLOT=0
-SRC_URI=https://github.com/dave-theunsub/clamtk/releases/download/v6.17/clamtk-6.17.tar.xz kde? ( https://github.com/dave-theunsub/clamtk-kde/releases/download/v0.19/clamtk-kde-0.19.tar.xz ) nautilus? ( https://github.com/dave-theunsub/clamtk-gnome/releases/download/v6.14/clamtk-gnome-6.14.tar.xz ) nemo? ( https://github.com/dave-theunsub/nemo-sendto-clamtk/releases/download/v0.05/nemo-sendto-clamtk-0.05.tar.xz ) thunar? ( https://github.com/dave-theunsub/thunar-sendto-clamtk/releases/download/v0.07/thunar-sendto-clamtk-0.07.tar.xz )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	perl-functions	c3fca037246e877693badea0df3b0ef8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fce62cf96090ed6e155a2a83d3d4488e
diff --git a/metadata/md5-cache/app-antivirus/clamtk-6.18 b/metadata/md5-cache/app-antivirus/clamtk-6.18
index fabfd762ae54..b6a19cba9f07 100644
--- a/metadata/md5-cache/app-antivirus/clamtk-6.18
+++ b/metadata/md5-cache/app-antivirus/clamtk-6.18
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/dave_m/clamtk/wikis/Home
 INHERIT=desktop perl-functions python-single-r1 xdg-utils
 IUSE=kde nautilus nemo +nls thunar python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=app-antivirus/clamav dev-perl/File-chdir dev-perl/Gtk3 dev-perl/JSON dev-perl/LWP-Protocol-https dev-perl/LWP-UserAgent-Cached dev-perl/Locale-gettext dev-perl/Text-CSV dev-perl/glib-perl dev-perl/libwww-perl virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-Encode virtual/perl-MIME-Base64 virtual/perl-Time-Piece nautilus? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) dev-python/nautilus-python[python_single_target_python3_10(-)?,python_single_target_python3_11(-)?,python_single_target_python3_12(-)?] )
 REQUIRED_USE=nautilus? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) )
 SLOT=0
 SRC_URI=https://github.com/dave-theunsub/clamtk/releases/download/v6.18/clamtk-6.18.tar.xz kde? ( https://github.com/dave-theunsub/clamtk-kde/releases/download/v0.19/clamtk-kde-0.19.tar.xz ) nautilus? ( https://github.com/dave-theunsub/clamtk-gnome/releases/download/v6.14/clamtk-gnome-6.14.tar.xz ) nemo? ( https://github.com/dave-theunsub/nemo-sendto-clamtk/releases/download/v0.05/nemo-sendto-clamtk-0.05.tar.xz ) thunar? ( https://github.com/dave-theunsub/thunar-sendto-clamtk/releases/download/v0.07/thunar-sendto-clamtk-0.07.tar.xz )
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	perl-functions	c3fca037246e877693badea0df3b0ef8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=51b555dea697461bb257dd29a3f60474
+_md5_=04dfd8be8665a274b9d1014c1136a571
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 54ee24dff3b5..62b0855e6154 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/lzip-1.24 b/metadata/md5-cache/app-arch/lzip-1.24
deleted file mode 100644
index f712f6aa258e..000000000000
--- a/metadata/md5-cache/app-arch/lzip-1.24
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=configure unpack
-DESCRIPTION=Lossless data compressor based on the LZMA algorithm
-EAPI=7
-HOMEPAGE=https://www.nongnu.org/lzip/lzip.html
-INHERIT=toolchain-funcs verify-sig
-IUSE=verify-sig
-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=GPL-2+
-SLOT=0
-SRC_URI=https://download.savannah.gnu.org/releases/lzip/lzip-1.24.tar.gz verify-sig? ( https://download.savannah.gnu.org/releases/lzip/lzip-1.24.tar.gz.sig )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=f7615c353ae567ec01a6d59dd246e2ac
diff --git a/metadata/md5-cache/app-arch/rar-6.24 b/metadata/md5-cache/app-arch/rar-6.24
deleted file mode 100644
index de9229e487a6..000000000000
--- a/metadata/md5-cache/app-arch/rar-6.24
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=all-sfx? ( app-arch/unrar )
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=RAR compressor/uncompressor
-EAPI=8
-HOMEPAGE=https://www.rarlab.com/
-INHERIT=unpacker
-IUSE=all-sfx
-KEYWORDS=-* amd64 x86
-LICENSE=BSD BSD-2 RAR
-RDEPEND=sys-libs/glibc
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=all-sfx? ( https://www.rarlab.com/rar/rarlinux-x64-624.tar.gz https://www.rarlab.com/rar/rarlinux-x32-624.tar.gz https://www.rarlab.com/rar/winrar-x64-624.exe ) amd64? ( https://www.rarlab.com/rar/rarlinux-x64-624.tar.gz ) x86? ( https://www.rarlab.com/rar/rarlinux-x32-624.tar.gz )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09
-_md5_=e3ba81e9faf211a89b50dda2560e2647
diff --git a/metadata/md5-cache/app-arch/rar-7.00 b/metadata/md5-cache/app-arch/rar-7.00
index a87600a47e57..f6f30493e51c 100644
--- a/metadata/md5-cache/app-arch/rar-7.00
+++ b/metadata/md5-cache/app-arch/rar-7.00
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.rarlab.com/
 INHERIT=unpacker
 IUSE=all-sfx
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=BSD BSD-2 RAR
 RDEPEND=sys-libs/glibc
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=all-sfx? ( https://www.rarlab.com/rar/rarlinux-x64-700.tar.gz https://www.rarlab.com/rar/rarlinux-x32-700.tar.gz https://www.rarlab.com/rar/winrar-x64-700.exe ) amd64? ( https://www.rarlab.com/rar/rarlinux-x64-700.tar.gz ) x86? ( https://www.rarlab.com/rar/rarlinux-x32-700.tar.gz )
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09
-_md5_=59c671d33f1c9e2d9ec96ff56481e292
+_md5_=66ea18855d7a34ff5898cc738efaece4
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 8881911b71f5..11f42ef5e122 100644
--- a/metadata/md5-cache/app-benchmarks/Manifest.gz
+++ b/metadata/md5-cache/app-benchmarks/Manifest.gz
diff --git a/metadata/md5-cache/app-benchmarks/geekbench-2.4.2-r1 b/metadata/md5-cache/app-benchmarks/geekbench-2.4.2-r1
index 592a082bd1f7..fa97f4e60ca3 100644
--- a/metadata/md5-cache/app-benchmarks/geekbench-2.4.2-r1
+++ b/metadata/md5-cache/app-benchmarks/geekbench-2.4.2-r1
@@ -7,4 +7,4 @@ LICENSE=geekbench
 RESTRICT=bindist mirror
 SLOT=2
 SRC_URI=https://cdn.primatelabs.com/Geekbench-2.4.2-LinuxARM.tar.gz
-_md5_=50cc8196c6fe67ac4453103b02b8639e
+_md5_=41aa33e54aa5371e0d7b79f13e8bb6e6
diff --git a/metadata/md5-cache/app-benchmarks/geekbench-2.4.3-r1 b/metadata/md5-cache/app-benchmarks/geekbench-2.4.3-r1
index 048b33f9f42d..cf10826e0f02 100644
--- a/metadata/md5-cache/app-benchmarks/geekbench-2.4.3-r1
+++ b/metadata/md5-cache/app-benchmarks/geekbench-2.4.3-r1
@@ -7,4 +7,4 @@ LICENSE=geekbench
 RESTRICT=bindist mirror
 SLOT=2
 SRC_URI=https://cdn.primatelabs.com/Geekbench-2.4.3-Linux.tar.gz
-_md5_=9812b81a964405199ff195bf242718fe
+_md5_=7363d566535e3e20e97ce450eb2aef68
diff --git a/metadata/md5-cache/app-benchmarks/geekbench-3.4.4 b/metadata/md5-cache/app-benchmarks/geekbench-3.4.4
index 0b5cc6109e53..ec821569a690 100644
--- a/metadata/md5-cache/app-benchmarks/geekbench-3.4.4
+++ b/metadata/md5-cache/app-benchmarks/geekbench-3.4.4
@@ -7,4 +7,4 @@ LICENSE=geekbench
 RESTRICT=bindist mirror
 SLOT=3
 SRC_URI=https://cdn.geekbench.com/Geekbench-3.4.4-Linux.tar.gz
-_md5_=e2b941f657df24133f7d2aab2d04d25c
+_md5_=b77bc7d1b58ff6e386b3689921acd90c
diff --git a/metadata/md5-cache/app-benchmarks/geekbench-4.4.4 b/metadata/md5-cache/app-benchmarks/geekbench-4.4.4
index 6866eecc5dee..6b78adbc6326 100644
--- a/metadata/md5-cache/app-benchmarks/geekbench-4.4.4
+++ b/metadata/md5-cache/app-benchmarks/geekbench-4.4.4
@@ -7,4 +7,4 @@ LICENSE=geekbench
 RESTRICT=bindist mirror
 SLOT=4
 SRC_URI=https://cdn.geekbench.com/Geekbench-4.4.4-Linux.tar.gz
-_md5_=3b735ad13bec4bfcdcc7f0e5bfa4e3d4
+_md5_=acd90e7da826dd236d2e55626d265e49
diff --git a/metadata/md5-cache/app-benchmarks/geekbench-5.5.1 b/metadata/md5-cache/app-benchmarks/geekbench-5.5.1
index ff9cbf968990..d76717238727 100644
--- a/metadata/md5-cache/app-benchmarks/geekbench-5.5.1
+++ b/metadata/md5-cache/app-benchmarks/geekbench-5.5.1
@@ -7,4 +7,4 @@ LICENSE=geekbench
 RESTRICT=bindist mirror
 SLOT=5
 SRC_URI=amd64? ( https://cdn.geekbench.com/Geekbench-5.5.1-Linux.tar.gz ) arm64? ( https://cdn.geekbench.com/Geekbench-5.5.1-LinuxARMPreview.tar.gz )
-_md5_=9cad4d931336020fe884d484bd6f451d
+_md5_=7376d2aea866629c12967bc8d71f52cc
diff --git a/metadata/md5-cache/app-benchmarks/geekbench-6.2.2 b/metadata/md5-cache/app-benchmarks/geekbench-6.2.2
index 66f06adb356e..baf295e29927 100644
--- a/metadata/md5-cache/app-benchmarks/geekbench-6.2.2
+++ b/metadata/md5-cache/app-benchmarks/geekbench-6.2.2
@@ -7,4 +7,4 @@ LICENSE=geekbench
 RESTRICT=bindist mirror
 SLOT=6
 SRC_URI=amd64? ( https://cdn.geekbench.com/Geekbench-6.2.2-Linux.tar.gz ) arm64? ( https://cdn.geekbench.com/Geekbench-6.2.2-LinuxARMPreview.tar.gz )
-_md5_=2cbf301d0c132f01f2ee3e3893ee9072
+_md5_=4e61d362134042266ffd044d931aadf7
diff --git a/metadata/md5-cache/app-benchmarks/geekbench-6.3.0 b/metadata/md5-cache/app-benchmarks/geekbench-6.3.0
new file mode 100644
index 000000000000..c163d5adbb58
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/geekbench-6.3.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install nofetch postinst
+DESCRIPTION=A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows
+EAPI=8
+HOMEPAGE=https://www.geekbench.com/
+KEYWORDS=-* ~amd64 ~arm64
+LICENSE=geekbench
+RESTRICT=bindist mirror
+SLOT=6
+SRC_URI=amd64? ( https://cdn.geekbench.com/Geekbench-6.3.0-Linux.tar.gz ) arm64? ( https://cdn.geekbench.com/Geekbench-6.3.0-LinuxARMPreview.tar.gz )
+_md5_=5389a0e673ec0e6df9aee5c91335d941
diff --git a/metadata/md5-cache/app-benchmarks/stress-ng-0.17.06 b/metadata/md5-cache/app-benchmarks/stress-ng-0.17.07
index dbeb99ed866b..567a8526bd9e 100644
--- a/metadata/md5-cache/app-benchmarks/stress-ng-0.17.06
+++ b/metadata/md5-cache/app-benchmarks/stress-ng-0.17.07
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-libs/libcap sys-libs/zlib virtual/libcrypt:= apparmor? ( sys-apps/apparmor-utils sys-libs/libapparmor ) jpeg? ( media-libs/libjpeg-turbo:= ) keyutils? ( sys-apps/keyutils:= ) sctp? ( net-misc/lksctp-tools )
 SLOT=0
-SRC_URI=https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V0.17.06.tar.gz -> stress-ng-0.17.06.tar.gz
+SRC_URI=https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V0.17.07.tar.gz -> stress-ng-0.17.07.tar.gz
 _eclasses_=linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=15f1a6c0430c37df27e72f46167433e4
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index b7738c4ff6c7..968d7bfe8313 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/earthly-0.8.5 b/metadata/md5-cache/app-containers/earthly-0.8.5
index 02184a551ed6..05cb8be13520 100644
--- a/metadata/md5-cache/app-containers/earthly-0.8.5
+++ b/metadata/md5-cache/app-containers/earthly-0.8.5
@@ -4,11 +4,11 @@ DESCRIPTION=Build automation tool that executes in containers
 EAPI=8
 HOMEPAGE=https://earthly.dev/ https://github.com/earthly/earthly/
 INHERIT=go-module
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MPL-2.0
 RDEPEND=|| ( app-containers/docker app-containers/podman )
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/earthly/earthly/archive/v0.8.5.tar.gz -> earthly-0.8.5.tar.gz https://dev.gentoo.org/~xgqt/distfiles/deps/earthly-0.8.5-deps.tar.xz
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	go-env	14f8f70fe58c14d7ab44fff15a05ac47	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=cc7b27b6e3502a9a52940da03c28e5cf
+_md5_=9d57bd2425f6c80a28fc09765c05c3c8
diff --git a/metadata/md5-cache/app-containers/earthly-0.8.8 b/metadata/md5-cache/app-containers/earthly-0.8.8
new file mode 100644
index 000000000000..24efa36054ad
--- /dev/null
+++ b/metadata/md5-cache/app-containers/earthly-0.8.8
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.20:= app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Build automation tool that executes in containers
+EAPI=8
+HOMEPAGE=https://earthly.dev/ https://github.com/earthly/earthly/
+INHERIT=go-module unpacker
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=|| ( app-containers/docker app-containers/podman )
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/earthly/earthly/archive/v0.8.8.tar.gz -> earthly-0.8.8.tar.gz https://dev.gentoo.org/~xgqt/distfiles/deps/earthly-0.8.8-deps.tar.zst
+_eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	go-env	14f8f70fe58c14d7ab44fff15a05ac47	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09
+_md5_=aca6f2f393ac1e03f9560ecf00acdf48
diff --git a/metadata/md5-cache/app-containers/podman-5.0.0 b/metadata/md5-cache/app-containers/podman-5.0.2
index d893dfd53e65..46ef85505b37 100644
--- a/metadata/md5-cache/app-containers/podman-5.0.0
+++ b/metadata/md5-cache/app-containers/podman-5.0.2
@@ -11,6 +11,6 @@ LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
 RDEPEND=app-containers/catatonit >=app-containers/conmon-2.1.10 >=app-containers/containers-common-0.58.0-r1 app-crypt/gpgme:= dev-libs/libassuan:= dev-libs/libgpg-error:= sys-apps/shadow:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) wrapper? ( !app-containers/docker-cli ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= ) systemd? ( sys-apps/systemd:= ) virtual/tmpfiles
 RESTRICT=test strip
 SLOT=0
-SRC_URI=https://github.com/containers/podman/archive/v5.0.0.tar.gz -> podman-5.0.0.tar.gz
+SRC_URI=https://github.com/containers/podman/archive/v5.0.2.tar.gz -> podman-5.0.2.tar.gz
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	go-env	14f8f70fe58c14d7ab44fff15a05ac47	go-module	83fd3ed1657cfc316c93d6a37018290d	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=618f4d7f64cb156cd1e2c99d4ba560f2
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 7fbafb8db255..f48d2538cc6c 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/consult-1.4 b/metadata/md5-cache/app-emacs/consult-1.4
index 12547e420d82..e18cd7532de8 100644
--- a/metadata/md5-cache/app-emacs/consult-1.4
+++ b/metadata/md5-cache/app-emacs/consult-1.4
@@ -4,10 +4,10 @@ DESCRIPTION=Consulting complete-read for GNU Emacs
 EAPI=8
 HOMEPAGE=https://github.com/minad/consult/
 INHERIT=elisp
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-emacs/compat-28.1 >=app-editors/emacs-27:*
 SLOT=0
 SRC_URI=https://github.com/minad/consult/archive/1.4.tar.gz -> consult-1.4.tar.gz
 _eclasses_=elisp	fbefa95f5e9ab880a34bc69832b7c0d7	elisp-common	b5740ee671dad911400f832fe315a9a5
-_md5_=ace9cc74d7d7d50f786d50f703371db7
+_md5_=8f3d8575ed1f4c94b2f83764d3053b66
diff --git a/metadata/md5-cache/app-emacs/eldev-1.9.1 b/metadata/md5-cache/app-emacs/eldev-1.9.1
index 23d209c723dd..9c385aeec4af 100644
--- a/metadata/md5-cache/app-emacs/eldev-1.9.1
+++ b/metadata/md5-cache/app-emacs/eldev-1.9.1
@@ -4,10 +4,10 @@ DESCRIPTION=Emacs Lisp Development Tool
 EAPI=8
 HOMEPAGE=https://emacs-eldev.github.io/eldev/ https://github.com/doublep/eldev/
 INHERIT=elisp
-KEYWORDS=~amd64 ~arm ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~ppc64 ~riscv ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25.3:*
 SLOT=0
 SRC_URI=https://github.com/doublep/eldev/archive/1.9.1.tar.gz -> eldev-1.9.1.tar.gz
 _eclasses_=elisp	fbefa95f5e9ab880a34bc69832b7c0d7	elisp-common	b5740ee671dad911400f832fe315a9a5
-_md5_=1e0dc597e72b45e775a3f4f6592f88d8
+_md5_=5f48f2d17a0d47aedf21f428ea6b4cdc
diff --git a/metadata/md5-cache/app-emacs/jinx-1.4 b/metadata/md5-cache/app-emacs/jinx-1.4
index 5cb531e2786d..b4c36ef9805b 100644
--- a/metadata/md5-cache/app-emacs/jinx-1.4
+++ b/metadata/md5-cache/app-emacs/jinx-1.4
@@ -5,10 +5,10 @@ DESCRIPTION=Enchanted Spell Checker for GNU Emacs
 EAPI=8
 HOMEPAGE=https://github.com/minad/jinx
 INHERIT=edo elisp toolchain-funcs
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3+
 RDEPEND=app-text/enchant:2 >=app-emacs/compat-29.1.4.0 >=app-editors/emacs-27.1:*
 SLOT=0
 SRC_URI=https://github.com/minad/jinx/archive/refs/tags/1.4.tar.gz -> jinx-1.4.tar.gz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	elisp	fbefa95f5e9ab880a34bc69832b7c0d7	elisp-common	b5740ee671dad911400f832fe315a9a5	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a34a6b48717bd633554d3d3ccc050baa
+_md5_=f67bbaeb4f47f65587ecd60392a28938
diff --git a/metadata/md5-cache/app-emacs/muse-3.20.2 b/metadata/md5-cache/app-emacs/muse-3.20.2
index 4a9bac5b0c90..9bfdb0069594 100644
--- a/metadata/md5-cache/app-emacs/muse-3.20.2
+++ b/metadata/md5-cache/app-emacs/muse-3.20.2
@@ -4,10 +4,10 @@ DESCRIPTION=An authoring and publishing environment for Emacs
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/emacs-muse/
 INHERIT=elisp
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-3+ FDL-1.2+ GPL-2 MIT
 RDEPEND=app-emacs/htmlize >=app-editors/emacs-25.3:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~xgqt/distfiles/repackaged/muse-3.20.2.tar.xz
 _eclasses_=elisp	fbefa95f5e9ab880a34bc69832b7c0d7	elisp-common	b5740ee671dad911400f832fe315a9a5
-_md5_=7e0d0cbe5fdcefb53fa85d68e0e0e290
+_md5_=79904d8c142c97936d4b162272fc1a9f
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index cb53649903df..9842cdeb0929 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/virtualbox-7.0.16 b/metadata/md5-cache/app-emulation/virtualbox-7.0.16
new file mode 100644
index 000000000000..1f23701a60c1
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-7.0.16
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) >=app-arch/tar-1.34-r2 >=dev-lang/yasm-0.6.2 dev-libs/libIDL dev-util/glslang >=dev-build/kbuild-0.1.9998.3592 sys-apps/which sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 app-text/docbook-xsl-ns-stylesheets dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra dev-qt/qthelp:5 ) gui? ( dev-qt/linguist-tools:5 ) nls? ( dev-qt/linguist-tools:5 ) java? ( virtual/jdk:1.8 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-7.0.16 dev-libs/libtpms dev-libs/libxml2 dev-libs/openssl:0= media-libs/libpng:0= media-libs/libvpx:0= net-misc/curl sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 x11-libs/libX11 x11-libs/libXt opengl? ( dev-qt/qtopengl:5 ) ) lvm? ( sys-fs/lvm2 ) opengl? ( media-libs/libglvnd[X] media-libs/vulkan-loader x11-libs/libX11 x11-libs/libXt ) pam? ( sys-libs/pam ) sdl? ( media-libs/libsdl2[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXt ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] ) vde? ( net-misc/vde ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-libs/libxslt-1.1.19 virtual/libcrypt:= alsa? ( >=media-libs/alsa-lib-1.0.13 ) gui? ( x11-base/xorg-proto x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr ) java? ( virtual/jdk:1.8 ) opengl? ( x11-base/xorg-proto x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr virtual/glu ) sdl? ( x11-libs/libXinerama ) pulseaudio? ( media-libs/libpulse ) udev? ( >=virtual/udev-171 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
+IUSE=alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde vnc java python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64
+LICENSE=GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-7.0.16 dev-libs/libtpms dev-libs/libxml2 dev-libs/openssl:0= media-libs/libpng:0= media-libs/libvpx:0= net-misc/curl sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 x11-libs/libX11 x11-libs/libXt opengl? ( dev-qt/qtopengl:5 ) ) lvm? ( sys-fs/lvm2 ) opengl? ( media-libs/libglvnd[X] media-libs/vulkan-loader x11-libs/libX11 x11-libs/libXt ) pam? ( sys-libs/pam ) sdl? ( media-libs/libsdl2[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXt ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] ) vde? ( net-misc/vde ) vnc? ( >=net-libs/libvncserver-0.9.9 ) gui? ( x11-libs/libxcb:= ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0/7.0
+SRC_URI=https://download.virtualbox.org/virtualbox/7.0.16/VirtualBox-7.0.16.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.16.tar.bz2 gui? ( !doc? ( https://dev.gentoo.org/~ceamac/app-emulation/virtualbox/virtualbox-help-7.0.16.tar.xz ) )
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	b346c3901e71ba37137bae0b25b00221	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=3b92d3d46b9c1962b6104d4959a893a2
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-7.0.16 b/metadata/md5-cache/app-emulation/virtualbox-additions-7.0.16
new file mode 100644
index 000000000000..c72b4796ab53
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-7.0.16
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=CD image containing guest additions for VirtualBox
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64
+LICENSE=GPL-3 || ( GPL-3 CDDL )
+SLOT=0/7.0
+SRC_URI=https://download.virtualbox.org/virtualbox/7.0.16/VBoxGuestAdditions_7.0.16.iso
+_md5_=0f2f584bc2bbcfa01b0200366bfdb316
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-7.0.16 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-7.0.16
new file mode 100644
index 000000000000..d1e9bfa58f23
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-7.0.16
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=PUEL extensions for VirtualBox
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64
+LICENSE=PUEL-11
+RDEPEND=|| ( =app-emulation/virtualbox-7.0.16* =app-emulation/virtualbox-kvm-7.0.16* )
+RESTRICT=bindist mirror strip
+SLOT=0/7.0
+SRC_URI=https://download.virtualbox.org/virtualbox/7.0.16/Oracle_VM_VirtualBox_Extension_Pack-7.0.16.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-7.0.16.tar.gz
+_md5_=3a927e53d95e4fe6eb39e3ebc70567f1
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-7.0.16 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-7.0.16
new file mode 100644
index 000000000000..99070439a41f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-7.0.16
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/yasm-0.6.2 >=dev-build/kbuild-0.1.9998.3127 sys-devel/bin86 sys-power/iasl sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig ) virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest sys-libs/pam sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) gui? ( x11-libs/libICE x11-libs/libSM x11-libs/libXau x11-libs/libXdmcp x11-base/xorg-proto ) virtual/linux-sources
+DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+IDEPEND=sys-apps/kmod[tools]
+INHERIT=edo linux-mod-r1 readme.gentoo-r1 systemd toolchain-funcs udev
+IUSE=+dbus gui dist-kernel modules-compress modules-sign +strip
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 LGPL-2.1+ MIT || ( GPL-3 CDDL )
+RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest sys-libs/pam sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+SLOT=0/7.0
+SRC_URI=https://download.virtualbox.org/virtualbox/7.0.16/VirtualBox-7.0.16.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.16.tar.bz2
+_eclasses_=dist-kernel-utils	145861da258122cbba5240a850f1a5e8	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	7ca3057b277f1e5978947b4cc289ce62	linux-mod-r1	137b318f89f77c2b66124fcc7790737a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=273545c079575d7f709bf68e967fa28f
diff --git a/metadata/md5-cache/app-emulation/virtualbox-kvm-7.0.16_pre20240325 b/metadata/md5-cache/app-emulation/virtualbox-kvm-7.0.16_pre20240325
new file mode 100644
index 000000000000..787c8a08cd0d
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-kvm-7.0.16_pre20240325
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) >=app-arch/tar-1.34-r2 >=dev-lang/yasm-0.6.2 dev-libs/libIDL dev-util/glslang >=dev-build/kbuild-0.1.9998.3592 sys-apps/which sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 app-text/docbook-xsl-ns-stylesheets dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra dev-qt/qthelp:5 ) gui? ( dev-qt/linguist-tools:5 ) nls? ( dev-qt/linguist-tools:5 ) java? ( virtual/jdk:1.8 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) acct-group/vboxusers dev-libs/libtpms dev-libs/libxml2 dev-libs/openssl:0= media-libs/libpng:0= media-libs/libvpx:0= net-misc/curl sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 x11-libs/libX11 x11-libs/libXt opengl? ( dev-qt/qtopengl:5 ) ) lvm? ( sys-fs/lvm2 ) opengl? ( media-libs/libglvnd[X] media-libs/vulkan-loader x11-libs/libX11 x11-libs/libXt ) pam? ( sys-libs/pam ) sdl? ( media-libs/libsdl2[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXt ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] ) vde? ( net-misc/vde ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-libs/libxslt-1.1.19 virtual/libcrypt:= alsa? ( >=media-libs/alsa-lib-1.0.13 ) gui? ( x11-base/xorg-proto x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr ) java? ( virtual/jdk:1.8 ) opengl? ( x11-base/xorg-proto x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr virtual/glu ) sdl? ( x11-libs/libXinerama ) pulseaudio? ( media-libs/libpulse ) udev? ( >=virtual/udev-171 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/ https://github.com/cyberus-technology/virtualbox-kvm
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
+IUSE=alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde vnc java python_single_target_python3_10 python_single_target_python3_11
+LICENSE=GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )
+RDEPEND=!app-emulation/virtualbox python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) acct-group/vboxusers dev-libs/libtpms dev-libs/libxml2 dev-libs/openssl:0= media-libs/libpng:0= media-libs/libvpx:0= net-misc/curl sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 x11-libs/libX11 x11-libs/libXt opengl? ( dev-qt/qtopengl:5 ) ) lvm? ( sys-fs/lvm2 ) opengl? ( media-libs/libglvnd[X] media-libs/vulkan-loader x11-libs/libX11 x11-libs/libXt ) pam? ( sys-libs/pam ) sdl? ( media-libs/libsdl2[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXt ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] ) vde? ( net-misc/vde ) vnc? ( >=net-libs/libvncserver-0.9.9 ) gui? ( x11-libs/libxcb:= ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.16.tar.bz2 https://github.com/cyberus-technology/virtualbox-kvm/archive/dev-20240325.tar.gz -> virtualbox-kvm-7.0.16_pre20240325.tar.gz https://download.virtualbox.org/virtualbox/7.0.16/VirtualBox-7.0.16.tar.bz2 gui? ( !doc? ( https://dev.gentoo.org/~ceamac/app-emulation/virtualbox/virtualbox-help-7.0.16.tar.xz ) )
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	b346c3901e71ba37137bae0b25b00221	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=b0718befa643cf3664ca9df868101f68
diff --git a/metadata/md5-cache/app-emulation/virtualbox-kvm-9999 b/metadata/md5-cache/app-emulation/virtualbox-kvm-9999
index 4de495957a17..c5b2d216e4aa 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-kvm-9999
+++ b/metadata/md5-cache/app-emulation/virtualbox-kvm-9999
@@ -12,6 +12,6 @@ PROPERTIES=live
 RDEPEND=!app-emulation/virtualbox python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) acct-group/vboxusers dev-libs/libtpms dev-libs/libxml2 dev-libs/openssl:0= media-libs/libpng:0= media-libs/libvpx:0= net-misc/curl sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 x11-libs/libX11 x11-libs/libXt opengl? ( dev-qt/qtopengl:5 ) ) lvm? ( sys-fs/lvm2 ) opengl? ( media-libs/libglvnd[X] media-libs/vulkan-loader x11-libs/libX11 x11-libs/libXt ) pam? ( sys-libs/pam ) sdl? ( media-libs/libsdl2[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXt ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] ) vde? ( net-misc/vde ) vnc? ( >=net-libs/libvncserver-0.9.9 ) gui? ( x11-libs/libxcb:= ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.14.tar.bz2 https://download.virtualbox.org/virtualbox/7.0.14/VirtualBox-7.0.14.tar.bz2 gui? ( !doc? ( https://dev.gentoo.org/~ceamac/app-emulation/virtualbox/virtualbox-help-7.0.14.tar.xz ) )
+SRC_URI=https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.16.tar.bz2 https://download.virtualbox.org/virtualbox/7.0.16/VirtualBox-7.0.16.tar.bz2 gui? ( !doc? ( https://dev.gentoo.org/~ceamac/app-emulation/virtualbox/virtualbox-help-7.0.16.tar.xz ) )
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	git-r3	fbb2889c81f3a05910c1524db69425c1	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	b346c3901e71ba37137bae0b25b00221	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=72bee4ca5cf6f36fa96b400eb14230d5
+_md5_=b0718befa643cf3664ca9df868101f68
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-7.0.16 b/metadata/md5-cache/app-emulation/virtualbox-modules-7.0.16
new file mode 100644
index 000000000000..d65196c8978c
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-7.0.16
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig )
+DEFINED_PHASES=compile install postinst setup
+DEPEND=virtual/linux-sources
+DESCRIPTION=Kernel Modules for Virtualbox
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+IDEPEND=sys-apps/kmod[tools]
+INHERIT=linux-mod-r1
+IUSE=dist-kernel modules-compress modules-sign +strip
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+SLOT=0/7.0
+SRC_URI=https://dev.gentoo.org/~ceamac/app-emulation/virtualbox-modules/vbox-kernel-module-src-7.0.16.tar.xz
+_eclasses_=dist-kernel-utils	145861da258122cbba5240a850f1a5e8	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	7ca3057b277f1e5978947b4cc289ce62	linux-mod-r1	137b318f89f77c2b66124fcc7790737a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=df6786a8dabc970bf428f6056a910b05
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index c5b4378b1e4e..d1143946bc96 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/scim-uim-0.2.0-r3 b/metadata/md5-cache/app-i18n/scim-uim-0.2.0-r3
index 2a5ea9be911e..175786a55b21 100644
--- a/metadata/md5-cache/app-i18n/scim-uim-0.2.0-r3
+++ b/metadata/md5-cache/app-i18n/scim-uim-0.2.0-r3
@@ -5,10 +5,10 @@ DESCRIPTION=An input module for Smart Common Input Method (SCIM) which uses uim
 EAPI=8
 HOMEPAGE=http://www.scim-im.org/
 INHERIT=autotools
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=>=app-i18n/uim-1.5.0 >=app-i18n/scim-1.4.0 dev-libs/libltdl
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-uim-0.2.0.tar.gz
 _eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=c9fbfa288fe83ce522e35b380ef2b502
+_md5_=5ad93545360c4f3d3ad60c50d891ec2a
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index b83aeacae819..0e229c3f55cd 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/fr24feed-1.0.34_p0 b/metadata/md5-cache/app-misc/fr24feed-1.0.34_p0
deleted file mode 100644
index 05146ed6c90a..000000000000
--- a/metadata/md5-cache/app-misc/fr24feed-1.0.34_p0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Flightradar24 data sharing software
-EAPI=8
-HOMEPAGE=https://www.flightradar24.com/share-your-data
-KEYWORDS=-* amd64 x86
-LICENSE=Flightradar24
-RDEPEND=net-wireless/dump1090 virtual/libusb:1
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://repo-feed.flightradar24.com/linux_x86_64_binaries/fr24feed_1.0.34-0_amd64.tgz ) x86? ( https://repo-feed.flightradar24.com/linux_x86_binaries/fr24feed_1.0.34-0_i386.tgz )
-_md5_=4a55c6bdb1bba5e127ad31f28999b8ca
diff --git a/metadata/md5-cache/app-misc/fr24feed-1.0.46_p2 b/metadata/md5-cache/app-misc/fr24feed-1.0.46_p2
index f3eef9a72550..2d62483acba0 100644
--- a/metadata/md5-cache/app-misc/fr24feed-1.0.46_p2
+++ b/metadata/md5-cache/app-misc/fr24feed-1.0.46_p2
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Flightradar24 data sharing software
 EAPI=8
 HOMEPAGE=https://www.flightradar24.com/share-your-data
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=Flightradar24
 RDEPEND=net-wireless/dump1090
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://repo-feed.flightradar24.com/linux_binaries/fr24feed_1.0.46-2_amd64.tgz ) x86? ( https://repo-feed.flightradar24.com/linux_binaries/fr24feed_1.0.46-2_i386.tgz )
-_md5_=b1a81538978aa9f2d2de08ecc94887c7
+_md5_=dcd3e7a95b549070543e5391116655c3
diff --git a/metadata/md5-cache/app-misc/jq-1.7 b/metadata/md5-cache/app-misc/jq-1.7
deleted file mode 100644
index 7cc30e7a2d81..000000000000
--- a/metadata/md5-cache/app-misc/jq-1.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20240116 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3
-DEFINED_PHASES=configure install prepare test
-DEPEND=>=sys-devel/bison-3.0 app-alternatives/lex oniguruma? ( >=dev-libs/oniguruma-6.9.3:=[static-libs?] )
-DESCRIPTION=A lightweight and flexible command-line JSON processor
-EAPI=8
-HOMEPAGE=https://stedolan.github.io/jq/
-INHERIT=autotools
-IUSE=+oniguruma static-libs test
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris
-LICENSE=MIT CC-BY-3.0
-RDEPEND=!static-libs? ( oniguruma? ( >=dev-libs/oniguruma-6.9.3[static-libs?] ) )
-REQUIRED_USE=test? ( oniguruma )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jqlang/jq/archive/refs/tags/jq-1.7.tar.gz -> jq-1.7.gh.tar.gz
-_eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=c3a58179976ea5a1b7076bf9b86431e7
diff --git a/metadata/md5-cache/app-misc/jq-1.7.1 b/metadata/md5-cache/app-misc/jq-1.7.1
index 86f9270210bb..475f1ef8324e 100644
--- a/metadata/md5-cache/app-misc/jq-1.7.1
+++ b/metadata/md5-cache/app-misc/jq-1.7.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://stedolan.github.io/jq/
 INHERIT=autotools
 IUSE=+oniguruma static-libs test
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris
 LICENSE=MIT CC-BY-3.0
 RDEPEND=!static-libs? ( oniguruma? ( >=dev-libs/oniguruma-6.9.3[static-libs?] ) )
 REQUIRED_USE=test? ( oniguruma )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jqlang/jq/archive/refs/tags/jq-1.7.1.tar.gz -> jq-1.7.1.gh.tar.gz
 _eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=5d2cf97599ee25926568d3cf9509fb05
+_md5_=c3a58179976ea5a1b7076bf9b86431e7
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 2fed11c4604d..9bc654aff21d 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/moneydance-2023.3.5064 b/metadata/md5-cache/app-office/moneydance-2024.5117
index f2dc922c4d59..8e49f63ada12 100644
--- a/metadata/md5-cache/app-office/moneydance-2023.3.5064
+++ b/metadata/md5-cache/app-office/moneydance-2024.5117
@@ -9,6 +9,6 @@ LICENSE=Apache-1.0 Apache-2.0 BSD CPAL-1.0 CPL-1.0 CSL-2.0 LGPL-2 MIT TIK
 RDEPEND=|| ( dev-java/openjdk-bin:17 dev-java/openjdk:17 ) >=dev-java/java-config-2.2.0-r3
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=https://infinitekind.com/stabledl/2023.3_5064/Moneydance_linux_amd64.tar.gz -> moneydance-2023.3.5064-amd64.tar.gz
+SRC_URI=https://infinitekind.com/stabledl/2024_5117/Moneydance_linux_amd64.tar.gz -> moneydance-2024.5117-amd64.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=911c0e3b1a4412186c309840bd7f0e9c
+_md5_=388245e45ccde3e9d12e8a9e40094edf
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 9bbb0c826481..990f35642bca 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/elt-patches-20240315 b/metadata/md5-cache/app-portage/elt-patches-20240315
index 8ddcbf39f87b..dfe5f9d6b95f 100644
--- a/metadata/md5-cache/app-portage/elt-patches-20240315
+++ b/metadata/md5-cache/app-portage/elt-patches-20240315
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Collection of patches for libtool.eclass
 EAPI=8
 HOMEPAGE=https://gitweb.gentoo.org/proj/elt-patches.git/
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~grobian/distfiles/elt-patches-20240315.tar.xz https://dev.gentoo.org/~vapier/dist/elt-patches-20240315.tar.xz https://dev.gentoo.org/~sam/distfiles/app-portage/elt-patches/elt-patches-20240315.tar.xz
-_md5_=872b98e2d2d942c06037bf9af5f8342a
+_md5_=418cb762b392927b5de5fe23620d1509
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index b0c1ab57c2c5..b37cd95ac455 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/calibre-7.6.0 b/metadata/md5-cache/app-text/calibre-7.6.0
index 17ed3a82a4a1..81d8a7e35f70 100644
--- a/metadata/md5-cache/app-text/calibre-7.6.0
+++ b/metadata/md5-cache/app-text/calibre-7.6.0
@@ -7,7 +7,7 @@ HOMEPAGE=https://calibre-ebook.com/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=edo toolchain-funcs python-single-r1 qmake-utils verify-sig xdg
 IUSE=+font-subsetting ios speech +system-mathjax test +udisks unrar python_single_target_python3_10 python_single_target_python3_11 verify-sig
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2
 RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[sqlite,ssl] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite,ssl] ) app-i18n/uchardet >=app-text/hunspell-1.7:= >=app-text/podofo-0.10.0:= app-text/poppler[utils] dev-libs/hyphen:= >=dev-libs/icu-57.1:= dev-libs/openssl:= dev-libs/snowball-stemmer:= python_single_target_python3_10? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_10(-)] dev-python/dnspython[python_targets_python3_10(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_10(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_10(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_10(-)] dev-python/jeepney[python_targets_python3_10(-)] >=dev-python/lxml-3.8.0[python_targets_python3_10(-)] >=dev-python/markdown-3.0.1[python_targets_python3_10(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_10(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_10(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_10(-)] >=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,python_targets_python3_10(-)] >=dev-python/psutil-4.3.0[python_targets_python3_10(-)] >=dev-python/pychm-0.8.6[python_targets_python3_10(-)] >=dev-python/pygments-2.3.1[python_targets_python3_10(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_10(-)] dev-python/PyQt6[gui,network,opengl,printsupport,quick,svg,widgets,python_targets_python3_10(-)] dev-python/PyQt6-WebEngine[widgets,python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] dev-python/xxhash[python_targets_python3_10(-)] >=dev-python/zeroconf-0.75.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_11(-)] dev-python/beautifulsoup4[python_targets_python3_11(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_11(-)] dev-python/dnspython[python_targets_python3_11(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_11(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_11(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_11(-)] dev-python/jeepney[python_targets_python3_11(-)] >=dev-python/lxml-3.8.0[python_targets_python3_11(-)] >=dev-python/markdown-3.0.1[python_targets_python3_11(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_11(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_11(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_11(-)] >=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,python_targets_python3_11(-)] >=dev-python/psutil-4.3.0[python_targets_python3_11(-)] >=dev-python/pychm-0.8.6[python_targets_python3_11(-)] >=dev-python/pygments-2.3.1[python_targets_python3_11(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_11(-)] dev-python/PyQt6[gui,network,opengl,printsupport,quick,svg,widgets,python_targets_python3_11(-)] dev-python/PyQt6-WebEngine[widgets,python_targets_python3_11(-)] dev-python/regex[python_targets_python3_11(-)] dev-python/xxhash[python_targets_python3_11(-)] >=dev-python/zeroconf-0.75.0[python_targets_python3_11(-)] ) dev-qt/qtbase:6=[gui,widgets] dev-qt/qtimageformats:6 dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-gfx/optipng-0.7.6 virtual/libusb:1= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 font-subsetting? ( python_single_target_python3_10? ( dev-python/fonttools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/fonttools[python_targets_python3_11(-)] ) ) ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) speech? ( python_single_target_python3_10? ( app-accessibility/speech-dispatcher[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-accessibility/speech-dispatcher[python,python_targets_python3_11(-)] ) ) system-mathjax? ( >=dev-libs/mathjax-3:= ) udisks? ( virtual/libudev ) unrar? ( dev-python/unrardll ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.calibre-ebook.com/7.6.0/calibre-7.6.0.tar.xz verify-sig? ( https://calibre-ebook.com/signatures/calibre-7.6.0.tar.xz.sig )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ce6ceea1cb9273ade31d8490702de454
+_md5_=9a61559d4c473a6de1e07e8317d5cd97
diff --git a/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r5 b/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r5
deleted file mode 100644
index 77d74a8ba4be..000000000000
--- a/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20240116 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3
-DEFINED_PHASES=install prepare
-DEPEND=>=dev-lang/perl-5 app-text/docbook-dsssl-stylesheets app-text/docbook-xml-dtd:4.2 app-text/openjade app-text/xhtml1 dev-perl/SGMLSpm ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1 ~app-text/docbook-sgml-dtd-4.2 ~app-text/docbook-sgml-dtd-4.4 ~app-text/docbook-xml-simple-dtd-1.0 ~app-text/docbook-xml-simple-dtd-4.1.2.4 sys-apps/which jadetex? ( dev-texlive/texlive-formatsextra ) || ( www-client/lynx www-client/links www-client/elinks virtual/w3m )
-DESCRIPTION=Shell scripts to manage DocBook documents
-EAPI=7
-HOMEPAGE=https://sourceware.org/docbook-tools/
-INHERIT=autotools prefix
-IUSE=jadetex
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5 app-text/docbook-dsssl-stylesheets app-text/docbook-xml-dtd:4.2 app-text/openjade app-text/xhtml1 dev-perl/SGMLSpm ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1 ~app-text/docbook-sgml-dtd-4.2 ~app-text/docbook-sgml-dtd-4.4 ~app-text/docbook-xml-simple-dtd-1.0 ~app-text/docbook-xml-simple-dtd-4.1.2.4 sys-apps/which jadetex? ( dev-texlive/texlive-formatsextra ) || ( www-client/lynx www-client/links www-client/elinks virtual/w3m )
-SLOT=0
-SRC_URI=https://sourceware.org/pub/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.14.tar.gz
-_eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=e32bbf430a6da5bc7df321fb285c983d
diff --git a/metadata/md5-cache/app-text/foliate-2.6.4-r2 b/metadata/md5-cache/app-text/foliate-2.6.4-r2
deleted file mode 100644
index b123b84de243..000000000000
--- a/metadata/md5-cache/app-text/foliate-2.6.4-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) sys-devel/gettext >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DESCRIPTION=gtk ebook reader built with gjs
-EAPI=8
-HOMEPAGE=https://github.com/johnfactotum/foliate/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=meson python-any-r1 plocale xdg gnome2-utils
-IUSE=handy spell
-KEYWORDS=amd64
-LICENSE=GPL-3+
-RDEPEND=dev-libs/gjs x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-libs/gdk-pixbuf:2[introspection] net-libs/webkit-gtk:4[introspection] sys-devel/gettext handy? ( gui-libs/libhandy:=[introspection] ) spell? ( app-text/gspell[introspection] )
-SLOT=0
-SRC_URI=https://github.com/johnfactotum/foliate/archive/2.6.4.tar.gz -> foliate-2.6.4.tar.gz
-_eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnome2-utils	30dbce54b89e77b86f366548f94419ad	meson	92696988eaddba122c4cedc191f59bcb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	plocale	950fbaec7deeba41b5bcc0572cca99b9	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=44bd8d4fd5a40a5c11244148e8af7fbb
diff --git a/metadata/md5-cache/app-text/foliate-2.6.4-r3 b/metadata/md5-cache/app-text/foliate-2.6.4-r3
deleted file mode 100644
index d153b079cdca..000000000000
--- a/metadata/md5-cache/app-text/foliate-2.6.4-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) sys-devel/gettext >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DESCRIPTION=gtk ebook reader built with gjs
-EAPI=8
-HOMEPAGE=https://github.com/johnfactotum/foliate/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=meson python-any-r1 plocale xdg gnome2-utils
-IUSE=handy spell
-KEYWORDS=amd64
-LICENSE=GPL-3+
-RDEPEND=dev-libs/gjs x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-libs/gdk-pixbuf:2[introspection] net-libs/webkit-gtk:4.1[introspection] sys-devel/gettext handy? ( gui-libs/libhandy:=[introspection] ) spell? ( app-text/gspell[introspection] )
-SLOT=0
-SRC_URI=https://github.com/johnfactotum/foliate/archive/2.6.4.tar.gz -> foliate-2.6.4.tar.gz
-_eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnome2-utils	30dbce54b89e77b86f366548f94419ad	meson	92696988eaddba122c4cedc191f59bcb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	plocale	950fbaec7deeba41b5bcc0572cca99b9	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=179bdc8f7106a092f865a7914595f664
diff --git a/metadata/md5-cache/app-text/foliate-3.0.1 b/metadata/md5-cache/app-text/foliate-3.0.1
deleted file mode 100644
index 8bdb26f32813..000000000000
--- a/metadata/md5-cache/app-text/foliate-3.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DESCRIPTION=gtk ebook reader built with gjs
-EAPI=8
-HOMEPAGE=https://github.com/johnfactotum/foliate/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=meson plocale xdg gnome2-utils
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/gjs-1.76 >=gui-libs/gtk-4.12 gui-libs/libadwaita net-libs/webkit-gtk:6[introspection] sys-devel/gettext
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~grozin/foliate-3.0.1.tar.bz2
-_eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnome2-utils	30dbce54b89e77b86f366548f94419ad	meson	92696988eaddba122c4cedc191f59bcb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	plocale	950fbaec7deeba41b5bcc0572cca99b9	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ad707b8a90dc8bbf03516203fa5fce5f
diff --git a/metadata/md5-cache/app-text/foliate-3.1.0 b/metadata/md5-cache/app-text/foliate-3.1.0
index 9641483ec71f..3cda89a19ad3 100644
--- a/metadata/md5-cache/app-text/foliate-3.1.0
+++ b/metadata/md5-cache/app-text/foliate-3.1.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/johnfactotum/foliate/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=meson plocale xdg gnome2-utils
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/gjs-1.76 >=gui-libs/gtk-4.12 gui-libs/libadwaita net-libs/webkit-gtk:6[introspection] sys-devel/gettext
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~grozin/foliate-3.1.0.tar.bz2
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnome2-utils	30dbce54b89e77b86f366548f94419ad	meson	92696988eaddba122c4cedc191f59bcb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	plocale	950fbaec7deeba41b5bcc0572cca99b9	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bfb620858ace636c8f081dc133b4fcbf
+_md5_=830c4dccdef297328eb8c0a62c407392
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 7bcdd0ea423f..1c52ef186918 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/sqlite-3.45.3 b/metadata/md5-cache/dev-db/sqlite-3.45.3
new file mode 100644
index 000000000000..98c590b2fcc7
--- /dev/null
+++ b/metadata/md5-cache/dev-db/sqlite-3.45.3
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/tcl-8.6:0 app-arch/unzip sys-devel/gnuconfig >=app-portage/elt-patches-20240116 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:= ) test? ( >=dev-lang/tcl-8.6: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(-)?] )
+DESCRIPTION=SQL database engine
+EAPI=8
+HOMEPAGE=https://sqlite.org/
+INHERIT=autotools flag-o-matic multilib-minimal toolchain-funcs
+IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=public-domain
+RDEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:= )
+RESTRICT=!test? ( test )
+SLOT=3
+SRC_URI=https://sqlite.org/2024/sqlite-src-3450300.zip doc? ( https://sqlite.org/2024/sqlite-doc-3450300.zip )
+_eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=36593e5f52aabe882b8cc97025195018
diff --git a/metadata/md5-cache/dev-dotnet/Manifest.gz b/metadata/md5-cache/dev-dotnet/Manifest.gz
index 9969936d9871..5fc583ad8e18 100644
--- a/metadata/md5-cache/dev-dotnet/Manifest.gz
+++ b/metadata/md5-cache/dev-dotnet/Manifest.gz
diff --git a/metadata/md5-cache/dev-dotnet/dotnet-outdated-4.6.1 b/metadata/md5-cache/dev-dotnet/dotnet-outdated-4.6.1
new file mode 100644
index 000000000000..6fea7fa70b83
--- /dev/null
+++ b/metadata/md5-cache/dev-dotnet/dotnet-outdated-4.6.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/dotnet-sdk:8.0 dev-dotnet/csharp-gentoodotnetinfo
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DESCRIPTION=Display and update outdated NuGet packages in a project
+EAPI=8
+HOMEPAGE=https://github.com/dotnet-outdated/dotnet-outdated/
+INHERIT=check-reqs dotnet-pkg
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=virtual/dotnet-sdk:8.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/dotnet-outdated/dotnet-outdated/archive/v4.6.1.tar.gz -> dotnet-outdated-4.6.1.tar.gz https://api.nuget.org/v3-flatcontainer/castle.core/5.0.0/castle.core.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/csvhelper/30.0.1/csvhelper.30.0.1.nupkg https://api.nuget.org/v3-flatcontainer/dotnet-xunit/2.3.1/dotnet-xunit.2.3.1.nupkg https://api.nuget.org/v3-flatcontainer/libuv/1.9.0/libuv.1.9.0.nupkg https://api.nuget.org/v3-flatcontainer/mcmaster.extensions.commandlineutils/4.0.2/mcmaster.extensions.commandlineutils.4.0.2.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/7.0.0/microsoft.bcl.asyncinterfaces.7.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.analyzers/1.1.0/microsoft.codeanalysis.analyzers.1.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.common/1.3.0/microsoft.codeanalysis.common.1.3.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.csharp/1.3.0/microsoft.codeanalysis.csharp.1.3.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.visualbasic/1.3.0/microsoft.codeanalysis.visualbasic.1.3.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codecoverage/17.8.0/microsoft.codecoverage.17.8.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.csharp/4.0.1/microsoft.csharp.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/7.0.0/microsoft.extensions.dependencyinjection.abstractions.7.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection/7.0.0/microsoft.extensions.dependencyinjection.7.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.net.test.sdk/17.8.0/microsoft.net.test.sdk.17.8.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app/1.0.0/microsoft.netcore.app.1.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.dotnethost/1.0.1/microsoft.netcore.dotnethost.1.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.dotnethostpolicy/1.0.1/microsoft.netcore.dotnethostpolicy.1.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.dotnethostresolver/1.0.1/microsoft.netcore.dotnethostresolver.1.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.jit/1.0.2/microsoft.netcore.jit.1.0.2.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.0.1/microsoft.netcore.platforms.1.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.runtime.coreclr/1.0.2/microsoft.netcore.runtime.coreclr.1.0.2.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/1.0.1/microsoft.netcore.targets.1.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.windows.apisets/1.0.1/microsoft.netcore.windows.apisets.1.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.objectmodel/17.8.0/microsoft.testplatform.objectmodel.17.8.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.testhost/17.8.0/microsoft.testplatform.testhost.17.8.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.visualbasic/10.0.1/microsoft.visualbasic.10.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.win32.primitives/4.0.1/microsoft.win32.primitives.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.win32.primitives/4.3.0/microsoft.win32.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.win32.registry/4.0.0/microsoft.win32.registry.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/netstandard.library/1.6.0/netstandard.library.1.6.0.nupkg https://api.nuget.org/v3-flatcontainer/netstandard.library/1.6.1/netstandard.library.1.6.1.nupkg https://api.nuget.org/v3-flatcontainer/newtonsoft.json/13.0.3/newtonsoft.json.13.0.3.nupkg https://api.nuget.org/v3-flatcontainer/nsubstitute/5.0.0/nsubstitute.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/nuget.common/6.8.0/nuget.common.6.8.0.nupkg https://api.nuget.org/v3-flatcontainer/nuget.configuration/6.8.0/nuget.configuration.6.8.0.nupkg https://api.nuget.org/v3-flatcontainer/nuget.credentials/6.8.0/nuget.credentials.6.8.0.nupkg https://api.nuget.org/v3-flatcontainer/nuget.dependencyresolver.core/6.8.0/nuget.dependencyresolver.core.6.8.0.nupkg https://api.nuget.org/v3-flatcontainer/nuget.frameworks/6.5.0/nuget.frameworks.6.5.0.nupkg https://api.nuget.org/v3-flatcontainer/nuget.frameworks/6.8.0/nuget.frameworks.6.8.0.nupkg https://api.nuget.org/v3-flatcontainer/nuget.librarymodel/6.8.0/nuget.librarymodel.6.8.0.nupkg https://api.nuget.org/v3-flatcontainer/nuget.packaging/6.8.0/nuget.packaging.6.8.0.nupkg https://api.nuget.org/v3-flatcontainer/nuget.projectmodel/6.8.0/nuget.projectmodel.6.8.0.nupkg https://api.nuget.org/v3-flatcontainer/nuget.protocol/6.8.0/nuget.protocol.6.8.0.nupkg https://api.nuget.org/v3-flatcontainer/nuget.versioning/6.8.0/nuget.versioning.6.8.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.collections/4.3.0/runtime.any.system.collections.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.diagnostics.tools/4.3.0/runtime.any.system.diagnostics.tools.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.diagnostics.tracing/4.3.0/runtime.any.system.diagnostics.tracing.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.globalization.calendars/4.3.0/runtime.any.system.globalization.calendars.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.globalization/4.3.0/runtime.any.system.globalization.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.io/4.3.0/runtime.any.system.io.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection.extensions/4.3.0/runtime.any.system.reflection.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection.primitives/4.3.0/runtime.any.system.reflection.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection/4.3.0/runtime.any.system.reflection.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.resources.resourcemanager/4.3.0/runtime.any.system.resources.resourcemanager.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime.handles/4.3.0/runtime.any.system.runtime.handles.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime.interopservices/4.3.0/runtime.any.system.runtime.interopservices.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime/4.3.0/runtime.any.system.runtime.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.text.encoding.extensions/4.3.0/runtime.any.system.text.encoding.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.text.encoding/4.3.0/runtime.any.system.text.encoding.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.threading.tasks/4.3.0/runtime.any.system.threading.tasks.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.threading.timer/4.3.0/runtime.any.system.threading.timer.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system.io.compression/4.1.0/runtime.native.system.io.compression.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system.io.compression/4.3.0/runtime.native.system.io.compression.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system.net.http/4.0.1/runtime.native.system.net.http.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system.net.http/4.3.0/runtime.native.system.net.http.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system.net.security/4.0.1/runtime.native.system.net.security.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system.security.cryptography.apple/4.3.0/runtime.native.system.security.cryptography.apple.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system.security.cryptography.openssl/4.3.0/runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system.security.cryptography/4.0.0/runtime.native.system.security.cryptography.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system/4.0.0/runtime.native.system.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system/4.3.0/runtime.native.system.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.microsoft.win32.primitives/4.3.0/runtime.unix.microsoft.win32.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.console/4.3.0/runtime.unix.system.console.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.diagnostics.debug/4.3.0/runtime.unix.system.diagnostics.debug.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.io.filesystem/4.3.0/runtime.unix.system.io.filesystem.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.net.primitives/4.3.0/runtime.unix.system.net.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.net.sockets/4.3.0/runtime.unix.system.net.sockets.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.private.uri/4.3.0/runtime.unix.system.private.uri.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.runtime.extensions/4.3.0/runtime.unix.system.runtime.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.appcontext/4.1.0/system.appcontext.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.appcontext/4.3.0/system.appcontext.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.buffers/4.0.0/system.buffers.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.buffers/4.3.0/system.buffers.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.buffers/4.5.1/system.buffers.4.5.1.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.concurrent/4.0.12/system.collections.concurrent.4.0.12.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.concurrent/4.3.0/system.collections.concurrent.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.immutable/1.2.0/system.collections.immutable.1.2.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections/4.0.11/system.collections.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.collections/4.3.0/system.collections.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.componentmodel.annotations/4.1.0/system.componentmodel.annotations.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.componentmodel.annotations/5.0.0/system.componentmodel.annotations.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.componentmodel/4.0.1/system.componentmodel.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.console/4.0.0/system.console.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.console/4.3.0/system.console.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.debug/4.0.11/system.diagnostics.debug.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.diagnosticsource/4.0.0/system.diagnostics.diagnosticsource.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.diagnosticsource/4.3.0/system.diagnostics.diagnosticsource.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.eventlog/6.0.0/system.diagnostics.eventlog.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.fileversioninfo/4.0.0/system.diagnostics.fileversioninfo.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.process/4.1.0/system.diagnostics.process.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.stacktrace/4.0.1/system.diagnostics.stacktrace.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.tools/4.0.1/system.diagnostics.tools.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.tools/4.3.0/system.diagnostics.tools.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.tracing/4.1.0/system.diagnostics.tracing.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.tracing/4.3.0/system.diagnostics.tracing.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.dynamic.runtime/4.0.11/system.dynamic.runtime.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.formats.asn1/6.0.0/system.formats.asn1.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.globalization.calendars/4.0.1/system.globalization.calendars.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.globalization.calendars/4.3.0/system.globalization.calendars.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.globalization.extensions/4.0.1/system.globalization.extensions.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.globalization.extensions/4.3.0/system.globalization.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.globalization/4.0.11/system.globalization.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.globalization/4.3.0/system.globalization.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.abstractions.testinghelpers/19.2.64/system.io.abstractions.testinghelpers.19.2.64.nupkg https://api.nuget.org/v3-flatcontainer/system.io.abstractions/19.2.64/system.io.abstractions.19.2.64.nupkg https://api.nuget.org/v3-flatcontainer/system.io.compression.zipfile/4.0.1/system.io.compression.zipfile.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.io.compression.zipfile/4.3.0/system.io.compression.zipfile.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.compression/4.1.0/system.io.compression.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.compression/4.3.0/system.io.compression.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.filesystem.accesscontrol/5.0.0/system.io.filesystem.accesscontrol.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.filesystem.primitives/4.0.1/system.io.filesystem.primitives.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.io.filesystem.primitives/4.3.0/system.io.filesystem.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.filesystem.watcher/4.0.0/system.io.filesystem.watcher.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.filesystem/4.0.1/system.io.filesystem.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.io.filesystem/4.3.0/system.io.filesystem.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.memorymappedfiles/4.0.0/system.io.memorymappedfiles.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.unmanagedmemorystream/4.0.1/system.io.unmanagedmemorystream.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.io/4.1.0/system.io.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io/4.3.0/system.io.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.linq.expressions/4.1.0/system.linq.expressions.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.linq.expressions/4.3.0/system.linq.expressions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.linq.parallel/4.0.1/system.linq.parallel.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.linq.queryable/4.0.1/system.linq.queryable.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.linq/4.1.0/system.linq.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.linq/4.3.0/system.linq.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.memory/4.5.4/system.memory.4.5.4.nupkg https://api.nuget.org/v3-flatcontainer/system.memory/4.5.5/system.memory.4.5.5.nupkg https://api.nuget.org/v3-flatcontainer/system.net.http/4.1.0/system.net.http.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.net.http/4.3.0/system.net.http.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.net.nameresolution/4.0.0/system.net.nameresolution.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.net.nameresolution/4.3.0/system.net.nameresolution.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.net.primitives/4.0.11/system.net.primitives.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.net.primitives/4.3.0/system.net.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.net.requests/4.0.11/system.net.requests.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.net.security/4.0.0/system.net.security.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.net.sockets/4.1.0/system.net.sockets.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.net.sockets/4.3.0/system.net.sockets.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.net.webheadercollection/4.0.1/system.net.webheadercollection.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.numerics.vectors/4.1.1/system.numerics.vectors.4.1.1.nupkg https://api.nuget.org/v3-flatcontainer/system.numerics.vectors/4.4.0/system.numerics.vectors.4.4.0.nupkg https://api.nuget.org/v3-flatcontainer/system.numerics.vectors/4.5.0/system.numerics.vectors.4.5.0.nupkg https://api.nuget.org/v3-flatcontainer/system.objectmodel/4.0.12/system.objectmodel.4.0.12.nupkg https://api.nuget.org/v3-flatcontainer/system.objectmodel/4.3.0/system.objectmodel.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.private.uri/4.3.0/system.private.uri.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.dispatchproxy/4.0.1/system.reflection.dispatchproxy.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit.ilgeneration/4.0.1/system.reflection.emit.ilgeneration.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit.ilgeneration/4.3.0/system.reflection.emit.ilgeneration.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit.lightweight/4.0.1/system.reflection.emit.lightweight.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit.lightweight/4.3.0/system.reflection.emit.lightweight.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit/4.0.1/system.reflection.emit.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit/4.3.0/system.reflection.emit.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.extensions/4.0.1/system.reflection.extensions.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.extensions/4.3.0/system.reflection.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.metadata/1.3.0/system.reflection.metadata.1.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.metadata/1.6.0/system.reflection.metadata.1.6.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.primitives/4.0.1/system.reflection.primitives.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.typeextensions/4.1.0/system.reflection.typeextensions.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.typeextensions/4.3.0/system.reflection.typeextensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection/4.1.0/system.reflection.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection/4.3.0/system.reflection.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.resources.reader/4.0.0/system.resources.reader.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.resources.resourcemanager/4.0.1/system.resources.resourcemanager.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.5.3/system.runtime.compilerservices.unsafe.4.5.3.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/6.0.0/system.runtime.compilerservices.unsafe.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.extensions/4.1.0/system.runtime.extensions.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.handles/4.0.1/system.runtime.handles.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices.runtimeinformation/4.0.0/system.runtime.interopservices.runtimeinformation.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices.runtimeinformation/4.3.0/system.runtime.interopservices.runtimeinformation.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices/4.1.0/system.runtime.interopservices.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.loader/4.0.0/system.runtime.loader.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.numerics/4.0.1/system.runtime.numerics.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.numerics/4.3.0/system.runtime.numerics.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime/4.1.0/system.runtime.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime/4.3.0/system.runtime.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.accesscontrol/5.0.0/system.security.accesscontrol.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.claims/4.0.1/system.security.claims.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.security.claims/4.3.0/system.security.claims.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.algorithms/4.2.0/system.security.cryptography.algorithms.4.2.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.algorithms/4.3.0/system.security.cryptography.algorithms.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/4.2.0/system.security.cryptography.cng.4.2.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/4.3.0/system.security.cryptography.cng.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/5.0.0/system.security.cryptography.cng.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.csp/4.0.0/system.security.cryptography.csp.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.csp/4.3.0/system.security.cryptography.csp.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.encoding/4.0.0/system.security.cryptography.encoding.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.encoding/4.3.0/system.security.cryptography.encoding.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.openssl/4.0.0/system.security.cryptography.openssl.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.openssl/4.3.0/system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.pkcs/6.0.4/system.security.cryptography.pkcs.6.0.4.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.primitives/4.0.0/system.security.cryptography.primitives.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.primitives/4.3.0/system.security.cryptography.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.protecteddata/4.4.0/system.security.cryptography.protecteddata.4.4.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.x509certificates/4.1.0/system.security.cryptography.x509certificates.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.x509certificates/4.3.0/system.security.cryptography.x509certificates.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.0.0/system.security.principal.windows.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.3.0/system.security.principal.windows.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/5.0.0/system.security.principal.windows.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.principal/4.0.1/system.security.principal.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.security.principal/4.3.0/system.security.principal.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding.codepages/4.0.1/system.text.encoding.codepages.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding.extensions/4.0.11/system.text.encoding.extensions.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding.extensions/4.3.0/system.text.encoding.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding/4.0.11/system.text.encoding.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/7.0.0/system.text.encodings.web.7.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.json/7.0.3/system.text.json.7.0.3.nupkg https://api.nuget.org/v3-flatcontainer/system.text.regularexpressions/4.1.0/system.text.regularexpressions.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.regularexpressions/4.3.0/system.text.regularexpressions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.overlapped/4.0.1/system.threading.overlapped.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks.dataflow/4.6.0/system.threading.tasks.dataflow.4.6.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.0.0/system.threading.tasks.extensions.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.3.0/system.threading.tasks.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.5.4/system.threading.tasks.extensions.4.5.4.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks.parallel/4.0.1/system.threading.tasks.parallel.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks/4.0.11/system.threading.tasks.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.thread/4.0.0/system.threading.thread.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.threadpool/4.0.10/system.threading.threadpool.4.0.10.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.threadpool/4.3.0/system.threading.threadpool.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.timer/4.0.1/system.threading.timer.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.timer/4.3.0/system.threading.timer.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading/4.0.11/system.threading.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.threading/4.3.0/system.threading.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.readerwriter/4.0.11/system.xml.readerwriter.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.readerwriter/4.3.0/system.xml.readerwriter.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.xdocument/4.0.11/system.xml.xdocument.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.xdocument/4.3.0/system.xml.xdocument.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.xmldocument/4.0.1/system.xml.xmldocument.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.xpath.xdocument/4.0.1/system.xml.xpath.xdocument.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.xpath/4.0.1/system.xml.xpath.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/testableio.system.io.abstractions.testinghelpers/19.2.64/testableio.system.io.abstractions.testinghelpers.19.2.64.nupkg https://api.nuget.org/v3-flatcontainer/testableio.system.io.abstractions.wrappers/19.2.64/testableio.system.io.abstractions.wrappers.19.2.64.nupkg https://api.nuget.org/v3-flatcontainer/testableio.system.io.abstractions/19.2.64/testableio.system.io.abstractions.19.2.64.nupkg https://api.nuget.org/v3-flatcontainer/xunit.abstractions/2.0.3/xunit.abstractions.2.0.3.nupkg https://api.nuget.org/v3-flatcontainer/xunit.analyzers/1.6.0/xunit.analyzers.1.6.0.nupkg https://api.nuget.org/v3-flatcontainer/xunit.assert/2.6.2/xunit.assert.2.6.2.nupkg https://api.nuget.org/v3-flatcontainer/xunit.core/2.6.2/xunit.core.2.6.2.nupkg https://api.nuget.org/v3-flatcontainer/xunit.extensibility.core/2.6.2/xunit.extensibility.core.2.6.2.nupkg https://api.nuget.org/v3-flatcontainer/xunit.extensibility.execution/2.6.2/xunit.extensibility.execution.2.6.2.nupkg https://api.nuget.org/v3-flatcontainer/xunit.runner.visualstudio/2.5.4/xunit.runner.visualstudio.2.5.4.nupkg https://api.nuget.org/v3-flatcontainer/xunit/2.6.2/xunit.2.6.2.nupkg
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	dotnet-pkg	9f041be16373f3b3c2ad1ae7a7559960	dotnet-pkg-base	3e91bc4d3bc423a7b9dc30a94279901c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	nuget	e90611a22e7a711a49d37cb365b878e8
+_md5_=7291c4370e08fcf9cc643d93a6379400
diff --git a/metadata/md5-cache/dev-dotnet/dotnet-runtime-nugets-6.0.28-r1 b/metadata/md5-cache/dev-dotnet/dotnet-runtime-nugets-6.0.28-r1
index 3523e4ef8f0b..2561f39fe7a3 100644
--- a/metadata/md5-cache/dev-dotnet/dotnet-runtime-nugets-6.0.28-r1
+++ b/metadata/md5-cache/dev-dotnet/dotnet-runtime-nugets-6.0.28-r1
@@ -3,10 +3,10 @@ DESCRIPTION=.NET runtime nugets
 EAPI=8
 HOMEPAGE=https://dotnet.microsoft.com/
 INHERIT=dotnet-pkg-base
-KEYWORDS=~amd64 ~arm ~arm64
+KEYWORDS=amd64 arm ~arm64
 LICENSE=MIT
 RESTRICT=strip
 SLOT=6.0.28/6.0.28
 SRC_URI=https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.ref/6.0.28/microsoft.aspnetcore.app.ref.6.0.28.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-arm/6.0.28/microsoft.aspnetcore.app.runtime.linux-arm.6.0.28.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-arm64/6.0.28/microsoft.aspnetcore.app.runtime.linux-arm64.6.0.28.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-musl-arm/6.0.28/microsoft.aspnetcore.app.runtime.linux-musl-arm.6.0.28.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-musl-arm64/6.0.28/microsoft.aspnetcore.app.runtime.linux-musl-arm64.6.0.28.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-musl-x64/6.0.28/microsoft.aspnetcore.app.runtime.linux-musl-x64.6.0.28.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-x64/6.0.28/microsoft.aspnetcore.app.runtime.linux-x64.6.0.28.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.linux-arm/6.0.28/microsoft.netcore.app.host.linux-arm.6.0.28.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.linux-arm64/6.0.28/microsoft.netcore.app.host.linux-arm64.6.0.28.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.linux-musl-arm/6.0.28/microsoft.netcore.app.host.linux-musl-arm.6.0.28.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.linux-musl-arm64/6.0.28/microsoft.netcore.app.host.linux-musl-arm64.6.0.28.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.linux-musl-x64/6.0.28/microsoft.netcore.app.host.linux-musl-x64.6.0.28.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.linux-x64/6.0.28/microsoft.netcore.app.host.linux-x64.6.0.28.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.ref/6.0.28/microsoft.netcore.app.ref.6.0.28.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-arm/6.0.28/microsoft.netcore.app.runtime.linux-arm.6.0.28.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-arm64/6.0.28/microsoft.netcore.app.runtime.linux-arm64.6.0.28.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-musl-arm/6.0.28/microsoft.netcore.app.runtime.linux-musl-arm.6.0.28.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-musl-arm64/6.0.28/microsoft.netcore.app.runtime.linux-musl-arm64.6.0.28.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-musl-x64/6.0.28/microsoft.netcore.app.runtime.linux-musl-x64.6.0.28.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-x64/6.0.28/microsoft.netcore.app.runtime.linux-x64.6.0.28.nupkg
 _eclasses_=dotnet-pkg-base	3e91bc4d3bc423a7b9dc30a94279901c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	nuget	e90611a22e7a711a49d37cb365b878e8
-_md5_=f242ea50c1188142585db71a4e786333
+_md5_=63cbfdbcca72b3543383cfe592e23f6c
diff --git a/metadata/md5-cache/dev-dotnet/dotnet-runtime-nugets-7.0.17-r1 b/metadata/md5-cache/dev-dotnet/dotnet-runtime-nugets-7.0.17-r1
index a5a3977dd8ce..47849b2d30e1 100644
--- a/metadata/md5-cache/dev-dotnet/dotnet-runtime-nugets-7.0.17-r1
+++ b/metadata/md5-cache/dev-dotnet/dotnet-runtime-nugets-7.0.17-r1
@@ -3,10 +3,10 @@ DESCRIPTION=.NET runtime nugets
 EAPI=8
 HOMEPAGE=https://dotnet.microsoft.com/
 INHERIT=dotnet-pkg-base
-KEYWORDS=~amd64 ~arm ~arm64
+KEYWORDS=amd64 arm ~arm64
 LICENSE=MIT
 RESTRICT=strip
 SLOT=7.0.17/7.0.17
 SRC_URI=https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.ref/7.0.17/microsoft.aspnetcore.app.ref.7.0.17.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-arm/7.0.17/microsoft.aspnetcore.app.runtime.linux-arm.7.0.17.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-arm64/7.0.17/microsoft.aspnetcore.app.runtime.linux-arm64.7.0.17.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-musl-arm/7.0.17/microsoft.aspnetcore.app.runtime.linux-musl-arm.7.0.17.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-musl-arm64/7.0.17/microsoft.aspnetcore.app.runtime.linux-musl-arm64.7.0.17.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-musl-x64/7.0.17/microsoft.aspnetcore.app.runtime.linux-musl-x64.7.0.17.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-x64/7.0.17/microsoft.aspnetcore.app.runtime.linux-x64.7.0.17.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.linux-arm/7.0.17/microsoft.netcore.app.host.linux-arm.7.0.17.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.linux-arm64/7.0.17/microsoft.netcore.app.host.linux-arm64.7.0.17.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.linux-musl-arm/7.0.17/microsoft.netcore.app.host.linux-musl-arm.7.0.17.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.linux-musl-arm64/7.0.17/microsoft.netcore.app.host.linux-musl-arm64.7.0.17.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.linux-musl-x64/7.0.17/microsoft.netcore.app.host.linux-musl-x64.7.0.17.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.linux-x64/7.0.17/microsoft.netcore.app.host.linux-x64.7.0.17.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.ref/7.0.17/microsoft.netcore.app.ref.7.0.17.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-arm/7.0.17/microsoft.netcore.app.runtime.linux-arm.7.0.17.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-arm64/7.0.17/microsoft.netcore.app.runtime.linux-arm64.7.0.17.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-musl-arm/7.0.17/microsoft.netcore.app.runtime.linux-musl-arm.7.0.17.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-musl-arm64/7.0.17/microsoft.netcore.app.runtime.linux-musl-arm64.7.0.17.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-musl-x64/7.0.17/microsoft.netcore.app.runtime.linux-musl-x64.7.0.17.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-x64/7.0.17/microsoft.netcore.app.runtime.linux-x64.7.0.17.nupkg
 _eclasses_=dotnet-pkg-base	3e91bc4d3bc423a7b9dc30a94279901c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	nuget	e90611a22e7a711a49d37cb365b878e8
-_md5_=f242ea50c1188142585db71a4e786333
+_md5_=63cbfdbcca72b3543383cfe592e23f6c
diff --git a/metadata/md5-cache/dev-dotnet/dotnet-runtime-nugets-8.0.3-r1 b/metadata/md5-cache/dev-dotnet/dotnet-runtime-nugets-8.0.3-r1
index e2404d00af05..8867a86bed20 100644
--- a/metadata/md5-cache/dev-dotnet/dotnet-runtime-nugets-8.0.3-r1
+++ b/metadata/md5-cache/dev-dotnet/dotnet-runtime-nugets-8.0.3-r1
@@ -3,10 +3,10 @@ DESCRIPTION=.NET runtime nugets
 EAPI=8
 HOMEPAGE=https://dotnet.microsoft.com/
 INHERIT=dotnet-pkg-base
-KEYWORDS=~amd64 ~arm ~arm64
+KEYWORDS=amd64 arm ~arm64
 LICENSE=MIT
 RESTRICT=strip
 SLOT=8.0.3/8.0.3
 SRC_URI=https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.ref/8.0.3/microsoft.aspnetcore.app.ref.8.0.3.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-arm/8.0.3/microsoft.aspnetcore.app.runtime.linux-arm.8.0.3.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-arm64/8.0.3/microsoft.aspnetcore.app.runtime.linux-arm64.8.0.3.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-musl-arm/8.0.3/microsoft.aspnetcore.app.runtime.linux-musl-arm.8.0.3.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-musl-arm64/8.0.3/microsoft.aspnetcore.app.runtime.linux-musl-arm64.8.0.3.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-musl-x64/8.0.3/microsoft.aspnetcore.app.runtime.linux-musl-x64.8.0.3.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-x64/8.0.3/microsoft.aspnetcore.app.runtime.linux-x64.8.0.3.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.net.illink.tasks/8.0.3/microsoft.net.illink.tasks.8.0.3.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.net.sdk.webassembly.pack/8.0.3/microsoft.net.sdk.webassembly.pack.8.0.3.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.linux-arm/8.0.3/microsoft.netcore.app.host.linux-arm.8.0.3.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.linux-arm64/8.0.3/microsoft.netcore.app.host.linux-arm64.8.0.3.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.linux-musl-arm/8.0.3/microsoft.netcore.app.host.linux-musl-arm.8.0.3.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.linux-musl-arm64/8.0.3/microsoft.netcore.app.host.linux-musl-arm64.8.0.3.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.linux-musl-x64/8.0.3/microsoft.netcore.app.host.linux-musl-x64.8.0.3.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.linux-x64/8.0.3/microsoft.netcore.app.host.linux-x64.8.0.3.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.ref/8.0.3/microsoft.netcore.app.ref.8.0.3.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-arm/8.0.3/microsoft.netcore.app.runtime.linux-arm.8.0.3.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-arm64/8.0.3/microsoft.netcore.app.runtime.linux-arm64.8.0.3.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-musl-arm/8.0.3/microsoft.netcore.app.runtime.linux-musl-arm.8.0.3.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-musl-arm64/8.0.3/microsoft.netcore.app.runtime.linux-musl-arm64.8.0.3.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-musl-x64/8.0.3/microsoft.netcore.app.runtime.linux-musl-x64.8.0.3.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-x64/8.0.3/microsoft.netcore.app.runtime.linux-x64.8.0.3.nupkg
 _eclasses_=dotnet-pkg-base	3e91bc4d3bc423a7b9dc30a94279901c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	nuget	e90611a22e7a711a49d37cb365b878e8
-_md5_=e42266eee64542302b4198f3e72941fe
+_md5_=0cfd6f8962ce34b054f11af34cce305b
diff --git a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-8.0.202 b/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-8.0.202
index 28e9b130b56d..3060937fb977 100644
--- a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-8.0.202
+++ b/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-8.0.202
@@ -4,11 +4,11 @@ DESCRIPTION=.NET is a free, cross-platform, open-source developer platform
 EAPI=8
 HOMEPAGE=https://dotnet.microsoft.com/ https://github.com/dotnet/dotnet/
 IDEPEND=app-eselect/eselect-dotnet
-KEYWORDS=~amd64 ~arm ~arm64
+KEYWORDS=amd64 arm ~arm64
 LICENSE=MIT
 PDEPEND=~dev-dotnet/dotnet-runtime-nugets-8.0.3 ~dev-dotnet/dotnet-runtime-nugets-6.0.28 ~dev-dotnet/dotnet-runtime-nugets-7.0.17
 RDEPEND=app-crypt/mit-krb5:0/0 dev-libs/icu dev-util/lttng-ust:0/2.12 sys-libs/zlib:0/1
 RESTRICT=splitdebug strip
 SLOT=8.0/8.0.3
 SRC_URI=amd64? ( elibc_glibc? ( https://dotnetcli.azureedge.net/dotnet/Sdk/8.0.202/dotnet-sdk-8.0.202-linux-x64.tar.gz ) elibc_musl? ( https://dotnetcli.azureedge.net/dotnet/Sdk/8.0.202/dotnet-sdk-8.0.202-linux-musl-x64.tar.gz ) ) arm? ( elibc_glibc? ( https://dotnetcli.azureedge.net/dotnet/Sdk/8.0.202/dotnet-sdk-8.0.202-linux-arm.tar.gz ) elibc_musl? ( https://dotnetcli.azureedge.net/dotnet/Sdk/8.0.202/dotnet-sdk-8.0.202-linux-musl-arm.tar.gz ) ) arm64? ( elibc_glibc? ( https://dotnetcli.azureedge.net/dotnet/Sdk/8.0.202/dotnet-sdk-8.0.202-linux-arm64.tar.gz ) elibc_musl? ( https://dotnetcli.azureedge.net/dotnet/Sdk/8.0.202/dotnet-sdk-8.0.202-linux-musl-arm64.tar.gz ) )
-_md5_=a959eb677452b2f9879b97732c6f85a8
+_md5_=b49393120cfd36057c7c4d273fe237ac
diff --git a/metadata/md5-cache/dev-dotnet/fable-4.14.0 b/metadata/md5-cache/dev-dotnet/fable-4.14.0
index fc64b55678c3..8ddd2e3dd7ad 100644
--- a/metadata/md5-cache/dev-dotnet/fable-4.14.0
+++ b/metadata/md5-cache/dev-dotnet/fable-4.14.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=http://fable.io/ https://github.com/fable-compiler/fable/
 INHERIT=check-reqs dotnet-pkg
 IUSE=debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0 MIT
 RDEPEND=virtual/dotnet-sdk:8.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/fable-compiler/fable/archive/refs/tags/4.14.0.tar.gz -> fable-4.14.0.tar.gz https://api.nuget.org/v3-flatcontainer/altcover/5.3.675/altcover.5.3.675.nupkg https://api.nuget.org/v3-flatcontainer/blackfox.commandline/1.0.0/blackfox.commandline.1.0.0.nupkg https://api.nuget.org/v3-flatcontainer/buildalyzer.logger/5.0.1/buildalyzer.logger.5.0.1.nupkg https://api.nuget.org/v3-flatcontainer/buildalyzer/5.0.1/buildalyzer.5.0.1.nupkg https://api.nuget.org/v3-flatcontainer/eluciusftw.spectrecoff/0.47.28/eluciusftw.spectrecoff.0.47.28.nupkg https://api.nuget.org/v3-flatcontainer/expecto/10.1.0/expecto.10.1.0.nupkg https://api.nuget.org/v3-flatcontainer/fable.ast/4.0.0/fable.ast.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/fable.browser.blob/1.1.4/fable.browser.blob.1.1.4.nupkg https://api.nuget.org/v3-flatcontainer/fable.browser.dom/2.4.4/fable.browser.dom.2.4.4.nupkg https://api.nuget.org/v3-flatcontainer/fable.browser.event/1.4.4/fable.browser.event.1.4.4.nupkg https://api.nuget.org/v3-flatcontainer/fable.browser.event/1.4.5/fable.browser.event.1.4.5.nupkg https://api.nuget.org/v3-flatcontainer/fable.browser.gamepad/1.0.3/fable.browser.gamepad.1.0.3.nupkg https://api.nuget.org/v3-flatcontainer/fable.browser.webstorage/1.0.4/fable.browser.webstorage.1.0.4.nupkg https://api.nuget.org/v3-flatcontainer/fable.core/3.1.6/fable.core.3.1.6.nupkg https://api.nuget.org/v3-flatcontainer/fable.core/4.2.0/fable.core.4.2.0.nupkg https://api.nuget.org/v3-flatcontainer/fable.fluentui/0.7.0/fable.fluentui.0.7.0.nupkg https://api.nuget.org/v3-flatcontainer/fable.jester/0.33.0/fable.jester.0.33.0.nupkg https://api.nuget.org/v3-flatcontainer/fable.jsonprovider/1.1.1/fable.jsonprovider.1.1.1.nupkg https://api.nuget.org/v3-flatcontainer/fable.node/1.0.2/fable.node.1.0.2.nupkg https://api.nuget.org/v3-flatcontainer/fable.promise/2.2.2/fable.promise.2.2.2.nupkg https://api.nuget.org/v3-flatcontainer/fable.react/8.0.1/fable.react.8.0.1.nupkg https://api.nuget.org/v3-flatcontainer/fable.reacttestinglibrary/0.33.0/fable.reacttestinglibrary.0.33.0.nupkg https://api.nuget.org/v3-flatcontainer/fake.core.context/6.0.0/fake.core.context.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/fake.core.environment/6.0.0/fake.core.environment.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/fake.core.fakevar/6.0.0/fake.core.fakevar.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/fake.core.string/6.0.0/fake.core.string.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/fake.core.trace/6.0.0/fake.core.trace.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/fake.io.filesystem/6.0.0/fake.io.filesystem.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/feliz.compilerplugins/2.0.0-prerelease-002/feliz.compilerplugins.2.0.0-prerelease-002.nupkg https://api.nuget.org/v3-flatcontainer/feliz/2.0.0-prerelease-002/feliz.2.0.0-prerelease-002.nupkg https://api.nuget.org/v3-flatcontainer/fsharp.analyzers.build/0.3.0/fsharp.analyzers.build.0.3.0.nupkg https://api.nuget.org/v3-flatcontainer/fsharp.analyzers.sdk/0.24.0/fsharp.analyzers.sdk.0.24.0.nupkg https://api.nuget.org/v3-flatcontainer/fsharp.compiler.service/43.8.100/fsharp.compiler.service.43.8.100.nupkg https://api.nuget.org/v3-flatcontainer/fsharp.core/4.7.0/fsharp.core.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/fsharp.core/6.0.2/fsharp.core.6.0.2.nupkg https://api.nuget.org/v3-flatcontainer/fsharp.core/7.0.200/fsharp.core.7.0.200.nupkg https://api.nuget.org/v3-flatcontainer/fsharp.core/8.0.100/fsharp.core.8.0.100.nupkg https://api.nuget.org/v3-flatcontainer/fsharp.core/8.0.101/fsharp.core.8.0.101.nupkg https://api.nuget.org/v3-flatcontainer/fsharp.data.adaptive/1.2.14/fsharp.data.adaptive.1.2.14.nupkg https://api.nuget.org/v3-flatcontainer/fsharp.systemtextjson/1.2.42/fsharp.systemtextjson.1.2.42.nupkg https://api.nuget.org/v3-flatcontainer/fsharp.umx/1.1.0/fsharp.umx.1.1.0.nupkg https://api.nuget.org/v3-flatcontainer/g-research.fsharp.analyzers/0.8.0/g-research.fsharp.analyzers.0.8.0.nupkg https://api.nuget.org/v3-flatcontainer/ionide.analyzers/0.8.0/ionide.analyzers.0.8.0.nupkg https://api.nuget.org/v3-flatcontainer/mcmaster.netcore.plugins/1.4.0/mcmaster.netcore.plugins.1.4.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.build.framework/16.9.0/microsoft.build.framework.16.9.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.build.tasks.core/16.9.0/microsoft.build.tasks.core.16.9.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.build.tasks.git/8.0.0/microsoft.build.tasks.git.8.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.build.utilities.core/16.9.0/microsoft.build.utilities.core.16.9.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.build/16.9.0/microsoft.build.16.9.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codecoverage/17.8.0/microsoft.codecoverage.17.8.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.csharp/4.0.1/microsoft.csharp.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.dotnet.platformabstractions/2.1.0/microsoft.dotnet.platformabstractions.2.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.dotnet.platformabstractions/3.1.6/microsoft.dotnet.platformabstractions.3.1.6.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.abstractions/2.1.1/microsoft.extensions.configuration.abstractions.2.1.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.abstractions/8.0.0/microsoft.extensions.configuration.abstractions.8.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.binder/2.1.1/microsoft.extensions.configuration.binder.2.1.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.binder/8.0.0/microsoft.extensions.configuration.binder.8.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration/2.1.1/microsoft.extensions.configuration.2.1.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration/8.0.0/microsoft.extensions.configuration.8.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/2.1.1/microsoft.extensions.dependencyinjection.abstractions.2.1.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/8.0.0/microsoft.extensions.dependencyinjection.abstractions.8.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection/8.0.0/microsoft.extensions.dependencyinjection.8.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencymodel/2.1.0/microsoft.extensions.dependencymodel.2.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencymodel/5.0.0/microsoft.extensions.dependencymodel.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/2.1.1/microsoft.extensions.logging.abstractions.2.1.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/6.0.0/microsoft.extensions.logging.abstractions.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/8.0.0/microsoft.extensions.logging.abstractions.8.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.configuration/8.0.0/microsoft.extensions.logging.configuration.8.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.console/8.0.0/microsoft.extensions.logging.console.8.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging/2.1.1/microsoft.extensions.logging.2.1.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging/8.0.0/microsoft.extensions.logging.8.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options.configurationextensions/8.0.0/microsoft.extensions.options.configurationextensions.8.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options/2.1.1/microsoft.extensions.options.2.1.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options/8.0.0/microsoft.extensions.options.8.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.primitives/2.1.1/microsoft.extensions.primitives.2.1.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.primitives/8.0.0/microsoft.extensions.primitives.8.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.net.test.sdk/17.8.0/microsoft.net.test.sdk.17.8.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.0.1/microsoft.netcore.platforms.1.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/3.1.0/microsoft.netcore.platforms.3.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/5.0.0/microsoft.netcore.platforms.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/1.0.1/microsoft.netcore.targets.1.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.sourcelink.common/8.0.0/microsoft.sourcelink.common.8.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.sourcelink.github/8.0.0/microsoft.sourcelink.github.8.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.objectmodel/17.8.0/microsoft.testplatform.objectmodel.17.8.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.testhost/17.8.0/microsoft.testplatform.testhost.17.8.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.win32.primitives/4.3.0/microsoft.win32.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.win32.registry/4.3.0/microsoft.win32.registry.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.win32.systemevents/4.7.0/microsoft.win32.systemevents.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/mono.cecil/0.11.4/mono.cecil.0.11.4.nupkg https://api.nuget.org/v3-flatcontainer/msbuild.structuredlogger/2.1.507/msbuild.structuredlogger.2.1.507.nupkg https://api.nuget.org/v3-flatcontainer/msbuildpipelogger.server/1.1.6/msbuildpipelogger.server.1.1.6.nupkg https://api.nuget.org/v3-flatcontainer/netstandard.library/1.6.1/netstandard.library.1.6.1.nupkg https://api.nuget.org/v3-flatcontainer/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg https://api.nuget.org/v3-flatcontainer/newtonsoft.json/11.0.2/newtonsoft.json.11.0.2.nupkg https://api.nuget.org/v3-flatcontainer/newtonsoft.json/13.0.1/newtonsoft.json.13.0.1.nupkg https://api.nuget.org/v3-flatcontainer/newtonsoft.json/9.0.1/newtonsoft.json.9.0.1.nupkg https://api.nuget.org/v3-flatcontainer/nuget.frameworks/6.0.0/nuget.frameworks.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/nuget.frameworks/6.5.0/nuget.frameworks.6.5.0.nupkg https://api.nuget.org/v3-flatcontainer/octokit/8.0.0/octokit.8.0.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.collections/4.3.0/runtime.any.system.collections.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.diagnostics.tools/4.3.0/runtime.any.system.diagnostics.tools.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.diagnostics.tracing/4.3.0/runtime.any.system.diagnostics.tracing.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.globalization.calendars/4.3.0/runtime.any.system.globalization.calendars.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.globalization/4.3.0/runtime.any.system.globalization.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.io/4.3.0/runtime.any.system.io.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection.extensions/4.3.0/runtime.any.system.reflection.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection.primitives/4.3.0/runtime.any.system.reflection.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection/4.3.0/runtime.any.system.reflection.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.resources.resourcemanager/4.3.0/runtime.any.system.resources.resourcemanager.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime.handles/4.3.0/runtime.any.system.runtime.handles.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime.interopservices/4.3.0/runtime.any.system.runtime.interopservices.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime/4.3.0/runtime.any.system.runtime.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.text.encoding.extensions/4.3.0/runtime.any.system.text.encoding.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.text.encoding/4.3.0/runtime.any.system.text.encoding.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.threading.tasks/4.3.0/runtime.any.system.threading.tasks.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.threading.timer/4.3.0/runtime.any.system.threading.timer.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system.io.compression/4.3.0/runtime.native.system.io.compression.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system.net.http/4.3.0/runtime.native.system.net.http.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system.security.cryptography.apple/4.3.0/runtime.native.system.security.cryptography.apple.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system.security.cryptography.openssl/4.3.0/runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system/4.0.0/runtime.native.system.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system/4.3.0/runtime.native.system.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.microsoft.win32.primitives/4.3.0/runtime.unix.microsoft.win32.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.console/4.3.0/runtime.unix.system.console.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.diagnostics.debug/4.3.0/runtime.unix.system.diagnostics.debug.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.io.filesystem/4.3.0/runtime.unix.system.io.filesystem.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.net.primitives/4.3.0/runtime.unix.system.net.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.net.sockets/4.3.0/runtime.unix.system.net.sockets.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.private.uri/4.3.0/runtime.unix.system.private.uri.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.runtime.extensions/4.3.0/runtime.unix.system.runtime.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/semver/2.3.0/semver.2.3.0.nupkg https://api.nuget.org/v3-flatcontainer/simpleexec/11.0.0/simpleexec.11.0.0.nupkg https://api.nuget.org/v3-flatcontainer/sixlabors.imagesharp/2.1.3/sixlabors.imagesharp.2.1.3.nupkg https://api.nuget.org/v3-flatcontainer/source-map-sharp/1.0.9/source-map-sharp.1.0.9.nupkg https://api.nuget.org/v3-flatcontainer/spectre.console.imagesharp/0.47.0/spectre.console.imagesharp.0.47.0.nupkg https://api.nuget.org/v3-flatcontainer/spectre.console.json/0.47.0/spectre.console.json.0.47.0.nupkg https://api.nuget.org/v3-flatcontainer/spectre.console/0.47.0/spectre.console.0.47.0.nupkg https://api.nuget.org/v3-flatcontainer/system.appcontext/4.1.0/system.appcontext.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.appcontext/4.3.0/system.appcontext.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.buffers/4.3.0/system.buffers.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.buffers/4.5.1/system.buffers.4.5.1.nupkg https://api.nuget.org/v3-flatcontainer/system.codedom/4.4.0/system.codedom.4.4.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.concurrent/4.3.0/system.collections.concurrent.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.immutable/5.0.0/system.collections.immutable.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.immutable/7.0.0/system.collections.immutable.7.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections/4.0.11/system.collections.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.collections/4.3.0/system.collections.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.console/4.3.0/system.console.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.debug/4.0.11/system.diagnostics.debug.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.diagnosticsource/4.3.0/system.diagnostics.diagnosticsource.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.diagnosticsource/7.0.2/system.diagnostics.diagnosticsource.7.0.2.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.tools/4.0.1/system.diagnostics.tools.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.tools/4.3.0/system.diagnostics.tools.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.tracing/4.3.0/system.diagnostics.tracing.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.drawing.common/4.7.0/system.drawing.common.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.dynamic.runtime/4.0.11/system.dynamic.runtime.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.globalization.calendars/4.3.0/system.globalization.calendars.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.globalization.extensions/4.3.0/system.globalization.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.globalization/4.0.11/system.globalization.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.globalization/4.3.0/system.globalization.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.compression.zipfile/4.3.0/system.io.compression.zipfile.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.compression/4.3.0/system.io.compression.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.filesystem.primitives/4.0.1/system.io.filesystem.primitives.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.io.filesystem.primitives/4.3.0/system.io.filesystem.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.filesystem/4.0.1/system.io.filesystem.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.io.filesystem/4.3.0/system.io.filesystem.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io/4.1.0/system.io.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io/4.3.0/system.io.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.linq.expressions/4.1.0/system.linq.expressions.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.linq.expressions/4.3.0/system.linq.expressions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.linq/4.1.0/system.linq.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.linq/4.3.0/system.linq.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.memory/4.5.1/system.memory.4.5.1.nupkg https://api.nuget.org/v3-flatcontainer/system.memory/4.5.4/system.memory.4.5.4.nupkg https://api.nuget.org/v3-flatcontainer/system.memory/4.5.5/system.memory.4.5.5.nupkg https://api.nuget.org/v3-flatcontainer/system.net.http/4.3.0/system.net.http.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.net.nameresolution/4.3.0/system.net.nameresolution.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.net.primitives/4.3.0/system.net.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.net.sockets/4.3.0/system.net.sockets.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.objectmodel/4.0.12/system.objectmodel.4.0.12.nupkg https://api.nuget.org/v3-flatcontainer/system.objectmodel/4.3.0/system.objectmodel.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.private.uri/4.3.0/system.private.uri.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit.ilgeneration/4.0.1/system.reflection.emit.ilgeneration.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit.ilgeneration/4.3.0/system.reflection.emit.ilgeneration.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit.lightweight/4.0.1/system.reflection.emit.lightweight.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit.lightweight/4.3.0/system.reflection.emit.lightweight.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit.lightweight/4.6.0/system.reflection.emit.lightweight.4.6.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit/4.0.1/system.reflection.emit.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit/4.3.0/system.reflection.emit.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit/4.7.0/system.reflection.emit.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.extensions/4.0.1/system.reflection.extensions.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.extensions/4.3.0/system.reflection.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.metadata/1.6.0/system.reflection.metadata.1.6.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.metadata/7.0.0/system.reflection.metadata.7.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.primitives/4.0.1/system.reflection.primitives.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.typeextensions/4.3.0/system.reflection.typeextensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.typeextensions/4.7.0/system.reflection.typeextensions.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection/4.1.0/system.reflection.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection/4.3.0/system.reflection.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.resources.extensions/4.6.0/system.resources.extensions.4.6.0.nupkg https://api.nuget.org/v3-flatcontainer/system.resources.resourcemanager/4.0.1/system.resources.resourcemanager.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.5.1/system.runtime.compilerservices.unsafe.4.5.1.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/5.0.0/system.runtime.compilerservices.unsafe.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/6.0.0/system.runtime.compilerservices.unsafe.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.extensions/4.1.0/system.runtime.extensions.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.handles/4.0.1/system.runtime.handles.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices.runtimeinformation/4.0.0/system.runtime.interopservices.runtimeinformation.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices.runtimeinformation/4.3.0/system.runtime.interopservices.runtimeinformation.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices/4.1.0/system.runtime.interopservices.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.numerics/4.3.0/system.runtime.numerics.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.serialization.primitives/4.1.1/system.runtime.serialization.primitives.4.1.1.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime/4.1.0/system.runtime.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime/4.3.0/system.runtime.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.accesscontrol/4.7.0/system.security.accesscontrol.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.claims/4.3.0/system.security.claims.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.algorithms/4.3.0/system.security.cryptography.algorithms.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/4.3.0/system.security.cryptography.cng.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/4.7.0/system.security.cryptography.cng.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.csp/4.3.0/system.security.cryptography.csp.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.encoding/4.3.0/system.security.cryptography.encoding.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.openssl/4.3.0/system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.pkcs/4.7.0/system.security.cryptography.pkcs.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.primitives/4.3.0/system.security.cryptography.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.x509certificates/4.3.0/system.security.cryptography.x509certificates.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.xml/4.7.0/system.security.cryptography.xml.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.permissions/4.7.0/system.security.permissions.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.3.0/system.security.principal.windows.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.7.0/system.security.principal.windows.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.principal/4.3.0/system.security.principal.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding.codepages/4.0.1/system.text.encoding.codepages.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding.codepages/5.0.0/system.text.encoding.codepages.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding.extensions/4.0.11/system.text.encoding.extensions.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding.extensions/4.3.0/system.text.encoding.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding/4.0.11/system.text.encoding.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/6.0.0/system.text.encodings.web.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/8.0.0/system.text.encodings.web.8.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.json/4.7.0/system.text.json.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.json/6.0.0/system.text.json.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.json/6.0.2/system.text.json.6.0.2.nupkg https://api.nuget.org/v3-flatcontainer/system.text.json/8.0.0/system.text.json.8.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.regularexpressions/4.1.0/system.text.regularexpressions.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.regularexpressions/4.3.0/system.text.regularexpressions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks.dataflow/4.9.0/system.threading.tasks.dataflow.4.9.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.0.0/system.threading.tasks.extensions.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.3.0/system.threading.tasks.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks/4.0.11/system.threading.tasks.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.threadpool/4.3.0/system.threading.threadpool.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.timer/4.3.0/system.threading.timer.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading/4.0.11/system.threading.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.threading/4.3.0/system.threading.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.windows.extensions/4.7.0/system.windows.extensions.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.readerwriter/4.0.11/system.xml.readerwriter.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.readerwriter/4.3.0/system.xml.readerwriter.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.xdocument/4.0.11/system.xml.xdocument.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.xdocument/4.3.0/system.xml.xdocument.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/thoth.json.net/11.0.0/thoth.json.net.11.0.0.nupkg https://api.nuget.org/v3-flatcontainer/xunit.abstractions/2.0.3/xunit.abstractions.2.0.3.nupkg https://api.nuget.org/v3-flatcontainer/xunit.analyzers/1.7.0/xunit.analyzers.1.7.0.nupkg https://api.nuget.org/v3-flatcontainer/xunit.assert/2.6.3/xunit.assert.2.6.3.nupkg https://api.nuget.org/v3-flatcontainer/xunit.core/2.6.3/xunit.core.2.6.3.nupkg https://api.nuget.org/v3-flatcontainer/xunit.extensibility.core/2.6.3/xunit.extensibility.core.2.6.3.nupkg https://api.nuget.org/v3-flatcontainer/xunit.extensibility.execution/2.6.3/xunit.extensibility.execution.2.6.3.nupkg https://api.nuget.org/v3-flatcontainer/xunit.runner.visualstudio/2.5.5/xunit.runner.visualstudio.2.5.5.nupkg https://api.nuget.org/v3-flatcontainer/xunit/2.6.3/xunit.2.6.3.nupkg
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	dotnet-pkg	9f041be16373f3b3c2ad1ae7a7559960	dotnet-pkg-base	3e91bc4d3bc423a7b9dc30a94279901c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	nuget	e90611a22e7a711a49d37cb365b878e8
-_md5_=119d6f5d64af9ddf0b3b95f49c4e806b
+_md5_=28747f52d31a73cf11599a0eb0c843d0
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 3c7b9e0d7e02..deb9d77d4fdf 100644
--- a/metadata/md5-cache/dev-games/Manifest.gz
+++ b/metadata/md5-cache/dev-games/Manifest.gz
diff --git a/metadata/md5-cache/dev-games/godot-4.2.2 b/metadata/md5-cache/dev-games/godot-4.2.2
new file mode 100644
index 000000000000..c7726a6e231c
--- /dev/null
+++ b/metadata/md5-cache/dev-games/godot-4.2.2
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig || ( ( dev-lang/python:3.12 >=dev-build/scons-4.4.0[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-build/scons-4.4.0[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-build/scons-4.4.0[python_targets_python3_10(-)] ) )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
+DEPEND=app-arch/brotli:= app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig ) gui? ( media-libs/libglvnd x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxkbcommon tools? ( raycast? ( media-libs/embree:3 ) ) vulkan? ( media-libs/vulkan-loader[X] ) ) pulseaudio? ( media-libs/libpulse ) speech? ( app-accessibility/speech-dispatcher ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) udev? ( virtual/udev ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= ) gui? ( x11-base/xorg-proto ) tools? ( test? ( dev-cpp/doctest ) )
+DESCRIPTION=Multi-platform 2D and 3D game engine with a feature-rich editor
+EAPI=8
+HOMEPAGE=https://godotengine.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop python-any-r1 flag-o-matic scons-utils shell-completion toolchain-funcs xdg
+IUSE=alsa +dbus debug deprecated +fontconfig +gui pulseaudio raycast +runner speech test +theora +tools +udev +upnp +vulkan +webp
+KEYWORDS=~amd64
+LICENSE=MIT Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )
+RDEPEND=app-arch/brotli:= app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig ) gui? ( media-libs/libglvnd x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxkbcommon tools? ( raycast? ( media-libs/embree:3 ) ) vulkan? ( media-libs/vulkan-loader[X] ) ) pulseaudio? ( media-libs/libpulse ) speech? ( app-accessibility/speech-dispatcher ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) udev? ( virtual/udev ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= )
+RESTRICT=test
+SLOT=4
+SRC_URI=https://downloads.tuxfamily.org/godotengine/4.2.2/godot-4.2.2-stable.tar.xz https://github.com/godotengine/godot/releases/download/4.2.2-stable/godot-4.2.2-stable.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	scons-utils	b3544637c85286a19000d59461d3a7a5	shell-completion	bb7eb6bc232cd6c4bf8af739cdd2ee14	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=b647c194a4f7eeb1f6c11c323a3aa4c0
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 56c20e46552a..29e3c4ecb6b1 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/jtidy-1.0-r1 b/metadata/md5-cache/dev-java/jtidy-1.0-r1
deleted file mode 100644
index 501a304d6313..000000000000
--- a/metadata/md5-cache/dev-java/jtidy-1.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
-DESCRIPTION=Java port of HTML Tidy, an HTML syntax checker and pretty printer
-EAPI=8
-HOMEPAGE=http://jtidy.sourceforge.net/
-INHERIT=java-pkg-2 java-ant-2
-IUSE=doc source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=HTML-Tidy W3C
-RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/jtidy/JTidy/r938/jtidy-r938-sources.zip -> jtidy-1.0.zip
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=78dde6709d3556a3db98f2282c032fd9
diff --git a/metadata/md5-cache/dev-java/jtidy-1.0-r2 b/metadata/md5-cache/dev-java/jtidy-1.0-r2
index ecd3581600ea..0598ce545646 100644
--- a/metadata/md5-cache/dev-java/jtidy-1.0-r2
+++ b/metadata/md5-cache/dev-java/jtidy-1.0-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/jtidy/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ppc64 ~x86
+KEYWORDS=amd64 ppc64 x86
 LICENSE=HTML-Tidy W3C
 RDEPEND=>=dev-java/ant-1.10.14-r3:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/jtidy/JTidy/r938/jtidy-r938-sources.zip -> jtidy-1.0.zip
 _eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	b346c3901e71ba37137bae0b25b00221
-_md5_=539ffa579471b3e51727332d7eddb55a
+_md5_=56cebc2ba6b7e664f540f142d97cea9c
diff --git a/metadata/md5-cache/dev-java/openjdk-8.402_p06-r2 b/metadata/md5-cache/dev-java/openjdk-8.402_p06-r2
index 7209c04a090f..f53245d158c7 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.402_p06-r2
+++ b/metadata/md5-cache/dev-java/openjdk-8.402_p06-r2
@@ -5,12 +5,12 @@ DESCRIPTION=Open source implementation of the Java programming language
 EAPI=7
 HOMEPAGE=https://openjdk.org
 INHERIT=check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-IUSE=alsa debug cups doc examples headless-awt javafx +jbootstrap selinux system-bootstrap source
+IUSE=alsa big-endian debug cups doc examples headless-awt javafx +jbootstrap selinux system-bootstrap source
 KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=GPL-2-with-classpath-exception
 PDEPEND=javafx? ( dev-java/openjfx:8 )
 RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
 SLOT=8
-SRC_URI=https://github.com/openjdk/jdk8u/archive/refs/tags/jdk8u402-ga.tar.gz -> openjdk-8.402_p06.tar.gz !system-bootstrap? ( x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-8.402_p06-x86.tar.xz ) )
+SRC_URI=https://github.com/openjdk/jdk8u/archive/refs/tags/jdk8u402-ga.tar.gz -> openjdk-8.402_p06.tar.gz !system-bootstrap? ( x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-8.402_p06-x86.tar.xz ) ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-8.402_p06-ppc64.tar.xz ) ) )
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	java-vm-2	562cbc1b6ee63dacf0cf6447f00d26b3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=96444f6fe4e65337680e505943d359fc
+_md5_=84448c3bc01476af28f840ba88961aab
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index b41b66867b31..3c88490950bb 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/boogie-3.1.3 b/metadata/md5-cache/dev-lang/boogie-3.1.3
index 8f8c6a083ca4..4b764d727eb6 100644
--- a/metadata/md5-cache/dev-lang/boogie-3.1.3
+++ b/metadata/md5-cache/dev-lang/boogie-3.1.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/boogie-org/boogie/
 INHERIT=check-reqs dotnet-pkg edo multiprocessing
 IUSE=test debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=sci-mathematics/z3 virtual/dotnet-sdk:8.0
 RESTRICT=!test? ( test ) strip
 SLOT=0
 SRC_URI=https://github.com/boogie-org/boogie/archive/v3.1.3.tar.gz -> boogie-3.1.3.tar.gz https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/6.0.0/microsoft.bcl.asyncinterfaces.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codecoverage/16.2.0/microsoft.codecoverage.16.2.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.csharp/4.0.1/microsoft.csharp.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.dotnet.internalabstractions/1.0.0/microsoft.dotnet.internalabstractions.1.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.net.test.sdk/16.2.0/microsoft.net.test.sdk.16.2.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.0.1/microsoft.netcore.platforms.1.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/1.0.1/microsoft.netcore.targets.1.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.objectmodel/16.2.0/microsoft.testplatform.objectmodel.16.2.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.testhost/16.2.0/microsoft.testplatform.testhost.16.2.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.win32.primitives/4.0.1/microsoft.win32.primitives.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.win32.primitives/4.3.0/microsoft.win32.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.win32.registry/4.0.0/microsoft.win32.registry.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.win32.registry/4.3.0/microsoft.win32.registry.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.win32.systemevents/6.0.0/microsoft.win32.systemevents.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/netstandard.library/1.6.0/netstandard.library.1.6.0.nupkg https://api.nuget.org/v3-flatcontainer/netstandard.library/2.0.0/netstandard.library.2.0.0.nupkg https://api.nuget.org/v3-flatcontainer/newtonsoft.json/9.0.1/newtonsoft.json.9.0.1.nupkg https://api.nuget.org/v3-flatcontainer/nunit/3.12.0/nunit.3.12.0.nupkg https://api.nuget.org/v3-flatcontainer/nunit3testadapter/3.15.1/nunit3testadapter.3.15.1.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.collections/4.3.0/runtime.any.system.collections.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.diagnostics.tools/4.3.0/runtime.any.system.diagnostics.tools.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.diagnostics.tracing/4.3.0/runtime.any.system.diagnostics.tracing.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.globalization.calendars/4.3.0/runtime.any.system.globalization.calendars.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.globalization/4.3.0/runtime.any.system.globalization.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.io/4.3.0/runtime.any.system.io.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection.extensions/4.3.0/runtime.any.system.reflection.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection.primitives/4.3.0/runtime.any.system.reflection.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection/4.3.0/runtime.any.system.reflection.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.resources.resourcemanager/4.3.0/runtime.any.system.resources.resourcemanager.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime.handles/4.3.0/runtime.any.system.runtime.handles.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime.interopservices/4.3.0/runtime.any.system.runtime.interopservices.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime/4.3.0/runtime.any.system.runtime.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.text.encoding.extensions/4.3.0/runtime.any.system.text.encoding.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.text.encoding/4.3.0/runtime.any.system.text.encoding.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.threading.tasks/4.3.0/runtime.any.system.threading.tasks.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.threading.timer/4.3.0/runtime.any.system.threading.timer.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system.io.compression/4.1.0/runtime.native.system.io.compression.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system.net.http/4.0.1/runtime.native.system.net.http.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system.security.cryptography.openssl/4.3.0/runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system.security.cryptography/4.0.0/runtime.native.system.security.cryptography.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system/4.0.0/runtime.native.system.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system/4.3.0/runtime.native.system.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.microsoft.win32.primitives/4.3.0/runtime.unix.microsoft.win32.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.console/4.3.0/runtime.unix.system.console.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.diagnostics.debug/4.3.0/runtime.unix.system.diagnostics.debug.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.io.filesystem/4.3.0/runtime.unix.system.io.filesystem.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.net.primitives/4.3.0/runtime.unix.system.net.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.net.sockets/4.3.0/runtime.unix.system.net.sockets.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.private.uri/4.3.0/runtime.unix.system.private.uri.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.runtime.extensions/4.3.0/runtime.unix.system.runtime.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.appcontext/4.1.0/system.appcontext.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.buffers/4.0.0/system.buffers.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.buffers/4.3.0/system.buffers.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.concurrent/4.0.12/system.collections.concurrent.4.0.12.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.immutable/1.2.0/system.collections.immutable.1.2.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.nongeneric/4.0.1/system.collections.nongeneric.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.nongeneric/4.3.0/system.collections.nongeneric.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.specialized/4.0.1/system.collections.specialized.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.specialized/4.3.0/system.collections.specialized.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections/4.0.11/system.collections.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.collections/4.3.0/system.collections.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.componentmodel.eventbasedasync/4.0.11/system.componentmodel.eventbasedasync.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.componentmodel.eventbasedasync/4.3.0/system.componentmodel.eventbasedasync.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.componentmodel.primitives/4.1.0/system.componentmodel.primitives.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.componentmodel.primitives/4.3.0/system.componentmodel.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.componentmodel.typeconverter/4.1.0/system.componentmodel.typeconverter.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.componentmodel.typeconverter/4.3.0/system.componentmodel.typeconverter.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.componentmodel/4.0.1/system.componentmodel.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.componentmodel/4.3.0/system.componentmodel.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.configuration.configurationmanager/6.0.0/system.configuration.configurationmanager.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.console/4.0.0/system.console.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.debug/4.0.11/system.diagnostics.debug.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.diagnosticsource/4.0.0/system.diagnostics.diagnosticsource.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.process/4.1.0/system.diagnostics.process.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.process/4.3.0/system.diagnostics.process.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.textwritertracelistener/4.0.0/system.diagnostics.textwritertracelistener.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.tools/4.0.1/system.diagnostics.tools.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.tracesource/4.0.0/system.diagnostics.tracesource.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.tracing/4.1.0/system.diagnostics.tracing.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.tracing/4.3.0/system.diagnostics.tracing.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.drawing.common/6.0.0/system.drawing.common.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.dynamic.runtime/4.0.11/system.dynamic.runtime.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.globalization.calendars/4.0.1/system.globalization.calendars.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.globalization.extensions/4.0.1/system.globalization.extensions.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.globalization.extensions/4.3.0/system.globalization.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.globalization/4.0.11/system.globalization.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.globalization/4.3.0/system.globalization.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.compression.zipfile/4.0.1/system.io.compression.zipfile.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.io.compression/4.1.0/system.io.compression.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.filesystem.primitives/4.0.1/system.io.filesystem.primitives.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.io.filesystem.primitives/4.3.0/system.io.filesystem.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.filesystem/4.0.1/system.io.filesystem.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.io.filesystem/4.3.0/system.io.filesystem.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io/4.1.0/system.io.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io/4.3.0/system.io.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.linq.async/6.0.1/system.linq.async.6.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.linq.expressions/4.1.0/system.linq.expressions.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.linq/4.1.0/system.linq.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.linq/4.3.0/system.linq.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.net.http/4.1.0/system.net.http.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.net.nameresolution/4.3.0/system.net.nameresolution.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.net.primitives/4.0.11/system.net.primitives.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.net.sockets/4.1.0/system.net.sockets.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.objectmodel/4.0.12/system.objectmodel.4.0.12.nupkg https://api.nuget.org/v3-flatcontainer/system.private.datacontractserialization/4.1.1/system.private.datacontractserialization.4.1.1.nupkg https://api.nuget.org/v3-flatcontainer/system.private.uri/4.3.0/system.private.uri.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reactive/4.4.1/system.reactive.4.4.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit.ilgeneration/4.0.1/system.reflection.emit.ilgeneration.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit.lightweight/4.0.1/system.reflection.emit.lightweight.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit/4.0.1/system.reflection.emit.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.extensions/4.0.1/system.reflection.extensions.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.extensions/4.3.0/system.reflection.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.metadata/1.3.0/system.reflection.metadata.1.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.primitives/4.0.1/system.reflection.primitives.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.typeextensions/4.1.0/system.reflection.typeextensions.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.typeextensions/4.3.0/system.reflection.typeextensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection/4.1.0/system.reflection.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection/4.3.0/system.reflection.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.resources.resourcemanager/4.0.1/system.resources.resourcemanager.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.caching/6.0.0/system.runtime.caching.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.extensions/4.1.0/system.runtime.extensions.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.handles/4.0.1/system.runtime.handles.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices.runtimeinformation/4.0.0/system.runtime.interopservices.runtimeinformation.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices.runtimeinformation/4.3.0/system.runtime.interopservices.runtimeinformation.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices/4.1.0/system.runtime.interopservices.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.loader/4.0.0/system.runtime.loader.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.numerics/4.0.1/system.runtime.numerics.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.serialization.json/4.0.2/system.runtime.serialization.json.4.0.2.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.serialization.primitives/4.1.1/system.runtime.serialization.primitives.4.1.1.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime/4.1.0/system.runtime.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime/4.3.0/system.runtime.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.accesscontrol/6.0.0/system.security.accesscontrol.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.claims/4.3.0/system.security.claims.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.algorithms/4.2.0/system.security.cryptography.algorithms.4.2.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/4.2.0/system.security.cryptography.cng.4.2.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.csp/4.0.0/system.security.cryptography.csp.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.encoding/4.0.0/system.security.cryptography.encoding.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.openssl/4.0.0/system.security.cryptography.openssl.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.primitives/4.0.0/system.security.cryptography.primitives.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.protecteddata/6.0.0/system.security.cryptography.protecteddata.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.x509certificates/4.1.0/system.security.cryptography.x509certificates.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.permissions/6.0.0/system.security.permissions.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.3.0/system.security.principal.windows.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.principal/4.3.0/system.security.principal.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding.extensions/4.0.11/system.text.encoding.extensions.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding.extensions/4.3.0/system.text.encoding.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding/4.0.11/system.text.encoding.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.regularexpressions/4.1.0/system.text.regularexpressions.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.regularexpressions/4.3.0/system.text.regularexpressions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.0.0/system.threading.tasks.extensions.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.3.0/system.threading.tasks.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks/4.0.11/system.threading.tasks.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.thread/4.0.0/system.threading.thread.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.thread/4.3.0/system.threading.thread.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.threadpool/4.0.10/system.threading.threadpool.4.0.10.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.threadpool/4.3.0/system.threading.threadpool.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.timer/4.0.1/system.threading.timer.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.threading/4.0.11/system.threading.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.threading/4.3.0/system.threading.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.windows.extensions/6.0.0/system.windows.extensions.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.readerwriter/4.0.11/system.xml.readerwriter.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.readerwriter/4.3.0/system.xml.readerwriter.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.xdocument/4.0.11/system.xml.xdocument.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.xmldocument/4.0.1/system.xml.xmldocument.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.xmldocument/4.3.0/system.xml.xmldocument.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.xmlserializer/4.0.11/system.xml.xmlserializer.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.xpath.xmldocument/4.0.1/system.xml.xpath.xmldocument.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.xpath.xmldocument/4.3.0/system.xml.xpath.xmldocument.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.xpath/4.0.1/system.xml.xpath.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.xpath/4.3.0/system.xml.xpath.4.3.0.nupkg
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	dotnet-pkg	9f041be16373f3b3c2ad1ae7a7559960	dotnet-pkg-base	3e91bc4d3bc423a7b9dc30a94279901c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	nuget	e90611a22e7a711a49d37cb365b878e8
-_md5_=b7063e9660f396218cc39a960ba2c139
+_md5_=74f36225e832ff7b7f0b4d7fd150d37c
diff --git a/metadata/md5-cache/dev-lang/elixir-1.15.7 b/metadata/md5-cache/dev-lang/elixir-1.15.7
index 3c366a5d229d..efc21425e366 100644
--- a/metadata/md5-cache/dev-lang/elixir-1.15.7
+++ b/metadata/md5-cache/dev-lang/elixir-1.15.7
@@ -4,10 +4,10 @@ DESCRIPTION=Elixir programming language
 EAPI=8
 HOMEPAGE=https://elixir-lang.org
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ppc ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ~riscv ~sparc x86
 LICENSE=Apache-2.0 ErlPL-1.1
 RDEPEND=>=dev-lang/erlang-24:0=[ssl] <dev-lang/erlang-27 !!sci-biology/phylip
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/elixir-lang/elixir/archive/v1.15.7.tar.gz -> elixir-1.15.7.tar.gz
-_md5_=b889e89b2ab4fd1ff17b6f1a4f146a85
+_md5_=61f9be79ae996536cf2b1005731e0d0b
diff --git a/metadata/md5-cache/dev-lang/gleam-1.0.0 b/metadata/md5-cache/dev-lang/gleam-1.0.0
deleted file mode 100644
index b577b0513ea9..000000000000
--- a/metadata/md5-cache/dev-lang/gleam-1.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=virtual/rust-1.53
-DEFINED_PHASES=compile configure install postinst test unpack
-DESCRIPTION=A friendly language for building type-safe, scalable systems!
-EAPI=8
-HOMEPAGE=https://gleam.run https://github.com/gleam-lang/gleam
-INHERIT=cargo optfeature
-IUSE=debug
-KEYWORDS=~amd64
-LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB openssl
-RDEPEND=dev-lang/erlang:*
-SLOT=0
-SRC_URI=https://github.com/gleam-lang/gleam/archive/refs/tags/v1.0.0.tar.gz -> gleam-1.0.0.tar.gz https://crates.io/api/v1/crates/addr2line/0.21.0/download -> addr2line-0.21.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aho-corasick/1.1.2/download -> aho-corasick-1.1.2.crate https://crates.io/api/v1/crates/askama/0.12.1/download -> askama-0.12.1.crate https://crates.io/api/v1/crates/askama_derive/0.12.5/download -> askama_derive-0.12.5.crate https://crates.io/api/v1/crates/askama_escape/0.10.3/download -> askama_escape-0.10.3.crate https://crates.io/api/v1/crates/askama_parser/0.2.1/download -> askama_parser-0.2.1.crate https://crates.io/api/v1/crates/asn1-rs/0.5.2/download -> asn1-rs-0.5.2.crate https://crates.io/api/v1/crates/asn1-rs-derive/0.4.0/download -> asn1-rs-derive-0.4.0.crate https://crates.io/api/v1/crates/asn1-rs-impl/0.1.0/download -> asn1-rs-impl-0.1.0.crate https://crates.io/api/v1/crates/async-trait/0.1.77/download -> async-trait-0.1.77.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/backtrace/0.3.69/download -> backtrace-0.3.69.crate https://crates.io/api/v1/crates/base16/0.2.1/download -> base16-0.2.1.crate https://crates.io/api/v1/crates/base64/0.13.1/download -> base64-0.13.1.crate https://crates.io/api/v1/crates/base64/0.21.7/download -> base64-0.21.7.crate https://crates.io/api/v1/crates/basic-toml/0.1.8/download -> basic-toml-0.1.8.crate https://crates.io/api/v1/crates/bincode/1.3.3/download -> bincode-1.3.3.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bitflags/2.4.2/download -> bitflags-2.4.2.crate https://crates.io/api/v1/crates/bitmaps/2.1.0/download -> bitmaps-2.1.0.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/bstr/1.9.0/download -> bstr-1.9.0.crate https://crates.io/api/v1/crates/bumpalo/3.15.2/download -> bumpalo-3.15.2.crate https://crates.io/api/v1/crates/bytes/1.5.0/download -> bytes-1.5.0.crate https://crates.io/api/v1/crates/camino/1.1.6/download -> camino-1.1.6.crate https://crates.io/api/v1/crates/capnp/0.14.11/download -> capnp-0.14.11.crate https://crates.io/api/v1/crates/capnpc/0.14.9/download -> capnpc-0.14.9.crate https://crates.io/api/v1/crates/cc/1.0.86/download -> cc-1.0.86.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/clap/3.2.25/download -> clap-3.2.25.crate https://crates.io/api/v1/crates/clap_derive/3.2.25/download -> clap_derive-3.2.25.crate https://crates.io/api/v1/crates/clap_lex/0.2.4/download -> clap_lex-0.2.4.crate https://crates.io/api/v1/crates/codespan-reporting/0.11.1/download -> codespan-reporting-0.11.1.crate https://crates.io/api/v1/crates/combine/4.6.6/download -> combine-4.6.6.crate https://crates.io/api/v1/crates/console/0.15.8/download -> console-0.15.8.crate https://crates.io/api/v1/crates/console_error_panic_hook/0.1.7/download -> console_error_panic_hook-0.1.7.crate https://crates.io/api/v1/crates/core-foundation/0.9.4/download -> core-foundation-0.9.4.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.6/download -> core-foundation-sys-0.8.6.crate https://crates.io/api/v1/crates/cpufeatures/0.2.12/download -> cpufeatures-0.2.12.crate https://crates.io/api/v1/crates/crc32fast/1.4.0/download -> crc32fast-1.4.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.11/download -> crossbeam-channel-0.5.11.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.5/download -> crossbeam-deque-0.8.5.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.18/download -> crossbeam-epoch-0.9.18.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.19/download -> crossbeam-utils-0.8.19.crate https://crates.io/api/v1/crates/ctrlc/3.4.2/download -> ctrlc-3.4.2.crate https://crates.io/api/v1/crates/data-encoding/2.5.0/download -> data-encoding-2.5.0.crate https://crates.io/api/v1/crates/debug-ignore/1.0.5/download -> debug-ignore-1.0.5.crate https://crates.io/api/v1/crates/der-parser/8.2.0/download -> der-parser-8.2.0.crate https://crates.io/api/v1/crates/deranged/0.3.11/download -> deranged-0.3.11.crate https://crates.io/api/v1/crates/diff/0.1.13/download -> diff-0.1.13.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/displaydoc/0.2.4/download -> displaydoc-0.2.4.crate https://crates.io/api/v1/crates/ecow/0.2.0/download -> ecow-0.2.0.crate https://crates.io/api/v1/crates/either/1.10.0/download -> either-1.10.0.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding_rs/0.8.33/download -> encoding_rs-0.8.33.crate https://crates.io/api/v1/crates/equivalent/1.0.1/download -> equivalent-1.0.1.crate https://crates.io/api/v1/crates/errno/0.3.8/download -> errno-0.3.8.crate https://crates.io/api/v1/crates/fastrand/2.0.1/download -> fastrand-2.0.1.crate https://crates.io/api/v1/crates/filetime/0.2.23/download -> filetime-0.2.23.crate https://crates.io/api/v1/crates/fixedbitset/0.4.2/download -> fixedbitset-0.4.2.crate https://crates.io/api/v1/crates/flate2/1.0.28/download -> flate2-1.0.28.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.2.1/download -> form_urlencoded-1.2.1.crate https://crates.io/api/v1/crates/fs_extra/1.3.0/download -> fs_extra-1.3.0.crate https://crates.io/api/v1/crates/fslock/0.2.1/download -> fslock-0.2.1.crate https://crates.io/api/v1/crates/futures/0.3.30/download -> futures-0.3.30.crate https://crates.io/api/v1/crates/futures-channel/0.3.30/download -> futures-channel-0.3.30.crate https://crates.io/api/v1/crates/futures-core/0.3.30/download -> futures-core-0.3.30.crate https://crates.io/api/v1/crates/futures-executor/0.3.30/download -> futures-executor-0.3.30.crate https://crates.io/api/v1/crates/futures-io/0.3.30/download -> futures-io-0.3.30.crate https://crates.io/api/v1/crates/futures-macro/0.3.30/download -> futures-macro-0.3.30.crate https://crates.io/api/v1/crates/futures-sink/0.3.30/download -> futures-sink-0.3.30.crate https://crates.io/api/v1/crates/futures-task/0.3.30/download -> futures-task-0.3.30.crate https://crates.io/api/v1/crates/futures-util/0.3.30/download -> futures-util-0.3.30.crate https://crates.io/api/v1/crates/generic-array/0.14.7/download -> generic-array-0.14.7.crate https://crates.io/api/v1/crates/getrandom/0.2.12/download -> getrandom-0.2.12.crate https://crates.io/api/v1/crates/gimli/0.28.1/download -> gimli-0.28.1.crate https://crates.io/api/v1/crates/globset/0.4.14/download -> globset-0.4.14.crate https://crates.io/api/v1/crates/h2/0.3.24/download -> h2-0.3.24.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/hashbrown/0.14.3/download -> hashbrown-0.14.3.crate https://crates.io/api/v1/crates/heck/0.4.1/download -> heck-0.4.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hermit-abi/0.3.6/download -> hermit-abi-0.3.6.crate https://crates.io/api/v1/crates/hexpm/2.1.1/download -> hexpm-2.1.1.crate https://crates.io/api/v1/crates/hostname/0.3.1/download -> hostname-0.3.1.crate https://crates.io/api/v1/crates/http/0.2.11/download -> http-0.2.11.crate https://crates.io/api/v1/crates/http-auth-basic/0.3.3/download -> http-auth-basic-0.3.3.crate https://crates.io/api/v1/crates/http-body/0.4.6/download -> http-body-0.4.6.crate https://crates.io/api/v1/crates/httparse/1.8.0/download -> httparse-1.8.0.crate https://crates.io/api/v1/crates/httpdate/1.0.3/download -> httpdate-1.0.3.crate https://crates.io/api/v1/crates/humansize/2.1.3/download -> humansize-2.1.3.crate https://crates.io/api/v1/crates/hyper/0.14.28/download -> hyper-0.14.28.crate https://crates.io/api/v1/crates/hyper-rustls/0.24.2/download -> hyper-rustls-0.24.2.crate https://crates.io/api/v1/crates/id-arena/2.2.1/download -> id-arena-2.2.1.crate https://crates.io/api/v1/crates/idna/0.5.0/download -> idna-0.5.0.crate https://crates.io/api/v1/crates/ignore/0.4.22/download -> ignore-0.4.22.crate https://crates.io/api/v1/crates/im/15.1.0/download -> im-15.1.0.crate https://crates.io/api/v1/crates/indexmap/1.9.3/download -> indexmap-1.9.3.crate https://crates.io/api/v1/crates/indexmap/2.2.3/download -> indexmap-2.2.3.crate https://crates.io/api/v1/crates/insta/1.35.1/download -> insta-1.35.1.crate https://crates.io/api/v1/crates/ipnet/2.9.0/download -> ipnet-2.9.0.crate https://crates.io/api/v1/crates/itertools/0.10.5/download -> itertools-0.10.5.crate https://crates.io/api/v1/crates/itoa/1.0.10/download -> itoa-1.0.10.crate https://crates.io/api/v1/crates/js-sys/0.3.68/download -> js-sys-0.3.68.crate https://crates.io/api/v1/crates/kstring/1.0.6/download -> kstring-1.0.6.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.153/download -> libc-0.2.153.crate https://crates.io/api/v1/crates/libm/0.2.8/download -> libm-0.2.8.crate https://crates.io/api/v1/crates/libredox/0.0.1/download -> libredox-0.0.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.6/download -> linked-hash-map-0.5.6.crate https://crates.io/api/v1/crates/linux-raw-sys/0.4.13/download -> linux-raw-sys-0.4.13.crate https://crates.io/api/v1/crates/log/0.4.20/download -> log-0.4.20.crate https://crates.io/api/v1/crates/lsp-server/0.7.6/download -> lsp-server-0.7.6.crate https://crates.io/api/v1/crates/lsp-types/0.94.1/download -> lsp-types-0.94.1.crate https://crates.io/api/v1/crates/match_cfg/0.1.0/download -> match_cfg-0.1.0.crate https://crates.io/api/v1/crates/matchers/0.1.0/download -> matchers-0.1.0.crate https://crates.io/api/v1/crates/memchr/2.7.1/download -> memchr-2.7.1.crate https://crates.io/api/v1/crates/mime/0.3.17/download -> mime-0.3.17.crate https://crates.io/api/v1/crates/mime_guess/2.0.4/download -> mime_guess-2.0.4.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.7.2/download -> miniz_oxide-0.7.2.crate https://crates.io/api/v1/crates/mio/0.8.10/download -> mio-0.8.10.crate https://crates.io/api/v1/crates/nix/0.27.1/download -> nix-0.27.1.crate https://crates.io/api/v1/crates/nom/7.1.3/download -> nom-7.1.3.crate https://crates.io/api/v1/crates/normpath/1.2.0/download -> normpath-1.2.0.crate https://crates.io/api/v1/crates/nu-ansi-term/0.46.0/download -> nu-ansi-term-0.46.0.crate https://crates.io/api/v1/crates/num-bigint/0.4.4/download -> num-bigint-0.4.4.crate https://crates.io/api/v1/crates/num-conv/0.1.0/download -> num-conv-0.1.0.crate https://crates.io/api/v1/crates/num-integer/0.1.46/download -> num-integer-0.1.46.crate https://crates.io/api/v1/crates/num-traits/0.2.18/download -> num-traits-0.2.18.crate https://crates.io/api/v1/crates/num_cpus/1.16.0/download -> num_cpus-1.16.0.crate https://crates.io/api/v1/crates/object/0.32.2/download -> object-0.32.2.crate https://crates.io/api/v1/crates/oid-registry/0.6.1/download -> oid-registry-0.6.1.crate https://crates.io/api/v1/crates/once_cell/1.19.0/download -> once_cell-1.19.0.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/opener/0.6.1/download -> opener-0.6.1.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/os_str_bytes/6.6.1/download -> os_str_bytes-6.6.1.crate https://crates.io/api/v1/crates/overload/0.1.1/download -> overload-0.1.1.crate https://crates.io/api/v1/crates/pathdiff/0.2.1/download -> pathdiff-0.2.1.crate https://crates.io/api/v1/crates/percent-encoding/2.3.1/download -> percent-encoding-2.3.1.crate https://crates.io/api/v1/crates/petgraph/0.6.4/download -> petgraph-0.6.4.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.13/download -> pin-project-lite-0.2.13.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/powerfmt/0.2.0/download -> powerfmt-0.2.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.17/download -> ppv-lite86-0.2.17.crate https://crates.io/api/v1/crates/pretty_assertions/1.4.0/download -> pretty_assertions-1.4.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-macro2/1.0.78/download -> proc-macro2-1.0.78.crate https://crates.io/api/v1/crates/protobuf/2.28.0/download -> protobuf-2.28.0.crate https://crates.io/api/v1/crates/protobuf-codegen/2.28.0/download -> protobuf-codegen-2.28.0.crate https://crates.io/api/v1/crates/protobuf-codegen-pure/2.28.0/download -> protobuf-codegen-pure-2.28.0.crate https://crates.io/api/v1/crates/pubgrub/0.2.1/download -> pubgrub-0.2.1.crate https://crates.io/api/v1/crates/pulldown-cmark/0.8.0/download -> pulldown-cmark-0.8.0.crate https://crates.io/api/v1/crates/quote/1.0.35/download -> quote-1.0.35.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/rand_xoshiro/0.6.0/download -> rand_xoshiro-0.6.0.crate https://crates.io/api/v1/crates/redox_syscall/0.4.1/download -> redox_syscall-0.4.1.crate https://crates.io/api/v1/crates/redox_users/0.4.4/download -> redox_users-0.4.4.crate https://crates.io/api/v1/crates/regex/1.10.3/download -> regex-1.10.3.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-automata/0.4.5/download -> regex-automata-0.4.5.crate https://crates.io/api/v1/crates/regex-syntax/0.6.29/download -> regex-syntax-0.6.29.crate https://crates.io/api/v1/crates/regex-syntax/0.8.2/download -> regex-syntax-0.8.2.crate https://crates.io/api/v1/crates/reqwest/0.11.24/download -> reqwest-0.11.24.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/ring/0.17.8/download -> ring-0.17.8.crate https://crates.io/api/v1/crates/rpassword/5.0.1/download -> rpassword-5.0.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.23/download -> rustc-demangle-0.1.23.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rusticata-macros/4.1.0/download -> rusticata-macros-4.1.0.crate https://crates.io/api/v1/crates/rustix/0.38.31/download -> rustix-0.38.31.crate https://crates.io/api/v1/crates/rustls/0.21.10/download -> rustls-0.21.10.crate https://crates.io/api/v1/crates/rustls-native-certs/0.6.3/download -> rustls-native-certs-0.6.3.crate https://crates.io/api/v1/crates/rustls-pemfile/1.0.4/download -> rustls-pemfile-1.0.4.crate https://crates.io/api/v1/crates/rustls-webpki/0.101.7/download -> rustls-webpki-0.101.7.crate https://crates.io/api/v1/crates/rustversion/1.0.14/download -> rustversion-1.0.14.crate https://crates.io/api/v1/crates/ryu/1.0.17/download -> ryu-1.0.17.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.23/download -> schannel-0.1.23.crate https://crates.io/api/v1/crates/scoped-tls/1.0.1/download -> scoped-tls-1.0.1.crate https://crates.io/api/v1/crates/sct/0.7.1/download -> sct-0.7.1.crate https://crates.io/api/v1/crates/security-framework/2.9.2/download -> security-framework-2.9.2.crate https://crates.io/api/v1/crates/security-framework-sys/2.9.1/download -> security-framework-sys-2.9.1.crate https://crates.io/api/v1/crates/serde/1.0.197/download -> serde-1.0.197.crate https://crates.io/api/v1/crates/serde-wasm-bindgen/0.4.5/download -> serde-wasm-bindgen-0.4.5.crate https://crates.io/api/v1/crates/serde_derive/1.0.197/download -> serde_derive-1.0.197.crate https://crates.io/api/v1/crates/serde_json/1.0.114/download -> serde_json-1.0.114.crate https://crates.io/api/v1/crates/serde_repr/0.1.18/download -> serde_repr-0.1.18.crate https://crates.io/api/v1/crates/serde_urlencoded/0.7.1/download -> serde_urlencoded-0.7.1.crate https://crates.io/api/v1/crates/sha2/0.9.9/download -> sha2-0.9.9.crate https://crates.io/api/v1/crates/sharded-slab/0.1.7/download -> sharded-slab-0.1.7.crate https://crates.io/api/v1/crates/similar/2.4.0/download -> similar-2.4.0.crate https://crates.io/api/v1/crates/sized-chunks/0.6.5/download -> sized-chunks-0.6.5.crate https://crates.io/api/v1/crates/slab/0.4.9/download -> slab-0.4.9.crate https://crates.io/api/v1/crates/smallvec/1.13.1/download -> smallvec-1.13.1.crate https://crates.io/api/v1/crates/smawk/0.3.2/download -> smawk-0.3.2.crate https://crates.io/api/v1/crates/socket2/0.5.5/download -> socket2-0.5.5.crate https://crates.io/api/v1/crates/spdx/0.8.1/download -> spdx-0.8.1.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/spin/0.9.8/download -> spin-0.9.8.crate https://crates.io/api/v1/crates/static_vcruntime/2.0.0/download -> static_vcruntime-2.0.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/strum/0.24.1/download -> strum-0.24.1.crate https://crates.io/api/v1/crates/strum_macros/0.24.3/download -> strum_macros-0.24.3.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/syn/2.0.50/download -> syn-2.0.50.crate https://crates.io/api/v1/crates/sync_wrapper/0.1.2/download -> sync_wrapper-0.1.2.crate https://crates.io/api/v1/crates/synstructure/0.12.6/download -> synstructure-0.12.6.crate https://crates.io/api/v1/crates/system-configuration/0.5.1/download -> system-configuration-0.5.1.crate https://crates.io/api/v1/crates/system-configuration-sys/0.5.0/download -> system-configuration-sys-0.5.0.crate https://crates.io/api/v1/crates/tar/0.4.40/download -> tar-0.4.40.crate https://crates.io/api/v1/crates/tempfile/3.10.0/download -> tempfile-3.10.0.crate https://crates.io/api/v1/crates/termcolor/1.4.1/download -> termcolor-1.4.1.crate https://crates.io/api/v1/crates/terminal_size/0.1.17/download -> terminal_size-0.1.17.crate https://crates.io/api/v1/crates/textwrap/0.15.0/download -> textwrap-0.15.0.crate https://crates.io/api/v1/crates/textwrap/0.16.1/download -> textwrap-0.16.1.crate https://crates.io/api/v1/crates/thiserror/1.0.57/download -> thiserror-1.0.57.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.57/download -> thiserror-impl-1.0.57.crate https://crates.io/api/v1/crates/thread_local/1.1.8/download -> thread_local-1.1.8.crate https://crates.io/api/v1/crates/time/0.3.34/download -> time-0.3.34.crate https://crates.io/api/v1/crates/time-core/0.1.2/download -> time-core-0.1.2.crate https://crates.io/api/v1/crates/time-macros/0.2.17/download -> time-macros-0.2.17.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.1/download -> tinyvec_macros-0.1.1.crate https://crates.io/api/v1/crates/tokio/1.36.0/download -> tokio-1.36.0.crate https://crates.io/api/v1/crates/tokio-rustls/0.24.1/download -> tokio-rustls-0.24.1.crate https://crates.io/api/v1/crates/tokio-util/0.7.10/download -> tokio-util-0.7.10.crate https://crates.io/api/v1/crates/toml/0.5.11/download -> toml-0.5.11.crate https://crates.io/api/v1/crates/toml_edit/0.9.1/download -> toml_edit-0.9.1.crate https://crates.io/api/v1/crates/tower-service/0.3.2/download -> tower-service-0.3.2.crate https://crates.io/api/v1/crates/tracing/0.1.40/download -> tracing-0.1.40.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.27/download -> tracing-attributes-0.1.27.crate https://crates.io/api/v1/crates/tracing-core/0.1.32/download -> tracing-core-0.1.32.crate https://crates.io/api/v1/crates/tracing-log/0.2.0/download -> tracing-log-0.2.0.crate https://crates.io/api/v1/crates/tracing-subscriber/0.3.18/download -> tracing-subscriber-0.3.18.crate https://crates.io/api/v1/crates/tracing-wasm/0.2.1/download -> tracing-wasm-0.2.1.crate https://crates.io/api/v1/crates/try-lock/0.2.5/download -> try-lock-0.2.5.crate https://crates.io/api/v1/crates/typenum/1.17.0/download -> typenum-1.17.0.crate https://crates.io/api/v1/crates/unicase/2.7.0/download -> unicase-2.7.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.15/download -> unicode-bidi-0.3.15.crate https://crates.io/api/v1/crates/unicode-ident/1.0.12/download -> unicode-ident-1.0.12.crate https://crates.io/api/v1/crates/unicode-linebreak/0.1.5/download -> unicode-linebreak-0.1.5.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.23/download -> unicode-normalization-0.1.23.crate https://crates.io/api/v1/crates/unicode-width/0.1.11/download -> unicode-width-0.1.11.crate https://crates.io/api/v1/crates/unicode-xid/0.2.4/download -> unicode-xid-0.2.4.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/untrusted/0.9.0/download -> untrusted-0.9.0.crate https://crates.io/api/v1/crates/url/2.5.0/download -> url-2.5.0.crate https://crates.io/api/v1/crates/valuable/0.1.0/download -> valuable-0.1.0.crate https://crates.io/api/v1/crates/vec1/1.10.1/download -> vec1-1.10.1.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/walkdir/2.4.0/download -> walkdir-2.4.0.crate https://crates.io/api/v1/crates/want/0.3.1/download -> want-0.3.1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.91/download -> wasm-bindgen-0.2.91.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.91/download -> wasm-bindgen-backend-0.2.91.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.41/download -> wasm-bindgen-futures-0.4.41.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.91/download -> wasm-bindgen-macro-0.2.91.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.91/download -> wasm-bindgen-macro-support-0.2.91.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.91/download -> wasm-bindgen-shared-0.2.91.crate https://crates.io/api/v1/crates/wasm-bindgen-test/0.3.41/download -> wasm-bindgen-test-0.3.41.crate https://crates.io/api/v1/crates/wasm-bindgen-test-macro/0.3.41/download -> wasm-bindgen-test-macro-0.3.41.crate https://crates.io/api/v1/crates/web-sys/0.3.68/download -> web-sys-0.3.68.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-util/0.1.6/download -> winapi-util-0.1.6.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 https://crates.io/api/v1/crates/windows-sys/0.48.0/download -> windows-sys-0.48.0.crate https://crates.io/api/v1/crates/windows-sys/0.52.0/download -> windows-sys-0.52.0.crate https://crates.io/api/v1/crates/windows-targets/0.48.5/download -> windows-targets-0.48.5.crate https://crates.io/api/v1/crates/windows-targets/0.52.0/download -> windows-targets-0.52.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.48.5/download -> windows_aarch64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.52.0/download -> windows_aarch64_gnullvm-0.52.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.48.5/download -> windows_aarch64_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.52.0/download -> windows_aarch64_msvc-0.52.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.48.5/download -> windows_i686_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.52.0/download -> windows_i686_gnu-0.52.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.48.5/download -> windows_i686_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.52.0/download -> windows_i686_msvc-0.52.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.48.5/download -> windows_x86_64_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.52.0/download -> windows_x86_64_gnu-0.52.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.48.5/download -> windows_x86_64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.52.0/download -> windows_x86_64_gnullvm-0.52.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.48.5/download -> windows_x86_64_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.52.0/download -> windows_x86_64_msvc-0.52.0.crate https://crates.io/api/v1/crates/winreg/0.50.0/download -> winreg-0.50.0.crate https://crates.io/api/v1/crates/x509-parser/0.15.1/download -> x509-parser-0.15.1.crate https://crates.io/api/v1/crates/xattr/1.3.1/download -> xattr-1.3.1.crate https://crates.io/api/v1/crates/xxhash-rust/0.8.10/download -> xxhash-rust-0.8.10.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate https://crates.io/api/v1/crates/yansi/0.5.1/download -> yansi-0.5.1.crate
-_eclasses_=cargo	4dede41d64d595673f6da62ab5540fa0	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=8a8deea1c43b7f8c5869d53ca21a8bc0
diff --git a/metadata/md5-cache/dev-lang/gleam-1.1.0 b/metadata/md5-cache/dev-lang/gleam-1.1.0
new file mode 100644
index 000000000000..cbd6641f09ff
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/gleam-1.1.0
@@ -0,0 +1,14 @@
+BDEPEND=>=virtual/rust-1.53
+DEFINED_PHASES=compile configure install postinst test unpack
+DESCRIPTION=A friendly language for building type-safe, scalable systems!
+EAPI=8
+HOMEPAGE=https://gleam.run https://github.com/gleam-lang/gleam
+INHERIT=cargo optfeature
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB openssl
+RDEPEND=dev-lang/erlang:*
+SLOT=0
+SRC_URI=https://github.com/gleam-lang/gleam/archive/refs/tags/v1.1.0.tar.gz -> gleam-1.1.0.tar.gz https://dev.gentoo.org/~matthew/distfiles/gleam-1.1.0-crates.tar.xz
+_eclasses_=cargo	4dede41d64d595673f6da62ab5540fa0	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=e8c54b62c2684b0d54d7fccb813c1147
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2021-r5 b/metadata/md5-cache/dev-lang/gnat-gpl-2021-r5
index 6b55085e345b..bde6c6dde063 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2021-r5
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2021-r5
@@ -13,5 +13,5 @@ RDEPEND=!=sys-devel/gcc-10.3.1* sys-libs/zlib virtual/libiconv nls? ( virtual/li
 RESTRICT=test !test? ( test )
 SLOT=10
 SRC_URI=https://community.download.adacore.com/v1/005d2b2eff627177986d2517eb31e1959bec6f3a?filename=gnat-2021-20210519-19A70-src.tar.gz -> gnat-2021-20210519-19A70-src.tar.gz https://community.download.adacore.com/v1/44cd393be0b468cc253bf2cf9cf7804c993e7b5b?filename=gcc-10-2021-20210519-19A74-src.tar.gz -> gcc-10-2021-20210519-19A74-src.tar.gz https://community.download.adacore.com/v1/8ace7d06e469d36d726cc8badb0ed78411e727f3?filename=gcc-interface-10-2021-20210519-19A75-src.tar.gz -> gcc-interface-10-2021-20210519-19A75-src.tar.gz bootstrap? ( amd64? ( https://community.download.adacore.com/v1/6eb6eef6bb897e4c743a519bfebe0b1d6fc409c6?filename=gnat-gpl-2014-x86_64-linux-bin.tar.gz&rand=1193 -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( https://community.download.adacore.com/v1/c5e9e6fdff5cb77ed90cf8c62536653e27c0bed6?filename=gnat-gpl-2014-x86-linux-bin.tar.gz&rand=436 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) https://dev.gentoo.org/~soap/distfiles/gcc-10.3.0-patches-4.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-10.3.0-patches-4.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.3.0-patches-4.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-4.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-4.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-4.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-4.tar.xz mirror://gentoo/gcc-10.3.0-patches-4.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gnat-gpl-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=e6b6f04c8031b41ce9027ba2e098f7f6
diff --git a/metadata/md5-cache/dev-lang/nim-2.0.4 b/metadata/md5-cache/dev-lang/nim-2.0.4
new file mode 100644
index 000000000000..32ab93a22654
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/nim-2.0.4
@@ -0,0 +1,15 @@
+BDEPEND=sys-process/parallel test? ( test-js? ( net-libs/nodejs ) )
+DEFINED_PHASES=compile configure install test
+DEPEND=test? ( dev-db/sqlite:3 dev-libs/boehm-gc dev-libs/libffi dev-libs/libpcre:3 dev-libs/openssl media-libs/libsdl media-libs/libsfml )
+DESCRIPTION=Compiled, garbage-collected systems programming language
+EAPI=8
+HOMEPAGE=https://nim-lang.org/ https://github.com/nim-lang/Nim/
+INHERIT=bash-completion-r1 edo multiprocessing toolchain-funcs xdg-utils
+IUSE=test-js test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://nim-lang.org/download/nim-2.0.4.tar.xz https://github.com/nim-lang/atlas/archive/refs/tags/0.8.0.tar.gz -> nim-atlas-0.8.0.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=b80a5cd0c7c419f1fd2e9c75fb26f3af
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 3d99ebd41df4..9556916bf48d 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/folks-0.15.9 b/metadata/md5-cache/dev-libs/folks-0.15.9
index 779fd535b688..4a532df7f529 100644
--- a/metadata/md5-cache/dev-libs/folks-0.15.9
+++ b/metadata/md5-cache/dev-libs/folks-0.15.9
@@ -7,7 +7,7 @@ HOMEPAGE=https://wiki.gnome.org/Projects/Folks https://gitlab.gnome.org/GNOME/fo
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
 IUSE=bluetooth eds telepathy test utils
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.58:2 >=dev-libs/libgee-0.10:0.8[introspection] >=dev-libs/gobject-introspection-1.54:= telepathy? ( >=net-libs/telepathy-glib-0.19.9 dev-libs/dbus-glib ) eds? ( >=gnome-extra/evolution-data-server-3.38:= ) dev-libs/libxml2:2 utils? ( sys-libs/readline:0= ) bluetooth? ( >=net-wireless/bluez-5[obex] ) telepathy? ( net-im/telepathy-mission-control )
 REQUIRED_USE=bluetooth? ( eds )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/26
 SRC_URI=mirror://gnome/sources/folks/0.15/folks-0.15.9.tar.xz
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2-utils	30dbce54b89e77b86f366548f94419ad	meson	92696988eaddba122c4cedc191f59bcb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a6f2e218fba4803473e9a55b6a27bf05
+_md5_=c07e09f54c1ed2d6f847db5f6d650662
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-24.05.28454.17-r1 b/metadata/md5-cache/dev-libs/intel-compute-runtime-24.05.28454.17-r1
index 4a1ce97c8f7f..7a4220b148ff 100644
--- a/metadata/md5-cache/dev-libs/intel-compute-runtime-24.05.28454.17-r1
+++ b/metadata/md5-cache/dev-libs/intel-compute-runtime-24.05.28454.17-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/intel/compute-runtime
 INHERIT=cmake flag-o-matic
 IUSE=+l0 +vaapi
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=>=dev-util/intel-graphics-compiler-1.0.15985.15 >=media-libs/gmmlib-22.3.17:=
 SLOT=0
 SRC_URI=https://github.com/intel/compute-runtime/archive/24.05.28454.17.tar.gz -> intel-compute-runtime-24.05.28454.17.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f396adccc6b2bff08a9e136dc4e2f5a1
+_md5_=c30c613b4cb3a8ebee33d6945be95c0a
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-23.52.28202.23-r1 b/metadata/md5-cache/dev-libs/intel-compute-runtime-24.13.29138.7
index e32aa47eda26..fa08eb63b318 100644
--- a/metadata/md5-cache/dev-libs/intel-compute-runtime-23.52.28202.23-r1
+++ b/metadata/md5-cache/dev-libs/intel-compute-runtime-24.13.29138.7
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-util/intel-graphics-compiler-1.0.15136.4 >=media-libs/gmmlib-22.3.5:= dev-libs/intel-metrics-discovery:= dev-libs/intel-metrics-library:= dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-system-controller-0.8.13:= media-libs/mesa >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.14.0:= ) vaapi? ( x11-libs/libdrm[video_cards_intel] media-libs/libva )
+DEPEND=>=dev-util/intel-graphics-compiler-1.0.15985.15 >=media-libs/gmmlib-22.3.17:= dev-libs/intel-metrics-discovery:= dev-libs/intel-metrics-library:= dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-system-controller-0.8.16:= media-libs/mesa >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.16.1:= ) vaapi? ( x11-libs/libdrm[video_cards_intel] media-libs/libva )
 DESCRIPTION=Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver
 EAPI=8
 HOMEPAGE=https://github.com/intel/compute-runtime
 INHERIT=cmake flag-o-matic
 IUSE=+l0 +vaapi
-KEYWORDS=amd64
+KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=>=dev-util/intel-graphics-compiler-1.0.15136.4 >=media-libs/gmmlib-22.3.5:=
+RDEPEND=>=dev-util/intel-graphics-compiler-1.0.15985.15 >=media-libs/gmmlib-22.3.17:=
 SLOT=0
-SRC_URI=https://github.com/intel/compute-runtime/archive/23.52.28202.23.tar.gz -> intel-compute-runtime-23.52.28202.23.tar.gz
+SRC_URI=https://github.com/intel/compute-runtime/archive/24.13.29138.7.tar.gz -> intel-compute-runtime-24.13.29138.7.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b9960429c8ca3c3737e4d3683016bd60
+_md5_=f396adccc6b2bff08a9e136dc4e2f5a1
diff --git a/metadata/md5-cache/dev-libs/intel-metrics-discovery-1.12.171 b/metadata/md5-cache/dev-libs/intel-metrics-discovery-1.12.171
new file mode 100644
index 000000000000..2997f2d95347
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/intel-metrics-discovery-1.12.171
@@ -0,0 +1,14 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-libs/libdrm
+DESCRIPTION=A user mode library that provides access to GPU performance data
+EAPI=8
+HOMEPAGE=https://github.com/intel/metrics-discovery
+INHERIT=cmake
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=x11-libs/libdrm
+SLOT=0/1.12.171
+SRC_URI=https://github.com/intel/metrics-discovery/archive/refs/tags/metrics-discovery-1.12.171.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=d5e810cf29c65d55ce4ad37c3bbfc6dc
diff --git a/metadata/md5-cache/dev-libs/intel-metrics-library-1.0.161 b/metadata/md5-cache/dev-libs/intel-metrics-library-1.0.161
new file mode 100644
index 000000000000..623f1ccab2f3
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/intel-metrics-library-1.0.161
@@ -0,0 +1,14 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-libs/libdrm
+DESCRIPTION=User mode driver helper library that provides access to GPU performance counters
+EAPI=8
+HOMEPAGE=https://github.com/intel/metrics-library
+INHERIT=cmake
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=x11-libs/libdrm
+SLOT=0/1.0.161
+SRC_URI=https://github.com/intel/metrics-library/archive/refs/tags/metrics-library-1.0.161.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=a367244b144350e0fb37cbc2909d0b5b
diff --git a/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.16.0 b/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.16.0
deleted file mode 100644
index 2c449f76cbdb..000000000000
--- a/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/libxml2:2= sys-devel/llvm:15 sys-libs/zlib !!sys-devel/llvm:0
-DESCRIPTION=A set of new intrinsics on top of core LLVM IR instructions
-EAPI=8
-HOMEPAGE=https://github.com/intel/vc-intrinsics
-INHERIT=cmake llvm python-any-r1
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=dev-libs/libxml2:2= sys-devel/llvm:15 sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/intel/vc-intrinsics/archive/refs/tags/v0.16.0.tar.gz -> intel-vc-intrinsics-0.16.0.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=dbc0a711c4ad689b49c60e1062cbf36b
diff --git a/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.18.0 b/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.18.0
index f86bf8f07737..ca3aca774eee 100644
--- a/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.18.0
+++ b/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.18.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/intel/vc-intrinsics
 INHERIT=cmake llvm-r1 python-any-r1
 IUSE=+llvm_slot_17 llvm_slot_15 llvm_slot_16
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=dev-libs/libxml2:2= llvm_slot_15? ( sys-devel/llvm:15 ) llvm_slot_16? ( sys-devel/llvm:16 ) llvm_slot_17? ( sys-devel/llvm:17 ) sys-libs/zlib
 REQUIRED_USE=^^ ( llvm_slot_15 llvm_slot_16 llvm_slot_17 )
 SLOT=0
 SRC_URI=https://github.com/intel/vc-intrinsics/archive/refs/tags/v0.18.0.tar.gz -> intel-vc-intrinsics-0.18.0.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	llvm-r1	2e652182b1f239b07688071f959f19e4	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0abf82dc225269988db702833ff05cdd
+_md5_=e1ce925be48e1ab0276594fceb8cbfad
diff --git a/metadata/md5-cache/dev-libs/level-zero-1.16.1 b/metadata/md5-cache/dev-libs/level-zero-1.16.1
index f782f23b53b9..129a4396ad43 100644
--- a/metadata/md5-cache/dev-libs/level-zero-1.16.1
+++ b/metadata/md5-cache/dev-libs/level-zero-1.16.1
@@ -4,9 +4,9 @@ DESCRIPTION=oneAPI Level Zero headers, loader and validation layer
 EAPI=8
 HOMEPAGE=https://github.com/oneapi-src/level-zero
 INHERIT=cmake
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 SLOT=0/1.16.1
 SRC_URI=https://github.com/oneapi-src/level-zero/archive/refs/tags/v1.16.1.tar.gz -> level-zero-1.16.1.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5d1b19b238319c3fc04804f954d43367
+_md5_=2dc97a88a753f94e937605e1b30dfa82
diff --git a/metadata/md5-cache/dev-libs/level-zero-1.15.8 b/metadata/md5-cache/dev-libs/level-zero-1.16.14
index 884b02ba3338..e1a1b91016b7 100644
--- a/metadata/md5-cache/dev-libs/level-zero-1.15.8
+++ b/metadata/md5-cache/dev-libs/level-zero-1.16.14
@@ -1,12 +1,13 @@
 BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/spdlog:=
 DESCRIPTION=oneAPI Level Zero headers, loader and validation layer
 EAPI=8
 HOMEPAGE=https://github.com/oneapi-src/level-zero
 INHERIT=cmake
-KEYWORDS=amd64
+KEYWORDS=~amd64
 LICENSE=MIT
-SLOT=0/1.15.8
-SRC_URI=https://github.com/oneapi-src/level-zero/archive/refs/tags/v1.15.8.tar.gz -> level-zero-1.15.8.tar.gz
+SLOT=0/1.16.14
+SRC_URI=https://github.com/oneapi-src/level-zero/archive/refs/tags/v1.16.14.tar.gz -> level-zero-1.16.14.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2dc97a88a753f94e937605e1b30dfa82
+_md5_=2803e1677edecfe4f29b2ef52a1ce76f
diff --git a/metadata/md5-cache/dev-libs/libdbusmenu-lxqt-0.1.0 b/metadata/md5-cache/dev-libs/libdbusmenu-lxqt-0.1.0
new file mode 100644
index 000000000000..4194ccfd6507
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libdbusmenu-lxqt-0.1.0
@@ -0,0 +1,13 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=LXQt DBusMenu Implementation
+EAPI=8
+HOMEPAGE=https://lxqt-project.org/
+INHERIT=cmake
+KEYWORDS=~amd64
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtbase-6.6:6[dbus,widgets]
+SLOT=0
+SRC_URI=https://github.com/lxqt/libdbusmenu-lxqt/releases/download/0.1.0/libdbusmenu-lxqt-0.1.0.tar.xz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=6db7c38fbf0be19772053a41ba5654e0
diff --git a/metadata/md5-cache/dev-libs/libgusb-0.4.8 b/metadata/md5-cache/dev-libs/libgusb-0.4.8
index 19d1698d4ed7..f5c55dd5d998 100644
--- a/metadata/md5-cache/dev-libs/libgusb-0.4.8
+++ b/metadata/md5-cache/dev-libs/libgusb-0.4.8
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/hughsie/libgusb
 INHERIT=meson-multilib python-any-r1 vala
 IUSE=gtk-doc +introspection test +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[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(-)?] >=dev-libs/json-glib-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) sys-apps/hwdata
 REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hughsie/libgusb/releases/download/0.4.8/libgusb-0.4.8.tar.xz
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	meson	92696988eaddba122c4cedc191f59bcb	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16
-_md5_=91d34b8b38db773f54f7d79e7d348d7d
+_md5_=89e9be3e5713bfc4a5e14031979215ba
diff --git a/metadata/md5-cache/dev-libs/libunistring-1.2 b/metadata/md5-cache/dev-libs/libunistring-1.2
index 3d7179c8a6db..86c179d10099 100644
--- a/metadata/md5-cache/dev-libs/libunistring-1.2
+++ b/metadata/md5-cache/dev-libs/libunistring-1.2
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/libunistring/
 INHERIT=multilib-minimal libtool
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=|| ( LGPL-3+ GPL-2+ ) || ( FDL-1.2 GPL-3+ )
 SLOT=0/5
 SRC_URI=mirror://gnu/libunistring/libunistring-1.2.tar.xz
 _eclasses_=libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=1f5604c4348cdb8e6d76807ef75370f4
+_md5_=4a12626549383cd340f93bcfeab098f8
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-15.0.0 b/metadata/md5-cache/dev-libs/opencl-clang-15.0.0
deleted file mode 100644
index 50d40d38a1f9..000000000000
--- a/metadata/md5-cache/dev-libs/opencl-clang-15.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-util/spirv-llvm-translator:15= sys-devel/clang:15=[static-analyzer] sys-devel/llvm:15= !!sys-devel/llvm:0
-DESCRIPTION=OpenCL-oriented thin wrapper library around clang
-EAPI=8
-HOMEPAGE=https://github.com/intel/opencl-clang
-INHERIT=cmake llvm
-KEYWORDS=amd64 ~riscv
-LICENSE=UoI-NCSA
-RDEPEND=dev-util/spirv-llvm-translator:15= sys-devel/clang:15=[static-analyzer] sys-devel/llvm:15=
-SLOT=15
-SRC_URI=https://github.com/intel/opencl-clang/archive/refs/tags/v15.0.0.tar.gz -> opencl-clang-15.0.0.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=cb30de71fff655bdde3ef7412727cf0c
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-15.0.0-r1 b/metadata/md5-cache/dev-libs/opencl-clang-15.0.0-r1
index 68ef88b86f13..b5038b544bfe 100644
--- a/metadata/md5-cache/dev-libs/opencl-clang-15.0.0-r1
+++ b/metadata/md5-cache/dev-libs/opencl-clang-15.0.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/intel/opencl-clang
 INHERIT=cmake llvm-r1
 IUSE=+llvm_slot_15
-KEYWORDS=~amd64 ~riscv
+KEYWORDS=amd64 ~riscv
 LICENSE=UoI-NCSA
 RDEPEND=dev-util/spirv-llvm-translator:15= llvm_slot_15? ( sys-devel/clang:15=[static-analyzer] sys-devel/llvm:15= )
 REQUIRED_USE=^^ ( llvm_slot_15 )
 SLOT=15
 SRC_URI=https://github.com/intel/opencl-clang/archive/refs/tags/v15.0.0.tar.gz -> opencl-clang-15.0.0.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	llvm-r1	2e652182b1f239b07688071f959f19e4	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=044345a16ea2e3372f06f15ead4ad08c
+_md5_=d249c2ffa4518a547811e0565a6ceaa6
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-16.0.0-r1 b/metadata/md5-cache/dev-libs/opencl-clang-16.0.0-r1
deleted file mode 100644
index afb8604a23b0..000000000000
--- a/metadata/md5-cache/dev-libs/opencl-clang-16.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-util/spirv-llvm-translator:16= sys-devel/clang:16=[static-analyzer] sys-devel/llvm:16= !!sys-devel/llvm:0
-DESCRIPTION=OpenCL-oriented thin wrapper library around clang
-EAPI=8
-HOMEPAGE=https://github.com/intel/opencl-clang
-INHERIT=cmake llvm
-KEYWORDS=amd64 ~riscv
-LICENSE=UoI-NCSA
-RDEPEND=dev-util/spirv-llvm-translator:16= sys-devel/clang:16=[static-analyzer] sys-devel/llvm:16=
-SLOT=16
-SRC_URI=https://github.com/intel/opencl-clang/archive/refs/tags/v16.0.0.tar.gz -> opencl-clang-16.0.0.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=42dd65bca7f3a53208d0e910f87abd92
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-16.0.0-r2 b/metadata/md5-cache/dev-libs/opencl-clang-16.0.0-r2
index 39450aeacae2..fced43520ec6 100644
--- a/metadata/md5-cache/dev-libs/opencl-clang-16.0.0-r2
+++ b/metadata/md5-cache/dev-libs/opencl-clang-16.0.0-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/intel/opencl-clang
 INHERIT=cmake llvm-r1
 IUSE=+llvm_slot_16
-KEYWORDS=~amd64 ~riscv
+KEYWORDS=amd64 ~riscv
 LICENSE=UoI-NCSA
 RDEPEND=dev-util/spirv-llvm-translator:16= llvm_slot_16? ( sys-devel/clang:16=[static-analyzer] sys-devel/llvm:16= )
 REQUIRED_USE=^^ ( llvm_slot_16 )
 SLOT=16
 SRC_URI=https://github.com/intel/opencl-clang/archive/refs/tags/v16.0.0.tar.gz -> opencl-clang-16.0.0.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	llvm-r1	2e652182b1f239b07688071f959f19e4	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f1555591a506b5beb74dc7d871911667
+_md5_=106535aed78022b437a16cce6db2a243
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-17.0.0 b/metadata/md5-cache/dev-libs/opencl-clang-17.0.0
index cf77094a5e40..2b1dcc6f8577 100644
--- a/metadata/md5-cache/dev-libs/opencl-clang-17.0.0
+++ b/metadata/md5-cache/dev-libs/opencl-clang-17.0.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/intel/opencl-clang
 INHERIT=cmake llvm-r1
 IUSE=+llvm_slot_17
-KEYWORDS=~amd64 ~riscv
+KEYWORDS=amd64 ~riscv
 LICENSE=UoI-NCSA
 RDEPEND=dev-util/spirv-llvm-translator:17= llvm_slot_17? ( sys-devel/clang:17=[static-analyzer] sys-devel/llvm:17= )
 REQUIRED_USE=^^ ( llvm_slot_17 )
 SLOT=17
 SRC_URI=https://github.com/intel/opencl-clang/archive/refs/tags/v17.0.0.tar.gz -> opencl-clang-17.0.0.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	llvm-r1	2e652182b1f239b07688071f959f19e4	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e18fafdcdd8abfb4d81e3ce88cadbff7
+_md5_=3cd9f1f4a83bd7711cdaebcbe9d60c4b
diff --git a/metadata/md5-cache/dev-libs/openssl-3.0.13-r2 b/metadata/md5-cache/dev-libs/openssl-3.0.13-r2
index dcca6f9072a5..63d99488993c 100644
--- a/metadata/md5-cache/dev-libs/openssl-3.0.13-r2
+++ b/metadata/md5-cache/dev-libs/openssl-3.0.13-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.openssl.org/
 INHERIT=edo flag-o-matic linux-info toolchain-funcs multilib multilib-minimal multiprocessing preserve-libs verify-sig
 IUSE=+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 PDEPEND=app-misc/ca-certificates
 RDEPEND=tls-compression? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=mirror://openssl/source/openssl-3.0.13.tar.gz verify-sig? ( mirror://openssl/source/openssl-3.0.13.tar.gz.asc )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	linux-info	7ca3057b277f1e5978947b4cc289ce62	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	21162ec96c87041004a75348d97342dd	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=a96841aa683c10f694de0e4e655136cc
+_md5_=095206e0935d4eedbde028c4cfb3997a
diff --git a/metadata/md5-cache/dev-libs/weston-11.0.1-r10 b/metadata/md5-cache/dev-libs/weston-11.0.1-r10
index 66a2bab792cf..378f030b75ea 100644
--- a/metadata/md5-cache/dev-libs/weston-11.0.1-r10
+++ b/metadata/md5-cache/dev-libs/weston-11.0.1-r10
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston
 INHERIT=meson python-any-r1 readme.gentoo-r1 xdg-utils
 IUSE=+desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +seatd +suid systemd test wayland-compositor webp +X xwayland
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~loong ppc64 ~riscv x86
 LICENSE=MIT CC-BY-SA-3.0
 RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.20.0 lcms? ( >=media-libs/lcms-2.9:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.108 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config drm? ( >=media-libs/mesa-17.1[gbm(+)] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) examples? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.3:= ) rdp? ( >=net-misc/freerdp-2.3.0:2=[server] ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) seatd? ( sys-auth/seatd:= ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xwayland x11-libs/cairo[X,xcb(+)] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
 REQUIRED_USE=drm? ( gles2 ) pipewire? ( drm ) remoting? ( drm gles2 ) screen-sharing? ( rdp ) test? ( desktop headless lcms xwayland ) wayland-compositor? ( gles2 ) || ( drm headless rdp wayland-compositor X ) || ( seatd systemd )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/wayland/weston/uploads/f5648c818fba5432edc3ea63c4db4813/weston-11.0.1.tar.xz
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	meson	92696988eaddba122c4cedc191f59bcb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3588549ecfc514d3d44f762ee60f6446
+_md5_=5d23ea2125059ab9c5830d0d5a11e588
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index e81b4306089e..fb5bafb3f808 100644
--- a/metadata/md5-cache/dev-lua/Manifest.gz
+++ b/metadata/md5-cache/dev-lua/Manifest.gz
diff --git a/metadata/md5-cache/dev-lua/dkjson-2.7 b/metadata/md5-cache/dev-lua/dkjson-2.7
index 97dc8a1f10b1..8894977e2f0b 100644
--- a/metadata/md5-cache/dev-lua/dkjson-2.7
+++ b/metadata/md5-cache/dev-lua/dkjson-2.7
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://dkolf.de/src/dkjson-lua.fsl/
 INHERIT=lua
 IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://dkolf.de/dkjson-lua/dkjson-2.7.tar.gz
 _eclasses_=lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=d35c5ebd7a766a682fcf3dfd628f095a
+_md5_=555d8388d19ee2b9dc1a513a4f2dd0b5
diff --git a/metadata/md5-cache/dev-lua/lanes-3.16.2 b/metadata/md5-cache/dev-lua/lanes-3.16.2
deleted file mode 100644
index 6cb77bdb5130..000000000000
--- a/metadata/md5-cache/dev-lua/lanes-3.16.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) )
-DEFINED_PHASES=compile install prepare test
-DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
-DESCRIPTION=Lightweight, native, lazy evaluating multithreading library
-EAPI=8
-HOMEPAGE=https://github.com/LuaLanes/lanes
-INHERIT=lua toolchain-funcs
-IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
-REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/LuaLanes/lanes/archive/v3.16.2.tar.gz -> lanes-3.16.2.tar.gz
-_eclasses_=lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a6645dc7ee4267a1d070e01b2d9ce9b8
diff --git a/metadata/md5-cache/dev-lua/lanes-3.16.3 b/metadata/md5-cache/dev-lua/lanes-3.16.3
index aab9b093d1d0..03ec7b430ca2 100644
--- a/metadata/md5-cache/dev-lua/lanes-3.16.3
+++ b/metadata/md5-cache/dev-lua/lanes-3.16.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/LuaLanes/lanes
 INHERIT=lua toolchain-funcs
 IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/LuaLanes/lanes/archive/v3.16.3.tar.gz -> lanes-3.16.3.tar.gz
 _eclasses_=lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=e235a7cdea31881e747b835f45082cf0
+_md5_=8f4822450373e844fab463efd5df0d96
diff --git a/metadata/md5-cache/dev-lua/luadbi-0.7.3 b/metadata/md5-cache/dev-lua/luadbi-0.7.3
index 450bc4c93b1d..0eb640aa757d 100644
--- a/metadata/md5-cache/dev-lua/luadbi-0.7.3
+++ b/metadata/md5-cache/dev-lua/luadbi-0.7.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/mwild1/luadbi
 INHERIT=lua toolchain-funcs
 IUSE=mysql postgres +sqlite test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite )
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 ) || ( mysql postgres sqlite )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mwild1/luadbi/archive/v0.7.3.tar.gz -> luadbi-0.7.3.tar.gz
 _eclasses_=lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=5de2eb495999e6d3b1e2db4b3a194a46
+_md5_=8267189c60c621f4e0318553d6f0a6c1
diff --git a/metadata/md5-cache/dev-lua/luarocks-3.11.0 b/metadata/md5-cache/dev-lua/luarocks-3.11.0
index ec59ea3bd056..b25e3f7dd4bd 100644
--- a/metadata/md5-cache/dev-lua/luarocks-3.11.0
+++ b/metadata/md5-cache/dev-lua/luarocks-3.11.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://luarocks.org
 INHERIT=lua-single
 IUSE=test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://luarocks.org/releases/luarocks-3.11.0.tar.gz
 _eclasses_=lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=d555ddeda42fffcc8d7dce81ea5ff6c9
+_md5_=23ec001a4ad450088a558be52a42f332
diff --git a/metadata/md5-cache/dev-lua/dkjson-2.6 b/metadata/md5-cache/dev-lua/penlight-1.14.0
index ec467bf41624..abb72619bac6 100644
--- a/metadata/md5-cache/dev-lua/dkjson-2.6
+++ b/metadata/md5-cache/dev-lua/penlight-1.14.0
@@ -1,17 +1,17 @@
 BDEPEND=virtual/pkgconfig test? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) )
-DEFINED_PHASES=install test
+DEFINED_PHASES=install prepare test
 DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
-DESCRIPTION=David Kolf's JSON module for Lua
+DESCRIPTION=Lua utility libraries loosely based on the Python standard libraries
 EAPI=8
-HOMEPAGE=http://dkolf.de/src/dkjson-lua.fsl/
+HOMEPAGE=https://github.com/lunarmodules/Penlight
 INHERIT=lua
 IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
-RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
+RDEPEND=dev-lua/luafilesystem[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=http://dkolf.de/src/dkjson-lua.fsl/tarball/dkjson-2.6.tar.gz?uuid=release_2_5 -> dkjson-2.6.tar.gz
+SRC_URI=https://github.com/lunarmodules/Penlight/archive/1.14.0.tar.gz -> penlight-1.14.0.tar.gz
 _eclasses_=lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f3c677b4b785841234b02c4926e81ca6
+_md5_=91b060ce6cf42eee19f4dd24d855c363
diff --git a/metadata/md5-cache/dev-perl/Cache-Memcached-Fast-0.280.0 b/metadata/md5-cache/dev-perl/Cache-Memcached-Fast-0.280.0
index 65b0ccffd2c2..f90f153b8c66 100644
--- a/metadata/md5-cache/dev-perl/Cache-Memcached-Fast-0.280.0
+++ b/metadata/md5-cache/dev-perl/Cache-Memcached-Fast-0.280.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Cache-Memcached-Fast
 INHERIT=perl-module
 IUSE=test examples
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86
 LICENSE=|| ( Artistic GPL-1+ ) LGPL-2.1+
 RDEPEND=>=virtual/perl-Carp-1.250.0 >=virtual/perl-XSLoader-0.140.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RA/RAZ/Cache-Memcached-Fast-0.28.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4e37e1004a0a27e41bb7025c0b974676	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=cab67e64fc9a74777be7d011120eb3b9
+_md5_=a75dcb854799d973404322a3056e4f55
diff --git a/metadata/md5-cache/dev-perl/GD-2.780.0 b/metadata/md5-cache/dev-perl/GD-2.780.0
index 0c2a334d41f6..841baa6d2c70 100644
--- a/metadata/md5-cache/dev-perl/GD-2.780.0
+++ b/metadata/md5-cache/dev-perl/GD-2.780.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/GD
 INHERIT=perl-module
 IUSE=animgif fcgi test truetype xpm test examples
-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=|| ( Artistic GPL-1+ )
 RDEPEND=>=media-libs/gd-2.2.3[png,jpeg] media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng sys-libs/zlib truetype? ( media-libs/gd[truetype] media-libs/freetype:2 ) xpm? ( media-libs/gd[xpm] x11-libs/libXpm ) fcgi? ( dev-libs/fcgi ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/GD-2.78.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4e37e1004a0a27e41bb7025c0b974676	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a39e0879f7e2d575019b9fce77f7c069
+_md5_=c0b1b9768c774fd24f69d7d38232c3ff
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 7fe481d33137..aeb172e49539 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/Test-Fork-0.20.0 b/metadata/md5-cache/dev-perl/Test-Fork-0.20.0
index 82e00ab29997..b65d0e0c95e9 100644
--- a/metadata/md5-cache/dev-perl/Test-Fork-0.20.0
+++ b/metadata/md5-cache/dev-perl/Test-Fork-0.20.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://metacpan.org/release/Test-Fork
 INHERIT=perl-module
 IUSE=test
-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=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWERN/Test-Fork-0.02.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4e37e1004a0a27e41bb7025c0b974676	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=e79dba053d02ef96d080cbf6fb09c50e
+_md5_=c6b20c6f6b1b318b5dc76dd0ea362763
diff --git a/metadata/md5-cache/dev-python/Faker-24.11.0 b/metadata/md5-cache/dev-python/Faker-24.11.0
new file mode 100644
index 000000000000..9f159d723dc4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Faker-24.11.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pillow[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,tiff] dev-python/validators[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !dev-ruby/faker >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python package that generates fake data for you
+EAPI=8
+HOMEPAGE=https://github.com/joke2k/faker/ https://pypi.org/project/Faker/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !dev-ruby/faker python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/F/Faker/Faker-24.11.0.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=bbe839d3a493c7fe63f5b015f677aefc
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 55bfc920cf68..5c05cf5f82bc 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/aiohttp-3.9.5 b/metadata/md5-cache/dev-python/aiohttp-3.9.5
new file mode 100644
index 000000000000..601a0561f5c4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aiohttp-3.9.5
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] www-servers/gunicorn[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/re-assert[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-python/time-machine[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( dev-python/time-machine[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( dev-python/time-machine[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test-rust? ( dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) ) test? ( >=dev-python/aiosignal-1.1.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/attrs-17.3.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/frozenlist-1.1.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/multidict-4.5.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/yarl-1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( <dev-python/async-timeout-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?] >=dev-python/async-timeout-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( <dev-python/async-timeout-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?] >=dev-python/async-timeout-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+DESCRIPTION=HTTP client/server for asyncio
+EAPI=8
+HOMEPAGE=https://github.com/aio-libs/aiohttp/ https://pypi.org/project/aiohttp/
+INHERIT=distutils-r1 pypi
+IUSE=test-rust test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/aiosignal-1.1.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/attrs-17.3.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/frozenlist-1.1.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/multidict-4.5.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/yarl-1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( <dev-python/async-timeout-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?] >=dev-python/async-timeout-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( <dev-python/async-timeout-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?] >=dev-python/async-timeout-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/a/aiohttp/aiohttp-3.9.5.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=215fda00fc734243e0b1a17e40005c6e
diff --git a/metadata/md5-cache/dev-python/apsw-3.45.3.0 b/metadata/md5-cache/dev-python/apsw-3.45.3.0
new file mode 100644
index 000000000000..d0a21ded92b9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/apsw-3.45.3.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-db/sqlite-3.45.3:3 python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+DESCRIPTION=APSW - Another Python SQLite Wrapper
+EAPI=8
+HOMEPAGE=https://github.com/rogerbinns/apsw/ https://pypi.org/project/apsw/
+INHERIT=distutils-r1
+IUSE=doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=ZLIB
+RDEPEND=>=dev-db/sqlite-3.45.3:3 python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+SLOT=0
+SRC_URI=https://github.com/rogerbinns/apsw/archive/3.45.3.0.tar.gz -> apsw-3.45.3.0.gh.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=cf7e083ed9dc868437177414b2cc16ce
diff --git a/metadata/md5-cache/dev-python/boto3-1.34.86 b/metadata/md5-cache/dev-python/boto3-1.34.86
new file mode 100644
index 000000000000..3162b93bfdb0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.34.86
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/botocore-1.34.86[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.34.86[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.34.86.tar.gz -> boto3-1.34.86.gh.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=8c57f4eda873e63141fd7028ea88e83b
diff --git a/metadata/md5-cache/dev-python/botocore-1.34.86 b/metadata/md5-cache/dev-python/botocore-1.34.86
new file mode 100644
index 000000000000..477b80d6a29b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.34.86
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=<dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/botocore/archive/1.34.86.tar.gz -> botocore-1.34.86.gh.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=f1ca9a8b0e1247ff42152fa304fc8999
diff --git a/metadata/md5-cache/dev-python/django-otp-1.5.0 b/metadata/md5-cache/dev-python/django-otp-1.5.0
new file mode 100644
index 000000000000..233dff33b1c9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-otp-1.5.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) python_targets_python3_11? ( dev-lang/python:3.11[sqlite] ) python_targets_python3_12? ( dev-lang/python:3.12[sqlite] ) dev-python/freezegun[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] || ( dev-python/qrcode[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/segno[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) >=dev-python/django-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.21.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Django framework adding two-factor authentication using one-time passwords
+EAPI=8
+HOMEPAGE=https://github.com/django-otp/django-otp/ https://pypi.org/project/django-otp/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/django-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/d/django-otp/django_otp-1.5.0.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=d0f8f3633508345e468f4749dd94d8b7
diff --git a/metadata/md5-cache/dev-python/hatchling-1.24.1 b/metadata/md5-cache/dev-python/hatchling-1.24.1
new file mode 100644
index 000000000000..a120ad3adc88
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hatchling-1.24.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/editables-0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-23.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pathspec-0.10.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) >=dev-python/trove-classifiers-2024.3.25[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( python_targets_pypy3? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) ) test? ( >=dev-python/editables-0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-23.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pathspec-0.10.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) >=dev-python/trove-classifiers-2024.3.25[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Modern, extensible Python build backend
+EAPI=8
+HOMEPAGE=https://pypi.org/project/hatchling/ https://github.com/pypa/hatch/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=>=dev-python/editables-0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-23.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pathspec-0.10.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) >=dev-python/trove-classifiers-2024.3.25[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pypa/hatch/archive/hatchling-v1.24.1.tar.gz -> hatch-hatchling-v1.24.1.gh.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=1a25fc8e183335d67a0bbdc6f9364f32
diff --git a/metadata/md5-cache/dev-python/jq-1.6.0-r1 b/metadata/md5-cache/dev-python/jq-1.6.0-r1
deleted file mode 100644
index 36e36cf94087..000000000000
--- a/metadata/md5-cache/dev-python/jq-1.6.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=app-misc/jq-1.7:= >=dev-libs/oniguruma-6.9.8:= >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-misc/jq-1.7:= >=dev-libs/oniguruma-6.9.8:= python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-DESCRIPTION=Python bindings for jq
-EAPI=8
-HOMEPAGE=https://github.com/mwilliamson/jq.py/ https://pypi.org/project/jq/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=>=app-misc/jq-1.7:= >=dev-libs/oniguruma-6.9.8:= python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mwilliamson/jq.py/archive/1.6.0.tar.gz -> jq.py-1.6.0.gh.tar.gz
-_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=0822ae8ec41ee9403613bd80dab42277
diff --git a/metadata/md5-cache/dev-python/jq-1.7.0 b/metadata/md5-cache/dev-python/jq-1.7.0
index 9a1c6d8bfe03..6da49cee8198 100644
--- a/metadata/md5-cache/dev-python/jq-1.7.0
+++ b/metadata/md5-cache/dev-python/jq-1.7.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/mwilliamson/jq.py/ https://pypi.org/project/jq/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=>=app-misc/jq-1.7.1:= >=dev-libs/oniguruma-6.9.8:= python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mwilliamson/jq.py/archive/1.7.0.tar.gz -> jq.py-1.7.0.gh.tar.gz
 _eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=b3e72d759dba3af6c3affd5bf0f63daf
+_md5_=c1237d29f7fd739eb059d85667775472
diff --git a/metadata/md5-cache/dev-python/meson-python-0.16.0 b/metadata/md5-cache/dev-python/meson-python-0.16.0
new file mode 100644
index 000000000000..6346898b5a59
--- /dev/null
+++ b/metadata/md5-cache/dev-python/meson-python-0.16.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/cython-0.29.34[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-vcs/git ) test? ( >=dev-python/pyproject-metadata-0.7.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-build/meson-0.63.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !kernel_Darwin? ( dev-util/patchelf ) python_targets_pypy3? ( >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Meson PEP 517 Python build backend
+EAPI=8
+HOMEPAGE=https://pypi.org/project/meson-python/ https://github.com/mesonbuild/meson-python/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos
+LICENSE=MIT
+RDEPEND=>=dev-python/pyproject-metadata-0.7.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-build/meson-0.63.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !kernel_Darwin? ( dev-util/patchelf ) python_targets_pypy3? ( >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mesonbuild/meson-python/archive/0.16.0.tar.gz -> meson-python-0.16.0.gh.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=96a1094077fbf22b8837963e13cb0b42
diff --git a/metadata/md5-cache/dev-python/notebook-7.1.3 b/metadata/md5-cache/dev-python/notebook-7.1.3
new file mode 100644
index 000000000000..13666291fb6c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/notebook-7.1.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-jupyter-builder[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/ipykernel[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/nbval[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests-unixsocket[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-console-scripts[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-jupyter[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-tornasync[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/jupyter-server-2.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyter-server-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyterlab-4.1.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyterlab-4.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyterlab-server-2.22.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyterlab-server-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/notebook-shim-0.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/notebook-shim-0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tornado-6.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.21.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DESCRIPTION=Jupyter Interactive Notebook
+EAPI=8
+HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/notebook/ https://pypi.org/project/notebook/
+INHERIT=distutils-r1 pypi xdg-utils
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/jupyter-server-2.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyter-server-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyterlab-4.1.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyterlab-4.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyterlab-server-2.22.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyterlab-server-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/notebook-shim-0.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/notebook-shim-0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tornado-6.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/n/notebook/notebook-7.1.3.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=01998b1cceb75f0e12fa30a1749c22f7
diff --git a/metadata/md5-cache/dev-python/openstacksdk-3.1.0 b/metadata/md5-cache/dev-python/openstacksdk-3.1.0
new file mode 100644
index 000000000000..2e41a1c02143
--- /dev/null
+++ b/metadata/md5-cache/dev-python/openstacksdk-3.1.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/pbr-2.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/ddt-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/oslo-config-6.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/prometheus-client-0.4.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-mock-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/statsd-3.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/cryptography-2.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/decorator-4.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/dogpile-cache-0.6.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jmespath-0.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jsonpatch-1.21[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/keystoneauth1-3.18.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/netifaces-0.10.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/os-service-types-1.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pbr-2.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/platformdirs-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyyaml-3.13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requestsexceptions-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A collection of libraries for building applications to work with OpenStack
+EAPI=8
+HOMEPAGE=https://opendev.org/openstack/openstacksdk/ https://github.com/openstack/openstacksdk/ https://pypi.org/project/openstacksdk/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/cryptography-2.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/decorator-4.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/dogpile-cache-0.6.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jmespath-0.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jsonpatch-1.21[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/keystoneauth1-3.18.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/netifaces-0.10.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/os-service-types-1.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pbr-2.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/platformdirs-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyyaml-3.13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requestsexceptions-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/o/openstacksdk/openstacksdk-3.1.0.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=8e33a699f86dfd16d4bfbbb7ebfac9b5
diff --git a/metadata/md5-cache/dev-python/pdm-backend-2.2.1 b/metadata/md5-cache/dev-python/pdm-backend-2.2.1
new file mode 100644
index 000000000000..0255333e9647
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pdm-backend-2.2.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/packaging-24.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyproject-metadata-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-vcs/git ) test? ( >=dev-python/packaging-24.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyproject-metadata-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A PEP 517 backend for PDM that supports PEP 621 metadata
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pdm-backend/ https://github.com/pdm-project/pdm-backend/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/packaging-24.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyproject-metadata-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pdm-project/pdm-backend/archive/2.2.1.tar.gz -> pdm-backend-2.2.1.gh.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=f301584ff68cf178740a653db9c33a65
diff --git a/metadata/md5-cache/dev-python/peewee-3.17.2 b/metadata/md5-cache/dev-python/peewee-3.17.2
new file mode 100644
index 000000000000..d957ec164367
--- /dev/null
+++ b/metadata/md5-cache/dev-python/peewee-3.17.2
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-db/postgresql dev-python/psycopg:0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) doc? ( || ( ( dev-lang/python:3.12[sqlite] >=dev-python/sphinx-7.2.6[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] ) ( dev-lang/python:3.11[sqlite] >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( dev-lang/python:3.10[sqlite] >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ) ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) python_targets_python3_11? ( dev-lang/python:3.11[sqlite] ) python_targets_python3_12? ( dev-lang/python:3.12[sqlite] ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=native-extensions? ( dev-db/sqlite:3= ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) python_targets_python3_11? ( dev-lang/python:3.11[sqlite] ) python_targets_python3_12? ( dev-lang/python:3.12[sqlite] )
+DESCRIPTION=Small Python ORM
+EAPI=8
+HOMEPAGE=https://github.com/coleifer/peewee/ https://pypi.org/project/peewee/
+INHERIT=distutils-r1
+IUSE=examples +native-extensions test doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=native-extensions? ( dev-db/sqlite:3= ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) python_targets_python3_11? ( dev-lang/python:3.11[sqlite] ) python_targets_python3_12? ( dev-lang/python:3.12[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/coleifer/peewee/archive/3.17.2.tar.gz -> peewee-3.17.2.gh.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=2efa1cdec9ff2b5127a2bffc69a2bdf7
diff --git a/metadata/md5-cache/dev-python/peewee-3.17.3 b/metadata/md5-cache/dev-python/peewee-3.17.3
new file mode 100644
index 000000000000..89172440ef13
--- /dev/null
+++ b/metadata/md5-cache/dev-python/peewee-3.17.3
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-db/postgresql dev-python/psycopg:0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) doc? ( || ( ( dev-lang/python:3.12[sqlite] >=dev-python/sphinx-7.2.6[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] ) ( dev-lang/python:3.11[sqlite] >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( dev-lang/python:3.10[sqlite] >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ) ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) python_targets_python3_11? ( dev-lang/python:3.11[sqlite] ) python_targets_python3_12? ( dev-lang/python:3.12[sqlite] ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=native-extensions? ( dev-db/sqlite:3= ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) python_targets_python3_11? ( dev-lang/python:3.11[sqlite] ) python_targets_python3_12? ( dev-lang/python:3.12[sqlite] )
+DESCRIPTION=Small Python ORM
+EAPI=8
+HOMEPAGE=https://github.com/coleifer/peewee/ https://pypi.org/project/peewee/
+INHERIT=distutils-r1
+IUSE=examples +native-extensions test doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=native-extensions? ( dev-db/sqlite:3= ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) python_targets_python3_11? ( dev-lang/python:3.11[sqlite] ) python_targets_python3_12? ( dev-lang/python:3.12[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/coleifer/peewee/archive/3.17.3.tar.gz -> peewee-3.17.3.gh.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=2efa1cdec9ff2b5127a2bffc69a2bdf7
diff --git a/metadata/md5-cache/dev-python/plotly-5.21.0 b/metadata/md5-cache/dev-python/plotly-5.21.0
new file mode 100644
index 000000000000..69ccf92070ff
--- /dev/null
+++ b/metadata/md5-cache/dev-python/plotly-5.21.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/ipython[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/ipywidgets[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jupyter[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jupyterlab[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/matplotlib[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pandas[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytz[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/shapely[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/statsmodels[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/xarray[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/scikit-image[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tenacity-6.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Browser-based graphing library for Python
+EAPI=8
+HOMEPAGE=https://plotly.com/python/ https://github.com/plotly/plotly.py/ https://pypi.org/project/plotly/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tenacity-6.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/plotly/plotly.py/archive/refs/tags/v5.21.0.tar.gz -> plotly.py-5.21.0.gh.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=ed2ca21f09558eddc49cb405127852da
diff --git a/metadata/md5-cache/dev-python/pyaml-24.4.0 b/metadata/md5-cache/dev-python/pyaml-24.4.0
new file mode 100644
index 000000000000..102826967b75
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyaml-24.4.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/unidecode[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=PyYAML-based module to produce pretty and readable YAML-serialized data
+EAPI=8
+HOMEPAGE=https://github.com/mk-fg/pretty-yaml/ https://pypi.org/project/pyaml/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=WTFPL-2
+RDEPEND=dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pyaml/pyaml-24.4.0.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=cf32cae3dbf6427097bd959230aefa98
diff --git a/metadata/md5-cache/dev-python/pyopenssl-24.1.0 b/metadata/md5-cache/dev-python/pyopenssl-24.1.0
index 8b3ee2dbd87e..3b028df681c0 100644
--- a/metadata/md5-cache/dev-python/pyopenssl-24.1.0
+++ b/metadata/md5-cache/dev-python/pyopenssl-24.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.pyopenssl.org/ https://github.com/pyca/pyopenssl/ https://pypi.org/project/pyOpenSSL/
 INHERIT=distutils-r1 toolchain-funcs pypi
 IUSE=doc test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=<dev-python/cryptography-43[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cryptography-41.0.5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pyOpenSSL/pyOpenSSL-24.1.0.tar.gz
 _eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=efd27501aa91a5cd7718be5483a432c1
+_md5_=b2b787136b7e02a0b1de3935a1df0721
diff --git a/metadata/md5-cache/dev-python/pyproject-fmt-1.8.0 b/metadata/md5-cache/dev-python/pyproject-fmt-1.8.0
new file mode 100644
index 000000000000..169c0956221f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyproject-fmt-1.8.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/pytest-mock-3.10[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tox ) test? ( dev-python/natsort[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomlkit[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.21.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Format your pyproject.toml file
+EAPI=8
+HOMEPAGE=https://github.com/tox-dev/pyproject-fmt/ https://pypi.org/project/pyproject-fmt/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/natsort[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomlkit[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pyproject-fmt/pyproject_fmt-1.8.0.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=8839f1336f61038621dac2a7c564aa87
diff --git a/metadata/md5-cache/dev-python/pyproject-metadata-0.8.0 b/metadata/md5-cache/dev-python/pyproject-metadata-0.8.0
new file mode 100644
index 000000000000..0d5e2cf17b96
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyproject-metadata-0.8.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) ) test? ( >=dev-python/packaging-19[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flit-core-3.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=PEP 621 metadata parsing
+EAPI=8
+HOMEPAGE=https://github.com/pypa/pyproject-metadata/ https://pypi.org/project/pyproject-metadata/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos
+LICENSE=MIT
+RDEPEND=>=dev-python/packaging-19[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pyproject-metadata/pyproject_metadata-0.8.0.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=817c33835e54eaedfcdb8fae1cf412b9
diff --git a/metadata/md5-cache/dev-python/pyproject-metadata-0.8.0_rc2 b/metadata/md5-cache/dev-python/pyproject-metadata-0.8.0_rc2
new file mode 100644
index 000000000000..768b6fe2b589
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyproject-metadata-0.8.0_rc2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) ) test? ( >=dev-python/packaging-19[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flit-core-3.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=PEP 621 metadata parsing
+EAPI=8
+HOMEPAGE=https://github.com/pypa/pyproject-metadata/ https://pypi.org/project/pyproject-metadata/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos
+LICENSE=MIT
+RDEPEND=>=dev-python/packaging-19[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pyproject-metadata/pyproject_metadata-0.8.0rc2.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=817c33835e54eaedfcdb8fae1cf412b9
diff --git a/metadata/md5-cache/dev-python/pyside6-6.6.2-r1 b/metadata/md5-cache/dev-python/pyside6-6.6.2-r1
deleted file mode 100644
index df444f9c8376..000000000000
--- a/metadata/md5-cache/dev-python/pyside6-6.6.2-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ~dev-python/shiboken6-6.6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,llvm_slot_15(-)?,llvm_slot_16(-)?,llvm_slot_17(-)?] =dev-qt/qtbase-6.6.2*:6[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?] 3d? ( =dev-qt/qt3d-6.6.2*:6[qml?,gles2-only=] ) bluetooth? ( =dev-qt/qtconnectivity-6.6.2*:6[bluetooth] ) charts? ( =dev-qt/qtcharts-6.6.2*:6 ) designer? ( =dev-qt/qttools-6.6.2*:6[designer] ) gui? ( =dev-qt/qtbase-6.6.2*:6[gui,jpeg(+)] x11-libs/libxkbcommon ) help? ( =dev-qt/qttools-6.6.2*:6[assistant] ) location? ( =dev-qt/qtlocation-6.6.2*:6 ) multimedia? ( =dev-qt/qtmultimedia-6.6.2*:6 ) network? ( =dev-qt/qtbase-6.6.2*:6[ssl] ) network-auth? ( =dev-qt/qtnetworkauth-6.6.2*:6 ) nfc? ( =dev-qt/qtconnectivity-6.6.2*:6[nfc] ) pdfium? ( =dev-qt/qtwebengine-6.6.2*:6[pdfium(-),widgets?] ) positioning? ( =dev-qt/qtpositioning-6.6.2*:6 ) printsupport? ( =dev-qt/qtbase-6.6.2*:6[gui,widgets] ) qml? ( =dev-qt/qtdeclarative-6.6.2*:6[widgets?] ) quick3d? ( =dev-qt/qtquick3d-6.6.2*:6 ) scxml? ( =dev-qt/qtscxml-6.6.2*:6 ) sensors? ( =dev-qt/qtsensors-6.6.2*:6[qml?] ) speech? ( =dev-qt/qtspeech-6.6.2*:6 ) serialport? ( =dev-qt/qtserialport-6.6.2*:6 ) svg? ( =dev-qt/qtsvg-6.6.2*:6 ) testlib? ( =dev-qt/qtbase-6.6.2*:6[gui] ) webchannel? ( =dev-qt/qtwebchannel-6.6.2*:6 ) webengine? ( || ( =dev-qt/qtwebengine-6.6.2*:6[alsa,widgets?] =dev-qt/qtwebengine-6.6.2*:6[pulseaudio,widgets?] ) ) websockets? ( =dev-qt/qtwebsockets-6.6.2*:6 ) llvm_slot_15? ( sys-devel/clang:15 sys-devel/llvm:15 ) llvm_slot_16? ( sys-devel/clang:16 sys-devel/llvm:16 ) llvm_slot_17? ( sys-devel/clang:17 sys-devel/llvm:17 ) test? ( =dev-qt/qtbase-6.6.2*:6[gui] )
-DESCRIPTION=Python bindings for the Qt framework
-EAPI=8
-HOMEPAGE=https://wiki.qt.io/PySide6
-INHERIT=cmake llvm-r1 python-r1 virtualx
-IUSE=3d bluetooth charts +concurrent +dbus designer gles2-only +gui help location multimedia +network network-auth nfc positioning +opengl pdfium positioning +printsupport qml quick quick3d serialport scxml sensors spatialaudio speech +sql svg test +testlib webchannel webengine websockets +widgets +xml +llvm_slot_17 llvm_slot_15 llvm_slot_16 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 test
-KEYWORDS=~amd64
-LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 )
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ~dev-python/shiboken6-6.6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,llvm_slot_15(-)?,llvm_slot_16(-)?,llvm_slot_17(-)?] =dev-qt/qtbase-6.6.2*:6[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?] 3d? ( =dev-qt/qt3d-6.6.2*:6[qml?,gles2-only=] ) bluetooth? ( =dev-qt/qtconnectivity-6.6.2*:6[bluetooth] ) charts? ( =dev-qt/qtcharts-6.6.2*:6 ) designer? ( =dev-qt/qttools-6.6.2*:6[designer] ) gui? ( =dev-qt/qtbase-6.6.2*:6[gui,jpeg(+)] x11-libs/libxkbcommon ) help? ( =dev-qt/qttools-6.6.2*:6[assistant] ) location? ( =dev-qt/qtlocation-6.6.2*:6 ) multimedia? ( =dev-qt/qtmultimedia-6.6.2*:6 ) network? ( =dev-qt/qtbase-6.6.2*:6[ssl] ) network-auth? ( =dev-qt/qtnetworkauth-6.6.2*:6 ) nfc? ( =dev-qt/qtconnectivity-6.6.2*:6[nfc] ) pdfium? ( =dev-qt/qtwebengine-6.6.2*:6[pdfium(-),widgets?] ) positioning? ( =dev-qt/qtpositioning-6.6.2*:6 ) printsupport? ( =dev-qt/qtbase-6.6.2*:6[gui,widgets] ) qml? ( =dev-qt/qtdeclarative-6.6.2*:6[widgets?] ) quick3d? ( =dev-qt/qtquick3d-6.6.2*:6 ) scxml? ( =dev-qt/qtscxml-6.6.2*:6 ) sensors? ( =dev-qt/qtsensors-6.6.2*:6[qml?] ) speech? ( =dev-qt/qtspeech-6.6.2*:6 ) serialport? ( =dev-qt/qtserialport-6.6.2*:6 ) svg? ( =dev-qt/qtsvg-6.6.2*:6 ) testlib? ( =dev-qt/qtbase-6.6.2*:6[gui] ) webchannel? ( =dev-qt/qtwebchannel-6.6.2*:6 ) webengine? ( || ( =dev-qt/qtwebengine-6.6.2*:6[alsa,widgets?] =dev-qt/qtwebengine-6.6.2*:6[pulseaudio,widgets?] ) ) websockets? ( =dev-qt/qtwebsockets-6.6.2*:6 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) 3d? ( gui network ) charts? ( gui widgets ) designer? ( widgets ) gles2-only? ( gui ) gui? ( dbus opengl ) help? ( network sql widgets ) location? ( gui network positioning quick ) multimedia? ( gui network ) network-auth? ( network ) opengl? ( gui ) pdfium? ( gui ) printsupport? ( widgets ) qml? ( network ) quick? ( gui network opengl qml ) quick3d? ( gui network opengl qml quick ) spatialaudio? ( multimedia ) speech? ( multimedia ) sql? ( widgets ) svg? ( gui ) testlib? ( widgets ) webchannel? ( qml ) webengine? ( network gui printsupport quick webchannel ) websockets? ( network ) widgets? ( gui ) ^^ ( llvm_slot_15 llvm_slot_16 llvm_slot_17 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-6.6.2-src/pyside-setup-everywhere-src-6.6.2.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	llvm-r1	2e652182b1f239b07688071f959f19e4	llvm-utils	e59dc622da7e7e7f16879105bed34858	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=88fd425e1d7006b8936c23c1be40b1bc
diff --git a/metadata/md5-cache/dev-python/pyside6-6.7.0 b/metadata/md5-cache/dev-python/pyside6-6.7.0
index 8c5d7373bbaf..6db39521f438 100644
--- a/metadata/md5-cache/dev-python/pyside6-6.7.0
+++ b/metadata/md5-cache/dev-python/pyside6-6.7.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://wiki.qt.io/PySide6
 INHERIT=cmake llvm-r1 python-r1 virtualx
 IUSE=3d bluetooth charts +concurrent +dbus designer gles2-only +gui help location multimedia +network network-auth nfc positioning +opengl pdfium positioning +printsupport qml quick quick3d serialport scxml sensors spatialaudio speech +sql svg test +testlib webchannel webengine websockets +widgets +xml +llvm_slot_17 llvm_slot_15 llvm_slot_16 llvm_slot_18 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 )
 RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ~dev-python/shiboken6-6.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,llvm_slot_15(-)?,llvm_slot_16(-)?,llvm_slot_17(-)?,llvm_slot_18(-)?] =dev-qt/qtbase-6.7.0*:6[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?] 3d? ( =dev-qt/qt3d-6.7.0*:6[qml?,gles2-only=] ) bluetooth? ( =dev-qt/qtconnectivity-6.7.0*:6[bluetooth] ) charts? ( =dev-qt/qtcharts-6.7.0*:6 ) designer? ( =dev-qt/qttools-6.7.0*:6[designer] ) gui? ( =dev-qt/qtbase-6.7.0*:6[gui,jpeg(+)] x11-libs/libxkbcommon ) help? ( =dev-qt/qttools-6.7.0*:6[assistant] ) location? ( =dev-qt/qtlocation-6.7.0*:6 ) multimedia? ( =dev-qt/qtmultimedia-6.7.0*:6 ) network? ( =dev-qt/qtbase-6.7.0*:6[ssl] ) network-auth? ( =dev-qt/qtnetworkauth-6.7.0*:6 ) nfc? ( =dev-qt/qtconnectivity-6.7.0*:6[nfc] ) pdfium? ( =dev-qt/qtwebengine-6.7.0*:6[pdfium(-),widgets?] ) positioning? ( =dev-qt/qtpositioning-6.7.0*:6 ) printsupport? ( =dev-qt/qtbase-6.7.0*:6[gui,widgets] ) qml? ( =dev-qt/qtdeclarative-6.7.0*:6[widgets?] ) quick3d? ( =dev-qt/qtquick3d-6.7.0*:6 ) scxml? ( =dev-qt/qtscxml-6.7.0*:6 ) sensors? ( =dev-qt/qtsensors-6.7.0*:6[qml?] ) speech? ( =dev-qt/qtspeech-6.7.0*:6 ) serialport? ( =dev-qt/qtserialport-6.7.0*:6 ) svg? ( =dev-qt/qtsvg-6.7.0*:6 ) testlib? ( =dev-qt/qtbase-6.7.0*:6[gui] ) webchannel? ( =dev-qt/qtwebchannel-6.7.0*:6 ) webengine? ( || ( =dev-qt/qtwebengine-6.7.0*:6[alsa,widgets?] =dev-qt/qtwebengine-6.7.0*:6[pulseaudio,widgets?] ) ) websockets? ( =dev-qt/qtwebsockets-6.7.0*:6 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) 3d? ( gui network ) charts? ( gui widgets ) designer? ( widgets ) gles2-only? ( gui ) gui? ( dbus opengl ) help? ( network sql widgets ) location? ( gui network positioning quick ) multimedia? ( gui network ) network-auth? ( network ) opengl? ( gui ) pdfium? ( gui ) printsupport? ( widgets ) qml? ( network ) quick? ( gui network opengl qml ) quick3d? ( gui network opengl qml quick ) spatialaudio? ( multimedia ) speech? ( multimedia ) sql? ( widgets ) svg? ( gui ) testlib? ( widgets ) webchannel? ( qml ) webengine? ( network gui printsupport quick webchannel ) websockets? ( network ) widgets? ( gui ) ^^ ( llvm_slot_15 llvm_slot_16 llvm_slot_17 llvm_slot_18 )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-6.7.0-src/pyside-setup-everywhere-src-6.7.0.tar.xz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	llvm-r1	2e652182b1f239b07688071f959f19e4	llvm-utils	e59dc622da7e7e7f16879105bed34858	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=193f2796c018017a6f48522426e69319
+_md5_=3125ca4a2442f56acd56d897c925360f
diff --git a/metadata/md5-cache/dev-python/pyside6-tools-6.6.2 b/metadata/md5-cache/dev-python/pyside6-tools-6.6.2
deleted file mode 100644
index 581ce52f3b1c..000000000000
--- a/metadata/md5-cache/dev-python/pyside6-tools-6.6.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ~dev-python/shiboken6-6.6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,llvm_slot_15(-)?,llvm_slot_16(-)?,llvm_slot_17(-)?] ~dev-python/pyside6-6.6.2[quick,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,llvm_slot_15(-)?,llvm_slot_16(-)?,llvm_slot_17(-)?] llvm_slot_15? ( sys-devel/clang:15 sys-devel/llvm:15 ) llvm_slot_16? ( sys-devel/clang:16 sys-devel/llvm:16 ) llvm_slot_17? ( sys-devel/clang:17 sys-devel/llvm:17 )
-DESCRIPTION=PySide development tools (pyside6-lupdate with support for Python)
-EAPI=8
-HOMEPAGE=https://wiki.qt.io/PySide6
-INHERIT=cmake llvm-r1 python-r1
-IUSE=+llvm_slot_17 llvm_slot_15 llvm_slot_16 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ~dev-python/shiboken6-6.6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,llvm_slot_15(-)?,llvm_slot_16(-)?,llvm_slot_17(-)?] ~dev-python/pyside6-6.6.2[quick,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,llvm_slot_15(-)?,llvm_slot_16(-)?,llvm_slot_17(-)?]
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) ^^ ( llvm_slot_15 llvm_slot_16 llvm_slot_17 )
-SLOT=0
-SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-6.6.2-src/pyside-setup-everywhere-src-6.6.2.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	llvm-r1	2e652182b1f239b07688071f959f19e4	llvm-utils	e59dc622da7e7e7f16879105bed34858	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ee5c3093c031b6453c59d0ed752be5f1
diff --git a/metadata/md5-cache/dev-python/pyside6-tools-6.7.0 b/metadata/md5-cache/dev-python/pyside6-tools-6.7.0
index 5462ad9cb92d..0e00dadabc3d 100644
--- a/metadata/md5-cache/dev-python/pyside6-tools-6.7.0
+++ b/metadata/md5-cache/dev-python/pyside6-tools-6.7.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.qt.io/PySide6
 INHERIT=cmake llvm-r1 python-r1
 IUSE=+llvm_slot_17 llvm_slot_15 llvm_slot_16 llvm_slot_18 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ~dev-python/shiboken6-6.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,llvm_slot_15(-)?,llvm_slot_16(-)?,llvm_slot_17(-)?,llvm_slot_18(-)?] ~dev-python/pyside6-6.7.0[quick,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,llvm_slot_15(-)?,llvm_slot_16(-)?,llvm_slot_17(-)?,llvm_slot_18(-)?]
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) ^^ ( llvm_slot_15 llvm_slot_16 llvm_slot_17 llvm_slot_18 )
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-6.7.0-src/pyside-setup-everywhere-src-6.7.0.tar.xz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	llvm-r1	2e652182b1f239b07688071f959f19e4	llvm-utils	e59dc622da7e7e7f16879105bed34858	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=acadcb2b0e3d789cd744c20c654747dd
+_md5_=7d244969ac63ad0b721d240f99e6741b
diff --git a/metadata/md5-cache/dev-python/pywlroots-0.16.7 b/metadata/md5-cache/dev-python/pywlroots-0.16.7
new file mode 100644
index 000000000000..fb97fef06365
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pywlroots-0.16.7
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/cffi:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pywayland-0.4.14[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/xkbcommon-0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] =gui-libs/wlroots-0.16*:=[X?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/cffi:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pywayland-0.4.14[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/xkbcommon-0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] =gui-libs/wlroots-0.16*:=[X?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+DESCRIPTION=Python binding to the wlroots library using cffi
+EAPI=8
+HOMEPAGE=https://github.com/flacjacket/pywlroots/ https://pypi.org/project/pywlroots/
+INHERIT=distutils-r1 pypi
+IUSE=X test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=dev-python/cffi:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pywayland-0.4.14[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/xkbcommon-0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] =gui-libs/wlroots-0.16*:=[X?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pywlroots/pywlroots-0.16.7.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=02281e6aa7003df7c37d207972a5f0e1
diff --git a/metadata/md5-cache/dev-python/qstylizer-0.2.3 b/metadata/md5-cache/dev-python/qstylizer-0.2.3
new file mode 100644
index 000000000000..228fbcc9b349
--- /dev/null
+++ b/metadata/md5-cache/dev-python/qstylizer-0.2.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/pbr[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/pytest-mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/tinycss2-0.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/tinycss2-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/inflection-0.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/inflection-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) doc? ( || ( ( dev-lang/python:3.12 >=dev-python/sphinx-7.2.6[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_10(-)] ) ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Stylesheet Generator for PyQt5/PySide2
+EAPI=8
+HOMEPAGE=https://github.com/blambright/qstylizer/ https://pypi.org/project/qstylizer/
+INHERIT=distutils-r1
+IUSE=test doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/tinycss2-0.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/tinycss2-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/inflection-0.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/inflection-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/blambright/qstylizer/archive/0.2.3.tar.gz -> qstylizer-0.2.3.gh.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=a1981033bdb9f2ed062db12cb59f1222
diff --git a/metadata/md5-cache/dev-python/regex-2024.4.16 b/metadata/md5-cache/dev-python/regex-2024.4.16
new file mode 100644
index 000000000000..604aa36f4262
--- /dev/null
+++ b/metadata/md5-cache/dev-python/regex-2024.4.16
@@ -0,0 +1,17 @@
+BDEPEND=test? ( python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+DESCRIPTION=Alternative regular expression module to replace re
+EAPI=8
+HOMEPAGE=https://github.com/mrabarnett/mrab-regex/ https://pypi.org/project/regex/
+INHERIT=distutils-r1 pypi
+IUSE=doc test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/r/regex/regex-2024.4.16.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=1bf4782e914fe3e8961a3ef31f3be778
diff --git a/metadata/md5-cache/dev-python/shiboken6-6.7.0 b/metadata/md5-cache/dev-python/shiboken6-6.7.0
index 249354b9688f..3f6cd117451e 100644
--- a/metadata/md5-cache/dev-python/shiboken6-6.7.0
+++ b/metadata/md5-cache/dev-python/shiboken6-6.7.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://wiki.qt.io/PySide6
 INHERIT=cmake flag-o-matic llvm-r1 python-r1 toolchain-funcs
 IUSE=+docstrings numpy test vulkan +llvm_slot_17 llvm_slot_15 llvm_slot_16 llvm_slot_18 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3
 RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) =dev-qt/qtbase-6.7.0*:6 llvm_slot_15? ( sys-devel/clang:15 sys-devel/llvm:15 ) llvm_slot_16? ( sys-devel/clang:16 sys-devel/llvm:16 ) llvm_slot_17? ( sys-devel/clang:17 sys-devel/llvm:17 ) llvm_slot_18? ( sys-devel/clang:18 sys-devel/llvm:18 ) docstrings? ( >=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 ) numpy? ( dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) vulkan? ( dev-util/vulkan-headers )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) ^^ ( llvm_slot_15 llvm_slot_16 llvm_slot_17 llvm_slot_18 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-6.7.0-src/pyside-setup-everywhere-src-6.7.0.tar.xz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	llvm-r1	2e652182b1f239b07688071f959f19e4	llvm-utils	e59dc622da7e7e7f16879105bed34858	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=00820da23c4d0bb1ab3875401e10bdc3
+_md5_=c53b115ff00809fea7bc7437ecde0501
diff --git a/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-2.1.0 b/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-2.1.0
new file mode 100644
index 000000000000..220b86d3ceb9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-2.1.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-vcs[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/sphobjinv-2.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/typing-extensions-4.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/sphinx-7.1.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.21.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Type hints support for the Sphinx autodoc extension
+EAPI=8
+HOMEPAGE=https://github.com/tox-dev/sphinx-autodoc-typehints/ https://pypi.org/project/sphinx-autodoc-typehints/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/sphinx-7.1.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinx-autodoc-typehints/sphinx_autodoc_typehints-2.1.0.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=8b6bb93a77a6bfdf36ebd80ec4a2ea51
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.51 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.51
deleted file mode 100644
index 9c31064a3370..000000000000
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.51
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( dev-python/pypy3:=[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) python_targets_python3_11? ( dev-lang/python:3.11[sqlite] ) python_targets_python3_12? ( dev-lang/python:3.12[sqlite] ) ) test? ( >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:=[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) python_targets_python3_11? ( dev-lang/python:3.11[sqlite?] ) python_targets_python3_12? ( dev-lang/python:3.12[sqlite?] ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=python_targets_pypy3? ( dev-python/pypy3:=[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) python_targets_python3_11? ( dev-lang/python:3.11[sqlite?] ) python_targets_python3_12? ( dev-lang/python:3.12[sqlite?] )
-DESCRIPTION=Python SQL toolkit and Object Relational Mapper
-EAPI=8
-HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/ https://github.com/sqlalchemy/sqlalchemy/
-INHERIT=distutils-r1 optfeature pypi
-IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-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:=[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) python_targets_python3_11? ( dev-lang/python:3.11[sqlite?] ) python_targets_python3_12? ( dev-lang/python:3.12[sqlite?] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/S/SQLAlchemy/SQLAlchemy-1.4.51.tar.gz
-_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=6585f1a9dbbc23e4152796e771baf091
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-2.0.28 b/metadata/md5-cache/dev-python/sqlalchemy-2.0.28
deleted file mode 100644
index ce2e69afdf16..000000000000
--- a/metadata/md5-cache/dev-python/sqlalchemy-2.0.28
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( python_targets_pypy3? ( dev-python/pypy3:=[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) python_targets_python3_11? ( dev-lang/python:3.11[sqlite] ) python_targets_python3_12? ( dev-lang/python:3.12[sqlite] ) dev-python/pytest-rerunfailures[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/typing-extensions-4.6.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:=[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) python_targets_python3_11? ( dev-lang/python:3.11[sqlite?] ) python_targets_python3_12? ( dev-lang/python:3.12[sqlite?] ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=python_targets_pypy3? ( dev-python/pypy3:=[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) python_targets_python3_11? ( dev-lang/python:3.11[sqlite?] ) python_targets_python3_12? ( dev-lang/python:3.12[sqlite?] )
-DESCRIPTION=Python SQL toolkit and Object Relational Mapper
-EAPI=8
-HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/ https://github.com/sqlalchemy/sqlalchemy/
-INHERIT=distutils-r1 multiprocessing optfeature pypi
-IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-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=>=dev-python/typing-extensions-4.6.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:=[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) python_targets_python3_11? ( dev-lang/python:3.11[sqlite?] ) python_targets_python3_12? ( dev-lang/python:3.12[sqlite?] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/S/SQLAlchemy/SQLAlchemy-2.0.28.tar.gz
-_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=210333501137a2582dbfaa7f3e7406f6
diff --git a/metadata/md5-cache/dev-python/statsmodels-0.14.2 b/metadata/md5-cache/dev-python/statsmodels-0.14.2
new file mode 100644
index 000000000000..0c3a1ac44acb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/statsmodels-0.14.2
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-python/numpy-1.22.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/scipy-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cython-3.0.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-scm-8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] doc? ( || ( ( dev-lang/python:3.12 >=dev-python/sphinx-7.2.6[python_targets_python3_12(-)] dev-python/ipykernel[python_targets_python3_12(-)] dev-python/jupyter-client[python_targets_python3_12(-)] dev-python/matplotlib[python_targets_python3_12(-)] dev-python/nbconvert[python_targets_python3_12(-)] dev-python/numpydoc[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] dev-python/ipykernel[python_targets_python3_11(-)] dev-python/jupyter-client[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] dev-python/nbconvert[python_targets_python3_11(-)] dev-python/numpydoc[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] dev-python/ipykernel[python_targets_python3_10(-)] dev-python/jupyter-client[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/nbconvert[python_targets_python3_10(-)] dev-python/numpydoc[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/numpy-1.22.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/scipy-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-21.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pandas-1.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/patsy-0.5.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-python/numpy-1.22.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/scipy-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+DESCRIPTION=Statistical computations and models for use with SciPy
+EAPI=8
+HOMEPAGE=https://www.statsmodels.org/stable/index.html https://github.com/statsmodels/statsmodels/ https://pypi.org/project/statsmodels/
+INHERIT=distutils-r1 optfeature pypi
+IUSE=examples doc test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~amd64 ~arm64 ~loong ~riscv ~s390 ~amd64-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/numpy-1.22.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/scipy-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-21.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pandas-1.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/patsy-0.5.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/s/statsmodels/statsmodels-0.14.2.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=5ce8ca1f13bf6fa09689c461dac3ba1e
diff --git a/metadata/md5-cache/dev-python/tifffile-2024.4.18 b/metadata/md5-cache/dev-python/tifffile-2024.4.18
new file mode 100644
index 000000000000..6396ec78bf7a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tifffile-2024.4.18
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/dask[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/defusedxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/fsspec-2021.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/xarray[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/numpy-1.19.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Read and write TIFF files
+EAPI=8
+HOMEPAGE=https://pypi.org/project/tifffile/ https://github.com/cgohlke/tifffile/ https://www.cgohlke.com/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/numpy-1.19.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/cgohlke/tifffile/archive/v2024.4.18.tar.gz -> tifffile-2024.4.18.gh.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=98f8c279341a0a7574688d65e531a5c6
diff --git a/metadata/md5-cache/dev-python/urllib3-2.0.7 b/metadata/md5-cache/dev-python/urllib3-2.0.7
deleted file mode 100644
index b767e8729253..000000000000
--- a/metadata/md5-cache/dev-python/urllib3-2.0.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-rerunfailures[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-rerunfailures[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-rerunfailures[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-rerunfailures[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) ) python_targets_pypy3? ( dev-python/pypy3:=[ssl(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[ssl(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[ssl(+)] ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.21.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and more
-EAPI=8
-HOMEPAGE=https://github.com/urllib3/urllib3/ https://pypi.org/project/urllib3/
-INHERIT=distutils-r1 multiprocessing pypi
-IUSE=brotli test zstd python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:=[ssl(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[ssl(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[ssl(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/u/urllib3/urllib3-2.0.7.tar.gz
-_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f954dc31df0d15d02db4ff8a0cb4e307
diff --git a/metadata/md5-cache/dev-python/urllib3-2.2.0-r1 b/metadata/md5-cache/dev-python/urllib3-2.2.0-r1
deleted file mode 100644
index 9d87f3b219d2..000000000000
--- a/metadata/md5-cache/dev-python/urllib3-2.2.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) http2? ( <dev-python/h2-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/h2-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/h2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-rerunfailures[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/quart[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/quart-trio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/trio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) http2? ( <dev-python/h2-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/h2-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/h2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-rerunfailures[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/quart[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/quart-trio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/trio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) http2? ( <dev-python/h2-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/h2-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/h2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-rerunfailures[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/quart[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/quart-trio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/trio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) http2? ( <dev-python/h2-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/h2-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/h2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-rerunfailures[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/quart[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/quart-trio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/trio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) ) python_targets_pypy3? ( dev-python/pypy3:=[ssl(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[ssl(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[ssl(+)] ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.21.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and more
-EAPI=8
-HOMEPAGE=https://github.com/urllib3/urllib3/ https://pypi.org/project/urllib3/
-INHERIT=distutils-r1 pypi
-IUSE=brotli http2 test zstd python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~riscv
-LICENSE=MIT
-RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) http2? ( <dev-python/h2-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/h2-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:=[ssl(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[ssl(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[ssl(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/u/urllib3/urllib3-2.2.0.tar.gz test? ( https://github.com/urllib3/hypercorn/archive/d1719f8c1570cbd8e6a3719ffdb14a4d72880abb.tar.gz -> hypercorn-d1719f8c1570cbd8e6a3719ffdb14a4d72880abb.gh.tar.gz )
-_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=e8536493782831b364fc8161237b7c09
diff --git a/metadata/md5-cache/dev-python/uv-0.1.33 b/metadata/md5-cache/dev-python/uv-0.1.33
new file mode 100644
index 000000000000..f75fd5a4393e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/uv-0.1.33
@@ -0,0 +1,17 @@
+BDEPEND=>=virtual/rust-1.77 test? ( dev-lang/python:3.8 dev-lang/python:3.9 dev-lang/python:3.10 dev-lang/python:3.11 dev-lang/python:3.12 ) >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install pretend setup test unpack
+DEPEND=dev-libs/libgit2:=
+DESCRIPTION=A Python package installer and resolver, written in Rust
+EAPI=8
+HOMEPAGE=https://github.com/astral-sh/uv/ https://pypi.org/project/uv/
+INHERIT=cargo check-reqs
+IUSE=test debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( Apache-2.0 MIT ) 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT MPL-2.0 Unicode-DFS-2016 openssl
+PROPERTIES=test_network
+RDEPEND=dev-libs/libgit2:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/astral-sh/uv/archive/0.1.33.tar.gz -> uv-0.1.33.gh.tar.gz https://github.com/charliermarsh/rs-async-zip/archive/1dcb40cfe1bf5325a6fd4bfcf9894db40241f585.tar.gz -> rs-async-zip-1dcb40cfe1bf5325a6fd4bfcf9894db40241f585.gh.tar.gz https://github.com/astral-sh/pubgrub/archive/c26e485213e39582c6f2e4d45c0328422670e7a7.tar.gz -> pubgrub-c26e485213e39582c6f2e4d45c0328422670e7a7.gh.tar.gz https://dev.gentoo.org/~mgorny/dist/uv-0.1.33-crates.tar.xz
+_eclasses_=cargo	4dede41d64d595673f6da62ab5540fa0	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=fb457c0072805016bbcff5b9aac26a6e
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.25.3 b/metadata/md5-cache/dev-python/virtualenv-20.25.3
new file mode 100644
index 000000000000..e5c1e7e0c487
--- /dev/null
+++ b/metadata/md5-cache/dev-python/virtualenv-20.25.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pip-22.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pytest-freezer-0.4.6[python_targets_pypy3(-)?] ) >=dev-python/pytest-mock-3.6.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-python/time-machine[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( dev-python/time-machine[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( dev-python/time-machine[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-20.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/distlib-0.3.7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/filelock-3.12.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/platformdirs-3.9.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.21.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Virtual Python Environment builder
+EAPI=8
+HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
+INHERIT=distutils-r1 multiprocessing pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/distlib-0.3.7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/filelock-3.12.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/platformdirs-3.9.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/v/virtualenv/virtualenv-20.25.3.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=17b28c807aa3fe137554fc04d0dd3d19
diff --git a/metadata/md5-cache/dev-python/xmlschema-3.3.0 b/metadata/md5-cache/dev-python/xmlschema-3.3.0
new file mode 100644
index 000000000000..5b1a6ed2cfc9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xmlschema-3.3.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( <dev-python/elementpath-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/elementpath-4.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An XML Schema validator and decoder
+EAPI=8
+HOMEPAGE=https://github.com/sissaschool/xmlschema/ https://pypi.org/project/xmlschema/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=<dev-python/elementpath-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/elementpath-4.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/x/xmlschema/xmlschema-3.3.0.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=96f20f9f33e557617b8be63c1fbbe8cf
diff --git a/metadata/md5-cache/dev-python/xmlsec-1.3.14 b/metadata/md5-cache/dev-python/xmlsec-1.3.14
new file mode 100644
index 000000000000..dea2711ee67d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xmlsec-1.3.14
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pkgconfig[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/setuptools-scm[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/wheel[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/hypothesis[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-libs/xmlsec:=[openssl] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/xmlsec:=[openssl] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+DESCRIPTION=Python bindings for the XML Security Library
+EAPI=8
+HOMEPAGE=https://github.com/xmlsec/python-xmlsec/ https://pypi.org/project/xmlsec/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/xmlsec:=[openssl] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/xmlsec/python-xmlsec/archive/1.3.14.tar.gz -> python-xmlsec-1.3.14.gh.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=758c25545a3320502ee024e91e25b9f3
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 375a15ed313e..d7c68b2c11c3 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.16.2 b/metadata/md5-cache/dev-ruby/nokogiri-1.16.2
index 0dc789bc9cc0..c0ec186e24fd 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.16.2
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.16.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://nokogiri.org/
 INHERIT=ruby-fakegem multilib
 IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos
 LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.12.5 >=dev-libs/libxslt-1.1.39 sys-libs/zlib virtual/libiconv ruby_targets_ruby31? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby33(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.16.2.tar.gz -> nokogiri-1.16.2-git.tgz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=e6ef8f2a227fdcc758b0f47132457326
+_md5_=420dd6cddff9625b1ab3178e9d49806e
diff --git a/metadata/md5-cache/dev-ruby/rdoc-6.6.3.1 b/metadata/md5-cache/dev-ruby/rdoc-6.6.3.1
index 883bac03638b..828da768e089 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-6.6.3.1
+++ b/metadata/md5-cache/dev-ruby/rdoc-6.6.3.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/rdoc/
 INHERIT=ruby-fakegem
 IUSE=doc test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 test test
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=|| ( GPL-2 Ruby-BSD )
 RDEPEND=>=app-eselect/eselect-ruby-20181225 ruby_targets_ruby31? ( >=dev-ruby/psych-4.0.0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/psych-4.0.0[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( >=dev-ruby/psych-4.0.0[ruby_targets_ruby33(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rdoc/archive/v6.6.3.1.tar.gz -> rdoc-6.6.3.1.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=d480f05f7982814adc2043b887bbcdbf
+_md5_=44eb6c932233ced47761263342cca940
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index dab2814723c4..c2f830429ad5 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/diffoscope-263 b/metadata/md5-cache/dev-util/diffoscope-263
index 1820ab867ab5..7ff7af00f37e 100644
--- a/metadata/md5-cache/dev-util/diffoscope-263
+++ b/metadata/md5-cache/dev-util/diffoscope-263
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
 INHERIT=distutils-r1
 IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86
 LICENSE=GPL-3+
 RDEPEND=|| ( dev-python/python-magic[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sys-apps/file[python,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) dev-python/libarchive-c[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/distro[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tlsh[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-alternatives/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/pypdf[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( virtual/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) python_targets_python3_11? ( dev-lang/python:3.11[ncurses] ) python_targets_python3_12? ( dev-lang/python:3.12[ncurses] )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://diffoscope.org/archive/diffoscope-263.tar.bz2
 _eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=17bf4e90111ce93ca2e2261f778a797f
+_md5_=78e5732c60e8097231e7f7fe24b75446
diff --git a/metadata/md5-cache/dev-util/fq-0.10.0 b/metadata/md5-cache/dev-util/fq-0.10.0
index 4c66cf6b0ce5..9d0ee970e29b 100644
--- a/metadata/md5-cache/dev-util/fq-0.10.0
+++ b/metadata/md5-cache/dev-util/fq-0.10.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/wader/fq
 INHERIT=go-module
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64
+KEYWORDS=amd64 ~arm ~arm64
 LICENSE=MIT BSD-2
 RESTRICT=!test? ( test ) strip
 SLOT=0
 SRC_URI=https://github.com/wader/fq/archive/v0.10.0.tar.gz -> fq-0.10.0.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-util/fq/fq-0.10.0-deps.tar.xz
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	go-env	14f8f70fe58c14d7ab44fff15a05ac47	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=1937c8b0620fe1a27086478e18757864
+_md5_=6fc0f2d14cb638b1b94de08a4fdc5d28
diff --git a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.15770.15 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.15770.15
deleted file mode 100644
index 8b3c4e7c1568..000000000000
--- a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.15770.15
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( ( dev-lang/python:3.12 dev-python/mako[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/mako[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/mako[python_targets_python3_10(-)] ) ) =sys-devel/lld-15* || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/opencl-clang:15= dev-util/spirv-tools sys-devel/lld:15= sys-devel/llvm:15= vc? ( >=dev-libs/intel-vc-intrinsics-0.16.0 dev-util/spirv-llvm-translator:15= ) !!sys-devel/llvm:0
-DESCRIPTION=LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware
-EAPI=8
-HOMEPAGE=https://github.com/intel/intel-graphics-compiler
-INHERIT=cmake flag-o-matic llvm python-any-r1
-IUSE=debug vc
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=dev-libs/opencl-clang:15= dev-util/spirv-tools sys-devel/lld:15= sys-devel/llvm:15= vc? ( >=dev-libs/intel-vc-intrinsics-0.16.0 dev-util/spirv-llvm-translator:15= )
-SLOT=0
-SRC_URI=https://github.com/intel/intel-graphics-compiler/archive/igc-1.0.15770.15.tar.gz -> intel-graphics-compiler-1.0.15770.15.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fd60f00cea84b4f7647fa8049fc5bc65
diff --git a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.15985.15 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.15985.15
index a1f935fa1c74..0751c94f25b3 100644
--- a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.15985.15
+++ b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.15985.15
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/intel/intel-graphics-compiler
 INHERIT=cmake flag-o-matic llvm-r1 python-any-r1
 IUSE=debug vc +llvm_slot_15
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=dev-libs/opencl-clang:15[llvm_slot_15(-)?] dev-util/spirv-tools llvm_slot_15? ( sys-devel/lld:15 sys-devel/llvm:15 ) vc? ( >=dev-libs/intel-vc-intrinsics-0.18.0[llvm_slot_15(-)?] dev-util/spirv-llvm-translator:15= )
 REQUIRED_USE=^^ ( llvm_slot_15 )
 SLOT=0
 SRC_URI=https://github.com/intel/intel-graphics-compiler/archive/igc-1.0.15985.15.tar.gz -> intel-graphics-compiler-1.0.15985.15.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	llvm-r1	2e652182b1f239b07688071f959f19e4	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d3a8fa81dd1c9a4154bf0dae5c1cc7eb
+_md5_=b888935b4ab837dd41b46e5c9f4cf188
diff --git a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.16695.2 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.16695.2
new file mode 100644
index 000000000000..a68fbd628c93
--- /dev/null
+++ b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.16695.2
@@ -0,0 +1,16 @@
+BDEPEND=|| ( ( dev-lang/python:3.12 dev-python/mako[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/mako[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/mako[python_targets_python3_10(-)] ) ) llvm_slot_15? ( sys-devel/lld:15 ) || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/opencl-clang:15[llvm_slot_15(-)?] dev-util/spirv-tools llvm_slot_15? ( sys-devel/lld:15 sys-devel/llvm:15 ) vc? ( >=dev-libs/intel-vc-intrinsics-0.18.0[llvm_slot_15(-)?] dev-util/spirv-llvm-translator:15= )
+DESCRIPTION=LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware
+EAPI=8
+HOMEPAGE=https://github.com/intel/intel-graphics-compiler
+INHERIT=cmake flag-o-matic llvm-r1 python-any-r1
+IUSE=debug vc +llvm_slot_15
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/opencl-clang:15[llvm_slot_15(-)?] dev-util/spirv-tools llvm_slot_15? ( sys-devel/lld:15 sys-devel/llvm:15 ) vc? ( >=dev-libs/intel-vc-intrinsics-0.18.0[llvm_slot_15(-)?] dev-util/spirv-llvm-translator:15= )
+REQUIRED_USE=^^ ( llvm_slot_15 )
+SLOT=0
+SRC_URI=https://github.com/intel/intel-graphics-compiler/archive/igc-1.0.16695.2.tar.gz -> intel-graphics-compiler-1.0.16695.2.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	llvm-r1	2e652182b1f239b07688071f959f19e4	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=d3a8fa81dd1c9a4154bf0dae5c1cc7eb
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.440.3 b/metadata/md5-cache/dev-util/jenkins-bin-2.440.3
new file mode 100644
index 000000000000..bb53e8af1d6e
--- /dev/null
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.440.3
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install
+DEPEND=acct-group/jenkins acct-user/jenkins
+DESCRIPTION=The leading open source automation server
+EAPI=8
+HOMEPAGE=https://jenkins.io/
+INHERIT=systemd
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=acct-group/jenkins acct-user/jenkins media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:0 || ( virtual/jre:17 virtual/jre:11 )
+SLOT=lts
+SRC_URI=https://get.jenkins.io/war-stable/2.440.3/jenkins.war -> jenkins-bin-2.440.3.war
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=b4515cf0d998ad2158bcc75421344653
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.454 b/metadata/md5-cache/dev-util/jenkins-bin-2.454
new file mode 100644
index 000000000000..9c2705b1921c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.454
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install
+DEPEND=acct-group/jenkins acct-user/jenkins
+DESCRIPTION=The leading open source automation server
+EAPI=8
+HOMEPAGE=https://jenkins.io/
+INHERIT=systemd
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=acct-group/jenkins acct-user/jenkins media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:lts || ( virtual/jre:17 virtual/jre:11 )
+SLOT=0
+SRC_URI=https://get.jenkins.io/war/2.454/jenkins.war -> jenkins-bin-2.454.war
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=6e41946e968301ba41944cf9b010077c
diff --git a/metadata/md5-cache/dev-util/lockrun-20240415 b/metadata/md5-cache/dev-util/lockrun-20240415
new file mode 100644
index 000000000000..52db66967d34
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lockrun-20240415
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Run cronjobs with overrun protection
+EAPI=8
+HOMEPAGE=http://www.unixwiz.net/tools/lockrun.html
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://downloads.uls.co.za/gentoo/lockrun/lockrun-20240415.c.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=f3f9f0742ad775fd8d865502f59ef1ef
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index b59e9ffb99b5..3b181face8b7 100644
--- a/metadata/md5-cache/games-server/Manifest.gz
+++ b/metadata/md5-cache/games-server/Manifest.gz
diff --git a/metadata/md5-cache/games-server/bedrock-server-1.20.72.01 b/metadata/md5-cache/games-server/bedrock-server-1.20.73.01
index 1e6255e2b124..cba51f657918 100644
--- a/metadata/md5-cache/games-server/bedrock-server-1.20.72.01
+++ b/metadata/md5-cache/games-server/bedrock-server-1.20.73.01
@@ -9,6 +9,6 @@ LICENSE=Mojang
 RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach net-misc/curl
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.20.72.01.zip
+SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.20.73.01.zip
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=10ed25f2d11627bcf3f5ca2176c2a77d
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index 5d0288bf1df6..3f6a69dbdbdf 100644
--- a/metadata/md5-cache/games-simulation/Manifest.gz
+++ b/metadata/md5-cache/games-simulation/Manifest.gz
diff --git a/metadata/md5-cache/games-simulation/openrct2-0.4.7 b/metadata/md5-cache/games-simulation/openrct2-0.4.10
index 59d13477e451..d3da52a330d9 100644
--- a/metadata/md5-cache/games-simulation/openrct2-0.4.7
+++ b/metadata/md5-cache/games-simulation/openrct2-0.4.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://openrct2.org/
 INHERIT=cmake readme.gentoo-r1 xdg-utils
 IUSE=dedicated +flac +opengl scripting test +truetype +vorbis
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/icu:= dev-libs/jansson:= dev-libs/libzip:= media-libs/libpng:= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp flac? ( media-libs/flac:= ) opengl? ( virtual/opengl ) vorbis? ( media-libs/libvorbis ) ) dev-libs/openssl:0= scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dedicated? ( acct-group/openrct2 acct-user/openrct2 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/OpenRCT2/OpenRCT2/archive/v0.4.7.tar.gz -> openrct2-0.4.7.tar.gz https://github.com/OpenRCT2/openmusic/releases/download/v1.5/openmusic.zip -> openrct2-openmusic-1.5.zip https://github.com/OpenRCT2/objects/releases/download/v1.3.13/objects.zip -> openrct2-objects-1.3.13.zip https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v1.0.3/opensound.zip -> openrct2-opensound-1.0.3.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.4.6/title-sequences.zip -> openrct2-title-sequences-0.4.6.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.78/replays.zip -> openrct2-replays-0.0.78.zip )
+SRC_URI=https://github.com/OpenRCT2/OpenRCT2/archive/v0.4.10.tar.gz -> openrct2-0.4.10.tar.gz https://github.com/OpenRCT2/openmusic/releases/download/v1.5/openmusic.zip -> openrct2-openmusic-1.5.zip https://github.com/OpenRCT2/objects/releases/download/v1.4.3/objects.zip -> openrct2-objects-1.4.3.zip https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v1.0.5/opensound.zip -> openrct2-opensound-1.0.5.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.4.6/title-sequences.zip -> openrct2-title-sequences-0.4.6.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.79/replays.zip -> openrct2-replays-0.0.79.zip )
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=db26d3955e85029605fc7011edde50f6
+_md5_=f3ec6e2f974128fc451f541bc911ca14
diff --git a/metadata/md5-cache/games-simulation/openrct2-0.4.9 b/metadata/md5-cache/games-simulation/openrct2-0.4.9
index 9035c6fcdd77..4ff19e7a0cf4 100644
--- a/metadata/md5-cache/games-simulation/openrct2-0.4.9
+++ b/metadata/md5-cache/games-simulation/openrct2-0.4.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://openrct2.org/
 INHERIT=cmake readme.gentoo-r1 xdg-utils
 IUSE=dedicated +flac +opengl scripting test +truetype +vorbis
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/icu:= dev-libs/jansson:= dev-libs/libzip:= media-libs/libpng:= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp flac? ( media-libs/flac:= ) opengl? ( virtual/opengl ) vorbis? ( media-libs/libvorbis ) ) dev-libs/openssl:0= scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dedicated? ( acct-group/openrct2 acct-user/openrct2 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenRCT2/OpenRCT2/archive/v0.4.9.tar.gz -> openrct2-0.4.9.tar.gz https://github.com/OpenRCT2/openmusic/releases/download/v1.5/openmusic.zip -> openrct2-openmusic-1.5.zip https://github.com/OpenRCT2/objects/releases/download/v1.4.0/objects.zip -> openrct2-objects-1.4.0.zip https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v1.0.5/opensound.zip -> openrct2-opensound-1.0.5.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.4.6/title-sequences.zip -> openrct2-title-sequences-0.4.6.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.79/replays.zip -> openrct2-replays-0.0.79.zip )
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=da8f433e18068e40486e08e78452b64b
+_md5_=b49d6a27a30ab8e7ae4cbcb88ab4eb25
diff --git a/metadata/md5-cache/games-simulation/openrct2-9999 b/metadata/md5-cache/games-simulation/openrct2-9999
index 0562263fc55d..c0b9c6b7493f 100644
--- a/metadata/md5-cache/games-simulation/openrct2-9999
+++ b/metadata/md5-cache/games-simulation/openrct2-9999
@@ -11,6 +11,6 @@ PROPERTIES=live
 RDEPEND=dev-libs/icu:= dev-libs/jansson:= dev-libs/libzip:= media-libs/libpng:= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp flac? ( media-libs/flac:= ) opengl? ( virtual/opengl ) vorbis? ( media-libs/libvorbis ) ) dev-libs/openssl:0= scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dedicated? ( acct-group/openrct2 acct-user/openrct2 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/OpenRCT2/openmusic/releases/download/v1.5/openmusic.zip -> openrct2-openmusic-1.5.zip https://github.com/OpenRCT2/objects/releases/download/v1.4.0/objects.zip -> openrct2-objects-1.4.0.zip https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v1.0.5/opensound.zip -> openrct2-opensound-1.0.5.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.4.6/title-sequences.zip -> openrct2-title-sequences-0.4.6.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.79/replays.zip -> openrct2-replays-0.0.79.zip )
+SRC_URI=https://github.com/OpenRCT2/openmusic/releases/download/v1.5/openmusic.zip -> openrct2-openmusic-1.5.zip https://github.com/OpenRCT2/objects/releases/download/v1.4.3/objects.zip -> openrct2-objects-1.4.3.zip https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v1.0.5/opensound.zip -> openrct2-opensound-1.0.5.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.4.6/title-sequences.zip -> openrct2-title-sequences-0.4.6.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.79/replays.zip -> openrct2-replays-0.0.79.zip )
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=dde2987333467f9e690fac69ef14e86f
+_md5_=358bc38f3fcc3d77e6c483cc71535a04
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index b814f6a68bf2..ccdc0e036f3c 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-control-center-45.3 b/metadata/md5-cache/gnome-base/gnome-control-center-45.3
index a454fe911795..0fe045a38507 100644
--- a/metadata/md5-cache/gnome-base/gnome-control-center-45.3
+++ b/metadata/md5-cache/gnome-base/gnome-control-center-45.3
@@ -7,7 +7,7 @@ HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-control-center
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=flag-o-matic gnome.org gnome2-utils meson python-any-r1 virtualx xdg
 IUSE=+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test wayland test
-KEYWORDS=~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+ CC-BY-SA-2.5
 PDEPEND=>=gnome-base/gnome-session-2.91.6-r1 networkmanager? ( gnome-extra/nm-applet )
 RDEPEND=gnome-online-accounts? ( x11-libs/gtk+:3 >=net-libs/gnome-online-accounts-3.25.3:= ) >=media-libs/libpulse-2.0[glib] >=gui-libs/gtk-4.11.2:4[X,wayland=] >=gui-libs/libadwaita-1.4_alpha:1 >=sys-apps/accountsservice-0.6.39 >=x11-misc/colord-0.1.34:0= >=x11-libs/gdk-pixbuf-2.23.0:2 >=dev-libs/glib-2.75.0:2 gnome-base/gnome-desktop:4= >=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?] >=gnome-base/gsettings-desktop-schemas-42_alpha dev-libs/libxml2:2 >=sys-power/upower-0.99.8:= >=dev-libs/libgudev-232 >=x11-libs/libX11-1.8 >=x11-libs/libXi-1.2 media-libs/libepoxy app-crypt/gcr:0= >=dev-libs/libpwquality-1.2.2 >=sys-auth/polkit-0.114 cups? ( >=net-print/cups-1.7[dbus] >=net-fs/samba-4.0.0[client] ) ibus? ( >=app-i18n/ibus-1.5.2 ) networkmanager? ( >=net-libs/libnma-1.10.2 >=net-misc/networkmanager-1.24.0[modemmanager] >=net-misc/modemmanager-0.7.990:= ) bluetooth? ( net-wireless/gnome-bluetooth:3= ) input_devices_wacom? ( >=dev-libs/libwacom-0.27:= ) kerberos? ( app-crypt/mit-krb5 ) x11-libs/cairo[glib] >=x11-libs/colord-gtk-0.3.0:= media-libs/fontconfig gnome-base/libgtop:2= >=sys-fs/udisks-2.1.8:2 app-crypt/libsecret net-libs/gnutls:= media-libs/gsound x11-libs/pango media-libs/libcanberra[pulseaudio,sound] systemd? ( >=sys-apps/systemd-31 ) elogind? ( app-admin/openrc-settingsd sys-auth/elogind ) x11-themes/adwaita-icon-theme >=gnome-extra/gnome-color-manager-3.1.2 cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) gnome-extra/tecla wayland? ( dev-libs/libinput ) !wayland? ( >=x11-drivers/xf86-input-libinput-0.19.0 input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
@@ -16,4 +16,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-control-center/45/gnome-control-center-45.3.tar.xz https://dev.gentoo.org/~mattst88/distfiles/gnome-control-center-45.0-patchset.tar.xz https://dev.gentoo.org/~mattst88/distfiles/gnome-control-center-gentoo-logo.svg https://dev.gentoo.org/~mattst88/distfiles/gnome-control-center-gentoo-logo-dark.svg
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2-utils	30dbce54b89e77b86f366548f94419ad	meson	92696988eaddba122c4cedc191f59bcb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=920829bdac4dd15b7fe1ca379c926b60
+_md5_=3b8599c719d132ab81165937c36f76d6
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 82dd3c335ca4..e4a234650260 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/gnome-calendar-45.1-r1 b/metadata/md5-cache/gnome-extra/gnome-calendar-45.1-r1
index 7294c49ff6d6..60800f7db424 100644
--- a/metadata/md5-cache/gnome-extra/gnome-calendar-45.1-r1
+++ b/metadata/md5-cache/gnome-extra/gnome-calendar-45.1-r1
@@ -7,11 +7,11 @@ HOMEPAGE=https://wiki.gnome.org/Apps/Calendar
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome.org gnome2-utils meson virtualx xdg
 IUSE=test
-KEYWORDS=~amd64 arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/libical-1.0.1:0= >=gnome-base/gsettings-desktop-schemas-3.21.2 >=gnome-extra/evolution-data-server-3.45.1:=[gtk] net-libs/libsoup:3.0 >=gui-libs/libadwaita-1.4_alpha:1 >=dev-libs/glib-2.67.5:2 >=gui-libs/gtk-4.11.2:4 >=dev-libs/libgweather-4.2.0:4= >=app-misc/geoclue-2.4:2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-calendar/45/gnome-calendar-45.1.tar.xz
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2-utils	30dbce54b89e77b86f366548f94419ad	meson	92696988eaddba122c4cedc191f59bcb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5f9b179a2c6cc92c9bb520fd782598da
+_md5_=c427c59c6630d4a27a25c66a9b903f68
diff --git a/metadata/md5-cache/gnome-extra/gnome-contacts-45.1 b/metadata/md5-cache/gnome-extra/gnome-contacts-45.1
index 20969ab5183f..df8e895cc288 100644
--- a/metadata/md5-cache/gnome-extra/gnome-contacts-45.1
+++ b/metadata/md5-cache/gnome-extra/gnome-contacts-45.1
@@ -7,10 +7,10 @@ HOMEPAGE=https://wiki.gnome.org/Design/Apps/Contacts
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
 IUSE=+gnome-online-accounts
-KEYWORDS=~amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/folks-0.14.0:=[eds] >=dev-libs/libgee-0.10:0.8= >=dev-libs/glib-2.64:2 >=gui-libs/gtk-4.12:4 >=gui-libs/libadwaita-1.4_alpha:1 >=gnome-extra/evolution-data-server-3.42:=[gnome-online-accounts?] >=dev-libs/libportal-0.6:= >=media-gfx/qrencode-4.1.1:= gnome-online-accounts? ( net-libs/gnome-online-accounts:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-contacts/45/gnome-contacts-45.1.tar.xz
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2-utils	30dbce54b89e77b86f366548f94419ad	meson	92696988eaddba122c4cedc191f59bcb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8480ecd40bded672b7ed5c4f6685d063
+_md5_=dc7d965738453a5aa112d04794d0cce4
diff --git a/metadata/md5-cache/gnome-extra/gnome-tweaks-45.2 b/metadata/md5-cache/gnome-extra/gnome-tweaks-45.2
index 1a2a2b575df8..8bbb70a0f6e3 100644
--- a/metadata/md5-cache/gnome-extra/gnome-tweaks-45.2
+++ b/metadata/md5-cache/gnome-extra/gnome-tweaks-45.2
@@ -7,11 +7,11 @@ HOMEPAGE=https://wiki.gnome.org/Apps/Tweaks
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome.org gnome2-utils meson python-single-r1 xdg
 IUSE=python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86
 LICENSE=GPL-3+ CC0-1.0
 RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( >=dev-python/pygobject-3.10.2:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.10.2:3[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/pygobject-3.10.2:3[python_targets_python3_12(-)] ) >=gnome-base/gnome-settings-daemon-3 x11-themes/sound-theme-freedesktop >=dev-libs/glib-2.58:2 >=x11-libs/gtk+-3.12:3[introspection] >=gnome-base/gnome-desktop-3.30:3[introspection] gui-libs/libhandy:1[introspection] x11-libs/libnotify[introspection] x11-libs/pango[introspection] >=gnome-base/gsettings-desktop-schemas-40.0 >=gnome-base/gnome-shell-3.24 x11-wm/mutter
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-tweaks/45/gnome-tweaks-45.2.tar.xz
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2-utils	30dbce54b89e77b86f366548f94419ad	meson	92696988eaddba122c4cedc191f59bcb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=618ef45668f7f81d291f517bc8f3cbf6
+_md5_=9f3ffa7a09ec094e4a5b48a33b3a60c5
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 668ad7ab1bb2..2259751b4fa1 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/thunderbird-115.10.0 b/metadata/md5-cache/mail-client/thunderbird-115.10.0
new file mode 100644
index 000000000000..fb0cb0c2ada9
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-115.10.0
@@ -0,0 +1,17 @@
+BDEPEND=|| ( dev-lang/python:3.11[ncurses,sqlite,ssl] dev-lang/python:3.10[ncurses,sqlite,ssl] ) || ( ( sys-devel/clang:17 sys-devel/llvm:17 clang? ( sys-devel/lld:17 virtual/rust:0/llvm-17 pgo? ( =sys-libs/compiler-rt-sanitizers-17*[profile] ) ) ) ( sys-devel/clang:16 sys-devel/llvm:16 clang? ( sys-devel/lld:16 virtual/rust:0/llvm-16 pgo? ( =sys-libs/compiler-rt-sanitizers-16*[profile] ) ) ) ( sys-devel/clang:15 sys-devel/llvm:15 clang? ( sys-devel/lld:15 virtual/rust:0/llvm-15 pgo? ( =sys-libs/compiler-rt-sanitizers-15*[profile] ) ) ) ) app-alternatives/awk app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.24.3 net-libs/nodejs virtual/pkgconfig !clang? ( >=virtual/rust-1.65 ) !elibc_glibc? ( || ( dev-lang/rust <dev-lang/rust-bin-1.73 ) ) amd64? ( >=dev-lang/nasm-2.14 ) x86? ( >=dev-lang/nasm-2.14 ) pgo? ( X? ( sys-devel/gettext x11-base/xorg-server[xvfb] x11-apps/xhost ) wayland? ( >=gui-libs/wlroots-0.15.1-r1[tinywl] x11-misc/xkeyboard-config ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20240116 || ( >=dev-build/automake-1.16.5:1.16 ) >=dev-build/autoconf-2.13-r7:2.1 >=dev-build/libtool-2.4.7-r3
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=!<x11-plugins/enigmail-2.2 selinux? ( sec-policy/selinux-thunderbird ) !system-librnp? ( dev-libs/jsoncpp ) system-librnp? ( dev-util/librnp ) >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.90 >=dev-libs/nspr-4.35 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) pulseaudio? ( || ( media-libs/libpulse >=media-sound/apulse-0.1.12-r4[sdk] ) ) libproxy? ( net-libs/libproxy ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-74.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( >=media-libs/libepoxy-1.5.10-r1 x11-libs/gtk+:3[wayland] x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) X? ( virtual/opengl x11-libs/cairo[X] x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= ) X? ( x11-base/xorg-proto x11-libs/libICE x11-libs/libSM ) !!sys-devel/llvm:0
+DESCRIPTION=Thunderbird Mail Client
+EAPI=8
+HOMEPAGE=https://www.thunderbird.net/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm multiprocessing optfeature pax-utils python-any-r1 toolchain-funcs virtualx xdg
+IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp wayland wifi +X +system-librnp l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=!<x11-plugins/enigmail-2.2 selinux? ( sec-policy/selinux-thunderbird ) !system-librnp? ( dev-libs/jsoncpp ) system-librnp? ( dev-util/librnp ) >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.90 >=dev-libs/nspr-4.35 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) pulseaudio? ( || ( media-libs/libpulse >=media-sound/apulse-0.1.12-r4[sdk] ) ) libproxy? ( net-libs/libproxy ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-74.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( >=media-libs/libepoxy-1.5.10-r1 x11-libs/gtk+:3[wayland] x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) X? ( virtual/opengl x11-libs/cairo[X] x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] )
+REQUIRED_USE=|| ( X wayland ) debug? ( !system-av1 ) pgo? ( lto ) wifi? ( dbus )
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/source/thunderbird-115.10.0.source.tar.xz -> thunderbird-115.10.0.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-115esr-patches-09.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/af.xpi -> thunderbird-115.10.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/ar.xpi -> thunderbird-115.10.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/ast.xpi -> thunderbird-115.10.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/be.xpi -> thunderbird-115.10.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/bg.xpi -> thunderbird-115.10.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/br.xpi -> thunderbird-115.10.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/ca.xpi -> thunderbird-115.10.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/cak.xpi -> thunderbird-115.10.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/cs.xpi -> thunderbird-115.10.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/cy.xpi -> thunderbird-115.10.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/da.xpi -> thunderbird-115.10.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/de.xpi -> thunderbird-115.10.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/dsb.xpi -> thunderbird-115.10.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/el.xpi -> thunderbird-115.10.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/en-CA.xpi -> thunderbird-115.10.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/en-GB.xpi -> thunderbird-115.10.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/es-AR.xpi -> thunderbird-115.10.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/es-ES.xpi -> thunderbird-115.10.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/es-MX.xpi -> thunderbird-115.10.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/et.xpi -> thunderbird-115.10.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/eu.xpi -> thunderbird-115.10.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/fi.xpi -> thunderbird-115.10.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/fr.xpi -> thunderbird-115.10.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-115.10.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-115.10.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/gd.xpi -> thunderbird-115.10.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/gl.xpi -> thunderbird-115.10.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/he.xpi -> thunderbird-115.10.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/hr.xpi -> thunderbird-115.10.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/hsb.xpi -> thunderbird-115.10.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/hu.xpi -> thunderbird-115.10.0-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/id.xpi -> thunderbird-115.10.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/is.xpi -> thunderbird-115.10.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/it.xpi -> thunderbird-115.10.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/ja.xpi -> thunderbird-115.10.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/ka.xpi -> thunderbird-115.10.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/kab.xpi -> thunderbird-115.10.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/kk.xpi -> thunderbird-115.10.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/ko.xpi -> thunderbird-115.10.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/lt.xpi -> thunderbird-115.10.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/lv.xpi -> thunderbird-115.10.0-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/ms.xpi -> thunderbird-115.10.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-115.10.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/nl.xpi -> thunderbird-115.10.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-115.10.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-115.10.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/pl.xpi -> thunderbird-115.10.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-115.10.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-115.10.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/rm.xpi -> thunderbird-115.10.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/ro.xpi -> thunderbird-115.10.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/ru.xpi -> thunderbird-115.10.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/sk.xpi -> thunderbird-115.10.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/sl.xpi -> thunderbird-115.10.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/sq.xpi -> thunderbird-115.10.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/sr.xpi -> thunderbird-115.10.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-115.10.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/th.xpi -> thunderbird-115.10.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/tr.xpi -> thunderbird-115.10.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/uk.xpi -> thunderbird-115.10.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/uz.xpi -> thunderbird-115.10.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/vi.xpi -> thunderbird-115.10.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-115.10.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-115.10.0-zh-TW.xpi )
+_eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnome2-utils	30dbce54b89e77b86f366548f94419ad	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	linux-info	7ca3057b277f1e5978947b4cc289ce62	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=475aff94ec091cf41d820b731231fbaa
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-115.10.0 b/metadata/md5-cache/mail-client/thunderbird-bin-115.10.0
new file mode 100644
index 000000000000..e7c073eab1e0
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-bin-115.10.0
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
+DEFINED_PHASES=install postinst postrm preinst unpack
+DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) )
+DESCRIPTION=Thunderbird Mail Client
+EAPI=8
+HOMEPAGE=https://www.thunderbird.net/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop optfeature pax-utils xdg
+IUSE=+alsa +ffmpeg +pulseaudio selinux wayland l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/alsa-lib media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb >=x11-libs/pango-1.22.0 ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-libs/libpulse ) selinux? ( sec-policy/selinux-thunderbird )
+RESTRICT=strip
+SLOT=0/115
+SRC_URI=amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/en-US/thunderbird-115.10.0.tar.bz2 -> thunderbird-bin_x86_64-115.10.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-i686/en-US/thunderbird-115.10.0.tar.bz2 -> thunderbird-bin_i686-115.10.0.tar.bz2 ) l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/af.xpi -> thunderbird-115.10.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/ar.xpi -> thunderbird-115.10.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/ast.xpi -> thunderbird-115.10.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/be.xpi -> thunderbird-115.10.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/bg.xpi -> thunderbird-115.10.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/br.xpi -> thunderbird-115.10.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/ca.xpi -> thunderbird-115.10.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/cak.xpi -> thunderbird-115.10.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/cs.xpi -> thunderbird-115.10.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/cy.xpi -> thunderbird-115.10.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/da.xpi -> thunderbird-115.10.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/de.xpi -> thunderbird-115.10.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/dsb.xpi -> thunderbird-115.10.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/el.xpi -> thunderbird-115.10.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/en-CA.xpi -> thunderbird-115.10.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/en-GB.xpi -> thunderbird-115.10.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/es-AR.xpi -> thunderbird-115.10.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/es-ES.xpi -> thunderbird-115.10.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/es-MX.xpi -> thunderbird-115.10.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/et.xpi -> thunderbird-115.10.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/eu.xpi -> thunderbird-115.10.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/fi.xpi -> thunderbird-115.10.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/fr.xpi -> thunderbird-115.10.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-115.10.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-115.10.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/gd.xpi -> thunderbird-115.10.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/gl.xpi -> thunderbird-115.10.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/he.xpi -> thunderbird-115.10.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/hr.xpi -> thunderbird-115.10.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/hsb.xpi -> thunderbird-115.10.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/hu.xpi -> thunderbird-115.10.0-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/id.xpi -> thunderbird-115.10.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/is.xpi -> thunderbird-115.10.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/it.xpi -> thunderbird-115.10.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/ja.xpi -> thunderbird-115.10.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/ka.xpi -> thunderbird-115.10.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/kab.xpi -> thunderbird-115.10.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/kk.xpi -> thunderbird-115.10.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/ko.xpi -> thunderbird-115.10.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/lt.xpi -> thunderbird-115.10.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/lv.xpi -> thunderbird-115.10.0-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/ms.xpi -> thunderbird-115.10.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-115.10.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/nl.xpi -> thunderbird-115.10.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-115.10.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-115.10.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/pl.xpi -> thunderbird-115.10.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-115.10.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-115.10.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/rm.xpi -> thunderbird-115.10.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/ro.xpi -> thunderbird-115.10.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/ru.xpi -> thunderbird-115.10.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/sk.xpi -> thunderbird-115.10.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/sl.xpi -> thunderbird-115.10.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/sq.xpi -> thunderbird-115.10.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/sr.xpi -> thunderbird-115.10.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-115.10.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/th.xpi -> thunderbird-115.10.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/tr.xpi -> thunderbird-115.10.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/uk.xpi -> thunderbird-115.10.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/uz.xpi -> thunderbird-115.10.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/vi.xpi -> thunderbird-115.10.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-115.10.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/115.10.0/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-115.10.0-zh-TW.xpi )
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=e10fca9721d24f120f30a1bcc1c62bdc
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index a4cf4794b6f5..868424caea30 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/curtail-1.9.1 b/metadata/md5-cache/media-gfx/curtail-1.9.1
new file mode 100644
index 000000000000..0dc93e54c937
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/curtail-1.9.1
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) gui-libs/gtk:4[introspection] 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(-)] ) python_single_target_python3_12? ( dev-python/pygobject:3[python_targets_python3_12(-)] ) dev-libs/appstream-glib dev-util/desktop-file-utils >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DESCRIPTION=Image compressor, supporting PNG, JPEG and WebP
+EAPI=8
+HOMEPAGE=https://github.com/Huluti/Curtail/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2-utils meson python-single-r1 xdg
+IUSE=python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) gui-libs/gtk:4[introspection] 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(-)] ) python_single_target_python3_12? ( dev-python/pygobject:3[python_targets_python3_12(-)] ) >=gui-libs/libadwaita-1.3.1 media-gfx/jpegoptim media-gfx/oxipng media-gfx/pngquant media-libs/libwebp
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/Huluti/Curtail/archive/1.9.1.tar.gz -> curtail-1.9.1.tar.gz
+_eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnome2-utils	30dbce54b89e77b86f366548f94419ad	meson	92696988eaddba122c4cedc191f59bcb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=a1cd8070c47133e29180d2474230a133
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 1d401865be05..7bd60d22f02c 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/mesa-9999 b/metadata/md5-cache/media-libs/mesa-9999
index 04dc45961fec..4000a5574ae8 100644
--- a/metadata/md5-cache/media-libs/mesa-9999
+++ b/metadata/md5-cache/media-libs/mesa-9999
@@ -1,6 +1,6 @@
 BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) opencl? ( >=virtual/rust-1.62.0 >=dev-util/bindgen-0.58.0 >=dev-build/meson-1.3.1 ) app-alternatives/yacc app-alternatives/lex virtual/pkgconfig || ( ( dev-lang/python:3.12 >=dev-python/mako-0.8.0[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ) video_cards_intel? ( ~dev-util/intel_clc-9999 dev-libs/libclc[spirv(-)] || ( ( dev-lang/python:3.12 dev-python/ply[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/ply[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/ply[python_targets_python3_10(-)] ) ) ) vulkan? ( dev-util/glslang ) wayland? ( dev-util/wayland-scanner ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( llvm_slot_15? ( sys-devel/llvm:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:15 sys-devel/clang:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_16? ( sys-devel/llvm:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:16 sys-devel/clang:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_17? ( sys-devel/llvm:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:17 sys-devel/clang:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3 dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeonsi? ( virtual/libelf: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(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.119[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_amdgpu] ) video_cards_d3d12? ( >=dev-util/directx-headers-1.611.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(-)?] ) valgrind? ( dev-debug/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.34 ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto )
+DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( llvm_slot_15? ( sys-devel/llvm:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:15 sys-devel/clang:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_16? ( sys-devel/llvm:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:16 sys-devel/clang:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_17? ( sys-devel/llvm:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:17 sys-devel/clang:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3 dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeonsi? ( virtual/libelf: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(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.119[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_amdgpu] ) video_cards_d3d12? ( >=dev-util/directx-headers-1.611.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(-)?] ) valgrind? ( dev-debug/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.34 ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto )
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=8
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
@@ -8,9 +8,9 @@ INHERIT=llvm-r1 meson-multilib python-any-r1 linux-info git-r3
 IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_d3d12 video_cards_freedreno video_cards_intel video_cards_lavapipe video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm lm-sensors opencl +opengl osmesa +proprietary-codecs selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa zink +zstd +llvm_slot_17 llvm_slot_15 llvm_slot_16 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=MIT SGI-B-2.0
 PROPERTIES=live
-RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( llvm_slot_15? ( sys-devel/llvm:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:15 sys-devel/clang:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_16? ( sys-devel/llvm:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:16 sys-devel/clang:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_17? ( sys-devel/llvm:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:17 sys-devel/clang:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3 dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeonsi? ( virtual/libelf: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(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.119[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_amdgpu] )
+RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( llvm_slot_15? ( sys-devel/llvm:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:15 sys-devel/clang:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_16? ( sys-devel/llvm:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:16 sys-devel/clang:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_17? ( sys-devel/llvm:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:17 sys-devel/clang:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3 dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeonsi? ( virtual/libelf: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(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.119[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_amdgpu] )
 REQUIRED_USE=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) llvm? ( ^^ ( llvm_slot_15 llvm_slot_16 llvm_slot_17 ) ) vulkan-overlay? ( vulkan ) video_cards_lavapipe? ( llvm vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) vdpau? ( X ) xa? ( X ) X? ( gles1? ( opengl ) gles2? ( opengl ) ) zink? ( vulkan || ( opengl gles1 gles2 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	git-r3	fbb2889c81f3a05910c1524db69425c1	linux-info	7ca3057b277f1e5978947b4cc289ce62	llvm-r1	2e652182b1f239b07688071f959f19e4	llvm-utils	e59dc622da7e7e7f16879105bed34858	meson	92696988eaddba122c4cedc191f59bcb	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=7864bbd6d7182061fbb2a0367079b3d7
+_md5_=12c4f419057936469aa9163904fdf88e
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index cda1410e1261..cf40dfacf44f 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/audacity-3.3.3 b/metadata/md5-cache/media-sound/audacity-3.3.3
new file mode 100644
index 000000000000..12d763e5eb6b
--- /dev/null
+++ b/metadata/md5-cache/media-sound/audacity-3.3.3
@@ -0,0 +1,18 @@
+BDEPEND=app-arch/unzip sys-devel/gettext virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-db/sqlite:3 dev-libs/expat dev-libs/glib:2 media-libs/libsndfile media-libs/libsoundtouch:= media-libs/portaudio[alsa?] media-libs/portmidi media-libs/portsmf:= media-libs/soxr media-sound/lame x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/wxGTK:3.2-gtk3[X] sys-apps/util-linux alsa? ( media-libs/alsa-lib ) audiocom? ( dev-libs/rapidjson net-misc/curl ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac:=[cxx] ) id3tag? ( media-libs/libid3tag:= ) lv2? ( dev-libs/serd dev-libs/sord media-libs/lilv media-libs/lv2 media-libs/sratom media-libs/suil ) mad? ( media-libs/libmad ) mpg123? ( media-sound/mpg123 ) ogg? ( media-libs/libogg ) opus? ( media-libs/opus ) sbsms? ( media-libs/libsbsms ) twolame? ( media-sound/twolame ) vamp? ( media-libs/vamp-plugin-sdk ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) test? ( <dev-cpp/catch-3:0 )
+DESCRIPTION=Free crossplatform audio editor
+EAPI=8
+HOMEPAGE=https://www.audacityteam.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake flag-o-matic wxwidgets xdg virtualx
+IUSE=alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg opus +portmixer sbsms test twolame vamp +vorbis wavpack test
+KEYWORDS=amd64 ~arm64 ppc64 ~riscv ~x86
+LICENSE=GPL-2+ GPL-3 audiocom? ( ZLIB )
+RDEPEND=dev-db/sqlite:3 dev-libs/expat dev-libs/glib:2 media-libs/libsndfile media-libs/libsoundtouch:= media-libs/portaudio[alsa?] media-libs/portmidi media-libs/portsmf:= media-libs/soxr media-sound/lame x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/wxGTK:3.2-gtk3[X] sys-apps/util-linux alsa? ( media-libs/alsa-lib ) audiocom? ( dev-libs/rapidjson net-misc/curl ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac:=[cxx] ) id3tag? ( media-libs/libid3tag:= ) lv2? ( dev-libs/serd dev-libs/sord media-libs/lilv media-libs/lv2 media-libs/sratom media-libs/suil ) mad? ( media-libs/libmad ) mpg123? ( media-sound/mpg123 ) ogg? ( media-libs/libogg ) opus? ( media-libs/opus ) sbsms? ( media-libs/libsbsms ) twolame? ( media-sound/twolame ) vamp? ( media-libs/vamp-plugin-sdk ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
+REQUIRED_USE=mad? ( !mpg123 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/audacity/audacity/archive/Audacity-3.3.3.tar.gz audiocom? ( https://raw.githubusercontent.com/progschj/ThreadPool/9a42ec1329f259a5f4881a291db1dcb8f2ad9040/ThreadPool.h -> progschj-ThreadPool-20140926.h )
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=cded20aa467598bc66db12295f28835c
diff --git a/metadata/md5-cache/media-sound/easyeffects-7.1.3-r1 b/metadata/md5-cache/media-sound/easyeffects-7.1.3-r1
index 5c0ae984a702..8b1803a57590 100644
--- a/metadata/md5-cache/media-sound/easyeffects-7.1.3-r1
+++ b/metadata/md5-cache/media-sound/easyeffects-7.1.3-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/wwmm/easyeffects
 INHERIT=gnome2-utils meson toolchain-funcs
 IUSE=calf +doc mda-lv2 zamaudio
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-cpp/nlohmann_json dev-cpp/tbb >=dev-libs/glib-2.56:2 dev-libs/libfmt >=dev-libs/libsigc++-3.0.6:3 >=gui-libs/gtk-4.10.0:4 >=gui-libs/libadwaita-1.2.0:1 media-libs/libbs2b >=media-libs/libebur128-1.2.0 media-libs/libsndfile media-libs/libsoundtouch >=media-libs/lilv-0.22 >=media-libs/lv2-1.18.2 media-libs/rnnoise media-libs/speexdsp >=media-libs/zita-convolver-3.0.0 >=media-video/pipewire-0.3.41 sci-libs/gsl:= sci-libs/fftw:3.0 >=media-libs/lsp-plugins-1.2.10[lv2] sys-apps/dbus calf? ( >=media-plugins/calf-0.90.1[lv2] ) doc? ( gnome-extra/yelp ) mda-lv2? ( media-plugins/mda-lv2 ) zamaudio? ( media-plugins/zam-plugins )
 SLOT=0
 SRC_URI=https://github.com/wwmm/easyeffects/archive/v7.1.3.tar.gz -> easyeffects-7.1.3.tar.gz
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnome2-utils	30dbce54b89e77b86f366548f94419ad	meson	92696988eaddba122c4cedc191f59bcb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=56aac85e8dc87be40476ff99d01ca046
+_md5_=88325367c18b209b9e09f4a8f371cee2
diff --git a/metadata/md5-cache/media-sound/gnome-music-45.1 b/metadata/md5-cache/media-sound/gnome-music-45.1
index e8f61553931b..e98c48c9bca4 100644
--- a/metadata/md5-cache/media-sound/gnome-music-45.1
+++ b/metadata/md5-cache/media-sound/gnome-music-45.1
@@ -7,11 +7,11 @@ HOMEPAGE=https://wiki.gnome.org/Apps/Music https://gitlab.gnome.org/GNOME/gnome-
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome.org gnome2-utils meson python-single-r1 xdg
 IUSE=python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) >=dev-libs/glib-2.67.1:2 >=net-libs/gnome-online-accounts-3.35.90[introspection] >=dev-libs/gobject-introspection-1.54:= >=gui-libs/gtk-4.5.0:4[introspection] >=gui-libs/libadwaita-1.2:1=[introspection] >=media-libs/libmediaart-1.9.1:2.0[introspection] net-libs/libsoup:3.0[introspection] app-misc/tracker:3=[introspection(+)] >=x11-libs/pango-1.44:= python_single_target_python3_10? ( >=dev-python/pygobject-3.36.1:3[cairo,python_targets_python3_10(-)] >=dev-python/pycairo-1.14.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.36.1:3[cairo,python_targets_python3_11(-)] >=dev-python/pycairo-1.14.0[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/pygobject-3.36.1:3[cairo,python_targets_python3_12(-)] >=dev-python/pycairo-1.14.0[python_targets_python3_12(-)] ) >=media-libs/grilo-0.3.15-r1:0.3[introspection] >=media-plugins/grilo-plugins-0.3.16:0.3[tracker] || ( app-misc/tracker-miners:3[gstreamer] app-misc/tracker-miners:3[ffmpeg] ) x11-libs/libnotify[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-plugins/gst-plugins-meta:1.0 media-plugins/grilo-plugins:0.3[tracker] x11-misc/xdg-user-dirs
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-music/45/gnome-music-45.1.tar.xz
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2-utils	30dbce54b89e77b86f366548f94419ad	meson	92696988eaddba122c4cedc191f59bcb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=42da7bc88c09af706afda8a4d5e68b19
+_md5_=2be82b5da7938393d6fc107b5ce21b73
diff --git a/metadata/md5-cache/media-sound/gtick-0.5.5 b/metadata/md5-cache/media-sound/gtick-0.5.5
deleted file mode 100644
index 27f2ff755e3b..000000000000
--- a/metadata/md5-cache/media-sound/gtick-0.5.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=media-sound/pulseaudio x11-libs/gtk+:2 sndfile? ( media-libs/libsndfile )
-DESCRIPTION=Metronome application supporting different meters and speeds ranging
-EAPI=7
-HOMEPAGE=https://www.antcom.de/gtick
-INHERIT=desktop xdg-utils
-IUSE=nls sndfile
-KEYWORDS=amd64 ~ppc ~sparc x86
-LICENSE=GPL-3+
-RDEPEND=media-sound/pulseaudio x11-libs/gtk+:2 sndfile? ( media-libs/libsndfile )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.antcom.de/gtick/download/gtick-0.5.5.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7ccbce3181c94a4da9c7e7518a9fa4c0
diff --git a/metadata/md5-cache/media-sound/gtick-0.5.5-r1 b/metadata/md5-cache/media-sound/gtick-0.5.5-r1
new file mode 100644
index 000000000000..2b7677baa66d
--- /dev/null
+++ b/metadata/md5-cache/media-sound/gtick-0.5.5-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20240116 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=media-libs/libpulse virtual/libintl x11-libs/gtk+:2 sndfile? ( media-libs/libsndfile )
+DESCRIPTION=Metronome application supporting different meters and speeds ranging
+EAPI=8
+HOMEPAGE=https://www.antcom.de/gtick
+INHERIT=autotools desktop xdg-utils
+IUSE=nls sndfile
+KEYWORDS=amd64 ~ppc ~sparc x86
+LICENSE=GPL-3+
+RDEPEND=media-libs/libpulse virtual/libintl x11-libs/gtk+:2 sndfile? ( media-libs/libsndfile )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.antcom.de/gtick/download/gtick-0.5.5.tar.gz
+_eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	desktop	021728fdc1b03b36357dbc89489e0f0d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=fa535dede8d79e4ee336814db1c0ce23
diff --git a/metadata/md5-cache/media-sound/guitarix-0.46.0 b/metadata/md5-cache/media-sound/guitarix-0.46.0
new file mode 100644
index 000000000000..3e4f0f21489c
--- /dev/null
+++ b/metadata/md5-cache/media-sound/guitarix-0.46.0
@@ -0,0 +1,17 @@
+BDEPEND=|| ( dev-lang/python:3.12[threads(+)] dev-lang/python:3.11[threads(+)] dev-lang/python:3.10[threads(+)] ) virtual/pkgconfig standalone? ( dev-lang/sassc nls? ( dev-util/intltool sys-devel/gettext ) )
+DEFINED_PHASES=compile configure install postinst postrm preinst setup
+DEPEND=dev-cpp/eigen:3 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-libs/glib:2 media-libs/libsndfile media-libs/zita-convolver:= media-libs/zita-resampler net-misc/curl sci-libs/fftw:3.0= x11-libs/gtk+:3 lv2? ( media-libs/lv2 ) standalone? ( dev-libs/boost:= media-libs/liblrdf media-libs/lilv virtual/jack bluetooth? ( net-wireless/bluez ) nsm? ( media-libs/liblo ) zeroconf? ( net-dns/avahi ) )
+DESCRIPTION=Virtual guitar amplifier for Linux
+EAPI=8
+HOMEPAGE=https://guitarix.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=multiprocessing python-any-r1 waf-utils xdg
+IUSE=bluetooth debug lv2 nls nsm +standalone zeroconf
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-cpp/eigen:3 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-libs/glib:2 media-libs/libsndfile media-libs/zita-convolver:= media-libs/zita-resampler net-misc/curl sci-libs/fftw:3.0= x11-libs/gtk+:3 lv2? ( media-libs/lv2 ) standalone? ( dev-libs/boost:= media-libs/liblrdf media-libs/lilv virtual/jack bluetooth? ( net-wireless/bluez ) nsm? ( media-libs/liblo ) zeroconf? ( net-dns/avahi ) ) standalone? ( media-fonts/roboto )
+REQUIRED_USE=|| ( lv2 standalone )
+SLOT=0
+SRC_URI=https://github.com/brummer10/guitarix/releases/download/V0.46.0/guitarix2-0.46.0.tar.xz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	waf-utils	be1df8dc616c09387b18633b4155fcb5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=b6183e997191796c14c6b29c0768419d
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 824a471ed2ef..242b16053b62 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/aegisub-3.3.3 b/metadata/md5-cache/media-video/aegisub-3.3.3
index 4d1668384747..0874ac0b2788 100644
--- a/metadata/md5-cache/media-video/aegisub-3.3.3
+++ b/metadata/md5-cache/media-video/aegisub-3.3.3
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=http://www.aegisub.org/ https://github.com/wangqr/Aegisub
 INHERIT=autotools flag-o-matic lua-single plocale wxwidgets xdg-utils vcs-snapshot toolchain-funcs
 IUSE=+alsa debug +fftw openal oss portaudio pulseaudio spell test +uchardet +lua_single_target_luajit
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD MIT
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:=[lua52compat] ) x11-libs/wxGTK:3.2-gtk3[X,opengl,debug?] dev-libs/boost:=[icu,nls] dev-libs/icu:= media-libs/ffmpegsource:= media-libs/fontconfig media-libs/freetype media-libs/libass:=[fontconfig] sys-libs/zlib virtual/libiconv virtual/opengl alsa? ( media-libs/alsa-lib ) fftw? ( >=sci-libs/fftw-3.3:= ) openal? ( media-libs/openal ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( media-libs/libpulse ) spell? ( app-text/hunspell:= ) uchardet? ( app-i18n/uchardet )
 REQUIRED_USE=^^ ( lua_single_target_luajit ) || ( alsa openal oss portaudio pulseaudio )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/wangqr/Aegisub/archive/v3.3.3.tar.gz -> aegisub-3.3.3.tar.gz
 _eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c39e0618416d220769a605257a731f6b
+_md5_=a00ded3872a2d6801d1d0b1cd7f49ade
diff --git a/metadata/md5-cache/media-video/mpv-0.38.0 b/metadata/md5-cache/media-video/mpv-0.38.0
new file mode 100644
index 000000000000..7323b18a6c71
--- /dev/null
+++ b/metadata/md5-cache/media-video/mpv-0.38.0
@@ -0,0 +1,18 @@
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) virtual/pkgconfig cli? ( dev-python/docutils ) wayland? ( dev-util/wayland-scanner ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst setup test
+DEPEND=media-libs/libass:=[fontconfig] >=media-libs/libplacebo-6.338.2:=[opengl?,vulkan?] >=media-video/ffmpeg-4.4:=[encode,soc(-)?,threads,vaapi?,vdpau?] X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXpresent x11-libs/libXrandr xv? ( x11-libs/libXv ) ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray:= ) cdda? ( dev-libs/libcdio-paranoia:= dev-libs/libcdio:= ) drm? ( x11-libs/libdrm egl? ( media-libs/mesa[gbm(+)] ) ) dvd? ( media-libs/libdvdnav media-libs/libdvdread:= ) egl? ( media-libs/libglvnd media-libs/libplacebo[opengl] ) gamepad? ( media-libs/libsdl2[joystick] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( dev-lang/mujs:= ) jpeg? ( media-libs/libjpeg-turbo:= ) lcms? ( media-libs/lcms:2 ) libcaca? ( media-libs/libcaca ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openal? ( media-libs/openal ) opengl? ( media-libs/libglvnd[X?] ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-libs/libpulse ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[sound,threads,video] ) sixel? ( media-libs/libsixel ) sndio? ( media-sound/sndio:= ) vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] ) vdpau? ( x11-libs/libvdpau ) vulkan? ( media-libs/vulkan-loader[X?,wayland?] ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols x11-libs/libxkbcommon ) zimg? ( media-libs/zimg ) zlib? ( sys-libs/zlib:= ) X? ( x11-base/xorg-proto ) dvb? ( sys-kernel/linux-headers ) nvenc? ( media-libs/nv-codec-headers ) wayland? ( dev-libs/wayland-protocols )
+DESCRIPTION=Media player for the command line
+EAPI=8
+HOMEPAGE=https://mpv.io/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=flag-o-matic lua-single meson optfeature pax-utils python-single-r1 xdg
+IUSE=+X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv +lua nvenc openal opengl pipewire pulseaudio rubberband sdl selinux sixel sndio soc test tools +uchardet vaapi vdpau vulkan wayland xv zimg zlib lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux
+LICENSE=LGPL-2.1+ GPL-2+ BSD ISC MIT
+RDEPEND=media-libs/libass:=[fontconfig] >=media-libs/libplacebo-6.338.2:=[opengl?,vulkan?] >=media-video/ffmpeg-4.4:=[encode,soc(-)?,threads,vaapi?,vdpau?] X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXpresent x11-libs/libXrandr xv? ( x11-libs/libXv ) ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray:= ) cdda? ( dev-libs/libcdio-paranoia:= dev-libs/libcdio:= ) drm? ( x11-libs/libdrm egl? ( media-libs/mesa[gbm(+)] ) ) dvd? ( media-libs/libdvdnav media-libs/libdvdread:= ) egl? ( media-libs/libglvnd media-libs/libplacebo[opengl] ) gamepad? ( media-libs/libsdl2[joystick] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( dev-lang/mujs:= ) jpeg? ( media-libs/libjpeg-turbo:= ) lcms? ( media-libs/lcms:2 ) libcaca? ( media-libs/libcaca ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openal? ( media-libs/openal ) opengl? ( media-libs/libglvnd[X?] ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-libs/libpulse ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[sound,threads,video] ) sixel? ( media-libs/libsixel ) sndio? ( media-sound/sndio:= ) vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] ) vdpau? ( x11-libs/libvdpau ) vulkan? ( media-libs/vulkan-loader[X?,wayland?] ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols x11-libs/libxkbcommon ) zimg? ( media-libs/zimg ) zlib? ( sys-libs/zlib:= ) selinux? ( sec-policy/selinux-mplayer ) tools? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) || ( cli libmpv ) egl? ( || ( X drm wayland ) ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) nvenc? ( || ( egl opengl vulkan ) ) opengl? ( || ( X aqua ) ) test? ( cli ) tools? ( cli ) uchardet? ( iconv ) vaapi? ( || ( X drm wayland ) ) vdpau? ( X ) vulkan? ( || ( X wayland ) ) xv? ( X )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/mpv-player/mpv/archive/v0.38.0.tar.gz -> mpv-0.38.0.tar.gz
+_eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	meson	92696988eaddba122c4cedc191f59bcb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=c357494ba8d80fc3addb754ee4e26e13
diff --git a/metadata/md5-cache/media-video/popcorntime-bin-0.4.8 b/metadata/md5-cache/media-video/popcorntime-bin-0.4.8
deleted file mode 100644
index 6035a3160f90..000000000000
--- a/metadata/md5-cache/media-video/popcorntime-bin-0.4.8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare pretend setup unpack
-DESCRIPTION=BitTorrent client that includes an integrated media player
-EAPI=8
-HOMEPAGE=https://github.com/popcorn-official/popcorn-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=chromium-2 desktop unpacker xdg
-IUSE=+l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2 unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
-RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/nspr dev-libs/nss media-libs/alsa-lib net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://github.com/popcorn-official/popcorn-desktop/releases/download/v0.4.8/Popcorn-Time-0.4.8-amd64.deb ) x86? ( https://github.com/popcorn-official/popcorn-desktop/releases/download/v0.4.8/Popcorn-Time-0.4.8-i386.deb )
-_eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8b73b80ece664bf1d74770ddfe1eb78c
diff --git a/metadata/md5-cache/media-video/popcorntime-bin-0.5.1 b/metadata/md5-cache/media-video/popcorntime-bin-0.5.1
new file mode 100644
index 000000000000..d6f1a140509c
--- /dev/null
+++ b/metadata/md5-cache/media-video/popcorntime-bin-0.5.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare pretend setup unpack
+DESCRIPTION=BitTorrent client that includes an integrated media player
+EAPI=8
+HOMEPAGE=https://github.com/popcorn-official/popcorn-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=chromium-2 desktop unpacker xdg
+IUSE=+l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2 unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
+RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/nspr dev-libs/nss media-libs/alsa-lib net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://github.com/popcorn-official/popcorn-desktop/releases/download/v0.5.1/Popcorn-Time-0.5.1-amd64.deb
+_eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=2d2c480ca340ed5bbd90db94dba6d03a
diff --git a/metadata/md5-cache/media-video/vlc-3.0.20-r10 b/metadata/md5-cache/media-video/vlc-3.0.20-r10
index fc256af817cb..1ccab5563a89 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.20-r10
+++ b/metadata/md5-cache/media-video/vlc-3.0.20-r10
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.videolan.org/vlc/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
 IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme keyring gstreamer +gui ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse +lua_single_target_lua5-1 test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv -sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv -sparc x86
 LICENSE=LGPL-2.1 GPL-2
 RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz:= virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:= >=media-libs/libdvdread-6.1.2:= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac:= media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123-base ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-libs/libpulse ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:2=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6(+)] ) v4l? ( media-libs/libv4l:= ) vaapi? ( <media-video/ffmpeg-5 media-libs/libva:=[drm(+),wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) skins? ( archive gui truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5-9
 SRC_URI=https://download.videolan.org/pub/videolan/vlc/3.0.20/vlc-3.0.20.tar.xz
 _eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=df3f1064c75c220f998d5f0e56651e64
+_md5_=2c1eda0b1fc9c872d9a79eeb742191cb
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 434e1513c3f9..5d51a8bb5539 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/hydra-9.5-r10 b/metadata/md5-cache/net-analyzer/hydra-9.5-r10
index 28b3fca5172d..ba78acd6c7c1 100644
--- a/metadata/md5-cache/net-analyzer/hydra-9.5-r10
+++ b/metadata/md5-cache/net-analyzer/hydra-9.5-r10
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/vanhauser-thc/thc-hydra
 INHERIT=edo toolchain-funcs
 IUSE=debug firebird gcrypt gtk idn memcached mongodb mysql ncurses oracle pcre postgres rdp libssh samba subversion zlib
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/openssl:= gtk? ( >=app-accessibility/at-spi2-core-2.46.0 dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:= ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient[sdk] ) pcre? ( dev-libs/libpcre2 ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp:2= ) libssh? ( >=net-libs/libssh-0.4.0 ) samba? ( net-fs/samba ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://github.com/vanhauser-thc/thc-hydra/archive/v9.5.tar.gz -> hydra-9.5.tar.gz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=45a1060bc03447eb7aeeef4a664bd1a8
+_md5_=45765782660fb10f0c478eb9b4fdbf61
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 6b124d09336f..73fc406d87cc 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/nsd-4.8.0-r1 b/metadata/md5-cache/net-dns/nsd-4.8.0-r1
index 2f641d503d4f..60a944aaf5bf 100644
--- a/metadata/md5-cache/net-dns/nsd-4.8.0-r1
+++ b/metadata/md5-cache/net-dns/nsd-4.8.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.nlnetlabs.nl/projects/nsd
 INHERIT=autotools systemd
 IUSE=bind8-stats debug dnstap libevent minimal-responses mmap munin +nsec3 ratelimit root-server ssl systemd
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=acct-group/nsd acct-user/nsd dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=https://www.nlnetlabs.nl/downloads/nsd/nsd-4.8.0.tar.gz
 _eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=d45a4b944f8c581a936080ac24e33702
+_md5_=26a1beed5749f8533b810909aef742ad
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index d6e6440c99a1..5abdefb64c7d 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/samba-4.18.11 b/metadata/md5-cache/net-fs/samba-4.18.11
new file mode 100644
index 000000000000..b7eb148218de
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.18.11
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[threads(+),xml(+)] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] >=sys-fs/e2fsprogs-1.46.4-r51[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/ldb-2.7.2:=[ldap(+)?,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/ldb-2.8.0:=[ldap(+)?,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[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/liburing:=[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/ncurses:= sys-libs/readline:= >=sys-libs/talloc-2.4.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/tdb-1.4.8[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/tevent-0.14.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] virtual/libiconv python_single_target_python3_10? ( addc? ( dev-python/dnspython:=[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_10(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_11? ( addc? ( dev-python/dnspython:=[python_targets_python3_11(-)] dev-python/markdown[python_targets_python3_11(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_11(-)] net-dns/bind-tools[gssapi] ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/talloc[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tdb[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tevent[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:= ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) ) zeroconf? ( net-dns/avahi[dbus] ) dev-perl/JSON net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/rpcsvc-proto spotlight? ( dev-libs/glib ) test? ( >=dev-util/cmocka-1.1.3[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_single_target_python3_10? ( dev-python/subunit[python_targets_python3_10(-),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_single_target_python3_11? ( dev-python/subunit[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(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
+DESCRIPTION=Samba Suite Version 4
+EAPI=8
+HOMEPAGE=https://samba.org/
+INHERIT=python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info systemd pam tmpfiles
+IUSE=acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind zeroconf python_single_target_python3_10 python_single_target_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 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] >=sys-fs/e2fsprogs-1.46.4-r51[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/ldb-2.7.2:=[ldap(+)?,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/ldb-2.8.0:=[ldap(+)?,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[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/liburing:=[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/ncurses:= sys-libs/readline:= >=sys-libs/talloc-2.4.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/tdb-1.4.8[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/tevent-0.14.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] virtual/libiconv python_single_target_python3_10? ( addc? ( dev-python/dnspython:=[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_10(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_11? ( addc? ( dev-python/dnspython:=[python_targets_python3_11(-)] dev-python/markdown[python_targets_python3_11(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_11(-)] net-dns/bind-tools[gssapi] ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/talloc[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tdb[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tevent[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:= ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[threads(+),xml(+)] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) addc? ( json python !system-mitkrb5 winbind ) ads? ( acl ldap python winbind ) cluster? ( ads ) gpg? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://download.samba.org/pub/samba/stable/samba-4.18.11.tar.gz
+_eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	linux-info	7ca3057b277f1e5978947b4cc289ce62	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	b56d0c9c20fc5b553f13c8ae165a10a5	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	waf-utils	be1df8dc616c09387b18633b4155fcb5
+_md5_=9c0a611f36073e86ac1c3f2d96677d31
diff --git a/metadata/md5-cache/net-fs/samba-4.19.6 b/metadata/md5-cache/net-fs/samba-4.19.6
new file mode 100644
index 000000000000..9146e0949c98
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.19.6
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[threads(+),xml(+)] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] >=sys-fs/e2fsprogs-1.46.4-r51[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/ldb-2.8.0:=[ldap(+)?,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/ldb-2.9.0:=[ldap(+)?,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[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/liburing:=[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/ncurses:= sys-libs/readline:= >=sys-libs/talloc-2.4.1[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/tdb-1.4.9[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/tevent-0.15.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/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] virtual/libiconv python_single_target_python3_10? ( addc? ( dev-python/dnspython:=[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_10(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_11? ( addc? ( dev-python/dnspython:=[python_targets_python3_11(-)] dev-python/markdown[python_targets_python3_11(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_11(-)] net-dns/bind-tools[gssapi] ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/talloc[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tdb[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tevent[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:= ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) ) zeroconf? ( net-dns/avahi[dbus] ) dev-perl/JSON net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/rpcsvc-proto spotlight? ( dev-libs/glib ) test? ( >=dev-util/cmocka-1.1.3[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_single_target_python3_10? ( dev-python/subunit[python_targets_python3_10(-),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_single_target_python3_11? ( dev-python/subunit[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(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
+DESCRIPTION=Samba Suite Version 4
+EAPI=8
+HOMEPAGE=https://samba.org/
+INHERIT=python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info systemd pam tmpfiles
+IUSE=acl addc ads ceph client cluster cups debug fam glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind zeroconf python_single_target_python3_10 python_single_target_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 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] >=sys-fs/e2fsprogs-1.46.4-r51[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/ldb-2.8.0:=[ldap(+)?,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/ldb-2.9.0:=[ldap(+)?,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[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/liburing:=[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/ncurses:= sys-libs/readline:= >=sys-libs/talloc-2.4.1[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/tdb-1.4.9[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/tevent-0.15.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/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] virtual/libiconv python_single_target_python3_10? ( addc? ( dev-python/dnspython:=[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_10(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_11? ( addc? ( dev-python/dnspython:=[python_targets_python3_11(-)] dev-python/markdown[python_targets_python3_11(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_11(-)] net-dns/bind-tools[gssapi] ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/talloc[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tdb[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tevent[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:= ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[threads(+),xml(+)] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) addc? ( json python !system-mitkrb5 winbind ) ads? ( acl ldap python winbind ) cluster? ( ads ) gpg? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://download.samba.org/pub/samba/stable/samba-4.19.6.tar.gz
+_eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	linux-info	7ca3057b277f1e5978947b4cc289ce62	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	b56d0c9c20fc5b553f13c8ae165a10a5	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	waf-utils	be1df8dc616c09387b18633b4155fcb5
+_md5_=18bcbd25650c7dd947c98a13e91608f9
diff --git a/metadata/md5-cache/net-fs/samba-4.20.0 b/metadata/md5-cache/net-fs/samba-4.20.0
new file mode 100644
index 000000000000..6e2a9f4a3026
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.20.0
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[threads(+),xml(+)] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] >=sys-fs/e2fsprogs-1.46.4-r51[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/ldb-2.9.0:=[ldap(+)?,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/ldb-2.10.0:=[ldap(+)?,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[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/liburing:=[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/ncurses:= sys-libs/readline:= >=sys-libs/talloc-2.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.10[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/tevent-0.16.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] virtual/libiconv python_single_target_python3_10? ( addc? ( dev-python/dnspython:=[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_10(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_11? ( addc? ( dev-python/dnspython:=[python_targets_python3_11(-)] dev-python/markdown[python_targets_python3_11(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_11(-)] net-dns/bind-tools[gssapi] ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/talloc[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tdb[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tevent[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:= ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) ) zeroconf? ( net-dns/avahi[dbus] ) dev-perl/JSON net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/rpcsvc-proto spotlight? ( dev-libs/glib ) test? ( >=dev-util/cmocka-1.1.3[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_single_target_python3_10? ( dev-python/subunit[python_targets_python3_10(-),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_single_target_python3_11? ( dev-python/subunit[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(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
+DESCRIPTION=Samba Suite Version 4
+EAPI=8
+HOMEPAGE=https://samba.org/
+INHERIT=python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info systemd pam tmpfiles
+IUSE=acl addc ads ceph client cluster cups debug fam glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind zeroconf python_single_target_python3_10 python_single_target_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 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] >=sys-fs/e2fsprogs-1.46.4-r51[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/ldb-2.9.0:=[ldap(+)?,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/ldb-2.10.0:=[ldap(+)?,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[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/liburing:=[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/ncurses:= sys-libs/readline:= >=sys-libs/talloc-2.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.10[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/tevent-0.16.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] virtual/libiconv python_single_target_python3_10? ( addc? ( dev-python/dnspython:=[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_10(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_11? ( addc? ( dev-python/dnspython:=[python_targets_python3_11(-)] dev-python/markdown[python_targets_python3_11(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_11(-)] net-dns/bind-tools[gssapi] ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/talloc[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tdb[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tevent[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:= ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[threads(+),xml(+)] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) addc? ( json python !system-mitkrb5 winbind ) ads? ( acl ldap python winbind ) cluster? ( ads ) gpg? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://download.samba.org/pub/samba/stable/samba-4.20.0.tar.gz
+_eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	linux-info	7ca3057b277f1e5978947b4cc289ce62	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	b56d0c9c20fc5b553f13c8ae165a10a5	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	waf-utils	be1df8dc616c09387b18633b4155fcb5
+_md5_=75d2a35e816240e9f4b52347ae2d273a
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index dbe153b91566..bfd52aa2297f 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/discord-0.0.49 b/metadata/md5-cache/net-im/discord-0.0.50
index 42654891c585..8bb3e43a969b 100644
--- a/metadata/md5-cache/net-im/discord-0.0.49
+++ b/metadata/md5-cache/net-im/discord-0.0.50
@@ -10,6 +10,6 @@ LICENSE=all-rights-reserved
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/libdrm x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango appindicator? ( dev-libs/libayatana-appindicator )
 RESTRICT=bindist mirror strip test
 SLOT=0
-SRC_URI=https://dl.discordapp.net/apps/linux/0.0.49/discord-0.0.49.tar.gz
+SRC_URI=https://dl.discordapp.net/apps/linux/0.0.50/discord-0.0.50.tar.gz
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=666d03bfb1285292037102c59da55a8f
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index e4e217b3dd8d..e0657ac50d51 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/gnome-online-accounts-3.48.1 b/metadata/md5-cache/net-libs/gnome-online-accounts-3.48.1
index fe4c079e72c6..d9d2f5699453 100644
--- a/metadata/md5-cache/net-libs/gnome-online-accounts-3.48.1
+++ b/metadata/md5-cache/net-libs/gnome-online-accounts-3.48.1
@@ -7,7 +7,7 @@ HOMEPAGE=https://wiki.gnome.org/Projects/GnomeOnlineAccounts
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome.org meson vala xdg
 IUSE=debug gnome gtk-doc +introspection kerberos man +vala
-KEYWORDS=~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2+
 PDEPEND=gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )
 RDEPEND=>=dev-libs/glib-2.67.4:2 sys-apps/dbus introspection? ( >=dev-libs/gobject-introspection-0.6.2:= ) >=x11-libs/gtk+-3.19.12:3 >=net-libs/webkit-gtk-2.33.1:4.1 >=dev-libs/json-glib-0.16 >=app-crypt/libsecret-0.5 >=net-libs/libsoup-3.0:3.0 dev-libs/libxml2:2 >=net-libs/rest-0.9.0:1.0 kerberos? ( app-crypt/gcr:0=[gtk] app-crypt/mit-krb5 )
@@ -15,4 +15,4 @@ REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/gnome-online-accounts/3.48/gnome-online-accounts-3.48.1.tar.xz
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnome.org	6b39404f1491c60a2d32e3c693a683fe	meson	92696988eaddba122c4cedc191f59bcb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c6d511d0399856b7fc612d86e1ca4b65
+_md5_=5be77f053a3d5613a4dc34234ca89b0f
diff --git a/metadata/md5-cache/net-libs/gupnp-1.6.6 b/metadata/md5-cache/net-libs/gupnp-1.6.6
index c16536e3d3c9..802c8d973bdf 100644
--- a/metadata/md5-cache/net-libs/gupnp-1.6.6
+++ b/metadata/md5-cache/net-libs/gupnp-1.6.6
@@ -7,11 +7,11 @@ HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gu
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome.org meson-multilib python-single-r1 vala xdg
 IUSE=connman gtk-doc +introspection networkmanager +vala 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_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2+ GPL-2+
 RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[xml(+)] ) python_single_target_python3_12? ( dev-lang/python:3.12[xml(+)] ) >=dev-libs/glib-2.70:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gssdp-1.6.2:1.6=[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libsoup-2.99.0:3.0[introspection?,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-apps/util-linux-2.24.1-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) ?? ( connman networkmanager ) gtk-doc? ( introspection )
 SLOT=1.6/1.6-0
 SRC_URI=mirror://gnome/sources/gupnp/1.6/gupnp-1.6.6.tar.xz
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnome.org	6b39404f1491c60a2d32e3c693a683fe	meson	92696988eaddba122c4cedc191f59bcb	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1cafdfc3e6ba06075c0962db16faff3d
+_md5_=8cc540f84291fd8538545bd475182ccd
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.44.1 b/metadata/md5-cache/net-libs/webkit-gtk-2.44.1
index 9814f7f1d15f..03db9b5c6351 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.44.1
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.44.1
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.webkitgtk.org
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
 IUSE=aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X
-KEYWORDS=~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=LGPL-2+ BSD
 RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= dev-libs/libtasn1:= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=media-libs/libepoxy-1.5.4[egl(+)] >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 media-libs/libwebp:= >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/glib-2.70.0:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) x11-libs/libdrm media-libs/mesa spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl,X?] media-libs/gst-plugins-base:1.0[opengl] >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 ) dev-libs/hyphen jpegxl? ( >=media-libs/libjxl-0.7.0:= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) media-libs/libglvnd wayland? ( >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.24 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 )
 REQUIRED_USE=|| ( aqua wayland X )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.44.1.tar.xz
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	fc9e598eaac41c6ac9ed1a44bc004d03	gnome2-utils	30dbce54b89e77b86f366548f94419ad	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	ruby-single	e045ee439d34b230e588900a87a11904	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f04ecfc68c706e04afee8e2c8afb6c37
+_md5_=2755161844bb22f3876affef4d938423
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.44.1-r410 b/metadata/md5-cache/net-libs/webkit-gtk-2.44.1-r410
index f52cc8a6f17a..9c8db172c478 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.44.1-r410
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.44.1-r410
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.webkitgtk.org
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
 IUSE=aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X
-KEYWORDS=~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=LGPL-2+ BSD
 RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= dev-libs/libtasn1:= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=media-libs/libepoxy-1.5.4[egl(+)] >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 media-libs/libwebp:= >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/glib-2.70.0:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) x11-libs/libdrm media-libs/mesa spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl,X?] media-libs/gst-plugins-base:1.0[opengl] >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 ) dev-libs/hyphen jpegxl? ( >=media-libs/libjxl-0.7.0:= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) media-libs/libglvnd wayland? ( >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.24 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
 REQUIRED_USE=|| ( aqua wayland X )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=4.1/0
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.44.1.tar.xz
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	fc9e598eaac41c6ac9ed1a44bc004d03	gnome2-utils	30dbce54b89e77b86f366548f94419ad	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	ruby-single	e045ee439d34b230e588900a87a11904	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6e3acc5fcd511ae4dc57481e5d83755c
+_md5_=b9863f8c5dbab7d9254d0911be629ac5
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.44.1-r600 b/metadata/md5-cache/net-libs/webkit-gtk-2.44.1-r600
index fe23b7d6184d..17ad7eb5f373 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.44.1-r600
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.44.1-r600
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.webkitgtk.org
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
 IUSE=aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X
-KEYWORDS=~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=LGPL-2+ BSD
 RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= dev-libs/libtasn1:= >=gui-libs/gtk-4.6.0:4[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=media-libs/libepoxy-1.5.4[egl(+)] >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 media-libs/libwebp:= >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/glib-2.70.0:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) x11-libs/libdrm media-libs/mesa spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl,X?] media-libs/gst-plugins-base:1.0[opengl] >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 ) dev-libs/hyphen jpegxl? ( >=media-libs/libjxl-0.7.0:= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) media-libs/libglvnd wayland? ( >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.24 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4 !<net-libs/webkit-gtk-2.44:4.1
 REQUIRED_USE=|| ( aqua wayland X )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=6/0
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.44.1.tar.xz
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	fc9e598eaac41c6ac9ed1a44bc004d03	gnome2-utils	30dbce54b89e77b86f366548f94419ad	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	ruby-single	e045ee439d34b230e588900a87a11904	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f82e66289463d2180577b39efa886075
+_md5_=3ced0dcfad369d0dba65bd5c91d8b820
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index f51e5f32e0df..06158b37a8e2 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/mu-1.12.4 b/metadata/md5-cache/net-mail/mu-1.12.4
index e042dd884920..8626ccb432a6 100644
--- a/metadata/md5-cache/net-mail/mu-1.12.4
+++ b/metadata/md5-cache/net-mail/mu-1.12.4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
 INHERIT=elisp-common meson readme.gentoo-r1
 IUSE=emacs readline
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos
 LICENSE=BSD Boost-1.0 CC0-1.0 GPL-3+ MIT
 RDEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) readline? ( sys-libs/readline:= )
 SLOT=0
 SRC_URI=https://github.com/djcb/mu/releases/download/v1.12.4/mu-1.12.4.tar.xz
 _eclasses_=elisp-common	b5740ee671dad911400f832fe315a9a5	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	meson	92696988eaddba122c4cedc191f59bcb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=c97c6a444e6c7d56de86a86e6621c403
+_md5_=f50b153e7899b8fe62e509fda84535bd
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index b48f4e397e93..0b66ff27283a 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/freerdp-2.11.5-r10 b/metadata/md5-cache/net-misc/freerdp-2.11.5-r10
index 0f936473bfdf..6b03733cbae7 100644
--- a/metadata/md5-cache/net-misc/freerdp-2.11.5-r10
+++ b/metadata/md5-cache/net-misc/freerdp-2.11.5-r10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.freerdp.com/
 INHERIT=cmake flag-o-matic
 IUSE=alsa cpu_flags_arm_neon client cups debug +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/openssl:0= sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ffmpeg? ( media-video/ffmpeg:0= ) !ffmpeg? ( x11-libs/cairo:0= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) icu? ( dev-libs/icu:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) kerberos? ( virtual/krb5 ) openh264? ( media-libs/openh264:0= ) pulseaudio? ( media-libs/libpulse ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) client? ( wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) ) X? ( x11-libs/libX11 x11-libs/libxkbfile ) !net-misc/freerdp:0 client? ( !net-misc/freerdp:3[client] ) server? ( !net-misc/freerdp:3[server] )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://pub.freerdp.com/releases/freerdp-2.11.5.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9cc4148cb5cc9450af0ec5bd8a09dd66
+_md5_=add1463e484753b8831ab47fa74f8e5e
diff --git a/metadata/md5-cache/net-misc/freerdp-3.4.0-r11 b/metadata/md5-cache/net-misc/freerdp-3.4.0-r11
index d5db7756811b..d23536cb29cd 100644
--- a/metadata/md5-cache/net-misc/freerdp-3.4.0-r11
+++ b/metadata/md5-cache/net-misc/freerdp-3.4.0-r11
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.freerdp.com/
 INHERIT=cmake flag-o-matic
 IUSE=aad alsa cpu_flags_arm_neon +client cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/openssl:0= sys-libs/zlib:0 aad? ( dev-libs/cJSON ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ffmpeg? ( media-video/ffmpeg:0= ) !ffmpeg? ( x11-libs/cairo:0= ) fuse? ( sys-fs/fuse:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 X? ( x11-libs/libXrandr ) ) icu? ( dev-libs/icu:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) kerberos? ( virtual/krb5 ) openh264? ( media-libs/openh264:0= ) pulseaudio? ( media-libs/libpulse ) sdl? ( media-libs/libsdl2[haptic(+),joystick(+),sound(+),video(+)] media-libs/sdl2-ttf ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( dev-libs/pkcs11-helper sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) client? ( wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) ) X? ( x11-libs/libX11 x11-libs/libxkbfile ) !net-misc/freerdp:0 client? ( !net-misc/freerdp:2[client] ) server? ( !net-misc/freerdp:2[server] )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://pub.freerdp.com/releases/freerdp-3.4.0.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=78409daefb458985f513348b5d873962
+_md5_=0db6ecea50d363e68667f0582a61920e
diff --git a/metadata/md5-cache/net-misc/passt-2024.04.05 b/metadata/md5-cache/net-misc/passt-2024.04.05
new file mode 100644
index 000000000000..b6210cd2d45b
--- /dev/null
+++ b/metadata/md5-cache/net-misc/passt-2024.04.05
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile prepare
+DESCRIPTION=User-mode networking daemons for VMs and namespaces, replacement for Slirp
+EAPI=8
+HOMEPAGE=https://passt.top/
+INHERIT=toolchain-funcs
+IUSE=static
+KEYWORDS=~amd64 ~arm64 ~riscv
+LICENSE=BSD GPL-2+
+SLOT=0
+SRC_URI=https://passt.top/passt/snapshot/passt-954589b.tar.xz -> passt-2024.04.05.tar.xz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=699cba43eb8a97fde6d375deef6b3863
diff --git a/metadata/md5-cache/net-misc/passt-9999 b/metadata/md5-cache/net-misc/passt-9999
index 3ae255edd30e..b68f436502f2 100644
--- a/metadata/md5-cache/net-misc/passt-9999
+++ b/metadata/md5-cache/net-misc/passt-9999
@@ -9,4 +9,4 @@ LICENSE=BSD GPL-2+
 PROPERTIES=live
 SLOT=0
 _eclasses_=git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=88abf0db50f8c242e59ea6537464ed44
+_md5_=699cba43eb8a97fde6d375deef6b3863
diff --git a/metadata/md5-cache/net-misc/putty-0.81 b/metadata/md5-cache/net-misc/putty-0.81
deleted file mode 100644
index 5a914c46bcc6..000000000000
--- a/metadata/md5-cache/net-misc/putty-0.81
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig doc? ( app-text/halibut ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/pango ) gssapi? ( virtual/krb5 )
-DESCRIPTION=A Free Telnet/SSH Client
-EAPI=8
-HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/putty/
-INHERIT=cmake desktop xdg-utils
-IUSE=debug doc +gtk gssapi
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/pango ) gssapi? ( virtual/krb5 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~matthew/distfiles/putty-icons.tar.bz2 https://the.earth.li/~sgtatham/putty/0.81/putty-0.81.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4ebdd37bd4556421be8d20a3e2c36241
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.13.1 b/metadata/md5-cache/net-misc/rabbitmq-server-3.13.1
index 2bf86df14448..f0248bfce741 100644
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.13.1
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.13.1
@@ -5,11 +5,11 @@ DESCRIPTION=RabbitMQ is a high-performance AMQP-compliant message broker written
 EAPI=8
 HOMEPAGE=https://www.rabbitmq.com/
 INHERIT=python-any-r1 systemd
-KEYWORDS=~amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=MPL-2.0
 RDEPEND=acct-group/rabbitmq acct-user/rabbitmq >=dev-lang/erlang-26.0[ssl] <dev-lang/erlang-26.3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.13.1/rabbitmq-server-3.13.1.tar.xz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=2b8901d1a8b444b2b70053135908f812
+_md5_=7c5fb14c4d834b341b6320816182d800
diff --git a/metadata/md5-cache/net-misc/remmina-1.4.35-r1 b/metadata/md5-cache/net-misc/remmina-1.4.35-r1
index bec8b7071217..acdbb22bba1d 100644
--- a/metadata/md5-cache/net-misc/remmina-1.4.35-r1
+++ b/metadata/md5-cache/net-misc/remmina-1.4.35-r1
@@ -7,11 +7,11 @@ HOMEPAGE=https://remmina.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake python-single-r1 xdg
 IUSE=+appindicator crypt cups examples keyring gvnc kwallet nls python spice ssh rdp vnc wayland webkit zeroconf python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=GPL-2+-with-openssl-exception
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= x11-libs/gdk-pixbuf x11-libs/gtk+:3[wayland?] x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libayatana-appindicator ) crypt? ( dev-libs/libgcrypt:0= ) keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet:5 ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129:2=[X] cups? ( net-print/cups:= ) ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4.1 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) virtual/freedesktop-icon-theme
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) )
 SLOT=0
 SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.35/Remmina-v1.4.35.tar.bz2
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6581262429d0408db5f8ac5fb041a736
+_md5_=bde5ccb5d2c579de78e404e86bcce990
diff --git a/metadata/md5-cache/net-misc/rygel-0.42.5 b/metadata/md5-cache/net-misc/rygel-0.42.5
index 229ca3b318ab..d73bf948034e 100644
--- a/metadata/md5-cache/net-misc/rygel-0.42.5
+++ b/metadata/md5-cache/net-misc/rygel-0.42.5
@@ -7,11 +7,11 @@ HOMEPAGE=https://wiki.gnome.org/Projects/Rygel
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome.org meson systemd vala xdg
 IUSE=gtk gtk-doc +introspection +sqlite tracker test transcode
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=LGPL-2.1+ CC-BY-SA-3.0
 RDEPEND=>=net-libs/gupnp-1.5.2:1.6=[vala] >=dev-libs/libgee-0.8:0.8= >=net-libs/gssdp-1.5.0:1.6=[vala] >=dev-libs/glib-2.62.0:2 >=dev-libs/libxml2-2.7:2 >=net-libs/gupnp-av-0.14.1:=[vala] >=media-libs/gupnp-dlna-0.9.4:2.0= >=net-libs/libsoup-3:3.0 sqlite? ( >=dev-db/sqlite-3.5:3 dev-libs/libunistring:= ) >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0 media-libs/gstreamer-editing-services:1.0 >=media-libs/libmediaart-0.7:2.0[vala] media-plugins/gst-plugins-soup:1.0 x11-libs/gdk-pixbuf:2 >=sys-apps/util-linux-2.20 x11-misc/shared-mime-info introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) tracker? ( app-misc/tracker:3=[vala(+)] ) transcode? ( media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-twolame:1.0 media-plugins/gst-plugins-libav:1.0 ) gtk? ( >=x11-libs/gtk+-3.22:3 ) x11-libs/libX11
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/rygel/0.42/rygel-0.42.5.tar.xz
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnome.org	6b39404f1491c60a2d32e3c693a683fe	meson	92696988eaddba122c4cedc191f59bcb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2c3366fb2696837074b821bcd752e358
+_md5_=16b788157ae881ca454a570537109d6f
diff --git a/metadata/md5-cache/net-misc/streamlink-6.7.2-r1 b/metadata/md5-cache/net-misc/streamlink-6.7.2-r1
index 2f726b57ce5c..d95c0de10684 100644
--- a/metadata/md5-cache/net-misc/streamlink-6.7.2-r1
+++ b/metadata/md5-cache/net-misc/streamlink-6.7.2-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://streamlink.github.io/
 INHERIT=distutils-r1
 IUSE=test python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=BSD-2 Apache-2.0
 RDEPEND=media-video/ffmpeg python_single_target_python3_10? ( dev-python/certifi[python_targets_python3_10(-)] || ( dev-python/chardet[python_targets_python3_10(-)] dev-python/charset-normalizer[python_targets_python3_10(-)] ) dev-python/exceptiongroup[python_targets_python3_10(-)] >=dev-python/requests-2.26.0[python_targets_python3_10(-)] dev-python/isodate[python_targets_python3_10(-)] >=dev-python/lxml-4.6.4[python_targets_python3_10(-)] >=dev-python/websocket-client-1.2.1[python_targets_python3_10(-)] dev-python/pycountry[python_targets_python3_10(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_10(-)] >dev-python/PySocks-1.5.7[python_targets_python3_10(-)] >=dev-python/trio-0.22.0[python_targets_python3_10(-)] >=dev-python/trio-websocket-0.9.0[python_targets_python3_10(-)] >=dev-python/urllib3-1.26.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/certifi[python_targets_python3_11(-)] || ( dev-python/chardet[python_targets_python3_11(-)] dev-python/charset-normalizer[python_targets_python3_11(-)] ) dev-python/exceptiongroup[python_targets_python3_11(-)] >=dev-python/requests-2.26.0[python_targets_python3_11(-)] dev-python/isodate[python_targets_python3_11(-)] >=dev-python/lxml-4.6.4[python_targets_python3_11(-)] >=dev-python/websocket-client-1.2.1[python_targets_python3_11(-)] dev-python/pycountry[python_targets_python3_11(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_11(-)] >dev-python/PySocks-1.5.7[python_targets_python3_11(-)] >=dev-python/trio-0.22.0[python_targets_python3_11(-)] >=dev-python/trio-websocket-0.9.0[python_targets_python3_11(-)] >=dev-python/urllib3-1.26.0[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/certifi[python_targets_python3_12(-)] || ( dev-python/chardet[python_targets_python3_12(-)] dev-python/charset-normalizer[python_targets_python3_12(-)] ) dev-python/exceptiongroup[python_targets_python3_12(-)] >=dev-python/requests-2.26.0[python_targets_python3_12(-)] dev-python/isodate[python_targets_python3_12(-)] >=dev-python/lxml-4.6.4[python_targets_python3_12(-)] >=dev-python/websocket-client-1.2.1[python_targets_python3_12(-)] dev-python/pycountry[python_targets_python3_12(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_12(-)] >dev-python/PySocks-1.5.7[python_targets_python3_12(-)] >=dev-python/trio-0.22.0[python_targets_python3_12(-)] >=dev-python/trio-websocket-0.9.0[python_targets_python3_12(-)] >=dev-python/urllib3-1.26.0[python_targets_python3_12(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10[xml(+),threads(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[xml(+),threads(+)] ) python_single_target_python3_12? ( dev-lang/python:3.12[xml(+),threads(+)] )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/streamlink/streamlink/releases/download/6.7.2/streamlink-6.7.2.tar.gz
 _eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f509de1fc1cedf86e68b21f1bf4626fa
+_md5_=6ae914c60c332d03db4730013b350b4d
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index c69fb7c532b3..4a2b9b58ad75 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-23.9 b/metadata/md5-cache/net-p2p/cpuminer-opt-24.1
index 33c1f93593fb..df830ab90241 100644
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-23.9
+++ b/metadata/md5-cache/net-p2p/cpuminer-opt-24.1
@@ -11,6 +11,6 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:= dev-libs/jansson:= >=net-misc/curl-7.15[ssl]
 REQUIRED_USE=cpu_flags_x86_sse2
 SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v23.9.tar.gz -> cpuminer-opt-23.9.tar.gz
+SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v24.1.tar.gz -> cpuminer-opt-24.1.tar.gz
 _eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=c68db853afd5184613935c613bb6217c
+_md5_=2aec00dd4ec6ea1d9b357eb6a705f7f1
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 15a7ab497e43..2bad0770453f 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/libreswan-4.14 b/metadata/md5-cache/net-vpn/libreswan-4.14
index 949dd020f4b0..0a92249e5de0 100644
--- a/metadata/md5-cache/net-vpn/libreswan-4.14
+++ b/metadata/md5-cache/net-vpn/libreswan-4.14
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://libreswan.org/
 INHERIT=systemd flag-o-matic toolchain-funcs tmpfiles
 IUSE=caps curl dnssec ldap networkmanager pam seccomp selinux systemd test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
 LICENSE=GPL-2 BSD-4 RSA DES
 RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= net-dns/dnssec-root ) ldap? ( net-nds/openldap:= ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec ) virtual/tmpfiles
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.libreswan.org/libreswan-4.14.tar.gz
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=971772482ad94926ba81843a89b590aa
+_md5_=84a5ad4427c26902c460fef4a16187c0
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.7.16-r1 b/metadata/md5-cache/net-vpn/tor-0.4.7.16-r1
index f35142019997..787a3149a378 100644
--- a/metadata/md5-cache/net-vpn/tor-0.4.7.16-r1
+++ b/metadata/md5-cache/net-vpn/tor-0.4.7.16-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/tor-0.4.7.16.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.7.16.tar.gz verify-sig? ( https://dist.torproject.org/tor-0.4.7.16.tar.gz.sha256sum https://dist.torproject.org/tor-0.4.7.16.tar.gz.sha256sum.asc )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=30198720d70c08fd6e960317f63a30c6
+_md5_=42649befcd6246609758eb7c26de27a4
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.8.10 b/metadata/md5-cache/net-vpn/tor-0.4.8.10
index eae850713dc8..cbdda7728755 100644
--- a/metadata/md5-cache/net-vpn/tor-0.4.8.10
+++ b/metadata/md5-cache/net-vpn/tor-0.4.8.10
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/tor-0.4.8.10.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.8.10.tar.gz verify-sig? ( https://dist.torproject.org/tor-0.4.8.10.tar.gz.sha256sum https://dist.torproject.org/tor-0.4.8.10.tar.gz.sha256sum.asc )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=d9d4835bf7ba2e1f5c1993d2bbbca5a0
+_md5_=7340e2c26ebe0482c98cd1a288b6c0dd
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.8.11 b/metadata/md5-cache/net-vpn/tor-0.4.8.11
index ae063cc767a1..dd7e1a2c8733 100644
--- a/metadata/md5-cache/net-vpn/tor-0.4.8.11
+++ b/metadata/md5-cache/net-vpn/tor-0.4.8.11
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/tor-0.4.8.11.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.8.11.tar.gz verify-sig? ( https://dist.torproject.org/tor-0.4.8.11.tar.gz.sha256sum https://dist.torproject.org/tor-0.4.8.11.tar.gz.sha256sum.asc )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=10e28a297d0f791221bf355edafa3af8
+_md5_=26d681eed6232a5daeb9d3a8cbf8c45f
diff --git a/metadata/md5-cache/net-vpn/tor-9999 b/metadata/md5-cache/net-vpn/tor-9999
index 884f1cd2c327..b0cab50c369d 100644
--- a/metadata/md5-cache/net-vpn/tor-9999
+++ b/metadata/md5-cache/net-vpn/tor-9999
@@ -12,4 +12,4 @@ RDEPEND=acct-user/tor acct-group/tor >=dev-libs/libevent-2.1.12-r1:=[ssl] dev-li
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=10e28a297d0f791221bf355edafa3af8
+_md5_=26d681eed6232a5daeb9d3a8cbf8c45f
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index f463fdf49766..aaa49b9ddec7 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/unifi-8.0.28 b/metadata/md5-cache/net-wireless/unifi-8.0.28
deleted file mode 100644
index cf18a57aca6f..000000000000
--- a/metadata/md5-cache/net-wireless/unifi-8.0.28
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst prepare setup
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
-EAPI=8
-HOMEPAGE=https://www.ubnt.com
-INHERIT=java-pkg-2 readme.gentoo-r1 systemd
-IUSE=systemd system-mongodb
-KEYWORDS=-* amd64 ~arm64
-LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
-RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:17 >=dev-java/java-config-2.2.0-r3
-RESTRICT=bindist mirror
-SLOT=0/8.0
-SRC_URI=https://dl.ui.com/unifi/8.0.28/UniFi.unix.zip -> unifi-8.0.28.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=31ea4d3217135116f30e8f4861e2c867
diff --git a/metadata/md5-cache/net-wireless/unifi-8.1.113 b/metadata/md5-cache/net-wireless/unifi-8.1.113
index 68d9b478ee52..7b9412255bf5 100644
--- a/metadata/md5-cache/net-wireless/unifi-8.1.113
+++ b/metadata/md5-cache/net-wireless/unifi-8.1.113
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.ubnt.com
 INHERIT=java-pkg-2 readme.gentoo-r1 systemd
 IUSE=systemd system-mongodb
-KEYWORDS=-* ~amd64 ~arm64
+KEYWORDS=-* amd64 ~arm64
 LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
 RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:17 >=dev-java/java-config-2.2.0-r3
 RESTRICT=bindist mirror
 SLOT=0/8.1
 SRC_URI=https://dl.ui.com/unifi/8.1.113/UniFi.unix.zip -> unifi-8.1.113.zip
 _eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=1c21bc23d733ddcdda104b7061ececb2
+_md5_=31ea4d3217135116f30e8f4861e2c867
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 5dccfd5c40f9..c484475c0b03 100644
--- a/metadata/md5-cache/sci-electronics/Manifest.gz
+++ b/metadata/md5-cache/sci-electronics/Manifest.gz
diff --git a/metadata/md5-cache/sci-electronics/ghdl-4.1.0 b/metadata/md5-cache/sci-electronics/ghdl-4.1.0
new file mode 100644
index 000000000000..5c5b91639821
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/ghdl-4.1.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/patchelf
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_13? ( sys-devel/gcc:13[ada] ) llvm? ( <sys-devel/llvm-18:= ) !!sys-devel/llvm:0
+DESCRIPTION=Open-source analyzer, compiler, and simulator for VHDL 2008/93/87
+EAPI=8
+HOMEPAGE=https://ghdl.github.io/ghdl/ https://github.com/ghdl/ghdl/
+INHERIT=ada edo llvm toolchain-funcs
+IUSE=llvm ada_target_gnat_2021 ada_target_gcc_12 ada_target_gcc_13
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_13? ( sys-devel/gcc:13[ada] ) llvm? ( <sys-devel/llvm-18:= )
+REQUIRED_USE=^^ ( ada_target_gnat_2021 ada_target_gcc_13 )
+SLOT=0
+SRC_URI=https://github.com/ghdl/ghdl/archive/v4.1.0.tar.gz -> ghdl-4.1.0.tar.gz
+_eclasses_=ada	f59e3151d12cf89115ffac32a03e7d31	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=60dd801f4ad41e4e2b2ea615b96878ef
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 4716a0d40bbe..20ea77baef4e 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/cadabra-2.4.4.1 b/metadata/md5-cache/sci-mathematics/cadabra-2.4.4.1
deleted file mode 100644
index eac4a6c38f30..000000000000
--- a/metadata/md5-cache/sci-mathematics/cadabra-2.4.4.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pybind11[python_targets_python3_11(-)] ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) app-text/dvipng dev-cpp/glibmm:2 dev-db/sqlite:3= dev-libs/boost:= dev-libs/gmp:=[cxx] dev-libs/jsoncpp:= dev-libs/libsigc++:2 dev-texlive/texlive-basic python_single_target_python3_10? ( dev-python/gmpy:2[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/sympy[python_targets_python3_10(-)] jupyter? ( dev-python/jupyter[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/gmpy:2[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] dev-python/sympy[python_targets_python3_11(-)] jupyter? ( dev-python/jupyter[python_targets_python3_11(-)] ) ) gui? ( dev-cpp/gtkmm:3.0 )
-DESCRIPTION=Field-theory motivated approach to computer algebra
-EAPI=8
-HOMEPAGE=https://cadabra.science/ https://github.com/kpeeters/cadabra2/
-INHERIT=xdg-utils python-single-r1 cmake
-IUSE=gui +jupyter test python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) app-text/dvipng dev-cpp/glibmm:2 dev-db/sqlite:3= dev-libs/boost:= dev-libs/gmp:=[cxx] dev-libs/jsoncpp:= dev-libs/libsigc++:2 dev-texlive/texlive-basic python_single_target_python3_10? ( dev-python/gmpy:2[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/sympy[python_targets_python3_10(-)] jupyter? ( dev-python/jupyter[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/gmpy:2[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] dev-python/sympy[python_targets_python3_11(-)] jupyter? ( dev-python/jupyter[python_targets_python3_11(-)] ) ) gui? ( dev-cpp/gtkmm:3.0 )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/kpeeters/cadabra2/archive/2.4.4.1.tar.gz -> cadabra-2.4.4.1.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e99a9b8a430fb0e4c8f49f2b5865778a
diff --git a/metadata/md5-cache/sci-mathematics/cadabra-2.4.5.5 b/metadata/md5-cache/sci-mathematics/cadabra-2.4.5.5
new file mode 100644
index 000000000000..c6755d523dcd
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/cadabra-2.4.5.5
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_10? ( dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pybind11[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pybind11[python_targets_python3_12(-)] ) app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) app-text/dvipng dev-cpp/glibmm:2 dev-db/sqlite:3= dev-libs/boost:= dev-libs/gmp:=[cxx] dev-libs/jsoncpp:= dev-libs/libsigc++:2 dev-texlive/texlive-basic python_single_target_python3_10? ( dev-python/gmpy:2[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/sympy[python_targets_python3_10(-)] jupyter? ( dev-python/jupyter[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/gmpy:2[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] dev-python/sympy[python_targets_python3_11(-)] jupyter? ( dev-python/jupyter[python_targets_python3_11(-)] ) ) python_single_target_python3_12? ( dev-python/gmpy:2[python_targets_python3_12(-)] dev-python/matplotlib[python_targets_python3_12(-)] dev-python/sympy[python_targets_python3_12(-)] jupyter? ( dev-python/jupyter[python_targets_python3_12(-)] ) ) gui? ( dev-cpp/gtkmm:3.0 )
+DESCRIPTION=Field-theory motivated approach to computer algebra
+EAPI=8
+HOMEPAGE=https://cadabra.science/ https://github.com/kpeeters/cadabra2/
+INHERIT=xdg-utils python-single-r1 cmake
+IUSE=gui +jupyter test python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) app-text/dvipng dev-cpp/glibmm:2 dev-db/sqlite:3= dev-libs/boost:= dev-libs/gmp:=[cxx] dev-libs/jsoncpp:= dev-libs/libsigc++:2 dev-texlive/texlive-basic python_single_target_python3_10? ( dev-python/gmpy:2[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/sympy[python_targets_python3_10(-)] jupyter? ( dev-python/jupyter[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/gmpy:2[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] dev-python/sympy[python_targets_python3_11(-)] jupyter? ( dev-python/jupyter[python_targets_python3_11(-)] ) ) python_single_target_python3_12? ( dev-python/gmpy:2[python_targets_python3_12(-)] dev-python/matplotlib[python_targets_python3_12(-)] dev-python/sympy[python_targets_python3_12(-)] jupyter? ( dev-python/jupyter[python_targets_python3_12(-)] ) ) gui? ( dev-cpp/gtkmm:3.0 )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/kpeeters/cadabra2/archive/2.4.5.5.tar.gz -> cadabra-2.4.5.5.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=bd54649009d351d937913ca600cec05c
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index eef36a285bcf..6c55ac58eef8 100644
--- a/metadata/md5-cache/sci-visualization/Manifest.gz
+++ b/metadata/md5-cache/sci-visualization/Manifest.gz
diff --git a/metadata/md5-cache/sci-visualization/veusz-3.5.3 b/metadata/md5-cache/sci-visualization/veusz-3.5.3
deleted file mode 100644
index 65d8fd3e077d..000000000000
--- a/metadata/md5-cache/sci-visualization/veusz-3.5.3
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] dev-python/alabaster[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-)] ) ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PyQt5[widgets,svg,printsupport,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sip:5[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DESCRIPTION=Qt scientific plotting package with good Postscript output
-EAPI=8
-HOMEPAGE=https://veusz.github.io/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop distutils-r1 qmake-utils virtualx xdg
-IUSE=dbus hdf5 doc python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PyQt5[widgets,svg,printsupport,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dbus? ( dev-python/dbus-python[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) hdf5? ( dev-python/h5py[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/veusz/veusz/releases/download/veusz-3.5.3/veusz-3.5.3.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=52a78f19e11c25e0264d2ecb583f79f1
diff --git a/metadata/md5-cache/sci-visualization/veusz-3.6.2-r1 b/metadata/md5-cache/sci-visualization/veusz-3.6.2-r1
new file mode 100644
index 000000000000..1d2ff43fa5eb
--- /dev/null
+++ b/metadata/md5-cache/sci-visualization/veusz-3.6.2-r1
@@ -0,0 +1,18 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.12 >=dev-python/sphinx-7.2.6[python_targets_python3_12(-)] dev-python/alabaster[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] dev-python/alabaster[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-)] ) ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/PyQt5[widgets,svg,printsupport,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sip:5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DESCRIPTION=Qt scientific plotting package with good Postscript output
+EAPI=8
+HOMEPAGE=https://veusz.github.io/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop distutils-r1 qmake-utils virtualx xdg
+IUSE=dbus hdf5 doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/PyQt5[widgets,svg,printsupport,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dbus? ( dev-python/dbus-python[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) hdf5? ( dev-python/h5py[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/veusz/veusz/releases/download/veusz-3.6.2/veusz-3.6.2.tar.gz
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=89e201dbe1639f0cfdc1f39d4172e245
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index 9a343c83da82..2a83c99623b6 100644
--- a/metadata/md5-cache/sec-keys/Manifest.gz
+++ b/metadata/md5-cache/sec-keys/Manifest.gz
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.86 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.86
deleted file mode 100644
index cbb1e903c262..000000000000
--- a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.86
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=OpenPGP keys used by tomcat.apache.org
-EAPI=8
-HOMEPAGE=https://tomcat.apache.org/download-90.cgi
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=public-domain
-SLOT=9.0.86
-SRC_URI=https://downloads.apache.org/tomcat/tomcat-9/v9.0.86/KEYS -> openpgp-keys-apache-tomcat-9.0.86-KEYS.asc
-_md5_=7927e4be735eaab273a44702d4ba9464
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index f32a1942a862..60e171646f48 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/cpuid-20240409 b/metadata/md5-cache/sys-apps/cpuid-20240409
new file mode 100644
index 000000000000..75427fab947c
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/cpuid-20240409
@@ -0,0 +1,12 @@
+BDEPEND=app-alternatives/gzip dev-lang/perl
+DEFINED_PHASES=install prepare
+DESCRIPTION=Linux tool to dump x86 CPUID information about the CPUs
+EAPI=8
+HOMEPAGE=http://www.etallen.com/cpuid.html
+INHERIT=toolchain-funcs
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=http://www.etallen.com/cpuid/cpuid-20240409.src.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=01831097d89577dadfa633df471f4214
diff --git a/metadata/md5-cache/sys-apps/intel-sa-00075-tools-1.0 b/metadata/md5-cache/sys-apps/intel-sa-00075-tools-1.0-r1
index da33d4239970..f334f0e58637 100644
--- a/metadata/md5-cache/sys-apps/intel-sa-00075-tools-1.0
+++ b/metadata/md5-cache/sys-apps/intel-sa-00075-tools-1.0-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile
 DESCRIPTION=Tools from Intel to detect and mitigate the AMT/MEI vulnerability
-EAPI=6
+EAPI=8
 HOMEPAGE=https://downloadcenter.intel.com/download/26799/INTEL-SA-00075-Linux-Detection-and-Mitigation-Tools
 INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
@@ -8,4 +8,4 @@ LICENSE=GPL-2 BSD
 SLOT=0
 SRC_URI=https://github.com/intel/INTEL-SA-00075-Linux-Detection-And-Mitigation-Tools/archive/1.0.tar.gz -> intel-sa-00075-tools-1.0.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=49747bae71466a85257dc3f65b36aa3b
+_md5_=f7a1278551250af4f73f319e85d96008
diff --git a/metadata/md5-cache/sys-apps/less-643-r2 b/metadata/md5-cache/sys-apps/less-643-r2
index 3ff67475564e..011a735e5097 100644
--- a/metadata/md5-cache/sys-apps/less-643-r2
+++ b/metadata/md5-cache/sys-apps/less-643-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.greenwoodsoftware.com/less/
 INHERIT=autotools flag-o-matic optfeature toolchain-funcs
 IUSE=pcre test
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=|| ( GPL-3 BSD-2 )
 RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:= pcre? ( dev-libs/libpcre2 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://www.greenwoodsoftware.com/less/less-643.tar.gz
 _eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=70a45d86951cff86899c03a79585b7fd
+_md5_=30c467b0864caed8d887611c2f2d93be
diff --git a/metadata/md5-cache/sys-apps/systemd-254.10 b/metadata/md5-cache/sys-apps/systemd-254.10
index a69d015783c5..3573e1bd0df3 100644
--- a/metadata/md5-cache/sys-apps/systemd-254.10
+++ b/metadata/md5-cache/sys-apps/systemd-254.10
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://systemd.io/
 INHERIT=bash-completion-r1 linux-info meson-multilib optfeature pam python-single-r1 secureboot systemd toolchain-funcs udev usr-ldscript
 IUSE=acl apparmor audit boot cgroup-hybrid cryptsetup curl +dns-over-tls elfutils fido2 +gcrypt gnutls homed http idn importd iptables +kernel-install +kmod +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test tpm ukify 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 python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 secureboot split-usr
-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 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 ukify? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-python/pefile[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pefile[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pefile[python_targets_python3_12(-)] ) ) 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 ) !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v254.10/systemd-stable-254.10.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	linux-info	7ca3057b277f1e5978947b4cc289ce62	meson	92696988eaddba122c4cedc191f59bcb	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	b56d0c9c20fc5b553f13c8ae165a10a5	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	secureboot	4911adb593665638c76fbd4e70d451ac	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9
-_md5_=ba5ca9ae607cdba62f1d1712ad277d44
+_md5_=c396ad15e06e2852970a74bd9cffee72
diff --git a/metadata/md5-cache/sys-apps/systemd-255.4 b/metadata/md5-cache/sys-apps/systemd-255.4
index 450cf85252f8..92491e1f98e6 100644
--- a/metadata/md5-cache/sys-apps/systemd-255.4
+++ b/metadata/md5-cache/sys-apps/systemd-255.4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://systemd.io/
 INHERIT=bash-completion-r1 linux-info meson-multilib optfeature pam python-single-r1 secureboot systemd toolchain-funcs udev
 IUSE=acl apparmor audit boot cgroup-hybrid cryptsetup curl +dns-over-tls elfutils fido2 +gcrypt gnutls homed http idn importd iptables +kernel-install +kmod +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test tpm ukify 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 python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 secureboot
-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 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.32: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-2.13:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( >=net-misc/curl-7.32.0: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.23.3:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( >=dev-libs/libpwquality-1.4.1:0= ) qrcode? ( >=media-gfx/qrencode-3:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( >=sys-libs/libselinux-2.1.9: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 ukify? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-python/pefile[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pefile[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pefile[python_targets_python3_12(-)] ) ) 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 ) !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v255.4/systemd-stable-255.4.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	linux-info	7ca3057b277f1e5978947b4cc289ce62	meson	92696988eaddba122c4cedc191f59bcb	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	b56d0c9c20fc5b553f13c8ae165a10a5	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	secureboot	4911adb593665638c76fbd4e70d451ac	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=eff41b2e0743378a3c985575a2f8a06d
+_md5_=14c5fad195baefab98426a017be61090
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index 0a3e8cf1772a..68b90d568a21 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=!test? ( test )
 SLOT=0/2
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	git-r3	fbb2889c81f3a05910c1524db69425c1	linux-info	7ca3057b277f1e5978947b4cc289ce62	meson	92696988eaddba122c4cedc191f59bcb	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	b56d0c9c20fc5b553f13c8ae165a10a5	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	secureboot	4911adb593665638c76fbd4e70d451ac	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=123e75c32f743543d0b6d663454bbcb1
+_md5_=b39979128f933dacc7da3086e936dc07
diff --git a/metadata/md5-cache/sys-auth/AusweisApp-2.1.0 b/metadata/md5-cache/sys-auth/AusweisApp-2.1.0
index d77d3c1bb735..a1fafee59061 100644
--- a/metadata/md5-cache/sys-auth/AusweisApp-2.1.0
+++ b/metadata/md5-cache/sys-auth/AusweisApp-2.1.0
@@ -5,10 +5,10 @@ DESCRIPTION=Official authentication app for German ID cards and residence permit
 EAPI=8
 HOMEPAGE=https://www.ausweisapp.bund.de/
 INHERIT=cmake xdg-utils
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=EUPL-1.2
 RDEPEND=dev-libs/openssl:0= dev-qt/qtbase:6[concurrent,network,widgets] dev-qt/qtdeclarative:6[widgets] dev-qt/qtscxml:6[qml] dev-qt/qtsvg:6 dev-qt/qtwebsockets:6[qml] net-libs/http-parser:0= sys-apps/pcsc-lite virtual/udev
 SLOT=0
 SRC_URI=https://github.com/Governikus/AusweisApp/archive/2.1.0.tar.gz -> AusweisApp-2.1.0.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e1c18cef8b99eba5703684e341a0396c
+_md5_=3fa40eee9c364ecbdede8eb044d9c42c
diff --git a/metadata/md5-cache/sys-auth/AusweisApp-2.0.3 b/metadata/md5-cache/sys-auth/AusweisApp-2.1.1
index 15d92cfb0863..3bd23a4f6490 100644
--- a/metadata/md5-cache/sys-auth/AusweisApp-2.0.3
+++ b/metadata/md5-cache/sys-auth/AusweisApp-2.1.1
@@ -5,10 +5,10 @@ DESCRIPTION=Official authentication app for German ID cards and residence permit
 EAPI=8
 HOMEPAGE=https://www.ausweisapp.bund.de/
 INHERIT=cmake xdg-utils
-KEYWORDS=amd64
+KEYWORDS=~amd64
 LICENSE=EUPL-1.2
 RDEPEND=dev-libs/openssl:0= dev-qt/qtbase:6[concurrent,network,widgets] dev-qt/qtdeclarative:6[widgets] dev-qt/qtscxml:6[qml] dev-qt/qtsvg:6 dev-qt/qtwebsockets:6[qml] net-libs/http-parser:0= sys-apps/pcsc-lite virtual/udev
 SLOT=0
-SRC_URI=https://github.com/Governikus/AusweisApp/archive/2.0.3.tar.gz -> AusweisApp-2.0.3.tar.gz
+SRC_URI=https://github.com/Governikus/AusweisApp/archive/2.1.1.tar.gz -> AusweisApp-2.1.1.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3fa40eee9c364ecbdede8eb044d9c42c
+_md5_=e1c18cef8b99eba5703684e341a0396c
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 45110a560d9e..9844a26df50f 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 70ffe03eeaef..9413b43e1483 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/poolmon-0.6 b/metadata/md5-cache/sys-cluster/poolmon-0.6-r1
index 482f238b064f..69074a2bfccd 100644
--- a/metadata/md5-cache/sys-cluster/poolmon-0.6
+++ b/metadata/md5-cache/sys-cluster/poolmon-0.6-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
-DESCRIPTION=A director mailserver pool monitoring script for Dovecot
-EAPI=6
+DESCRIPTION=Director mailserver pool monitoring script for Dovecot
+EAPI=8
 HOMEPAGE=https://github.com/brandond/poolmon
 KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
+LICENSE=GPL-2+
 RDEPEND=dev-perl/IO-Socket-SSL net-mail/dovecot
 SLOT=0
 SRC_URI=https://github.com/brandond/poolmon/archive/0.6.tar.gz -> poolmon-0.6.tar.gz
-_md5_=bf20478cf2a4c282dcf1d0dae0cb56bf
+_md5_=5c76f8edaacff629d4ee22a98e615c3b
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 90f6cbcfbdd9..2c18b8564cf3 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/gcc-10.5.0 b/metadata/md5-cache/sys-devel/gcc-10.5.0
index d93bd56432a4..b25c3439e33a 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.5.0
+++ b/metadata/md5-cache/sys-devel/gcc-10.5.0
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=mirror://gcc/gcc-10.5.0/gcc-10.5.0.tar.xz mirror://gnu/gcc/gcc-10.5.0/gcc-10.5.0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-patches-6.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-musl-patches-2.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gcc-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=decc3a4bc8d50c312730506639b4c28d
diff --git a/metadata/md5-cache/sys-devel/gcc-11.4.1_p20240111 b/metadata/md5-cache/sys-devel/gcc-11.4.1_p20240111
index 7d762721e520..c4e4ea21f197 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.4.1_p20240111
+++ b/metadata/md5-cache/sys-devel/gcc-11.4.1_p20240111
@@ -13,5 +13,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=mirror://gcc/snapshots/11-20240111/gcc-11-20240111.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-12.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-2.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gcc-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=78a8ee767cc72b38c65c758210bccffc
diff --git a/metadata/md5-cache/sys-devel/gcc-11.4.1_p20240208 b/metadata/md5-cache/sys-devel/gcc-11.4.1_p20240208
index 4b9b8960c56a..23b5ed006879 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.4.1_p20240208
+++ b/metadata/md5-cache/sys-devel/gcc-11.4.1_p20240208
@@ -13,5 +13,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=mirror://gcc/snapshots/11-20240208/gcc-11-20240208.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-12.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-2.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gcc-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=043d55e125d88b2dfda25db76d1d422a
diff --git a/metadata/md5-cache/sys-devel/gcc-11.4.1_p20240328 b/metadata/md5-cache/sys-devel/gcc-11.4.1_p20240328
index 83e87e1ea52d..055ffd308607 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.4.1_p20240328
+++ b/metadata/md5-cache/sys-devel/gcc-11.4.1_p20240328
@@ -12,5 +12,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=mirror://gcc/snapshots/11-20240328/gcc-11-20240328.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-12.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-2.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gcc-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=ba2924ae7406ec70164ef51848feddff
diff --git a/metadata/md5-cache/sys-devel/gcc-11.4.1_p20240404 b/metadata/md5-cache/sys-devel/gcc-11.4.1_p20240404
index cb5c17d9ebca..726f7b332a30 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.4.1_p20240404
+++ b/metadata/md5-cache/sys-devel/gcc-11.4.1_p20240404
@@ -13,5 +13,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=mirror://gcc/snapshots/11-20240404/gcc-11-20240404.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-12.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-2.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gcc-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=043d55e125d88b2dfda25db76d1d422a
diff --git a/metadata/md5-cache/sys-devel/gcc-11.4.1_p20240411 b/metadata/md5-cache/sys-devel/gcc-11.4.1_p20240411
index b53c2443a470..051d57d88d3d 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.4.1_p20240411
+++ b/metadata/md5-cache/sys-devel/gcc-11.4.1_p20240411
@@ -12,5 +12,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=mirror://gcc/snapshots/11-20240411/gcc-11-20240411.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-12.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-2.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gcc-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=ba2924ae7406ec70164ef51848feddff
diff --git a/metadata/md5-cache/sys-devel/gcc-11.5.9999 b/metadata/md5-cache/sys-devel/gcc-11.5.9999
index e1962dfae351..667ca1c3b53c 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.5.9999
+++ b/metadata/md5-cache/sys-devel/gcc-11.5.9999
@@ -13,5 +13,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gcc-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=4ccb0f5e4e8d13c8ba4c6cd3bde6ccf9
diff --git a/metadata/md5-cache/sys-devel/gcc-12.3.1_p20240112 b/metadata/md5-cache/sys-devel/gcc-12.3.1_p20240112
index e5b65bdd0e2a..3e67deca4325 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.3.1_p20240112
+++ b/metadata/md5-cache/sys-devel/gcc-12.3.1_p20240112
@@ -13,5 +13,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=12
 SRC_URI=mirror://gcc/snapshots/12-20240112/gcc-12-20240112.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.3.0-patches-2.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.3.0-musl-patches-1.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gcc-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=7741c15e5cabfe7e8fa1c3d2e180ce61
diff --git a/metadata/md5-cache/sys-devel/gcc-12.3.1_p20240209 b/metadata/md5-cache/sys-devel/gcc-12.3.1_p20240209
index 416dfa0b7c61..6e6f5180bd03 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.3.1_p20240209
+++ b/metadata/md5-cache/sys-devel/gcc-12.3.1_p20240209
@@ -13,5 +13,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=12
 SRC_URI=mirror://gcc/snapshots/12-20240209/gcc-12-20240209.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.3.0-patches-3.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.3.0-musl-patches-1.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gcc-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=cca639b8bedea47a1ccc6533272f0be7
diff --git a/metadata/md5-cache/sys-devel/gcc-12.3.1_p20240329 b/metadata/md5-cache/sys-devel/gcc-12.3.1_p20240329
index ec213de1bd55..f852cd3bb11f 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.3.1_p20240329
+++ b/metadata/md5-cache/sys-devel/gcc-12.3.1_p20240329
@@ -12,5 +12,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=12
 SRC_URI=mirror://gcc/snapshots/12-20240329/gcc-12-20240329.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.3.0-patches-3.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.3.0-musl-patches-1.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gcc-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=9e169f194e0beaed02aac47037aa8dbb
diff --git a/metadata/md5-cache/sys-devel/gcc-12.3.1_p20240405 b/metadata/md5-cache/sys-devel/gcc-12.3.1_p20240405
index 8246c8299072..6aec7673a829 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.3.1_p20240405
+++ b/metadata/md5-cache/sys-devel/gcc-12.3.1_p20240405
@@ -12,5 +12,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=12
 SRC_URI=mirror://gcc/snapshots/12-20240405/gcc-12-20240405.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.3.0-patches-3.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.3.0-musl-patches-1.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gcc-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=9e169f194e0beaed02aac47037aa8dbb
diff --git a/metadata/md5-cache/sys-devel/gcc-12.3.1_p20240412 b/metadata/md5-cache/sys-devel/gcc-12.3.1_p20240412
index 10bb023ab381..3c1d357bfe57 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.3.1_p20240412
+++ b/metadata/md5-cache/sys-devel/gcc-12.3.1_p20240412
@@ -12,5 +12,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=12
 SRC_URI=mirror://gcc/snapshots/12-20240412/gcc-12-20240412.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.3.0-patches-3.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.3.0-musl-patches-1.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gcc-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=9e169f194e0beaed02aac47037aa8dbb
diff --git a/metadata/md5-cache/sys-devel/gcc-12.4.9999 b/metadata/md5-cache/sys-devel/gcc-12.4.9999
index 02b1f9d5eacb..1682cfce567d 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.4.9999
+++ b/metadata/md5-cache/sys-devel/gcc-12.4.9999
@@ -13,5 +13,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=12
 SRC_URI=test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gcc-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=4b7c6925ed55573f1c50bd9fb20fcce1
diff --git a/metadata/md5-cache/sys-devel/gcc-13.2.1_p20240113-r1 b/metadata/md5-cache/sys-devel/gcc-13.2.1_p20240113-r1
index 5f62ad417ac3..ee76e0aa4dfc 100644
--- a/metadata/md5-cache/sys-devel/gcc-13.2.1_p20240113-r1
+++ b/metadata/md5-cache/sys-devel/gcc-13.2.1_p20240113-r1
@@ -13,5 +13,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=13
 SRC_URI=mirror://gcc/snapshots/13-20240113/gcc-13-20240113.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-13.2.0-patches-12.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-13.2.0-musl-patches-2.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gcc-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=58bdd91aeb17cee25d62f12c095e4520
diff --git a/metadata/md5-cache/sys-devel/gcc-13.2.1_p20240210 b/metadata/md5-cache/sys-devel/gcc-13.2.1_p20240210
index 3f2248f33f20..989540ac1f1a 100644
--- a/metadata/md5-cache/sys-devel/gcc-13.2.1_p20240210
+++ b/metadata/md5-cache/sys-devel/gcc-13.2.1_p20240210
@@ -13,5 +13,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=13
 SRC_URI=mirror://gcc/snapshots/13-20240210/gcc-13-20240210.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-13.2.0-patches-14.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-13.2.0-musl-patches-2.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gcc-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=348fb93b01c19081fb0e9264947b1ce4
diff --git a/metadata/md5-cache/sys-devel/gcc-13.2.1_p20240330 b/metadata/md5-cache/sys-devel/gcc-13.2.1_p20240330
index 7adfe26cd9c7..0889f5778f7a 100644
--- a/metadata/md5-cache/sys-devel/gcc-13.2.1_p20240330
+++ b/metadata/md5-cache/sys-devel/gcc-13.2.1_p20240330
@@ -12,5 +12,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=13
 SRC_URI=mirror://gcc/snapshots/13-20240330/gcc-13-20240330.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-13.2.0-patches-14.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-13.2.0-musl-patches-2.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gcc-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=f647ad087e35ca7fb60e34223caf1c75
diff --git a/metadata/md5-cache/sys-devel/gcc-13.2.1_p20240406 b/metadata/md5-cache/sys-devel/gcc-13.2.1_p20240406
index 69132b83439b..11f92f045b87 100644
--- a/metadata/md5-cache/sys-devel/gcc-13.2.1_p20240406
+++ b/metadata/md5-cache/sys-devel/gcc-13.2.1_p20240406
@@ -12,5 +12,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=13
 SRC_URI=mirror://gcc/snapshots/13-20240406/gcc-13-20240406.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-13.2.0-patches-15.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-13.2.0-musl-patches-2.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gcc-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=5f1b37bae606878f585568231bb753b5
diff --git a/metadata/md5-cache/sys-devel/gcc-13.2.1_p20240413 b/metadata/md5-cache/sys-devel/gcc-13.2.1_p20240413
index 6872cd1462a9..2b54e5796a6f 100644
--- a/metadata/md5-cache/sys-devel/gcc-13.2.1_p20240413
+++ b/metadata/md5-cache/sys-devel/gcc-13.2.1_p20240413
@@ -12,5 +12,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=13
 SRC_URI=mirror://gcc/snapshots/13-20240413/gcc-13-20240413.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-13.2.0-patches-15.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-13.2.0-musl-patches-2.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gcc-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=5f1b37bae606878f585568231bb753b5
diff --git a/metadata/md5-cache/sys-devel/gcc-13.3.9999 b/metadata/md5-cache/sys-devel/gcc-13.3.9999
index 21ad875b4b6b..02717302fbea 100644
--- a/metadata/md5-cache/sys-devel/gcc-13.3.9999
+++ b/metadata/md5-cache/sys-devel/gcc-13.3.9999
@@ -13,5 +13,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=13
 SRC_URI=test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gcc-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=391a69701977529a65e59aeed8556c54
diff --git a/metadata/md5-cache/sys-devel/gcc-14.0.1_pre20240317 b/metadata/md5-cache/sys-devel/gcc-14.0.1_pre20240317
index 02db6bbcab84..0cce583d3a5f 100644
--- a/metadata/md5-cache/sys-devel/gcc-14.0.1_pre20240317
+++ b/metadata/md5-cache/sys-devel/gcc-14.0.1_pre20240317
@@ -12,5 +12,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=14
 SRC_URI=mirror://gcc/snapshots/14-20240317/gcc-14-20240317.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-14.0.0-patches-25.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-14.0.0-musl-patches-1.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gcc-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=f471766efade5cfceec340465caaea52
diff --git a/metadata/md5-cache/sys-devel/gcc-14.0.1_pre20240324-r1 b/metadata/md5-cache/sys-devel/gcc-14.0.1_pre20240324-r1
index 1b2ed1b8f101..7dd392b0ba16 100644
--- a/metadata/md5-cache/sys-devel/gcc-14.0.1_pre20240324-r1
+++ b/metadata/md5-cache/sys-devel/gcc-14.0.1_pre20240324-r1
@@ -12,5 +12,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=14
 SRC_URI=mirror://gcc/snapshots/14-20240324/gcc-14-20240324.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-14.0.0-patches-25.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-14.0.0-musl-patches-1.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gcc-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=1adf52ccdd19ac89fa120f1c4409bbc7
diff --git a/metadata/md5-cache/sys-devel/gcc-14.0.1_pre20240331 b/metadata/md5-cache/sys-devel/gcc-14.0.1_pre20240331
index 973af200f45c..88d69ce6b7ba 100644
--- a/metadata/md5-cache/sys-devel/gcc-14.0.1_pre20240331
+++ b/metadata/md5-cache/sys-devel/gcc-14.0.1_pre20240331
@@ -12,5 +12,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=14
 SRC_URI=mirror://gcc/snapshots/14-20240331/gcc-14-20240331.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-14.0.0-patches-25.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-14.0.0-musl-patches-1.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gcc-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=f471766efade5cfceec340465caaea52
diff --git a/metadata/md5-cache/sys-devel/gcc-14.0.1_pre20240407 b/metadata/md5-cache/sys-devel/gcc-14.0.1_pre20240407
index 2e54da8cb63d..0f7ce39811d3 100644
--- a/metadata/md5-cache/sys-devel/gcc-14.0.1_pre20240407
+++ b/metadata/md5-cache/sys-devel/gcc-14.0.1_pre20240407
@@ -12,5 +12,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=14
 SRC_URI=mirror://gcc/snapshots/14-20240407/gcc-14-20240407.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-14.0.0-patches-26.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-14.0.0-musl-patches-1.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gcc-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=aefb5d8c3268d078044edf03b28f422e
diff --git a/metadata/md5-cache/sys-devel/gcc-14.0.1_pre20240414 b/metadata/md5-cache/sys-devel/gcc-14.0.1_pre20240414
index 18b95e417e70..26276de33a76 100644
--- a/metadata/md5-cache/sys-devel/gcc-14.0.1_pre20240414
+++ b/metadata/md5-cache/sys-devel/gcc-14.0.1_pre20240414
@@ -12,5 +12,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=14
 SRC_URI=mirror://gcc/snapshots/14-20240414/gcc-14-20240414.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-14.0.0-patches-26.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-14.0.0-musl-patches-1.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gcc-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=aefb5d8c3268d078044edf03b28f422e
diff --git a/metadata/md5-cache/sys-devel/gcc-14.0.9999 b/metadata/md5-cache/sys-devel/gcc-14.0.9999
index 36e43b46ba68..8766d1d15e3d 100644
--- a/metadata/md5-cache/sys-devel/gcc-14.0.9999
+++ b/metadata/md5-cache/sys-devel/gcc-14.0.9999
@@ -13,5 +13,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=14
 SRC_URI=test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gcc-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=746e950e19c9cea90683239a5bb049e3
diff --git a/metadata/md5-cache/sys-devel/gcc-8.5.0-r1 b/metadata/md5-cache/sys-devel/gcc-8.5.0-r1
index 777329d7ab19..ec8e73a8213e 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.5.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-8.5.0-r1
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=8.5.0
 SRC_URI=mirror://gcc/gcc-8.5.0/gcc-8.5.0.tar.xz mirror://gnu/gcc/gcc-8.5.0/gcc-8.5.0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-8.5.0-patches-4.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gcc-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=081f9705fcfc87f1421148ae02b37132
diff --git a/metadata/md5-cache/sys-devel/gcc-9.5.0 b/metadata/md5-cache/sys-devel/gcc-9.5.0
index 11a09e9dce7e..15a1292a5bff 100644
--- a/metadata/md5-cache/sys-devel/gcc-9.5.0
+++ b/metadata/md5-cache/sys-devel/gcc-9.5.0
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=9.5.0
 SRC_URI=mirror://gcc/gcc-9.5.0/gcc-9.5.0.tar.xz mirror://gnu/gcc/gcc-9.5.0/gcc-9.5.0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-9.5.0-patches-2.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> gcc-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=057b42bbe46abc98ea35a2c4441abd7c
diff --git a/metadata/md5-cache/sys-devel/kgcc64-10.5.0 b/metadata/md5-cache/sys-devel/kgcc64-10.5.0
index fe79bf1af45f..87af551a4a16 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-10.5.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-10.5.0
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=mirror://gcc/gcc-10.5.0/gcc-10.5.0.tar.xz mirror://gnu/gcc/gcc-10.5.0/gcc-10.5.0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-patches-6.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-musl-patches-2.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> kgcc64-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=903c8170fae8d1a34fd17defcf096a3d
diff --git a/metadata/md5-cache/sys-devel/kgcc64-11.4.1_p20240111 b/metadata/md5-cache/sys-devel/kgcc64-11.4.1_p20240111
index 56da34fc77a3..fd037e1c216e 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-11.4.1_p20240111
+++ b/metadata/md5-cache/sys-devel/kgcc64-11.4.1_p20240111
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=mirror://gcc/snapshots/11-20240111/gcc-11-20240111.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-12.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-2.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> kgcc64-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=0b0d21ef04077eb807461b2e0abbdd31
diff --git a/metadata/md5-cache/sys-devel/kgcc64-11.4.1_p20240208 b/metadata/md5-cache/sys-devel/kgcc64-11.4.1_p20240208
index 05c0419555ed..bf7784f769b7 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-11.4.1_p20240208
+++ b/metadata/md5-cache/sys-devel/kgcc64-11.4.1_p20240208
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=mirror://gcc/snapshots/11-20240208/gcc-11-20240208.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-12.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-2.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> kgcc64-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=fd8fc244d2088cae9564b7ba82f61089
diff --git a/metadata/md5-cache/sys-devel/kgcc64-12.3.1_p20240112 b/metadata/md5-cache/sys-devel/kgcc64-12.3.1_p20240112
index aeb4f4c83bb9..e3a9457fef14 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-12.3.1_p20240112
+++ b/metadata/md5-cache/sys-devel/kgcc64-12.3.1_p20240112
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=12
 SRC_URI=mirror://gcc/snapshots/12-20240112/gcc-12-20240112.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.3.0-patches-2.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.3.0-musl-patches-1.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> kgcc64-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=1cfeece8bbcc4d0e7f8d561413bf776c
diff --git a/metadata/md5-cache/sys-devel/kgcc64-12.3.1_p20240209 b/metadata/md5-cache/sys-devel/kgcc64-12.3.1_p20240209
index 28362e96db31..8c47a6c5f05e 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-12.3.1_p20240209
+++ b/metadata/md5-cache/sys-devel/kgcc64-12.3.1_p20240209
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=12
 SRC_URI=mirror://gcc/snapshots/12-20240209/gcc-12-20240209.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.3.0-patches-2.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.3.0-musl-patches-1.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> kgcc64-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=1cfeece8bbcc4d0e7f8d561413bf776c
diff --git a/metadata/md5-cache/sys-devel/kgcc64-13.2.1_p20240113-r1 b/metadata/md5-cache/sys-devel/kgcc64-13.2.1_p20240113-r1
index 4ef5b5a024ea..07ebd07607cb 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-13.2.1_p20240113-r1
+++ b/metadata/md5-cache/sys-devel/kgcc64-13.2.1_p20240113-r1
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=13
 SRC_URI=mirror://gcc/snapshots/13-20240113/gcc-13-20240113.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-13.2.0-patches-12.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-13.2.0-musl-patches-2.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> kgcc64-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=f97d44f314874ce6a77699dc9a58c767
diff --git a/metadata/md5-cache/sys-devel/kgcc64-13.2.1_p20240210 b/metadata/md5-cache/sys-devel/kgcc64-13.2.1_p20240210
index d52ff30db372..2322122eac2c 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-13.2.1_p20240210
+++ b/metadata/md5-cache/sys-devel/kgcc64-13.2.1_p20240210
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=13
 SRC_URI=mirror://gcc/snapshots/13-20240210/gcc-13-20240210.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-13.2.0-patches-13.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-13.2.0-musl-patches-2.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=7bbfb01a32b73842f8908de028703510a0e12057 -> kgcc64-validate-failures-7bbfb01a32b73842f8908de028703510a0e12057.py )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	37e9d43013bc25606b5476599f5db77e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain	26126a7c2728a7ec08890ef0059164e4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=ff15502a172fce3707878fdaaba8005e
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 9a2d618808d1..b15950afedc9 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-6.7.0 b/metadata/md5-cache/sys-fs/xfsprogs-6.7.0
new file mode 100644
index 000000000000..35edfe823a55
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/xfsprogs-6.7.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-libs/inih dev-libs/userspace-rcu:= >=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) libedit? ( dev-libs/libedit )
+DESCRIPTION=XFS filesystem utilities
+EAPI=8
+HOMEPAGE=https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/
+INHERIT=flag-o-matic systemd udev usr-ldscript toolchain-funcs
+IUSE=icu libedit nls selinux split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/inih dev-libs/userspace-rcu:= >=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) libedit? ( dev-libs/libedit ) selinux? ( sec-policy/selinux-xfs )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-6.7.0.tar.xz
+_eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9
+_md5_=4d33061c9720299d3c012f19fdf87c1c
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index dce7fc3b3332..1eb9408da1fb 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/gentoo-sources-5.15.156 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.156
new file mode 100644
index 000000000000..1bc67786151e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.156
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.15 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-alternatives/cpio dev-lang/perl app-alternatives/bc dev-build/make sys-devel/bison sys-devel/flex >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.15.156
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-166.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-166.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-166.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-166.extras.tar.xz
+_eclasses_=crossdev	f04338ff78f213a4a55c5c37b3c6563e	estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	d7063ec2420394c5b29ed142f15b5033	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=b40a552277a9ba38b2e857f9a4e18ee8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.87 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.87
new file mode 100644
index 000000000000..1625fd130344
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.87
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 6.1 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-alternatives/cpio dev-lang/perl app-alternatives/bc dev-build/make sys-devel/bison sys-devel/flex >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=6.1.87
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-96.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-96.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-96.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-96.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-96.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-96.experimental.tar.xz )
+_eclasses_=crossdev	f04338ff78f213a4a55c5c37b3c6563e	estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	d7063ec2420394c5b29ed142f15b5033	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=647b041ca43df2ed73e31c0dbfa9bb10
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.6.28 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.6.28
new file mode 100644
index 000000000000..fe4b2cfb745c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-6.6.28
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 6.6 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-alternatives/cpio dev-lang/perl app-alternatives/bc dev-build/make sys-devel/bison sys-devel/flex >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=6.6.28
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.6.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.6-35.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.6-35.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.6-35.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.6-35.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.6-35.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.6-35.experimental.tar.xz )
+_eclasses_=crossdev	f04338ff78f213a4a55c5c37b3c6563e	estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	d7063ec2420394c5b29ed142f15b5033	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=e66fbb6bcde9bd62e33e1d3fb153b2da
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.8.7 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.8.7
new file mode 100644
index 000000000000..94caacf75b47
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-6.8.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 6.8 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa -ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-alternatives/cpio dev-lang/perl app-alternatives/bc dev-build/make sys-devel/bison sys-devel/flex >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=6.8.7
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.8.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.8-10.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.8-10.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.8-10.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.8-10.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.8-10.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.8-10.experimental.tar.xz )
+_eclasses_=crossdev	f04338ff78f213a4a55c5c37b3c6563e	estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	d7063ec2420394c5b29ed142f15b5033	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=997ed1efaad1de06814f28d8cf936067
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 025064a02ffb..aaccd992b9f5 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/glibc-2.38-r12 b/metadata/md5-cache/sys-libs/glibc-2.38-r12
new file mode 100644
index 000000000000..44a422ec28a9
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/glibc-2.38-r12
@@ -0,0 +1,18 @@
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison compile-locales? ( sys-apps/locale-gen ) doc? ( dev-lang/perl sys-apps/texinfo ) test? ( dev-lang/perl >=net-dns/libidn2-2.3.0 ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6.2 sys-devel/gnuconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
+DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-debug/systemtap ) virtual/os-headers
+DESCRIPTION=GNU libc C library
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/libc/
+IDEPEND=!compile-locales? ( sys-apps/locale-gen )
+INHERIT=python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
+IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd hash-sysv-compat headers-only +multiarch multilib multilib-bootstrap nscd perl profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
+PDEPEND=!vanilla? ( sys-libs/timezone-data )
+RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-debug/systemtap ) !<app-misc/pax-utils-1.3.3 perl? ( dev-lang/perl ) >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
+RESTRICT=!test? ( test )
+SLOT=2.2
+SRC_URI=mirror://gnu/glibc/glibc-2.38.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.38-patches-12.tar.xz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
+_eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	21162ec96c87041004a75348d97342dd	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=6edfd07c8ba315b5eb15caa0b0288520
diff --git a/metadata/md5-cache/sys-libs/glibc-2.39-r3 b/metadata/md5-cache/sys-libs/glibc-2.39-r3
new file mode 100644
index 000000000000..84dec74131e2
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/glibc-2.39-r3
@@ -0,0 +1,18 @@
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison compile-locales? ( sys-apps/locale-gen ) doc? ( dev-lang/perl sys-apps/texinfo ) test? ( dev-lang/perl >=net-dns/libidn2-2.3.0 ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6.2 sys-devel/gnuconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
+DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-debug/systemtap ) virtual/os-headers
+DESCRIPTION=GNU libc C library
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/libc/
+IDEPEND=!compile-locales? ( sys-apps/locale-gen )
+INHERIT=python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
+IUSE=audit caps cet compile-locales custom-cflags doc gd hash-sysv-compat headers-only +multiarch multilib multilib-bootstrap nscd perl profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa -ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
+PDEPEND=!vanilla? ( sys-libs/timezone-data )
+RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-debug/systemtap ) !<app-misc/pax-utils-1.3.3 !<sys-apps/systemd-254.9-r1 perl? ( dev-lang/perl ) >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
+RESTRICT=!test? ( test )
+SLOT=2.2
+SRC_URI=mirror://gnu/glibc/glibc-2.39.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.39-patches-3.tar.xz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
+_eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	21162ec96c87041004a75348d97342dd	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=b099df1e52dfe575c157c5e0e212ddd8
diff --git a/metadata/md5-cache/sys-libs/ldb-2.9.0 b/metadata/md5-cache/sys-libs/ldb-2.9.0
new file mode 100644
index 000000000000..bbb41e85b49a
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/ldb-2.9.0
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[threads(+)] ) dev-libs/libxslt virtual/pkgconfig doc? ( app-text/doxygen )
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[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/talloc-2.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.10[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/tevent-0.16.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap:= ) lmdb? ( >=dev-db/lmdb-0.9.16:=[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_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tdb[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tevent[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) virtual/libcrypt test? ( >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=LDAP-like embedded database
+EAPI=8
+HOMEPAGE=https://ldb.samba.org
+INHERIT=python-single-r1 waf-utils multilib-minimal
+IUSE=doc ldap +lmdb python test python_single_target_python3_10 python_single_target_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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-3
+RDEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[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/talloc-2.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.10[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/tevent-0.16.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap:= ) lmdb? ( >=dev-db/lmdb-0.9.16:=[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_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tdb[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tevent[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) test? ( lmdb )
+RESTRICT=!test? ( test )
+SLOT=0/2.9.0
+SRC_URI=https://samba.org/ftp/pub/ldb/ldb-2.9.0.tar.gz
+_eclasses_=multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	waf-utils	be1df8dc616c09387b18633b4155fcb5
+_md5_=6230185270ceb5a30a9597fa166c1327
diff --git a/metadata/md5-cache/sys-libs/libseccomp-2.5.5-r1 b/metadata/md5-cache/sys-libs/libseccomp-2.5.5-r1
index 3cac44ee4b43..4f4ea695c48e 100644
--- a/metadata/md5-cache/sys-libs/libseccomp-2.5.5-r1
+++ b/metadata/md5-cache/sys-libs/libseccomp-2.5.5-r1
@@ -1,10 +1,10 @@
-BDEPEND=>=sys-kernel/linux-headers-5.15 python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) dev-util/gperf python? ( >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] )
+BDEPEND=>=sys-kernel/linux-headers-5.15 python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) dev-util/gperf experimental-loong? ( || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3 ) python? ( >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) sys-devel/gnuconfig >=app-portage/elt-patches-20240116
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=sys-kernel/linux-headers-5.15 python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) )
 DESCRIPTION=High level interface to Linux seccomp filter
 EAPI=8
 HOMEPAGE=https://github.com/seccomp/libseccomp
-INHERIT=distutils-r1 multilib-minimal
+INHERIT=distutils-r1 multilib-minimal autotools
 IUSE=experimental-loong python static-libs test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug 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 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
@@ -12,6 +12,6 @@ RDEPEND=>=sys-kernel/linux-headers-5.15 python? ( python_targets_python3_10? ( d
 REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/seccomp/libseccomp/releases/download/v2.5.5/libseccomp-2.5.5.tar.gz experimental-loong? ( https://dev.gentoo.org/~xen0n/distfiles/libseccomp-2.5.5-loongarch64-20231204.patch.xz )
-_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f66df213df92cbbf30a73377ad904429
+SRC_URI=https://github.com/seccomp/libseccomp/releases/download/v2.5.5/libseccomp-2.5.5.tar.gz experimental-loong? ( https://github.com/matoro/libseccomp/compare/v2.5.5..loongarch-r1.patch -> libseccomp-2.5.5-loongarch-r1.patch )
+_eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=003872cc647dc38fb4a77d29acff82f3
diff --git a/metadata/md5-cache/sys-libs/talloc-2.4.2 b/metadata/md5-cache/sys-libs/talloc-2.4.2
new file mode 100644
index 000000000000..4efdd5b2be7c
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/talloc-2.4.2
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_single_target_python3_12? ( dev-lang/python:3.12[threads(+)] ) dev-libs/libxslt sys-devel/gettext
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!elibc_SunOS? ( !elibc_Darwin? ( dev-libs/libbsd[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_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_single_target_python3_12? ( dev-lang/python:3.12[threads(+)] ) ) valgrind? ( dev-debug/valgrind )
+DESCRIPTION=Samba talloc library
+EAPI=8
+HOMEPAGE=https://talloc.samba.org/
+INHERIT=waf-utils python-single-r1 multilib-minimal
+IUSE=compat +python test valgrind python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=GPL-3 LGPL-3+ LGPL-2
+RDEPEND=!elibc_SunOS? ( !elibc_Darwin? ( dev-libs/libbsd[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_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_single_target_python3_12? ( dev-lang/python:3.12[threads(+)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.samba.org/ftp/talloc/talloc-2.4.2.tar.gz
+_eclasses_=multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	waf-utils	be1df8dc616c09387b18633b4155fcb5
+_md5_=d56dfaad4783163ae9a83b96f9251ab1
diff --git a/metadata/md5-cache/sys-libs/tdb-1.4.10 b/metadata/md5-cache/sys-libs/tdb-1.4.10
new file mode 100644
index 000000000000..d296bbc10ad4
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/tdb-1.4.10
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_single_target_python3_12? ( dev-lang/python:3.12[threads(+)] ) app-text/docbook-xml-dtd:4.2
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/libbsd[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_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_single_target_python3_12? ( dev-lang/python:3.12[threads(+)] ) ) virtual/libcrypt
+DESCRIPTION=Simple database API
+EAPI=8
+HOMEPAGE=https://tdb.samba.org/
+INHERIT=waf-utils multilib-minimal python-single-r1
+IUSE=python test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=dev-libs/libbsd[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_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_single_target_python3_12? ( dev-lang/python:3.12[threads(+)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://samba.org/ftp/tdb/tdb-1.4.10.tar.gz
+_eclasses_=multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	waf-utils	be1df8dc616c09387b18633b4155fcb5
+_md5_=85fe519ef5dfa95578ddb656f1fa8932
diff --git a/metadata/md5-cache/sys-libs/tevent-0.16.1 b/metadata/md5-cache/sys-libs/tevent-0.16.1
new file mode 100644
index 000000000000..3f4cfde6f663
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/tevent-0.16.1
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[threads(+)] ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/libbsd[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/talloc-2.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[threads(+)] ) >=sys-libs/talloc-2.4.2[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) elibc_glibc? ( net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/rpcsvc-proto ) test? ( >=dev-util/cmocka-1.1.3 )
+DESCRIPTION=Samba tevent library
+EAPI=8
+HOMEPAGE=https://tevent.samba.org/
+INHERIT=waf-utils multilib-minimal python-single-r1
+IUSE=python test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
+LICENSE=GPL-3
+RDEPEND=dev-libs/libbsd[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/talloc-2.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[threads(+)] ) >=sys-libs/talloc-2.4.2[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://samba.org/ftp/tevent/tevent-0.16.1.tar.gz
+_eclasses_=multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	waf-utils	be1df8dc616c09387b18633b4155fcb5
+_md5_=844d547023d996d83ae0cca4a90b0638
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index af09d0a160ce..f0f8dd186609 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/epiphany-46.0 b/metadata/md5-cache/www-client/epiphany-46.0
index 1c48d410086e..6a19d3a69871 100644
--- a/metadata/md5-cache/www-client/epiphany-46.0
+++ b/metadata/md5-cache/www-client/epiphany-46.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-libs/appstream-glib dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=x11-libs/cairo-1.2 >=app-crypt/gcr-3.9.0:4=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 >=dev-libs/glib-2.74.0:2 gnome-base/gsettings-desktop-schemas >=media-libs/gstreamer-1.0 >=gui-libs/gtk-4.12.0:4 >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.6 app-arch/libarchive:= >=gui-libs/libadwaita-1.4.0:1 >=app-crypt/libsecret-0.19 >=net-libs/libsoup-2.99.4:3.0 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/nettle-3.4:= >=dev-libs/libportal-0.6:0=[gtk] >=dev-db/sqlite-3.22:3 >=net-libs/webkit-gtk-2.43.4:6 dev-libs/gmp:0=
+DEPEND=>=x11-libs/cairo-1.2 >=app-crypt/gcr-3.9.0:4=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 >=dev-libs/glib-2.74.0:2 gnome-base/gsettings-desktop-schemas media-libs/gstreamer:1.0 >=gui-libs/gtk-4.12.0:4 >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.6 app-arch/libarchive:= >=gui-libs/libadwaita-1.4.0:1 >=app-crypt/libsecret-0.19 >=net-libs/libsoup-2.99.4:3.0 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/nettle-3.4:= >=dev-libs/libportal-0.6:0=[gtk] >=dev-db/sqlite-3.22:3 >=net-libs/webkit-gtk-2.43.4:6 dev-libs/gmp:0=
 DESCRIPTION=GNOME webbrowser based on Webkit
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Web https://gitlab.gnome.org/GNOME/epiphany
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome.org gnome2-utils meson xdg virtualx
 IUSE=test test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-3+
-RDEPEND=>=x11-libs/cairo-1.2 >=app-crypt/gcr-3.9.0:4=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 >=dev-libs/glib-2.74.0:2 gnome-base/gsettings-desktop-schemas >=media-libs/gstreamer-1.0 >=gui-libs/gtk-4.12.0:4 >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.6 app-arch/libarchive:= >=gui-libs/libadwaita-1.4.0:1 >=app-crypt/libsecret-0.19 >=net-libs/libsoup-2.99.4:3.0 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/nettle-3.4:= >=dev-libs/libportal-0.6:0=[gtk] >=dev-db/sqlite-3.22:3 >=net-libs/webkit-gtk-2.43.4:6 dev-libs/gmp:0= x11-themes/adwaita-icon-theme
+RDEPEND=>=x11-libs/cairo-1.2 >=app-crypt/gcr-3.9.0:4=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 >=dev-libs/glib-2.74.0:2 gnome-base/gsettings-desktop-schemas media-libs/gstreamer:1.0 >=gui-libs/gtk-4.12.0:4 >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.6 app-arch/libarchive:= >=gui-libs/libadwaita-1.4.0:1 >=app-crypt/libsecret-0.19 >=net-libs/libsoup-2.99.4:3.0 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/nettle-3.4:= >=dev-libs/libportal-0.6:0=[gtk] >=dev-db/sqlite-3.22:3 >=net-libs/webkit-gtk-2.43.4:6 dev-libs/gmp:0= x11-themes/adwaita-icon-theme
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/epiphany/46/epiphany-46.0.tar.xz
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2-utils	30dbce54b89e77b86f366548f94419ad	meson	92696988eaddba122c4cedc191f59bcb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6f0655f15fe0c8d2b88a7d86727ae2af
+_md5_=c4e30f1f5d67786dcda137000d15369d
diff --git a/metadata/md5-cache/www-client/firefox-115.10.0 b/metadata/md5-cache/www-client/firefox-115.10.0
index f10c4148df62..5588e2343c1b 100644
--- a/metadata/md5-cache/www-client/firefox-115.10.0
+++ b/metadata/md5-cache/www-client/firefox-115.10.0
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.mozilla.com/firefox
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm multiprocessing optfeature pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs virtualx xdg
 IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack libproxy lto openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp wayland wifi +X geckodriver +gmp-autoupdate screencast l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW l10n_ach l10n_an l10n_az l10n_bn l10n_bs l10n_ca-valencia l10n_eo l10n_es-CL l10n_es-MX l10n_fa l10n_ff l10n_fur l10n_gn l10n_gu l10n_hi l10n_hy l10n_ia l10n_km l10n_kn l10n_lij l10n_mk l10n_mr l10n_my l10n_ne l10n_oc l10n_sc l10n_sco l10n_si l10n_son l10n_szl l10n_ta l10n_te l10n_tl l10n_trs l10n_ur l10n_xh
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=!www-client/firefox:0 !www-client/firefox:rapid screencast? ( media-video/pipewire:= ) selinux? ( sec-policy/selinux-mozilla ) >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.90 >=dev-libs/nspr-4.35 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) pulseaudio? ( || ( media-libs/libpulse >=media-sound/apulse-0.1.12-r4[sdk] ) ) libproxy? ( net-libs/libproxy ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) screencast? ( media-video/pipewire:= ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-73.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( >=media-libs/libepoxy-1.5.10-r1 x11-libs/gtk+:3[wayland] x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) X? ( virtual/opengl x11-libs/cairo[X] x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= ) hwaccel? ( media-video/libva-utils sys-apps/pciutils ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] )
 REQUIRED_USE=|| ( X wayland ) debug? ( !system-av1 ) pgo? ( lto ) wifi? ( dbus )
 SLOT=esr
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/source/firefox-115.10.0esr.source.tar.xz -> firefox-115.10.0esr.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-115esr-patches-09.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/af.xpi -> firefox-115.10.0esr-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/ar.xpi -> firefox-115.10.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/ast.xpi -> firefox-115.10.0esr-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/be.xpi -> firefox-115.10.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/bg.xpi -> firefox-115.10.0esr-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/br.xpi -> firefox-115.10.0esr-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/ca.xpi -> firefox-115.10.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/cak.xpi -> firefox-115.10.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/cs.xpi -> firefox-115.10.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/cy.xpi -> firefox-115.10.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/da.xpi -> firefox-115.10.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/de.xpi -> firefox-115.10.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-115.10.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/el.xpi -> firefox-115.10.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-115.10.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-115.10.0esr-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-115.10.0esr-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-115.10.0esr-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/et.xpi -> firefox-115.10.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/eu.xpi -> firefox-115.10.0esr-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/fi.xpi -> firefox-115.10.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/fr.xpi -> firefox-115.10.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-115.10.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-115.10.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/gd.xpi -> firefox-115.10.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/gl.xpi -> firefox-115.10.0esr-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/he.xpi -> firefox-115.10.0esr-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/hr.xpi -> firefox-115.10.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-115.10.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/hu.xpi -> firefox-115.10.0esr-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/id.xpi -> firefox-115.10.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/is.xpi -> firefox-115.10.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/it.xpi -> firefox-115.10.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/ja.xpi -> firefox-115.10.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/ka.xpi -> firefox-115.10.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/kab.xpi -> firefox-115.10.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/kk.xpi -> firefox-115.10.0esr-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/ko.xpi -> firefox-115.10.0esr-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/lt.xpi -> firefox-115.10.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/lv.xpi -> firefox-115.10.0esr-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/ms.xpi -> firefox-115.10.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-115.10.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/nl.xpi -> firefox-115.10.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-115.10.0esr-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-115.10.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/pl.xpi -> firefox-115.10.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-115.10.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-115.10.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/rm.xpi -> firefox-115.10.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/ro.xpi -> firefox-115.10.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/ru.xpi -> firefox-115.10.0esr-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/sk.xpi -> firefox-115.10.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/sl.xpi -> firefox-115.10.0esr-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/sq.xpi -> firefox-115.10.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/sr.xpi -> firefox-115.10.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-115.10.0esr-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/th.xpi -> firefox-115.10.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/tr.xpi -> firefox-115.10.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/uk.xpi -> firefox-115.10.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/uz.xpi -> firefox-115.10.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/vi.xpi -> firefox-115.10.0esr-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-115.10.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-115.10.0esr-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/ach.xpi -> firefox-115.10.0esr-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/an.xpi -> firefox-115.10.0esr-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/az.xpi -> firefox-115.10.0esr-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/bn.xpi -> firefox-115.10.0esr-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/bs.xpi -> firefox-115.10.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-115.10.0esr-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/eo.xpi -> firefox-115.10.0esr-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-115.10.0esr-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-115.10.0esr-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/fa.xpi -> firefox-115.10.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/ff.xpi -> firefox-115.10.0esr-ff.xpi ) l10n_fur? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/fur.xpi -> firefox-115.10.0esr-fur.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/gn.xpi -> firefox-115.10.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-115.10.0esr-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-115.10.0esr-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-115.10.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/ia.xpi -> firefox-115.10.0esr-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/km.xpi -> firefox-115.10.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/kn.xpi -> firefox-115.10.0esr-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/lij.xpi -> firefox-115.10.0esr-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/mk.xpi -> firefox-115.10.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/mr.xpi -> firefox-115.10.0esr-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/my.xpi -> firefox-115.10.0esr-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-115.10.0esr-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/oc.xpi -> firefox-115.10.0esr-oc.xpi ) l10n_sc? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/sc.xpi -> firefox-115.10.0esr-sc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/sco.xpi -> firefox-115.10.0esr-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/si.xpi -> firefox-115.10.0esr-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/son.xpi -> firefox-115.10.0esr-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/szl.xpi -> firefox-115.10.0esr-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/ta.xpi -> firefox-115.10.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/te.xpi -> firefox-115.10.0esr-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/tl.xpi -> firefox-115.10.0esr-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/trs.xpi -> firefox-115.10.0esr-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/ur.xpi -> firefox-115.10.0esr-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/115.10.0esr/linux-x86_64/xpi/xh.xpi -> firefox-115.10.0esr-xh.xpi )
 _eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnome2-utils	30dbce54b89e77b86f366548f94419ad	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	linux-info	7ca3057b277f1e5978947b4cc289ce62	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=95f941f695b8f0cef0fdcb44c27dcbd4
+_md5_=b0b5bc44dac61c70c47bf88ba4fd72fa
diff --git a/metadata/md5-cache/www-client/firefox-125.0.1 b/metadata/md5-cache/www-client/firefox-125.0.1
new file mode 100644
index 000000000000..4093b1f56e87
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-125.0.1
@@ -0,0 +1,17 @@
+BDEPEND=|| ( dev-lang/python:3.12[ncurses,sqlite,ssl] dev-lang/python:3.11[ncurses,sqlite,ssl] dev-lang/python:3.10[ncurses,sqlite,ssl] ) llvm_slot_17? ( sys-devel/clang:17 sys-devel/llvm:17 clang? ( sys-devel/lld:17 virtual/rust:0/llvm-17 ) pgo? ( sys-libs/compiler-rt-sanitizers:17[profile] ) ) app-alternatives/awk app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.26.0 net-libs/nodejs virtual/pkgconfig !clang? ( >=virtual/rust-1.74 ) !elibc_glibc? ( dev-lang/rust ) amd64? ( >=dev-lang/nasm-2.14 ) x86? ( >=dev-lang/nasm-2.14 ) pgo? ( X? ( sys-devel/gettext x11-base/xorg-server[xvfb] x11-apps/xhost ) !X? ( >=gui-libs/wlroots-0.15.1-r1[tinywl] x11-misc/xkeyboard-config ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20240116 || ( >=dev-build/automake-1.16.5:1.16 ) >=dev-build/autoconf-2.13-r7:2.1 >=dev-build/libtool-2.4.7-r3
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=!www-client/firefox:0 !www-client/firefox:esr selinux? ( sec-policy/selinux-mozilla ) >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.99 >=dev-libs/nspr-4.35 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango x11-libs/pixman dbus? ( sys-apps/dbus ) jack? ( virtual/jack ) pulseaudio? ( || ( media-libs/libpulse >=media-sound/apulse-0.1.12-r4[sdk] ) ) libproxy? ( net-libs/libproxy ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-73.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) valgrind? ( dev-debug/valgrind ) wayland? ( >=media-libs/libepoxy-1.5.10-r1 x11-libs/gtk+:3[wayland] x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( net-misc/networkmanager sys-apps/dbus ) ) X? ( virtual/opengl x11-libs/cairo[X] x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= ) X? ( x11-base/xorg-proto x11-libs/libICE x11-libs/libSM )
+DESCRIPTION=Firefox Web Browser
+EAPI=8
+HOMEPAGE=https://www.mozilla.com/firefox
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multiprocessing optfeature pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs virtualx xdg
+IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack +jumbo-build libproxy lto openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp +telemetry valgrind wayland wifi +X geckodriver +gmp-autoupdate l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW l10n_ach l10n_an l10n_az l10n_bn l10n_bs l10n_ca-valencia l10n_eo l10n_es-CL l10n_es-MX l10n_fa l10n_ff l10n_fur l10n_gn l10n_gu l10n_hi l10n_hy l10n_ia l10n_km l10n_kn l10n_lij l10n_mk l10n_mr l10n_my l10n_ne l10n_oc l10n_sc l10n_sco l10n_si l10n_son l10n_szl l10n_ta l10n_te l10n_tl l10n_trs l10n_ur l10n_xh +llvm_slot_17
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=!www-client/firefox:0 !www-client/firefox:esr selinux? ( sec-policy/selinux-mozilla ) >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.99 >=dev-libs/nspr-4.35 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango x11-libs/pixman dbus? ( sys-apps/dbus ) jack? ( virtual/jack ) pulseaudio? ( || ( media-libs/libpulse >=media-sound/apulse-0.1.12-r4[sdk] ) ) libproxy? ( net-libs/libproxy ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-73.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) valgrind? ( dev-debug/valgrind ) wayland? ( >=media-libs/libepoxy-1.5.10-r1 x11-libs/gtk+:3[wayland] x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( net-misc/networkmanager sys-apps/dbus ) ) X? ( virtual/opengl x11-libs/cairo[X] x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= ) hwaccel? ( media-video/libva-utils sys-apps/pciutils ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] )
+REQUIRED_USE=|| ( X wayland ) debug? ( !system-av1 ) pgo? ( lto ) wifi? ( dbus ) ^^ ( llvm_slot_17 )
+SLOT=rapid
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/125.0.1/source/firefox-125.0.1.source.tar.xz -> firefox-125.0.1.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-125-patches-01.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/af.xpi -> firefox-125.0.1-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/ar.xpi -> firefox-125.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/ast.xpi -> firefox-125.0.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/be.xpi -> firefox-125.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/bg.xpi -> firefox-125.0.1-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/br.xpi -> firefox-125.0.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/ca.xpi -> firefox-125.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/cak.xpi -> firefox-125.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/cs.xpi -> firefox-125.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/cy.xpi -> firefox-125.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/da.xpi -> firefox-125.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/de.xpi -> firefox-125.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/dsb.xpi -> firefox-125.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/el.xpi -> firefox-125.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/en-CA.xpi -> firefox-125.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/en-GB.xpi -> firefox-125.0.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/es-AR.xpi -> firefox-125.0.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/es-ES.xpi -> firefox-125.0.1-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/et.xpi -> firefox-125.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/eu.xpi -> firefox-125.0.1-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/fi.xpi -> firefox-125.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/fr.xpi -> firefox-125.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/fy-NL.xpi -> firefox-125.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/ga-IE.xpi -> firefox-125.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/gd.xpi -> firefox-125.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/gl.xpi -> firefox-125.0.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/he.xpi -> firefox-125.0.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/hr.xpi -> firefox-125.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/hsb.xpi -> firefox-125.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/hu.xpi -> firefox-125.0.1-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/id.xpi -> firefox-125.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/is.xpi -> firefox-125.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/it.xpi -> firefox-125.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/ja.xpi -> firefox-125.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/ka.xpi -> firefox-125.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/kab.xpi -> firefox-125.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/kk.xpi -> firefox-125.0.1-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/ko.xpi -> firefox-125.0.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/lt.xpi -> firefox-125.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/lv.xpi -> firefox-125.0.1-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/ms.xpi -> firefox-125.0.1-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/nb-NO.xpi -> firefox-125.0.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/nl.xpi -> firefox-125.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/nn-NO.xpi -> firefox-125.0.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/pa-IN.xpi -> firefox-125.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/pl.xpi -> firefox-125.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/pt-BR.xpi -> firefox-125.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/pt-PT.xpi -> firefox-125.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/rm.xpi -> firefox-125.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/ro.xpi -> firefox-125.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/ru.xpi -> firefox-125.0.1-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/sk.xpi -> firefox-125.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/sl.xpi -> firefox-125.0.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/sq.xpi -> firefox-125.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/sr.xpi -> firefox-125.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/sv-SE.xpi -> firefox-125.0.1-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/th.xpi -> firefox-125.0.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/tr.xpi -> firefox-125.0.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/uk.xpi -> firefox-125.0.1-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/uz.xpi -> firefox-125.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/vi.xpi -> firefox-125.0.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/zh-CN.xpi -> firefox-125.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/zh-TW.xpi -> firefox-125.0.1-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/ach.xpi -> firefox-125.0.1-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/an.xpi -> firefox-125.0.1-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/az.xpi -> firefox-125.0.1-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/bn.xpi -> firefox-125.0.1-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/bs.xpi -> firefox-125.0.1-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/ca-valencia.xpi -> firefox-125.0.1-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/eo.xpi -> firefox-125.0.1-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/es-CL.xpi -> firefox-125.0.1-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/es-MX.xpi -> firefox-125.0.1-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/fa.xpi -> firefox-125.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/ff.xpi -> firefox-125.0.1-ff.xpi ) l10n_fur? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/fur.xpi -> firefox-125.0.1-fur.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/gn.xpi -> firefox-125.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/gu-IN.xpi -> firefox-125.0.1-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/hi-IN.xpi -> firefox-125.0.1-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/hy-AM.xpi -> firefox-125.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/ia.xpi -> firefox-125.0.1-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/km.xpi -> firefox-125.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/kn.xpi -> firefox-125.0.1-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/lij.xpi -> firefox-125.0.1-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/mk.xpi -> firefox-125.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/mr.xpi -> firefox-125.0.1-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/my.xpi -> firefox-125.0.1-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/ne-NP.xpi -> firefox-125.0.1-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/oc.xpi -> firefox-125.0.1-oc.xpi ) l10n_sc? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/sc.xpi -> firefox-125.0.1-sc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/sco.xpi -> firefox-125.0.1-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/si.xpi -> firefox-125.0.1-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/son.xpi -> firefox-125.0.1-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/szl.xpi -> firefox-125.0.1-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/ta.xpi -> firefox-125.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/te.xpi -> firefox-125.0.1-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/tl.xpi -> firefox-125.0.1-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/trs.xpi -> firefox-125.0.1-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/ur.xpi -> firefox-125.0.1-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xpi/xh.xpi -> firefox-125.0.1-xh.xpi )
+_eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnome2-utils	30dbce54b89e77b86f366548f94419ad	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	linux-info	7ca3057b277f1e5978947b4cc289ce62	llvm-r1	2e652182b1f239b07688071f959f19e4	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=a507a3814787e42fd964b85802368ec5
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 12c2c0257967..3c4d5686625b 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/gunicorn-22.0.0 b/metadata/md5-cache/www-servers/gunicorn-22.0.0
new file mode 100644
index 000000000000..62686181fe07
--- /dev/null
+++ b/metadata/md5-cache/www-servers/gunicorn-22.0.0
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( >=dev-python/sphinx-7.2.6 ) test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/setproctitle[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A WSGI HTTP Server for UNIX
+EAPI=8
+HOMEPAGE=https://gunicorn.org/ https://github.com/benoitc/gunicorn/ https://pypi.org/project/gunicorn/
+INHERIT=distutils-r1
+IUSE=doc test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT PSF-2 doc? ( BSD )
+RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/setproctitle[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/benoitc/gunicorn/archive/22.0.0.tar.gz -> gunicorn-22.0.0.gh.tar.gz
+_eclasses_=distutils-r1	d9a9242b3972ef569e740451da4b90e1	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=5dae885cc2820ca2a67bee99fe61d7f4
diff --git a/metadata/md5-cache/www-servers/nginx-1.24.0-r2 b/metadata/md5-cache/www-servers/nginx-1.24.0-r2
index 0d24ba14b6a0..17a8306ec118 100644
--- a/metadata/md5-cache/www-servers/nginx-1.24.0-r2
+++ b/metadata/md5-cache/www-servers/nginx-1.24.0-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://nginx.org
 INHERIT=autotools lua-single multiprocessing ssl-cert toolchain-funcs perl-module systemd pax-utils
 IUSE=aio debug +http +http2 +http-cache libatomic pcre +pcre2 pcre-jit rtmp selinux ssl test threads vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy +lua_single_target_luajit
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
 PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
 RDEPEND=acct-group/nginx acct-user/nginx virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre2? ( dev-libs/libpcre2:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/modsecurity ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) app-misc/mime-types[nginx] selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:mainline
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://nginx.org/download/nginx-1.24.0.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.63.tar.gz -> ngx_http_echo-0.63.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.4.tar.gz -> ngx_http_geoip2_module-3.4.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/openresty/headers-more-nginx-module/archive/v0.34.tar.gz -> ngx_http_headers_more-0.34.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.7.12.tar.gz -> njs-0.7.12.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/b6d167cf1a93c0c885c28db5a439f2404874cb26.tar.gz -> ngx_http_lua-b6d167cf1a93c0c885c28db5a439f2404874cb26.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/liquidm/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/wargio/naxsi/archive/4140b2ded624eb36f04c783c460379b9403012d0.tar.gz -> ngx_http_naxsi-4140b2ded624eb36f04c783c460379b9403012d0.tar.gz https://github.com/libinjection/libinjection/archive/49904c42a6e68dc8f16c022c693e897e4010a06c.tar.gz -> ngx_http_naxsi_libinjection-49904c42a6e68dc8f16c022c693e897e4010a06c.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/8c02220d484d7848bc8e3a6d9b1c616987e86f66.tar.gz -> ngx_http_push_stream-8c02220d484d7848bc8e3a6d9b1c616987e86f66.tar.gz ) nginx_modules_http_security? ( https://github.com/SpiderLabs/ModSecurity-nginx/archive/refs/tags/v1.0.3.tar.gz -> modsecurity-nginx-1.0.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/68b3ab3b64a0cee7f785d161401c8be357bbed12.tar.gz -> ngx_http_upload_progress-68b3ab3b64a0cee7f785d161401c8be357bbed12.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/v0.2.1.tar.gz -> ngx_http_vhost_traffic_status-0.2.1.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.4.tar.gz -> ngx_http_geoip2_module-3.4.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.7.12.tar.gz -> njs-0.7.12.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.2.tar.gz -> ngx_rtmp-1.2.2.tar.gz ) test? ( https://hg.nginx.org/nginx-tests/archive/24482e311749.tar.gz -> nginx-tests-24482e311749.tar.gz )
 _eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4e37e1004a0a27e41bb7025c0b974676	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	ssl-cert	c6ea4108da6e229ed3a7d2d949f72a26	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=6ba05e9f9faccaab20876ed847f2cb5e
+_md5_=e26801bdc822af1f0a0223fbd9c0e045
diff --git a/metadata/md5-cache/www-servers/nginx-1.25.4 b/metadata/md5-cache/www-servers/nginx-1.25.4
index d59644eb716e..e59783b75f1e 100644
--- a/metadata/md5-cache/www-servers/nginx-1.25.4
+++ b/metadata/md5-cache/www-servers/nginx-1.25.4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://nginx.org
 INHERIT=autotools lua-single multiprocessing ssl-cert toolchain-funcs perl-module systemd pax-utils
 IUSE=aio debug +http +http2 http3 +http-cache ktls libatomic pcre +pcre2 pcre-jit rtmp selinux ssl test threads vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy +lua_single_target_luajit
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
 PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
 RDEPEND=acct-group/nginx acct-user/nginx virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre2? ( dev-libs/libpcre2:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) ktls? ( >=dev-libs/openssl-3:0=[ktls] ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/modsecurity ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) app-misc/mime-types[nginx] selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=mainline
 SRC_URI=https://nginx.org/download/nginx-1.25.4.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.63.tar.gz -> ngx_http_echo-0.63.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.4.tar.gz -> ngx_http_geoip2_module-3.4.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/openresty/headers-more-nginx-module/archive/v0.34.tar.gz -> ngx_http_headers_more-0.34.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.8.2.tar.gz -> njs-0.8.2.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.25.tar.gz -> ngx_http_lua-0.10.25.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/liquidm/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/wargio/naxsi/archive/4140b2ded624eb36f04c783c460379b9403012d0.tar.gz -> ngx_http_naxsi-4140b2ded624eb36f04c783c460379b9403012d0.tar.gz https://github.com/libinjection/libinjection/archive/49904c42a6e68dc8f16c022c693e897e4010a06c.tar.gz -> ngx_http_naxsi_libinjection-49904c42a6e68dc8f16c022c693e897e4010a06c.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/8c02220d484d7848bc8e3a6d9b1c616987e86f66.tar.gz -> ngx_http_push_stream-8c02220d484d7848bc8e3a6d9b1c616987e86f66.tar.gz ) nginx_modules_http_security? ( https://github.com/SpiderLabs/ModSecurity-nginx/archive/refs/tags/v1.0.3.tar.gz -> modsecurity-nginx-1.0.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/68b3ab3b64a0cee7f785d161401c8be357bbed12.tar.gz -> ngx_http_upload_progress-68b3ab3b64a0cee7f785d161401c8be357bbed12.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/v0.2.1.tar.gz -> ngx_http_vhost_traffic_status-0.2.1.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.4.tar.gz -> ngx_http_geoip2_module-3.4.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.8.2.tar.gz -> njs-0.8.2.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.2.tar.gz -> ngx_rtmp-1.2.2.tar.gz ) test? ( https://hg.nginx.org/nginx-tests/archive/24482e311749.tar.gz -> nginx-tests-24482e311749.tar.gz )
 _eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4e37e1004a0a27e41bb7025c0b974676	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	ssl-cert	c6ea4108da6e229ed3a7d2d949f72a26	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=4f8ad0f18c5fffd7c34178f1ab40bb46
+_md5_=b8d96f0336e1223ae8d780f9a3a2c874
diff --git a/metadata/md5-cache/www-servers/nginx-1.25.5 b/metadata/md5-cache/www-servers/nginx-1.25.5
new file mode 100644
index 000000000000..50a34806ac97
--- /dev/null
+++ b/metadata/md5-cache/www-servers/nginx-1.25.5
@@ -0,0 +1,18 @@
+BDEPEND=nginx_modules_http_brotli? ( virtual/pkgconfig ) test? ( dev-lang/perl dev-perl/Cache-Memcached dev-perl/Cache-Memcached-Fast dev-perl/CryptX dev-perl/FCGI dev-perl/GD dev-perl/Net-SSLeay ) sys-devel/gnuconfig >=app-portage/elt-patches-20240116 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=acct-group/nginx acct-user/nginx virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre2? ( dev-libs/libpcre2:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) ktls? ( >=dev-libs/openssl-3:0=[ktls] ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/modsecurity ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops )
+DESCRIPTION=Robust, small and high performance http and reverse proxy server
+EAPI=8
+HOMEPAGE=https://nginx.org
+INHERIT=autotools lua-single multiprocessing ssl-cert toolchain-funcs perl-module systemd pax-utils
+IUSE=aio debug +http +http2 http3 +http-cache ktls libatomic pcre +pcre2 pcre-jit rtmp selinux ssl test threads vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy +lua_single_target_luajit
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
+PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
+RDEPEND=acct-group/nginx acct-user/nginx virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre2? ( dev-libs/libpcre2:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) ktls? ( >=dev-libs/openssl-3:0=[ktls] ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/modsecurity ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) app-misc/mime-types[nginx] selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
+REQUIRED_USE=pcre-jit? ( pcre ) ktls? ( ssl ) nginx_modules_http_fancyindex? ( nginx_modules_http_addition ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( ^^ ( lua_single_target_luajit ) nginx_modules_http_rewrite pcre !pcre2 ) nginx_modules_http_naxsi? ( nginx_modules_http_rewrite pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
+RESTRICT=!test? ( test )
+SLOT=mainline
+SRC_URI=https://nginx.org/download/nginx-1.25.5.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.63.tar.gz -> ngx_http_echo-0.63.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.4.tar.gz -> ngx_http_geoip2_module-3.4.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/openresty/headers-more-nginx-module/archive/v0.34.tar.gz -> ngx_http_headers_more-0.34.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.8.4.tar.gz -> njs-0.8.4.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.25.tar.gz -> ngx_http_lua-0.10.25.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/liquidm/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/wargio/naxsi/archive/4140b2ded624eb36f04c783c460379b9403012d0.tar.gz -> ngx_http_naxsi-4140b2ded624eb36f04c783c460379b9403012d0.tar.gz https://github.com/libinjection/libinjection/archive/49904c42a6e68dc8f16c022c693e897e4010a06c.tar.gz -> ngx_http_naxsi_libinjection-49904c42a6e68dc8f16c022c693e897e4010a06c.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/8c02220d484d7848bc8e3a6d9b1c616987e86f66.tar.gz -> ngx_http_push_stream-8c02220d484d7848bc8e3a6d9b1c616987e86f66.tar.gz ) nginx_modules_http_security? ( https://github.com/SpiderLabs/ModSecurity-nginx/archive/refs/tags/v1.0.3.tar.gz -> modsecurity-nginx-1.0.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/68b3ab3b64a0cee7f785d161401c8be357bbed12.tar.gz -> ngx_http_upload_progress-68b3ab3b64a0cee7f785d161401c8be357bbed12.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/v0.2.1.tar.gz -> ngx_http_vhost_traffic_status-0.2.1.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.4.tar.gz -> ngx_http_geoip2_module-3.4.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.8.4.tar.gz -> njs-0.8.4.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.2.tar.gz -> ngx_rtmp-1.2.2.tar.gz ) test? ( https://hg.nginx.org/nginx-tests/archive/24482e311749.tar.gz -> nginx-tests-24482e311749.tar.gz )
+_eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4e37e1004a0a27e41bb7025c0b974676	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	ssl-cert	c6ea4108da6e229ed3a7d2d949f72a26	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=5eb5a9bc33a5d099953f5e1c7c4d09be
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.86-r1 b/metadata/md5-cache/www-servers/tomcat-9.0.86-r1
deleted file mode 100644
index cddc06138489..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-9.0.86-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-9.0.86:9.0.86 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=dev-java/eclipse-ecj:4.15 dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 app-admin/pwgen >=dev-java/ant-1.10.14-r3:0 >=virtual/jdk-17:* test? ( >=dev-java/ant-1.10.14-r3:0[junit] dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
-DESCRIPTION=Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
-EAPI=8
-HOMEPAGE=https://tomcat.apache.org/
-INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
-IUSE=extra-webapps doc source test verify-sig
-KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=9
-SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.86/src/apache-tomcat-9.0.86-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/7.0.0/biz.aQute.bnd-7.0.0.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.86/src/apache-tomcat-9.0.86-src.tar.gz.asc )
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=99b4a7fa933ba6d38de6e145ca823df9
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.87-r1 b/metadata/md5-cache/www-servers/tomcat-9.0.87-r1
index 065c9d1862b1..4c0b50b62bb6 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.87-r1
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.87-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
 IUSE=extra-webapps doc source test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=9
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.87/src/apache-tomcat-9.0.87-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/7.0.0/biz.aQute.bnd-7.0.0.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.87/src/apache-tomcat-9.0.87-src.tar.gz.asc )
 _eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=ca0076efe75e1609e3f93252015d157c
+_md5_=99b4a7fa933ba6d38de6e145ca823df9
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.88 b/metadata/md5-cache/www-servers/tomcat-9.0.88-r1
index 51998321a9bc..45dac6881c6d 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.88
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.88-r1
@@ -1,6 +1,6 @@
 BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-9.0.88:9.0.88 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=dev-java/eclipse-ecj:4.20 dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 app-admin/pwgen >=dev-java/ant-1.10.14-r3:0 dev-java/bnd-annotation:0 dev-java/bnd-ant:0 dev-java/bnd-util:0 dev-java/bndlib:0 dev-java/libg:0 dev-java/osgi-cmpn:8 dev-java/osgi-core:0 dev-java/slf4j-api:0 >=virtual/jdk-17:* test? ( >=dev-java/ant-1.10.14-r3:0[junit] dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
+DEPEND=dev-java/bnd-annotation:0 dev-java/eclipse-ecj:4.20 dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 app-admin/pwgen >=dev-java/ant-1.10.14-r3:0 dev-java/bnd-ant:0 dev-java/bnd-util:0 dev-java/bndlib:0 dev-java/libg:0 dev-java/osgi-cmpn:8 dev-java/osgi-core:0 dev-java/slf4j-api:0 >=virtual/jdk-17:* test? ( >=dev-java/ant-1.10.14-r3:0[junit] dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
 DESCRIPTION=Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
 EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
@@ -8,9 +8,9 @@ INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
 IUSE=extra-webapps doc source test verify-sig
 KEYWORDS=~amd64 ~arm ~arm64 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.20 dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=dev-java/bnd-annotation:0 dev-java/eclipse-ecj:4.20 dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=9
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.88/src/apache-tomcat-9.0.88-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.88/src/apache-tomcat-9.0.88-src.tar.gz.asc )
 _eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=d1d7244b621e120803d898824af7259b
+_md5_=ed2ba1fa1e54f333abbfc5a150012f3d
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 0f885eadc27d..fef3990f6eb0 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-550.76 b/metadata/md5-cache/x11-drivers/nvidia-drivers-550.76
new file mode 100644
index 000000000000..26f6b8ee027f
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-550.76
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/m4 virtual/pkgconfig modules? ( sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig ) ) virtual/pkgconfig
+DEFINED_PHASES=compile install postinst preinst prepare setup unpack
+DEPEND=acct-group/video X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) modules? ( virtual/linux-sources )
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=8
+HOMEPAGE=https://www.nvidia.com/download/index.aspx
+IDEPEND=modules? ( sys-apps/kmod[tools] )
+INHERIT=desktop flag-o-matic linux-mod-r1 readme.gentoo-r1 systemd toolchain-funcs unpacker user-info
+IUSE=+X abi_x86_32 abi_x86_64 kernel-open persistenced powerd +static-libs +tools wayland dist-kernel modules-compress modules-sign +strip +modules
+KEYWORDS=-* ~amd64 ~arm64
+LICENSE=NVIDIA-r2 Apache-2.0 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
+RDEPEND=acct-group/video X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) dev-libs/openssl:0/3 sys-libs/glibc X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) powerd? ( sys-apps/dbus[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 ) modules? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+REQUIRED_USE=kernel-open? ( modules )
+SLOT=0/550
+SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/550.76/NVIDIA-Linux-x86_64-550.76.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/550.76/NVIDIA-Linux-aarch64-550.76.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-550.76.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-550.76.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-550.76.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-550.76.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-550.76.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-550.76.tar.xz
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	dist-kernel-utils	145861da258122cbba5240a850f1a5e8	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	linux-info	7ca3057b277f1e5978947b4cc289ce62	linux-mod-r1	137b318f89f77c2b66124fcc7790737a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6b01787cbc17a1ed440715e9f8d3aa82
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 7a788f86e38c..452cc413dfdd 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.24.41 b/metadata/md5-cache/x11-libs/gtk+-3.24.41
index 84cf2872a62c..c0b8f65350ee 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.24.41
+++ b/metadata/md5-cache/x11-libs/gtk+-3.24.41
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.gtk.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome2 meson-multilib multilib toolchain-funcs virtualx
 IUSE=aqua broadway cloudproviders colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
 LICENSE=LGPL-2+
 PDEPEND=gnome-base/librsvg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-themes/adwaita-icon-theme-3.14 vim-syntax? ( app-vim/gtk-syntax )
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/fribidi-0.19.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(-)?] >=dev-libs/glib-2.57.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-2.2.0:= >=media-libs/libepoxy-1.4[X(+)?,egl(+),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/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(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.44.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cloudproviders? ( net-libs/libcloudproviders[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) colord? ( >=x11-misc/colord-0.1.9: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(-)?] ) cups? ( >=net-print/cups-2.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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.14.91[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.32 media-libs/mesa[wayland,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxkbcommon-0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( media-libs/libglvnd[X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=dev-util/gtk-update-icon-cache-3
@@ -16,4 +16,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=mirror://gnome/sources/gtk+/3.24/gtk+-3.24.41.tar.xz
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	fc9e598eaac41c6ac9ed1a44bc004d03	gnome2-utils	30dbce54b89e77b86f366548f94419ad	libtool	5f49a16f67f81bdf873e3d1f10b10001	meson	92696988eaddba122c4cedc191f59bcb	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e50be7a1bb30c5c674540bea2c9961fa
+_md5_=fb967009fd7215c08a0567455d8e8253
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index a46a1d3ff063..a7d46132120e 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/dunst-1.10.0 b/metadata/md5-cache/x11-misc/dunst-1.10.0
index 1ce2d2ba006b..186fcd476905 100644
--- a/metadata/md5-cache/x11-misc/dunst-1.10.0
+++ b/metadata/md5-cache/x11-misc/dunst-1.10.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://dunst-project.org/ https://github.com/dunst-project/dunst
 INHERIT=shell-completion systemd toolchain-funcs
 IUSE=wayland
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXScrnSaver x11-libs/libXinerama x11-libs/libXrandr x11-libs/libnotify x11-libs/pango[X] x11-misc/xdg-utils wayland? ( dev-libs/wayland )
 SLOT=0
 SRC_URI=https://github.com/dunst-project/dunst/archive/v1.10.0.tar.gz -> dunst-1.10.0.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	c19072c3cd7ac5cb21de013f7e9832e0	shell-completion	bb7eb6bc232cd6c4bf8af739cdd2ee14	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=e719b5e9186c5e2526e7541d837e9741
+_md5_=a2c28a2e3d18ea56c7516591a21f9a6a
diff --git a/metadata/md5-cache/x11-misc/dunst-1.9.1 b/metadata/md5-cache/x11-misc/dunst-1.11.0
index d42f48896afd..f4a5382bbdc4 100644
--- a/metadata/md5-cache/x11-misc/dunst-1.9.1
+++ b/metadata/md5-cache/x11-misc/dunst-1.11.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://dunst-project.org/ https://github.com/dunst-project/dunst
 INHERIT=systemd toolchain-funcs
 IUSE=wayland
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXScrnSaver x11-libs/libXinerama x11-libs/libXrandr x11-libs/libnotify x11-libs/pango[X] x11-misc/xdg-utils wayland? ( dev-libs/wayland )
 SLOT=0
-SRC_URI=https://github.com/dunst-project/dunst/archive/v1.9.1.tar.gz -> dunst-1.9.1.tar.gz
+SRC_URI=https://github.com/dunst-project/dunst/archive/v1.11.0.tar.gz -> dunst-1.11.0.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=ddf4df46b90066288fe0bb84e0ffa66a
+_md5_=6c0969f9016f1a5639d60c5ba2f953ed
diff --git a/metadata/md5-cache/x11-misc/dunst-1.9.2 b/metadata/md5-cache/x11-misc/dunst-1.9.2
deleted file mode 100644
index be2e886900bd..000000000000
--- a/metadata/md5-cache/x11-misc/dunst-1.9.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig wayland? ( dev-libs/wayland-protocols ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXScrnSaver x11-libs/libXinerama x11-libs/libXrandr x11-libs/libnotify x11-libs/pango[X] x11-misc/xdg-utils wayland? ( dev-libs/wayland )
-DESCRIPTION=Lightweight replacement for common notification daemons
-EAPI=8
-HOMEPAGE=https://dunst-project.org/ https://github.com/dunst-project/dunst
-INHERIT=systemd toolchain-funcs
-IUSE=wayland
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
-LICENSE=BSD
-RDEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXScrnSaver x11-libs/libXinerama x11-libs/libXrandr x11-libs/libnotify x11-libs/pango[X] x11-misc/xdg-utils wayland? ( dev-libs/wayland )
-SLOT=0
-SRC_URI=https://github.com/dunst-project/dunst/archive/v1.9.2.tar.gz -> dunst-1.9.2.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=ddf4df46b90066288fe0bb84e0ffa66a
diff --git a/metadata/md5-cache/x11-misc/dunst-9999 b/metadata/md5-cache/x11-misc/dunst-9999
index bcba43fab9e3..3931a8c0e5c5 100644
--- a/metadata/md5-cache/x11-misc/dunst-9999
+++ b/metadata/md5-cache/x11-misc/dunst-9999
@@ -4,11 +4,11 @@ DEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf:
 DESCRIPTION=Lightweight replacement for common notification daemons
 EAPI=8
 HOMEPAGE=https://dunst-project.org/ https://github.com/dunst-project/dunst
-INHERIT=git-r3 shell-completion systemd toolchain-funcs
+INHERIT=git-r3 systemd toolchain-funcs
 IUSE=wayland
 LICENSE=BSD
 PROPERTIES=live
 RDEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXScrnSaver x11-libs/libXinerama x11-libs/libXrandr x11-libs/libnotify x11-libs/pango[X] x11-misc/xdg-utils wayland? ( dev-libs/wayland )
 SLOT=0
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	shell-completion	bb7eb6bc232cd6c4bf8af739cdd2ee14	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=316408eb6b49d575076bec0545807139
+_eclasses_=git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=e50aca02da497518f4c2e69b5ece97b3
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 498dcd061244..794ec01a6e6d 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/thunar-vcs-plugin-0.2.0-r1 b/metadata/md5-cache/xfce-extra/thunar-vcs-plugin-0.2.0-r1
new file mode 100644
index 000000000000..0f95c563e74d
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/thunar-vcs-plugin-0.2.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.32:2= >=x11-libs/gtk+-3.20:3= >=xfce-base/exo-0.11.4:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/thunar-1.7:= git? ( dev-vcs/git ) subversion? ( >=dev-libs/apr-0.9.7:= >=dev-vcs/subversion-1.5:= )
+DESCRIPTION=Adds Subversion and GIT actions to the context menu of thunar
+EAPI=8
+HOMEPAGE=https://goodies.xfce.org/projects/thunar-plugins/thunar-vcs-plugin
+INHERIT=xdg-utils
+IUSE=+git +subversion
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.32:2= >=x11-libs/gtk+-3.20:3= >=xfce-base/exo-0.11.4:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/thunar-1.7:= git? ( dev-vcs/git ) subversion? ( >=dev-libs/apr-0.9.7:= >=dev-vcs/subversion-1.5:= )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/thunar-plugins/thunar-vcs-plugin/0.2/thunar-vcs-plugin-0.2.0.tar.bz2
+_eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=90a4cb74b4a9546aa28f067d4c0e1e85
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 7ce0b1d83085..3b06ad371451 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 17308 BLAKE2B d6f0e1960300dcb206a4c928e0f5497ce5fdccacc5a0e5c2508a7af6e8f9498d7b9fb9ec3f5d3954053fc79e8414e01e57845b94cb5cd6f55794cf59ea3c0d33 SHA512 5f19269ff35bf881a2c86ab1b5ce45cd93f05493fcf48e1b653586b091edc5c0a54df7ffbf400b137990209ea574d0bf309d777111a8f29a227fc82a5ed91540
-TIMESTAMP 2024-04-17T10:41:45Z
+TIMESTAMP 2024-04-18T10:40:26Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYfp2lfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYg+JpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCLWxAApMZKO4RCaQI1ac8edFN60d9flrPhcrIrS+yjwi/ZdofHk8vzkyo8wM5O
-vlh6TqeuIPH+O3247TYZDk8j1wFNEPkSACJx7fUVCFGHOKs9svthqn0N+kMaov6h
-xSHtm3YLz9weS8QVlBt0j/NyMyy1BfHaKwc4E8qAcUCmoKtywI/7fpUXsV2pd5pU
-8Cdqkx70wBbGfn8A9DDOcLT/o64oY9XOM7Dakb2YFn/w+uRVS8nS/3jxD2YiYnav
-YaTXGQbll2iu+ijrO5Tkf8fxqHiqMdPYWuO/hHqfcZdV+iiiTMEdIoO67NbIkoVt
-kF9/Wp6Pzaw+axTKeiksLWK+QPW4BfhNBlP6k69t8IYjR/6v5CMJZVyDOcDb6qng
-FhaiYL8IPWaF6rPFYzzlujW7PhhaWpZXJM48eu3zEEmWY6J+yy+DDajSi/r0Uznt
-dnhKl5gbwgiWU5pKjlhIC4I0DcjhV8TeKHjNXf35IcuE3saPTuLogsEHKFaib7X0
-06D99lVRhPV8pwwQgkb9nNTpFmWysNbP2nU4maha697A9OvCptY+mL8j6wwwNrOZ
-KnkU5vm4oa7b+f5fyz0yKYVgh6PX2sR4puG543Mo55XcaydBbPwYWMb9tt4ldVup
-whsvxLMj/shs33Bhk6tWXQK5RyJGI3hjJq4M3zx4pDuk0UBaiBE=
-=m+3X
+klB38Q//Y6eF8GHYM+XFvdElK8PLUPMOuTmP1/D5FBsOG82kCFlaNLPrdKBNuPPs
+TGuE6Mw6gzl4Kqmkc2OSXdxb/siQTW+SS+NjRR8R7IUQxjA+1WE4IOM6ORf8Pfjj
+wrbtY+K0zhZkmIOa/wVJ1z5Z4cSmcCz6Nv3UKk0mcyonwezbJ1bqokR/ShzuqI2f
+oYnc+V4q4nqOqh0P0LbXM76/isaU0SrG+zgUPZWObmGMYVx5MxKVHv0y0g86tbxO
+UheY4EgF6Ukit7Koia8iSx2v1Qzks2jfoU6ZaZCvddFqVELM1aa2qfzGQZGtRXqO
+3sxlB2MN+r1xIVvYrXXBeILOC2/P2reXf5aDJZXdEcmEzna2GhLkhIWwc2FrpgcC
+uDJY+Vs7FwZzrN99saCc8jFKxr53/Lp8TjFeKH8tdvadlFqG6dpV/5PDrRZC6VHx
+uTqXIHV/5QnIMc1ttsj1l7Qj9lD/520s5WxH77kASC1wg0R0a+OfrGmvnyn9yWMx
+DySftD3Xt4EVeQKuxtv+2wTNoLrLS53QlI7mJbBvqzZQ/0bUSyQwJe3AsQ6anmbo
+jryCtEusjbGR4eQIJoFySBCTerZyISEKkbLQ7a9aIJUs6X/IOo9ab3AD9HmTVzWw
+wVNe7eevcajIa0gHdsOg/ZsAuPq8AqfZzBLDKfRLaIAseogr5Pw=
+=bE1h
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 50a5b5320265..6f2fad3383fb 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 17 Apr 2024 10:41:42 +0000
+Thu, 18 Apr 2024 10:40:23 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 732c00680a72..d3b9b7e14014 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Apr 17 10:41:41 AM UTC 2024
+Thu Apr 18 10:40:23 AM UTC 2024
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 9513c97d23b4..601502317ca8 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 17 Apr 2024 10:45:00 +0000
+Thu, 18 Apr 2024 10:45:00 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index b7c908fba810..3ffa81ca8c31 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-865b42c15b520af89040fd4a6e6e6c4cd54125c2 1713348964 2024-04-17T10:16:04+00:00
+3b33b304cb326d0ae48bea4ee244209c4231a652 1713435979 2024-04-18T10:26:19+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 2a48ace5479e..3d4df58eb2db 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1713350400 Wed 17 Apr 2024 10:40:00 AM UTC
+1713436801 Thu 18 Apr 2024 10:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 08c985ed928c..6f2fad3383fb 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 17 Apr 2024 10:41:41 +0000
+Thu, 18 Apr 2024 10:40:23 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index ba9d3bba5818..b168f47ab6aa 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index 0341f84f4210..42e1279a71d3 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -1,5 +1,5 @@
 AUX hydra-9.5-no-clobber-fortify-source.patch 516 BLAKE2B 9e1ac9293ffad6aa7d7ac6b0f2363f81fedc9459b5a084dbb5ffadc6704ccfac602172e4f58386364c60742bb1aef91d0ddb0000b9a8b7683a1ba273100ed1e8 SHA512 371c5bf962550cd33077b73a6e6413f51b24968c2d99ed25629b3e2ff483fa96428677c00093169f7424f713abe2845808d1197330e9a46535f657769d0a4c8a
 DIST hydra-9.5.tar.gz 833798 BLAKE2B 848c5b34719c2db98b3a3bee1c47e0b2ebeea668f5c387f015c7079f800cf0607a8cb5accba25ef2e253deb44422d51cf6e012c313496942a47468e0503000e8 SHA512 a8fe42d175d184cdb82072f3a963b956d767fa908aaf1cbbc0746b6a67cfd37f8b5e3ecf9be82085a7f6c1ef57e91a8bf05bfeb41e96708899b6c8d7f05eee06
 EBUILD hydra-9.5-r1.ebuild 3968 BLAKE2B 76ebe365f0371e55cdc34e85d79592d8c940ae1422e46a04518208b93c76dc44408324e517aed5bd794a26d28d63f45944e4f245d5bfedaaffd738173c682c7c SHA512 6e59e1c2b145706e677855a8b8b73e55fff3c860d58096e4ff9cfe952cc047a041b79f90d3dd60d9f738008af358458faf7eaab9fe43fba60944082c948e3338
-EBUILD hydra-9.5-r10.ebuild 3967 BLAKE2B 03da8d6c2450c86674cb51150049295d18d6aa122a4402bffd03975abe278eae84b380f8b9e44c05ea82562540b1e7b193cb346e1b05980d6095e773e798737f SHA512 256d521ea7c9d75575365df39931b131bc0b77b224ceacf7cd2dbf6caf3fc61cd233a83b272f9b63ba7d562f2dc4f84ebc3a5c765c92d94d25f0b0ba0e5ceb92
+EBUILD hydra-9.5-r10.ebuild 3965 BLAKE2B 6949b168409e437075f3012753288f97433c06b8d89fd7d3843490180a195eac7b897652a95b6d310d4e955c708ddc3df3e1b1b928155767509388814cb03240 SHA512 f9c805a65ccd96efa5858c8a49404a03a9cd5ea45e6f116e759d34bdd532e93c8b693903f95bdcc1e502fdec7b95c5db981186e5b9f0f8f05d95732c2de91156
 MISC metadata.xml 584 BLAKE2B c408a4a825d860594a10c6ba9a562a5fb96344f2a02a5d7ff12622c986ebb2ba05eeff5a7a3c79c09a437c14fc7024df33196ccd7f6566325f2f7920afe2d545 SHA512 e548b8600a0b3d9a548b963c1b3dc6c917606942f165f7c0859ad7e877c21dbe677c964d54f9548e38452170c4a3b4872ec81436100ec7b55123628bf4383da8
diff --git a/net-analyzer/hydra/hydra-9.5-r10.ebuild b/net-analyzer/hydra/hydra-9.5-r10.ebuild
index c24df6641725..0960ae6bf060 100644
--- a/net-analyzer/hydra/hydra-9.5-r10.ebuild
+++ b/net-analyzer/hydra/hydra-9.5-r10.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/thc-${P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug firebird gcrypt gtk idn memcached mongodb mysql ncurses oracle pcre postgres rdp libssh samba subversion zlib"
 
 RDEPEND="
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 39399eeff8ec..a9598bac7298 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index ae99ea17026f..05684594c60d 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -7,7 +7,7 @@ AUX nsd_munin_.patch 542 BLAKE2B 13ff49c41683d5bf505e257cd17bf5f3ad06662c00032d7
 DIST nsd-4.7.0.tar.gz 1289477 BLAKE2B d3949c8b65376ea78c700efaeb988acbfac5a5ba338f9bf29035176a7da6730ee8b7a2b6bfc5573ad178db80166ca74d71d313bf3d405acc666bf87f17dac63b SHA512 387e66993517c015ea49fc7a985c1f746623ae30a82bd01f224efbdb7c58d1d2f3e5a5a3574203959047876c632ec464b6682d1644f0e0f157ec0e6fb3f0cdbb
 DIST nsd-4.8.0.tar.gz 1273228 BLAKE2B d1e6a5e8fb158bb32081bc7674d957e3f5a596ed10ee89dd6a5f6af9a79a8c130f2de7070345bee69cb7798e9f373d856a9336a9e9f65f733ff45e15e94833ff SHA512 13c9cffffe6adfcbabf744ee2effebe6ae265d83476345a1edb60dc9c6d7f838a5e239e9b18e667924e5e76b74b2caac63818fcaecf7f0fa651ff21736174a46
 EBUILD nsd-4.7.0.ebuild 3223 BLAKE2B 7493eeff0fae1bfcb965aab5437cae7dc2fa6ff2240da6afa19e9088dc65800befd23972d33442952818d40d249377fb9d56ae3c4bc98d64ad0ba5a6102d1fec SHA512 457b48d3be50fe32837e706fd44700a65dc8a0a1772adcd23446c8332486315f94b63b59aa3ff89e13dc45211a8d8ac7248bb703dd76c533e2c4115b540827ea
-EBUILD nsd-4.8.0-r1.ebuild 3205 BLAKE2B 4ff848f7a9427fa6b5842699b2ca7e32c1e992033535a30cd43ed4eb16ef03b8e39e0adab2dfe851e9c4b29e754c1840fe0b106c04f6f8283e5ff2a7dbfb2193 SHA512 b95381071f8d3732c75d2cd17ae553af4623c4e7870ba2d9a52eab46ecd08fa763b795b144ab857563f4f4bcd458b59fdd3ee23d0e3f7915a4d2f205f42ce604
+EBUILD nsd-4.8.0-r1.ebuild 3204 BLAKE2B 415c180bfe12586b3649c968b1398e78f42a788eb2af34886c78b2b233c1696e810a4a3fe98608c7d12f22fb03c569aa0e3f352b8b4517ff3afb588a1c5da1df SHA512 f9319cf5d03a713068cd13d036890e44d04b2d787938a16574d71946dcf23cade65a1e7b33fd61bdd055f8eae4c47d9f1002f74868183e8dc47f60ee711c554a
 EBUILD nsd-4.8.0.ebuild 3160 BLAKE2B 5c26de437434792093091a55aa7106c4ae2921fdc696295752e0c6bf488f52458ce8a8bbb63a3b13a32327bf3198923eda4c2159eb803c178657e40d716ad78b SHA512 d8faf89d364d0896d591a62059d91bc9034be1052055e85650f663faaa5fc2912aafaf1ec81c33d6e4db55468ebcc61dcce1b3e520801e3a6f0cbff4dc12bf71
 EBUILD nsd-9999.ebuild 3162 BLAKE2B 41b1809b4714230e89c9633513fdce0f027b0bce3300a4167ee83fd7055741faf7aebca1b5ecbf47eae1e9b12284d9c43bd3f5ed2344549c77bac33f65ad58ed SHA512 1304030fead7260f40a7a1fe7e0b0172160f6fa407aa77e9e25eb32480cfa06bcbd40de174e1735a03df71d13a3fb0eb8781362492af14c74e9f2ac82babe6e2
 MISC metadata.xml 1048 BLAKE2B 2eda93b2f202fc8cb59a0c90914f1132515c7c86521b1791580ebc8d60da348e1fe2c4f522f0800696e9e8f36ac7e60a3f2da459be53ed51977ec36da7b018f2 SHA512 2d09782adfae14dcb00a2e2354ec2b361e35e81d83cb7fdd6ac72063f106e11fa2d89f6044d46b144e32c7015377ad547b1402df98b6ce7d04591f1ef4b71b70
diff --git a/net-dns/nsd/nsd-4.8.0-r1.ebuild b/net-dns/nsd/nsd-4.8.0-r1.ebuild
index 62663bcaf82e..fc6955f83a99 100644
--- a/net-dns/nsd/nsd-4.8.0-r1.ebuild
+++ b/net-dns/nsd/nsd-4.8.0-r1.ebuild
@@ -21,7 +21,7 @@ else
 		SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
 		S="${WORKDIR}"/${MY_P}
 
-		KEYWORDS="~amd64 x86"
+		KEYWORDS="amd64 x86"
 	fi
 fi
 
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index e52784cde5de..e1ed684dedb8 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 4af73589e4fc..2d4fb9f47b1d 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -5,11 +5,17 @@ AUX ldb-2.5.2-skip-wav-tevent-check.patch 606 BLAKE2B 9cfe1afd1adfca20e1fcdead2f
 AUX samba-4.18.4-pam.patch 900 BLAKE2B c2e07609d619a50086ac7727d714ae5bd9508b548f070b9c8193fa5ff4c2051b8f9ee8c3d636693746ae4b4a422add093a95bf3e713e7a4c9325fe6a8a2a2f4c SHA512 5cb997276a35ad6a188801deac7ccaad0e1b8c92f2070fcac62513ea371afc1d9d3414550d3c65726a4a813a4a619ada25063a6d7f145243873c1d9ed6d9690f
 AUX samba.conf 146 BLAKE2B d86e630dba5fcb3a0bb22ac6daf8b0f63d30903c31911353116bc7a63e3ba434f69fd2cbe7a854ab3dc994b95e630932dcbe556fdd6372d27cea5a15618aa816 SHA512 da9ae57a6740135745453e776040b1e54bb492b351a1aa700b8868ef2d1716c0d54b55400cd9b1b1877e065d896ca1569b5a617863c698676250d8ea29939a52
 DIST samba-4.18.10.tar.gz 41352009 BLAKE2B 191928a3b0b2ff203de83a208dd61ac047bc666b744b0ba16a8f9a7e2e072438e2980bf0096ac95cc44003526b2098e763a29b4317083a1e3192f7e3cae2ab85 SHA512 19fed2644b1cb5a5bddca6c7eb2da11b4faf224b060b52ac9131f321d194dc650ea3082051960253e2ce627cdc06ef396778fa0f95e3e9b79f74cd1422577d80
+DIST samba-4.18.11.tar.gz 41352059 BLAKE2B b2a39079286c5c0ca7beec99597ef6004c37eb81e7772b010c78b95b468b48d0370941717b8b919f0308e5313be4fc6a09374460eb2a0d2d7b26e3a8cea996d0 SHA512 7ae0f739070133c803fff3daf27ae2b0adff7336affb4898b07e5ca13bd6658228e8796565374e5a2c14e0b16ae84f404d3a62454096cacccc120520d379199f
 DIST samba-4.18.8.tar.gz 41335959 BLAKE2B d25711f1e781ed16fc224476979a07a5362f92ac943dd0bccfdf445434d0e6838281d5ceae27963267f914720ad6db647078520dc0e78c6ae652faec7d773e73 SHA512 2924c360f6299129527457547b13c1b282e2907a0ecde1036dbca894c752935d693914b4846a9eab436b33798c53c9974692e51fd071301b1174598be944a246
 DIST samba-4.18.9.tar.gz 41332779 BLAKE2B 8a0769c73d42b941b6f69d62243dd2b93d66748231465b853320cf1bf4b3dd8a912ac7bddfaa9c8b1941788951c2ccd630dabb23cf94965bc1d1e4cb5d74d123 SHA512 93a6c878bca583f59208df2a7865bbd453f7a65dc2f39a863797ef807bdeced4d632c5edd4579e341f8cf3b0b2fbe41e68a815a1510518bdd43e9a25a973c94c
 DIST samba-4.19.4.tar.gz 41839810 BLAKE2B b5916478d9385eff93d852b61eaa835e04eef7d813175b7011dfab518d3115707895a67f34fc4bb6afc2a1e3b2f60af8d30cd5a32b59d8ec48977c7eefd1b906 SHA512 9a66f685cb1b5b89c59c75ccb67292b3f792b40b30ca76dfc483e805f5bb680bac027117a28a117f42713452fca41c439bed1724ba7d436fe0b0cb30a34f5b45
+DIST samba-4.19.6.tar.gz 41847853 BLAKE2B 42a1756f3cb1cd48da5abe043357e15b294148b88fdcb2502394372628a17a729ffb5ea070a967face2dfb76e319cdf6fa56d611c369baddf54e998164d782ca SHA512 23172f4393deb9c520182ffb1acb3cf3e53391d4276fffe98527f2f514f969c0952e6e59bcd90f11385dc51367a7bb9cd0534fa9fc3814f16bfb88f41609d0f5
+DIST samba-4.20.0.tar.gz 42433302 BLAKE2B 97cdfdaf118fcd9b44aef0134d211e243a6e2468d90449b9c5ac55c9a8c4dc1e63bf9eb2be9878dc70609c830f90b08b4d1dbf80d7e947c10219043def970d24 SHA512 e820739706992ef3b4e3a7a771ad5d8efc6b87d5ccdcee7ebd41483d90fa3cc0420ba9680d059e71d7083c9c12b0d36deafcdce0224560f49bbfc3a277e7e77c
 EBUILD samba-4.18.10.ebuild 11530 BLAKE2B c2014cf1159a2315f5608e0f6e0dfaa6a32354fcd67fea923af9833dfd1b71b1f83f7f8a81e41bae0bca60f65e420cb610a1817ac3c0f59d83c38afe31b13a93 SHA512 895792479db3fc664bd969435e61044a9a5436e64501271b7c8711548ef1eb07f89196f1812efa7fb9ad9a9ff051199d90da7731dab05c7b37324a4a3cfdd36d
+EBUILD samba-4.18.11.ebuild 11530 BLAKE2B c2014cf1159a2315f5608e0f6e0dfaa6a32354fcd67fea923af9833dfd1b71b1f83f7f8a81e41bae0bca60f65e420cb610a1817ac3c0f59d83c38afe31b13a93 SHA512 895792479db3fc664bd969435e61044a9a5436e64501271b7c8711548ef1eb07f89196f1812efa7fb9ad9a9ff051199d90da7731dab05c7b37324a4a3cfdd36d
 EBUILD samba-4.18.8.ebuild 11523 BLAKE2B 1480d96d418d6f2ab8b96d09d57c38ef03d6d43accfca82757f4e5b1a1bc2050fd0a1f60cc31605b7fa27fbdca461415c7f8ece9efae835126a5a915e70cf069 SHA512 952dea0dd961eef3de6f842a31ef3f8b51746764b7f50a37709fa925a52e441f94443c3b62b37a4467059c18dbf3ffa43482aea3cabcf4e82e2cffacb9f8cbf3
 EBUILD samba-4.18.9.ebuild 11523 BLAKE2B 7825567877bfebeb584091463f5b9f8d9fa0d58f9f809b27e9bdb2782cf0c6f5aff949f2bf7c1e4560b2efd8182e8f659d013b8e56d9e83a865e3a19058fcc6e SHA512 41c3c08be796099419d97d36e882c2d8bafc0ef7afb68b8fdf5b6b07900ac7447c5c8ad2421e837a7c2adeb8ada9a1cf61ebd4b1093204b814d129e85ce5b9b5
 EBUILD samba-4.19.4.ebuild 11456 BLAKE2B 3e05dae4d56617c912543b6b5e6cdb0fa59d7e996d1ab6f9a49e00196b06642371f0fff54e10df838bdddf1376da9b64c3c00acac0c5b72a0e07b2751b3f80c3 SHA512 d310b274a307ca23e587fb853b4ca1d2f8f03576561fb298804765091301df000b833746844f9dbe0f3e970cb2d179b2a818b1fe7debdcb2f06a6d72590531f3
+EBUILD samba-4.19.6.ebuild 11456 BLAKE2B 3e05dae4d56617c912543b6b5e6cdb0fa59d7e996d1ab6f9a49e00196b06642371f0fff54e10df838bdddf1376da9b64c3c00acac0c5b72a0e07b2751b3f80c3 SHA512 d310b274a307ca23e587fb853b4ca1d2f8f03576561fb298804765091301df000b833746844f9dbe0f3e970cb2d179b2a818b1fe7debdcb2f06a6d72590531f3
+EBUILD samba-4.20.0.ebuild 11458 BLAKE2B f8b45daca7c6d1869c4859b6a4d66ec69dd252c5491d624439d28b12d9719ab4cafe4d1014730e23189ab2b5e6fc51032049d82a71fb0182b41af3ab6bfed9b6 SHA512 6611bcff2414ec421336c0b30ea318d46bd59eaeb1e451c1bc12ff6ae65d1a3c1b6d39084f331b429796e17f5131478528471671d9477aa21d600cff97f44f25
 MISC metadata.xml 2066 BLAKE2B 1d3a5757c3226cede70b5fabb63b27bf0a5b86bf27643a30ebfe743d0758e57ce1e69b14ba6795de4c656b3d5da5b3f9d90d11074520c24d6459220f62723b04 SHA512 0a7963f9abddd4cc3b303c93dcd4b7dc30ca5660e64750d77bcd3bce0a95291c46208d9a1143303c168febb2d65cdad0018c475130dc04c16d79df2019d8e9aa
diff --git a/net-fs/samba/samba-4.18.11.ebuild b/net-fs/samba/samba-4.18.11.ebuild
new file mode 100644
index 000000000000..aad41632fada
--- /dev/null
+++ b/net-fs/samba/samba-4.18.11.ebuild
@@ -0,0 +1,383 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+inherit python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info systemd pam tmpfiles
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://samba.org/"
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} == *_rc* ]]; then
+	SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz"
+else
+	SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam glusterfs gpg"
+IUSE+=" iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux"
+IUSE+=" snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind"
+IUSE+=" zeroconf"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	addc? ( json python !system-mitkrb5 winbind )
+	ads? ( acl ldap python winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	spotlight? ( json )
+	test? ( python )
+	!ads? ( !addc )
+	?? ( system-heimdal system-mitkrb5 )
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+TALLOC_VERSION="2.4.0"
+TDB_VERSION="1.4.8"
+TEVENT_VERSION="0.14.1"
+
+COMMON_DEPEND="
+	>=app-arch/libarchive-3.1.2:=[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/icu:=[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/libtasn1:=[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-perl/Parse-Yapp
+	>=net-libs/gnutls-3.4.7:=[${MULTILIB_USEDEP}]
+	>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.7.2:=[ldap(+)?,${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.8.0:=[ldap(+)?,${MULTILIB_USEDEP}]
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	sys-libs/liburing:=[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	>=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	$(python_gen_cond_dep '
+		addc? (
+			dev-python/dnspython:=[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		)
+		ads? (
+			dev-python/dnspython:=[${PYTHON_USEDEP}]
+			net-dns/bind-tools[gssapi]
+		)
+	')
+	acl? ( virtual/acl )
+	ceph? ( sys-cluster/ceph )
+	cluster? ( net-libs/rpcsvc-proto )
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	fam? ( virtual/fam )
+	gpg? ( app-crypt/gpgme:= )
+	json? ( dev-libs/jansson:= )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? (
+		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+	snapper? ( sys-apps/dbus )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl(-),${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:= )
+	unwind? (
+		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		!llvm-libunwind? ( sys-libs/libunwind:= )
+	)
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-perl/JSON
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	net-libs/rpcsvc-proto
+	spotlight? ( dev-libs/glib )
+	test? (
+		>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
+		!system-mitkrb5? (
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/nss_wrapper-1.1.3
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${COMMON_DEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-samba )
+"
+BDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.18.4-pam.patch
+	"${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch
+)
+
+CONFDIR="${FILESDIR}/4.4"
+WAF_BINARY="${S}/buildtools/bin/waf"
+SHAREDMODS=""
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+	export PYTHONHASHSEED=1
+
+	python-single-r1_pkg_setup
+
+	SHAREDMODS="$(usev !snapper '!')vfs_snapper"
+	if use cluster ; then
+		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS+=",idmap_ad"
+	fi
+}
+
+check_samba_dep_versions() {
+	actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die)
+	if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then
+		eerror "Source talloc version: ${TALLOC_VERSION}"
+		eerror "Ebuild talloc version: ${actual_talloc_version}"
+		die "Ebuild needs to fix TALLOC_VERSION!"
+	fi
+
+	actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die)
+	if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then
+		eerror "Source tdb version: ${TDB_VERSION}"
+		eerror "Ebuild tdb version: ${actual_tdb_version}"
+		die "Ebuild needs to fix TDB_VERSION!"
+	fi
+
+	actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die)
+	if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then
+		eerror "Source tevent version: ${TEVENT_VERSION}"
+		eerror "Ebuild tevent version: ${actual_tevent_version}"
+		die "Ebuild needs to fix TEVENT_VERSION!"
+	fi
+}
+
+src_prepare() {
+	default
+
+	check_samba_dep_versions
+
+	# Unbundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# Unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	# Ugly hackaround for bug #592502
+	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# WAF
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# When specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	# We "use" bundled cmocka when we're not running tests as we're
+	# not using it anyway. Means we avoid making users install it for
+	# no reason. bug #802531
+	if ! use test ; then
+		bundled_libs="cmocka,${bundled_libs}"
+	fi
+
+	# bug #874633
+	if use llvm-libunwind ; then
+		mkdir -p "${T}"/${ABI}/pkgconfig || die
+
+		local -x PKG_CONFIG_PATH="${T}/${ABI}/pkgconfig:${PKG_CONFIG_PATH}"
+
+		cat <<-EOF > "${T}"/${ABI}/pkgconfig/libunwind-generic.pc || die
+		exec_prefix=\${prefix}
+		libdir=/usr/$(get_libdir)
+		includedir=\${prefix}/include
+
+		Name: libunwind-generic
+		Description: libunwind generic library
+		Version: 1.70
+		Libs: -L\${libdir} -lunwind
+		Cflags: -I\${includedir}
+		EOF
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		--without-winexe
+		--accel-aes=$(usex cpu_flags_x86_aes intelaesni none)
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		--without-dmapi
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_enable glusterfs)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with regedit)
+		$(multilib_native_use_enable spotlight)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		--systemd-install-services
+		--with-systemddir="$(systemd_get_systemunitdir)"
+		$(multilib_native_use_with unwind libunwind)
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usev system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')")
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+		# bug #683148
+		--jobs 1
+	)
+
+	if multilib_is_native_abi ; then
+		myconf+=( --with-shared-modules=${SHAREDMODS} )
+	else
+		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
+	fi
+
+	append-cppflags "-I${ESYSROOT}/usr/include/et"
+
+	waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "Test failed"
+	fi
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+	# smbspool_krb5_wrapper must only be accessible to root, bug #880739
+	find "${ED}" -type f -name "smbspool_krb5_wrapper" -exec chmod go-rwx {} + || die
+
+	# Remove empty runtime dirs created by build system (bug #892341)
+	find "${ED}"/{run,var} -type d -empty -delete || die
+
+	if multilib_is_native_abi ; then
+		# Install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# Create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool \
+				/usr/libexec/cups/backend/smb
+		fi
+
+		# Install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (bug #603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		dotmpfiles "${FILESDIR}"/samba.conf
+		if ! use addc ; then
+			rm "${D}/$(systemd_get_systemunitdir)/samba.service" \
+				|| die
+		fi
+
+		# Preserve functionality for old gentoo-specific unit names
+		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
+		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
+		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process samba.conf
+}
diff --git a/net-fs/samba/samba-4.19.6.ebuild b/net-fs/samba/samba-4.19.6.ebuild
new file mode 100644
index 000000000000..14523d446af3
--- /dev/null
+++ b/net-fs/samba/samba-4.19.6.ebuild
@@ -0,0 +1,382 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+inherit python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info systemd pam tmpfiles
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://samba.org/"
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} == *_rc* ]]; then
+	SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz"
+else
+	SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl addc ads ceph client cluster cups debug fam glusterfs gpg"
+IUSE+=" iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux"
+IUSE+=" snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind"
+IUSE+=" zeroconf"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	addc? ( json python !system-mitkrb5 winbind )
+	ads? ( acl ldap python winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	spotlight? ( json )
+	test? ( python )
+	!ads? ( !addc )
+	?? ( system-heimdal system-mitkrb5 )
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+TALLOC_VERSION="2.4.1"
+TDB_VERSION="1.4.9"
+TEVENT_VERSION="0.15.0"
+
+COMMON_DEPEND="
+	>=app-arch/libarchive-3.1.2:=[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/icu:=[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/libtasn1:=[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-perl/Parse-Yapp
+	>=net-libs/gnutls-3.4.7:=[${MULTILIB_USEDEP}]
+	>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.8.0:=[ldap(+)?,${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.9.0:=[ldap(+)?,${MULTILIB_USEDEP}]
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	sys-libs/liburing:=[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	>=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	$(python_gen_cond_dep '
+		addc? (
+			dev-python/dnspython:=[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		)
+		ads? (
+			dev-python/dnspython:=[${PYTHON_USEDEP}]
+			net-dns/bind-tools[gssapi]
+		)
+	')
+	acl? ( virtual/acl )
+	ceph? ( sys-cluster/ceph )
+	cluster? ( net-libs/rpcsvc-proto )
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	fam? ( virtual/fam )
+	gpg? ( app-crypt/gpgme:= )
+	json? ( dev-libs/jansson:= )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? (
+		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+	snapper? ( sys-apps/dbus )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl(-),${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:= )
+	unwind? (
+		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		!llvm-libunwind? ( sys-libs/libunwind:= )
+	)
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-perl/JSON
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	net-libs/rpcsvc-proto
+	spotlight? ( dev-libs/glib )
+	test? (
+		>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
+		!system-mitkrb5? (
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/nss_wrapper-1.1.3
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${COMMON_DEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-samba )
+"
+BDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.18.4-pam.patch
+	"${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch
+)
+
+CONFDIR="${FILESDIR}/4.4"
+WAF_BINARY="${S}/buildtools/bin/waf"
+SHAREDMODS=""
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+	export PYTHONHASHSEED=1
+
+	python-single-r1_pkg_setup
+
+	SHAREDMODS="$(usev !snapper '!')vfs_snapper"
+	if use cluster ; then
+		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS+=",idmap_ad"
+	fi
+}
+
+check_samba_dep_versions() {
+	actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die)
+	if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then
+		eerror "Source talloc version: ${TALLOC_VERSION}"
+		eerror "Ebuild talloc version: ${actual_talloc_version}"
+		die "Ebuild needs to fix TALLOC_VERSION!"
+	fi
+
+	actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die)
+	if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then
+		eerror "Source tdb version: ${TDB_VERSION}"
+		eerror "Ebuild tdb version: ${actual_tdb_version}"
+		die "Ebuild needs to fix TDB_VERSION!"
+	fi
+
+	actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die)
+	if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then
+		eerror "Source tevent version: ${TEVENT_VERSION}"
+		eerror "Ebuild tevent version: ${actual_tevent_version}"
+		die "Ebuild needs to fix TEVENT_VERSION!"
+	fi
+}
+
+src_prepare() {
+	default
+
+	check_samba_dep_versions
+
+	# Unbundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# Unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	# Ugly hackaround for bug #592502
+	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# WAF
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# When specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	# We "use" bundled cmocka when we're not running tests as we're
+	# not using it anyway. Means we avoid making users install it for
+	# no reason. bug #802531
+	if ! use test ; then
+		bundled_libs="cmocka,${bundled_libs}"
+	fi
+
+	# bug #874633
+	if use llvm-libunwind ; then
+		mkdir -p "${T}"/${ABI}/pkgconfig || die
+
+		local -x PKG_CONFIG_PATH="${T}/${ABI}/pkgconfig:${PKG_CONFIG_PATH}"
+
+		cat <<-EOF > "${T}"/${ABI}/pkgconfig/libunwind-generic.pc || die
+		exec_prefix=\${prefix}
+		libdir=/usr/$(get_libdir)
+		includedir=\${prefix}/include
+
+		Name: libunwind-generic
+		Description: libunwind generic library
+		Version: 1.70
+		Libs: -L\${libdir} -lunwind
+		Cflags: -I\${includedir}
+		EOF
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		--without-winexe
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		--without-dmapi
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_enable glusterfs)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with regedit)
+		$(multilib_native_use_enable spotlight)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		--systemd-install-services
+		--with-systemddir="$(systemd_get_systemunitdir)"
+		$(multilib_native_use_with unwind libunwind)
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usev system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')")
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+		# bug #683148
+		--jobs 1
+	)
+
+	if multilib_is_native_abi ; then
+		myconf+=( --with-shared-modules=${SHAREDMODS} )
+	else
+		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
+	fi
+
+	append-cppflags "-I${ESYSROOT}/usr/include/et"
+
+	waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "Test failed"
+	fi
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+	# smbspool_krb5_wrapper must only be accessible to root, bug #880739
+	find "${ED}" -type f -name "smbspool_krb5_wrapper" -exec chmod go-rwx {} + || die
+
+	# Remove empty runtime dirs created by build system (bug #892341)
+	find "${ED}"/{run,var} -type d -empty -delete || die
+
+	if multilib_is_native_abi ; then
+		# Install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# Create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool \
+				/usr/libexec/cups/backend/smb
+		fi
+
+		# Install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (bug #603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		dotmpfiles "${FILESDIR}"/samba.conf
+		if ! use addc ; then
+			rm "${D}/$(systemd_get_systemunitdir)/samba.service" \
+				|| die
+		fi
+
+		# Preserve functionality for old gentoo-specific unit names
+		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
+		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
+		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process samba.conf
+}
diff --git a/net-fs/samba/samba-4.20.0.ebuild b/net-fs/samba/samba-4.20.0.ebuild
new file mode 100644
index 000000000000..bbddb3c9b0b7
--- /dev/null
+++ b/net-fs/samba/samba-4.20.0.ebuild
@@ -0,0 +1,382 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+inherit python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info systemd pam tmpfiles
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://samba.org/"
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} == *_rc* ]]; then
+	SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz"
+else
+	SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl addc ads ceph client cluster cups debug fam glusterfs gpg"
+IUSE+=" iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux"
+IUSE+=" snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind"
+IUSE+=" zeroconf"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	addc? ( json python !system-mitkrb5 winbind )
+	ads? ( acl ldap python winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	spotlight? ( json )
+	test? ( python )
+	!ads? ( !addc )
+	?? ( system-heimdal system-mitkrb5 )
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+TALLOC_VERSION="2.4.2"
+TDB_VERSION="1.4.10"
+TEVENT_VERSION="0.16.1"
+
+COMMON_DEPEND="
+	>=app-arch/libarchive-3.1.2:=[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/icu:=[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/libtasn1:=[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-perl/Parse-Yapp
+	>=net-libs/gnutls-3.4.7:=[${MULTILIB_USEDEP}]
+	>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.9.0:=[ldap(+)?,${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.10.0:=[ldap(+)?,${MULTILIB_USEDEP}]
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	sys-libs/liburing:=[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	>=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	$(python_gen_cond_dep '
+		addc? (
+			dev-python/dnspython:=[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		)
+		ads? (
+			dev-python/dnspython:=[${PYTHON_USEDEP}]
+			net-dns/bind-tools[gssapi]
+		)
+	')
+	acl? ( virtual/acl )
+	ceph? ( sys-cluster/ceph )
+	cluster? ( net-libs/rpcsvc-proto )
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	fam? ( virtual/fam )
+	gpg? ( app-crypt/gpgme:= )
+	json? ( dev-libs/jansson:= )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? (
+		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+	snapper? ( sys-apps/dbus )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl(-),${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:= )
+	unwind? (
+		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		!llvm-libunwind? ( sys-libs/libunwind:= )
+	)
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-perl/JSON
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	net-libs/rpcsvc-proto
+	spotlight? ( dev-libs/glib )
+	test? (
+		>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
+		!system-mitkrb5? (
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/nss_wrapper-1.1.3
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${COMMON_DEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-samba )
+"
+BDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.18.4-pam.patch
+	"${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch
+)
+
+CONFDIR="${FILESDIR}/4.4"
+WAF_BINARY="${S}/buildtools/bin/waf"
+SHAREDMODS=""
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+	export PYTHONHASHSEED=1
+
+	python-single-r1_pkg_setup
+
+	SHAREDMODS="$(usev !snapper '!')vfs_snapper"
+	if use cluster ; then
+		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS+=",idmap_ad"
+	fi
+}
+
+check_samba_dep_versions() {
+	actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die)
+	if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then
+		eerror "Source talloc version: ${TALLOC_VERSION}"
+		eerror "Ebuild talloc version: ${actual_talloc_version}"
+		die "Ebuild needs to fix TALLOC_VERSION!"
+	fi
+
+	actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die)
+	if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then
+		eerror "Source tdb version: ${TDB_VERSION}"
+		eerror "Ebuild tdb version: ${actual_tdb_version}"
+		die "Ebuild needs to fix TDB_VERSION!"
+	fi
+
+	actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die)
+	if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then
+		eerror "Source tevent version: ${TEVENT_VERSION}"
+		eerror "Ebuild tevent version: ${actual_tevent_version}"
+		die "Ebuild needs to fix TEVENT_VERSION!"
+	fi
+}
+
+src_prepare() {
+	default
+
+	check_samba_dep_versions
+
+	# Unbundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# Unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	# Ugly hackaround for bug #592502
+	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# WAF
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# When specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	# We "use" bundled cmocka when we're not running tests as we're
+	# not using it anyway. Means we avoid making users install it for
+	# no reason. bug #802531
+	if ! use test ; then
+		bundled_libs="cmocka,${bundled_libs}"
+	fi
+
+	# bug #874633
+	if use llvm-libunwind ; then
+		mkdir -p "${T}"/${ABI}/pkgconfig || die
+
+		local -x PKG_CONFIG_PATH="${T}/${ABI}/pkgconfig:${PKG_CONFIG_PATH}"
+
+		cat <<-EOF > "${T}"/${ABI}/pkgconfig/libunwind-generic.pc || die
+		exec_prefix=\${prefix}
+		libdir=/usr/$(get_libdir)
+		includedir=\${prefix}/include
+
+		Name: libunwind-generic
+		Description: libunwind generic library
+		Version: 1.70
+		Libs: -L\${libdir} -lunwind
+		Cflags: -I\${includedir}
+		EOF
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		--without-winexe
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		--without-dmapi
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_enable glusterfs)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with regedit)
+		$(multilib_native_use_enable spotlight)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		--systemd-install-services
+		--with-systemddir="$(systemd_get_systemunitdir)"
+		$(multilib_native_use_with unwind libunwind)
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usev system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')")
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+		# bug #683148
+		--jobs 1
+	)
+
+	if multilib_is_native_abi ; then
+		myconf+=( --with-shared-modules=${SHAREDMODS} )
+	else
+		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
+	fi
+
+	append-cppflags "-I${ESYSROOT}/usr/include/et"
+
+	waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "Test failed"
+	fi
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+	# smbspool_krb5_wrapper must only be accessible to root, bug #880739
+	find "${ED}" -type f -name "smbspool_krb5_wrapper" -exec chmod go-rwx {} + || die
+
+	# Remove empty runtime dirs created by build system (bug #892341)
+	find "${ED}"/{run,var} -type d -empty -delete || die
+
+	if multilib_is_native_abi ; then
+		# Install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# Create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool \
+				/usr/libexec/cups/backend/smb
+		fi
+
+		# Install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (bug #603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		dotmpfiles "${FILESDIR}"/samba.conf
+		if ! use addc ; then
+			rm "${D}/$(systemd_get_systemunitdir)/samba.service" \
+				|| die
+		fi
+
+		# Preserve functionality for old gentoo-specific unit names
+		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
+		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
+		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process samba.conf
+}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 14dc1d79a2c0..abece3082ad0 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/discord/Manifest b/net-im/discord/Manifest
index c257a2eede20..b23a5b760e21 100644
--- a/net-im/discord/Manifest
+++ b/net-im/discord/Manifest
@@ -1,3 +1,3 @@
-DIST discord-0.0.49.tar.gz 101238886 BLAKE2B f39af3bb1db0efbe26627091b416467f7a5f52ef212215df4d0d5ee1a0d6c1909571119edc0e1623cfaf8f94e71f05276e14ca740bf1d4f27491862aee51c0d7 SHA512 b8b1509c31e4c237255d678bbc3e8c4d0cd8b3731050b732e149399f8dda8abb12a46ad9ea3e718016f430ebfe17f88629d0964fe1266efe8b4cd20a2f9abbce
-EBUILD discord-0.0.49.ebuild 3517 BLAKE2B 376f475de1231064440fa4508621101f2668319cc0d1b91592bfed39e5673994fc2c7a6fbd4e8df88e301d17ca6975e75cb2a5ecc0db591ad608235ad29769c1 SHA512 2e7678d3c65b235ec6d955e13af6b73447a1e32cd79592bcca1948ab232cb5f6f270cc6cc61c8f356f9c32ad539d9920f613d2df749590fd9498a1195532e751
+DIST discord-0.0.50.tar.gz 101523210 BLAKE2B 7ebbc99d1145bc1719d8297d5a1d39aad7b65bde53359973662293f21b92884ca692c217166c4d7e274799dbe345eab682083fa5c55b049a8413e8ca64274286 SHA512 8e745436645ab8aa3fae582e125224b81c8556b74b40476ead337594f377fab95684a96287c53510d3838e948a64e0397f07ca8a76f6d99cd243af6a06080873
+EBUILD discord-0.0.50.ebuild 3517 BLAKE2B 376f475de1231064440fa4508621101f2668319cc0d1b91592bfed39e5673994fc2c7a6fbd4e8df88e301d17ca6975e75cb2a5ecc0db591ad608235ad29769c1 SHA512 2e7678d3c65b235ec6d955e13af6b73447a1e32cd79592bcca1948ab232cb5f6f270cc6cc61c8f356f9c32ad539d9920f613d2df749590fd9498a1195532e751
 MISC metadata.xml 506 BLAKE2B ff098a1c9341a94ebb21da57c3028d3d96e884e19e3adf2df8d50b694a1ca3eee61f5dfd90eaa557a0a0eee769fd11dfa7bbf63308386a11faa56d13687e33c3 SHA512 56baf0a5323057b4af83a7b7d760b2b1e071e15ca4eef6546eab4104fbdd026906f68d8023a3155f492d8d93cd7022c5d0017372cbaf2894b94bd253b2ce3665
diff --git a/net-im/discord/discord-0.0.49.ebuild b/net-im/discord/discord-0.0.50.ebuild
index fefed5b524d7..fefed5b524d7 100644
--- a/net-im/discord/discord-0.0.49.ebuild
+++ b/net-im/discord/discord-0.0.50.ebuild
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 962d2fc0b3ad..0fdd8574c981 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 40afd04d3d6a..2fa7ed5966b4 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -2,5 +2,5 @@ AUX b9638e2418408be4906752297e700506766dcf20.patch 696 BLAKE2B 5a5cde5acee207004
 DIST gnome-online-accounts-3.48.0.tar.xz 382964 BLAKE2B 9b64329415118ca3d44f4662db31d82f262c27b4d8cda8ba9eb05b8e606081ae3eb06b5bf691c165b9bb7cf984fdeba8389390d72a4b3595a7d39b1d6ea11df1 SHA512 67e6c39d38187dc58175f6b694c66a92d9b9152b179db41ee05a8c512db5b16f1dd1eb1503c7d732b09126942abc00206ba956f7a54c6ae7a285a9e3101be7a5
 DIST gnome-online-accounts-3.48.1.tar.xz 383124 BLAKE2B a9e18bf034454429a84be0920110f4d74fba9462fb1f7f23e74f304e963323413d99af2d84caa9ef1c6841917f5b8249ac94dc433ba04546f2ae23d6268dcd70 SHA512 8f191994b8f38bee4b922b10b94e96d6f7cb323de0e9a1f29febea848cb2002320357262ccf6f28839e32e9216faeb28a871f878e1ad9478c61650fdd3549737
 EBUILD gnome-online-accounts-3.48.0.ebuild 2001 BLAKE2B 31777257e4d72208c86dc295a7941f942aa9e35ca7b5507561dfd10a1045fb7c632e0c2926d08e903a2d30fa4524153c367fb0980db9a24c10a62d4319364e5f SHA512 833d108ad7a5b4eb530218f7981a1d60bc3fca5cfeab583a7df877d03589218a7a7dfb0ff5bbab5ea981822f66c2ac2ab3894d172af753eeb425bb76a2a9813a
-EBUILD gnome-online-accounts-3.48.1.ebuild 1894 BLAKE2B bc21599a6a6bf7b5828f5bc6408dac2533e50e3e7381acc5ffc09551930d15c31d5309f443a1ceb68c59998c86bc1265f27b5687de88d5657fddf5ce1a8fcc1c SHA512 10780567e092961ebdf2a51f69e51c1fb20da49bdb86d9ae6b40812dc6c6ccd65bca193d26929caf57634719a998f9b101ea94397295be40e62893d45cf4d82b
+EBUILD gnome-online-accounts-3.48.1.ebuild 1893 BLAKE2B 02d3810304f050b48df6e17c770aac35dddfb09e175b2c5be1eed4eab39a758256c4986f1626ff8e9d1ae3e1d35a525fa13b74118f0a7cca375a568a89423b2f SHA512 29cc129d6f0c88c5c720022f5ed5052b019cf7e1c9d3b95c7f2702f481e05bdb1946c51744a147442aeefd8d6a8dadb1e1c70ae352e82305b6f12a93f21c61ae
 MISC metadata.xml 497 BLAKE2B c9f25a548f7d6c51efc6dcd12d2c23ce4121621bccd62b0dd29ea9c83170eb5d91ccdb208362c7d4a246207162bc34f5c9f447baaa079b46a848c64ba26ee9a7 SHA512 9950752a3f1465eca98bc46d691ec3105f9d6806449923189884028e4d591977b2840f515348b948985cc75ec9e389155d4a54c2a460e4fc6c757ca30ad466bc
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.48.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.48.1.ebuild
index fb2fe09f3a14..742566f97ee1 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.48.1.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.48.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
 
 LICENSE="LGPL-2+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~sparc x86"
 
 IUSE="debug gnome gtk-doc +introspection kerberos man +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 1e6f8f079e8d..47998de6a0d6 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,4 +1,3 @@
-AUX gnutls-3.8.1-fix-gnutls-header.patch 1432 BLAKE2B 019f3e720c3f4f72cbb022fcef53b6a0ab1ea41fcd9080bd2d4ea0cc8ef786250c869245cc71605364a0b899c1e9b6f136a53d3246ab991827750572017d0e40 SHA512 a763fffcd8abc828a194e1cc4162231992e5c961a693bf314c5fb8cdf338a9cca062c0113ba7a1cd81f6560adb9a1f9de131551d94c4805978abc50fabaec245
 DIST gnutls-3.7.8.tar.xz 6029220 BLAKE2B 0a21e63c7cb0ba4eeff23593c7282e0b4d704fa2d2a1cd5289998fd04b58ea36fc343f872225ad05478e278b1cdebbcd0fd376459abcb58547f8fa1488485530 SHA512 4199bcf7c9e3aab2f52266aadceefc563dfe2d938d0ea1f3ec3be95d66f4a8c8e5494d3a800c03dd02ad386dec1738bd63e1fe0d8b394a2ccfc7d6c6a0cc9359
 DIST gnutls-3.7.8.tar.xz.sig 1250 BLAKE2B 66c6a335c3b2290a4e44ffa6ae715ad71d2bcd7df485c1d2d9490985d9dcd445768d6eb021ad3a61614431183c6652254c63ebd8abd0f0a03d3164a6193b6192 SHA512 cecf9843e8683a278d065b663dc98ac2b5fcad1905ee25333038c93c2289b518c974629367e77e66552ac1c9d122d551616edba35cb0c4204202ec676f1a2db7
 DIST gnutls-3.7.9.tar.xz 6377212 BLAKE2B c8263381132b0c96f23a580823cfaf57112056876e5f2cc21aec4eeddec641b0c01fa02ff9493ea686f49fd917190b06f89379eb448a510cf4d50fe3a0742851 SHA512 56ccbab5f214f9e3cf10a43dd90dedc1e10a38d08b8359a4305dc05c59ddb4a1d3680b282077b6446605c31675a4261cd0579c2c0d976e0b2ced02e6dba224c1
diff --git a/net-libs/gnutls/files/gnutls-3.8.1-fix-gnutls-header.patch b/net-libs/gnutls/files/gnutls-3.8.1-fix-gnutls-header.patch
deleted file mode 100644
index b3d10c1788f6..000000000000
--- a/net-libs/gnutls/files/gnutls-3.8.1-fix-gnutls-header.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://bugs.gentoo.org/911872
-https://gitlab.com/gnutls/gnutls/-/commit/abfa8634db940115a11a07596ce53c8f9c4f87d2
-
-From abfa8634db940115a11a07596ce53c8f9c4f87d2 Mon Sep 17 00:00:00 2001
-From: Adrian Bunk <bunk@debian.org>
-Date: Sun, 6 Aug 2023 22:46:22 +0300
-Subject: [PATCH] Move the GNUTLS_NO_EXTENSIONS compatibility #define to
- gnutls.h
-
-Signed-off-by: Adrian Bunk <bunk@debian.org>
---- a/lib/ext/ext_master_secret.h
-+++ b/lib/ext/ext_master_secret.h
-@@ -23,9 +23,6 @@
- #ifndef GNUTLS_LIB_EXT_EXT_MASTER_SECRET_H
- #define GNUTLS_LIB_EXT_EXT_MASTER_SECRET_H
- 
--/* Keep backward compatibility */
--#define GNUTLS_NO_EXTENSIONS GNUTLS_NO_DEFAULT_EXTENSIONS
--
- #include <hello_ext.h>
- 
- extern const hello_ext_entry_st ext_mod_ext_master_secret;
---- a/lib/includes/gnutls/gnutls.h.in
-+++ b/lib/includes/gnutls/gnutls.h.in
-@@ -542,6 +542,9 @@ typedef enum {
- #define GNUTLS_ENABLE_CERT_TYPE_NEG 0
- // Here for compatibility reasons
- 
-+/* Keep backward compatibility */
-+#define GNUTLS_NO_EXTENSIONS GNUTLS_NO_DEFAULT_EXTENSIONS
-+
- /**
-  * gnutls_alert_level_t:
-  * @GNUTLS_AL_WARNING: Alert of warning severity.
---- a/lib/state.h
-+++ b/lib/state.h
-@@ -110,7 +110,4 @@ inline static int _gnutls_PRF(gnutls_session_t session, const uint8_t *secret,
- 
- #define DEFAULT_CERT_TYPE GNUTLS_CRT_X509
- 
--/* Keep backward compatibility */
--#define GNUTLS_NO_EXTENSIONS GNUTLS_NO_DEFAULT_EXTENSIONS
--
- #endif /* GNUTLS_LIB_STATE_H */
--- 
-GitLab
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index f5808596b703..2f7eac6465b2 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -6,5 +6,5 @@ DIST gupnp-1.6.5.tar.xz 163380 BLAKE2B 92c29db56a0fe9596bb0c523fc31be0783d6cf95b
 DIST gupnp-1.6.6.tar.xz 245860 BLAKE2B 9cf9bb4a61e224f74aff18fb4d4491f7e9cb36cf812709b74a8c08581954d82c3c6e59d2b46cac517685a0d191846fbdb6690ac79cebc77a26b6a7d1347f3ae0 SHA512 6721f7dfda273074255e1b418d244eba72a24976e1407fdbaf24fd15a8c15a7a6d389690131563aa1f3b15fdeefb2e100da494c04c6c8e29201d402f072fcbe6
 EBUILD gupnp-1.4.3.ebuild 2328 BLAKE2B 551160f7d1ce7ed984fc20273f83ee3bfa952bd3045dbac39be2a8e70c5eb20c724e5bbf05f81dde0c8b1a0da77ff153e1f369e34509a4eb0629e109d32c2d9e SHA512 9657d0fcfecb5cb110970db70bf701426e2d71420b3c1a93a6a2a8de197c6cbb9b5c11403d9b556354eedf8d5074ea5f30823167e7a2c2cdd6a5540819624031
 EBUILD gupnp-1.6.5.ebuild 2295 BLAKE2B 5cd3b1b0b034043c19d967f0ab1440e5642ed30a6ddbed0e12d27f415e5f7f580bb8edf3bc43307410458ba0d67efcaf268e5df2e4580fc427a1b0d2615046fd SHA512 31d4f5f15886acf5d1c98df9959983ccdb7bfa8a83acc19446fc123cd398b4c3d111eaab42f3f4a4dea455977320d0f6c62031e8d64c1ae0e0657ee88383a477
-EBUILD gupnp-1.6.6.ebuild 2355 BLAKE2B 37b4fb61b0bbc4f527152f6be3c5f8190702ec35e18f2021f4d039763ac5f0f66f316c8e7acfe93c4948980da8cd4ef295ea3e24caf784cb0b1e831cf50260c7 SHA512 ec54d39bacbb04045ff2f8eafe61222e652ac1f489208bc06f14b59de88059eb3b3edbf33ef11080c1bb135c22f9a72bf034fcf643ed6b4c05e2815bd58b46e0
+EBUILD gupnp-1.6.6.ebuild 2354 BLAKE2B cd9842d3efd882e071b73bcebdb60a41e33ba51cc7cc6e9ffba44899f8937adcbede6f2dea4d058dfe82d474a829a1dac1ee999b9147b5f210be3698b58f8ab2 SHA512 204adcedc2b935620be213c4830e04490d972778482b4fcb3da048e14b5a44a8e57d6ea21da0c774e98df7f6931ec27e085f6c1398281c20693d2a31be2fea79
 MISC metadata.xml 346 BLAKE2B c0c2d7c5a0f1906cc1789a30daec476919e7332f2a8aed9ec78e824be2776e7a18202b8fe19e519340cc9437d4147e223eb6830460c2a4c499cd483c77524cd5 SHA512 84998e9f5ebf374d1bfea85f7eb4b89f8459ee62ec89dc8b9bd36de354a307ad854cd7521eecd31b410659d5128a4dd9545ab7037eb5b7f8b41efdb8054b9b2c
diff --git a/net-libs/gupnp/gupnp-1.6.6.ebuild b/net-libs/gupnp/gupnp-1.6.6.ebuild
index 21125194bdee..17ee0dd39514 100644
--- a/net-libs/gupnp/gupnp-1.6.6.ebuild
+++ b/net-libs/gupnp/gupnp-1.6.6.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/g
 
 LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+
 SLOT="1.6/1.6-0" # <API version>-<soname>
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="connman gtk-doc +introspection networkmanager +vala"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 5da7511e80d5..b54c1d520808 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -9,7 +9,7 @@ DIST webkitgtk-2.44.1.tar.xz 36280696 BLAKE2B a5fff4c4fe90bcd0ea098930e51a36ea60
 EBUILD webkit-gtk-2.42.5-r410.ebuild 8354 BLAKE2B b9d9d8f58c0e1d0f5676c1f1ec30aa8967f84cc9cc7f12422d61120c4bea9fe1f8bf0aaf4f4ebbb0ec71b3d9146f4444dd513d5ea7e5de6df37658a511843c17 SHA512 079ccfa5fde801f5d9ae5eebb98d624f488f5d4ea04e64a029e3e3bde3df1cf7df5b067c740063070f1b35c200c5965ec72444bd75f5969154db25aab7806db7
 EBUILD webkit-gtk-2.42.5-r600.ebuild 8251 BLAKE2B c64822cc8aebe1fc31fe70a43a34261d7ee121a3f518e1d5e2cbfb91b9e41717196377de57535f8aa547be689f082de653643a4f1f7e8e5c36ce8f5af5276aeb SHA512 d6dc05ee61b7bb0e6db90671337b5436ecc3884e94a8e750f4c55e2b06339dbbe92904d0d1cf515303ca4e2809b3464eda70c16954a90bf9d9569bab9b358a5d
 EBUILD webkit-gtk-2.42.5.ebuild 8080 BLAKE2B ec3c77f34c528e4e81e6a292db60f69bd6ea31ee3cfaea3c4ea91e9196bac5c18b663821ec5a403968d7219bf3f0e54429d9d598502afadb4b173703237971bc SHA512 db29fb92f5cdba3aef6e60dbd7d29580403ca93c095e7d022d39b8c8d5978536002fc23549fc73e0993c2430beae79101bed2a13832c1c7f7b06701838296e39
-EBUILD webkit-gtk-2.44.1-r410.ebuild 8157 BLAKE2B 15d99c621bf281c543f0a83e5f8b5c13899a1468b65cda2a5de11cf8da335990c99dc063bc3ff1412432b9b4474dca17d03aa0dc9d64ca4f43f31c730827b3ae SHA512 7935d0e5faf57f3713299ec9116f8ecd511b5e3e24b23830cbb9f9c5bdd507878ab5449b7fb8b230ed500366a0e2a93d59c8fc942806555eb1be4ae34a5e72e6
-EBUILD webkit-gtk-2.44.1-r600.ebuild 8850 BLAKE2B c230f13f7115d989e19d409aa6c88a2e791c7c0a2c708f11ae8b927642b0f04953166b94a3ee961df2877f6ab065f3183f23d72c265f3b1d633783c18c820c55 SHA512 e1c130f7b6c50eced3deacdda796d23e3a77e8be3f52855858bedb463bac3abc9c719ef8c46be7b4bad1c5fd7e25344b98d34dc299b52a818e0b387725b732bb
-EBUILD webkit-gtk-2.44.1.ebuild 8005 BLAKE2B 705f7e86dcfa05ee19ff5416daedbc4fb3a88f4a54149af66222a24f4e668072fac78ef7547344adeaa732666a5a432165e2d612c5dad45458abbbd47c511161 SHA512 a14e58fd1ba0d84123d05660b0188b1c89212cf3e1b8433136bb1551e09543de255c8251f797968e38167938d7ce380b8dc05f07e4540c5a892ff8c853241673
+EBUILD webkit-gtk-2.44.1-r410.ebuild 8156 BLAKE2B 5a94d6f8f71ef6e000cb859825439fe9b011b4956e053c5d787e9538b094d02f21757d1d4f8931e0ca28bfc632c263cba82c08b6fb79daa3164a6ecf50cb45d9 SHA512 b204420c3b558c1a6949c84104e96827273b7075878021731c7e2a9a50c334286bed8b50177a6aa054283e00505675a1f0651460885fdaa8687d96f1a7b4bcf1
+EBUILD webkit-gtk-2.44.1-r600.ebuild 8849 BLAKE2B b9a38c961f7fb325228bea5d2515ad84fbc1367ffde6b62d74321925570402c0e5d50dd6856954f427f171d646b1b67fe3a5e2e0e92d4adf0fc1daa63e0dc707 SHA512 eca1c6819d52e464da703cc9a3af871396a688737ccbac30ce5d3aa6413a9c20cf19180ba8b349989df7454e753e67b4c73ef223d0c6978ad7d1e805b0a9d255
+EBUILD webkit-gtk-2.44.1.ebuild 8004 BLAKE2B 5dd8bc56901c32022a5995c9d4fd21604255f11144179493ab136cb75795e8a1f43a6f2199971629e47ac8393496aa35ae946dfb682c2119b91e622d0e379e35 SHA512 39bb937147d3284350c4f90648612f3a0b6fc5f0a98666b8b5be4f88ff1e9fd3f2deaa97c9651173cd39992b5cb7fe2ce444857af3e8c7d4b81ca1ffc5391dba
 MISC metadata.xml 615 BLAKE2B 5527ca0439e337193601d221df1b5f9b85c6f4ea0b0867fe8ac0548307672de45fe956fe61c0044b778644c8079271eba565854ab041ce45738dd98a9b3db39e SHA512 4681816de7821ede7c252e62a4cb29ee5c6e88f1799972a7325b40ed1998f9462835ca38c42dc65eeac4c0bcb0d672593af857fcf442cced865bdfdefe063eb1
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild
index 41098cceb03b..bc40ebb5aca9 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
index b1f209c670fd..7777c042a3c6 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild
index 508a5427c0ab..ab20e5f173bb 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 0f0126853128..f8e57a31a529 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index c21829fcf650..66d581cd347d 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -8,5 +8,5 @@ DIST mu-1.12.4.tar.xz 715232 BLAKE2B 5886f07ad6fb12d8a538de80c4681cd2ba416da8283
 EBUILD mu-1.10.8-r1.ebuild 2196 BLAKE2B 94f794bd3be0a72cb038225aa78644258a85558aba0db46d9f0b3604b34f20111dd3f76e87a2925d619068d48bf5e07c26861ea1674f23e74aeedeb89ef36248 SHA512 b6a997cf017581293c6b0a28f1b74938edff5f50571a49b56a00cd5877b0d738b6f3f12b185668640fa4862950ce42ff8994b54a607eb6f8ee2a3142d31fe686
 EBUILD mu-1.12.2.ebuild 2383 BLAKE2B 258e8bbe267a97db89f934dcd6135f9912c04620c15a50ba46b2f5328e4fadfa2b8ac1df1bc2e83f35f0e4f43404744670c1f1583243b82821fa45363af09235 SHA512 97654240ea9c1db7c695724442c4d83fbdf8207425333df5dcdaea4039d3e13e16dfc12d9d888f3cab4f404b9d1cac32e8c9fb33a7ca7be5525535d2d6b58f3e
 EBUILD mu-1.12.3.ebuild 2420 BLAKE2B 3a6a5a57787475abf2a24a71e643054c81ff2514e3d3ba94498d0806f34232fb3266540bd5836e87daeaf6cc8941c5ea483b19f2aba8c6e628c30be66c24bc3c SHA512 4d429208cf30de5d7da13f75293a6234adf95d77bb77c8a44625a2f4d67c755343c7f9929cb6cc8a029cf4390cd994834c0d53748390a70169273f7748748022
-EBUILD mu-1.12.4.ebuild 2290 BLAKE2B 2bce26b9d77d67712ccc8025945cb0e9ef7edf2bcc3d0ede07f3753d1ce54b4ed742235cb6c700dbdf0caf9d66b74ec6df3819b8785b22efdd24d1286e3df3bc SHA512 f09876f6f835564789b1eec59a874ffb6bd6e4737589e0b3ea79384cac3b14db24ff457efcc18c5d782b45b58ed3e012d9d38d6f2f135abef9f2d6ff995f9e80
+EBUILD mu-1.12.4.ebuild 2289 BLAKE2B cc78e46ca6533adaf7bb88b3fabfb5fbabf09b1dad4917f7e3ce8d65cf687ad53c09889374b828e91610e3ca5cad01a691340c2d4a312a402a7bdfcb7dc7c277 SHA512 c7d0e6354f65125df4c70e57d5bcefa479c86ad384c322357a57993f6fa070c229b78681fbe68ab6a6b161502a0e6d360a03d5e56f9dc6a20968e5cc052c5abc
 MISC metadata.xml 893 BLAKE2B 4d21c0794fc184957939ebaab628b9a1abe0bbdb63915157e266ce0a773fe3acc52722d010d3b4e096f86257e945c0f9dd51cd0dbe54c37f717408ffe942bc06 SHA512 7f499e039820d12c9acd0affe2a402fc53ee6367684a3c2ba25669987f02b0fabb3db0de978e197876bd9e3af315734af398ba7c8305119c511d59c709b6e225
diff --git a/net-mail/mu/mu-1.12.4.ebuild b/net-mail/mu/mu-1.12.4.ebuild
index 974051ec7307..428a84148a90 100644
--- a/net-mail/mu/mu-1.12.4.ebuild
+++ b/net-mail/mu/mu-1.12.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz"
 # + variant-lite: Boost-1.0
 LICENSE="BSD Boost-1.0 CC0-1.0 GPL-3+ MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
 IUSE="emacs readline"
 
 DEPEND="
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index bde016365bce..3dcffd035229 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index adb0fb6c4286..f49b1843ffff 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -4,10 +4,10 @@ AUX freerdp-3.4.0-incompatible-pointer.patch 10251 BLAKE2B 70a23022ff8db7dcf0ada
 DIST freerdp-2.11.5.tar.gz 7330372 BLAKE2B 53adf40ca8f6c226f93cbc4599d857170bed2cbbe233860f52b30416b3a5d15c1ef2268c329790553dd1dbbcd93dedd834e5b62f67128029e551083d1053b357 SHA512 152dfef2783283ef703eb28ebe4d32fb02519ee6de9042b124af34395a2a6db36bd4cf1e96200ba3e93acf06c245109413e3e36e6143ed4409bd90ede6c383bd
 DIST freerdp-3.4.0.tar.gz 9331562 BLAKE2B 888d6c5786c7b3c5eea89e41bca23ef2b323377b8115c5f5bfd0dd38e5ed2d3701ffc7603e4aa4253e9116804a12268f4b59dadeb2f60f5c39e8170e78ba6bd1 SHA512 b69f2a2a5f6c70b4a21f0768ce2050020af47b83a3cf06d3b3b46a0e6aa7c062ed2b9de04782a8d6651002ded4c267f8653dfdc2517323926aaab3675924b6c5
 DIST freerdp-3.5.0.tar.gz 9335565 BLAKE2B fc417336cda9dd14a2c7605a2b0172220f711599356b38d4d346130fc865c1ef563e627b57bcb20843dae231d8cfda272261db30d956ea98c29ebf7908c4722c SHA512 5f6f6fc84d0fb3581b3debd8dde8ed7054275af46f71b6ebd618d240b196e26352cf5ea260bd819a2b4464101012184910715b546701a95fc1aa951433150b07
-EBUILD freerdp-2.11.5-r10.ebuild 3667 BLAKE2B 7e106b9e6e4b1f71b8881366a1619ce60aa9d2cea0542c14025c825e927d0564e0d5aafa9342a050f4d0a1def732f8a2baa7d051bc38f17e0f54b7b6ba238016 SHA512 5a2ebe4ef47eca39e178478398fbf7c3711ba5220a89f779534b9dea226bbc4fc2eb6119712b4f2391d7c869388df0aaaf4f64d8ca629ca66815dd76b0754095
+EBUILD freerdp-2.11.5-r10.ebuild 3665 BLAKE2B 4e63ad2f96eb98384bc1bea579800f9e0c077d5b9587d8f1936222db07b4e4fd0a39d1941e806d26c4b3f038478445df425264b2c095f173f87a9c91c48604c3 SHA512 96cea93f97ebd00a8575d8a23158bed8fa6216bb41ef0ba6389b3a81503036a3c47b5146e67ef2cc29ff54bf9a5ad2625bf83590cd3020464a42063b372496f4
 EBUILD freerdp-2.11.5-r2.ebuild 3470 BLAKE2B 738dfd8ac8d02cf814ee17ca07a593b0c4394862aa8c5ac5a4a59f5aaf4f58f8d28c4069a7d2726a8a5a2bceace3497c18a6f93f894e02f8af997fa257799194 SHA512 cf303673f413fe5d404d98ba0dc8d08fbe1a67175f20b00fd5f857a0674baaa62c439e1a88158aa204e0498fab5a7a326521b630d73c8b72de74a6417a434812
 EBUILD freerdp-2.9999.ebuild 3535 BLAKE2B beec173d3aab0eaa21c85235b2c859853796dab2e285ca91f961514044bd0bb23f444118953ae114c451113de8bfb4d316d576890d7c49b543b64d8166ea0868 SHA512 7e6baae43145d324583f77275449626f40c2f63a1f12d862edc260bbf4dcfa644d384ece41cb6e6cd9399a3d79b12445207a92f2f95b0db7a117549a8b316edd
-EBUILD freerdp-3.4.0-r11.ebuild 4209 BLAKE2B bb3dd7fd86feb4cf69a3fd465af95246282ca4f0647c20f849fd92881ba2bf735a27d920d2c7c4775a1bde5b83e6f62c3b8efe2f56262d23e617e10161f499ee SHA512 33574b719fdbc8a53269afa1357edeb0be420326363400a7120cbb6ecdcd02416d187ee81397407cc01ec8b0ecd1d448cffa99cb10730547410017a2648d7665
+EBUILD freerdp-3.4.0-r11.ebuild 4207 BLAKE2B 919d48289e54e736d90c435c1903ae17dc595e07e4b05d75f39b2a18b72b2548011074de5ec2b570875800e7ce20bdbeb166ebcb5c3bb1e33373003af053c3ff SHA512 2c9d44e152450e250d598eccfc3c9af366f00333e46ef8db1bbdf10f8f441ec88ce05e7fc847160688fc2efe42056ab3df6cb0614babca1581cda0b968d61ce6
 EBUILD freerdp-3.5.0.ebuild 4096 BLAKE2B 17233f00d185e600c88a24a9dd606cb35747cf314f1e690166620da318c82a66cc44811f8ea2d168441f738e3de3faed3e4820df282119a42294004829b0b588 SHA512 870744c2e32703ca45a026717a3f41c0c7ae57812599e61a9510a8925ce70540f5aeeb17fea97c2dcffe35e31ea2adb32ddd9cdf8504034d18bb237efb7bb66f
 EBUILD freerdp-9999.ebuild 4096 BLAKE2B 17233f00d185e600c88a24a9dd606cb35747cf314f1e690166620da318c82a66cc44811f8ea2d168441f738e3de3faed3e4820df282119a42294004829b0b588 SHA512 870744c2e32703ca45a026717a3f41c0c7ae57812599e61a9510a8925ce70540f5aeeb17fea97c2dcffe35e31ea2adb32ddd9cdf8504034d18bb237efb7bb66f
 MISC metadata.xml 650 BLAKE2B 619e236cb4c4b249beafc2e4772c5321e5c912242a0e69d7e181867a83078ebfadd639aa5b7cf2a0da58572ade2ae374bfd61f41d83e333065bbfde2c06533ed SHA512 f9ec3e33c342c2a364be4d780c0fc69800617896bda40e473175f0b98f39925ea7bcc1896993782470fd9aad1b04edc2848baf5db2a8dd4e2c4099c062e657ae
diff --git a/net-misc/freerdp/freerdp-2.11.5-r10.ebuild b/net-misc/freerdp/freerdp-2.11.5-r10.ebuild
index 62d89623c96b..207ee831d3b4 100644
--- a/net-misc/freerdp/freerdp-2.11.5-r10.ebuild
+++ b/net-misc/freerdp/freerdp-2.11.5-r10.ebuild
@@ -15,7 +15,7 @@ else
 	MY_P=${P/_/-}
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Free implementation of the Remote Desktop Protocol"
diff --git a/net-misc/freerdp/freerdp-3.4.0-r11.ebuild b/net-misc/freerdp/freerdp-3.4.0-r11.ebuild
index 1898ee89fcc3..96042d27fc4e 100644
--- a/net-misc/freerdp/freerdp-3.4.0-r11.ebuild
+++ b/net-misc/freerdp/freerdp-3.4.0-r11.ebuild
@@ -15,7 +15,7 @@ else
 	MY_P=${P/_/-}
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Free implementation of the Remote Desktop Protocol"
diff --git a/net-misc/passt/Manifest b/net-misc/passt/Manifest
index 0e4eb1674873..8a153016de16 100644
--- a/net-misc/passt/Manifest
+++ b/net-misc/passt/Manifest
@@ -3,9 +3,11 @@ DIST passt-2023.12.04.tar.xz 188136 BLAKE2B f1d72fbb4bbb25f6a11e9ff87a91cf9bac06
 DIST passt-2023.12.30.tar.xz 188596 BLAKE2B 75712a7cb7a00fea20427979153090d938b8c7b0e3da61c83cabb3751786034df35ebbe8afbd991d582a680f55b12792547b68efa931a5576dc181040b31e5fd SHA512 4b19d191e2526bacc61bb8ab2964f5da4e0535656b094a7592f91d6b437c855a586fc772e2abd89138ff4f89aae12ade494c6e0fe7bee1502fe319215200d8f0
 DIST passt-2024.03.20.tar.xz 195332 BLAKE2B 1bed740ddd235f300a4233fb2024f155758809589f1fdd2174ab99a8a93dd16044ab41814b215d12eb1e557966a73a3754bbff2b9acd752b45b385edd88ba3c7 SHA512 3701820e539545771d0f867fe0b8977cb5967e7501413f717fed08d2d2c141f17d86ed7238177b4fb4cf4cfc01c6c9d07e3c218c34b48e0a5a1f2b2ce8a5b903
 DIST passt-2024.03.26.tar.xz 195348 BLAKE2B d91e6ac1d50aae04ceb53a34341b545ff644ceccdfcfab461907050612d9d871f61591aac02ebddef9a607a9b39ce5017a2fc47c9189f85b9b9a70a30d010e4c SHA512 da771f8f334862f81702b22688c9d3552aefc2883b5a44c39156ff7a69f301cabf52fa0fb13f8695240db5411c498806d28d847fca8caff2bedb69d1a4b4e5a7
+DIST passt-2024.04.05.tar.xz 195772 BLAKE2B 4c237aeda56455f948d4309624d171612d59fa7ec653e7f89c1aeb05c677ccbdeeaaf6e14c09cda1d5bc88a97fca57dbbe480095e9711045fbd381bd30fb644a SHA512 bf14689cb1c4780d4249562965ff9a5a0515756cbf5af4b531c17982a066f33001a65210959ff8da691ddaa75560ab5691c685a4c1a4b73e742a883d12d2a24b
 EBUILD passt-2023.12.04.ebuild 707 BLAKE2B fe3b6c4c697e725c51b3cefec18e7501055c3abb0d2cb74d8b5983a73a6803ff2a5fafa2502b54725e4225072a5fa2dc6e0043524c89c6019d5380df79314aeb SHA512 0845a4d1dda79af28f08b2735297cd8fc515460df24fa9cf8d5d8653ffa3c20379e3ab5167b895fcd35b7f2068531aebe7c2e51fe9b86a65aa526f9a2cbf3306
 EBUILD passt-2023.12.30.ebuild 714 BLAKE2B afabcac34eb836f21812deeb1946d657a9bb7ed3e87868a2d50641ca8a21f43f869397f6ffe8736f66f96bf890f19f3c59f8f4c43956abfc9a0f8d17fa278b17 SHA512 e75a6066c5d13053047843c2bb0be917941d97305a53138e68dd6b5f758be01a623ca66c4d7dee37e14fc8fab212248d131cc1ccec049a506bc4ca0f679f2ec7
 EBUILD passt-2024.03.20.ebuild 842 BLAKE2B bdfd388a62cee3b064e5bdfd3f3960ff19fd505365469b3e5cc0d0148139b8dfb02020af67fda5be6e313faf1294a96ad6df106b8bf8b2fa01ee234285179bf7 SHA512 0c3f1480d9a325fba24471cd97a0030047d9f78261e93fc33429d6a56cb593f27828de96ddf5fd3cce547f0cfb95d5af8d5eae5331f9b29d9b565ac38ce94b27
 EBUILD passt-2024.03.26.ebuild 842 BLAKE2B 2d3a84c42100682fc7cf027c16545a8ccb811f943a43bad17d8c8f00dfcbb54c5ecd73bb8e0690165dfa896baa6a898e95aa0c57482ec878b2d5bb46c593a2ac SHA512 7155fef1d337530c70ec44bef45a6acf5dbc9f747953a77569db921324ea0e69c3d314144735af83f33feef97f148fabd96c89779c17837f7062bdb4288f3a32
-EBUILD passt-9999.ebuild 842 BLAKE2B 2d3a84c42100682fc7cf027c16545a8ccb811f943a43bad17d8c8f00dfcbb54c5ecd73bb8e0690165dfa896baa6a898e95aa0c57482ec878b2d5bb46c593a2ac SHA512 7155fef1d337530c70ec44bef45a6acf5dbc9f747953a77569db921324ea0e69c3d314144735af83f33feef97f148fabd96c89779c17837f7062bdb4288f3a32
+EBUILD passt-2024.04.05.ebuild 842 BLAKE2B 8cd4f2806d61b2e4d567bea4ba90d629d43f518153b36e5f343690b4bb7e70a476c35ec89305bc1d701f202b18af64ab2c65574642d72e1cf037b43b5fada0e6 SHA512 f7bfb90004c0a78b0a7a68e01c9431581dc1ade39457c8957555a157862716b27b0a6a814fc499674a69642467a913e7915b2a7554dd57b8638045dc676c3ea4
+EBUILD passt-9999.ebuild 842 BLAKE2B 8cd4f2806d61b2e4d567bea4ba90d629d43f518153b36e5f343690b4bb7e70a476c35ec89305bc1d701f202b18af64ab2c65574642d72e1cf037b43b5fada0e6 SHA512 f7bfb90004c0a78b0a7a68e01c9431581dc1ade39457c8957555a157862716b27b0a6a814fc499674a69642467a913e7915b2a7554dd57b8638045dc676c3ea4
 MISC metadata.xml 1410 BLAKE2B 415cf4ab3e0d993066251ff9e136ea4a5ef13fc50b838b5dd057784600b5fb89fecb411cc0d61d08459e34da7fe34097d22b8908240f3e46e6ff50f503aa7089 SHA512 85d756f5b8077fb0838e1881f9ef48f08ca8da1ca540d8677632c81d34765d6fb1483b3fdd0eead64467aa7872b1ca133745610736d0afc5a2b8223abacc1cb6
diff --git a/net-misc/passt/passt-2024.04.05.ebuild b/net-misc/passt/passt-2024.04.05.ebuild
new file mode 100644
index 000000000000..e4201215e520
--- /dev/null
+++ b/net-misc/passt/passt-2024.04.05.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp"
+HOMEPAGE="https://passt.top/"
+
+RELEASE_COMMIT="954589b"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://passt.top/passt"
+else
+	SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz -> ${P}.tar.xz"
+	S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+IUSE="static"
+
+PATCHES=(
+	"${FILESDIR}"/Makefile-2024.03.20.patch
+)
+
+src_prepare() {
+	default
+	tc-export CC
+}
+
+src_compile() {
+	[[ ${PV} != 9999* ]] && export VERSION="${PV}"
+	export prefix="${EPREFIX}/usr" docdir="${EPREFIX}/usr/share/doc/${P}"
+
+	emake $(usev static)
+}
diff --git a/net-misc/passt/passt-9999.ebuild b/net-misc/passt/passt-9999.ebuild
index 90df839f93d9..e4201215e520 100644
--- a/net-misc/passt/passt-9999.ebuild
+++ b/net-misc/passt/passt-9999.ebuild
@@ -8,7 +8,7 @@ inherit toolchain-funcs
 DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp"
 HOMEPAGE="https://passt.top/"
 
-RELEASE_COMMIT="4988e2b"
+RELEASE_COMMIT="954589b"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 43c737b950de..c1129da62cd6 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,6 +1,4 @@
 DIST putty-0.80.tar.gz 2831433 BLAKE2B 95769ed372ee57f1cd0b9c9b26aab47c710b3eac2dd2f40b511179f1e06dae6c59ef5fd270eddc6b0531d8ed135897490ea029e0ca8c1febefe64743ddada341 SHA512 c8a6b6fa54ecd8bcf4ec274fef51343dd9996e6458b250b5555c4dc88ded25e87f97277da482c29858510e65635112d541f559ab683635bd950572d850129f90
-DIST putty-0.81.tar.gz 2844616 BLAKE2B f4f687555ae6d043f9eb868eccb1086227a0fa3ec1a5eff68ab7ccd96c877fd87afad9c9639930e899e0fc16058ea0f4553a3035ab477761038d6257332d64af SHA512 d86f2fd0e126b18275d58cf64334b3b27c450899a1c2be2502de9faa2ef58f7fc8efc5d45f25c8395623f1e21917aa02407343bb2fee44c4c00b9f81267d5ecd
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
 EBUILD putty-0.80.ebuild 1757 BLAKE2B 12fdc0ce4f55cbfe74d8b9b0fd332bfa10d2b94554f96b39e4484b23ceeed41fb2f34b8037769b0a7ef9609b2ff5dc319316b3a74f307066734fa88bc9ffb6a7 SHA512 fa2f57698e0e0164b5c3e198434cbb8b710869aae8de33125e2787d12c109247740e07b5515f674e0dd402f5427c98f785c0c3040fc1c774966460fe906bfffb
-EBUILD putty-0.81.ebuild 1758 BLAKE2B 66376c286acd126dee9d548f2767519a3e3c02f997cb931a07aeba03867d30d2196d634518becddc700381ce6d7787562ffcffa9fbfdbe974551a179efa873e5 SHA512 e3f0f758db857858b508cd159b5e8db64a300548ebc79fa87a335465ae9de164c7d6e2dca0890b904b3347e91b8fdb558839df1fa9476183b8bec8f0373bc674
 MISC metadata.xml 887 BLAKE2B c51675758674360519d21f8722a4ea0815bfc56591a28e9026e4aa02b0046006ab87bfcd68f945184f1d82710d912a0f3557c34f4d43fc5fadd7ad7c38b5c3d3 SHA512 be79490eb1313d5f9d4b80dacc6e7727d44c1106da668869e58f106235ff6b074d17ad3fe41aa09c176bf713e17dddda6a73df728bfdfe752db6ccbf9690befa
diff --git a/net-misc/putty/putty-0.81.ebuild b/net-misc/putty/putty-0.81.ebuild
deleted file mode 100644
index 380c946e01c6..000000000000
--- a/net-misc/putty/putty-0.81.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit cmake desktop xdg-utils
-
-DESCRIPTION="A Free Telnet/SSH Client"
-HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
-SRC_URI="https://dev.gentoo.org/~matthew/distfiles/${PN}-icons.tar.bz2"
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.tartarus.org/simon/putty.git"
-else
-	SRC_URI+=" https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ppc ppc64 sparc x86"
-fi
-LICENSE="MIT"
-
-SLOT="0"
-IUSE="debug doc +gtk gssapi"
-
-RDEPEND="
-	!net-misc/pssh
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3[X]
-		x11-libs/libX11
-		x11-libs/pango
-	)
-	gssapi? ( virtual/krb5 )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig
-	doc? ( app-text/halibut )
-"
-
-src_unpack() {
-	[[ ${PV} == *9999 ]] && git-r3_src_unpack
-	default
-}
-
-src_configure() {
-	cd "${S}"/unix || die
-	local mycmakeargs=(
-		-DPUTTY_DEBUG="$(usex debug)"
-		-DPUTTY_GSSAPI="$(usex gssapi DYNAMIC OFF)"
-		-DPUTTY_GTK_VERSION=$(usex gtk 3 '')
-		-DPUTTY_IPV6=yes
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile all doc
-}
-
-src_install() {
-	cmake_src_install
-
-	doman "${BUILD_DIR}"/doc/*.1
-
-	if use doc ; then
-		docinto html
-		dodoc "${BUILD_DIR}"/doc/html/*.html
-	fi
-
-	if use gtk ; then
-		local i
-		for i in 16 22 24 32 48 64 128 256; do
-			newicon -s ${i} \
-				"${WORKDIR}"/${PN}-icons/${PN}-${i}.png \
-				${PN}.png
-		done
-
-		# install desktop file provided by Gustav Schaffter in #49577
-		make_desktop_entry ${PN} PuTTY ${PN} Network
-	fi
-}
-
-pkg_postinst() {
-	use gtk && xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	use gtk && xdg_icon_cache_update
-}
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index 1bedc2b3fdaa..4e9e976cb831 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -6,5 +6,5 @@ DIST rabbitmq-server-3.12.9.tar.xz 4437392 BLAKE2B 19c1e88e79c29af0c06d732d25098
 DIST rabbitmq-server-3.13.1.tar.xz 5083312 BLAKE2B 1821d05c1be2da491019605de7877f26cb8d47bf67f901d5bb2ede961558a44900a3b8697e254167eb5622d37b20b668dc919fadbe5c5c98f5cc644b948986b3 SHA512 022c6e213cf7cea865a6931a3481897efea65dffa649dd77df9d88bb5f9b7abaaa83b525f983de4cb336b1e0469073cadc2ce48d4f47f93005c87b9fdadb3857
 EBUILD rabbitmq-server-3.11.2-r1.ebuild 2377 BLAKE2B 5ef270056b188fcfa9d216d0755f2617185c8cf42e9298eb8b2463174aa5e07859f426247b3f0a15ee99c5fbcf96c00ab86be92e5239dd89ebe59688e58e2d9f SHA512 0f616f65974a56569211255ad6b5aedb21dea12129cc5862eafc811416b65cbda0df4a79338647e48ba09ea97e613ec2015ac6ea020f7d3c038291034318c465
 EBUILD rabbitmq-server-3.12.9.ebuild 2524 BLAKE2B 15b4d1a2c697ef13ee9aaddcb8109c3c4b344d6815d6f0e7fea77799d7a78d1d48c36c81f51628bd1d1514af42ad6f92db785f228fe078e94139d104a6f61cad SHA512 2195fd5400446d23807e7d83ddcd9dd6e1d254f7882f8f63289e9a1ac2741035d2a459ee067a77996ddb939a800c55cb746f76a6a134a8d18144c9537e8b4ef7
-EBUILD rabbitmq-server-3.13.1.ebuild 2593 BLAKE2B 04e901ad1bb4130dbc8e3143dc03d95ca810c57a3f6c8f987a8d186ae06db488b2e401cb7c0532f5cadd84d40ff93975a925543551f7456963a6e3866fca1cd8 SHA512 dbb18be01aa375f91cbeac0720bef7b643d568c7ae738b7cd465e85a94e1dbe65bf6d643ffac42606dcdfde1fd2fa64a46b9cd8a3a60ef2f72e35ea0874276ef
+EBUILD rabbitmq-server-3.13.1.ebuild 2723 BLAKE2B cceb0b1125758829b8de8e82c44a9bacd27439f80d114fe95bfcc14991d2b27c3856c55ccfc190b391844b492c9212975d4d86823b09ff5a0dbf4cbaf2b693ad SHA512 ee6244c7c8eb3a4bd94251353745c697fc2f910595b51c819c5e62070d4911e8c5fcb0ee252f9970d3a044d22b18d10f34e6d4936dab3025a2463ea8de8ea65e
 MISC metadata.xml 333 BLAKE2B 32574e66e290f23db4e2f991b817eb61ca3d2f63f467f93c1ef129c9e2534e3bd75a1f473d45cd4a4c53fe4ba30b53c6ca2ceec4c7fce6abce298f74b45c6f6a SHA512 abb06f8d7b8cbea106288347519a303bcb284acc4882b5810b0d5fa30a182f6f34c33f784cfe3a15a95147b5074efc73cbcecb4b4d6312ece36ecc74df849c1a
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.13.1.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.13.1.ebuild
index 958f619bf72b..2fdd45494c53 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.13.1.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.13.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/${
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 RESTRICT="test"
 
 # See https://www.rabbitmq.com/which-erlang.html for Erlang version
@@ -40,7 +40,11 @@ pkg_setup() {
 }
 
 src_compile() {
-	emake all docs dist
+	# Disable parallel make
+	# https://bugs.gentoo.org/930093
+	# https://bugs.gentoo.org/930098
+	# https://bugs.gentoo.org/930133
+	emake -j1 all docs dist
 }
 
 src_install() {
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 1067cff84d29..b8784fa854bb 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,5 +1,5 @@
 DIST Remmina-v1.4.31.tar.bz2 2078380 BLAKE2B daee0b68305e3ec0eedcc8cb3622ed5649303562fccd766bf5cc6ed1e96f27c1608286afa1b9bbaf44480bdc210f71a863bf442974ebbc1c50ebfbcf2dfeea35 SHA512 288e7fb5b5251d251e9502ec310f2bfe526f1a28a91c9dd9e79c712191c5d2b287844bd994596dc5097ec50ed8282d0af11144f6c5f0a74cb444aa4c6a8f6838
 DIST Remmina-v1.4.35.tar.bz2 2150047 BLAKE2B 3ba730cd4009a797ee7d66bbe4390e9db221ee5cf0b008e0eb3df4a992d7260ddc65983c8c34d1aa1bb2190ed1104653e269369565d7e4eecaf3078ffc84330c SHA512 36dc419b4473c71f6b3e53338f4a3cf7a1fe60534ea0dce375b4c9fd00cd9d8a618c4376be4d031bdee1eed8b4aade4538a6cc414629ef6dde41cdcd513a6d36
 EBUILD remmina-1.4.31-r2.ebuild 2533 BLAKE2B 201fd4b935a44a984d6172f7736b8482df8024e99f360c006d6276ab61f48af7ddfca4714f89175f2b959547de58f55f2cb04791462d4993df688b44dd87ec17 SHA512 77124daa925d55d6e590987bf4b7179228cf7fc23de84e91685aa6a51240885bc5ab409f8a7aaf5d8bb66b94e2e156a167602f73dc610b22c8b3675f5020a773
-EBUILD remmina-1.4.35-r1.ebuild 2515 BLAKE2B aab99547da3a46f2e0696530c3bae767c84e468379393d22d11d56c08756e1023e4a500bd841de59d54c864c669f4f9715bf663d47bfd3d49af1a90e8bdae5ba SHA512 3448d529ae13761efff3191ae6d329fdfa60ba93bcec04efc6b148e0b69382eea9be5dd50083959582b64ea4ce4f4e5b1891fac5cb925679d83125d4af4b0158
+EBUILD remmina-1.4.35-r1.ebuild 2513 BLAKE2B 279cd3a256e970675609c4080a92a483eb16cc0034889c0f76b6167ae4e0937d68e43bdbdd8a818b95d77345057fd134744b67d5bb22ddc7cf197c965a95d994 SHA512 e24541a389a458f46a0e665749d59a8d52f6842d4d5b8e9cfd9095f2000806c4ce8456775e339fd7bfb124713e0cc9627492efbad5ead0c3a2c19a037acc5262
 MISC metadata.xml 1123 BLAKE2B 658714c247c6fbec6118a88bc5493a67aca30e949249407d421592b956c15b439b6d96c682d2d6d7cc9f1eb2dfdcc902c4c463c6a208af4bb9196656723f220a SHA512 cbf00348e2da27acbe9890ac2d6b19d5731496cf1aab303d64f036700fb779587cb7fe81a95d3a25f9ec5dcb79e2e7e880e345fc1ac267acd25da89844ab6f21
diff --git a/net-misc/remmina/remmina-1.4.35-r1.ebuild b/net-misc/remmina/remmina-1.4.35-r1.ebuild
index 5ff20d98dc90..e5f045ac8a94 100644
--- a/net-misc/remmina/remmina-1.4.35-r1.ebuild
+++ b/net-misc/remmina/remmina-1.4.35-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="+appindicator crypt cups examples keyring gvnc kwallet nls python spice ssh rdp vnc wayland webkit zeroconf"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest
index cc744f7d4f63..e0cfeaa76093 100644
--- a/net-misc/rygel/Manifest
+++ b/net-misc/rygel/Manifest
@@ -1,5 +1,5 @@
 DIST rygel-0.42.4.tar.xz 1700196 BLAKE2B b83f9534c2294b88a180b20f90df6c43a220db83473429a41b034bfe3fff501f0f4e1f17deaa72001b8e3a886477f2c788dcf457463a275165652cc8c33da6e8 SHA512 b346e9ebfa6349c32b67557bef57bf7ddcf92782d112e875d64b7bd26718cbf89d7c5178b03defeba606ddfeb5bc94c685c10bdbd3fbd14f6942c72d96a9331a
 DIST rygel-0.42.5.tar.xz 1704072 BLAKE2B a00be296956def2bc90b978df5b8c4b23a122b9c30adfa66c634249b5daafe8d21de1cac40417095d72d42e80522ce58fe678a7f7780bd1e134aa2cd66f3d2bf SHA512 cd1aaff4e2eb2c25931197d70f518a30dab75604d62b9f071bc560570c352371d132a10caaf94956d34ecd24505ccd9a7b9f5bf324d544c676ca1f47b124f533
 EBUILD rygel-0.42.4.ebuild 2281 BLAKE2B f07335d8f5283116ee95142eecfa33eca960a463fcfef4b12422d9554ef51a97c8ec407ec108f2e3f9eca88852764a8bba737e072329e5e4decb2b3a6751b06b SHA512 e717acdf3126874357b6d3a888c25484c76371943bea0e91d4a0a196ca640da711eed7a34096cdce8bc1a4439884412ebca55863f154d5bc3f9e7b8269c81170
-EBUILD rygel-0.42.5.ebuild 2283 BLAKE2B 5e396c0b570b3a307990b9a3d42ee7d77c5e575c1555ed22daab50e052ed107c8d58604d5306e0fcfcb13415e803ae929cee0d6a4004712836284961adc22323 SHA512 f9e8cae4c2955c476c47d82ab795521350434830c972332df6280836cbae3289e5aa80c5c733e2a7c7051a149380f7c52f59e5c6a8ae44f1763196656a85a3d2
+EBUILD rygel-0.42.5.ebuild 2282 BLAKE2B 8305f185532a1970c6f886d7671c279d791ca53780915c783ab1a407816cedbf04a664855d999c96395b886fc9822b8458488d9f753f84f6d828b832ee0459d3 SHA512 0a4896af672dce6227b0195878439443405cff021c0694b48cdf5efc225271b0ee91e2b9ec30e87f9309d7df3d381b8065a29d445cf4ffe562780e465ff07ee4
 MISC metadata.xml 518 BLAKE2B 789b1e692571138dfd93f177e22ae1f86ed20a96652c31d5012b4e691b101408eb6162e401be9661f23b8239a304e854044485a8de6f2e1db7b8ecd1e801dabc SHA512 7f956f2a41c6de314dbfc2f3b17de68857474fcbfb4fc43f3019cc713d899ebbb17fcddc613bae43e441242f6e730ddb188cf09a40bd22080e665e6f32212a63
diff --git a/net-misc/rygel/rygel-0.42.5.ebuild b/net-misc/rygel/rygel-0.42.5.ebuild
index 84bce3e400b8..79b6f1fe1ace 100644
--- a/net-misc/rygel/rygel-0.42.5.ebuild
+++ b/net-misc/rygel/rygel-0.42.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
 
 LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="gtk gtk-doc +introspection +sqlite tracker test transcode"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index 2c090bb148e2..873050bd4555 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -5,7 +5,7 @@ DIST streamlink-6.7.2.tar.gz 741037 BLAKE2B b6ecea883a8b09e524a28ebdee083bb5f1e5
 DIST streamlink-6.7.3.tar.gz 742832 BLAKE2B 5f03a036c3f2170d25e43618f36d7b937e8063f15a965f45d8cc6033b49899b15c19af23aa2a845f8aec74341932721b792dad6bff70400f0dea24a19f1415ed SHA512 0955faab177bcdd0f66500f837124bf0f426829cb5c847fa18bb85aa3fcd7c27a750bab13f3e247b5187e9561713330b582b10729d82984d98081856e976ae65
 EBUILD streamlink-6.5.1.ebuild 2195 BLAKE2B 402b5052819b75766701fca53fcef174031ecabf1546cef2ae582183601321af449089df87fceac39f799cf1ec1005ceb5d8681268b33d3b9d4bf5e36a5868c9 SHA512 0a3c651ec9ea507e721fd819a7cb4fede850cc7a6fe001002cf5087e554515deb6816d0c7da8f673ab95795d22a5d0f6a3a11c615ea29fa5bef8fce0a1c5026d
 EBUILD streamlink-6.6.2.ebuild 2196 BLAKE2B 8ef3951cba5995da90a9964a29f231a62939d9a154375757d48eb2227fedcc0b5f07ebcc3215ba281d9485a4c902ef0d9a7e648cfccd7b929b2ab667d758de97 SHA512 8a6282c96ed33721631aa2fcaee5caf424881090b5c2406a44bd4ec355d92e41ec93fb3f9daf4124e3f67e024e435fa48f03a65a534485fa5bc406dfb3c3bc39
-EBUILD streamlink-6.7.2-r1.ebuild 3587 BLAKE2B c15e6c3b815d8fe77a3c98a80e814cbb15dd23cb0aefd0b65022a373b8228ce9675c7caf2edf02e1b584ad417ca0939524f9b0d8f9d8dd08edcbfbe139e87feb SHA512 6a1860f4f05afafaed455cf89784071de9920ea0fb80e8316599b303cb69c820a454ff1a2857fa8126ded5735b646985029533be3d3ad9264039ab3925be758c
+EBUILD streamlink-6.7.2-r1.ebuild 3586 BLAKE2B 84da1643f580ee83c3c21d10ea05938c8f19508f0174d7c078712df5f6e87974935ca102d409158c76d326079f23aa03a1090fd61e567072672fe8a78d22126d SHA512 8b35abad170e51449321c60d238dc956fd9f567ec0342ad10da21f2e1d7671379f8523d227bc1d5b544815fbc7ba258638dc9c49c94eb476da26f7050cbda6a5
 EBUILD streamlink-6.7.3.ebuild 3512 BLAKE2B 5b466bef6616009eeb15735d85b32d32d967a1b8ff17e6e04e2ee8d96f072fb72bdae3f5c554619ff2de438826c87b2af46bbdb7eb55ab74142b75f6b480d6e1 SHA512 8ad3b8d227b37aec93ca0f76b305a0e43afefae55ff3c2c1a963ced7d4e532c5199769005ef5361d2ec8e72946dc98e17e14fae6313be78423e15f4f7e18a55e
 EBUILD streamlink-9999.ebuild 3512 BLAKE2B 5b466bef6616009eeb15735d85b32d32d967a1b8ff17e6e04e2ee8d96f072fb72bdae3f5c554619ff2de438826c87b2af46bbdb7eb55ab74142b75f6b480d6e1 SHA512 8ad3b8d227b37aec93ca0f76b305a0e43afefae55ff3c2c1a963ced7d4e532c5199769005ef5361d2ec8e72946dc98e17e14fae6313be78423e15f4f7e18a55e
 MISC metadata.xml 398 BLAKE2B 43aa67d43256cecb95b788e4bab999f73b7b624fa1af0432aa87ffa94071f09e29eab6733468d6607eeb7aa9f81030610dfbcd849f9cb9196d80181ea5712f74 SHA512 2db05f8a1196e44e632b4ee1d85f804d295eb53141cf176e85cbe90cc30e0fee382a5e798e4cc7fd63557d60687d05a671533c2188a2fcf497f6e95292190149
diff --git a/net-misc/streamlink/streamlink-6.7.2-r1.ebuild b/net-misc/streamlink/streamlink-6.7.2-r1.ebuild
index 2f0f40037611..73d54972af03 100644
--- a/net-misc/streamlink/streamlink-6.7.2-r1.ebuild
+++ b/net-misc/streamlink/streamlink-6.7.2-r1.ebuild
@@ -26,7 +26,7 @@ fi
 LICENSE="BSD-2 Apache-2.0"
 SLOT="0"
 if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 # See https://github.com/streamlink/streamlink/commit/9d8156dd794ee0919297cd90d85bcc11b8a28358 for chardet/charset-normalizer dep
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index b310257c9375..26cddb4a0bc4 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/cpuminer-opt/Manifest b/net-p2p/cpuminer-opt/Manifest
index 8a40d873fd97..603803c7297d 100644
--- a/net-p2p/cpuminer-opt/Manifest
+++ b/net-p2p/cpuminer-opt/Manifest
@@ -1,5 +1,5 @@
 AUX cpuminer-opt.service 690 BLAKE2B f95dff31fb5ff12da8b8ae282bba4c0fd15b5c0aa7e0f2b87f94a901a8e15ea5c81e6704fe5e81681383a3d82c41516174c4cae3a6dc59c9d2af618197f32189 SHA512 d175754246d61d08d615af52c3499d67e4d8c6a5166f07ea4fd646f3000ca7afed99f9b436785c50141a86b5faf017be4b2d1d5d2f9e3921a6171e4223be9b4c
-DIST cpuminer-opt-23.9.tar.gz 1789859 BLAKE2B a1a4594100a28c5eba9a2db3284944e61bb96b7fa118c44a4a97d66ada8df33f0e6feb74fb0cc507598b23980cd32f2839c5dc54abd4520fb875ab465da9d657 SHA512 76d81dcac0c631c46b1fa5b8c5918b21b900cafa00f1a56f72af87924b90b2c947b09f5aaed30d478e6e0e77b3ac6111e3e537e52460514185e3d2787db5ca11
-EBUILD cpuminer-opt-23.9.ebuild 972 BLAKE2B 4bea6b716150282b920ceb4f563dc731a029a0856c81fe2d31c371cb9151c89f1cd45174738fc3c5c17cf4d04b3aac4e8c33b964a9ec76e32189a3f3febffc18 SHA512 d4eac5605963c1c02df9744811e50bc121fd9ee71149fd520f35282080f3bcfad6d4c83252aeac10a533781bebd70dfd7d02c81b3a54106f5033d83cc85a59db
+DIST cpuminer-opt-24.1.tar.gz 1790880 BLAKE2B 8a14df69c612bd9d00ec59a4da36b468b285f04731d8b943edea3af05bf0baf676a540e0daf3b411df3803b02314a6c6588c276cd38e2107918402f364d8b644 SHA512 f76dc5695f0baa745a6e6379ff4b105b18a183088a26eede31dbada6da5459eaceaecf22213dff21c95bf99ca6a5e179af839c1e742e1212f209ff6e8ed5fc6a
+EBUILD cpuminer-opt-24.1.ebuild 972 BLAKE2B 0bb88178a6f002c1a9035f00bdf43279fe0b103abd8c03af71cb306109188e857491a2ccceb6ddf5ebecd11d3a204e1496a8e4d735039bd4696e7cee2430a0a3 SHA512 1072c9a542517da85b90329b2aa97f816ceb41b2788afbdd81946ff22a2d1d66db4d0f6ecfaacdd04514a4ae66a768de456117c7097419e36317de0b6f61f2f7
 EBUILD cpuminer-opt-9999.ebuild 972 BLAKE2B 4bea6b716150282b920ceb4f563dc731a029a0856c81fe2d31c371cb9151c89f1cd45174738fc3c5c17cf4d04b3aac4e8c33b964a9ec76e32189a3f3febffc18 SHA512 d4eac5605963c1c02df9744811e50bc121fd9ee71149fd520f35282080f3bcfad6d4c83252aeac10a533781bebd70dfd7d02c81b3a54106f5033d83cc85a59db
 MISC metadata.xml 334 BLAKE2B f5b55d2366d5e2bc0fa04e0bbfd20fb8fb21993a352641b1f63b0d33075c97611fee985b6296cb1338a8b8b613f6835efcf8621cb8ca89d6598bd4a493673bb8 SHA512 a7b29760fbd65f440341fe862a157676a66caea1ac0d51b324e3cb79297a1293de9464ff1a460b9ee0b9399f3e637bf4ec8eb6022db957db792fe13282585ffa
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-23.9.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-24.1.ebuild
index 7a6224bf33d8..2683d4bdc544 100644
--- a/net-p2p/cpuminer-opt/cpuminer-opt-23.9.ebuild
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 37374f91febf..a3603585d20b 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index 7310a049b817..8bac9531c631 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -3,6 +3,6 @@ DIST libreswan-4.12.tar.gz 3718440 BLAKE2B f17b79b3ae51d8d2823ace258b899a1c6a40b
 DIST libreswan-4.14.tar.gz 3721106 BLAKE2B 29c0beb8bb1d1fc3bc4fe5d229dd24ac74ca3f173c24bdf6982813f06aa1bad4572c8c472a414d58bdd5699b4fba33499ab5db7c55870c78314b39c213fc0e89 SHA512 fb4c4dc426530614d308a7c4f5d21123a166b1ad652f66393b45d4987a3e2be8e8bc135e7eedfe1c014db962b70f08108757f876e27cd9e7739a79764c6d4f2d
 DIST libreswan-4.15.tar.gz 3728498 BLAKE2B f2fd0955c73fb7278f4b2dbce3c1fa483406502c12340746426c77faa39143252e9b5f0b2c0cb60e238a962789b22b1f5b33a5bf5a42e79bb7e513fb2f12855f SHA512 49a60688bb4a5241dbd791bdde0c71ae80cfb7383bb841ea0788a9d0237569d7ad79e59985c700526e3807817ddae77ebd57521897526fbb8fb93ffbea631efe
 EBUILD libreswan-4.12.ebuild 3586 BLAKE2B 959c608b98ee1b84d6159b14d42faa5c2afbff89e6065a1907425d7ee60c1cb17052c084bb22c2f9c51c1fdf4dfa7e2f82414c7b211ccac554d9a8f4d38eac2a SHA512 cd6f241e70e39f62382fc90d4a5308bb7a16e7d61f3e68d4c52bcf0844eec3608949bc2d6dd883515e913676497563ca70adf86fbbac6fa37bcdbe6147fdf571
-EBUILD libreswan-4.14.ebuild 3588 BLAKE2B 81d5db7e7602f6367623410cefc90d977c1e7271d2fbfb0e7f8e0e90209850edf6f3fc850ad69ad54ae5ebe5a809b059f74bac4e76dc456613b1dfdcd6345c7e SHA512 3ee7aa3cdd9d050be80e7e38a754d585ea520f094e0d3219c2f5dd95dc8f9e9c7f66f86262386c800a00aff792a35b4741a36cca828d58246159788e445d522f
+EBUILD libreswan-4.14.ebuild 3586 BLAKE2B 959c608b98ee1b84d6159b14d42faa5c2afbff89e6065a1907425d7ee60c1cb17052c084bb22c2f9c51c1fdf4dfa7e2f82414c7b211ccac554d9a8f4d38eac2a SHA512 cd6f241e70e39f62382fc90d4a5308bb7a16e7d61f3e68d4c52bcf0844eec3608949bc2d6dd883515e913676497563ca70adf86fbbac6fa37bcdbe6147fdf571
 EBUILD libreswan-4.15.ebuild 3588 BLAKE2B 81d5db7e7602f6367623410cefc90d977c1e7271d2fbfb0e7f8e0e90209850edf6f3fc850ad69ad54ae5ebe5a809b059f74bac4e76dc456613b1dfdcd6345c7e SHA512 3ee7aa3cdd9d050be80e7e38a754d585ea520f094e0d3219c2f5dd95dc8f9e9c7f66f86262386c800a00aff792a35b4741a36cca828d58246159788e445d522f
 MISC metadata.xml 404 BLAKE2B f1ff60cd5478c1733d76593cd0973609ce894c1cdf7d9086259bb1d988a7877a06762da95d872466633353d08b99f9c531ee65708593a8ada551cb96630ce4b7 SHA512 bf2ceacf48e75dec7f9ae83c9442b27a27b62bb89a5533f636f2032fcd765357c9892897145c6a05d6ad14855986a7c4bc15b79f99bdbd23cf9b8f2868a8f394
diff --git a/net-vpn/libreswan/libreswan-4.14.ebuild b/net-vpn/libreswan/libreswan-4.14.ebuild
index 74604f1c4a7e..c06292894782 100644
--- a/net-vpn/libreswan/libreswan-4.14.ebuild
+++ b/net-vpn/libreswan/libreswan-4.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.libreswan.org/${P}.tar.gz"
 
 LICENSE="GPL-2 BSD-4 RSA DES"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="caps curl dnssec ldap networkmanager pam seccomp selinux systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index af02377c3306..eb2aa75fb941 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -19,9 +19,9 @@ DIST tor-0.4.8.11.tar.gz 9690074 BLAKE2B b7f5bb855a6f8fe7dfd0e0efe7b48798e9d4642
 DIST tor-0.4.8.11.tar.gz.sha256sum 86 BLAKE2B 062077991dc4ca70c457a7c1a70c815d288b5afcd54246a51dd86685454fb0cf52aa8e12974e7909ef2c0b8e764c369278113c5b7d84e866fad0a66bdff93ebc SHA512 061411e2e5695fec84fcade7cf8ed36e14d5ea3ccfab7b0d7abdb53a57ca1d3647f73f416e5cc55c0d11f8d5405bba1a972d0b8ed05e6e20d088de57eac027bf
 DIST tor-0.4.8.11.tar.gz.sha256sum.asc 1321 BLAKE2B fbb12fbef8ef2c33a0a1c40eefb7b180e63f1d0c97ef15352e209a55decdcbfee3ed82be0ce28e95e47dc22f85602ff53008d585b15c82e2b669f39d987c106a SHA512 9f35e5a17293f4e5175fb617de913ad2622a695461d0f5fb78ad8b942c6af1e8d1de782e6bb06796ce7e8acb70c0c9c75ff6d6ac605defb73526c26dbe313546
 EBUILD tor-0.4.7.13-r1.ebuild 3754 BLAKE2B 7f74903deadf5f2e3c24328a5f047144e107dd48702bc6a411df3cf8b64072a6d717e2f02938d10b5aefa15d7ba43b0477f0ead8083e7a9b45622dea57722254 SHA512 b60da829bd21e4ae3bb44886cbe8dc598a68904808d356499c54618cc31418c5d35d120a527bb96a10025ffe761aaf9018f622acbb6ee1181dacd2fa6870ff6a
-EBUILD tor-0.4.7.16-r1.ebuild 4125 BLAKE2B 803c5804e276c01435b44ccc4b29dd4165991fd0a0a32922e261ca40b26f42944148efe1363d5e932cab0936c52fac2f988a51719190d36c3659f1f115dbde55 SHA512 28536af09f2fefe7ff70bd80f0960746a7b1906f02a8d4799e9223f64a7e50e2fd106be0ee0b9f3909e9d633c057122a812d2c8d9d40f9afbdcc0b9aaed36bdb
+EBUILD tor-0.4.7.16-r1.ebuild 4152 BLAKE2B a8d8402191eae40cdb23b36f92177e37c38f4d5564c9b02ec5a80cf73611a8044a82dd9dd7387cfdce3ee1c1b4c39b7acef9b09030b9e71704d225ca30bb590e SHA512 14ed6db3f7d55482a522376fd1e434df5845941478ee997b9c51bb835f44042cab4a05de26ed3c4e721fc776f245dc8ee4423bc4a0e5a0eaa6d245a7144b9498
 EBUILD tor-0.4.7.16.ebuild 3848 BLAKE2B 055aedeb3699510785c8584261144648af057e861257c7aa70d212cc91f98decbafb7451c27452b5fb42f7da201c783ded2dc0c9d76ebf6ac107965efe270100 SHA512 1838b05d4e023e4e09c8e5b185cec464f2c26e8fcd48d4dc5645402667dd3afddb79a7727cc457d3c4c6b40ca2b18f8b79a9e3b8aa7c434f727ab27f9c48088d
-EBUILD tor-0.4.8.10.ebuild 4531 BLAKE2B c20876c37abd411c5631378a78ae16662b415abb30169781518912bbd38e8429a6e3165f505f43e8f2367ebd3ba0d5e592d279365b045f5386f2a722c6123091 SHA512 9543c98fc9bcb7827482409bf65731514075c7ead135167ab42ba270326054be9bcc9d180bf241234e42036d14194cd4e137755dfd2143a872febfa79a7c3627
-EBUILD tor-0.4.8.11.ebuild 4536 BLAKE2B 3d32179d4ae75b5b02ac784cb916d214af2b1093cace7d241eb929a91173737e272b5299f1b27ac390d90d2e0965632ab1d67a0bca408f62f765bce68a671c4b SHA512 06011e9d1c1022f853854b3351457ef0d0b5b4807c3c3ca4fcbf27e2a0dc834f265bbbc1aecd6b1186488db34f091cd05694c0c409688ee692ce80de3c7b8034
-EBUILD tor-9999.ebuild 4536 BLAKE2B 3d32179d4ae75b5b02ac784cb916d214af2b1093cace7d241eb929a91173737e272b5299f1b27ac390d90d2e0965632ab1d67a0bca408f62f765bce68a671c4b SHA512 06011e9d1c1022f853854b3351457ef0d0b5b4807c3c3ca4fcbf27e2a0dc834f265bbbc1aecd6b1186488db34f091cd05694c0c409688ee692ce80de3c7b8034
+EBUILD tor-0.4.8.10.ebuild 4558 BLAKE2B 85ddc3217a9ed7986a1cfab6383ce2914e174208f07a1f9cf2655127f2e140ae50fbbb757acf166b57e052458f636a4f518033ded471d5a4f4b6bd5d5e93c057 SHA512 cfeac2c2ef230bd4fdf3e20567fd642c11eed7a7af46d26192dafd24fc5371a56ed5ca2c0976e5c548b650b058fa7cb7faae2c43a28ea63189ff7b02547400fa
+EBUILD tor-0.4.8.11.ebuild 4563 BLAKE2B 559cd65c54ea7ac73c16f9a27fd72a00e473abdf6d183f0a05ba9db61cb9a07ee1e37132bf7cddab91019a0b20b936c648248ac5addf693766eb2844df6bf5e3 SHA512 e42330244754cd0dbd8e2756063639347a8b5aacb58d9cf3f83e36a9e3c23485ab45b549e595e8191a5dae6a338fb9075e7fe7b5d2d73ccae04c6104ff5c3603
+EBUILD tor-9999.ebuild 4563 BLAKE2B 559cd65c54ea7ac73c16f9a27fd72a00e473abdf6d183f0a05ba9db61cb9a07ee1e37132bf7cddab91019a0b20b936c648248ac5addf693766eb2844df6bf5e3 SHA512 e42330244754cd0dbd8e2756063639347a8b5aacb58d9cf3f83e36a9e3c23485ab45b549e595e8191a5dae6a338fb9075e7fe7b5d2d73ccae04c6104ff5c3603
 MISC metadata.xml 645 BLAKE2B a7f450c6cfb9a605f7021cbe533ec64ff0926c9877bef7aace8ce1770a8ec552255b5c54ac80035646c3515d7d0b778100573897068d0905a56f7b860c8de21b SHA512 e5724033912b73ab8abe1b47e74578c8fe4bf6e341b8e7d7434d69071508cd1f35d97f4c7ade9787ae0ded6660cf0a5477d3c7462ed13832693bfd6205f0f0f1
diff --git a/net-vpn/tor/tor-0.4.7.16-r1.ebuild b/net-vpn/tor/tor-0.4.7.16-r1.ebuild
index 35d6f8e5b028..40cb1c91e1e0 100644
--- a/net-vpn/tor/tor-0.4.7.16-r1.ebuild
+++ b/net-vpn/tor/tor-0.4.7.16-r1.ebuild
@@ -151,6 +151,7 @@ src_test() {
 			:sandbox/opendir_dirname
 			:sandbox/openat_filename
 			:sandbox/chmod_filename
+			:sandbox/chown_filename
 			:sandbox/rename_filename
 		)
 	fi
diff --git a/net-vpn/tor/tor-0.4.8.10.ebuild b/net-vpn/tor/tor-0.4.8.10.ebuild
index a7d8e3404faa..9e6f8bed3784 100644
--- a/net-vpn/tor/tor-0.4.8.10.ebuild
+++ b/net-vpn/tor/tor-0.4.8.10.ebuild
@@ -160,6 +160,7 @@ src_test() {
 			:sandbox/opendir_dirname
 			:sandbox/openat_filename
 			:sandbox/chmod_filename
+			:sandbox/chown_filename
 			:sandbox/rename_filename
 		)
 	fi
diff --git a/net-vpn/tor/tor-0.4.8.11.ebuild b/net-vpn/tor/tor-0.4.8.11.ebuild
index 7d9d0b0a91ee..ecb77a48ea92 100644
--- a/net-vpn/tor/tor-0.4.8.11.ebuild
+++ b/net-vpn/tor/tor-0.4.8.11.ebuild
@@ -160,6 +160,7 @@ src_test() {
 			:sandbox/opendir_dirname
 			:sandbox/openat_filename
 			:sandbox/chmod_filename
+			:sandbox/chown_filename
 			:sandbox/rename_filename
 		)
 	fi
diff --git a/net-vpn/tor/tor-9999.ebuild b/net-vpn/tor/tor-9999.ebuild
index 7d9d0b0a91ee..ecb77a48ea92 100644
--- a/net-vpn/tor/tor-9999.ebuild
+++ b/net-vpn/tor/tor-9999.ebuild
@@ -160,6 +160,7 @@ src_test() {
 			:sandbox/opendir_dirname
 			:sandbox/openat_filename
 			:sandbox/chmod_filename
+			:sandbox/chown_filename
 			:sandbox/rename_filename
 		)
 	fi
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index b4bc495ddf8a..204268a604c9 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index fba0beae9999..a1dc9775b32c 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -6,10 +6,8 @@ AUX unifi.initd-r2 477 BLAKE2B 11dc44ebc7c9d9a670b6aecfd3a82265df60f21057ae459fa
 AUX unifi.service-r2 233 BLAKE2B 95d87f040be667c5d5817bc9b6eabfa3d2ef454cfcdd60badef834d6f9ec250612ea5b32724c9df28c735e22183180c9c646729e375d3e38f6a26371661af93b SHA512 cafa67126e7416c736e1ab59e8b31cd2f9ce3f8933b84985f4ba983898b664bb892255855c2fc6cbdb4519732f63e58207209d7701f908d48828dfdd399f1550
 DIST unifi-6.5.55.zip 157805689 BLAKE2B 09a7b69143478d0b81dd6f7be1746b1a35cd00ee034471c512d04e4f91aa02688871857edf3c0ef538e601aaf8eccdd0c55193a9bde10924ddeff1fd333da355 SHA512 c2f677de819268366d65622238c1b8d6d8abcd5e06d6f1f635d9755573eff5a6aca0c84298a111b0da5e80bade8132e05339035edde3cc5fc08834f2d6c4b26e
 DIST unifi-7.5.187.zip 172434106 BLAKE2B db54079f30c9f61989ceb70474ea68559189804876000534c2a0165a9ef2324f92d19e7b055eaa31cd77e7bd90db0c29aa9f20953dc17a5c54cc646a5c862990 SHA512 703e29273412c497a5bea74210e8c409c629b81fee2badd3f116bbb31a2ca82942ff0281303c0da57757a85e44f4457ba3730deaba0a1f4cc2adc1eb5ace3276
-DIST unifi-8.0.28.zip 158243946 BLAKE2B 396517012acc6efae37ab1894cfa5d605b9bb5474af35a8facf19985393d7647df853e9ba3676abc482c9021a97e149f61b093c4b9b22d211907e7be582e7be1 SHA512 50ec9d56e8358e934806ef85e9635c6bf5bb3374ec4897ff4ede708073fad276a9aabdf06108a780f077612b49d2d99b2f9ae15dfa9c558c941a4af1dfa30432
 DIST unifi-8.1.113.zip 169688768 BLAKE2B 458b92f495dc5f738687d64ccfd7cb02066a46d3712bb11b28c17d65dd152553bb2ed7dc46e41840bb2ce99948579af7630be5bfaa775e084ee61334a7c0ea62 SHA512 f20f028097a63246c3189567b254e2da5bb0cf42abdce9d8c4cdd438665b8db76210c9a98c2e4f00fe526cff259ddd039887082661d4b3e13089eaa797e4d404
 EBUILD unifi-6.5.55-r2.ebuild 2535 BLAKE2B 2cfa249e33c6e13be327dd416862070f087e7998ef7219b2903a397c1419676b854576d059396276c03767b90a196fda451826df401525aba19014a54fa919df SHA512 2c15b0ff1eded12d1f2b99891f274d71d6dd9527d23440f8aacef8d76ccf66f6063b2ee136b503bd7b200258c812f648661fc40e54e958fe338ff0730cd2e0e3
 EBUILD unifi-7.5.187.ebuild 2673 BLAKE2B 4248580218eb10fc588ec60fea1c41344a84be3d9e464b9b85572afe9b3bc4326a9a13cded7fc20ae6043ab11d9d5b942226b39da9688898c84a323cc43a1a09 SHA512 445193da23f62a5420205c9988baca93ff3bb4e86b4b215b98fe911365fd6a602e606dab3ed1c1e5bffe3f1dde6b2442711b7ef1b5a0e62312ecefb0d90c7404
-EBUILD unifi-8.0.28.ebuild 2665 BLAKE2B 3b1815c1286abc5d874eeec60d586b56d574f090ae33f8c67ac03d14cb3c6c92a1fcdbee00e90b8883b6c9eaf816294f236a47d6c907923139b0c919f7538752 SHA512 8742007a954a4f531e3d01ce9a75c8b649547ad10430be416204185d7db24b59590299ae98f70765d85c3533ba1dee4b5d96a29d9c9bd75fdcc89800cc2d6e0d
-EBUILD unifi-8.1.113.ebuild 2666 BLAKE2B 20c2e21008e49fd27c8f7ed0e26ccdf2127a9ec1b1783db350b228bf2df88112531f06d815145f4c5c79117846639f3ff0ed16a059295191992a051e383897bc SHA512 549582cffb9b5d8de9238babf45cdcdbebea04a26bf8b02d7311eb8b9603919c795837c53ff3097858ebc2bdb8122a3ef23ea8b9e6018cdaa4bb179843b1e414
+EBUILD unifi-8.1.113.ebuild 2665 BLAKE2B 3b1815c1286abc5d874eeec60d586b56d574f090ae33f8c67ac03d14cb3c6c92a1fcdbee00e90b8883b6c9eaf816294f236a47d6c907923139b0c919f7538752 SHA512 8742007a954a4f531e3d01ce9a75c8b649547ad10430be416204185d7db24b59590299ae98f70765d85c3533ba1dee4b5d96a29d9c9bd75fdcc89800cc2d6e0d
 MISC metadata.xml 706 BLAKE2B c089f7ad4712f8ad5ef71f8127686dd13a7d3ead5f31dff6c939b100c18920680d648c4d27af479dc14624b5365fc038998f478ae82222fc2f2d073bbb7b58cb SHA512 8866e9107a41456a238b21316a1b174167b4343a55bcca2964b05e44fcc2d157df113a7867496726fcdc0eabf3e244e14567e03b53e3e1df2b11a2d932fa761c
diff --git a/net-wireless/unifi/unifi-8.0.28.ebuild b/net-wireless/unifi/unifi-8.0.28.ebuild
deleted file mode 100644
index 2f1936dc19fa..000000000000
--- a/net-wireless/unifi/unifi-8.0.28.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Set this var for any releases except stable
-# RC_SUFFIX="-"
-
-inherit java-pkg-2 readme.gentoo-r1 systemd
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-S="${WORKDIR}/UniFi"
-
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="-* amd64 ~arm64"
-IUSE="systemd system-mongodb"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	acct-group/unifi
-	acct-user/unifi
-	dev-db/mongodb
-	virtual/jre:17
-"
-
-BDEPEND="app-arch/unzip"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="
-	usr/lib/unifi/lib/native/Linux/aarch64/*.so
-	usr/lib/unifi/lib/native/Linux/x86_64/*.so
-"
-
-src_prepare() {
-	if [[ ${CHOST} != aarch64* ]]; then
-		rm -r lib/native/Linux/aarch64 || die
-	fi
-	if [[ ${CHOST} != x86_64* ]]; then
-		rm -r lib/native/Linux/x86_64 || die
-	fi
-
-	if [[ ${CHOST} == aarch64* ]]; then
-		if ! use systemd; then
-			rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die
-		fi
-	fi
-	if [[ ${CHOST} == x86_64* ]]; then
-		if ! use systemd; then
-			rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
-		fi
-	fi
-
-	default
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	insinto /usr/lib/unifi
-	doins -r dl lib webapps
-	! use system-mongodb && doins -r bin
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	java-pkg_regjar "${D}"/usr/lib/unifi/lib/*.jar
-	java-pkg_dolauncher \
-		unifi \
-		--java_args '-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp \
-			-Djava.library.path= \
-			--add-opens java.base/java.lang=ALL-UNNAMED \
-			--add-opens java.base/java.time=ALL-UNNAMED \
-			--add-opens java.base/sun.security.util=ALL-UNNAMED \
-			--add-opens java.base/java.io=ALL-UNNAMED \
-			--add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED' \
-		--jar ace.jar \
-		--pwd '/usr/lib/unifi'
-
-	if use system-mongodb; then
-		systemd_newunit "${FILESDIR}"/unifi-mongodb.service unifi.service
-		newinitd "${FILESDIR}"/unifi-mongodb.initd unifi
-	else
-		systemd_newunit "${FILESDIR}"/unifi.service-r2 unifi.service
-		newinitd "${FILESDIR}"/unifi.initd-r2 unifi
-	fi
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-wireless/unifi/unifi-8.1.113.ebuild b/net-wireless/unifi/unifi-8.1.113.ebuild
index ed01ef5545ac..2f1936dc19fa 100644
--- a/net-wireless/unifi/unifi-8.1.113.ebuild
+++ b/net-wireless/unifi/unifi-8.1.113.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/UniFi"
 
 LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="-* ~amd64 ~arm64"
+KEYWORDS="-* amd64 ~arm64"
 IUSE="systemd system-mongodb"
 RESTRICT="bindist mirror"
 
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 781175a1fef5..84dd5c215643 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/powerpc/ppc64/64le/package.use.force b/profiles/arch/powerpc/ppc64/64le/package.use.force
index 5d6499cf5a4e..3a750ec50bf7 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.use.force
+++ b/profiles/arch/powerpc/ppc64/64le/package.use.force
@@ -1,9 +1,10 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2022-01-20)
 # force users to use system versions
 # internal bootstrap only needed in parent big-endian profile
+dev-java/openjdk:8 system-bootstrap
 dev-java/openjdk:11 system-bootstrap
 dev-java/openjdk:17 system-bootstrap
 dev-java/openjdk:21 system-bootstrap
diff --git a/profiles/arch/powerpc/ppc64/64ul/package.use.force b/profiles/arch/powerpc/ppc64/64ul/package.use.force
index 173cf4ca17de..fbff0a723e85 100644
--- a/profiles/arch/powerpc/ppc64/64ul/package.use.force
+++ b/profiles/arch/powerpc/ppc64/64ul/package.use.force
@@ -1,9 +1,10 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Arthur Zamarin <arthurzam@gentoo.org> (2022-01-13)
 # Bootstrapping is possible using our build snapshot, so don't force
 # system bootstrap
+dev-java/openjdk:8 -system-bootstrap
 dev-java/openjdk:11 -system-bootstrap
 dev-java/openjdk:17 -system-bootstrap
 dev-java/openjdk:21 -system-bootstrap
diff --git a/profiles/package.mask b/profiles/package.mask
index 55746e83015e..2be7c3e337a6 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2024-04-18)
+# Upstream gone, unfetchable, stuck on EAPI 6. Bug 605796
+# Removal on 2024-05-18
+sci-visualization/spectromatic
+
 # Fabian Groffen <grobian@gentoo.org> (2024-04-16)
 # Official latest Python support 3.8, replacement app-metrics/go-carbon
 # is more performant and designed to be a drop-in replacement.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 4b0b4cdab50e..7dac118824c9 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1175,7 +1175,6 @@ app-text/evince:nautilus - Enable property page extension in gnome-base/nautilus
 app-text/evince:postscript - Enable support for PostScript and Adobe Illustrator documents with app-text/libspectre
 app-text/evince:spell - Enable inline spell check for annotations via app-text/gspell
 app-text/evince:xps - Enable XPS viewer using app-text/libgxps
-app-text/foliate:handy - Use gui-libs/libhandy
 app-text/ghostscript-gpl:unicode - Add support for unicode passwords via net-dns/libidn
 app-text/groonga:abort - Enable query abortion
 app-text/groonga:benchmark - Build benchmark programs
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 42665118ed15..1d0af1c5acc6 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/ghdl/Manifest b/sci-electronics/ghdl/Manifest
index 95bb2313704d..5e24ea0ae161 100644
--- a/sci-electronics/ghdl/Manifest
+++ b/sci-electronics/ghdl/Manifest
@@ -1,6 +1,8 @@
 AUX ghdl-4.0.0_pre20231218-no-pyunit.patch 689 BLAKE2B 2df3df07e290240b2e99422fda33d2ccee9f01a5f3c3aa3535e40ab66bf5de95cbef3821a3e31b0f36b82f5bc90e078e9d2f9424ea5226f7c671ce4dec571458 SHA512 9149bb90346b0c97683a4ed7056cecb727f4ff9a5b89f8b4046983475cd40937f363438129304c72199442bcc3ad948f2c86cb38b6bd0d314dba9199f34a37a6
 DIST ghdl-4.0.0.tar.gz 7683124 BLAKE2B 2b43f1a24c9fb30f754ae6326b21fd52991f3bd69fc1c2dfbd3064d950cef74f7e66f2a846778e6429fbfae07d349f913993d91c52ec53cdad894b06f810cb03 SHA512 95b08274f2ed54556fbe2e72ce52605d9ca8269b535306348d25a259615a0610b59a61fb4458e0c1e548570361af15d45d89941bf4ab4afd2fafb10b07e69cae
 DIST ghdl-4.0.0_pre20231218.tar.gz 7761842 BLAKE2B d5b3ae4c28b245881681695cee74eca1d69092d8089cb1ec042f42d26e62aa420ace8f04899023d98259d845ea89700d77c453b892c176d4d1b367ac7a8237a6 SHA512 6b9ac7221bee5b8ec2cc7971fbad5aff615839aa3c3170fa39079c68e65da8b4a8d60f5c53d9fa88146c9f865b0d8a059fd03358e20b660b6543cf1b0c0b0c84
+DIST ghdl-4.1.0.tar.gz 7704716 BLAKE2B d69791d947ed11b62fac8e076c3b9e1bad606a0de57e8d5bd67c9a8f7ea0cad73643085efbaaa06fabdd5900366334b63385589da72f4db488f5b27b142a76f8 SHA512 0a3a465f7f8ed7fba9b81b5dec2903bf82731c97a127666e7644286c9ea80078354be4e6bf8947a6ef631b646dc7e8e69dce2d9a467ac36ee03c67d9335a2703
 EBUILD ghdl-4.0.0-r1.ebuild 1552 BLAKE2B 1f6df7a2429dabc436e75bc48def8b870be90be99b96975197db1682be8701f00726f8b0d2c42e5c9e4819cae46e94cfc0ca6723d6482153161ac7e7191c29e6 SHA512 8d5ed325abef1f4385ffed01feed152a9caa2452fe757b23b94114ecd06edeaa782d94673ba71473fdcd324b6fb2447729f14c6c3e5989f29d983e89a63fa184
 EBUILD ghdl-4.0.0_pre20231218-r1.ebuild 1543 BLAKE2B c5c7971d7dd3ae1332ce537a445c6432f21714952a146a212a13fedb2d446a5c37d4a3ace4634cb360292604a9f99838b2b0a1046f6f72a01c9646446da138ef SHA512 ac2199364c2536cd761cdc9a1aa82a03d73b916248e62b82c3323ee81c7f3dd1d58814556631314ab238f226ee29ff11c1ae5d9d62482b95b5dc2480e1c903f4
+EBUILD ghdl-4.1.0.ebuild 1552 BLAKE2B 1f6df7a2429dabc436e75bc48def8b870be90be99b96975197db1682be8701f00726f8b0d2c42e5c9e4819cae46e94cfc0ca6723d6482153161ac7e7191c29e6 SHA512 8d5ed325abef1f4385ffed01feed152a9caa2452fe757b23b94114ecd06edeaa782d94673ba71473fdcd324b6fb2447729f14c6c3e5989f29d983e89a63fa184
 MISC metadata.xml 1462 BLAKE2B a403ab50a3463fc26ddfb6ad65aa2cfe9782e98b74cd91fe24ef81678e7c52a2211b0bcad27accc4cd57db281ed23ad5d8697ae69dd8b67c623465949d6d3434 SHA512 4bd4c20a8fbbdaa80a63373f81bd96144e110371403832627aba81a7a95d073ee73922516a6d5c193898affbeb8bd7f1ce9fc4203faa13464cf39ba809c82d5d
diff --git a/sci-electronics/ghdl/ghdl-4.1.0.ebuild b/sci-electronics/ghdl/ghdl-4.1.0.ebuild
new file mode 100644
index 000000000000..91b707eb0ca7
--- /dev/null
+++ b/sci-electronics/ghdl/ghdl-4.1.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ADA_COMPAT=( gnat_2021 gcc_13 )
+LLVM_MAX_SLOT=17        # Check "configure" script for supported LLVM versions.
+
+inherit ada edo llvm toolchain-funcs
+
+DESCRIPTION="Open-source analyzer, compiler, and simulator for VHDL 2008/93/87"
+HOMEPAGE="https://ghdl.github.io/ghdl/
+	https://github.com/ghdl/ghdl/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/ghdl/${PN}.git"
+else
+	SRC_URI="https://github.com/ghdl/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="llvm"
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+RDEPEND="
+	${ADA_DEPS}
+	llvm? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-util/patchelf
+"
+
+PATCHES=( "${FILESDIR}/${PN}-4.0.0_pre20231218-no-pyunit.patch" )
+
+pkg_setup() {
+	ada_pkg_setup
+
+	use llvm && llvm_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	sed -i "s|ar rc|$(tc-getAR) rc|g" Makefile.in || die
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	local -a myconf=(
+		# Build.
+		--disable-werror
+
+		# Install location.
+		--libdir=$(get_libdir)
+		--prefix=/usr
+
+		# Features.
+		--enable-libghdl
+		--enable-synth
+	)
+
+	if use llvm ; then
+		myconf+=( --with-llvm-config=llvm-config )
+	fi
+
+	# Not a autotools script!
+	edo sh ./configure "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	patchelf --set-soname libghw.so lib/libghw.so || die
+}
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name '*.a' -delete || die
+}
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index a9833079a878..6bc6e41c21a4 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 92af40eb9f10..dfe60952f176 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -1,4 +1,3 @@
-AUX plplot-5.12.0-safe-string.patch 791 BLAKE2B 8a3b37dd236d3086fe0780dd0e10d670884f706b4e6164980d8197de1a3f49fc0ef2ee15cd9f499c50b14a454bf62a6d6aee1512522ab5a3fe16c8fb93fc042f SHA512 c531a57ef2203c01f5d44f0bd1edc5101c740986987e454019fe42f4905dbd9b5f13ad93e91e3c73c95c320e9128ac4696021e258dc523fc9f5559348eda9129
 DIST plplot-5.15.0.tar.gz 15380293 BLAKE2B 41f359c4e86c7a26fe53a9d82a9f02aeb97b5b6f44abca590621640c56e50a62823e8a03165a939689f5456cee419b8292ea34faccd07641bd4a953b6f1d73fe SHA512 54533245569b724a7ef90392cc6e9ae65873e6cbab923df0f841c8b43def5e4307690894c7681802209bd3c8df97f54285310a706428f79b3340cce3207087c8
 DIST plplot_5.15.0+dfsg2-6.debian.tar.xz 73416 BLAKE2B 2f0a9be0aea6d77b2c538f53a509636a6edca59eb930b7885da7ba915a0324d3cbe0e4b0ffe33a2a552ec7b8b679931e9eaa3e4810372b05ac3c0901ea9c6ee9 SHA512 0d64352eb08cb5bb003e8eac11c73533f6ecd08ad542cce002474d20ba4a899fd54b77f96b5e53656b551180fa693da820e7c40b18d6d43e20ea2c7377c36c69
 EBUILD plplot-5.15.0_p6.ebuild 7383 BLAKE2B feca625173950da8db5553a31d46d49fdfb6105722fc032da0c306ed57b342e816ae655965921459398b473a511db8051aa9dcd66fd9cf83c09b0def334bfe98 SHA512 eabd7464afd56f13bc621f73acf4409c1a954ac3f3f21723bde0975321abce033aa395b2d3f8142e99a1dde24a12918c4280ff08d2fd9f62e1750431a7c497db
diff --git a/sci-libs/plplot/files/plplot-5.12.0-safe-string.patch b/sci-libs/plplot/files/plplot-5.12.0-safe-string.patch
deleted file mode 100644
index 5a3605168e61..000000000000
--- a/sci-libs/plplot/files/plplot-5.12.0-safe-string.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- plplot-5.12.0.old/examples/ocaml/x20.ml	2017-01-29 01:50:35.000000000 +0000
-+++ plplot-5.12.0/examples/ocaml/x20.ml	2017-11-18 12:10:33.476409441 +0000
-@@ -59,7 +59,7 @@
-   let w, h = Scanf.sscanf w_h_line "%d %d" (fun w h -> w, h) in
-   let num_col = Scanf.sscanf num_col_line "%d" (fun n -> n) in
- 
--  let img = String.make (w * h) ' ' in
-+  let img = Bytes.make (w * h) ' ' in
-   let imf = Array.make_matrix w h 0.0 in
- 
-   (* Note that under 32bit OCaml, this will only work when reading strings up
-@@ -72,7 +72,7 @@
-     for j = 0 to h - 1 do
-       imf.(i).(j) <-
-         (* flip image up-down *)
--        float_of_int (int_of_char (img.[(h - 1 - j ) * w + i]));
-+        float_of_int (int_of_char (Bytes.get img ((h - 1 - j ) * w + i)));
-     done
-   done;
-   imf, w, h, num_col
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index e0d715051931..6ea022b84dd8 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/cadabra/Manifest b/sci-mathematics/cadabra/Manifest
index 943a3075a423..e3fbe78a70a8 100644
--- a/sci-mathematics/cadabra/Manifest
+++ b/sci-mathematics/cadabra/Manifest
@@ -1,6 +1,6 @@
 AUX cadabra2-CMake.patch 3184 BLAKE2B afa702834d5eb82a8056307b419fc20bbc2d45b0474994328b70fee383dff415ea37ef2e70c83e9cb7776e06f9295cf5cb9afddddaf857227f7a72f362b61726 SHA512 ddd6b451f81e465d4fef9401340808922bcb1074895173d83d699614e0c967024863848fabdd207f7124ff6396e8c2c75d2ed1425ba73d7bb6d5ac6fe56a87f1
-DIST cadabra-2.4.4.1.tar.gz 25171405 BLAKE2B 7505b5b56c4b9f18c63535cac1854a8926f985729ac9b284146d7d604c4774436510f1fa04c615efb4e06ae4b077859e391046b2d07565586afc0d9dac66156a SHA512 9e81889dabeff1ad93f4d8fc01960c11747d2a19d0cb6d8f872cff217ffe7bd6b92fcd5ce49cf5f2c089c440a3abdb0358f5f470b4de616ce17c42a23864caf6
 DIST cadabra-2.4.5.4.tar.gz 26825874 BLAKE2B 90562e4ddb08a99a38f32d5cf3fe237b2ca5ece80e4bf70caa8db23a2b6af246b289eb41e7d366c5a242e6e06a680ab0917deb43f29efcf7d6703338c7e97d00 SHA512 907e291880aac84a4f5695f77dd34512c13dba320b38fee59c765b070235c9ef777f6e188c675c8247f56144624edb84459d8b500e4c074731633a2b9cf9ee74
-EBUILD cadabra-2.4.4.1.ebuild 2329 BLAKE2B 877d2060a10c388f43d1723f0830cfdb9a67426af825d7fb16709978b8f1f77888de668f676c76f60e652252261074e60b8087cf144e8f0d1add2db74656e67e SHA512 d081f07f31259e6bf596f6ed3e0362e426b83e02aa99d51cf51601f1654bead5c1d6e5e8a1bd0be000b2237018eab41c9cd00cb6141a76473bed3f1cbaec106f
+DIST cadabra-2.4.5.5.tar.gz 26827810 BLAKE2B ba8eaa9eaab6ec1832dc9dd0ff47710a503b6a4a33124cdd3021144177b471c2b3616a7e61f4ec32fd464270e45cdc460d2bcdb5bd39fa853a00bbfefba58c92 SHA512 931537cb1b72194cbe89dc2231fa50c5550e14e7f259cfbd19bc2ffdf9d558273b60cd36fdfe0578b05e26b74cb362e1411c4c4706293437b867b71ee7661411
 EBUILD cadabra-2.4.5.4.ebuild 2349 BLAKE2B 7150b06e2425b70d36670f6849e0626b054b79f263463db8b78375731cc65b9ee6e840c3a8956a9adb13b03d0c73003107858806a067802d81b40cb0c617f7f9 SHA512 28e5f53aca9bd310c0becdf391599f020dd740c7a619c6426aa55f54c19224cdbf4ec230b6b890769708a174a53560040a6b5821faaca6a910d773966be336b7
+EBUILD cadabra-2.4.5.5.ebuild 2351 BLAKE2B f031cc63d771d26e9fb13ab0793bb5200d2a4e510cd222b702d404d5ef5eb58c791c1c64224cf51e9bb31666c57a0a93bb93ec178f646b545d4ff002efa14c5d SHA512 b36360335712eb5d944ea9a2ecef60b29db1d10ac2f08946291b9d12ecab12d3958db15c1e1682810a129ede6fcd98f4e7a222840826e6d12489a9df89f7c74a
 MISC metadata.xml 1342 BLAKE2B 2f34aae73fc01d4b8fd4326505b7b0785663c62593641d1d0a01f64adc12cbc8676271612ce91258927ac22957a8d5aba53dd2627130582c744bc32c28e0e207 SHA512 41dffbcfae16f8f0702df5a1837b225100761d48817a2d70fa03aca6246b9d3184d60989cf265282286b02a77a126ac82695c2d74c6de91da45e8f64fcb91811
diff --git a/sci-mathematics/cadabra/cadabra-2.4.4.1.ebuild b/sci-mathematics/cadabra/cadabra-2.4.5.5.ebuild
index dc848e56ac06..de5c161c94ef 100644
--- a/sci-mathematics/cadabra/cadabra-2.4.4.1.ebuild
+++ b/sci-mathematics/cadabra/cadabra-2.4.5.5.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-MAJOR=$(ver_cut 1)
-CADABRA=${PN}${MAJOR}
+MAJOR="$(ver_cut 1)"
+CADABRA="${PN}${MAJOR}"
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit xdg-utils python-single-r1 cmake
 
@@ -16,12 +16,14 @@ HOMEPAGE="https://cadabra.science/
 
 if [[ "${PV}" == *9999* ]] ; then
 	inherit git-r3
+
 	EGIT_REPO_URI="https://github.com/kpeeters/${CADABRA}.git"
 else
 	SRC_URI="https://github.com/kpeeters/${CADABRA}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
-	S="${WORKDIR}"/${CADABRA}-${PV}
-	KEYWORDS="amd64 ~x86"
+	S="${WORKDIR}/${CADABRA}-${PV}"
+
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-3"
@@ -46,12 +48,18 @@ RDEPEND="
 		dev-python/sympy[${PYTHON_USEDEP}]
 		jupyter? ( dev-python/jupyter[${PYTHON_USEDEP}] )
 	')
-	gui? ( dev-cpp/gtkmm:3.0 )
+	gui? (
+		dev-cpp/gtkmm:3.0
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
 "
-DEPEND="${RDEPEND}"
-BDEPEND="$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')"
 
-PATCHES=( "${FILESDIR}"/${CADABRA}-CMake.patch )
+PATCHES=( "${FILESDIR}/${CADABRA}-CMake.patch" )
 
 DOCS=( CODE_OF_CONDUCT.md CONTRIBUTING.md JUPYTER.rst README.rst )
 
@@ -65,11 +73,11 @@ xdg_update() {
 
 src_prepare() {
 	# Clean postinst script which calls libtool and icon-cache update
-	echo '#!/bin/sh' > "${S}"/config/postinst.in || die
+	echo '#!/bin/sh' > "${S}/config/postinst.in" || die
 
 	# Fix "PYTHON_EXECUTABLE" in Jupyter kernel
 	sed -i "s|@PYTHON_EXECUTABLE@|${EPYTHON}|"  \
-		"${S}"/jupyterkernel/kernelspec/kernel.json.in || die
+		"${S}/jupyterkernel/kernelspec/kernel.json.in" || die
 
 	cmake_src_prepare
 }
@@ -83,9 +91,9 @@ src_configure() {
 		-DENABLE_JUPYTER=OFF  # special Xeus Jupyter kernel (uses xtl)
 		-DENABLE_MATHEMATICA=OFF
 		-DINSTALL_TARGETS_ONLY=OFF
-		-DBUILD_TESTS=$(usex test)
-		-DENABLE_FRONTEND=$(usex gui)
-		-DENABLE_PY_JUPYTER=$(usex jupyter)
+		-DBUILD_TESTS="$(usex test)"
+		-DENABLE_FRONTEND="$(usex gui)"
+		-DENABLE_PY_JUPYTER="$(usex jupyter)"
 	)
 	cmake_src_configure
 }
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index f25b2e78b17f..c51b882eed1f 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/veusz/Manifest b/sci-visualization/veusz/Manifest
index f36b21ebd46a..69509dc0d37f 100644
--- a/sci-visualization/veusz/Manifest
+++ b/sci-visualization/veusz/Manifest
@@ -1,7 +1,6 @@
 AUX veusz.desktop 248 BLAKE2B 02c9b85f9ea12ef0ee9bf8f538788f577ab4314468e94140b80351accece2dcbcf11b39b26468d8c31e3feb9fc8422a1fe5051b00100743f263eba2558861236 SHA512 986479153d6409a639f0daab4c2c11836927fce93feecf0bffefd7643cfa9c3ee2c24d374f2c6eaef475bc4bcfe39095c6b12bd0731c585ad213f0a4672c8047
 AUX veusz.xml 346 BLAKE2B c99688c930b3901edcf500c4a99447074a01be6abfd2be714f8c1dccd4318a0270d30f47f92636280f406ba9003540434c52683b0a8f66fb4d672e3436fdb5a1 SHA512 c4f049d4648192d932560a2e73088843ecb0a2beea2e628424488d552684a8e69b84628773a08947741690eb732901bc8ae8c52fa926d1b44bf02b9046cb569e
-DIST veusz-3.5.3.tar.gz 3319834 BLAKE2B d673ea62b1a8d4d11e05fc9b95105b34fdc75f697fcd48fbd82c5bbfaf72530adc73f2d40f99ee281d36c11d26bcaf1cd292110e163166c9b2e112187c85cc21 SHA512 26c245640b83a3e6d0d036e942774b15d47dcb4dd2af41025528781f63ecb2ba5357b3eeedcb7a3432bd2b54cce7bca0587f47b6f1208d08532f3a08cab19d32
 DIST veusz-3.6.2.tar.gz 3330225 BLAKE2B dacadb7f4a4059cab02c07d2af4e53ba3b5714593233ff2995083237416e26425723950603dc542ac58cc355aaf6106c3fd4065efddb9cc7884757e440d3efa2 SHA512 5580171c0259415cf3de11322133fde02e244b65ffede1e83b5e6d17c8a037624860550495dc0b53c7b5e2f65b3ae6b95daa0e95f7164358e1201ffedeb13f51
-EBUILD veusz-3.5.3.ebuild 1705 BLAKE2B eb09154d5907624b62c2c918c6a28c86463c1c47d5551fed92bec6f51afdec23b3effeae1ff0cf3a373446287b09ca8fcc4cd14de6786939485fc12e62deac14 SHA512 a53427bc84d7d76e22cabb9f877c1c470eb02c7a0c46d721bba7049bfe972dc0c5228f918e1b86236ef122371bf7badbecacbd12a2ff4a6ca11d42223b4662d5
+EBUILD veusz-3.6.2-r1.ebuild 1705 BLAKE2B c8d8f5e3c9484d829102527d1fa1a7a1cff98ff0ba08a78d9e3c951b480d2335665918085df51dd10173bc27f0ef67f8e0317b0737468c8201341c89b3c7cbde SHA512 ee29e8b7a1c53097a7082cde9cc74cd0bee28ca197bc0ddf4b4bdefae165390dd7435c70205e70ff8b2dc254e39b8d4369462967234c318c328958486d2dfd52
 EBUILD veusz-3.6.2.ebuild 1705 BLAKE2B eb09154d5907624b62c2c918c6a28c86463c1c47d5551fed92bec6f51afdec23b3effeae1ff0cf3a373446287b09ca8fcc4cd14de6786939485fc12e62deac14 SHA512 a53427bc84d7d76e22cabb9f877c1c470eb02c7a0c46d721bba7049bfe972dc0c5228f918e1b86236ef122371bf7badbecacbd12a2ff4a6ca11d42223b4662d5
 MISC metadata.xml 678 BLAKE2B 8eb0a7fd08dc1800899df2f638353b0c85a42a2cd09428fda46c8f96c7c4a900c053ea29d0ca50707d94cf55f1eb69788c61f45a6b3a69bcba19093f9609e67d SHA512 f800d5d25f8b81446f6d5132b3cf2eda516f0ec06bb74dd8e1d708a66c225fd4692fa5fc8d6c5f5ad0ce4389e598b0dcd35dfd79a50f5ab5801d800a5eac1f20
diff --git a/sci-visualization/veusz/veusz-3.5.3.ebuild b/sci-visualization/veusz/veusz-3.6.2-r1.ebuild
index d7aff55dc407..7d00d0397b86 100644
--- a/sci-visualization/veusz/veusz-3.5.3.ebuild
+++ b/sci-visualization/veusz/veusz-3.6.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 DISTUTILS_USE_PEP517=setuptools
 inherit desktop distutils-r1 qmake-utils virtualx xdg
 
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 25c2545a4561..bc9f0eeb1285 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-apache-tomcat/Manifest b/sec-keys/openpgp-keys-apache-tomcat/Manifest
index 9abdf954ea60..64fa38b325f5 100644
--- a/sec-keys/openpgp-keys-apache-tomcat/Manifest
+++ b/sec-keys/openpgp-keys-apache-tomcat/Manifest
@@ -2,14 +2,12 @@ DIST openpgp-keys-apache-tomcat-10.1.19-KEYS.asc 35385 BLAKE2B 1c2bba42759f901fe
 DIST openpgp-keys-apache-tomcat-10.1.20-KEYS.asc 35385 BLAKE2B 1c2bba42759f901fef1cda1871c706cd5f960de4120de62361853b7e6cade3c205852215e8562e066ca675506bf1a8d424fb588dfd856cdc99bca5bcc575be06 SHA512 43d3c06e6eb776b939864a092161f70759e6f095b9b2bb7f00172cb6dca890fb88dff6f646863b882226ac490ad8082c03a84f93dfe917e7b9aab378f54612ce
 DIST openpgp-keys-apache-tomcat-8.5.100-KEYS.asc 44901 BLAKE2B c3661429327bc7fec4379b900bfe83d2067548c321f9ee868b7606be493f34f89911f8aa10694280876bb831790b90537d5c3f4bb5fa9af55924e7f8e631a316 SHA512 26a59a0e0cc5257b35bb9826f750172301dcdb29e1f862db4bdd372fb1e79c45d782e87766c2cd1de4504dfdf3dc532a58ede5f23a9e3539ad8a3412029e0125
 DIST openpgp-keys-apache-tomcat-8.5.99-KEYS.asc 44901 BLAKE2B c3661429327bc7fec4379b900bfe83d2067548c321f9ee868b7606be493f34f89911f8aa10694280876bb831790b90537d5c3f4bb5fa9af55924e7f8e631a316 SHA512 26a59a0e0cc5257b35bb9826f750172301dcdb29e1f862db4bdd372fb1e79c45d782e87766c2cd1de4504dfdf3dc532a58ede5f23a9e3539ad8a3412029e0125
-DIST openpgp-keys-apache-tomcat-9.0.86-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
 DIST openpgp-keys-apache-tomcat-9.0.87-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
 DIST openpgp-keys-apache-tomcat-9.0.88-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
 EBUILD openpgp-keys-apache-tomcat-10.1.19.ebuild 561 BLAKE2B b0d1d1118ac926cce2ba54feea8791f7f8ba44d2bfe2bb61b0bc11815e460d6fc3d4c4993c1552b34c1b98b7453e798b4dc70c70a1942bedcec09fc1cad05ef7 SHA512 83f6ee3b0f2e32b39136027f840557c0f94bd47b89adf990e33da1e7015f02193cd643e911828f1d6545609e39ff4b4dcb9aecd061c7cad678996122b20b1152
 EBUILD openpgp-keys-apache-tomcat-10.1.20.ebuild 561 BLAKE2B b0d1d1118ac926cce2ba54feea8791f7f8ba44d2bfe2bb61b0bc11815e460d6fc3d4c4993c1552b34c1b98b7453e798b4dc70c70a1942bedcec09fc1cad05ef7 SHA512 83f6ee3b0f2e32b39136027f840557c0f94bd47b89adf990e33da1e7015f02193cd643e911828f1d6545609e39ff4b4dcb9aecd061c7cad678996122b20b1152
 EBUILD openpgp-keys-apache-tomcat-8.5.100.ebuild 561 BLAKE2B 737b5559820662ce3c0b0a390b240efe14c5a7d82702b0764cb4c9a31a7699f009cb787d1fb03dd8ebcefd3c25032edfacef6dd96d4314dad3d8969f92e9343c SHA512 da39830647de9de8b52ba823b0abc712a14cb99b3b1133284caa41af313aa6fb29456806310d471f79f23202f97613694e996e1af47d71273cc0c9f6671bcccd
 EBUILD openpgp-keys-apache-tomcat-8.5.99.ebuild 561 BLAKE2B 737b5559820662ce3c0b0a390b240efe14c5a7d82702b0764cb4c9a31a7699f009cb787d1fb03dd8ebcefd3c25032edfacef6dd96d4314dad3d8969f92e9343c SHA512 da39830647de9de8b52ba823b0abc712a14cb99b3b1133284caa41af313aa6fb29456806310d471f79f23202f97613694e996e1af47d71273cc0c9f6671bcccd
-EBUILD openpgp-keys-apache-tomcat-9.0.86.ebuild 561 BLAKE2B b0d1d1118ac926cce2ba54feea8791f7f8ba44d2bfe2bb61b0bc11815e460d6fc3d4c4993c1552b34c1b98b7453e798b4dc70c70a1942bedcec09fc1cad05ef7 SHA512 83f6ee3b0f2e32b39136027f840557c0f94bd47b89adf990e33da1e7015f02193cd643e911828f1d6545609e39ff4b4dcb9aecd061c7cad678996122b20b1152
 EBUILD openpgp-keys-apache-tomcat-9.0.87.ebuild 561 BLAKE2B b0d1d1118ac926cce2ba54feea8791f7f8ba44d2bfe2bb61b0bc11815e460d6fc3d4c4993c1552b34c1b98b7453e798b4dc70c70a1942bedcec09fc1cad05ef7 SHA512 83f6ee3b0f2e32b39136027f840557c0f94bd47b89adf990e33da1e7015f02193cd643e911828f1d6545609e39ff4b4dcb9aecd061c7cad678996122b20b1152
 EBUILD openpgp-keys-apache-tomcat-9.0.88.ebuild 561 BLAKE2B b0d1d1118ac926cce2ba54feea8791f7f8ba44d2bfe2bb61b0bc11815e460d6fc3d4c4993c1552b34c1b98b7453e798b4dc70c70a1942bedcec09fc1cad05ef7 SHA512 83f6ee3b0f2e32b39136027f840557c0f94bd47b89adf990e33da1e7015f02193cd643e911828f1d6545609e39ff4b4dcb9aecd061c7cad678996122b20b1152
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.86.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.86.ebuild
deleted file mode 100644
index 57c3e1749269..000000000000
--- a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.86.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
-HOMEPAGE="https://tomcat.apache.org/download-90.cgi"
-SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
-S="${WORKDIR}"
-
-LICENSE="public-domain"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-src_install() {
-	local files=( ${A} )
-	insinto /usr/share/openpgp-keys
-	newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
-}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index f44d27406e31..bf24dae618cb 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 6c5dece847f7..0fe0266aa2ce 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,6 +1,8 @@
 AUX cpuid-20220620-makefile.patch 1359 BLAKE2B b16bd455de251f3989718fa56c1b19f97d79271998ccf774f74f0886ab8072be482e480604bfad462e0ac9c325470d12e80150e6fc588abfae629cd6499e0ea4 SHA512 680e477460679ae016c95d0e0c5cef916486629011b43cafb5f90c1c097b8c245d4c8b7861a20bdeee05b87b2220ad37a5ca589ff952dd9d7580ca301aac0ada
 DIST cpuid-20230614.src.tar.gz 149777 BLAKE2B 5ebfd7d055f2b67cd158dd6eaa5467a5776170a879a4323e2dc103e8b84f4cf72523d5ae5272d2f89ae6555f597d903bdf149f279f9565bf88a1e26b0e574606 SHA512 46698e5565d1c558e50b9526154489d82ada64ea5dbcebc01e3cd34b79b2b646f324deaf7d63678cd477d227e902437c3ff6c7998b4385ddd373aa1fc76ff70c
 DIST cpuid-20240330.src.tar.gz 154968 BLAKE2B c859b2e66044ce622daf695e951666fbeaad4e529cf764cb86dd7e43837327dc21aaaae98cfd915663560f5b33af1497ee9af9e1e02dba7345456e9aa6948c4a SHA512 a35bcf730a9945df029159f5f851b212fd3c07ab94dfb680d4ebdd541dfbc5fdee1cd269fe0d1f14e9678f78c41c47f2c54621cfe81a93e3b4c5c1194f9be9ee
+DIST cpuid-20240409.src.tar.gz 155607 BLAKE2B 0becfb559137cb4b965b3d9e34c3f6d8875634c6ea46afb4a61c9dabd437c345859dce99c5e05fa54b9945a4d2a001dba14b87825ed2b76344571745c072ae07 SHA512 04b3165d2441e4572754412eda330632bd6c0a2a16df4114231030cb991789ecf5507e1ea52f9ea1c84a43b2d190a95d07a6ee2788d8f8a2a6414da127751a36
 EBUILD cpuid-20230614-r1.ebuild 608 BLAKE2B aa200b62c4a747cb023b971149c30f4d6b3c69ea505e248aadd7ae3d8e68166eca457b607c1e953a59660c5486103b4a033cf13ba21de17d97db4355d6dc7dee SHA512 988cb0fb9c34d9cd7f3afb49a289294de88125fec858bb6b3d920a46d869e1b675748301cdb2d869d2397d32eded64b18118004f952a5bab47a1ee36a9d00cf9
 EBUILD cpuid-20240330-r1.ebuild 610 BLAKE2B d07e1630231fdf16335eda46ab506f12c810dcd753e7b78138baab9c1f371790460e1ff51d0ecaeac74ced6bdadc7049e496935e01922a346f1dd6d75089f39a SHA512 e6b88a77b8ca8e7aeb6e66c29ccb5070468cf8348092f879d5d3e3a24d6c606da06b68aa71ea20c948bd164a1a5495850496d9dd6e702d300de45ef96e485eb5
+EBUILD cpuid-20240409.ebuild 610 BLAKE2B d07e1630231fdf16335eda46ab506f12c810dcd753e7b78138baab9c1f371790460e1ff51d0ecaeac74ced6bdadc7049e496935e01922a346f1dd6d75089f39a SHA512 e6b88a77b8ca8e7aeb6e66c29ccb5070468cf8348092f879d5d3e3a24d6c606da06b68aa71ea20c948bd164a1a5495850496d9dd6e702d300de45ef96e485eb5
 MISC metadata.xml 532 BLAKE2B 49d1eb34a9859763d42159adcf9a2dca3128af78aef52cedc4483950084238ba780bd841788f4b27eb72fc44e61c2c5bd264b6c6e2c57824ccf146b6ecad50e9 SHA512 f51db55a3cc5478afba39a42731122db8ac720af8685e093b6952efd2778c9f0668ac936d2a1cdacaf2586d62d0f13240d664a7bd4fbd18236c816e9e6745600
diff --git a/sys-apps/cpuid/cpuid-20240409.ebuild b/sys-apps/cpuid/cpuid-20240409.ebuild
new file mode 100644
index 000000000000..c2868c0d5525
--- /dev/null
+++ b/sys-apps/cpuid/cpuid-20240409.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Linux tool to dump x86 CPUID information about the CPUs"
+HOMEPAGE="http://www.etallen.com/cpuid.html"
+SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+BDEPEND="
+	app-alternatives/gzip
+	dev-lang/perl
+"
+
+DOCS=( "ChangeLog" "FUTURE" )
+
+PATCHES=( "${FILESDIR}/${PN}-20220620-makefile.patch" )
+
+src_prepare() {
+	default
+
+	tc-export CC
+}
+
+src_install() {
+	emake BUILDROOT="${ED}" install
+
+	einstalldocs
+}
diff --git a/sys-apps/intel-sa-00075-tools/Manifest b/sys-apps/intel-sa-00075-tools/Manifest
index 0bec509ceb00..490989c7459c 100644
--- a/sys-apps/intel-sa-00075-tools/Manifest
+++ b/sys-apps/intel-sa-00075-tools/Manifest
@@ -1,4 +1,4 @@
 AUX intel-sa-00075-tools-makefile.patch 620 BLAKE2B 17d6348394b66eef2887b13db9d7071e37add23dc0b1fa482662f33f6a3d5e6e51cc2c50401fe24ff67991db2547467bc27308274b1a824007f8e2ff74aa5cca SHA512 01347eaa8a50731ec21effc80125a6384760e75a954205710b7a813d65e392b2aba002ac521db8ca9fb9cfc1f8a071cf8d988969068415e410987f0473147483
 DIST intel-sa-00075-tools-1.0.tar.gz 18750 BLAKE2B 64bcdf96d79f9b608f7d5a9b691129718a911a76b86a057ecce510e681355165a32fb17c3e3ceaab2736b50898e57345eced4bbb31d7773dcc09e7fdae0156dd SHA512 a42ee0e1553f4638c2976d8a28feb8c91d5ecb9163608f735406a3c80213f34933231320630f43392552fa69674afb1795f23fffef29b4cad45641827130e86e
-EBUILD intel-sa-00075-tools-1.0.ebuild 686 BLAKE2B d9adb09cf9922a6c5544a623beb14aec00b634459c3b1474b86eeb515c97db33599dd078c7829114264c9b2a042bb4161e1e9ea7a00cc54834d758cbc9e42b84 SHA512 a2989947caff57d7b262a10518fb0174f182b9f4cc20ce1161a43fab357860de77e8d68084cf942338d06cce695a037d550038afb32bb5c1859908a4e6d9520d
+EBUILD intel-sa-00075-tools-1.0-r1.ebuild 682 BLAKE2B 42342e852ef9197a5d5c32e45806d778f6f85f66b8b34c3749e475a1afc3d9817f8e2f16369d118a31b54207b54e200ce1519f0e896ece69f2b9224190dd57d3 SHA512 2469be19a37198b829f0c8eee3ca007eee4f47e38fd6c857fefe121e70b949ca54a7623f7d4ae3f622ad92f97122023196c73949d714511df02e728b1ddcda6e
 MISC metadata.xml 775 BLAKE2B 2c3d6bc2d37759e5433b58af7b996a2921ba5f47e453c1e7e3681e61eda399daaa4ad0fb66a68192d578b4794bebc12ae8678c71e419f13382ba0f2c941857f9 SHA512 2b7a388902b1c71bb4d01422ac246c915b039d619068fa9f45159a1f1e9d9055d70bd745c4610fc01e2d1f176dc3b5880df4b7288eaab02c21526fd61641fa4c
diff --git a/sys-apps/intel-sa-00075-tools/intel-sa-00075-tools-1.0.ebuild b/sys-apps/intel-sa-00075-tools/intel-sa-00075-tools-1.0-r1.ebuild
index ad560d576889..e96418f15b69 100644
--- a/sys-apps/intel-sa-00075-tools/intel-sa-00075-tools-1.0.ebuild
+++ b/sys-apps/intel-sa-00075-tools/intel-sa-00075-tools-1.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -10,13 +10,12 @@ MY_PN="INTEL-SA-00075-Linux-Detection-And-Mitigation-Tools"
 DESCRIPTION="Tools from Intel to detect and mitigate the AMT/MEI vulnerability"
 HOMEPAGE="https://downloadcenter.intel.com/download/26799/INTEL-SA-00075-Linux-Detection-and-Mitigation-Tools"
 SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
-
 PATCHES=("${FILESDIR}/${PN}-makefile.patch")
 
 src_compile() {
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 0e97530af584..767848bb0fee 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -7,6 +7,6 @@ DIST less-633.tar.gz 375733 BLAKE2B e9df180794af365f86734c6b8fde766c1bba42b11171
 DIST less-643.tar.gz 592291 BLAKE2B 6dc60dc2e8db05afdae466877a1d26a3008ff5378bbbf2fbdf9efc4f87c0fcfde5703d44a24d4355c98d3a5f438bdb51173150f2a69f801d9c8e4a7401d71b53 SHA512 6a324ac54e22429ac652dc303bc1fe48933555d1cbf8ad7ecf345940910c014fef9551a3219743cfb7115e356b5841ae97d6ce62e7a1ba1e3300d243efca34d9
 EBUILD less-633.ebuild 2188 BLAKE2B 3157e4c5b111b0f1b8e1ef9a9a437474f5380af2b6bbc7e1011d102b6d6cefd788fe2c60bb7d272f0fcdf69db0fd1692c66a42bb47b648f94dfe3281ecdebdc6 SHA512 299d40de3ac0c4d3a9321dca6efbc44aad50066fabe324c0e0cea407469adf374b26887cd4ca1347cec99eb6c2037d3fff2e8cbc764d44ee509759b27f588b1e
 EBUILD less-643-r1.ebuild 2448 BLAKE2B 5b6c29a76f576163a2138b16f46fab51d4a4e8cdd84a14faf6e8f438078c11f6223af5f2bb8b34208775f449b961e9c41b251c705b22c26d28d2157ae5766e51 SHA512 f3e10bc7760f7ce1cd3b9e1177b8a6f6398384208667cc701c72b6c77fbb9d9124f160de9bcccc707acbf826f622a6c691ce27adee700843aaff034e43699fe7
-EBUILD less-643-r2.ebuild 2498 BLAKE2B 9a596baa4300c19026dd159c72483d2cea425fbeade67a3f9f6c81783a2e153f8c3817d130be4e2839db8a33ea00c404154b1c2f4ed482ba5f5a32bde8007d29 SHA512 843b5fa24d64b7e4bd032dcce4dc1c10f807ef497652161ef2db7a400095f30727fd81530856232bce1bd9f591a0f6d91e561826b5d80a4702d58687f2bf27b4
+EBUILD less-643-r2.ebuild 2496 BLAKE2B 2fae4c0ba3d274571a5e5b12123d7daa5283b3167ef33da8d333b028165f091d1093aa317095f3487d393572c1716a5949ce5878f20058a43f570cae3c17970c SHA512 4a13378720500c555f85975bb45324fd4d8c528ec1f116fad50060ce20210b7d86f7c2f6f741c1c091c647c5a066851dede85e7998dcf4589fc312d0c5c22ffe
 EBUILD less-9999.ebuild 2455 BLAKE2B 56d96673aec2ef08bb61b3215dcf8473ca7c4bec84df7ac74475c37b332a369f15d2ddbe7fb93b5bcd0eba048e67767b6ef9b5a17ebdcf97eb7e165c6bcc629b SHA512 d71d25aa70fa1c7b334b302f7d94d49bbc9de16f50854a8749f1650bbbc63f91e416c2aa817ea81fcd7248814b511425427bbb7c5f3f76744493f75e4be61bc4
 MISC metadata.xml 384 BLAKE2B ab69cbf4d7813bc4c96dc1c18ca35454dc9e9202bc95e3ff3b638c79b6cff4f9914fba1e7a35908aa305567a3874d3ead3a78f5faa83c9fbd3027afe12767eac SHA512 d799332d42f1c3115132216b3ba98a39f662d583aecb06fa2590e3da4c03b0ec07bab1eb0bbd397ef8249a5916ca9b457992c226899f66d4f4bef8bf1a20074f
diff --git a/sys-apps/less/less-643-r2.ebuild b/sys-apps/less/less-643-r2.ebuild
index 0b846ece797a..1f7bfd5f8cf9 100644
--- a/sys-apps/less/less-643-r2.ebuild
+++ b/sys-apps/less/less-643-r2.ebuild
@@ -25,7 +25,7 @@ else
 	SRC_URI="https://www.greenwoodsoftware.com/less/${MY_P}.tar.gz"
 
 	if [[ ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 3cd1db7fa431..125db567584e 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -6,16 +6,17 @@ AUX legacy.conf 80 BLAKE2B 23eca4dd1743a5cf77767894d23d419c1663147c5aee6be971da6
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 AUX systemd-253-initrd-generators.patch 1486 BLAKE2B 85a7f714aa1743bd88e01b45624dc4104e4d762732745d9958019063f6ac91ffd89ae84e03f728e6040a58643f253a5ea7f77f44ef71620e686e23aed61876e4 SHA512 f8aab9f4bbf5a73c52144013fd7001dc78974211f11abb58a0f5eceff59b3ebf670409846fff854daec10219074602674176730f85583db0e81275289e89c66b
 AUX systemd-254.9-fchmodat2.patch 9696 BLAKE2B d3e3dbf5af966742c18d6710efc75f13b21e703daa256c37c8d7a2f8ec4247f67687647eb34f38675dbba3e2a9ddd6606a3ca599688d0c2115bf29406521c4b3 SHA512 b28ff60cf0eb3fb58ff26b120721efa39537d0dc10e162ac07cb415db25c98eca98103f833bffcb1b98d4cefb44af8e433c69280b88d1bcd1209944e78ce5c6c
+AUX systemd-test-process-util.patch 1058 BLAKE2B 3125bc8c32a853c59659889ca71360bbc7e87a2e18a15142806b294b88fefc6afdee1b35e7dbacefedad2b541d1d591acdbf29b452a22874403c42467fda0a72 SHA512 1672c643b92eb7cc92aa881103d01431db1c67240da0c264d08c7c7c1b354e74750f84f32c17b95557c10554ba94e832934484ab6609c24b6057dca98cc86c52
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
 DIST systemd-stable-254.10.tar.gz 14428960 BLAKE2B 488c27b9657ec7452f876ab6c18bbfe711f1351afa022801f5a646f2dd1d76d63c17e52e6ebf43b38a76807907287b654a7eaca3afdb0688f5b05839e98ad727 SHA512 0c127d38d0ade8655ae12172c2edbaa8af68bd29f42d965b988d75e74626846ae859bcf0b39b535c9a99ad8c709ad7575ed4d5ea5bc95ce8729e3caafdb32b70
 DIST systemd-stable-254.8.tar.gz 14418468 BLAKE2B e5a151ece86e57c7224fc95bda1b4ede1277fce4a2ba28d3605ab0431a2aafe1088f90c49a20e3b53a5b56aeef7c0f1f5da0601db740150f5efdf6eae7bbde80 SHA512 a3f35d9fcafcccd8d9c33ab1047241f226146017be95562a67c7dcc9eeb4b77bded92ad80e92f4767f2bf2009df0172a621d4c54a805e07ed5a5ed03940ec28e
 DIST systemd-stable-254.9.tar.gz 14423806 BLAKE2B ab39c0a00b8451b24b40e39f4bf7ecb912ff23d9cd6f8d30fd0545e895936baa635b1ff63c02a83761682b72f44244aac8338bf6506885c9b07cd0c5247b6693 SHA512 a0300693a044cfe4c76deb0e3e48a927125eb97c3952c07ba68936f1e093c93506d8044b249b534b8e778ade6143b43194f8d6b721a8cd520bc7bb4cb3d3e5c1
 DIST systemd-stable-255.3.tar.gz 14873273 BLAKE2B e22ef391c691fcf1e765c5112e1a55096d3bba61a9dae3ea1a3958add4e355892a97d5214e63c516ba3b70e2a83bb5d21254812d870f06c16c74a58d4f957d75 SHA512 c2868a53df2176649b0d0c94e5d451c46ba783bcdbc89ce12434ed2d11dba44b4854ffe4c2430f3f64eef2e214cbb51d5f740170afbd9edd66761a8851157453
 DIST systemd-stable-255.4.tar.gz 14952427 BLAKE2B 27f5080f83a9e870fbe8e3ebcb500a63c42022f1f96f26f35c76eeeea85dab691291c31ee716cab330b76df5e576910a6a82f51267eff4f766b1d4c304d815c9 SHA512 8a2bde11a55f7f788ba7751789a5e9be6ce9634e88d54e49f6e832c4c49020c6cacaf2a610fe26f92998b0cbf43c6c2150a96b2c0953d23261009f57d71ea979
-EBUILD systemd-254.10.ebuild 15480 BLAKE2B 64930d2eb7fbca3db987ae14fbb6cead1a7ad259fd723e763b910982b50f7f411d5897dd5dd0aebd38fc3a6690dfe79650009e3f3d21b646606b1b6e514eeee9 SHA512 e3c87b2bde33bea4f50f3a08121af1fe8dfab7832792a7410d54d4a240f9eb5ff71e4809337bca9a4e1540af692d75d04cad63618854225a5eeb1277afbf1116
+EBUILD systemd-254.10.ebuild 15359 BLAKE2B 84800757e9794148b127b5fa11a1da271be1a9f99512e7405d12a0870c133f6d16e540d1d40f7a2717935c8677975577c31380e032a127c5a82d5067c23f7d29 SHA512 f2c0e02124b00a0a48bfe5ad14c7ce900a35ea00ee43c826dcca78c1c315a36a3502ead18b7e0e1881c642eafd2c6a5bc97aae72b6380b5fc5bf3cd33a29432e
 EBUILD systemd-254.8-r1.ebuild 15472 BLAKE2B 22b00b6cefce875f30858d26a8b900096a99551dddda2b2a6a9d4461ad6278bf875254d0b83eab8dbc8b68ef3c647ec1a35cb4bec9cf6d9fec6e723b2539eeaa SHA512 f70748a5b0066598e7d87ee3dc21d3b472c51f327249a0629fc77d24156294b74820442f76597fe5d7ce1d823a6680805e9b2d4aea7a9c1ad0719d494c9de27b
 EBUILD systemd-254.9-r1.ebuild 15526 BLAKE2B 8dcef82b133f49b1916c107575b64e695f0aa2e37aeb41adb9f8e5f0dfa5417343dae73df750c752b85830541b0d6eac4979a432fe9b196476e6a176e93077c0 SHA512 35585c7eb25279b5d668db7ed714e81158b3df57385440225d0267a8e8b7f9f479503de18d5fdfe90c5a29f6f528dc476eb270c7fcdfafa30a5beccf6c050694
 EBUILD systemd-255.3-r1.ebuild 14914 BLAKE2B 1166b26b9b4f9149007879f9502f6923459a4eb2faa8474fc23ef66e76b81a6d8541069e3382f26b3fb75043c0cac828223632181f3007f6637ffc41a27cc37b SHA512 61b4888e9d4f208bcbd32da4c6da7b101d5b757518ff22b8013bdfcac055a70b20e43ff5cf6bd2debc14b73e97cebd1e0cc48f17b40639fefe56e4e30154fab5
-EBUILD systemd-255.4.ebuild 15069 BLAKE2B b39f44c677a9389012840300d063af1ce1738d9a442845dfb97b9f0f421e4ff45cab9ea7ce3709af688368c9d69e527f1ba5b0eac2485a223cf14954bdc7147d SHA512 e781c1b3e09257c54c2942cc6f43a2063abb91715027f323cd6339ba0939d0f498bc3046718cf968aed8c4af8ed0cdce24f1ce601bad986f903969936a1e33ed
-EBUILD systemd-9999.ebuild 15019 BLAKE2B 8ae000eb7ee4807c5097c6bc461b206d367b1346355ab0e4c07b5bbb94c0e8f11d2aeac5d2cd5e20108ada4904f261ec9bec5f7f3e378d264b2573a6702c68b9 SHA512 514aef386cd20133b85c3559f3b6805730f9f8338781215168d4555fd528dc03d29c2e2c70a7dff0f94384d684d494112d4f65f3d8a9c1d6a252b35875ffc3c9
+EBUILD systemd-255.4.ebuild 14946 BLAKE2B f913ad642a88bc874bd520b183681c8558d8c4a0809aa18ad7755dc0443f31e72223aa17a767e08d3ef2a0d7cb98dcf0d0492d884f9094c0bc5f97dfc0f8472c SHA512 30cca08da90aa989ecb4d3cb8ca19653a669dccf7ce2e44c21e42ad5d8a4c692c2d15525a768cdfcef3faa62ad4478dd0665c37f7bfc0ca6acdd2602cc4dd747
+EBUILD systemd-9999.ebuild 14899 BLAKE2B 821ecbb2502896c89a293c75047b79695281127336c8fde824834ffd6390187ebb9c3563e55ae66868fc9591bb41857c9db0f54db2d086a60ef1c1f9c831de7a SHA512 faa9ea73c23062b2cd3e6ce973495364d9d410de95b2847364009fe441adff098c79cac13abd34bc52aea06a962c72ced44000e40e930470950ecc317beb154c
 MISC metadata.xml 2609 BLAKE2B 8947f3b696fbba7b90e838a54fbb4fd933c71907c8011652fc2b7d68d4ce5f78a19f350a309e4c0f66ef0159376c9064ba9c15941ecf1748c359c4ae3b072102 SHA512 dfeea24b7a93f5d4af4ac47b87ba08092d069fb1a4749c0c1f36a669be6115eaea8f67e6183b6a4f155ef90d7714f74299109420d569c2b0545d80584ed0e97e
diff --git a/sys-apps/systemd/files/systemd-test-process-util.patch b/sys-apps/systemd/files/systemd-test-process-util.patch
new file mode 100644
index 000000000000..ec1a766764ee
--- /dev/null
+++ b/sys-apps/systemd/files/systemd-test-process-util.patch
@@ -0,0 +1,30 @@
+From 1d3404701bf0c27600dd44b2814cd6caffca877a Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 18 Apr 2024 00:04:44 -0400
+Subject: [PATCH] test-process-util: remove assert that fails under pid-sandbox
+
+Upstream refuses to fix this.
+
+Bug: https://bugs.gentoo.org/674458
+Bug: https://github.com/systemd/systemd/issues/25015
+---
+ src/test/test-process-util.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c
+index c96bd4341b..4009cf96e2 100644
+--- a/src/test/test-process-util.c
++++ b/src/test/test-process-util.c
+@@ -92,9 +92,6 @@ static void test_pid_get_comm_one(pid_t pid) {
+         assert_se(r >= 0 || r == -EACCES);
+         log_info("PID"PID_FMT" strlen(environ): %zi", pid, env ? (ssize_t)strlen(env) : (ssize_t)-errno);
+ 
+-        if (!detect_container())
+-                assert_se(get_ctty_devnr(pid, &h) == -ENXIO || pid != 1);
+-
+         (void) getenv_for_pid(pid, "PATH", &i);
+         log_info("PID"PID_FMT" $PATH: '%s'", pid, strna(i));
+ }
+-- 
+2.44.0
+
diff --git a/sys-apps/systemd/systemd-254.10.ebuild b/sys-apps/systemd/systemd-254.10.ebuild
index 8faffb898fd8..c85a0b31b907 100644
--- a/sys-apps/systemd/systemd-254.10.ebuild
+++ b/sys-apps/systemd/systemd-254.10.ebuild
@@ -23,7 +23,7 @@ else
 	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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 inherit bash-completion-r1 linux-info meson-multilib optfeature pam python-single-r1
@@ -182,11 +182,6 @@ 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="~BLK_DEV_BSG ~CGROUPS
 			~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
 			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
@@ -240,6 +235,7 @@ src_unpack() {
 
 src_prepare() {
 	local PATCHES=(
+		"${FILESDIR}/systemd-test-process-util.patch"
 		"${FILESDIR}/systemd-253-initrd-generators.patch"
 		"${FILESDIR}/254-PrivateDevices-userdbd.patch"
 	)
diff --git a/sys-apps/systemd/systemd-255.4.ebuild b/sys-apps/systemd/systemd-255.4.ebuild
index de47dde183cf..6ba01385a7b2 100644
--- a/sys-apps/systemd/systemd-255.4.ebuild
+++ b/sys-apps/systemd/systemd-255.4.ebuild
@@ -25,7 +25,7 @@ else
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
 
 	if [[ ${PV} != *rc* ]] ; then
-		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
 fi
 
@@ -190,11 +190,6 @@ pkg_pretend() {
 		die "systemd no longer supports split-usr"
 	fi
 	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="~BLK_DEV_BSG ~CGROUPS
 			~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
 			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
@@ -248,7 +243,8 @@ src_unpack() {
 
 src_prepare() {
 	local PATCHES=(
-		"${FILESDIR}"/255-install-format-overflow.patch
+		"${FILESDIR}/systemd-test-process-util.patch"
+		"${FILESDIR}/255-install-format-overflow.patch"
 	)
 
 	if ! use vanilla; then
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index c035b9a2cfde..9ebc6c14fa23 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -190,11 +190,6 @@ pkg_pretend() {
 		die "systemd no longer supports split-usr"
 	fi
 	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="~BLK_DEV_BSG ~CGROUPS
 			~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
 			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
@@ -248,6 +243,7 @@ src_unpack() {
 
 src_prepare() {
 	local PATCHES=(
+		"${FILESDIR}/systemd-test-process-util.patch"
 	)
 
 	if ! use vanilla; then
diff --git a/sys-auth/AusweisApp/AusweisApp-2.1.0.ebuild b/sys-auth/AusweisApp/AusweisApp-2.1.0.ebuild
index d86746427953..f791a20ba107 100644
--- a/sys-auth/AusweisApp/AusweisApp-2.1.0.ebuild
+++ b/sys-auth/AusweisApp/AusweisApp-2.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Governikus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="EUPL-1.2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND="
 	dev-qt/qtshadertools:6
diff --git a/sys-auth/AusweisApp/AusweisApp-2.0.3.ebuild b/sys-auth/AusweisApp/AusweisApp-2.1.1.ebuild
index f791a20ba107..d86746427953 100644
--- a/sys-auth/AusweisApp/AusweisApp-2.0.3.ebuild
+++ b/sys-auth/AusweisApp/AusweisApp-2.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Governikus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="EUPL-1.2"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 
 BDEPEND="
 	dev-qt/qtshadertools:6
diff --git a/sys-auth/AusweisApp/Manifest b/sys-auth/AusweisApp/Manifest
index 6a0f57b20596..38bd862e9537 100644
--- a/sys-auth/AusweisApp/Manifest
+++ b/sys-auth/AusweisApp/Manifest
@@ -1,6 +1,6 @@
-DIST AusweisApp-2.0.3.tar.gz 9125557 BLAKE2B 6d32e0d451259bfb44ac99dce9dee3e66afd07d5c78c8f033703213888fb68c5d3ee9f8374d1ab79cd364061e78d98ce0c21fc5d6957f601bd88e5e3e6b2489d SHA512 4f492d137c1f38d3ff5ae70afc28d44bd86ce2034166e8ea7ca44e91161301a739ddcf985c76b14147485f6bc4e30e316db50db86eda7e2de1b7344c37091cd4
 DIST AusweisApp-2.1.0.tar.gz 5876657 BLAKE2B 54c8676dda53a667104f8edf8fc70fc4ca736b1207bea0ce2a5fc0a628216ce4f001adac03308fceccbb8ad834d171f364ac6b4e948ada26d6983ede827fd10e SHA512 a7186bdfe3ebd6779588dc6fa219fcc2f60d36c62a8b9956bbdc86e4962120e46b39266e7207cf0de4d84f9212d1616bbec9f8901cb0a112bcfcae1684f3ff75
-EBUILD AusweisApp-2.0.3.ebuild 910 BLAKE2B d1aaf65386b5339398d7ed38d86b1ec8cbb332eda37e111282266c537db1ad55a8f3380f90b64f6fdc442b849471039ce874d8aebd415363d0c831f3ca749198 SHA512 4a1b6322614a3f646b65e52c0f66e9cd2bb79debbe9dc32df8e8c5549b6bd9aa4ccc63305d930a8b1457a794aeadcf6ecbb8286b7258c9d5c264fb49e1f591c0
-EBUILD AusweisApp-2.1.0.ebuild 911 BLAKE2B 5fb0feea2a99816a8426d3ced8847289fa71116ba4456bd0f979d157a6d00fbdbe63745b041f1a5b0bf7f7e2848f7c3d7b410ff05d0917f3089b77b5dd099dfc SHA512 6710189f8e7388b73e27ea70ffeaad233d8d218338cdc8e5efbe280c6d83532a3bdb409d919995031f994a26ccf2c6d1d28568ef82a7cb529fc9cb112667545f
+DIST AusweisApp-2.1.1.tar.gz 5878477 BLAKE2B c2948b51a7a04e36aa5bdfb805cd4ecb565fff5c67e040c0159adb4c10fd7e956e1968f5e12df48057bcd5c09dfd91d79aee781fb2a26319a0c2a3ef1a131d85 SHA512 124e92238b81ae2fd7865bc018ce64723a4d237e214b5166385fe191ae5365b5c9e260ecae8d249355d8dc61df08beea0988a622f6712132e7b164cb7f832674
+EBUILD AusweisApp-2.1.0.ebuild 910 BLAKE2B d1aaf65386b5339398d7ed38d86b1ec8cbb332eda37e111282266c537db1ad55a8f3380f90b64f6fdc442b849471039ce874d8aebd415363d0c831f3ca749198 SHA512 4a1b6322614a3f646b65e52c0f66e9cd2bb79debbe9dc32df8e8c5549b6bd9aa4ccc63305d930a8b1457a794aeadcf6ecbb8286b7258c9d5c264fb49e1f591c0
+EBUILD AusweisApp-2.1.1.ebuild 911 BLAKE2B 5fb0feea2a99816a8426d3ced8847289fa71116ba4456bd0f979d157a6d00fbdbe63745b041f1a5b0bf7f7e2848f7c3d7b410ff05d0917f3089b77b5dd099dfc SHA512 6710189f8e7388b73e27ea70ffeaad233d8d218338cdc8e5efbe280c6d83532a3bdb409d919995031f994a26ccf2c6d1d28568ef82a7cb529fc9cb112667545f
 EBUILD AusweisApp-9999.ebuild 895 BLAKE2B 9f387ed15472f788a161a98556d530b0023d7eb4f8ede4fd4c35a5cabcb05e211ca59f7d1cec952dd7dae5e8378799ed75b7d2a7dca68bad0861e6c04499e055 SHA512 373818c73a3d47b92cfd5992a944313d9a68451abf3f2254aa2c2592862d35ac3c25682801c38eb61b73545e87982e4bc909324171c5621d47453ae4daba7e55
 MISC metadata.xml 337 BLAKE2B cfa80942834326f3877db81df2a01530ebf3a7c13b20f0dee664be8c5f45dc1eebd1f2aff1fd7a6350b14b1d107cff08176e0c46cc853dbf32ff502b0c0a671e SHA512 00b4aeca40869fd8e2490829d6b52f9a7b5520bc78b7eca0dddf287a4028e34b07c4e308b32447541bae342d41f5d08b01f30f4f836551bbf2c17f9bb49a0d58
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 17670f17cc4c..da199bbc63e6 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 5359f7a275cc..a33c6d8d93ee 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/poolmon/Manifest b/sys-cluster/poolmon/Manifest
index 2b3562c42fcd..02fd69dc4ec4 100644
--- a/sys-cluster/poolmon/Manifest
+++ b/sys-cluster/poolmon/Manifest
@@ -2,5 +2,5 @@ AUX poolmon.conf 67 BLAKE2B 33ea31b0decdcd7d2ff660f813af4b8c9bade3f0abeaab40dfcf
 AUX poolmon.init 416 BLAKE2B 8c96021af268786248cda12f669dc120878cfb454c1a947ecfba6c74b313950fabdcfc771d8cfa9ca01ad696c1ee40372658b20f184b7508c31bb847e97620b3 SHA512 f82e806ae9b57dc91a42e53ff1a7ce40423a48c8220616be3bf3ec0e9b2035baed2304b9e82fab0a8cc2ccd3f8e8fb325b319f587595d4c31f66db84b47f9e59
 AUX poolmon.logrotate 132 BLAKE2B 0dbddd9ab47494e5410779e24dd60bffd16339638d7dc9994937200c36ea12d50393ee2abcc7fcabfda05271ee511c89d5f045e5643970cd62e4d320e7056d41 SHA512 b18cca84d2d12aca84a5b53369631a34cc93d58fd74877c38f7577e68657510d741e3897e42b8ceab8c8c109916d1992dbf7bc4bb886803c9f3de7e640738590
 DIST poolmon-0.6.tar.gz 7460 BLAKE2B 2be5320c9c8ec5df7aac168e141ffd2ed09415bebb9b817a536fb180385371012fc1f88d09b682b0a016fdee3122d6f9ed47d3956c49c65016c35e572d7fbbe2 SHA512 8a702acd57093ba8806c4135cddc421979c718a881c8a49de3aea70b0f05c041a66dd04b838e5251fd05ccdc694d00e85d5894d677c2684baf5231b4ce0a1453
-EBUILD poolmon-0.6.ebuild 650 BLAKE2B 2f83a5c5abda3e9033d649b2fc3f1d13cd8760875e241a6f441bb72a8ded144a59fe1c3317e03825923f86037e78d8e740dd8d5b76faec053899aaf03d9386e0 SHA512 db28f9e257ed54c55e3593db4b8c8889758fb18db1c9cf6ebc1ff55c7a522536ff9d14c2294717fc5f61bcc67b7400f921c3f6144dcca490c0bbd0020f6c5b23
+EBUILD poolmon-0.6-r1.ebuild 628 BLAKE2B b97262cc2270a7b0e27c146709af3085875d5847f0bc809df42e350c3a241eb6b916fd1ed0238835e83b6f110755e9302289a5abfca4dabcf35d91d284539259 SHA512 a44b1e3cfd5ac3dc8637f665b3c306ad726b32b3dfb58126652f63003d7c1f7bb7ecf630ae2c087fb78c4aa326d4387093002b75fc877c43f3581fed2ca19c3d
 MISC metadata.xml 342 BLAKE2B d9f0df6515e9690b3b995a5c9330561d3838348a18f75646d5d0a9849ed30575611b61ae4d716bfaaeded3cc2a11350710d23aed466c736ca3e2bb059b70480b SHA512 fff0505cfec0f8fd2a96c4fa830446c0b34a37148256e2317adcfa8053c22384a4a19078e3dce06a9b2aeb4240dfdeab73aa8939980ca05f4bc6e930a69b009b
diff --git a/sys-cluster/poolmon/poolmon-0.6.ebuild b/sys-cluster/poolmon/poolmon-0.6-r1.ebuild
index b66b1ce8c23d..21b86f964dcb 100644
--- a/sys-cluster/poolmon/poolmon-0.6.ebuild
+++ b/sys-cluster/poolmon/poolmon-0.6-r1.ebuild
@@ -1,18 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-DESCRIPTION="A director mailserver pool monitoring script for Dovecot"
+DESCRIPTION="Director mailserver pool monitoring script for Dovecot"
 HOMEPAGE="https://github.com/brandond/poolmon"
 SRC_URI="https://github.com/brandond/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND=""
 RDEPEND="
 	dev-perl/IO-Socket-SSL
 	net-mail/dovecot
diff --git a/sys-cluster/rocm-k8s-device-plugin/Manifest b/sys-cluster/rocm-k8s-device-plugin/Manifest
index 098533876013..4fbba8216005 100644
--- a/sys-cluster/rocm-k8s-device-plugin/Manifest
+++ b/sys-cluster/rocm-k8s-device-plugin/Manifest
@@ -2,4 +2,4 @@ DIST rocm-k8s-device-plugin-0.3.0.tar.gz 5188051 BLAKE2B cff5a5eefea521fc398a3b9
 DIST rocm-k8s-device-plugin-0.5.0.tar.gz 6297528 BLAKE2B 8fed4af34e2639eecbcd6e8b238a9a964203693e9f7458486a4e36d61b83908ebcb72f7d582b0fe240518a6e3eed5e38403be265a600af01383b860075097ea2 SHA512 56b38d9f1c516bfcc735dbcf1128ab9f7967871295c214ebb474d7fc3ed18822b6389dc5fae08e54a3735fd0704b67d71e9beba6066f313ed69c1d7c9c8fad2a
 EBUILD rocm-k8s-device-plugin-0.3.0.ebuild 840 BLAKE2B 5892b27256156d6ac2fe102faebd708302c7706c1579921043583d241e9f4544c70855b4c08089708665f1a9c85bd82476a7eb4fc4915c8da23e58b2c81e1200 SHA512 305495b731682cfdacabe188914190c271a98d001f53c09dde724fdd2de354f17265f5a8a459a4e3530cb28de3ca99a276c8a676efe689cd2afc648a26154832
 EBUILD rocm-k8s-device-plugin-0.5.0.ebuild 850 BLAKE2B 002474fb2ed023bb83b7975d85e02f43e9e8bc4805c066b5722396dab66c7297fd483edcce247c02d181ba8eaa43433a903bd7961a14f5860252b3e0fc6d7393 SHA512 e6483c67efcd0755c9ca6f2f7a8b8bf1e1282ffc6107776b5190614da83aabe095a225551a2b25717341b8c9e85812ffc21d768ca40cccde12313d8920a3167d
-MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
+MISC metadata.xml 336 BLAKE2B f173b0002c40119616da17a5306e22a97f9510ff444981ec2b9415bd13959a81566f1e25339ee43d427fedc378cd729d780d653338979284b8da3c74da1be07c SHA512 901163967dad64c0ee5908b911b47ca41b6fc6480623a692d58af7cf903b4b68e5b2d4b7b974890c3d0edd68f3882b936c1c104754a4c9d6b2b00cb1714519f8
diff --git a/sys-cluster/rocm-k8s-device-plugin/metadata.xml b/sys-cluster/rocm-k8s-device-plugin/metadata.xml
index db463f3eeb66..08c9cb683ed6 100644
--- a/sys-cluster/rocm-k8s-device-plugin/metadata.xml
+++ b/sys-cluster/rocm-k8s-device-plugin/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">ROCm/k8s-device-plugin</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 687e49dc421b..455022a17e24 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 8f06c1591cbb..9b2dde6a1393 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -3,8 +3,11 @@ AUX 0002-io-Adapt-to-64-bit-time_t.patch 1641 BLAKE2B 51a74717f974b24543e8a9151a
 AUX 0003-build-Request-64-bit-time_t-where-possible.patch 1297 BLAKE2B 2e2a379aef0fc803cfb319919f19c51917e2084fe13ad72f9c62f97cd7561a0262fd192cc7625a0ac52c9bbc4611eb31e61984edfb1b52788fa2346f236eb56b SHA512 022267f15c044d595b6a52e91e0802b98ae2f3b4b8b921b64fc79dadec498473f3053ba19c6fb44766fe4ff8bdd85df577c77030523524c8079ed47e4d06bd51
 AUX xfsprogs-5.18.0-docdir.patch 278 BLAKE2B 5277fff17f26b4da946535a430878bfe1e91f92f41c44f2eaaac80703d58176f8d15e14f0586fcf23f29ce207f193303dc662ae5cca6877d6eca9f5ae698620f SHA512 0a94f24b292bece9786bceb99100c25b6d697b9ecf1566bb52b8266683e3adaee415bf7d79c81eed7f2adf846f982f3d91122c9a6dcbb7e16231983037fe9cae
 AUX xfsprogs-5.3.0-libdir.patch 1137 BLAKE2B 7e455b8b82c553a819155fb4c1fee3d5c31bef0fa4c7ab0bf4ad4558a9a5b0b2f408138558c3601deb3ba85d465ab2dae5248bc20a4ba83f08cf733b27a796a1 SHA512 eaec31b6dab500c2e9c4fe7d5d82e60a40f3073cff99af0ae2aa817f6e4541f6a3de0a48f9151a274c6dd97e99ca26192b95b920aea1c5227d75232b808c98fa
+AUX xfsprogs-6.7.0-fix-porting-to-6.7.patch 6103 BLAKE2B 4dae3812b6c40892ed7a8605cd46f117997c4dcf0d02c2402670c5294a2e5d6a0cac11743d90b0578d7544906d1d25da7ca6da6baf2cae76a995b8acad734cd1 SHA512 36b576afe505173f71b4848c064e6b9a4031ec831df32cf3b9726544941408a03a8f64cdd3aedfb9a264213705850e72258cef6ab542c4278c087f338d8d5905
 DIST xfsprogs-6.4.0.tar.xz 1344720 BLAKE2B 566a80a1fa90520c6cc2b20c8e8cde41eb83a48f0b6d4a978f9e5d43960e99b54cab3e0c2cd4147a3d8f4944e50876063fc571441c8239d6deaaa01604843a6b SHA512 831e7747640bc2964b182226d8bb6f637610b123aeec9b3cb97a5de5d5b65bde30c6b40ad2e78de6a5214e823dd75de3a2bdfddd8ab1638f5c7340a760c91b3f
 DIST xfsprogs-6.6.0.tar.xz 1351792 BLAKE2B a479126ed19389c057af28ac3564893826a6d27859984cfadb28b17663759d8f19b1796031d43f294bf8001f5ddda8854b6b0d90d0229092bd31fbdf6e5d1554 SHA512 89b4436a958075ac77cc2b5b5f0618164d47f7d6fbc2271a7927c886fba7bf67284e1825c1ecc259969235222b4d084a40c354edb6d83c21029d737108aa38da
+DIST xfsprogs-6.7.0.tar.xz 1349748 BLAKE2B e16db682cafbd35266e9130a64943c19304174ebd501e30aa32fb8f0d1904286ccdef62c0820480541c7272575d770eea7e73e7dc83c0b452eb5fb2a3a7085ca SHA512 4f543e4c5c4e88e4f9ce16b82ca1151330f687469368fe7470b68e8bb21d1d3c7280eb2e691d3bdf24ae3d4fa2ee5764dc34637198bca0d4ffa65eea2f10ac74
 EBUILD xfsprogs-6.4.0.ebuild 2442 BLAKE2B e3c81310b54fffc95322f9e0ff1c6cc74a29ee08d31f98bd183405cfef572830829049bcdf393cd59c337415196e6f69cbc065c1b0d09ccfe2dde487fd281b7c SHA512 b69bd26d92c5c0d6988778867485c40b21dcfe7d1a7f6e357620933a31a68e2b3035ceca27ceff5fba8f8317d73b7c09f201f6cf61ad0801289878c5383f0add
 EBUILD xfsprogs-6.6.0.ebuild 2632 BLAKE2B b71bec7b14c345cda6fe0fce490a524d3e5ebb4f2906aa61a777d3c14852369df0ac4edd752753b75001c912e8d5b51a2d136effe318b7d1c6309810d2cb8888 SHA512 90ed981a0161cd1398b287e4572a82120b46204b3070b30f03a5130b646fe128876a059ddd12b52bac60dcf71d5e1e8517716c6e86da260e46cf978c418367b8
+EBUILD xfsprogs-6.7.0.ebuild 2489 BLAKE2B b4402c8334294d17c55ba32c7bcce269a0d88d804acf55d31ad6e1553ae872efbc6d86581a8a90bceff38ef9ab80066ed444d8115d71d84d1811145eea1e6c0b SHA512 90128b5a9599346043be72ee87e8f5caac4094e7ab2c4bf2f37154dfa84ec3127bfe2ef84f955b77ef070bda0c201ceb9c91bea99e7feecf874aec5a37219f95
 MISC metadata.xml 339 BLAKE2B b7d67fc8bcf854e7a2453c23e5d5d8c193525ccd16a643e80415a103d2d22c892458ea6ada32653d04b3d471c780f07b2b0537a317d9e64468130e065c6f5ab1 SHA512 445b4f6d853a272cc6bf8fde42745adf226512fa310f9af4bbabad4cfa5a6888b2c2215dfc0896c07b800820b69417c6d408bb21ed17a5224b5c9e3412c5f62d
diff --git a/sys-fs/xfsprogs/files/xfsprogs-6.7.0-fix-porting-to-6.7.patch b/sys-fs/xfsprogs/files/xfsprogs-6.7.0-fix-porting-to-6.7.patch
new file mode 100644
index 000000000000..fcc30d170a8c
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-6.7.0-fix-porting-to-6.7.patch
@@ -0,0 +1,157 @@
+https://lore.kernel.org/linux-xfs/171142126323.2211955.1239989461209318080.stgit@frogsfrogsfrogs/
+
+From mboxrd@z Thu Jan  1 00:00:00 1970
+Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201])
+	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
+	(No client certificate requested)
+	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 80EBA128387
+	for <linux-xfs@vger.kernel.org>; Tue, 26 Mar 2024 02:59:42 +0000 (UTC)
+Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201
+ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
+	t=1711421982; cv=none; b=BWaXePO42YIrz9dUA7DXc3SL5MWIoC+liDfJkd/1AM/cv7gR6JRGHa5e5W3sXZFsI6S6pH/fKSEijUigTR0kiRGPFWbeCiDWEGQdq6y4AChFbZMTfQSg4Jei7pONholMK08CyBQ/K4UutICyqbos2cdxAGKKjNPTIOtdQdkiHdc=
+ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
+	s=arc-20240116; t=1711421982; c=relaxed/simple;
+	bh=qfMP8tvVLZAoDkRmqI3ZwhMEx6csbe2+Xclngz+n+GI=;
+	h=Date:Subject:From:To:Cc:Message-ID:In-Reply-To:References:
+	 MIME-Version:Content-Type; b=O5h4CVWF9TsE/Yho55MGUjmR7zhvoPO0EhXK59BWm/HSUFB3D7vD+ozThDlpENzz0iLrKzdR6aPYBS78cRpOzAszO4ZnMf0HPbFlLmlsIHK/ha5XFPO2qrmLgOGUkKKZepgXIROIA9knDYpxuvlWHnOptPf9birJvyR0gztAEyw=
+ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dkgsPgmY; arc=none smtp.client-ip=10.30.226.201
+Authentication-Results: smtp.subspace.kernel.org;
+	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dkgsPgmY"
+Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0A482C433C7;
+	Tue, 26 Mar 2024 02:59:42 +0000 (UTC)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
+	s=k20201202; t=1711421982;
+	bh=qfMP8tvVLZAoDkRmqI3ZwhMEx6csbe2+Xclngz+n+GI=;
+	h=Date:Subject:From:To:Cc:In-Reply-To:References:From;
+	b=dkgsPgmYjqxxC1yEflpaDSaicJ6J1MpL6wH2GNkbwb7jHMXma/nM8+TuJ7ITuHQGY
+	 WXTMKAQFvTq29s+IWJaQZtuCfgH6cDQ3JTkRcjvg/OgSTo0X+aqxadBBnAjO4AP5/P
+	 hX4gszw3hlZ8oDjMvW9Wl6nLyDmR82rshZOTF4hZfQ8mkbU3Vzcsg2QiPQQzzKgfon
+	 3c/GxXIQ7V2jg37MBrPpNRYPvqBXWn1X/EkR0wuFiUtw9fTJ6Wyt0Vr6/vemAf2U+S
+	 gwHkISopsTOE3k8cCYYf7LXqmtU3PLOOqWBDol6TkWe6OgIOMSljoytIkFq1up/zhz
+	 LHrtnfD5yRlLg==
+Date: Mon, 25 Mar 2024 19:59:41 -0700
+Subject: [PATCH 01/13] libxfs: fix incorrect porting to 6.7
+From: "Darrick J. Wong" <djwong@kernel.org>
+To: cem@kernel.org, djwong@kernel.org
+Cc: Christoph Hellwig <hch@lst.de>, Bill O'Donnell <bodonnel@redhat.com>,
+ linux-xfs@vger.kernel.org
+Message-ID: <171142126323.2211955.1239989461209318080.stgit@frogsfrogsfrogs>
+In-Reply-To: <171142126291.2211955.14829143192552278353.stgit@frogsfrogsfrogs>
+References: <171142126291.2211955.14829143192552278353.stgit@frogsfrogsfrogs>
+User-Agent: StGit/0.19
+Precedence: bulk
+X-Mailing-List: linux-xfs@vger.kernel.org
+List-Id: <linux-xfs.vger.kernel.org>
+List-Subscribe: <mailto:linux-xfs+subscribe@vger.kernel.org>
+List-Unsubscribe: <mailto:linux-xfs+unsubscribe@vger.kernel.org>
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 7bit
+
+From: Darrick J. Wong <djwong@kernel.org>
+
+Userspace libxfs is supposed to match the kernel libxfs except for the
+preprocessor include directives.  Fix a few discrepancies that came up
+for whatever reason.
+
+To fix the build errors resulting from CONFIG_XFS_RT not being defined,
+add it to libxfs.h and alter the Makefile to track xfs_rtbitmap.h.
+
+Signed-off-by: Darrick J. Wong <djwong@kernel.org>
+Reviewed-by: Christoph Hellwig <hch@lst.de>
+Reviewed-by: Bill O'Donnell <bodonnel@redhat.com>
+---
+ db/check.c            |    1 -
+ include/libxfs.h      |    4 ++++
+ libxfs/Makefile       |    1 +
+ libxfs/xfs_rtbitmap.c |    2 +-
+ libxfs/xfs_rtbitmap.h |    3 ---
+ repair/rt.c           |    1 -
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+
+diff --git a/db/check.c b/db/check.c
+index 9d5576c333b2..a47a5d9cb5b4 100644
+--- a/db/check.c
++++ b/db/check.c
+@@ -20,7 +20,6 @@
+ #include "init.h"
+ #include "malloc.h"
+ #include "dir2.h"
+-#include "xfs_rtbitmap.h"
+ 
+ typedef enum {
+ 	IS_USER_QUOTA, IS_PROJECT_QUOTA, IS_GROUP_QUOTA,
+diff --git a/include/libxfs.h b/include/libxfs.h
+index 9cec394ca407..aeec2bc76126 100644
+--- a/include/libxfs.h
++++ b/include/libxfs.h
+@@ -7,6 +7,9 @@
+ #ifndef __LIBXFS_H__
+ #define __LIBXFS_H__
+ 
++/* For userspace XFS_RT is always defined */
++#define CONFIG_XFS_RT
++
+ #include "libxfs_api_defs.h"
+ #include "platform_defs.h"
+ #include "xfs.h"
+@@ -80,6 +83,7 @@ struct iomap;
+ #include "xfs_refcount_btree.h"
+ #include "xfs_refcount.h"
+ #include "xfs_btree_staging.h"
++#include "xfs_rtbitmap.h"
+ 
+ #ifndef ARRAY_SIZE
+ #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+diff --git a/libxfs/Makefile b/libxfs/Makefile
+index 010ee68e2292..6f688c0ad25a 100644
+--- a/libxfs/Makefile
++++ b/libxfs/Makefile
+@@ -50,6 +50,7 @@ HFILES = \
+ 	xfs_refcount_btree.h \
+ 	xfs_rmap.h \
+ 	xfs_rmap_btree.h \
++	xfs_rtbitmap.h \
+ 	xfs_sb.h \
+ 	xfs_shared.h \
+ 	xfs_trans_resv.h \
+diff --git a/libxfs/xfs_rtbitmap.c b/libxfs/xfs_rtbitmap.c
+index 8f313339e97f..fb083499070c 100644
+--- a/libxfs/xfs_rtbitmap.c
++++ b/libxfs/xfs_rtbitmap.c
+@@ -931,7 +931,7 @@ xfs_rtcheck_alloc_range(
+  */
+ int
+ xfs_rtfree_extent(
+-	xfs_trans_t		*tp,	/* transaction pointer */
++	struct xfs_trans	*tp,	/* transaction pointer */
+ 	xfs_rtxnum_t		start,	/* starting rtext number to free */
+ 	xfs_rtxlen_t		len)	/* length of extent freed */
+ {
+diff --git a/libxfs/xfs_rtbitmap.h b/libxfs/xfs_rtbitmap.h
+index db2f8c924b05..c0637057d69c 100644
+--- a/libxfs/xfs_rtbitmap.h
++++ b/libxfs/xfs_rtbitmap.h
+@@ -6,9 +6,6 @@
+ #ifndef __XFS_RTBITMAP_H__
+ #define	__XFS_RTBITMAP_H__
+ 
+-/* For userspace XFS_RT is always defined */
+-#define CONFIG_XFS_RT
+-
+ struct xfs_rtalloc_args {
+ 	struct xfs_mount	*mp;
+ 	struct xfs_trans	*tp;
+diff --git a/repair/rt.c b/repair/rt.c
+index abe58b569c0c..9f3bc8d53ec6 100644
+--- a/repair/rt.c
++++ b/repair/rt.c
+@@ -13,7 +13,6 @@
+ #include "protos.h"
+ #include "err_protos.h"
+ #include "rt.h"
+-#include "xfs_rtbitmap.h"
+ 
+ #define xfs_highbit64 libxfs_highbit64	/* for XFS_RTBLOCKLOG macro */
+ 
diff --git a/sys-fs/xfsprogs/xfsprogs-6.7.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.7.0.ebuild
new file mode 100644
index 000000000000..c412012a15f3
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-6.7.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic systemd udev usr-ldscript toolchain-funcs
+
+DESCRIPTION="XFS filesystem utilities"
+HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/"
+SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="icu libedit nls selinux"
+
+RDEPEND="
+	dev-libs/inih
+	dev-libs/userspace-rcu:=
+	>=sys-apps/util-linux-2.17.2
+	icu? ( dev-libs/icu:= )
+	libedit? ( dev-libs/libedit )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.3.0-libdir.patch
+	"${FILESDIR}"/${PN}-6.7.0-fix-porting-to-6.7.patch
+)
+
+src_prepare() {
+	default
+
+	# Fix doc dir
+	sed -i \
+		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+		include/builddefs.in || die
+
+	# Don't install compressed docs
+	sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
+}
+
+src_configure() {
+	# include/builddefs.in will add FCFLAGS to CFLAGS which will
+	# unnecessarily clutter CFLAGS (and fortran isn't used)
+	unset FCFLAGS
+
+	# If set in user env, this breaks configure
+	unset PLATFORM
+
+	export DEBUG=-DNDEBUG
+
+	# Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
+	# However, we have to provide an empty value to avoid default
+	# flags.
+	export OPTIMIZER=" "
+
+	# Avoid automagic on libdevmapper (bug #709694)
+	export ac_cv_search_dm_task_create=no
+
+	# bug 903611
+	use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
+
+	# Build fails with -O3 (bug #712698)
+	replace-flags -O3 -O2
+
+	# Upstream does NOT support --disable-static anymore,
+	# https://www.spinics.net/lists/linux-xfs/msg30185.html
+	# https://www.spinics.net/lists/linux-xfs/msg30272.html
+	local myconf=(
+		--enable-static
+		--with-crond-dir="${EPREFIX}/etc/cron.d"
+		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+		--with-udev-rule-dir="$(get_udevdir)"
+		$(use_enable icu libicu)
+		$(use_enable nls gettext)
+		$(use_enable libedit editline)
+	)
+
+	if tc-is-lto ; then
+		myconf+=( --enable-lto )
+	else
+		myconf+=( --disable-lto )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install
+	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev
+
+	gen_usr_ldscript -a handle
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 70bddb534101..ece183bf446b 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 2e48b8d9131b..d16c4c9f3447 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -26,6 +26,8 @@ DIST genpatches-5.15-164.base.tar.xz 6702232 BLAKE2B 2a65783ebd23392a767ded40028
 DIST genpatches-5.15-164.extras.tar.xz 3940 BLAKE2B f1a166e7982c6a6968a083fcf60b6e383d148c17562403035ed8168ba16d045e56384528694752cd614b7aeade23fda879ab298c704bb297278af554ea6caa93 SHA512 a78b7eb2a98194a08b836358be7b8249cc280216056caffd95cea98dbeb62e01c04012c864031d5f9f16bf132b154dfc4922a4550127192c8307ab61da3937d1
 DIST genpatches-5.15-165.base.tar.xz 6711916 BLAKE2B 1c77612af16b5111c89c5f9ec8624f82ecdb8cbd18afaa25d72c05853cf63f6206101fbd19b9beaedc9689f7a14ebd9b6c6b6b559b502282489e6a558e48afca SHA512 46c196486d96644d9991ea93b44dfcc524fd7ea68b7bbc549f6eaa8d99ef5dce039365c727157c7bffa6f389503d92630b4d750ee482bbf67def2159daad766b
 DIST genpatches-5.15-165.extras.tar.xz 3936 BLAKE2B 6556f3659c1cc3f85a06c3e8204e3a1d013e016afe4b1b28c5ef1f43ef7ab47847d16f5d969dde9c7dd62ac7e35ee69ae2ed3eb1651ab66d73b3a9ced0e603cf SHA512 c3f3131b930fdab97b3014e884b94f91420585c686aa96c3dd88a6a9579e06d0377d4bb7d50590eb4bdfb6aee7707499f4ea92fbdfc6d982f5551dafd07b3c6f
+DIST genpatches-5.15-166.base.tar.xz 6725224 BLAKE2B f19d204334748c6c5befdecb51cf9250f87f022599fd5d3c04053a9326a0832ea370b0238dc7167fe75b36e97118799dc3739b7313f92ba30143f7e2ca6c71ed SHA512 f200cb2ef8266f84ae9865f506dac6bd938383c56c3197c1ec722fb3698f14c2f6c3ffec284bb45e695877f99d8da29e7d73d16191bd81ac142eeaf55835a012
+DIST genpatches-5.15-166.extras.tar.xz 3940 BLAKE2B 6db1809d2ff7d407c12a461c737a80ddfd0a91aa762ad2624613640202f9a65bc39b538007826740f42f8aa210b13f2936124737c5d5793a94a9778456135445 SHA512 45d025bbede7990ac1a8f285a6c27d4df79aab77842ec2f63b7e2e44b53b27f00da5e3866ced56fde852453130dc0930e8a1b2e95873af4c2d7a663649d1f800
 DIST genpatches-6.1-83.base.tar.xz 4358680 BLAKE2B 0ef9de04e2bdbfd4cdf2942ad1e1b27b8a314b07409cd7c140d0cc2783679a135eedd7d08860ed9fb6256115dbfbcbab5cd3d15522733bd72ec3d4d918fdc96e SHA512 544630385153defad073422da90ec6710d0b4e3444ca1843017b1f1b855add852045c0a1d7e8cd68c037746c4c23e8ec24df747469e177519384ca2e8185cfda
 DIST genpatches-6.1-83.experimental.tar.xz 17456 BLAKE2B 1c87dd4cbe085c2cffdc63602b76a35971dca4bd710b257eed536d05377cd485de58b939290428006d770db60c851de5610e14be43f728d185fe80627927c7cd SHA512 d9189c50f63889865747da485a8359cd8d08f461e37d4a408c26a50f4909b98e6548facfe711873f071768203e2ec1eeeb4ba91d2229c81c0553c151c68f15ef
 DIST genpatches-6.1-83.extras.tar.xz 3816 BLAKE2B d22ef26f4b321319ce84b7bac4b345759519ce1bf4b821fd85590021f93c80242506b4ebd3cfca6ad4c1e56dc8d3600e54a0b459f07eabe0e154b03a0a1bb37d SHA512 086b04be251177d98038fc2aab2b4110aea45144996b3e50d7803e331a5660cef9e4c7d6fe794905dc8a22065ab8ecf4b5eb5f94e8db59df88a2c861c09c2505
@@ -44,6 +46,9 @@ DIST genpatches-6.1-94.extras.tar.xz 3816 BLAKE2B 1f542b22b91ed285938cfbc6eef5f6
 DIST genpatches-6.1-95.base.tar.xz 5062256 BLAKE2B e08c254f1e2e2a062d2b8026109d72553ca8083b170f0a4424c78ac53802bd5bf54d23195dd89f748ef6c253bdf1058cdd65a6f548d0b0a5378b8636b63c3908 SHA512 0607276c857bd40a96e74fafea00d11c0ac80a3801a3cb320230463be1f6ad52727f0081261194a6fff1b0d644b3561663eb51cb3c36778c5827b5859e0923d6
 DIST genpatches-6.1-95.experimental.tar.xz 17428 BLAKE2B 7216dfbd36ae5d1c2743c2f481cfacdd8705783e593d0c5d305e5a55b053611ff00eb542d41d12316659bb98f3439012b5e9ea78cb72fa3f2a8013e0feb54e9c SHA512 014cf2ff9a6626e8d3f96d02a739bec5b1c157874c71d5281df83d0e79b2643c91d44f00c08a427deee607a43b30b790881ba6ef48704983cc0705c731c68460
 DIST genpatches-6.1-95.extras.tar.xz 3816 BLAKE2B b1fd3b8c0cfdf227a96084fb8eb2ac99d9ff5d45bc3b3092818accd4253e677cb4962e7a554d3510a3bdc62dcad9b7ae22f549f15e0478241fa2c6d19a45da97 SHA512 73f46044c7d64969a287cbb269c9039bb1eb1d537fb1cdcfe0bc3772b9fa220419abda8ef5395d3d0d06ca80d3761a6eda610251cc825b79fc7fa3b4b0c1cd99
+DIST genpatches-6.1-96.base.tar.xz 5079348 BLAKE2B 97ea3473a5189a92ea4478ff82051fb6b9b48344284168902c98674f4d093e2d9e8deaafc5e6ffdfe4653c7aa41bacb5c094f867dba3e283bf2fbb236d753d80 SHA512 3e7f9a56a0767b7532c89460c156d663e2bed069223c27f7b6d5ca7084c3ee869b00bd63a844989c4801e29e442ddf7889c4a025af97195228e181564d8f087e
+DIST genpatches-6.1-96.experimental.tar.xz 17440 BLAKE2B 2acc2e1b687ef8128db6b65e5d4326ebab01d31b1157f72b05c663121a8ccb11660ca58dc7410caf1c501e6c7987e69660d9861d589c4c62d66d645e040ca766 SHA512 4818f284a63763d444d50897a408b728d35c5fd6c8c2fd548925c823ff83f5b9591919e27c486c6ee97258566f96ea9c3f3a774e268391cb2d553fc167fc8030
+DIST genpatches-6.1-96.extras.tar.xz 3812 BLAKE2B 506642a22002bf8bd3607d2bf060740e29d1a6bb649b0345f751c83e504f1084bf0bf279e69c7f52fae517acd7b166c32861f5263d843a02384d12b7f6e04e9c SHA512 1c5a7f9e3f28d2db1d0136a037d32c30cfe754186491970addb9f3b8d24bad851e9472c028e6eb8dcc71bf892a227d7a7e606fa7b7210cf11f79b6d8a063617a
 DIST genpatches-6.6-16.base.tar.xz 750868 BLAKE2B 13af5286f51a69dd0ad7b2543bcf0d933865e14c4c865e495f3225a8740bd7579858cbbd72a2099333e8dc241900c166730d4c812183f2636bf3d4049156a71b SHA512 70864a69f8bdb28f8fa3515a33be510a2c529a5c3bc767aede2dae1c290869491d776336be9983259685af9fee2d2bc61c821d0103c47e91b69078bf81fe2c63
 DIST genpatches-6.6-16.experimental.tar.xz 5756 BLAKE2B 48c2224ae8759ebbd36f8fb31e720b2df2d8c0a519ae5990e5d5947b04c7a1d0bf515fa2cf4316f3c84885ee643734da2cd4ea80ed6ee0bbdc73d12025d1c132 SHA512 81438179ea1d3a202a8631400727f854f938182118dcafddf7faedb12f2b69df834ac349d75cfe0ed84da422d7613d4a45723668ead5f076780d2c3236145cd4
 DIST genpatches-6.6-16.extras.tar.xz 3704 BLAKE2B a33d9a80926abd8318f124fa6aa25f7181b88a6965c17908232ef2b866a27a5e856e464895994599265e0e57d8e1f81561758df4670f25ef5694e5d5f535ba95 SHA512 8ee1686a16886320b698ac0e3767804fc9bbaf595335203fb2899c727a0ca0f3e551ac13b3cbb97cec8d91e77257aa1da75669f1c41d263960875e9d31303b1a
@@ -65,6 +70,12 @@ DIST genpatches-6.6-33.extras.tar.xz 3704 BLAKE2B c337062a967a4261f48d3a571d4267
 DIST genpatches-6.6-34.base.tar.xz 1827752 BLAKE2B ad39269523df3e740205d812d3911da9a70e2117ed671d30b68cfc22ff3c3dcee24bc4731806fcefc7684e815019665f02c2a0ae6c8df52ef5663b57c1ed6b46 SHA512 ec1f5641cf3765833ffbd2f43454ea1c8581f942eb5d55cc894da7caad768d4f77ca579c21ef981773b90a97779965c42de32e944b99f6f8c30068910d951479
 DIST genpatches-6.6-34.experimental.tar.xz 5756 BLAKE2B af4ea385208e7ebc4ab59b8e624fe7b6e81af654c5cb9f6866435f8cf0b029d1e4a247675ceb8c487ddd7d7b39269ec21f18d7a6ebdcde98007aa30b34c89795 SHA512 3157a903571dc229406744c44d7f296c92d47f774ccb4d71faa20bea9c200f2973b98b2147b468a53a09977773f8ff3b23bd66be5106a99917ff27010a70eaea
 DIST genpatches-6.6-34.extras.tar.xz 3704 BLAKE2B 7e5ad01a7ef80cdce8a974ede1efe530278de1b551a173674910686860bd12b76b9569bbcdad57fc6c65cc28d9c62c84bbfa0297f4cea321f9ec9fcb14c0b809 SHA512 96d9b972f7bd5392320183cd21db573a22806841006354ee5a52f8c311ccff63805923178f9a6ce63baa432e87d972dfe1964326ab0ede4cce0a3a185db8fc54
+DIST genpatches-6.6-35.base.tar.xz 1860992 BLAKE2B afeb95582f83a941d830e8a90d1b7e6275d6d43b41de93aeb01dc743b1afafc5d675d98b66b528899fe9e69fe856402059932be58487c74bfc0102cff748244a SHA512 bf2848bc7e668b8b8df410f22f66b575ccd3a4d160efc6ac5d3549e4d34dc10d81736d8dbf689e64414491d4bb5479c54ee8ba7d6ad9d3dcae7db1d15c13dff0
+DIST genpatches-6.6-35.experimental.tar.xz 5756 BLAKE2B 057d6bd9f1082bcd2a956bccea4a3d7ecbf35c57cf1f5e54b702e282d651b780f325dc1d4f65198a84cf6567ee79790dfeecdbded9cd93b86e8c2df57ebb7ac5 SHA512 19451d95b23770d705b1947fecaf5f211a22de1ca43f91f5b40a5a8c2f0a9e136e5ddcdb8de35cbd5c77664b131adbed8385dd3f403f0fb78bca2799602bf1c1
+DIST genpatches-6.6-35.extras.tar.xz 3704 BLAKE2B 23fe1a854b29b205e93ac82a796ed6eabbc96774648168f616c2366f647dedd5f5ebade68059bc7e9f8aad5b57c8b7577b6e098859484f35c07913cb4e3567a2 SHA512 37e311b153e411df00489bf4973e1a414b480c4f2d6ac488ddd8af3f717461b14c53143696628df3750168869cfcc3cfc209599454f9873e28ae1e1390198076
+DIST genpatches-6.8-10.base.tar.xz 574628 BLAKE2B 87b6006dd317b24157dc7af3e0386ff598c9b596e0fe7cdc5f8f109d56191ff6741d6c55f359bc1e43ce9fc2887a614edbc1a2871343dace4ee57d2f472ff8a4 SHA512 fdc83b414ca5d72323646d345d95071a175f0a52470fb4a4b5cc7e9a3c8fd59e8d257396a8ff0bfdff81177bc24aaa3b22ba20b27b7bcf31eb71d8b428edfe0f
+DIST genpatches-6.8-10.experimental.tar.xz 79636 BLAKE2B f625573411a8b4e86812164477a0a01cdf5fd2cc9923b3228241ff8bc1014d6a2d557fd82400ed1d0ba43238cade1f300a2fa9b0edfc2920959c89fd194fd5df SHA512 ff490250974e298a83ba16a9448f55b4c1f2d754445ea4c389d71d8e48c2cf67f05b7567a8b40c1379cf0389b7ce90e2e2965ad66b6e553546aacfd66382ab0a
+DIST genpatches-6.8-10.extras.tar.xz 3704 BLAKE2B d836e79733083c5587dcb63d1fb3c30c7b91aee70660681b5fcfbdf90d4ba6fdca09dcbdab29588d267e07ffa8b338223e9590539356fa862e8fa211827d6f9f SHA512 bb01fb545a182d3073590939b172755b1883e827b6687870f889634ac00949308fd62e0d870e6d6d18d8c517dfbeafd3252f9b61d589522cf5c9d09d534ec6a4
 DIST genpatches-6.8-4.base.tar.xz 388904 BLAKE2B 22339e2c3d8b06e98ccac88d877edeefbc5955af73ccc1bd0857ad22f33757cdcd7b851ebf0987b2927e0d6397149d034e39dd7a1f2e252355bed36ada7ea4aa SHA512 ab11669385ad58a45941db73bb01957fc7a0d4794768aeaf4ab78e078d25d3eeae4d508994e61fd7d4a6de791991c9f01ea226932f9d42047c38e2fc4a037a4a
 DIST genpatches-6.8-4.experimental.tar.xz 79600 BLAKE2B 95ad304dab8c2589591c37b5a11564c526223606fed55277ea4e0d12ef04fda3ca6eab6e4ea8e5f879a4a4ff0f384ebc142b8ad1e044c637d42bf51dfd1f6382 SHA512 4a3e8f88695d314accefe3c57b55595cdc66f239e168dc14db93f887dfdd8a1ec2391d4b259ea5c9cd53e965f292e7ab381b6b03278720c98ff095f3a55534da
 DIST genpatches-6.8-4.extras.tar.xz 3704 BLAKE2B 2ac07079b69f3a778464b287924fbb758643fee48c6a02ba36cbd17d401f5761e6f5d4fb82083eb9153c8a1be22480f3b12dc0299b9d605a4d8abac49ae2c7ea SHA512 5ef9d85730999d5cd1a4acbb1b35f54b71012a919440ed763dc0254ad146b3656ab2d3487df39274b1e3042167500a260dc4c620965226c450395066d950af53
@@ -96,12 +107,14 @@ EBUILD gentoo-sources-5.15.152.ebuild 736 BLAKE2B a59cc0ff1d6c55a9ce3c2e17e26e12
 EBUILD gentoo-sources-5.15.153.ebuild 736 BLAKE2B ba686299a9256309b0ba126496c3c5997acb453d4365049b79ba75dbbe6fe24ce20be2341103516c37d54ada700abd1709d7d55ce7f6932dffb6f73c76903593 SHA512 3a49eb4a5fe0a21f716c5ee655d2064bd68117597e4c83b903411f22d6e51dec69fb475a6c02ec9588e4a6a107f4ea822b8912c8b99b56e8adbea1db1a4cd6d9
 EBUILD gentoo-sources-5.15.154.ebuild 736 BLAKE2B 03934faa86c463a32552b8f1185e3a45bc1642808c4558a382a37c3bb72fd036af494ad57618e0aed23b1604c459760d66af2a7616574477d2c3eba5ef88ffca SHA512 3780cd6b201a953b2096480a01664a9cb325bc961dca81efced32f8307cc82147400d7349c079a347415e9ad8124b35c1a8cd0308eb7e73feca3150e1b61e644
 EBUILD gentoo-sources-5.15.155.ebuild 736 BLAKE2B 186fa95f6f987cf6b1565c0e19422c100985b136e55a7d059288079342e92c4db3c84d1b3518bf10f6ad9d466dfa6accf4439e3f409bc084c6b1b8284e455d13 SHA512 7f90bb255f86a7208445c50af14fd816dc856fe2abeeba371f7faf5e42adcf6fbaf7198bf462f7b125019b1ee58e946cceba788dc0d49fac79ca2de43709faa0
+EBUILD gentoo-sources-5.15.156.ebuild 736 BLAKE2B ce6726dbe864b9a91554f8d678e708ecd693f70b0f8840a0f2bc74b1c90e40f74d40bd9271c71e99031dfc24480c4c5f13d65657444fab57b7c6a882feb24b07 SHA512 3c8ab75f4a0194db2e4bd4c288aa795de030ed72af1642e9065d6d783045ba0f316a93ff7d721a729cf85adfc3ebe0d0fcd76a117563747c23d6de93db5bdb03
 EBUILD gentoo-sources-6.1.74.ebuild 684 BLAKE2B cb7bffa4ccdaa11c35c4582b9cfa4d60fbd92ae647080073dda0ef6ad227e0fc3ac829afdb2e69690bf8b8bde67cf8468b78ec0f82dcde43f24210f8cff6e291 SHA512 9b0413ca5de8638cf69fad2f02fe371fb748ffab7f3abbecd86e4c33bcbbc338eb963dd4352d387ff8182a3d3107a6cf4f33f2b48716ccdb81d7893edb7c1dd2
 EBUILD gentoo-sources-6.1.81.ebuild 741 BLAKE2B af3683328d69d5081997549ffd0b88130aefafaedb5be71056c7dec401d2e91a0b47284e1730c105a8a42d3a97012f22e4f57d301128324c146af14ed304adce SHA512 27e6424bade9fd3326be3bdff320a923297749f273c8cfa74d79b539304adcc26993fbeae4bf5e73598346817e1ea69da43ac22e7aa73b88e25c84cfd8c07f08
 EBUILD gentoo-sources-6.1.83.ebuild 748 BLAKE2B f5686bdb0be828f6cdeada058ce634ccda30899ddad2eef9a1e792be9783da7a4871109b2e581b0026e01d3ec6df13d45163544d9ec131374f47d70410884da2 SHA512 4a8e98fb525342f50b4b80959f3708901ee84db2e8abfb8b862414f653020521db1e0a141e499e855d62cf91712fca6b6805ef8c4dcc64fdc957e5dd6b8017b7
 EBUILD gentoo-sources-6.1.84.ebuild 748 BLAKE2B afdf80c1f3313ee483aabf1f8ec40eed827c477a9e927b25d559b49416db0173d13a4ccd9e9fcddd5abf4c22d64d641940caefb617b21027a10e015f3945373f SHA512 680409ba4b3a2adb0f8819164f0a978c3181ad0b61539cc65c962de832daac4f4e46ddf4de4f283370c3867cd091667682c3d0115a13def59099bef569d2c56c
 EBUILD gentoo-sources-6.1.85.ebuild 748 BLAKE2B cf5beb5a227c6fbe0f5461b336fde5c14025a2d8fa1ffa2d771cc03bf016e5b1a9a6f0288a16338d1e8d2980339c1921562ed27e5f9532cb6afbad41aa928c48 SHA512 7a33765ffaef69160706321736500fedd22ad6a8d80b5b19fc4ce53d42c0f4375fc9e47b337d8083436cc64547a8eb5d35c85dce2d8c22e44cc43f4c0cc0e672
 EBUILD gentoo-sources-6.1.86.ebuild 748 BLAKE2B 7cc254b62d60ed02c9cfbc03dbb9b29cdd322f4e33f312ff9647bb702fc30f4d41e4bb765e0d81663d9b821c93952191f6515d75d5c0ce674408d1a490260e64 SHA512 574623b9227669eb43adf780d380279c6cc81fd939b51cd30fb815c8c63b103d18d1a89a4c79a2df90aa7cc4192782ed9fdc99d5f7be93bb7411e9ff490f97b6
+EBUILD gentoo-sources-6.1.87.ebuild 748 BLAKE2B bde17baba5439b326977ab9ff632435f3957436fd5b32c04f5e7a67ea57a99d9196a8e7cf0dc8dbd46c30fd9cfe956d7cb81940ac64ae325b147a4538355eb92 SHA512 d1d1fd79c1e1b6a6bf177f49dd96dc06f825e7ea9d92597cf7da529d002530815f4b447172146a1eb8def63f6285892bd338fb2b40ff550b612cdaa3e6fa48b7
 EBUILD gentoo-sources-6.6.13.ebuild 691 BLAKE2B 6c64500c9093da46755a1b37b0649bcac3276c3b44b930ae5cd051b1f5109ce6e2529aaeebbefd523aa2ced171128dce46143b48e979f0a890b0c9ef92367542 SHA512 94b03b91fddf7c7c4b22ada6b8e8833a006a29529758cbcfbfe5a7010f0743526d1e2f1de00cd2ee7e8938d714717aece931c67d42daf111c7da8e723b7a6232
 EBUILD gentoo-sources-6.6.21.ebuild 748 BLAKE2B fa384ad84a2d5a98c0319fb4c588696c650898342018f4160d6f88b43919488b189119d14359dfbb5a6331c2abb5762508d2fa2ece3bf63b3b807514c66aabea SHA512 4ee7ba0794df37f912580cebae2326591db6e3ba182d52e349febd1c838215ac74e9105dfed85f86c3c9386522c979fd7374a510eb9e1b3e6ad85631ebf55ac9
 EBUILD gentoo-sources-6.6.24.ebuild 755 BLAKE2B 287a1c17db36dcb5cd5eb97094487757cb3f4fc01ff1dd28faae1decb9d35b8a8afc9be5d345f5482830ed51c876072572db26dfe11b5920667a076176859571 SHA512 9bda85374cc8f9360f0e86b5aceb2904fab6fedbd4c88899e4b4f55f8b7edbf802a722365d2f785539b48b90400dedd526b69332759292b57ebb342a1c1adf21
@@ -109,9 +122,11 @@ EBUILD gentoo-sources-6.6.25.ebuild 755 BLAKE2B 75d266aa070570345231656727eba86a
 EBUILD gentoo-sources-6.6.26-r1.ebuild 755 BLAKE2B 2cbb251d4ac21a5800c9b9fc92f3c84507e4cd93f2eb375767f86f25a4261e30f860872168e069d059e52da4375323298f240d4888fbae4b7cbc0da4e87a4fbd SHA512 dbe66a5b8f11ce0f650b62e7a2d8ca32b726dada52bf3dc52b52a7c6424a864c04e8f3bb90a8ab0aa8efe70b99ab1c27dadc53cbd8633c99786d2fd138cd9dc7
 EBUILD gentoo-sources-6.6.26.ebuild 755 BLAKE2B 95652c54d4a700ec7428233ebca61dbc7c5ba207f4199f96d56a3d4f4399c8b3a065a70f88f3fd18f16d84cfb1267c5a7d4bdef3c93afb3a829f31c2e1d46e74 SHA512 fa144f82e16e66f6c4adc12f1c180aa3da1f0f2662a6a25157831d080919724cc585230c144836777515c3608d6a0610bfee962a40157fe257aee75e41b2a312
 EBUILD gentoo-sources-6.6.27.ebuild 755 BLAKE2B e72ef0eed2cfed7b8e1ef5a876c62aa5b650e9ad1fc1b6c3bff7c45bb1310d0bfcd01f38a947e26be65abd93573d8a6d163bd5ab2af9ed5fc2cbee92c7787359 SHA512 ff32436b4afe79bbbbd82ff279f10d372dfbed71fc2031a20c8d95f0d4eeacb64b7ba5255dc5938f72ab24e8bc830799d6ec97270e21f985907c6241190d1e38
+EBUILD gentoo-sources-6.6.28.ebuild 755 BLAKE2B 4c55374fbaec7e89d2bc606834c256e46a24b7bfe1e1de1e74b48131c6b6999f1388c72fd36a20755e0bf571c10df9713690d7ac5385f48c43c12ea6065347f5 SHA512 a45a51723dd3aab7c1496dc3cbd48f46b6cd4fc5ad595e6f568111e4202866c2904ec11e43ec5416f03321e26ae31197f18a70335480e07a71e285233415597f
 EBUILD gentoo-sources-6.8.3.ebuild 754 BLAKE2B 4f78a4acc83c56462efff7437166ac119277acb40a8321dda7ca962d766081742d79d37e0c788f8724577251abb62b0a501e9eeb460df82c16c89a5cc47f903e SHA512 604ec4fd3481d88f68c30db4fbe03fee930e2fad1248d7937e86b4974e62c7278b71875141552fd5a14f58760c1b885a0998daee80ce62b75850720a0f4b542d
 EBUILD gentoo-sources-6.8.4.ebuild 754 BLAKE2B 6bec8bcc38b2369222b9961f9939cf6c7fc8f5bd215ec1920e5528082e35f4cfc70a00387dfe62484fcd0004f1b416b9b5c699696f9ab2a2fca640bb9349c85b SHA512 bd471976db6ab099784d1b3cb70ab421ff0a663c821b2653cfe17ad877c04273f93e289140643032669fe51ee57f0816296bd5c412764842bb0687fe2fb6da1c
 EBUILD gentoo-sources-6.8.5-r1.ebuild 754 BLAKE2B 724c6c65a508a632832fd181906222ddd21e83de0bed2f4108fa9d3661ebb5726ebb4a44a90a9ba2e9e2fcf41c777a7e95d0f63d83aa7f02a41756b47aab85b4 SHA512 98f05c40e412a21bc52ca9a58252d6fdd46da8c8c9480027690f4c23259aa25b0c0f49a1ec8a00ccd9176a69fdc5d905395c2590747e50a129ba8080f8be9913
 EBUILD gentoo-sources-6.8.5.ebuild 754 BLAKE2B 164a2cbaadd38acb3267d8d37b2d57aed3a78326a3c363cbe33745684b5ec28b87535cb138edcda891a6cac8113cee9c29b57b3be1e1a6e685f408013746e9a0 SHA512 be2243c610e1301d7fefc4650f28ad4ad535f7a95e52108880bfdc329806d25e68f9af5f131f7a4116ce4eb9fb37099471aff41064f3d6128b06a5f4a682b89e
 EBUILD gentoo-sources-6.8.6.ebuild 754 BLAKE2B 32471ddd6e1a2be51f139cf52704012e5a3c87ba7fa94a9f6fce0547a57261a5ded0ca1aa06d446e6563168526f4cab32bc6ea71f990bc58b8adf2bfa8575bf2 SHA512 316f02258acf0bfd6b93c4b76c537e1371a72cb9f9639c18463341c267f6747ebc0d96670b6ac5d3e44226a6125d5da16e43c0697e65fe1409e20e28ef722e9d
+EBUILD gentoo-sources-6.8.7.ebuild 755 BLAKE2B b2505372451d18596cd09657e5c26f9218ab80537c4f55f69b0124add110017a3e0ddfc7c846eae55ed9e66648898de0ee59ecb1ba2c8790044267a01c86ce9a SHA512 1658bbd0f50059417a9853159217f08a373bd83d50796a71c8c15824ab49f6bed26e42149b930a3e6bff9b4bce0209b68647082470f6a774ae5c5530c44c0b63
 MISC metadata.xml 501 BLAKE2B f5363c8a19540d5bb924b38bdebeb8dbc60c84e58d1d87a9148a3e7abb09b0a1b733c98b130b778b8ab3a88375598444aa9d537d8c5338864a3d4497600d7836 SHA512 bc1ba0d75dbf5b95b3f93e666389c6408f20aebeec99bc8ec00653758b67588e07214285ed106fd9e5aed2c8d57c625d666c797212fda51e1ab98ce1df816467
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.156.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.156.ebuild
new file mode 100644
index 000000000000..5e689cdeb98d
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.15.156.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="166"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.1.87.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.1.87.ebuild
new file mode 100644
index 000000000000..ecc51d2fae9f
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.1.87.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="96"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.6.28.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.6.28.ebuild
new file mode 100644
index 000000000000..1e3c4e211368
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.6.28.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="35"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.8.7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.8.7.ebuild
new file mode 100644
index 000000000000..f2577741245c
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.8.7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="10"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa -ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 3751de59fdd2..7b81d5f7bafd 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index ad5df3f97393..6b50c2878dfd 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -32,9 +32,11 @@ DIST glibc-2.37-patches-12.tar.xz 83716 BLAKE2B 123951d94dad6c22150c4ef2299bcaaf
 DIST glibc-2.37.tar.xz 18674604 BLAKE2B 8139cd977b2ed3bfdbde5ffb1cda8f759763dbb83071167272fef798cfbdc0d17cfd1ec893d126c52c91511b7961f3ad12eed34534b99412dfa04a1cdd5b4ea3 SHA512 4fc5932f206bb1b8b54828a28af1a681616b838bbab60c81c82155f3629cbfe1301d271af65511ed917f4c6949a025429221fe6035753282f15346919f15b90c
 DIST glibc-2.38-patches-10.tar.xz 60792 BLAKE2B e228568f9e9cfa719ee9f2f91d220efa53e4eba617377fdf37bf7381b9f7c43036dfe62dd284b4228e9a99d41223ed0416ed058407a630b84064962518cba90b SHA512 573661299d75b63b7e2f771e9032193492e762e64cbb495b42bb7ad1021532f54f19d829a721e8070c79b2ad5edef077584cc4c76896d951cc93275592cf255c
 DIST glibc-2.38-patches-11.tar.xz 67188 BLAKE2B 5025fd72359842a357e7c2cd76de3e717c9bd117259dd8be93aa6fcd906f8b65e266388bf685e611bfa439d57c03e0a4f7d024d7a766ff275277936f76f1ecbf SHA512 d0fa1c11c153c7ada8668d865a15c7c47013956b5fa1e0d0e2b7e24cea5d3e16909dc8f9ba9b2b392d85271ed71603deb440ead19de50fd61b53a6c1f73d467b
+DIST glibc-2.38-patches-12.tar.xz 83568 BLAKE2B 051f32976d82cfe510084a94a4a40f328531eab8601454685c906405a96bb92527780378ccf6bfa42ab9cbadc405545d3bd28d0c4a15927d1a1c18a7a23c513f SHA512 a66d567680f5b34e35d1e4c5c2a4a9b0af67450cc0ea4a03074ec66953d79e4d0e9e921ca44717b3ca45f5910a8cdb033818bc111efd93b41666610cc8478b67
 DIST glibc-2.38.tar.xz 18913712 BLAKE2B f9b039f0ef98a7dd8e1cba228ed10286b9e4fbe4dd89af4d26fa5c4e4cf266f19c2746b44d797ce54739d86499e74cf334aaf311bcf6e30120fd7748453e653f SHA512 a6dd5e42dcd63d58e2820c783522c8c895890b6e8c8e6c83b025553de0cc77cdf227e7044e431ead98c89c68a9ce4dd63509b47e647775fb2075f011849c1900
 DIST glibc-2.39-patches-1.tar.xz 14316 BLAKE2B e0a05eb98d11ed4bc332b9267bc363ed8d7cfed8e9a1e7d1e854802830326241b231fc6fcca4f97bf80e52c361863f21fe09e060febe3234e1f6dd9e6cfa78f8 SHA512 0391ed526fc5686fd6e3a01beb18d92702ad7b5f8ad06651f1a1be174b16d7ab367cf3375b98e9c54b9dffee2e3416b22d60963dcf3a96e0d6141b682943ccd2
 DIST glibc-2.39-patches-2.tar.xz 18860 BLAKE2B 9ef3ff522820e650876dcda6ea78294fa5ad5301c2f5284d296a44e6c3c71a401c5da5aa097bdd2c9336fe8f89c931d9b5f8c127d5599c8ae962e2e64718842c SHA512 6cacd95576c5802a800cffa7e2939b3ab7db886ce8ae5e117182ac461ab8c207f4b5c2a05bf80e9214f13d9c9e43d136de0d2dc5f48c3d3389299eafad19a75c
+DIST glibc-2.39-patches-3.tar.xz 69980 BLAKE2B 08239eb30c0059ea7ff750287f9349ebc4dff3416aa4711db2cdfedf5a01ba000e135b390528cc77e50c20cb2656aaa571c299542b495fe72828301f61702548 SHA512 47c87e568ce6bdddf42605d8c422869c238be13e77905051b214fed51265de0cd35c2031d0fc906019058f5a159b6b99ed52cb177450db2f710ce398770b3e85
 DIST glibc-2.39.tar.xz 18520988 BLAKE2B 9d98459a2d58401e07c081e0d841935b23998da75a7eb5a7ebd23a1f9ebab99dee623fe166397c1b6c926960c570f62dbca5cb3b5ce84a918adff6b7a15e16bb SHA512 818f58172a52815b4338ea9f2a69ecaa3335492b9f8f64cbf8afb24c0d737982341968ecd79631cae3d3074ab0ae4bc6056fc4ba3ffe790849dc374835cd57e2
 DIST glibc-systemd-20210729.tar.gz 1480 BLAKE2B 37722c7579df782d890e44dbab99c3de52ab466eb9de80d82405e9bb5620bf39ffc8c5f466a435bdb86ef6d36dd7019c0736573916bda6c67d02a2581e0ec979 SHA512 efd75af58b50522c28cdac7abd1fc56555bc1bb042512c90d8340c1ec09c5791b3872a305bf83723252bbde5855b75d958c041083457765c4cfd170732d09238
 DIST glibc-systemd-20210814.tar.gz 1469 BLAKE2B 10fa7bcb46d4fdce9c0ab353cbd30871e9b09a347a13a9c9a3b5777f931aa3c826c158d2e49532c604d4a834f2fab4089b67495fb88d0398945dc50d45ad9ef1 SHA512 5346a9ea459a1e6ccf665389f2a294de1e16f1e3e05cdf07e3dd99ed0e4f6f8b52cc333d4bff3c75ac90ab6ce70cd4ab2b3e126f920ce7979abd6dda56315efc
@@ -52,7 +54,9 @@ EBUILD glibc-2.36-r8.ebuild 52468 BLAKE2B 005a5537d1cbcc1ba128174c06aa9fe797b2f1
 EBUILD glibc-2.37-r10.ebuild 52997 BLAKE2B 5302881267c59582fbdb775dd789597c199461735a92cf91d2609e1827b80fdfd5514d836867a917895ab2f0c1ea61d4a899321ae490e68af33c17456b20c164 SHA512 c0010d3a73918e95ab9cfc50c3cf452b528a028e78a4522659df3be3f8f753094bd2ba5542d539a83a76d51608d563054a3560f25ee0a862757730e1cd18adad
 EBUILD glibc-2.38-r10.ebuild 54293 BLAKE2B a1e9e5df6cf6454cd823f4c497113b4b958ee48f2e7caa1f0faa8f0a798d287b4c9b333b3e10a51f0f687fcea77f1cbf10aeb2d254f9d636e3224a645e39eb82 SHA512 49bd7ced8fe1781929d1b416dd121f247a2902bf258af361826fe58ef0192cb31055855fcf8cd36f8893e3013dc915febc8899bf4c61fc8010aa36480d245552
 EBUILD glibc-2.38-r11.ebuild 54516 BLAKE2B 5f54284b49ed56c0d22b425300d4926655d81755e6ba27417dc1fdc5e1137a50b9ae3de26c7475844b93b7b1ba815ab54e5d52c4c91b881a029a6320bdb0063b SHA512 e37b8a2498d8c0444843406e53b4b5f3fff873cee1521218eb5de364308c3dadb7d599314ba34efaf09d6b1309fa8e6fdb468e708597390252d4858d8047440c
+EBUILD glibc-2.38-r12.ebuild 54523 BLAKE2B dc72f4d0c7e92331de1c5ee991acdc59d610685eed564a1781f804ce0486b35f9f2f9c6e0cff102b56c098ca0abb0ed4b17dc091c86256f5c0cabec584771d46 SHA512 6dc8b00de8216c3e94193eb24228127f1323804a020d16f8f3d65551938d0c70a5cb1bd4f04e73d9df408d6c30128f897d4fab23781e7461ec28176bbfbbd0d3
 EBUILD glibc-2.39-r1.ebuild 54002 BLAKE2B 132527fc9289b6526837df002fb5dc518cc988b6e995a4fce5d73f7c6a7304875509c469716dc50544bda7f9b61261cf52788d1e41951eab9604699276d042d2 SHA512 5bb5854dce0382146af3f68c11e45075fe32e81ac93cff5bc1cc1d4938c7ce31092d1e7a1bd1cfe1364c0d79686d8c523445dfa8df8f82cf260c18a37b915296
 EBUILD glibc-2.39-r2.ebuild 54302 BLAKE2B e26f05667f9d11fc20122ec156912645e40e8f72b31f4c3c6af1b55facdf225855c1e666b439483156e1fcf6bf7cea57d69c186dc5aeb0bbe073cd7ec3b1450e SHA512 2b79905886b56d3d0e2f710dd1c9d9f89e71b9d6d705b26fc74ae9ef73ce4d1ee18a1c12e2978f46c37795f7939bb3cb5a3c2f5738e6b6c736c776bc99b1c393
+EBUILD glibc-2.39-r3.ebuild 54302 BLAKE2B 6f11bf8a572f860d3285d6da4869881e9eaf9a88ce3a1166493e645bf8006d0d760304f2dba3636b1304947a0a6ff9e6952b0472c83f919af0778c03c4e43f7f SHA512 3a8c30464a6015dfc8ea77b2fe1998cd374c37e05e79ac02f262530150b73796675073cf4645074a7e4508bf074724c58cd12efaa9d155fd9a26c329854d8439
 EBUILD glibc-9999.ebuild 54303 BLAKE2B fb17c851cddbdfb5417aa0e11847b2e4a1219db670b652f17e8b0952105c66782b9d4f4d58e343e57bc0a0d41c4ed4527fb65485f36fd011908a7e2b06dfc9ba SHA512 3d496f1df146744c303ba005b48d134babce84e9e4f43e85acb589620e21afa5dc944dab43b903169d3057a20bc6a37f074076bb4d532230b79401e702c0be5f
 MISC metadata.xml 2142 BLAKE2B 765ba540eb10afccd1bade4de56f0c13ce269225500a62d1d17328194de69e7fa15d359a14eac6bfa8a36df45344db3d52f5e1811b174cf1fa2bfb95ad7760a7 SHA512 2f4a148c076a0967663d14e76b85a698ddae7093ff299b0dc95a6c3b00957c9bf73443f2bace9670eb62a45465efbcca892bb52b6aac8577acb2bc5f74a7397c
diff --git a/sys-libs/glibc/glibc-2.38-r12.ebuild b/sys-libs/glibc/glibc-2.38-r12.ebuild
new file mode 100644
index 000000000000..e55dc707ba7e
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.38-r12.ebuild
@@ -0,0 +1,1724 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Bumping notes: https://wiki.gentoo.org/wiki/Project:Toolchain/sys-libs/glibc
+# Please read & adapt the page as necessary if obsolete.
+
+PYTHON_COMPAT=( python3_{10..12} )
+TMPFILES_OPTIONAL=1
+
+inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \
+	multilib systemd multiprocessing tmpfiles
+
+DESCRIPTION="GNU libc C library"
+HOMEPAGE="https://www.gnu.org/software/libc/"
+LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
+SLOT="2.2"
+
+EMULTILIB_PKG="true"
+
+# Gentoo patchset (ignored for live ebuilds)
+PATCH_VER=12
+PATCH_DEV=dilfridge
+
+# gcc mulitilib bootstrap files version
+GCC_BOOTSTRAP_VER=20201208
+
+# systemd integration version
+GLIBC_SYSTEMD_VER=20210729
+
+# Minimum kernel version that glibc requires
+MIN_KERN_VER="3.2.0"
+
+# Minimum pax-utils version needed (which contains any new syscall changes for
+# its seccomp filter!). Please double check this!
+MIN_PAX_UTILS_VER="1.3.3"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
+fi
+
+SRC_URI+=" multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
+SRC_URI+=" systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz )"
+
+IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd hash-sysv-compat headers-only +multiarch multilib multilib-bootstrap nscd perl profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla"
+
+# Here's how the cross-compile logic breaks down ...
+#  CTARGET - machine that will target the binaries
+#  CHOST   - machine that will host the binaries
+#  CBUILD  - machine that will build the binaries
+# If CTARGET != CHOST, it means you want a libc for cross-compiling.
+# If CHOST != CBUILD, it means you want to cross-compile the libc.
+#  CBUILD = CHOST = CTARGET    - native build/install
+#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
+#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
+#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
+# For install paths:
+#  CHOST = CTARGET  - install into /
+#  CHOST != CTARGET - install into /usr/CTARGET/
+#
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+# Note [Disable automatic stripping]
+# Disabling automatic stripping for a few reasons:
+# - portage's attempt to strip breaks non-native binaries at least on
+#   arm: bug #697428
+# - portage's attempt to strip libpthread.so.0 breaks gdb thread
+#   enumeration: bug #697910. This is quite subtle:
+#   * gdb uses glibc's libthread_db-1.0.so to enumerate threads.
+#   * libthread_db-1.0.so needs access to libpthread.so.0 local symbols
+#     via 'ps_pglobal_lookup' symbol defined in gdb.
+#   * 'ps_pglobal_lookup' uses '.symtab' section table to resolve all
+#     known symbols in 'libpthread.so.0'. Specifically 'nptl_version'
+#     (unexported) is used to sanity check compatibility before enabling
+#     debugging.
+#     Also see https://sourceware.org/gdb/wiki/FAQ#GDB_does_not_see_any_threads_besides_the_one_in_which_crash_occurred.3B_or_SIGTRAP_kills_my_program_when_I_set_a_breakpoint
+#   * normal 'strip' command trims '.symtab'
+#   Thus our main goal here is to prevent 'libpthread.so.0' from
+#   losing it's '.symtab' entries.
+# - similarly, valgrind requires knowledge about symbols in ld.so:
+#	bug #920753
+# As Gentoo's strip does not allow us to pass less aggressive stripping
+# options and does not check the machine target we strip selectively.
+
+# We need a new-enough binutils/gcc to match upstream baseline.
+# Also we need to make sure our binutils/gcc supports TLS,
+# and that gcc already contains the hardened patches.
+# Lastly, let's avoid some openssh nastiness, bug 708224, as
+# convenience to our users.
+
+IDEPEND="
+	!compile-locales? ( sys-apps/locale-gen )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-misc/pax-utils-${MIN_PAX_UTILS_VER}
+	sys-devel/bison
+	compile-locales? ( sys-apps/locale-gen )
+	doc? (
+		dev-lang/perl
+		sys-apps/texinfo
+	)
+	test? (
+		dev-lang/perl
+		>=net-dns/libidn2-2.3.0
+	)
+"
+COMMON_DEPEND="
+	gd? ( media-libs/gd:2= )
+	nscd? ( selinux? (
+		audit? ( sys-process/audit )
+		caps? ( sys-libs/libcap )
+	) )
+	suid? ( caps? ( sys-libs/libcap ) )
+	selinux? ( sys-libs/libselinux )
+	systemtap? ( dev-debug/systemtap )
+"
+DEPEND="${COMMON_DEPEND}
+"
+RDEPEND="${COMMON_DEPEND}
+	!<app-misc/pax-utils-${MIN_PAX_UTILS_VER}
+	perl? ( dev-lang/perl )
+"
+
+RESTRICT="!test? ( test )"
+
+if [[ ${CATEGORY} == cross-* ]] ; then
+	BDEPEND+=" !headers-only? (
+		>=${CATEGORY}/binutils-2.27
+		>=${CATEGORY}/gcc-6.2
+	)"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
+else
+	BDEPEND+="
+		>=sys-devel/binutils-2.27
+		>=sys-devel/gcc-6.2
+	"
+	DEPEND+=" virtual/os-headers "
+	RDEPEND+="
+		>=net-dns/libidn2-2.3.0
+		vanilla? ( !sys-libs/timezone-data )
+	"
+	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
+fi
+
+# Ignore tests whitelisted below
+GENTOO_GLIBC_XFAIL_TESTS="${GENTOO_GLIBC_XFAIL_TESTS:-yes}"
+
+# The following tests fail due to the Gentoo build system and are thus
+# executed but ignored:
+XFAIL_TEST_LIST=(
+	# buggy test, assumes /dev/ and /dev/null on a single filesystem
+	# 'mount --bind /dev/null /chroot/dev/null' breaks it.
+	# https://sourceware.org/PR25909
+	tst-support_descriptors
+
+	# The following tests fail only inside portage
+	# https://bugs.gentoo.org/831267
+	tst-system
+	tst-strerror
+	tst-strsignal
+	# Fails with certain PORTAGE_NICENESS/PORTAGE_SCHEDULING_POLICY
+	tst-sched1
+)
+
+XFAIL_NSPAWN_TEST_LIST=(
+	# These tests need to be adapted to handle EPERM/ENOSYS(?) properly
+	# upstream, as systemd-nspawn's default seccomp whitelist is too strict.
+	# https://sourceware.org/PR30603
+	test-errno-linux
+	tst-bz21269
+	tst-mlock2
+	tst-ntp_gettime
+	tst-ntp_gettime-time64
+	tst-ntp_gettimex
+	tst-ntp_gettimex-time64
+	tst-pkey
+	tst-process_mrelease
+	tst-adjtime
+	tst-adjtime-time64
+	tst-clock2
+	tst-clock2-time64
+
+	# These fail if --suppress-sync and/or low priority is set
+	tst-sync_file_range
+	test-errno
+)
+
+#
+# Small helper functions
+#
+
+dump_build_environment() {
+	einfo ==== glibc build environment ========================================================
+	local v
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX CPP LD {AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM AR AS STRIP RANLIB OBJCOPY STRINGS OBJDUMP READELF; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+	einfo =====================================================================================
+}
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	is_crosscompile && use headers-only
+}
+
+alt_prefix() {
+	is_crosscompile && echo /usr/${CTARGET}
+}
+
+# This prefix is applicable to CHOST when building against this
+# glibc. It is baked into the library at configure time.
+host_eprefix() {
+	is_crosscompile || echo "${EPREFIX}"
+}
+
+# This prefix is applicable to CBUILD when building against this
+# glibc. It determines the destination path at install time.
+build_eprefix() {
+	is_crosscompile && echo "${EPREFIX}"
+}
+
+# We need to be able to set alternative headers for compiling for non-native
+# platform. Will also become useful for testing kernel-headers without screwing
+# up the whole system.
+alt_headers() {
+	echo ${ALT_HEADERS:=$(alt_prefix)/usr/include}
+}
+
+alt_build_headers() {
+	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
+		ALT_BUILD_HEADERS="$(host_eprefix)$(alt_headers)"
+		if tc-is-cross-compiler ; then
+			ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
+			if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
+				local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h')
+				ALT_BUILD_HEADERS=${header_path%/linux/version.h}
+			fi
+		fi
+	fi
+	echo "${ALT_BUILD_HEADERS}"
+}
+
+alt_libdir() {
+	echo $(alt_prefix)/$(get_libdir)
+}
+alt_usrlibdir() {
+	echo $(alt_prefix)/usr/$(get_libdir)
+}
+
+builddir() {
+	echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1"
+}
+
+do_compile_test() {
+	local ret save_cflags=${CFLAGS}
+	CFLAGS+=" $1"
+	shift
+
+	pushd "${T}" >/dev/null
+
+	rm -f glibc-test*
+	printf '%b' "$*" > glibc-test.c
+
+	# We assume CC is already set up.
+	nonfatal emake glibc-test
+	ret=$?
+
+	popd >/dev/null
+
+	CFLAGS=${save_cflags}
+	return ${ret}
+}
+
+do_run_test() {
+	local ret
+
+	if [[ ${MERGE_TYPE} == "binary" ]] ; then
+		# ignore build failures when installing a binary package #324685
+		do_compile_test "" "$@" 2>/dev/null || return 0
+	else
+		if ! do_compile_test "" "$@" ; then
+			ewarn "Simple build failed ... assuming this is desired #324685"
+			return 0
+		fi
+	fi
+
+	pushd "${T}" >/dev/null
+
+	./glibc-test
+	ret=$?
+	rm -f glibc-test*
+
+	popd >/dev/null
+
+	return ${ret}
+}
+
+setup_target_flags() {
+	# This largely mucks with compiler flags.  None of which should matter
+	# when building up just the headers.
+	just_headers && return 0
+
+	case $(tc-arch) in
+		x86)
+			# -march needed for #185404 #199334
+			# TODO: When creating the first glibc cross-compile, this test will
+			# always fail as it does a full link which in turn requires glibc.
+			# Probably also applies when changing multilib profile settings (e.g.
+			# enabling x86 when the profile was amd64-only previously).
+			# We could change main to _start and pass -nostdlib here so that we
+			# only test the gcc code compilation.  Or we could do a compile and
+			# then look for the symbol via scanelf.
+			if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
+				filter-flags '-march=*'
+				export CFLAGS="-march=${t} ${CFLAGS}"
+				einfo "Auto adding -march=${t} to CFLAGS #185404"
+			fi
+			# For compatibility with older binaries at slight performance cost.
+			use stack-realign && export CFLAGS+=" -mstackrealign"
+		;;
+		amd64)
+			# -march needed for #185404 #199334
+			# TODO: See cross-compile issues listed above for x86.
+			if [[ ${ABI} == x86 ]]; then
+				if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
+					local t=${CTARGET_OPT:-${CTARGET}}
+					t=${t%%-*}
+					# Normally the target is x86_64-xxx, so turn that into the -march that
+					# gcc actually accepts. #528708
+					[[ ${t} == "x86_64" ]] && t="x86-64"
+					filter-flags '-march=*'
+					# ugly, ugly, ugly.  ugly.
+					CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}")
+					export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
+					einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
+				fi
+				# For compatibility with older binaries at slight performance cost.
+				use stack-realign && export CFLAGS_x86+=" -mstackrealign"
+
+				# Workaround for bug #823780.
+				# Need to save/restore CC because earlier on, we stuff it full of CFLAGS, and tc-getCPP doesn't like that.
+				CC_mangled=${CC}
+				CC=${glibc__GLIBC_CC}
+				if tc-is-gcc && (($(gcc-major-version) == 11)) && (($(gcc-minor-version) <= 2)) && (($(gcc-micro-version) == 0)) ; then
+					export CFLAGS_x86="${CFLAGS_x86} -mno-avx512f"
+					einfo "Auto adding -mno-avx512f to CFLAGS_x86 for buggy GCC version (bug #823780) (ABI=${ABI})"
+				fi
+				CC=${CC_mangled}
+			fi
+		;;
+		mips)
+			# The mips abi cannot support the GNU style hashes. #233233
+			filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
+		;;
+		ppc|ppc64)
+			# Many arch-specific implementations do not work on ppc with
+			# cache-block not equal to 128 bytes. This breaks memset:
+			#   https://sourceware.org/PR26522
+			#   https://bugs.gentoo.org/737996
+			# Use default -mcpu=. For ppc it means non-multiarch setup.
+			filter-flags '-mcpu=*'
+		;;
+		sparc)
+			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
+			filter-flags "-fcall-used-g7"
+			append-flags "-fcall-used-g6"
+
+			local cpu
+			case ${CTARGET} in
+			sparc64-*)
+				cpu="sparc64"
+				case $(get-flag mcpu) in
+				v9)
+					# We need to force at least v9a because the base build doesn't
+					# work with just v9.
+					# https://sourceware.org/bugzilla/show_bug.cgi?id=19477
+					append-flags "-Wa,-xarch=v9a"
+					;;
+				esac
+				;;
+			sparc-*)
+				case $(get-flag mcpu) in
+				v8|supersparc|hypersparc|leon|leon3)
+					cpu="sparcv8"
+					;;
+				*)
+					cpu="sparcv9"
+					;;
+				esac
+			;;
+			esac
+			[[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"
+		;;
+	esac
+}
+
+setup_flags() {
+	# Make sure host make.conf doesn't pollute us
+	if is_crosscompile || tc-is-cross-compiler ; then
+		CHOST=${CTARGET} strip-unsupported-flags
+	fi
+
+	# Store our CFLAGS because it's changed depending on which CTARGET
+	# we are building when pulling glibc on a multilib profile
+	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
+	CFLAGS=${CFLAGS_BASE}
+	CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}
+	CXXFLAGS=${CXXFLAGS_BASE}
+	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
+	ASFLAGS=${ASFLAGS_BASE}
+
+	# Allow users to explicitly avoid flag sanitization via
+	# USE=custom-cflags.
+	if ! use custom-cflags; then
+		# Over-zealous CFLAGS can often cause problems.  What may work for one
+		# person may not work for another.  To avoid a large influx of bugs
+		# relating to failed builds, we strip most CFLAGS out to ensure as few
+		# problems as possible.
+		strip-flags
+		# Lock glibc at -O2; we want to be conservative here.
+		filter-flags '-O?'
+		append-flags -O2
+	fi
+
+	strip-unsupported-flags
+	filter-lto
+	filter-flags -m32 -m64 '-mabi=*'
+
+	# glibc aborts if rpath is set by LDFLAGS
+	filter-ldflags '-Wl,-rpath=*'
+
+	# ld can't use -r & --relax at the same time, bug #788901
+	# https://sourceware.org/PR27837
+	filter-ldflags '-Wl,--relax'
+
+	# Flag added for cross-prefix, but causes ldconfig to segfault. Not needed
+	# anyway because glibc already handles this by itself.
+	filter-ldflags '-Wl,--dynamic-linker=*'
+
+	# some weird software relies on sysv hashes in glibc, bug 863863, bug 864100
+	# we have to do that here already so mips can filter it out again :P
+	if use hash-sysv-compat ; then
+		append-ldflags '-Wl,--hash-style=both'
+	fi
+
+	# #492892
+	filter-flags -frecord-gcc-switches
+
+	# #898098
+	filter-flags -fno-builtin
+
+	# #829583
+	filter-lfs-flags
+
+	unset CBUILD_OPT CTARGET_OPT
+	if use multilib ; then
+		CTARGET_OPT=$(get_abi_CTARGET)
+		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
+	fi
+
+	setup_target_flags
+
+	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
+		CBUILD_OPT=${CTARGET_OPT}
+	fi
+
+	# glibc's headers disallow -O0 and fail at build time:
+	#  include/libc-symbols.h:75:3: #error "glibc cannot be compiled without optimization"
+	# https://sourceware.org/glibc/wiki/FAQ#Why_do_I_get:.60.23error_.22glibc_cannot_be_compiled_without_optimization.22.27.2C_when_trying_to_compile_GNU_libc_with_GNU_CC.3F
+	replace-flags -O0 -O1
+
+	# glibc handles this internally already where it's appropriate;
+	# can't always have SSP when we're the ones setting it up, etc
+	filter-flags '-fstack-protector*'
+
+	# Similar issues as with SSP. Can't inject yourself that early.
+	filter-flags '-fsanitize=*'
+
+	# See end of bug #830454; we handle this via USE=cet
+	filter-flags '-fcf-protection=*'
+
+	# When bootstrapping, we may have a situation where
+	# CET-enabled gcc from seed is used to build CET-disabled
+	# glibc. As such, gcc implicitly enables CET if no
+	# -fcf-protection flag is passed. For a typical package it
+	# should not be a problem, but for glibc it matters as it is
+	# dealing with CET in ld.so. So if CET is supposed to be
+	# disabled for glibc, be explicit about it.
+	if (use amd64 || use x86) && ! use cet; then
+		append-flags '-fcf-protection=none'
+	fi
+}
+
+use_multiarch() {
+	# Allow user to disable runtime arch detection in multilib.
+	use multiarch || return 1
+	# Make sure binutils is new enough to support indirect functions,
+	# #336792. This funky sed supports gold and bfd linkers.
+	local bver nver
+	bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}')
+	case $(tc-arch ${CTARGET}) in
+	amd64|x86) nver="2.20" ;;
+	arm)       nver="2.22" ;;
+	hppa)      nver="2.23" ;;
+	ppc|ppc64) nver="2.20" ;;
+	# ifunc support was added in 2.23, but glibc also needs
+	# machinemode which is in 2.24.
+	s390)      nver="2.24" ;;
+	sparc)     nver="2.21" ;;
+	*)         return 1 ;;
+	esac
+	ver_test ${bver} -ge ${nver}
+}
+
+# Setup toolchain variables that had historically been defined in the
+# profiles for these archs.
+setup_env() {
+	# silly users
+	unset LD_RUN_PATH
+	unset LD_ASSUME_KERNEL
+
+	if is_crosscompile || tc-is-cross-compiler ; then
+		multilib_env ${CTARGET_OPT:-${CTARGET}}
+
+		if ! use multilib ; then
+			MULTILIB_ABIS=${DEFAULT_ABI}
+		else
+			MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
+		fi
+
+		# If the user has CFLAGS_<CTARGET> in their make.conf, use that,
+		# and fall back on CFLAGS.
+		local VAR=CFLAGS_${CTARGET//[-.]/_}
+		CFLAGS=${!VAR-${CFLAGS}}
+		einfo " $(printf '%15s' 'Manual CFLAGS:')   ${CFLAGS}"
+	fi
+
+	setup_flags
+
+	export ABI=${ABI:-${DEFAULT_ABI:-default}}
+
+	if just_headers ; then
+		# Avoid mixing host's CC and target's CFLAGS_${ABI}:
+		# At this bootstrap stage we have only binutils for
+		# target but not compiler yet.
+		einfo "Skip CC ABI injection. We can't use (cross-)compiler yet."
+		return 0
+	fi
+
+	# Glibc does not work with gold (for various reasons) #269274.
+	tc-ld-disable-gold
+
+	if use doc ; then
+		export MAKEINFO=makeinfo
+	else
+		export MAKEINFO=/dev/null
+	fi
+
+	# Reset CC and CXX to the value at start of emerge
+	export CC=${glibc__ORIG_CC:-${CC:-$(tc-getCC ${CTARGET})}}
+	export CXX=${glibc__ORIG_CXX:-${CXX:-$(tc-getCXX ${CTARGET})}}
+	export CPP=${glibc__ORIG_CPP:-${CPP:-$(tc-getCPP ${CTARGET})}}
+
+	# and make sure glibc__ORIG_CC and glibc__ORIG_CXX is defined now.
+	export glibc__ORIG_CC=${CC}
+	export glibc__ORIG_CXX=${CXX}
+	export glibc__ORIG_CPP=${CPP}
+
+	if tc-is-clang && ! use custom-cflags && ! is_crosscompile ; then
+		export glibc__force_gcc=yes
+		# once this is toggled on, it needs to stay on, since with CPP manipulated
+		# tc-is-clang does not work correctly anymore...
+	fi
+
+	if [[ ${glibc__force_gcc} == "yes" ]] ; then
+		# If we are running in an otherwise clang/llvm environment, we need to
+		# recover the proper gcc and binutils settings here, at least until glibc
+		# is finally building with clang. So let's override everything that is
+		# set in the clang profiles.
+		# Want to shoot yourself into the foot? Set USE=custom-cflags, that's always
+		# a good start into that direction.
+		# Also, if you're crosscompiling, let's assume you know what you are doing.
+		# Hopefully.
+		# Last, we need the settings of the *build* environment, not of the
+		# target environment...
+
+		local current_binutils_path=$(env ROOT="${BROOT}" binutils-config -B)
+		local current_gcc_path=$(env ROOT="${BROOT}" gcc-config -B)
+		einfo "Overriding clang configuration, since it won't work here"
+
+		export CC="${current_gcc_path}/gcc"
+		export CPP="${current_gcc_path}/cpp"
+		export CXX="${current_gcc_path}/g++"
+		export CPP="$(tc-getCPP ${CTARGET})"
+		export LD="${current_binutils_path}/ld.bfd"
+		export AR="${current_binutils_path}/ar"
+		export AS="${current_binutils_path}/as"
+		export NM="${current_binutils_path}/nm"
+		export STRIP="${current_binutils_path}/strip"
+		export RANLIB="${current_binutils_path}/ranlib"
+		export OBJCOPY="${current_binutils_path}/objcopy"
+		export STRINGS="${current_binutils_path}/strings"
+		export OBJDUMP="${current_binutils_path}/objdump"
+		export READELF="${current_binutils_path}/readelf"
+		export ADDR2LINE="${current_binutils_path}/addr2line"
+
+		# do we need to also do flags munging here? yes! at least...
+		filter-flags '-fuse-ld=*'
+		filter-flags '-D_FORTIFY_SOURCE=*'
+
+	else
+
+		# this is the "normal" case
+
+		export CC="$(tc-getCC ${CTARGET})"
+		export CXX="$(tc-getCXX ${CTARGET})"
+
+		# Always use tuple-prefixed toolchain. For non-native ABI glibc's configure
+		# can't detect them automatically due to ${CHOST} mismatch and fallbacks
+		# to unprefixed tools. Similar to multilib.eclass:multilib_toolchain_setup().
+		export NM="$(tc-getNM ${CTARGET})"
+		export READELF="$(tc-getREADELF ${CTARGET})"
+
+	fi
+
+	# We need to export CFLAGS with abi information in them because glibc's
+	# configure script checks CFLAGS for some targets (like mips).  Keep
+	# around the original clean value to avoid appending multiple ABIs on
+	# top of each other. (Why does the comment talk about CFLAGS if the code
+	# acts on CC?)
+	export glibc__GLIBC_CC=${CC}
+	export glibc__GLIBC_CXX=${CXX}
+	export glibc__GLIBC_CPP=${CPP}
+
+	export glibc__abi_CFLAGS="$(get_abi_CFLAGS)"
+
+	# CFLAGS can contain ABI-specific flags like -mfpu=neon, see bug #657760
+	# To build .S (assembly) files with the same ABI-specific flags
+	# upstream currently recommends adding CFLAGS to CC/CXX:
+	#    https://sourceware.org/PR23273
+	# Note: Passing CFLAGS via CPPFLAGS overrides glibc's arch-specific CFLAGS
+	# and breaks multiarch support. See 659030#c3 for an example.
+	# The glibc configure script doesn't properly use LDFLAGS all the time.
+	export CC="${glibc__GLIBC_CC} ${glibc__abi_CFLAGS} ${CFLAGS} ${LDFLAGS}"
+
+	# Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548
+	export CXX="${glibc__GLIBC_CXX} ${glibc__abi_CFLAGS} ${CFLAGS}"
+
+	export CPP="${glibc__GLIBC_CPP} ${glibc__abi_CFLAGS}"
+
+	if is_crosscompile; then
+		# Assume worst-case bootstrap: glibc is built for the first time
+		# with ${CTARGET}-g++ not available yet. We avoid
+		# building auxiliary programs that require C++: bug #683074
+		# It should not affect final result.
+		export libc_cv_cxx_link_ok=no
+		# The line above has the same effect. We set CXX explicitly
+		# to make build logs less confusing.
+		export CXX=
+	fi
+}
+
+foreach_abi() {
+	setup_env
+
+	local ret=0
+	local abilist=""
+	if use multilib ; then
+		abilist=$(get_install_abis)
+	else
+		abilist=${DEFAULT_ABI}
+	fi
+	local -x ABI
+	for ABI in ${abilist:-default} ; do
+		setup_env
+		einfo "Running $1 for ABI ${ABI}"
+		$1
+		: $(( ret |= $? ))
+	done
+	return ${ret}
+}
+
+glibc_banner() {
+	local b="Gentoo ${PVR}"
+	[[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" (patchset ${PATCH_VER})"
+	echo "${b}"
+}
+
+# The following Kernel version handling functions are mostly copied from portage
+# source. It's better not to use linux-info.eclass here since a) it adds too
+# much magic, see bug 326693 for some of the arguments, and b) some of the
+# functions are just not provided.
+
+g_get_running_KV() {
+	uname -r
+	return $?
+}
+
+g_KV_major() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	echo "${KV%%.*}"
+}
+
+g_KV_minor() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.}
+	echo "${KV%%.*}"
+}
+
+g_KV_micro() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.*.}
+	echo "${KV%%[^[:digit:]]*}"
+}
+
+g_KV_to_int() {
+	[[ -z $1 ]] && return 1
+	local KV_MAJOR=$(g_KV_major "$1")
+	local KV_MINOR=$(g_KV_minor "$1")
+	local KV_MICRO=$(g_KV_micro "$1")
+	local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))
+
+	# We make version 2.2.0 the minimum version we will handle as
+	# a sanity check ... if its less, we fail ...
+	if [[ ${KV_int} -ge 131584 ]] ; then
+		echo "${KV_int}"
+		return 0
+	fi
+	return 1
+}
+
+g_int_to_KV() {
+	local version=$1 major minor micro
+	major=$((version / 65536))
+	minor=$(((version % 65536) / 256))
+	micro=$((version % 256))
+	echo ${major}.${minor}.${micro}
+}
+
+eend_KV() {
+	[[ $(g_KV_to_int $1) -ge $(g_KV_to_int $2) ]]
+	eend $?
+}
+
+get_kheader_version() {
+	printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \
+	$(tc-getCPP ${CTARGET}) -I "$(build_eprefix)$(alt_build_headers)" - | \
+	tail -n 1
+}
+
+# We collect all sanity checks here. Consistency is not guranteed between
+# pkg_ and src_ phases, so we call this function both in pkg_pretend and in
+# src_unpack.
+sanity_prechecks() {
+	# Prevent native builds from downgrading
+	if [[ ${MERGE_TYPE} != "buildonly" ]] && \
+	   [[ -z ${ROOT} ]] && \
+	   [[ ${CBUILD} == ${CHOST} ]] && \
+	   [[ ${CHOST} == ${CTARGET} ]] ; then
+
+		# The high rev # is to allow people to downgrade between -r#
+		# versions. We want to block 2.20->2.19, but 2.20-r3->2.20-r2
+		# should be fine. Hopefully we never actually use a r# this
+		# high.
+		if has_version ">${CATEGORY}/${P}-r10000" ; then
+			eerror "Sanity check to keep you from breaking your system:"
+			eerror " Downgrading glibc is not supported and a sure way to destruction."
+			[[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system."
+		fi
+
+		if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then
+			eerror "Your old kernel is broken. You need to update it to a newer"
+			eerror "version as syscall(<bignum>) will break. See bug 279260."
+			die "Old and broken kernel."
+		fi
+	fi
+
+	if [[ ${CTARGET} == i386-* ]] ; then
+		eerror "i386 CHOSTs are no longer supported."
+		eerror "Chances are you don't actually want/need i386."
+		eerror "Please read https://www.gentoo.org/doc/en/change-chost.xml"
+		die "Please fix your CHOST"
+	fi
+
+	if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
+		ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
+		ewarn "This will result in a 50% performance penalty when running with a 32bit"
+		ewarn "hypervisor, which is probably not what you want."
+	fi
+
+	# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
+	# we test for...
+	if ! is_crosscompile ; then
+		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
+			ebegin "Checking that IA32 emulation is enabled in the running kernel"
+			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
+			local STAT
+			if ${CC-${CHOST}-gcc} ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
+				"${T}/check-ia32-emulation.elf32"
+				STAT=$?
+			else
+				# Don't fail here to allow single->multi ABI switch
+				# or recover from breakage like bug #646424
+				ewarn "Failed to compile the ABI test. Broken host glibc?"
+				STAT=0
+			fi
+			rm -f "${T}/check-ia32-emulation.elf32"
+			eend $STAT
+			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+		fi
+
+	fi
+
+	# When we actually have to compile something...
+	if ! just_headers && [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if [[ -d "${ESYSROOT}"/usr/lib/include ]] ; then
+			# bug #833620, bug #643302
+			eerror "Found ${ESYSROOT}/usr/lib/include directory!"
+			eerror "This is known to break glibc's build."
+			eerror "Please backup its contents then remove the directory."
+			die "Found directory (${ESYSROOT}/usr/lib/include) which will break build (bug #833620)!"
+		fi
+
+		if [[ ${CTARGET} == *-linux* ]] ; then
+			local run_kv build_kv want_kv
+
+			run_kv=$(g_get_running_KV)
+			build_kv=$(g_int_to_KV $(get_kheader_version))
+			want_kv=${MIN_KERN_VER}
+
+			if ! is_crosscompile && ! tc-is-cross-compiler ; then
+				# Building fails on an non-supporting kernel
+				ebegin "Checking running kernel version (${run_kv} >= ${want_kv})"
+				if ! eend_KV ${run_kv} ${want_kv} ; then
+					echo
+					eerror "You need a kernel of at least ${want_kv}!"
+					die "Kernel version too low!"
+				fi
+			fi
+
+			# Do not run this check for pkg_pretend, just pkg_setup and friends (if we ever get used there).
+			# It's plausible (seen it in the wild) that Portage will (correctly) schedule a linux-headers
+			# upgrade before glibc, but because pkg_pretend gets run before any packages are merged at all (not
+			# just glibc), the whole emerge gets aborted without a good reason. We probably don't
+			# need to run this check at all given we have a dependency on the right headers,
+			# but let's leave it as-is for now.
+			if [[ ${EBUILD_PHASE_FUNC} != pkg_pretend ]] ; then
+				ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
+				if ! eend_KV ${build_kv} ${want_kv} ; then
+					echo
+					eerror "You need linux-headers of at least ${want_kv}!"
+					die "linux-headers version too low!"
+				fi
+			fi
+		fi
+	fi
+}
+
+upgrade_warning() {
+	is_crosscompile && return
+
+	if [[ ${MERGE_TYPE} != buildonly && -n ${REPLACING_VERSIONS} && -z ${ROOT} ]]; then
+		local oldv newv=$(ver_cut 1-2 ${PV})
+		for oldv in ${REPLACING_VERSIONS}; do
+			if ver_test ${oldv} -lt ${newv}; then
+				ewarn "After upgrading glibc, please restart all running processes."
+				ewarn "Be sure to include init (telinit u) or systemd (systemctl daemon-reexec)."
+				ewarn "Alternatively, reboot your system."
+				ewarn "(See bug #660556, bug #741116, bug #823756, etc)"
+				break
+			fi
+		done
+	fi
+}
+
+#
+# the phases
+#
+
+# pkg_pretend
+
+pkg_pretend() {
+	upgrade_warning
+}
+
+# pkg_setup
+
+pkg_setup() {
+	# see bug 682570
+	[[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
+}
+
+# src_unpack
+
+src_unpack() {
+	setup_env
+
+	einfo "Checking general environment sanity."
+	sanity_prechecks
+
+	use multilib-bootstrap && unpack gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
+
+	if [[ ${PV} == 9999* ]] ; then
+		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/glibc-patches.git"
+		EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
+		git-r3_src_unpack
+		mv patches-git/9999 patches || die
+
+		EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
+		EGIT_CHECKOUT_DIR=${S}
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.xz
+
+		cd "${WORKDIR}" || die
+		unpack glibc-${PV}-patches-${PATCH_VER}.tar.xz
+	fi
+
+	cd "${WORKDIR}" || die
+	use systemd && unpack glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz
+}
+
+# src_prepare
+
+src_prepare() {
+	local patchsetname
+	if ! use vanilla ; then
+		if [[ ${PV} == 9999* ]] ; then
+			patchsetname="from git master"
+		else
+			patchsetname="${PV}-${PATCH_VER}"
+		fi
+		einfo "Applying Gentoo Glibc patchset ${patchsetname}"
+		eapply "${WORKDIR}"/patches
+		einfo "Done."
+	fi
+
+	default
+
+	gnuconfig_update
+
+	cd "${WORKDIR}" || die
+	find . -name configure -exec touch {} +
+
+	# Fix permissions on some of the scripts.
+	chmod u+x "${S}"/scripts/*.sh
+
+	cd "${S}" || die
+}
+
+# src_configure
+
+glibc_do_configure() {
+	dump_build_environment
+
+	local myconf=()
+
+	# Use '=strong' instead of '=all' to protect only functions
+	# worth protecting from stack smashes.
+	myconf+=( --enable-stack-protector=$(usex ssp strong no) )
+
+	# Keep a whitelist of targets supporing IFUNC. glibc's ./configure
+	# is not robust enough to detect proper support:
+	#    https://bugs.gentoo.org/641216
+	#    https://sourceware.org/PR22634#c0
+	case $(tc-arch ${CTARGET}) in
+		# Keep whitelist of targets where autodetection mostly works.
+		amd64|x86|sparc|ppc|ppc64|arm|arm64|s390|riscv|loong) ;;
+		# Blacklist everywhere else
+		*) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
+	esac
+
+	# Enable Intel Control-flow Enforcement Technology on amd64 if requested
+	case ${CTARGET} in
+		x86_64-*) myconf+=( $(use_enable cet) ) ;;
+		*) ;;
+	esac
+
+	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
+
+	myconf+=( --enable-kernel=${MIN_KERN_VER} )
+
+	# Since SELinux support is only required for nscd, only enable it if:
+	# 1. USE selinux
+	# 2. only for the primary ABI on multilib systems
+	# 3. Not a crosscompile
+	if ! is_crosscompile && use selinux ; then
+		if use multilib ; then
+			if is_final_abi ; then
+				myconf+=( --with-selinux )
+			else
+				myconf+=( --without-selinux )
+			fi
+		else
+			myconf+=( --with-selinux )
+		fi
+	else
+		myconf+=( --without-selinux )
+	fi
+
+	# Force a few tests where we always know the answer but
+	# configure is incapable of finding it.
+	if is_crosscompile ; then
+		export \
+			libc_cv_c_cleanup=yes \
+			libc_cv_forced_unwind=yes
+	fi
+
+	myconf+=(
+		--disable-werror
+		--enable-bind-now
+		--enable-fortify-source
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		$(use_enable profile)
+		$(use_with gd)
+		--with-headers=$(build_eprefix)$(alt_build_headers)
+		--prefix="$(host_eprefix)/usr"
+		--sysconfdir="$(host_eprefix)/etc"
+		--localstatedir="$(host_eprefix)/var"
+		--libdir='$(prefix)'/$(get_libdir)
+		--mandir='$(prefix)'/share/man
+		--infodir='$(prefix)'/share/info
+		--libexecdir='$(libdir)'/misc/glibc
+		--with-bugurl=https://bugs.gentoo.org/
+		--with-pkgversion="$(glibc_banner)"
+		$(use_enable crypt)
+		$(use_multiarch || echo --disable-multi-arch)
+		$(use_enable systemtap)
+		$(use_enable nscd)
+
+		# /usr/bin/mtrace has a Perl shebang. Gentoo Prefix QA checks fail if
+		# Perl hasn't been installed inside the prefix yet and configure picks
+		# up a Perl from outside the prefix instead. configure will fail to
+		# execute Perl during configure if we're cross-compiling a prefix, but
+		# it will just disable mtrace in that case.
+		# Note: mtrace is needed by the test suite.
+		ac_cv_path_PERL="$(usex perl "${EPREFIX}"/usr/bin/perl $(usex test "${EPREFIX}"/usr/bin/perl $(usex doc "${EPREFIX}"/usr/bin/perl no)))"
+
+		# locale data is arch-independent
+		# https://bugs.gentoo.org/753740
+		libc_cv_complocaledir='${exec_prefix}/lib/locale'
+
+		# On aarch64 there is no way to override -mcpu=native, and if
+		# the current cpu does not support SVE configure fails.
+		# Let's boldly assume our toolchain can always build SVE instructions.
+		libc_cv_aarch64_sve_asm=yes
+
+		${EXTRA_ECONF}
+	)
+
+	# We rely on sys-libs/timezone-data for timezone tools normally.
+	myconf+=( $(use_enable vanilla timezone-tools) )
+
+	# These libs don't have configure flags.
+	ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no)
+	ac_cv_lib_cap_cap_init=$(usex caps || echo no)
+
+	# There is no configure option for this and we need to export it
+	# since the glibc build will re-run configure on itself
+	export libc_cv_rootsbindir="$(host_eprefix)/sbin"
+	export libc_cv_slibdir="$(host_eprefix)/$(get_libdir)"
+
+	local builddir=$(builddir nptl)
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+	set -- "${S}"/configure "${myconf[@]}"
+	echo "$@"
+	"$@" || die "failed to configure glibc"
+
+	# ia64 static cross-compilers are a pita in so much that they
+	# can't produce static ELFs (as the libgcc.a is broken).  so
+	# disable building of the programs for those targets if it
+	# doesn't work.
+	# XXX: We could turn this into a compiler test, but ia64 is
+	# the only one that matters, so this should be fine for now.
+	if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then
+		sed -i '1i+link-static = touch $@' config.make
+	fi
+
+	# If we're trying to migrate between ABI sets, we need
+	# to lie and use a local copy of gcc.  Like if the system
+	# is built with MULTILIB_ABIS="amd64 x86" but we want to
+	# add x32 to it, gcc/glibc don't yet support x32.
+	#
+	if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib-bootstrap ; then
+		echo 'int main(void){}' > "${T}"/test.c || die
+		if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then
+			sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die
+		fi
+	fi
+}
+
+glibc_headers_configure() {
+	export ABI=default
+
+	local builddir=$(builddir "headers")
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+
+	# if we don't have a compiler yet, we can't really test it now ...
+	# hopefully they don't affect header generation, so let's hope for
+	# the best here ...
+	local v vars=(
+		ac_cv_header_cpuid_h=yes
+		libc_cv_{386,390,alpha,arm,hppa,ia64,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes
+		libc_cv_asm_cfi_directives=yes
+		libc_cv_broken_visibility_attribute=no
+		libc_cv_c_cleanup=yes
+		libc_cv_compiler_powerpc64le_binary128_ok=yes
+		libc_cv_forced_unwind=yes
+		libc_cv_gcc___thread=yes
+		libc_cv_mlong_double_128=yes
+		libc_cv_mlong_double_128ibm=yes
+		libc_cv_ppc_machine=yes
+		libc_cv_ppc_rel16=yes
+		libc_cv_predef_fortify_source=no
+		libc_cv_target_power8_ok=yes
+		libc_cv_visibility_attribute=yes
+		libc_cv_z_combreloc=yes
+		libc_cv_z_execstack=yes
+		libc_cv_z_initfirst=yes
+		libc_cv_z_nodelete=yes
+		libc_cv_z_nodlopen=yes
+		libc_cv_z_relro=yes
+		libc_mips_abi=${ABI}
+		libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard)
+		# These libs don't have configure flags.
+		ac_cv_lib_audit_audit_log_user_avc_message=no
+		ac_cv_lib_cap_cap_init=no
+	)
+
+	einfo "Forcing cached settings:"
+	for v in "${vars[@]}" ; do
+		einfo " ${v}"
+		export ${v}
+	done
+
+	local headers_only_arch_CPPFLAGS=()
+
+	# Blow away some random CC settings that screw things up. #550192
+	if [[ -d ${S}/sysdeps/mips ]]; then
+		pushd "${S}"/sysdeps/mips >/dev/null
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
+
+		# Force the mips ABI to the default.  This is OK because the set of
+		# installed headers in this phase is the same between the 3 ABIs.
+		# If this ever changes, this hack will break, but that's unlikely
+		# as glibc discourages that behavior.
+		# https://crbug.com/647033
+		sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die
+
+		popd >/dev/null
+	fi
+
+	local myconf=()
+
+	case ${CTARGET} in
+	aarch64*)
+		# The configure checks fail during cross-build, so disable here
+		# for headers-only
+		myconf+=(
+			--disable-mathvec
+		) ;;
+	riscv*)
+		# RISC-V interrogates the compiler to determine which target to
+		# build.  If building the headers then we don't strictly need a
+		# RISC-V compiler, so the built-in definitions that are provided
+		# along with all RISC-V compiler might not exist.  This causes
+		# glibc's RISC-V preconfigure script to blow up.  Since we're just
+		# building the headers any value will actually work here, so just
+		# pick the standard one (rv64g/lp64d) to make the build scripts
+		# happy for now -- the headers are all the same anyway so it
+		# doesn't matter.
+		headers_only_arch_CPPFLAGS+=(
+			-D__riscv_xlen=64
+			-D__riscv_flen=64
+			-D__riscv_float_abi_double=1
+			-D__riscv_atomic=1
+		) ;;
+	esac
+
+	myconf+=(
+		--disable-sanity-checks
+		--enable-hacker-mode
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		--with-headers=$(build_eprefix)$(alt_build_headers)
+		--prefix="$(host_eprefix)/usr"
+		$(use_enable crypt)
+		${EXTRA_ECONF}
+	)
+
+	# Nothing is compiled here which would affect the headers for the target.
+	# So forcing CC/CFLAGS is sane.
+	local headers_only_CC=$(tc-getBUILD_CC)
+	local headers_only_CFLAGS="-O1 -pipe"
+	local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}"
+	local headers_only_LDFLAGS=""
+	set -- "${S}"/configure "${myconf[@]}"
+	echo \
+		"CC=${headers_only_CC}" \
+		"CFLAGS=${headers_only_CFLAGS}" \
+		"CPPFLAGS=${headers_only_CPPFLAGS}" \
+		"LDFLAGS=${headers_only_LDFLAGS}" \
+		"$@"
+	CC=${headers_only_CC} \
+	CFLAGS=${headers_only_CFLAGS} \
+	CPPFLAGS=${headers_only_CPPFLAGS} \
+	LDFLAGS="" \
+	"$@" || die "failed to configure glibc"
+}
+
+do_src_configure() {
+	if just_headers ; then
+		glibc_headers_configure
+	else
+		glibc_do_configure nptl
+	fi
+}
+
+src_configure() {
+	foreach_abi do_src_configure
+}
+
+# src_compile
+
+do_src_compile() {
+	emake -C "$(builddir nptl)"
+}
+
+src_compile() {
+	if just_headers ; then
+		return
+	fi
+
+	foreach_abi do_src_compile
+}
+
+# src_test
+
+glibc_src_test() {
+	cd "$(builddir nptl)"
+
+	local myxfailparams=""
+	if [[ "${GENTOO_GLIBC_XFAIL_TESTS}" == "yes" ]] ; then
+		local virt=$(systemd-detect-virt 2>/dev/null)
+		if [[ ${virt} == systemd-nspawn ]] ; then
+			ewarn "Skipping extra tests because in systemd-nspawn container"
+			XFAIL_TEST_LIST+=( "${XFAIL_NSPAWN_TEST_LIST[@]}" )
+		fi
+
+		for myt in ${XFAIL_TEST_LIST[@]} ; do
+			myxfailparams+="test-xfail-${myt}=yes "
+		done
+	fi
+
+	# sandbox does not understand unshare() and prevents
+	# writes to /proc/, which makes many tests fail
+
+	# we give the tests a bit more time to avoid spurious
+	# bug reports on slow arches
+
+	SANDBOX_ON=0 LD_PRELOAD= TIMEOUTFACTOR=32 emake ${myxfailparams} check
+}
+
+src_test() {
+	if just_headers ; then
+		return
+	fi
+
+	foreach_abi glibc_src_test || die "tests failed"
+}
+
+# src_install
+
+run_locale_gen() {
+	# if the host locales.gen contains no entries, we'll install everything
+	local root="$1"
+	local inplace=""
+
+	if [[ "${root}" == "--inplace-glibc" ]] ; then
+		inplace="--inplace-glibc"
+		root="$2"
+	fi
+
+	local locale_list="${root%/}/etc/locale.gen"
+
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
+		[[ -z ${inplace} ]] && ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
+		locale_list="${root%/}/usr/share/i18n/SUPPORTED"
+	fi
+
+	# bug 736794: we need to be careful with the parallelization... the number of
+	# processors saved in the environment of a binary package may differ strongly
+	# from the number of processes available during postinst
+	local mygenjobs="$(makeopts_jobs)"
+	if [[ "${EMERGE_FROM}" == "binary" ]] ; then
+		mygenjobs="$(nproc)"
+	fi
+
+	set -- locale-gen ${inplace} --jobs "${mygenjobs}" --config "${locale_list}" \
+		--destdir "${root}"
+	echo "$@"
+	"$@"
+
+	popd >/dev/null
+}
+
+glibc_do_src_install() {
+	local builddir=$(builddir nptl)
+	cd "${builddir}"
+
+	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install
+
+	# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
+	# which come without headers etc. Only needed for binary packages since the
+	# external net-libs/libnsl has increased soversion. Keep only versioned libraries.
+	find "${D}" -name "libnsl.a" -delete
+	find "${D}" -name "libnsl.so" -delete
+
+	# Normally upstream_pv is ${PV}. Live ebuilds are exception, there we need
+	# to infer upstream version:
+	# '#define VERSION "2.26.90"' -> '2.26.90'
+	local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
+
+	# Avoid stripping binaries not targeted by ${CHOST}. Or else
+	# ${CHOST}-strip would break binaries build for ${CTARGET}.
+	is_crosscompile && dostrip -x /
+
+	# gdb thread introspection relies on local libpthreads symbols. stripping breaks it
+	# See Note [Disable automatic stripping]
+	dostrip -x $(alt_libdir)/libpthread-${upstream_pv}.so
+	# valgrind requires knowledge about ld.so symbols.
+	dostrip -x $(alt_libdir)/ld-*.so*
+
+	if [[ -e ${ED}/$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
+		# Move versioned .a file out of libdir to evade portage QA checks
+		# instead of using gen_usr_ldscript(). We fix ldscript as:
+		# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..."
+		sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"/$(alt_usrlibdir)/libm.a || die
+		dodir $(alt_usrlibdir)/${P}
+		mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
+	fi
+
+	# We configure toolchains for standalone prefix systems with a sysroot,
+	# which is prepended to paths in ld scripts, so strip the prefix from these.
+	# Before: GROUP ( /foo/lib64/libc.so.6 /foo/usr/lib64/libc_nonshared.a  AS_NEEDED ( /foo/lib64/ld-linux-x86-64.so.2 ) )
+	# After: GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a  AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) )
+	if [[ -n $(host_eprefix) ]] ; then
+		local file
+		grep -lZIF "ld script" "${ED}/$(alt_usrlibdir)"/lib*.{a,so} 2>/dev/null | while read -rd '' file ; do
+			sed -i "s|$(host_eprefix)/|/|g" "${file}" || die
+		done
+	fi
+
+	# We'll take care of the cache ourselves
+	rm -f "${ED}"/etc/ld.so.cache
+
+	# Everything past this point just needs to be done once ...
+	is_final_abi || return 0
+
+	# Make sure the non-native interp can be found on multilib systems even
+	# if the main library set isn't installed into the right place.  Maybe
+	# we should query the active gcc for info instead of hardcoding it ?
+	local i ldso_abi ldso_name
+	local ldso_abi_list=(
+		# x86
+		amd64   /lib64/ld-linux-x86-64.so.2
+		x32     /libx32/ld-linux-x32.so.2
+		x86     /lib/ld-linux.so.2
+		# mips
+		o32     /lib/ld.so.1
+		n32     /lib32/ld.so.1
+		n64     /lib64/ld.so.1
+		# powerpc
+		ppc     /lib/ld.so.1
+		# riscv
+		ilp32d  /lib/ld-linux-riscv32-ilp32d.so.1
+		ilp32   /lib/ld-linux-riscv32-ilp32.so.1
+		lp64d   /lib/ld-linux-riscv64-lp64d.so.1
+		lp64    /lib/ld-linux-riscv64-lp64.so.1
+		# s390
+		s390    /lib/ld.so.1
+		s390x   /lib/ld64.so.1
+		# sparc
+		sparc32 /lib/ld-linux.so.2
+		sparc64 /lib64/ld-linux.so.2
+	)
+	case $(tc-endian) in
+	little)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64.so.1
+			# ELFv2 (glibc does not support ELFv1 on LE)
+			ppc64   /lib64/ld64.so.2
+		)
+		;;
+	big)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64_be.so.1
+			# ELFv1 (glibc does not support ELFv2 on BE)
+			ppc64   /lib64/ld64.so.1
+		)
+		;;
+	esac
+	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
+	fi
+	for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do
+		ldso_abi=${ldso_abi_list[i]}
+		has ${ldso_abi} $(get_install_abis) || continue
+
+		ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
+		if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
+			dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
+		fi
+	done
+
+	# In the LSB 5.0 definition, someone had the excellent idea to "standardize"
+	# the runtime loader name, see also https://xkcd.com/927/
+	# Normally, in Gentoo one should never come across executables that require this.
+	# However, binary commercial packages are known to adhere to weird practices.
+	# https://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-AMD64/LSB-Core-AMD64.html#BASELIB
+	local lsb_ldso_name native_ldso_name lsb_ldso_abi
+	local lsb_ldso_abi_list=(
+		# x86
+		amd64	ld-linux-x86-64.so.2	ld-lsb-x86-64.so.3
+	)
+	for (( i = 0; i < ${#lsb_ldso_abi_list[@]}; i += 3 )) ; do
+		lsb_ldso_abi=${lsb_ldso_abi_list[i]}
+		native_ldso_name=${lsb_ldso_abi_list[i+1]}
+		lsb_ldso_name=${lsb_ldso_abi_list[i+2]}
+		has ${lsb_ldso_abi} $(get_install_abis) || continue
+
+		if [[ ! -L ${ED}/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name} && ! -e ${ED}/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name} ]] ; then
+			dosym ${native_ldso_name} "$(alt_prefix)/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name}"
+		fi
+	done
+
+	# With devpts under Linux mounted properly, we do not need the pt_chown
+	# binary to be setuid.  This is because the default owners/perms will be
+	# exactly what we want.
+	if ! use suid ; then
+		find "${ED}" -name pt_chown -exec chmod -s {} +
+	fi
+
+	#################################################################
+	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
+	#################################################################
+
+	# Make sure we install some symlink hacks so that when we build
+	# a 2nd stage cross-compiler, gcc finds the target system
+	# headers correctly.  See gcc/doc/gccinstall.info
+	if is_crosscompile ; then
+		# We need to make sure that /lib and /usr/lib always exists.
+		# gcc likes to use relative paths to get to its multilibs like
+		# /usr/lib/../lib64/.  So while we don't install any files into
+		# /usr/lib/, we do need it to exist.
+		keepdir $(alt_prefix)/lib
+		keepdir $(alt_prefix)/usr/lib
+
+		dosym usr/include $(alt_prefix)/sys-include
+		return 0
+	fi
+
+	# Files for Debian-style locale updating
+	dodir /usr/share/i18n
+	sed \
+		-e "/^#/d" \
+		-e "/SUPPORTED-LOCALES=/d" \
+		-e "s: \\\\::g" -e "s:/: :g" \
+		"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
+		|| die "generating /usr/share/i18n/SUPPORTED failed"
+
+	cd "${S}" || die
+
+	# Install misc network config files
+	insinto /etc
+	doins posix/gai.conf
+
+	if use systemd ; then
+		doins "${WORKDIR}/glibc-systemd-${GLIBC_SYSTEMD_VER}/gentoo-config/nsswitch.conf"
+	else
+		doins nss/nsswitch.conf
+	fi
+
+	# Gentoo-specific
+	newins "${FILESDIR}"/host.conf-1 host.conf
+
+	if use nscd ; then
+		doins nscd/nscd.conf
+
+		newinitd "$(prefixify_ro "${FILESDIR}"/nscd-1)" nscd
+
+		local nscd_args=(
+			-e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):"
+		)
+
+		sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
+
+		use systemd && systemd_dounit nscd/nscd.service
+		newtmpfiles nscd/nscd.tmpfiles nscd.conf
+	fi
+
+	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
+	doenvd "${T}"/00glibc
+
+	for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
+		[[ -s ${d} ]] && dodoc ${d}
+	done
+	dodoc -r ChangeLog.old
+
+	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
+	# creation of the "factory" symlink in pkg_postinst().
+	rm -f "${ED}"/etc/localtime
+
+	# Generate all locales if this is a native build as locale generation
+	if use compile-locales && ! is_crosscompile ; then
+		run_locale_gen --inplace-glibc "${ED}/"
+	fi
+}
+
+glibc_headers_install() {
+	local builddir=$(builddir "headers")
+	cd "${builddir}"
+	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install-headers
+
+	insinto $(alt_headers)/gnu
+	doins "${S}"/include/gnu/stubs.h
+
+	# Make sure we install the sys-include symlink so that when
+	# we build a 2nd stage cross-compiler, gcc finds the target
+	# system headers correctly.  See gcc/doc/gccinstall.info
+	dosym usr/include $(alt_prefix)/sys-include
+}
+
+src_install() {
+	if just_headers ; then
+		export ABI=default
+		glibc_headers_install
+		return
+	fi
+
+	foreach_abi glibc_do_src_install
+
+	if ! use static-libs ; then
+		einfo "Not installing static glibc libraries"
+		find "${ED}" -name "*.a" -and -not -name "*_nonshared.a" -delete
+	fi
+}
+
+# Simple test to make sure our new glibc isn't completely broken.
+# Make sure we don't test with statically built binaries since
+# they will fail.  Also, skip if this glibc is a cross compiler.
+#
+# If coreutils is built with USE=multicall, some of these files
+# will just be wrapper scripts, not actual ELFs we can test.
+glibc_sanity_check() {
+	cd / #228809
+
+	# We enter ${ED} so to avoid trouble if the path contains
+	# special characters; for instance if the path contains the
+	# colon character (:), then the linker will try to split it
+	# and look for the libraries in an unexpected place. This can
+	# lead to unsafe code execution if the generated prefix is
+	# within a world-writable directory.
+	# (e.g. /var/tmp/portage:${HOSTNAME})
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	# first let's find the actual dynamic linker here
+	# symlinks may point to the wrong abi
+	local newldso=$(find . -maxdepth 1 -name 'ld*so.?' -type f -print -quit)
+
+	einfo Last-minute run tests with ${newldso} in /$(get_libdir) ...
+
+	local x striptest
+	for x in cal date env free ls true uname uptime ; do
+		x=$(type -p ${x})
+		[[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue
+		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
+		case ${striptest} in
+		*"statically linked"*) continue;;
+		*"ASCII text"*) continue;;
+		esac
+		# We need to clear the locale settings as the upgrade might want
+		# incompatible locale data.  This test is not for verifying that.
+		LC_ALL=C \
+		${newldso} --library-path . ${x} > /dev/null \
+			|| die "simple run test (${x}) failed"
+	done
+
+	popd >/dev/null
+}
+
+pkg_preinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	einfo "Checking general environment sanity."
+	sanity_prechecks
+
+	# prepare /etc/ld.so.conf.d/ for files
+	mkdir -p "${EROOT}"/etc/ld.so.conf.d
+
+	# Default /etc/hosts.conf:multi to on for systems with small dbs.
+	if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then
+		sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf
+		einfo "Defaulting /etc/host.conf:multi to on"
+	fi
+
+	[[ -n ${ROOT} ]] && return 0
+	[[ -d ${ED}/$(get_libdir) ]] || return 0
+	[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
+
+	if [[ -L ${EROOT}/usr/lib/locale ]]; then
+		# Help portage migrate this to a directory
+		# https://bugs.gentoo.org/753740
+		rm "${EROOT}"/usr/lib/locale || die
+	fi
+
+	# Keep around libcrypt so that Perl doesn't break when merging libxcrypt
+	# (libxcrypt is the new provider for now of libcrypt.so.{1,2}).
+	# bug #802207
+	if ! use crypt && has_version "${CATEGORY}/${PN}[crypt]" && ! has preserve-libs ${FEATURES}; then
+		PRESERVED_OLD_LIBCRYPT=1
+		cp -p "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" "${T}/libcrypt$(get_libname 1)" || die
+	else
+		PRESERVED_OLD_LIBCRYPT=0
+	fi
+}
+
+glibc_refresh_ldconfig() {
+	if [[ ${MERGE_TYPE} == buildonly ]]; then
+		return
+	fi
+
+	# Version check could be added to avoid unnecessary work, but ldconfig
+	# should finish quickly enough to not matter.
+	ebegin "Refreshing ld.so.cache"
+	ldconfig -i
+	if ! eend $?; then
+		ewarn "Failed to refresh the ld.so.cache for you. Some programs may be broken"
+		ewarn "before you manually do so (ldconfig -i)."
+	fi
+}
+
+pkg_postinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
+		# Generate fastloading iconv module configuration file.
+		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}/"
+	fi
+
+	if ! is_crosscompile && [[ -z ${ROOT} ]] ; then
+		# glibc-2.38+ on loong has ldconfig support added, but the ELF e_flags
+		# handling has changed as well, which means stale ldconfig auxiliary
+		# cache entries and failure to lookup libgcc_s / libstdc++ (breaking
+		# every C++ application) / libgomp etc., among other breakages.
+		#
+		# To fix this, simply refresh the ld.so.cache without using the
+		# auxiliary cache if we're natively installing on loong. This should
+		# be done relatively soon because we want to minimize the breakage
+		# window for the affected programs.
+		use loong && glibc_refresh_ldconfig
+
+		use compile-locales || run_locale_gen "${EROOT}/"
+	fi
+
+	upgrade_warning
+
+	# Check for sanity of /etc/nsswitch.conf, take 2
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then
+		local entry
+		for entry in passwd group shadow; do
+			if grep -E -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then
+				ewarn ""
+				ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been"
+				ewarn "removed from glibc and is now provided by the package"
+				ewarn "  sys-auth/libnss-nis"
+				ewarn "Install it now to keep your NIS setup working."
+				ewarn ""
+			fi
+		done
+	fi
+
+	if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then
+		cp -p "${T}/libcrypt$(get_libname 1)" "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" || die
+		preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1)
+
+		elog "Please ignore a possible later error message about a file collision involving"
+		elog "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1). We need to preserve this file for the moment to keep"
+		elog "the upgrade working, but it also needs to be overwritten when"
+		elog "sys-libs/libxcrypt is installed. See bug 802210 for more details."
+	fi
+}
diff --git a/sys-libs/glibc/glibc-2.39-r3.ebuild b/sys-libs/glibc/glibc-2.39-r3.ebuild
new file mode 100644
index 000000000000..f53dac7811b7
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.39-r3.ebuild
@@ -0,0 +1,1724 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Bumping notes: https://wiki.gentoo.org/wiki/Project:Toolchain/sys-libs/glibc
+# Please read & adapt the page as necessary if obsolete.
+
+PYTHON_COMPAT=( python3_{10..12} )
+TMPFILES_OPTIONAL=1
+
+inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \
+	multilib systemd multiprocessing tmpfiles
+
+DESCRIPTION="GNU libc C library"
+HOMEPAGE="https://www.gnu.org/software/libc/"
+LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
+SLOT="2.2"
+
+EMULTILIB_PKG="true"
+
+# Gentoo patchset (ignored for live ebuilds)
+PATCH_VER=3
+PATCH_DEV=dilfridge
+
+# gcc mulitilib bootstrap files version
+GCC_BOOTSTRAP_VER=20201208
+
+# systemd integration version
+GLIBC_SYSTEMD_VER=20210729
+
+# Minimum kernel version that glibc requires
+MIN_KERN_VER="3.2.0"
+
+# Minimum pax-utils version needed (which contains any new syscall changes for
+# its seccomp filter!). Please double check this!
+MIN_PAX_UTILS_VER="1.3.3"
+
+# Minimum systemd version needed (which contains any new syscall changes for
+# its seccomp filter!). Please double check this!
+MIN_SYSTEMD_VER="254.9-r1"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa -ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
+fi
+
+SRC_URI+=" multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
+SRC_URI+=" systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz )"
+
+IUSE="audit caps cet compile-locales custom-cflags doc gd hash-sysv-compat headers-only +multiarch multilib multilib-bootstrap nscd perl profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla"
+
+# Here's how the cross-compile logic breaks down ...
+#  CTARGET - machine that will target the binaries
+#  CHOST   - machine that will host the binaries
+#  CBUILD  - machine that will build the binaries
+# If CTARGET != CHOST, it means you want a libc for cross-compiling.
+# If CHOST != CBUILD, it means you want to cross-compile the libc.
+#  CBUILD = CHOST = CTARGET    - native build/install
+#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
+#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
+#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
+# For install paths:
+#  CHOST = CTARGET  - install into /
+#  CHOST != CTARGET - install into /usr/CTARGET/
+#
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+# Note [Disable automatic stripping]
+# Disabling automatic stripping for a few reasons:
+# - portage's attempt to strip breaks non-native binaries at least on
+#   arm: bug #697428
+# - portage's attempt to strip libpthread.so.0 breaks gdb thread
+#   enumeration: bug #697910. This is quite subtle:
+#   * gdb uses glibc's libthread_db-1.0.so to enumerate threads.
+#   * libthread_db-1.0.so needs access to libpthread.so.0 local symbols
+#     via 'ps_pglobal_lookup' symbol defined in gdb.
+#   * 'ps_pglobal_lookup' uses '.symtab' section table to resolve all
+#     known symbols in 'libpthread.so.0'. Specifically 'nptl_version'
+#     (unexported) is used to sanity check compatibility before enabling
+#     debugging.
+#     Also see https://sourceware.org/gdb/wiki/FAQ#GDB_does_not_see_any_threads_besides_the_one_in_which_crash_occurred.3B_or_SIGTRAP_kills_my_program_when_I_set_a_breakpoint
+#   * normal 'strip' command trims '.symtab'
+#   Thus our main goal here is to prevent 'libpthread.so.0' from
+#   losing it's '.symtab' entries.
+# - similarly, valgrind requires knowledge about symbols in ld.so:
+#	bug #920753
+# As Gentoo's strip does not allow us to pass less aggressive stripping
+# options and does not check the machine target we strip selectively.
+
+# We need a new-enough binutils/gcc to match upstream baseline.
+# Also we need to make sure our binutils/gcc supports TLS,
+# and that gcc already contains the hardened patches.
+# Lastly, let's avoid some openssh nastiness, bug 708224, as
+# convenience to our users.
+
+IDEPEND="
+	!compile-locales? ( sys-apps/locale-gen )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-misc/pax-utils-${MIN_PAX_UTILS_VER}
+	sys-devel/bison
+	compile-locales? ( sys-apps/locale-gen )
+	doc? (
+		dev-lang/perl
+		sys-apps/texinfo
+	)
+	test? (
+		dev-lang/perl
+		>=net-dns/libidn2-2.3.0
+	)
+"
+COMMON_DEPEND="
+	gd? ( media-libs/gd:2= )
+	nscd? ( selinux? (
+		audit? ( sys-process/audit )
+		caps? ( sys-libs/libcap )
+	) )
+	suid? ( caps? ( sys-libs/libcap ) )
+	selinux? ( sys-libs/libselinux )
+	systemtap? ( dev-debug/systemtap )
+"
+DEPEND="${COMMON_DEPEND}
+"
+RDEPEND="${COMMON_DEPEND}
+	!<app-misc/pax-utils-${MIN_PAX_UTILS_VER}
+	!<sys-apps/systemd-${MIN_SYSTEMD_VER}
+	perl? ( dev-lang/perl )
+"
+
+RESTRICT="!test? ( test )"
+
+if [[ ${CATEGORY} == cross-* ]] ; then
+	BDEPEND+=" !headers-only? (
+		>=${CATEGORY}/binutils-2.27
+		>=${CATEGORY}/gcc-6.2
+	)"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
+else
+	BDEPEND+="
+		>=sys-devel/binutils-2.27
+		>=sys-devel/gcc-6.2
+	"
+	DEPEND+=" virtual/os-headers "
+	RDEPEND+="
+		>=net-dns/libidn2-2.3.0
+		vanilla? ( !sys-libs/timezone-data )
+	"
+	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
+fi
+
+# Ignore tests whitelisted below
+GENTOO_GLIBC_XFAIL_TESTS="${GENTOO_GLIBC_XFAIL_TESTS:-yes}"
+
+# The following tests fail due to the Gentoo build system and are thus
+# executed but ignored:
+XFAIL_TEST_LIST=(
+	# buggy test, assumes /dev/ and /dev/null on a single filesystem
+	# 'mount --bind /dev/null /chroot/dev/null' breaks it.
+	# https://sourceware.org/PR25909
+	tst-support_descriptors
+
+	# The following tests fail only inside portage
+	# https://bugs.gentoo.org/831267
+	tst-system
+	tst-strerror
+	tst-strsignal
+
+	# Fails with certain PORTAGE_NICENESS/PORTAGE_SCHEDULING_POLICY
+	tst-sched1
+
+	# Fails regularly, unreliable
+	tst-valgrind-smoke
+)
+
+XFAIL_NSPAWN_TEST_LIST=(
+	# These tests need to be adapted to handle EPERM/ENOSYS(?) properly
+	# upstream, as systemd-nspawn's default seccomp whitelist is too strict.
+	# https://sourceware.org/PR30603
+	test-errno-linux
+	tst-bz21269
+	tst-mlock2
+	tst-ntp_gettime
+	tst-ntp_gettime-time64
+	tst-ntp_gettimex
+	tst-ntp_gettimex-time64
+	tst-pkey
+	tst-process_mrelease
+	tst-adjtime
+	tst-adjtime-time64
+	tst-clock2
+	tst-clock2-time64
+
+	# These fail if --suppress-sync and/or low priority is set
+	tst-sync_file_range
+	test-errno
+)
+
+#
+# Small helper functions
+#
+
+dump_build_environment() {
+	einfo ==== glibc build environment ========================================================
+	local v
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX CPP LD {AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM AR AS STRIP RANLIB OBJCOPY STRINGS OBJDUMP READELF; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+	einfo =====================================================================================
+}
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	is_crosscompile && use headers-only
+}
+
+alt_prefix() {
+	is_crosscompile && echo /usr/${CTARGET}
+}
+
+# This prefix is applicable to CHOST when building against this
+# glibc. It is baked into the library at configure time.
+host_eprefix() {
+	is_crosscompile || echo "${EPREFIX}"
+}
+
+# This prefix is applicable to CBUILD when building against this
+# glibc. It determines the destination path at install time.
+build_eprefix() {
+	is_crosscompile && echo "${EPREFIX}"
+}
+
+# We need to be able to set alternative headers for compiling for non-native
+# platform. Will also become useful for testing kernel-headers without screwing
+# up the whole system.
+alt_headers() {
+	echo ${ALT_HEADERS:=$(alt_prefix)/usr/include}
+}
+
+alt_build_headers() {
+	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
+		ALT_BUILD_HEADERS="$(host_eprefix)$(alt_headers)"
+		if tc-is-cross-compiler ; then
+			ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
+			if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
+				local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h')
+				ALT_BUILD_HEADERS=${header_path%/linux/version.h}
+			fi
+		fi
+	fi
+	echo "${ALT_BUILD_HEADERS}"
+}
+
+alt_libdir() {
+	echo $(alt_prefix)/$(get_libdir)
+}
+alt_usrlibdir() {
+	echo $(alt_prefix)/usr/$(get_libdir)
+}
+
+builddir() {
+	echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1"
+}
+
+do_compile_test() {
+	local ret save_cflags=${CFLAGS}
+	CFLAGS+=" $1"
+	shift
+
+	pushd "${T}" >/dev/null
+
+	rm -f glibc-test*
+	printf '%b' "$*" > glibc-test.c
+
+	# We assume CC is already set up.
+	nonfatal emake glibc-test
+	ret=$?
+
+	popd >/dev/null
+
+	CFLAGS=${save_cflags}
+	return ${ret}
+}
+
+do_run_test() {
+	local ret
+
+	if [[ ${MERGE_TYPE} == "binary" ]] ; then
+		# ignore build failures when installing a binary package #324685
+		do_compile_test "" "$@" 2>/dev/null || return 0
+	else
+		if ! do_compile_test "" "$@" ; then
+			ewarn "Simple build failed ... assuming this is desired #324685"
+			return 0
+		fi
+	fi
+
+	pushd "${T}" >/dev/null
+
+	./glibc-test
+	ret=$?
+	rm -f glibc-test*
+
+	popd >/dev/null
+
+	return ${ret}
+}
+
+setup_target_flags() {
+	# This largely mucks with compiler flags.  None of which should matter
+	# when building up just the headers.
+	just_headers && return 0
+
+	case $(tc-arch) in
+		x86)
+			# -march needed for #185404 #199334
+			# TODO: When creating the first glibc cross-compile, this test will
+			# always fail as it does a full link which in turn requires glibc.
+			# Probably also applies when changing multilib profile settings (e.g.
+			# enabling x86 when the profile was amd64-only previously).
+			# We could change main to _start and pass -nostdlib here so that we
+			# only test the gcc code compilation.  Or we could do a compile and
+			# then look for the symbol via scanelf.
+			if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
+				filter-flags '-march=*'
+				export CFLAGS="-march=${t} ${CFLAGS}"
+				einfo "Auto adding -march=${t} to CFLAGS #185404"
+			fi
+			# For compatibility with older binaries at slight performance cost.
+			use stack-realign && export CFLAGS+=" -mstackrealign"
+		;;
+		amd64)
+			# -march needed for #185404 #199334
+			# TODO: See cross-compile issues listed above for x86.
+			if [[ ${ABI} == x86 ]]; then
+				if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
+					local t=${CTARGET_OPT:-${CTARGET}}
+					t=${t%%-*}
+					# Normally the target is x86_64-xxx, so turn that into the -march that
+					# gcc actually accepts. #528708
+					[[ ${t} == "x86_64" ]] && t="x86-64"
+					filter-flags '-march=*'
+					# ugly, ugly, ugly.  ugly.
+					CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}")
+					export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
+					einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
+				fi
+				# For compatibility with older binaries at slight performance cost.
+				use stack-realign && export CFLAGS_x86+=" -mstackrealign"
+
+				# Workaround for bug #823780.
+				# Need to save/restore CC because earlier on, we stuff it full of CFLAGS, and tc-getCPP doesn't like that.
+				CC_mangled=${CC}
+				CC=${glibc__GLIBC_CC}
+				if tc-is-gcc && (($(gcc-major-version) == 11)) && (($(gcc-minor-version) <= 2)) && (($(gcc-micro-version) == 0)) ; then
+					export CFLAGS_x86="${CFLAGS_x86} -mno-avx512f"
+					einfo "Auto adding -mno-avx512f to CFLAGS_x86 for buggy GCC version (bug #823780) (ABI=${ABI})"
+				fi
+				CC=${CC_mangled}
+			fi
+		;;
+		mips)
+			# The mips abi cannot support the GNU style hashes. #233233
+			filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
+		;;
+		ppc|ppc64)
+			# Many arch-specific implementations do not work on ppc with
+			# cache-block not equal to 128 bytes. This breaks memset:
+			#   https://sourceware.org/PR26522
+			#   https://bugs.gentoo.org/737996
+			# Use default -mcpu=. For ppc it means non-multiarch setup.
+			filter-flags '-mcpu=*'
+		;;
+		sparc)
+			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
+			filter-flags "-fcall-used-g7"
+			append-flags "-fcall-used-g6"
+
+			local cpu
+			case ${CTARGET} in
+			sparc64-*)
+				cpu="sparc64"
+				case $(get-flag mcpu) in
+				v9)
+					# We need to force at least v9a because the base build doesn't
+					# work with just v9.
+					# https://sourceware.org/bugzilla/show_bug.cgi?id=19477
+					append-flags "-Wa,-xarch=v9a"
+					;;
+				esac
+				;;
+			sparc-*)
+				case $(get-flag mcpu) in
+				v8|supersparc|hypersparc|leon|leon3)
+					cpu="sparcv8"
+					;;
+				*)
+					cpu="sparcv9"
+					;;
+				esac
+			;;
+			esac
+			[[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"
+		;;
+	esac
+}
+
+setup_flags() {
+	# Make sure host make.conf doesn't pollute us
+	if is_crosscompile || tc-is-cross-compiler ; then
+		CHOST=${CTARGET} strip-unsupported-flags
+	fi
+
+	# Store our CFLAGS because it's changed depending on which CTARGET
+	# we are building when pulling glibc on a multilib profile
+	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
+	CFLAGS=${CFLAGS_BASE}
+	CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}
+	CXXFLAGS=${CXXFLAGS_BASE}
+	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
+	ASFLAGS=${ASFLAGS_BASE}
+
+	# Allow users to explicitly avoid flag sanitization via
+	# USE=custom-cflags.
+	if ! use custom-cflags; then
+		# Over-zealous CFLAGS can often cause problems.  What may work for one
+		# person may not work for another.  To avoid a large influx of bugs
+		# relating to failed builds, we strip most CFLAGS out to ensure as few
+		# problems as possible.
+		strip-flags
+		# Lock glibc at -O2; we want to be conservative here.
+		filter-flags '-O?'
+		append-flags -O2
+	fi
+
+	strip-unsupported-flags
+	filter-lto
+	filter-flags -m32 -m64 '-mabi=*'
+
+	# glibc aborts if rpath is set by LDFLAGS
+	filter-ldflags '-Wl,-rpath=*'
+
+	# ld can't use -r & --relax at the same time, bug #788901
+	# https://sourceware.org/PR27837
+	filter-ldflags '-Wl,--relax'
+
+	# Flag added for cross-prefix, but causes ldconfig to segfault. Not needed
+	# anyway because glibc already handles this by itself.
+	filter-ldflags '-Wl,--dynamic-linker=*'
+
+	# some weird software relies on sysv hashes in glibc, bug 863863, bug 864100
+	# we have to do that here already so mips can filter it out again :P
+	if use hash-sysv-compat ; then
+		append-ldflags '-Wl,--hash-style=both'
+	fi
+
+	# #492892
+	filter-flags -frecord-gcc-switches
+
+	# #898098
+	filter-flags -fno-builtin
+
+	# #829583
+	filter-lfs-flags
+
+	unset CBUILD_OPT CTARGET_OPT
+	if use multilib ; then
+		CTARGET_OPT=$(get_abi_CTARGET)
+		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
+	fi
+
+	setup_target_flags
+
+	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
+		CBUILD_OPT=${CTARGET_OPT}
+	fi
+
+	# glibc's headers disallow -O0 and fail at build time:
+	#  include/libc-symbols.h:75:3: #error "glibc cannot be compiled without optimization"
+	# https://sourceware.org/glibc/wiki/FAQ#Why_do_I_get:.60.23error_.22glibc_cannot_be_compiled_without_optimization.22.27.2C_when_trying_to_compile_GNU_libc_with_GNU_CC.3F
+	replace-flags -O0 -O1
+
+	# glibc handles this internally already where it's appropriate;
+	# can't always have SSP when we're the ones setting it up, etc
+	filter-flags '-fstack-protector*'
+
+	# Similar issues as with SSP. Can't inject yourself that early.
+	filter-flags '-fsanitize=*'
+
+	# See end of bug #830454; we handle this via USE=cet
+	filter-flags '-fcf-protection=*'
+
+	# When bootstrapping, we may have a situation where
+	# CET-enabled gcc from seed is used to build CET-disabled
+	# glibc. As such, gcc implicitly enables CET if no
+	# -fcf-protection flag is passed. For a typical package it
+	# should not be a problem, but for glibc it matters as it is
+	# dealing with CET in ld.so. So if CET is supposed to be
+	# disabled for glibc, be explicit about it.
+	if ! use cet; then
+		if use amd64 || use x86; then
+			append-flags '-fcf-protection=none'
+		elif use arm64; then
+			append-flags '-mbranch-protection=none'
+		fi
+	fi
+}
+
+use_multiarch() {
+	# Allow user to disable runtime arch detection in multilib.
+	use multiarch || return 1
+	# Make sure binutils is new enough to support indirect functions,
+	# #336792. This funky sed supports gold and bfd linkers.
+	local bver nver
+	bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}')
+	case $(tc-arch ${CTARGET}) in
+	amd64|x86) nver="2.20" ;;
+	arm)       nver="2.22" ;;
+	hppa)      nver="2.23" ;;
+	ppc|ppc64) nver="2.20" ;;
+	# ifunc support was added in 2.23, but glibc also needs
+	# machinemode which is in 2.24.
+	s390)      nver="2.24" ;;
+	sparc)     nver="2.21" ;;
+	*)         return 1 ;;
+	esac
+	ver_test ${bver} -ge ${nver}
+}
+
+# Setup toolchain variables that had historically been defined in the
+# profiles for these archs.
+setup_env() {
+	# silly users
+	unset LD_RUN_PATH
+	unset LD_ASSUME_KERNEL
+
+	if is_crosscompile || tc-is-cross-compiler ; then
+		multilib_env ${CTARGET_OPT:-${CTARGET}}
+
+		if ! use multilib ; then
+			MULTILIB_ABIS=${DEFAULT_ABI}
+		else
+			MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
+		fi
+
+		# If the user has CFLAGS_<CTARGET> in their make.conf, use that,
+		# and fall back on CFLAGS.
+		local VAR=CFLAGS_${CTARGET//[-.]/_}
+		CFLAGS=${!VAR-${CFLAGS}}
+		einfo " $(printf '%15s' 'Manual CFLAGS:')   ${CFLAGS}"
+	fi
+
+	setup_flags
+
+	export ABI=${ABI:-${DEFAULT_ABI:-default}}
+
+	if just_headers ; then
+		# Avoid mixing host's CC and target's CFLAGS_${ABI}:
+		# At this bootstrap stage we have only binutils for
+		# target but not compiler yet.
+		einfo "Skip CC ABI injection. We can't use (cross-)compiler yet."
+		return 0
+	fi
+
+	# Glibc does not work with gold (for various reasons) #269274.
+	tc-ld-disable-gold
+
+	if use doc ; then
+		export MAKEINFO=makeinfo
+	else
+		export MAKEINFO=/dev/null
+	fi
+
+	# Reset CC and CXX to the value at start of emerge
+	export CC=${glibc__ORIG_CC:-${CC:-$(tc-getCC ${CTARGET})}}
+	export CXX=${glibc__ORIG_CXX:-${CXX:-$(tc-getCXX ${CTARGET})}}
+	export CPP=${glibc__ORIG_CPP:-${CPP:-$(tc-getCPP ${CTARGET})}}
+
+	# and make sure glibc__ORIG_CC and glibc__ORIG_CXX is defined now.
+	export glibc__ORIG_CC=${CC}
+	export glibc__ORIG_CXX=${CXX}
+	export glibc__ORIG_CPP=${CPP}
+
+	if tc-is-clang && ! use custom-cflags && ! is_crosscompile ; then
+		export glibc__force_gcc=yes
+		# once this is toggled on, it needs to stay on, since with CPP manipulated
+		# tc-is-clang does not work correctly anymore...
+	fi
+
+	if [[ ${glibc__force_gcc} == "yes" ]] ; then
+		# If we are running in an otherwise clang/llvm environment, we need to
+		# recover the proper gcc and binutils settings here, at least until glibc
+		# is finally building with clang. So let's override everything that is
+		# set in the clang profiles.
+		# Want to shoot yourself into the foot? Set USE=custom-cflags, that's always
+		# a good start into that direction.
+		# Also, if you're crosscompiling, let's assume you know what you are doing.
+		# Hopefully.
+		# Last, we need the settings of the *build* environment, not of the
+		# target environment...
+
+		local current_binutils_path=$(env ROOT="${BROOT}" binutils-config -B)
+		local current_gcc_path=$(env ROOT="${BROOT}" gcc-config -B)
+		einfo "Overriding clang configuration, since it won't work here"
+
+		export CC="${current_gcc_path}/gcc"
+		export CPP="${current_gcc_path}/cpp"
+		export CXX="${current_gcc_path}/g++"
+		export LD="${current_binutils_path}/ld.bfd"
+		export AR="${current_binutils_path}/ar"
+		export AS="${current_binutils_path}/as"
+		export NM="${current_binutils_path}/nm"
+		export STRIP="${current_binutils_path}/strip"
+		export RANLIB="${current_binutils_path}/ranlib"
+		export OBJCOPY="${current_binutils_path}/objcopy"
+		export STRINGS="${current_binutils_path}/strings"
+		export OBJDUMP="${current_binutils_path}/objdump"
+		export READELF="${current_binutils_path}/readelf"
+		export ADDR2LINE="${current_binutils_path}/addr2line"
+
+		# do we need to also do flags munging here? yes! at least...
+		filter-flags '-fuse-ld=*'
+		filter-flags '-D_FORTIFY_SOURCE=*'
+
+	else
+
+		# this is the "normal" case
+
+		export CC="$(tc-getCC ${CTARGET})"
+		export CXX="$(tc-getCXX ${CTARGET})"
+		export CPP="$(tc-getCPP ${CTARGET})"
+
+		# Always use tuple-prefixed toolchain. For non-native ABI glibc's configure
+		# can't detect them automatically due to ${CHOST} mismatch and fallbacks
+		# to unprefixed tools. Similar to multilib.eclass:multilib_toolchain_setup().
+		export NM="$(tc-getNM ${CTARGET})"
+		export READELF="$(tc-getREADELF ${CTARGET})"
+
+	fi
+
+	# We need to export CFLAGS with abi information in them because glibc's
+	# configure script checks CFLAGS for some targets (like mips).  Keep
+	# around the original clean value to avoid appending multiple ABIs on
+	# top of each other. (Why does the comment talk about CFLAGS if the code
+	# acts on CC?)
+	export glibc__GLIBC_CC=${CC}
+	export glibc__GLIBC_CXX=${CXX}
+	export glibc__GLIBC_CPP=${CPP}
+
+	export glibc__abi_CFLAGS="$(get_abi_CFLAGS)"
+
+	# CFLAGS can contain ABI-specific flags like -mfpu=neon, see bug #657760
+	# To build .S (assembly) files with the same ABI-specific flags
+	# upstream currently recommends adding CFLAGS to CC/CXX:
+	#    https://sourceware.org/PR23273
+	# Note: Passing CFLAGS via CPPFLAGS overrides glibc's arch-specific CFLAGS
+	# and breaks multiarch support. See 659030#c3 for an example.
+	# The glibc configure script doesn't properly use LDFLAGS all the time.
+	export CC="${glibc__GLIBC_CC} ${glibc__abi_CFLAGS} ${CFLAGS} ${LDFLAGS}"
+
+	# Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548
+	export CXX="${glibc__GLIBC_CXX} ${glibc__abi_CFLAGS} ${CFLAGS}"
+
+	export CPP="${glibc__GLIBC_CPP} ${glibc__abi_CFLAGS}"
+
+	if is_crosscompile; then
+		# Assume worst-case bootstrap: glibc is built for the first time
+		# with ${CTARGET}-g++ not available yet. We avoid
+		# building auxiliary programs that require C++: bug #683074
+		# It should not affect final result.
+		export libc_cv_cxx_link_ok=no
+		# The line above has the same effect. We set CXX explicitly
+		# to make build logs less confusing.
+		export CXX=
+	fi
+}
+
+foreach_abi() {
+	setup_env
+
+	local ret=0
+	local abilist=""
+	if use multilib ; then
+		abilist=$(get_install_abis)
+	else
+		abilist=${DEFAULT_ABI}
+	fi
+	local -x ABI
+	for ABI in ${abilist:-default} ; do
+		setup_env
+		einfo "Running $1 for ABI ${ABI}"
+		$1
+		: $(( ret |= $? ))
+	done
+	return ${ret}
+}
+
+glibc_banner() {
+	local b="Gentoo ${PVR}"
+	[[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" (patchset ${PATCH_VER})"
+	echo "${b}"
+}
+
+# The following Kernel version handling functions are mostly copied from portage
+# source. It's better not to use linux-info.eclass here since a) it adds too
+# much magic, see bug 326693 for some of the arguments, and b) some of the
+# functions are just not provided.
+
+g_get_running_KV() {
+	uname -r
+	return $?
+}
+
+g_KV_major() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	echo "${KV%%.*}"
+}
+
+g_KV_minor() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.}
+	echo "${KV%%.*}"
+}
+
+g_KV_micro() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.*.}
+	echo "${KV%%[^[:digit:]]*}"
+}
+
+g_KV_to_int() {
+	[[ -z $1 ]] && return 1
+	local KV_MAJOR=$(g_KV_major "$1")
+	local KV_MINOR=$(g_KV_minor "$1")
+	local KV_MICRO=$(g_KV_micro "$1")
+	local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))
+
+	# We make version 2.2.0 the minimum version we will handle as
+	# a sanity check ... if its less, we fail ...
+	if [[ ${KV_int} -ge 131584 ]] ; then
+		echo "${KV_int}"
+		return 0
+	fi
+	return 1
+}
+
+g_int_to_KV() {
+	local version=$1 major minor micro
+	major=$((version / 65536))
+	minor=$(((version % 65536) / 256))
+	micro=$((version % 256))
+	echo ${major}.${minor}.${micro}
+}
+
+eend_KV() {
+	[[ $(g_KV_to_int $1) -ge $(g_KV_to_int $2) ]]
+	eend $?
+}
+
+get_kheader_version() {
+	printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \
+	$(tc-getCPP ${CTARGET}) -I "$(build_eprefix)$(alt_build_headers)" - | \
+	tail -n 1
+}
+
+# We collect all sanity checks here. Consistency is not guranteed between
+# pkg_ and src_ phases, so we call this function both in pkg_pretend and in
+# src_unpack.
+sanity_prechecks() {
+	# Prevent native builds from downgrading
+	if [[ ${MERGE_TYPE} != "buildonly" ]] && \
+	   [[ -z ${ROOT} ]] && \
+	   [[ ${CBUILD} == ${CHOST} ]] && \
+	   [[ ${CHOST} == ${CTARGET} ]] ; then
+
+		# The high rev # is to allow people to downgrade between -r#
+		# versions. We want to block 2.20->2.19, but 2.20-r3->2.20-r2
+		# should be fine. Hopefully we never actually use a r# this
+		# high.
+		if has_version ">${CATEGORY}/${P}-r10000" ; then
+			eerror "Sanity check to keep you from breaking your system:"
+			eerror " Downgrading glibc is not supported and a sure way to destruction."
+			[[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system."
+		fi
+
+		if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then
+			eerror "Your old kernel is broken. You need to update it to a newer"
+			eerror "version as syscall(<bignum>) will break. See bug 279260."
+			die "Old and broken kernel."
+		fi
+	fi
+
+	if [[ ${CTARGET} == i386-* ]] ; then
+		eerror "i386 CHOSTs are no longer supported."
+		eerror "Chances are you don't actually want/need i386."
+		eerror "Please read https://www.gentoo.org/doc/en/change-chost.xml"
+		die "Please fix your CHOST"
+	fi
+
+	if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
+		ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
+		ewarn "This will result in a 50% performance penalty when running with a 32bit"
+		ewarn "hypervisor, which is probably not what you want."
+	fi
+
+	# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
+	# we test for...
+	if ! is_crosscompile ; then
+		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
+			ebegin "Checking that IA32 emulation is enabled in the running kernel"
+			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
+			local STAT
+			if ${CC-${CHOST}-gcc} ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
+				"${T}/check-ia32-emulation.elf32"
+				STAT=$?
+			else
+				# Don't fail here to allow single->multi ABI switch
+				# or recover from breakage like bug #646424
+				ewarn "Failed to compile the ABI test. Broken host glibc?"
+				STAT=0
+			fi
+			rm -f "${T}/check-ia32-emulation.elf32"
+			eend $STAT
+			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+		fi
+
+	fi
+
+	# When we actually have to compile something...
+	if ! just_headers && [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if [[ -d "${ESYSROOT}"/usr/lib/include ]] ; then
+			# bug #833620, bug #643302
+			eerror "Found ${ESYSROOT}/usr/lib/include directory!"
+			eerror "This is known to break glibc's build."
+			eerror "Please backup its contents then remove the directory."
+			die "Found directory (${ESYSROOT}/usr/lib/include) which will break build (bug #833620)!"
+		fi
+
+		if [[ ${CTARGET} == *-linux* ]] ; then
+			local run_kv build_kv want_kv
+
+			run_kv=$(g_get_running_KV)
+			build_kv=$(g_int_to_KV $(get_kheader_version))
+			want_kv=${MIN_KERN_VER}
+
+			if ! is_crosscompile && ! tc-is-cross-compiler ; then
+				# Building fails on an non-supporting kernel
+				ebegin "Checking running kernel version (${run_kv} >= ${want_kv})"
+				if ! eend_KV ${run_kv} ${want_kv} ; then
+					echo
+					eerror "You need a kernel of at least ${want_kv}!"
+					die "Kernel version too low!"
+				fi
+			fi
+
+			# Do not run this check for pkg_pretend, just pkg_setup and friends (if we ever get used there).
+			# It's plausible (seen it in the wild) that Portage will (correctly) schedule a linux-headers
+			# upgrade before glibc, but because pkg_pretend gets run before any packages are merged at all (not
+			# just glibc), the whole emerge gets aborted without a good reason. We probably don't
+			# need to run this check at all given we have a dependency on the right headers,
+			# but let's leave it as-is for now.
+			if [[ ${EBUILD_PHASE_FUNC} != pkg_pretend ]] ; then
+				ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
+				if ! eend_KV ${build_kv} ${want_kv} ; then
+					echo
+					eerror "You need linux-headers of at least ${want_kv}!"
+					die "linux-headers version too low!"
+				fi
+			fi
+		fi
+	fi
+}
+
+upgrade_warning() {
+	is_crosscompile && return
+
+	if [[ ${MERGE_TYPE} != buildonly && -n ${REPLACING_VERSIONS} && -z ${ROOT} ]]; then
+		local oldv newv=$(ver_cut 1-2 ${PV})
+		for oldv in ${REPLACING_VERSIONS}; do
+			if ver_test ${oldv} -lt ${newv}; then
+				ewarn "After upgrading glibc, please restart all running processes."
+				ewarn "Be sure to include init (telinit u) or systemd (systemctl daemon-reexec)."
+				ewarn "Alternatively, reboot your system."
+				ewarn "(See bug #660556, bug #741116, bug #823756, etc)"
+				break
+			fi
+		done
+	fi
+}
+
+#
+# the phases
+#
+
+# pkg_pretend
+
+pkg_pretend() {
+	upgrade_warning
+}
+
+# pkg_setup
+
+pkg_setup() {
+	# see bug 682570
+	[[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
+}
+
+# src_unpack
+
+src_unpack() {
+	setup_env
+
+	einfo "Checking general environment sanity."
+	sanity_prechecks
+
+	use multilib-bootstrap && unpack gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
+
+	if [[ ${PV} == 9999* ]] ; then
+		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/glibc-patches.git"
+		EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
+		git-r3_src_unpack
+		mv patches-git/9999 patches || die
+
+		EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
+		EGIT_CHECKOUT_DIR=${S}
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.xz
+
+		cd "${WORKDIR}" || die
+		unpack glibc-${PV}-patches-${PATCH_VER}.tar.xz
+	fi
+
+	cd "${WORKDIR}" || die
+	use systemd && unpack glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz
+}
+
+# src_prepare
+
+src_prepare() {
+	local patchsetname
+	if ! use vanilla ; then
+		if [[ ${PV} == 9999* ]] ; then
+			patchsetname="from git master"
+		else
+			patchsetname="${PV}-${PATCH_VER}"
+		fi
+		einfo "Applying Gentoo Glibc patchset ${patchsetname}"
+		eapply "${WORKDIR}"/patches
+		einfo "Done."
+	fi
+
+	default
+
+	gnuconfig_update
+
+	cd "${WORKDIR}" || die
+	find . -name configure -exec touch {} +
+
+	# Fix permissions on some of the scripts.
+	chmod u+x "${S}"/scripts/*.sh
+
+	cd "${S}" || die
+}
+
+# src_configure
+
+glibc_do_configure() {
+	dump_build_environment
+
+	local myconf=()
+
+	# Use '=strong' instead of '=all' to protect only functions
+	# worth protecting from stack smashes.
+	myconf+=( --enable-stack-protector=$(usex ssp strong no) )
+
+	# Keep a whitelist of targets supporing IFUNC. glibc's ./configure
+	# is not robust enough to detect proper support:
+	#    https://bugs.gentoo.org/641216
+	#    https://sourceware.org/PR22634#c0
+	case $(tc-arch ${CTARGET}) in
+		# Keep whitelist of targets where autodetection mostly works.
+		amd64|x86|sparc|ppc|ppc64|arm|arm64|s390|riscv|loong) ;;
+		# Blacklist everywhere else
+		*) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
+	esac
+
+	case ${ABI}-${CTARGET} in
+		amd64-x86_64-*|x32-x86_64-*-*-gnux32) myconf+=( $(use_enable cet) ) ;;
+		*) ;;
+	esac
+
+	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
+
+	myconf+=( --enable-kernel=${MIN_KERN_VER} )
+
+	# Since SELinux support is only required for nscd, only enable it if:
+	# 1. USE selinux
+	# 2. only for the primary ABI on multilib systems
+	# 3. Not a crosscompile
+	if ! is_crosscompile && use selinux ; then
+		if use multilib ; then
+			if is_final_abi ; then
+				myconf+=( --with-selinux )
+			else
+				myconf+=( --without-selinux )
+			fi
+		else
+			myconf+=( --with-selinux )
+		fi
+	else
+		myconf+=( --without-selinux )
+	fi
+
+	# Force a few tests where we always know the answer but
+	# configure is incapable of finding it.
+	if is_crosscompile ; then
+		export \
+			libc_cv_c_cleanup=yes \
+			libc_cv_forced_unwind=yes
+	fi
+
+	myconf+=(
+		--disable-werror
+		--enable-bind-now
+		--enable-fortify-source
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		$(use_enable profile)
+		$(use_with gd)
+		--with-headers=$(build_eprefix)$(alt_build_headers)
+		--prefix="$(host_eprefix)/usr"
+		--sysconfdir="$(host_eprefix)/etc"
+		--localstatedir="$(host_eprefix)/var"
+		--libdir='$(prefix)'/$(get_libdir)
+		--mandir='$(prefix)'/share/man
+		--infodir='$(prefix)'/share/info
+		--libexecdir='$(libdir)'/misc/glibc
+		--with-bugurl=https://bugs.gentoo.org/
+		--with-pkgversion="$(glibc_banner)"
+		$(use_multiarch || echo --disable-multi-arch)
+		$(use_enable systemtap)
+		$(use_enable nscd)
+
+		# /usr/bin/mtrace has a Perl shebang. Gentoo Prefix QA checks fail if
+		# Perl hasn't been installed inside the prefix yet and configure picks
+		# up a Perl from outside the prefix instead. configure will fail to
+		# execute Perl during configure if we're cross-compiling a prefix, but
+		# it will just disable mtrace in that case.
+		# Note: mtrace is needed by the test suite.
+		ac_cv_path_PERL="$(usex perl "${EPREFIX}"/usr/bin/perl $(usex test "${EPREFIX}"/usr/bin/perl $(usex doc "${EPREFIX}"/usr/bin/perl no)))"
+
+		# locale data is arch-independent
+		# https://bugs.gentoo.org/753740
+		libc_cv_complocaledir='${exec_prefix}/lib/locale'
+
+		# On aarch64 there is no way to override -mcpu=native, and if
+		# the current cpu does not support SVE configure fails.
+		# Let's boldly assume our toolchain can always build SVE instructions.
+		libc_cv_aarch64_sve_asm=yes
+
+		${EXTRA_ECONF}
+	)
+
+	# We rely on sys-libs/timezone-data for timezone tools normally.
+	myconf+=( $(use_enable vanilla timezone-tools) )
+
+	# These libs don't have configure flags.
+	ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no)
+	ac_cv_lib_cap_cap_init=$(usex caps || echo no)
+
+	# There is no configure option for this and we need to export it
+	# since the glibc build will re-run configure on itself
+	export libc_cv_rootsbindir="$(host_eprefix)/sbin"
+	export libc_cv_slibdir="$(host_eprefix)/$(get_libdir)"
+
+	local builddir=$(builddir nptl)
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+	set -- "${S}"/configure "${myconf[@]}"
+	echo "$@"
+	"$@" || die "failed to configure glibc"
+
+	# If we're trying to migrate between ABI sets, we need
+	# to lie and use a local copy of gcc.  Like if the system
+	# is built with MULTILIB_ABIS="amd64 x86" but we want to
+	# add x32 to it, gcc/glibc don't yet support x32.
+	#
+	if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib-bootstrap ; then
+		echo 'int main(void){}' > "${T}"/test.c || die
+		if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then
+			sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die
+		fi
+	fi
+}
+
+glibc_headers_configure() {
+	export ABI=default
+
+	local builddir=$(builddir "headers")
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+
+	# if we don't have a compiler yet, we can't really test it now ...
+	# hopefully they don't affect header generation, so let's hope for
+	# the best here ...
+	local v vars=(
+		ac_cv_header_cpuid_h=yes
+		libc_cv_{386,390,alpha,arm,hppa,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes
+		libc_cv_asm_cfi_directives=yes
+		libc_cv_broken_visibility_attribute=no
+		libc_cv_c_cleanup=yes
+		libc_cv_compiler_powerpc64le_binary128_ok=yes
+		libc_cv_forced_unwind=yes
+		libc_cv_gcc___thread=yes
+		libc_cv_mlong_double_128=yes
+		libc_cv_mlong_double_128ibm=yes
+		libc_cv_ppc_machine=yes
+		libc_cv_ppc_rel16=yes
+		libc_cv_predef_fortify_source=no
+		libc_cv_target_power8_ok=yes
+		libc_cv_visibility_attribute=yes
+		libc_cv_z_combreloc=yes
+		libc_cv_z_execstack=yes
+		libc_cv_z_initfirst=yes
+		libc_cv_z_nodelete=yes
+		libc_cv_z_nodlopen=yes
+		libc_cv_z_relro=yes
+		libc_mips_abi=${ABI}
+		libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard)
+		# These libs don't have configure flags.
+		ac_cv_lib_audit_audit_log_user_avc_message=no
+		ac_cv_lib_cap_cap_init=no
+	)
+
+	einfo "Forcing cached settings:"
+	for v in "${vars[@]}" ; do
+		einfo " ${v}"
+		export ${v}
+	done
+
+	local headers_only_arch_CPPFLAGS=()
+
+	# Blow away some random CC settings that screw things up. #550192
+	if [[ -d ${S}/sysdeps/mips ]]; then
+		pushd "${S}"/sysdeps/mips >/dev/null
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
+
+		# Force the mips ABI to the default.  This is OK because the set of
+		# installed headers in this phase is the same between the 3 ABIs.
+		# If this ever changes, this hack will break, but that's unlikely
+		# as glibc discourages that behavior.
+		# https://crbug.com/647033
+		sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die
+
+		popd >/dev/null
+	fi
+
+	local myconf=()
+
+	case ${CTARGET} in
+	aarch64*)
+		# The configure checks fail during cross-build, so disable here
+		# for headers-only
+		myconf+=(
+			--disable-mathvec
+		) ;;
+	riscv*)
+		# RISC-V interrogates the compiler to determine which target to
+		# build.  If building the headers then we don't strictly need a
+		# RISC-V compiler, so the built-in definitions that are provided
+		# along with all RISC-V compiler might not exist.  This causes
+		# glibc's RISC-V preconfigure script to blow up.  Since we're just
+		# building the headers any value will actually work here, so just
+		# pick the standard one (rv64g/lp64d) to make the build scripts
+		# happy for now -- the headers are all the same anyway so it
+		# doesn't matter.
+		headers_only_arch_CPPFLAGS+=(
+			-D__riscv_xlen=64
+			-D__riscv_flen=64
+			-D__riscv_float_abi_double=1
+			-D__riscv_atomic=1
+		) ;;
+	esac
+
+	myconf+=(
+		--disable-sanity-checks
+		--enable-hacker-mode
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		--with-headers=$(build_eprefix)$(alt_build_headers)
+		--prefix="$(host_eprefix)/usr"
+		${EXTRA_ECONF}
+	)
+
+	# Nothing is compiled here which would affect the headers for the target.
+	# So forcing CC/CFLAGS is sane.
+	local headers_only_CC=$(tc-getBUILD_CC)
+	local headers_only_CFLAGS="-O1 -pipe"
+	local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}"
+	local headers_only_LDFLAGS=""
+	set -- "${S}"/configure "${myconf[@]}"
+	echo \
+		"CC=${headers_only_CC}" \
+		"CFLAGS=${headers_only_CFLAGS}" \
+		"CPPFLAGS=${headers_only_CPPFLAGS}" \
+		"LDFLAGS=${headers_only_LDFLAGS}" \
+		"$@"
+	CC=${headers_only_CC} \
+	CFLAGS=${headers_only_CFLAGS} \
+	CPPFLAGS=${headers_only_CPPFLAGS} \
+	LDFLAGS="" \
+	"$@" || die "failed to configure glibc"
+}
+
+do_src_configure() {
+	if just_headers ; then
+		glibc_headers_configure
+	else
+		glibc_do_configure nptl
+	fi
+}
+
+src_configure() {
+	foreach_abi do_src_configure
+}
+
+# src_compile
+
+do_src_compile() {
+	emake -C "$(builddir nptl)"
+}
+
+src_compile() {
+	if just_headers ; then
+		return
+	fi
+
+	foreach_abi do_src_compile
+}
+
+# src_test
+
+glibc_src_test() {
+	cd "$(builddir nptl)"
+
+	local myxfailparams=""
+	if [[ "${GENTOO_GLIBC_XFAIL_TESTS}" == "yes" ]] ; then
+		local virt=$(systemd-detect-virt 2>/dev/null)
+		if [[ ${virt} == systemd-nspawn ]] ; then
+			ewarn "Skipping extra tests because in systemd-nspawn container"
+			XFAIL_TEST_LIST+=( "${XFAIL_NSPAWN_TEST_LIST[@]}" )
+		fi
+
+		for myt in ${XFAIL_TEST_LIST[@]} ; do
+			myxfailparams+="test-xfail-${myt}=yes "
+		done
+	fi
+
+	# sandbox does not understand unshare() and prevents
+	# writes to /proc/, which makes many tests fail
+
+	# we give the tests a bit more time to avoid spurious
+	# bug reports on slow arches
+
+	SANDBOX_ON=0 LD_PRELOAD= TIMEOUTFACTOR=16 emake ${myxfailparams} check
+}
+
+src_test() {
+	if just_headers ; then
+		return
+	fi
+
+	foreach_abi glibc_src_test || die "tests failed"
+}
+
+# src_install
+
+run_locale_gen() {
+	# if the host locales.gen contains no entries, we'll install everything
+	local root="$1"
+	local inplace=""
+
+	if [[ "${root}" == "--inplace-glibc" ]] ; then
+		inplace="--inplace-glibc"
+		root="$2"
+	fi
+
+	local locale_list="${root%/}/etc/locale.gen"
+
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
+		[[ -z ${inplace} ]] && ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
+		locale_list="${root%/}/usr/share/i18n/SUPPORTED"
+	fi
+
+	# bug 736794: we need to be careful with the parallelization... the number of
+	# processors saved in the environment of a binary package may differ strongly
+	# from the number of processes available during postinst
+	local mygenjobs="$(makeopts_jobs)"
+	if [[ "${EMERGE_FROM}" == "binary" ]] ; then
+		mygenjobs="$(nproc)"
+	fi
+
+	set -- locale-gen ${inplace} --jobs "${mygenjobs}" --config "${locale_list}" \
+		--destdir "${root}"
+	echo "$@"
+	"$@"
+
+	popd >/dev/null
+}
+
+glibc_do_src_install() {
+	local builddir=$(builddir nptl)
+	cd "${builddir}"
+
+	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install
+
+	# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
+	# which come without headers etc. Only needed for binary packages since the
+	# external net-libs/libnsl has increased soversion. Keep only versioned libraries.
+	find "${D}" -name "libnsl.a" -delete
+	find "${D}" -name "libnsl.so" -delete
+
+	# Normally upstream_pv is ${PV}. Live ebuilds are exception, there we need
+	# to infer upstream version:
+	# '#define VERSION "2.26.90"' -> '2.26.90'
+	local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
+
+	# Avoid stripping binaries not targeted by ${CHOST}. Or else
+	# ${CHOST}-strip would break binaries build for ${CTARGET}.
+	is_crosscompile && dostrip -x /
+
+	# gdb thread introspection relies on local libpthreads symbols. stripping breaks it
+	# See Note [Disable automatic stripping]
+	dostrip -x $(alt_libdir)/libpthread-${upstream_pv}.so
+	# valgrind requires knowledge about ld.so symbols.
+	dostrip -x $(alt_libdir)/ld-*.so*
+
+	if [[ -e ${ED}/$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
+		# Move versioned .a file out of libdir to evade portage QA checks
+		# instead of using gen_usr_ldscript(). We fix ldscript as:
+		# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..."
+		sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"/$(alt_usrlibdir)/libm.a || die
+		dodir $(alt_usrlibdir)/${P}
+		mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
+	fi
+
+	# We configure toolchains for standalone prefix systems with a sysroot,
+	# which is prepended to paths in ld scripts, so strip the prefix from these.
+	# Before: GROUP ( /foo/lib64/libc.so.6 /foo/usr/lib64/libc_nonshared.a  AS_NEEDED ( /foo/lib64/ld-linux-x86-64.so.2 ) )
+	# After: GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a  AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) )
+	if [[ -n $(host_eprefix) ]] ; then
+		local file
+		grep -lZIF "ld script" "${ED}/$(alt_usrlibdir)"/lib*.{a,so} 2>/dev/null | while read -rd '' file ; do
+			sed -i "s|$(host_eprefix)/|/|g" "${file}" || die
+		done
+	fi
+
+	# We'll take care of the cache ourselves
+	rm -f "${ED}"/etc/ld.so.cache
+
+	# Everything past this point just needs to be done once ...
+	is_final_abi || return 0
+
+	# Make sure the non-native interp can be found on multilib systems even
+	# if the main library set isn't installed into the right place.  Maybe
+	# we should query the active gcc for info instead of hardcoding it ?
+	local i ldso_abi ldso_name
+	local ldso_abi_list=(
+		# x86
+		amd64   /lib64/ld-linux-x86-64.so.2
+		x32     /libx32/ld-linux-x32.so.2
+		x86     /lib/ld-linux.so.2
+		# mips
+		o32     /lib/ld.so.1
+		n32     /lib32/ld.so.1
+		n64     /lib64/ld.so.1
+		# powerpc
+		ppc     /lib/ld.so.1
+		# riscv
+		ilp32d  /lib/ld-linux-riscv32-ilp32d.so.1
+		ilp32   /lib/ld-linux-riscv32-ilp32.so.1
+		lp64d   /lib/ld-linux-riscv64-lp64d.so.1
+		lp64    /lib/ld-linux-riscv64-lp64.so.1
+		# s390
+		s390    /lib/ld.so.1
+		s390x   /lib/ld64.so.1
+		# sparc
+		sparc32 /lib/ld-linux.so.2
+		sparc64 /lib64/ld-linux.so.2
+	)
+	case $(tc-endian) in
+	little)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64.so.1
+			# ELFv2 (glibc does not support ELFv1 on LE)
+			ppc64   /lib64/ld64.so.2
+		)
+		;;
+	big)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64_be.so.1
+			# ELFv1 (glibc does not support ELFv2 on BE)
+			ppc64   /lib64/ld64.so.1
+		)
+		;;
+	esac
+	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
+	fi
+	for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do
+		ldso_abi=${ldso_abi_list[i]}
+		has ${ldso_abi} $(get_install_abis) || continue
+
+		ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
+		if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
+			dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
+		fi
+	done
+
+	# In the LSB 5.0 definition, someone had the excellent idea to "standardize"
+	# the runtime loader name, see also https://xkcd.com/927/
+	# Normally, in Gentoo one should never come across executables that require this.
+	# However, binary commercial packages are known to adhere to weird practices.
+	# https://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-AMD64/LSB-Core-AMD64.html#BASELIB
+	local lsb_ldso_name native_ldso_name lsb_ldso_abi
+	local lsb_ldso_abi_list=(
+		# x86
+		amd64	ld-linux-x86-64.so.2	ld-lsb-x86-64.so.3
+	)
+	for (( i = 0; i < ${#lsb_ldso_abi_list[@]}; i += 3 )) ; do
+		lsb_ldso_abi=${lsb_ldso_abi_list[i]}
+		native_ldso_name=${lsb_ldso_abi_list[i+1]}
+		lsb_ldso_name=${lsb_ldso_abi_list[i+2]}
+		has ${lsb_ldso_abi} $(get_install_abis) || continue
+
+		if [[ ! -L ${ED}/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name} && ! -e ${ED}/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name} ]] ; then
+			dosym ${native_ldso_name} "$(alt_prefix)/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name}"
+		fi
+	done
+
+	# With devpts under Linux mounted properly, we do not need the pt_chown
+	# binary to be setuid.  This is because the default owners/perms will be
+	# exactly what we want.
+	if ! use suid ; then
+		find "${ED}" -name pt_chown -exec chmod -s {} +
+	fi
+
+	#################################################################
+	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
+	#################################################################
+
+	# Make sure we install some symlink hacks so that when we build
+	# a 2nd stage cross-compiler, gcc finds the target system
+	# headers correctly.  See gcc/doc/gccinstall.info
+	if is_crosscompile ; then
+		# We need to make sure that /lib and /usr/lib always exists.
+		# gcc likes to use relative paths to get to its multilibs like
+		# /usr/lib/../lib64/.  So while we don't install any files into
+		# /usr/lib/, we do need it to exist.
+		keepdir $(alt_prefix)/lib
+		keepdir $(alt_prefix)/usr/lib
+
+		dosym usr/include $(alt_prefix)/sys-include
+		return 0
+	fi
+
+	# Files for Debian-style locale updating
+	dodir /usr/share/i18n
+	sed \
+		-e "/^#/d" \
+		-e "/SUPPORTED-LOCALES=/d" \
+		-e "s: \\\\::g" -e "s:/: :g" \
+		"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
+		|| die "generating /usr/share/i18n/SUPPORTED failed"
+
+	cd "${S}" || die
+
+	# Install misc network config files
+	insinto /etc
+	doins posix/gai.conf
+
+	if use systemd ; then
+		doins "${WORKDIR}/glibc-systemd-${GLIBC_SYSTEMD_VER}/gentoo-config/nsswitch.conf"
+	else
+		doins nss/nsswitch.conf
+	fi
+
+	# Gentoo-specific
+	newins "${FILESDIR}"/host.conf-1 host.conf
+
+	if use nscd ; then
+		doins nscd/nscd.conf
+
+		newinitd "$(prefixify_ro "${FILESDIR}"/nscd-1)" nscd
+
+		local nscd_args=(
+			-e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):"
+		)
+
+		sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
+
+		use systemd && systemd_dounit nscd/nscd.service
+		newtmpfiles nscd/nscd.tmpfiles nscd.conf
+	fi
+
+	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
+	doenvd "${T}"/00glibc
+
+	for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
+		[[ -s ${d} ]] && dodoc ${d}
+	done
+	dodoc -r ChangeLog.old
+
+	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
+	# creation of the "factory" symlink in pkg_postinst().
+	rm -f "${ED}"/etc/localtime
+
+	# Generate all locales if this is a native build as locale generation
+	if use compile-locales && ! is_crosscompile ; then
+		run_locale_gen --inplace-glibc "${ED}/"
+	fi
+}
+
+glibc_headers_install() {
+	local builddir=$(builddir "headers")
+	cd "${builddir}"
+	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install-headers
+
+	insinto $(alt_headers)/gnu
+	doins "${S}"/include/gnu/stubs.h
+
+	# Make sure we install the sys-include symlink so that when
+	# we build a 2nd stage cross-compiler, gcc finds the target
+	# system headers correctly.  See gcc/doc/gccinstall.info
+	dosym usr/include $(alt_prefix)/sys-include
+}
+
+src_install() {
+	if just_headers ; then
+		export ABI=default
+		glibc_headers_install
+		return
+	fi
+
+	foreach_abi glibc_do_src_install
+
+	if ! use static-libs ; then
+		einfo "Not installing static glibc libraries"
+		find "${ED}" -name "*.a" -and -not -name "*_nonshared.a" -delete
+	fi
+}
+
+# Simple test to make sure our new glibc isn't completely broken.
+# Make sure we don't test with statically built binaries since
+# they will fail.  Also, skip if this glibc is a cross compiler.
+#
+# If coreutils is built with USE=multicall, some of these files
+# will just be wrapper scripts, not actual ELFs we can test.
+glibc_sanity_check() {
+	cd / #228809
+
+	# We enter ${ED} so to avoid trouble if the path contains
+	# special characters; for instance if the path contains the
+	# colon character (:), then the linker will try to split it
+	# and look for the libraries in an unexpected place. This can
+	# lead to unsafe code execution if the generated prefix is
+	# within a world-writable directory.
+	# (e.g. /var/tmp/portage:${HOSTNAME})
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	# first let's find the actual dynamic linker here
+	# symlinks may point to the wrong abi
+	local newldso=$(find . -maxdepth 1 -name 'ld*so.?' -type f -print -quit)
+
+	einfo Last-minute run tests with ${newldso} in /$(get_libdir) ...
+
+	local x striptest
+	for x in cal date env free ls true uname uptime ; do
+		x=$(type -p ${x})
+		[[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue
+		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
+		case ${striptest} in
+		*"statically linked"*) continue;;
+		*"ASCII text"*) continue;;
+		esac
+		# We need to clear the locale settings as the upgrade might want
+		# incompatible locale data.  This test is not for verifying that.
+		LC_ALL=C \
+		${newldso} --library-path . ${x} > /dev/null \
+			|| die "simple run test (${x}) failed"
+	done
+
+	popd >/dev/null
+}
+
+pkg_preinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	einfo "Checking general environment sanity."
+	sanity_prechecks
+
+	# prepare /etc/ld.so.conf.d/ for files
+	mkdir -p "${EROOT}"/etc/ld.so.conf.d
+
+	# Default /etc/hosts.conf:multi to on for systems with small dbs.
+	if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then
+		sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf
+		einfo "Defaulting /etc/host.conf:multi to on"
+	fi
+
+	[[ -n ${ROOT} ]] && return 0
+	[[ -d ${ED}/$(get_libdir) ]] || return 0
+	[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
+
+	if [[ -L ${EROOT}/usr/lib/locale ]]; then
+		# Help portage migrate this to a directory
+		# https://bugs.gentoo.org/753740
+		rm "${EROOT}"/usr/lib/locale || die
+	fi
+
+	# Keep around libcrypt so that Perl doesn't break when merging libxcrypt
+	# (libxcrypt is the new provider for now of libcrypt.so.{1,2}).
+	# bug #802207
+	if has_version "${CATEGORY}/${PN}[crypt]" && ! has preserve-libs ${FEATURES}; then
+		PRESERVED_OLD_LIBCRYPT=1
+		cp -p "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" "${T}/libcrypt$(get_libname 1)" || die
+	else
+		PRESERVED_OLD_LIBCRYPT=0
+	fi
+}
+
+glibc_refresh_ldconfig() {
+	if [[ ${MERGE_TYPE} == buildonly ]]; then
+		return
+	fi
+
+	# Version check could be added to avoid unnecessary work, but ldconfig
+	# should finish quickly enough to not matter.
+	ebegin "Refreshing ld.so.cache"
+	ldconfig -i
+	if ! eend $?; then
+		ewarn "Failed to refresh the ld.so.cache for you. Some programs may be broken"
+		ewarn "before you manually do so (ldconfig -i)."
+	fi
+}
+
+pkg_postinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
+		# Generate fastloading iconv module configuration file.
+		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}/"
+	fi
+
+	if ! is_crosscompile && [[ -z ${ROOT} ]] ; then
+		# glibc-2.38+ on loong has ldconfig support added, but the ELF e_flags
+		# handling has changed as well, which means stale ldconfig auxiliary
+		# cache entries and failure to lookup libgcc_s / libstdc++ (breaking
+		# every C++ application) / libgomp etc., among other breakages.
+		#
+		# To fix this, simply refresh the ld.so.cache without using the
+		# auxiliary cache if we're natively installing on loong. This should
+		# be done relatively soon because we want to minimize the breakage
+		# window for the affected programs.
+		use loong && glibc_refresh_ldconfig
+
+		use compile-locales || run_locale_gen "${EROOT}/"
+	fi
+
+	upgrade_warning
+
+	# Check for sanity of /etc/nsswitch.conf, take 2
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then
+		local entry
+		for entry in passwd group shadow; do
+			if grep -E -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then
+				ewarn ""
+				ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been"
+				ewarn "removed from glibc and is now provided by the package"
+				ewarn "  sys-auth/libnss-nis"
+				ewarn "Install it now to keep your NIS setup working."
+				ewarn ""
+			fi
+		done
+	fi
+
+	if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then
+		cp -p "${T}/libcrypt$(get_libname 1)" "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" || die
+		preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1)
+
+		elog "Please ignore a possible later error message about a file collision involving"
+		elog "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1). We need to preserve this file for the moment to keep"
+		elog "the upgrade working, but it also needs to be overwritten when"
+		elog "sys-libs/libxcrypt is installed. See bug 802210 for more details."
+	fi
+}
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index f4e640203547..7474cde00141 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -2,16 +2,19 @@ AUX ldb-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch 701 BLAKE2B dd2398f9e
 AUX ldb-1.5.2-optional_packages.patch 1441 BLAKE2B 0b9413cd9690aae2b2eb26f097d2509c0bbe0fc59f81bab22add57ffe0c603a8fb0c9be038d06693dcbb1d3817d4ad97a5931120b18bd9783efaac599fe0ccbc SHA512 2f313c3377385279ca3da6db21d926df0559d971e1fd42f8cce57b4001078c3817f472b85088a1f3b0e5ddcdfbbfd943199485d6e4a00412f62c883c6ea04afd
 AUX ldb-2.4.2-skip-32bit-time_t-tests.patch 1308 BLAKE2B 1ff687160b92c5395c7838ade8af32ba77637a2b18153d146b9e1496f96ec9c411cc5e5f9721a8dea1730118e6574a091ee7fd1edca1830cc54c5d4fddb007ab SHA512 27a35123cb9a1f6e39b88c91de8241ecfc0f0ed125a235ba26b95767dc3121d176b267ba97b1579e5b68cfb9e3879f40326f0163a31e311f01a1b2eb7751caf4
 AUX ldb-2.5.2-skip-waf-tevent-check.patch 606 BLAKE2B 9cfe1afd1adfca20e1fcdead2f2a60f52a64f181b85c227be6cf9c9373a64528afbe4e9db1970e8316d5bddf76ba9395a75b194f27bcf25eb4d2e7695c5530eb SHA512 19028447cbde09a425f1a07fe2d9a2a6f16cada1785e6e9684a8b573db5705b6694a29cd6f5480047360920562fcc654fc10faad39e73c565f7d475558cb57c8
+AUX ldb-2.9.0-optional_packages.patch 1568 BLAKE2B 723a36ca839e085dd264c9a00895f2be8dbc65dce4a523e07da2c177372cb70557bbe337e9fcfe2b7dbbedcb684e565607ddd80ce4d9e0c936f74cc8fa30c94d SHA512 9321a12f927163c95658c2a4c03e2ade3c6506bced8663a48d6ef3bbca57708fa1570a96be180b7844bc22bb5f6d4b73b722ab9bb12ded66678d8ba12f624e46
 DIST ldb-2.4.4.tar.gz 1726595 BLAKE2B c01440e7032dbd3f7b735cb8d2078d7e1dbb56370bd1defe5f170eff006d3979daa654698e6e046c0583288dacd2cda9a5cde249fd6382db52c4aadb83f55e34 SHA512 2e4c762525eee9db40083b21e2a23f9cdfad5d2969cc628b3ea5414f9ec1be2c12d0aa65137cd8d8a5395c0414166ba14fc3dd57d53c533596762d80b9c561f4
 DIST ldb-2.5.2.tar.gz 1730347 BLAKE2B a0d3a9ae02f79c27b396314b804195ecd37b8bcd843fb94f9813a69fb15773db94ed2210f4102e395333562c2dccebabde1c2dcc0c2fceac97dfa31b2ad97e3d SHA512 02ae1246f99d9b6d6b33c5030488aa46c6abb535b4da4b13799a62b49d32c490b7c088ef41c0bc5a1b2f7263c680faceb8033827834cb6f66916adcdb5be421c
 DIST ldb-2.5.3.tar.gz 1736354 BLAKE2B dcd4d33f7a0ce3583bc96762b274d195c20e868337a29fd7793d6edf092069632f5c4f7f805693e3b330bbda1cc24540a989e2937f6325ac68bacf15d0f12db4 SHA512 b6f62dfb4887927514a98f01771b2178ac781886fc361600be0f59e513fc5762e3a421e48f452b1dd4452795f04b5c7c95e4dd4a9cc97573e563f5f528af4a35
 DIST ldb-2.6.2.tar.gz 1738908 BLAKE2B 44998efdff46486f94deb115225119cb3f6f23e15192672a5ac59c27e06c074fbcf2e1dba7d89d5ce273748cf08bc2261a10f7818cc2d02c4b25fd5403b158a9 SHA512 091111b8cf6cd93d662737890dacb64439e930b287d29299d2fc2cb18709f61d1e8a8c17d44f7224d8370dda6dc89af91e4ce8959816903ad5363388d8e37d8f
 DIST ldb-2.7.2.tar.gz 1737849 BLAKE2B 0aa70d8a4827448e41874db97130f18d17683c800b8f03f9940b4852e24fd6092052f6e70aae845c587939b9be16c80d7a920f6b874a746f923c4513b73d2afc SHA512 beb2cd83a8f128713e0b43ec6e80d0f87ab0883c6c8f0cefbbf5bf49e29dfa327b245b78467d1906917cb5f3f11e01cb76cc6bcca58a47c5deac4f05c2e9dfbd
 DIST ldb-2.8.0.tar.gz 1747616 BLAKE2B 19fd4cc0893ca36e7aa65eb605b050e3faeb7add6c00a2dfd8415334c58b7dc644ffaad41c24fe358b39292aaa581e3231e6b8161b03c073e903cdae16050ac5 SHA512 b6f289af3137e02a8e3ee0588bc300d1756b8980558e0b3a3a9eee4449100ccd42ed873187dbdb334e7e7834a8bff8478cd4f20588d4ca834d9ea14c0ee2c2f9
+DIST ldb-2.9.0.tar.gz 1757213 BLAKE2B 6d24ced193a64e723da65f26a055b97e5c5645b0ce17263073db997e9310509c788e7739136b70d099d171d1d0cbbe43bb43ea50746d876d74a1be06fa2fc36f SHA512 b5cfbbcb2c35d6830bf1a7c85e1d4363728ae474504441add54c4c8569316b26aedbf6fb9f561ec4f187eb5a847ac76af07396e38d00e6f7632b63e02d7b64a1
 EBUILD ldb-2.4.4.ebuild 3062 BLAKE2B 1a8abbc3daaf7a811039a51df74bcd77694ef2667928b5c0e10f97415a4fe63135a2906efdc8271fb02c5f523b9b6db26115456ede481adb518a443e57fb2563 SHA512 119081ff7523d62c7219fc719ee93f0b7ffbbfceecb10f1cbdc57552449e1df3146c702c08cde2e8ec053248d1f5b562e8ee28b09eae343c05ad98f87b88f78d
 EBUILD ldb-2.5.2.ebuild 3069 BLAKE2B 1f82ac443260c0893ed29e5a166e9b1f529ba78bb2a79e7ee27063cbb6c2e54d412a475b46ec19af7c24a5f797d290d327cbd94ffbd61e876dacaa0586b34050 SHA512 3679ed7914b32d25e151fab8cd9005778b93336dd095250fb37a80ed7e02b1790d8ef7a912e442cca8c01126d2febab0a7d06e9cbbb906a7894252ad229fda33
 EBUILD ldb-2.5.3.ebuild 3305 BLAKE2B a3375495cd0b66857a98d78fbc9432237c6943c91e636a618f7a0e5d1baac7032b4283ee87d237e6a6710761f2bc06cf854f78aa9615d52db0b7028bbaa8e06c SHA512 1afeb66c24d00f65a68225341c6ce292539591db10bc02500764880debc0b141425e9ce5d926f368aec3a0ce68d1824d064d26711a0bf313cbf8ac3eda4d769b
 EBUILD ldb-2.6.2.ebuild 4775 BLAKE2B 5f636277864004e4ecc7031e009e9b7bb7830a4d62e01570fd077c6a41e266d917e2c21041242487509c528ddb216f797af64661b83cf18f132e682b0def5e18 SHA512 6bff04aeee22f4a6340462675c0e2c554b079023abbfbbe5f4b1ea4b552a3aaf78802b21215726e89e42355ec49a462aa6a058686d1d7d243a282735348cf566
 EBUILD ldb-2.7.2.ebuild 4768 BLAKE2B 8c4f71b869a0628367082bf43cbc5ed98735294c07210d6580f4c19e14fccde404ce366319bdbda4c7e80977ac184086117909fd5b5943e45725e5c8d6dd3178 SHA512 796df5565dedb7236c1e34d5c47d26390f36f7eb767ef27519d5f2ac1f0aa08d0b3c141b62c826226601b214c48be415d8b2b253885809812849eba570ccbc3d
 EBUILD ldb-2.8.0.ebuild 4775 BLAKE2B 10ab6360b8264be6f3021c2a6ef729e613aaf61e1746fb35e5ffe37516937adf727be75a523c36b8246d05f38d74dc5c3581aee64ead0d25e1d2ad0172168f0d SHA512 054004e541c4642e35f20f355cbf56506179640431e608a4fbeab09f4686a3876cdbacfb890263d6d8d9f1b852d9cdb46646a224ecb2ad1f24212b66de031055
+EBUILD ldb-2.9.0.ebuild 4776 BLAKE2B b73c3ae7ff90a1e8fe3afe252d2c95d69f25cc7fb1cdf3e2a58a7a18f0f2e65a64c52f26275eecbf8ba53037a7328fd1a84d3a5c9b41775163a58db9dd265ac5 SHA512 3210ca98621d1497c2e9317afe1b2c083485ab4fd6490f29f9f60e93f3f381d1713e898bedfd4651256b1d93c943c6b01c83480174711d2d9bdce419af10071b
 MISC metadata.xml 446 BLAKE2B 4ee524096a438d9cbf73faea3207715f6570b763715578b74289732677c1a159955783b3d81beb775612f15f1a58f10fe9ee68406bb22484faddabb302680620 SHA512 beffe8e4143ba8a595dabfe3e9c0ed7e1093b4e92dded1a6d7dd27e2bde7928d26e95ba048e421ab17d506ede92675764732388aa8edb454cd7753a0e0094c49
diff --git a/sys-libs/ldb/files/ldb-2.9.0-optional_packages.patch b/sys-libs/ldb/files/ldb-2.9.0-optional_packages.patch
new file mode 100644
index 000000000000..791f49c8de6c
--- /dev/null
+++ b/sys-libs/ldb/files/ldb-2.9.0-optional_packages.patch
@@ -0,0 +1,41 @@
+diff -ur ldb-2.9.0/wscript ldb-2.9.0.new/wscript
+--- ldb-2.9.0/wscript	2024-01-29 10:20:28.452400700 -0600
++++ ldb-2.9.0.new/wscript	2024-04-17 10:49:58.934921251 -0500
+@@ -34,6 +34,10 @@
+     opt.RECURSE('lib/tevent')
+     opt.RECURSE('lib/replace')
+     opt.load('python') # options for disabling pyc or pyo compilation
++    if opt.IN_LAUNCH_DIR():
++        opt.add_option('--disable-ldap',
++        help=("disable ldap support"),
++        action="store_true", dest='disable_ldap', default=False)
+ 
+     opt.add_option('--without-ldb-lmdb',
+                    help='disable new LMDB backend for LDB',
+@@ -41,6 +45,10 @@
+ 
+ 
+ def configure(conf):
++    conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
++
++    conf.env.disable_ldap = getattr(Options.options, 'disable_ldap', False)
++
+     conf.RECURSE('lib/tdb')
+     conf.RECURSE('lib/tevent')
+ 
+@@ -145,9 +153,12 @@
+     if conf.env.standalone_ldb:
+         conf.CHECK_XSLTPROC_MANPAGES()
+ 
+-        # we need this for the ldap backend
+-        if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
+-            conf.env.ENABLE_LDAP_BACKEND = True
++        if not conf.env.disable_ldap:
++           # we need this for the ldap backend
++            if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
++                conf.env.ENABLE_LDAP_BACKEND = True
++        else:
++            conf.env.ENABLE_LDAP_BACKEND = False
+ 
+         # we don't want any libraries or modules to rely on runtime
+         # resolution of symbols
diff --git a/sys-libs/ldb/ldb-2.9.0.ebuild b/sys-libs/ldb/ldb-2.9.0.ebuild
new file mode 100644
index 000000000000..c0dac63c7137
--- /dev/null
+++ b/sys-libs/ldb/ldb-2.9.0.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="threads(+)"
+inherit python-single-r1 waf-utils multilib-minimal
+
+DESCRIPTION="LDAP-like embedded database"
+HOMEPAGE="https://ldb.samba.org"
+SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc ldap +lmdb python test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	test? ( lmdb )"
+
+RESTRICT="!test? ( test )"
+
+TALLOC_VERSION="2.4.2"
+TDB_VERSION="1.4.10"
+TEVENT_VERSION="0.16.1"
+
+RDEPEND="
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}]
+	ldap? ( net-nds/openldap:= )
+	lmdb? ( >=dev-db/lmdb-0.9.16:=[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	virtual/libcrypt
+	test? ( >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] )
+"
+BDEPEND="${PYTHON_DEPS}
+	dev-libs/libxslt
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )
+"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.0-optional_packages.patch
+	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
+	"${FILESDIR}"/${PN}-2.4.2-skip-32bit-time_t-tests.patch
+	"${FILESDIR}"/${PN}-2.5.2-skip-waf-tevent-check.patch
+)
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+	export PYTHONHASHSEED=1
+
+	# waf requires a python interpreter
+	python-single-r1_pkg_setup
+}
+
+check_samba_dep_versions() {
+	actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die)
+	if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then
+		eerror "Source talloc version: ${TALLOC_VERSION}"
+		eerror "Ebuild talloc version: ${actual_talloc_version}"
+		die "Ebuild needs to fix TALLOC_VERSION!"
+	fi
+
+	actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die)
+	if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then
+		eerror "Source tdb version: ${TDB_VERSION}"
+		eerror "Ebuild tdb version: ${actual_tdb_version}"
+		die "Ebuild needs to fix TDB_VERSION!"
+	fi
+
+	actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die)
+	if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then
+		eerror "Source tevent version: ${TEVENT_VERSION}"
+		eerror "Ebuild tevent version: ${actual_tevent_version}"
+		die "Ebuild needs to fix TEVENT_VERSION!"
+	fi
+}
+
+src_prepare() {
+	default
+
+	check_samba_dep_versions
+
+	if use test && ! use python ; then
+		# We want to be able to run tests w/o Python as it makes
+		# automated testing much easier (as USE=python isn't default-enabled).
+		truncate -s0 tests/python/{repack,index,api,crash}.py || die
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# When specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+
+	# We "use" bundled cmocka when we're not running tests as we're
+	# not using it anyway. Means we avoid making users install it for
+	# no reason. bug #802531
+	if ! use test; then
+		bundled_libs="cmocka,${bundled_libs}"
+	fi
+
+	local myconf=(
+		$(usex ldap '' --disable-ldap)
+		$(usex lmdb '' --without-ldb-lmdb)
+		--disable-rpath
+		--disable-rpath-install
+		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+	)
+
+	if ! use python || ! multilib_is_native_abi; then
+		myconf+=( --disable-python )
+	fi
+
+	waf-utils_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+	multilib_is_native_abi && use doc && doxygen Doxyfile
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		WAF_MAKE=1 \
+		PATH=buildtools/bin:../../../buildtools/bin:${PATH}:"${BUILD_DIR}"/bin/shared/private/ \
+		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \
+		waf test || die
+	fi
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	if multilib_is_native_abi && use doc; then
+		doman  apidocs/man/man3/*.3
+		docinto html
+		dodoc -r apidocs/html/.
+	fi
+
+	# bug #726454
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	if has_version sys-auth/sssd; then
+		ewarn "You have sssd installed. It is known to break after ldb upgrades,"
+		ewarn "so please try to rebuild it before reporting bugs."
+		ewarn "See https://bugs.gentoo.org/404281"
+	fi
+}
diff --git a/sys-libs/libseccomp/Manifest b/sys-libs/libseccomp/Manifest
index 2f24d03c95bc..60e9dbd8eb2c 100644
--- a/sys-libs/libseccomp/Manifest
+++ b/sys-libs/libseccomp/Manifest
@@ -3,9 +3,10 @@ AUX libseccomp-2.5.5-arch-syscall-check.patch 1485 BLAKE2B c94cd88060e51e1ba4962
 AUX libseccomp-2.5.5-which-hunt.patch 1779 BLAKE2B 00ac7f24b718f450c258c0d69f600a739360ac6cce45acdca51d413e07396d16ffa50d64fda2744968171e33e3a0e2ac17fa01c6016a95fab6774a4f6c7ba7c4 SHA512 b077a3f1075664fdfec6fecc077bd53685823794f037315a559f205cb6dc78a7d5e720ea4587dfdb605bfbeae79cf964d083157fbfae2085ca1d9e2995015067
 AUX libseccomp-2.6.0-python-shared.patch 778 BLAKE2B 343bcb6c8e8cfc9bab3e0439d391ddfae023587f64f23860c1594cacb60d3af58e031edd5f37ba705bf3da01799ed12ab931a4b9a98e9063922f16cab814d5e6 SHA512 029b1403a3b0af5931833837d9b640d8d9ee172972f927f756137ca51bdbfd3f9cd42657029397fdb2cb727a5065356e05ca196fcb2170484f807bb65cd5a398
 AUX libseccomp-python-shared.patch 759 BLAKE2B e2c42e18ca93fe5fddbc3a5b47ac0e6a29e566292fd62b87e6b45f6cb230570a2d1907a8b192e80b32c1900d069a4f10a866fa50bd9b88f5b78abff4206bd4cb SHA512 74548c7969869ff8f937a75eac720f1c654fad87dc17aed1c041bcb765586b4ee978a3ff7c6281be03277f6c74f2ec32624f91beb55afec3066a06a9e51483e2
+DIST libseccomp-2.5.5-loongarch-r1.patch 119822 BLAKE2B 4aa75c1ac87b2ca25cf6be38dfd760879c7255ca8e6cf86be3ac6e354f76cdaf3c8e2f59b646254414ffb0f1ffe6b7c50478f4db895a6ce632db8782c9807e91 SHA512 f7cd768d672a25448b2a3ceda27db52e0d62b5d9ab3eeb906226b6ebc19332c89332e0b870aaf82d4ffcfd642c2deb6029a30ae9a6bd702ebad9fdd40622b582
 DIST libseccomp-2.5.5-loongarch64-20231204.patch.xz 41236 BLAKE2B 7831b28c275771bb675b4b5045e657d96c254e69cee7188a19f4812bc83343e0041772c20be1e7392ec88387726b49f34aa670a906b922dba531a0d35e548b1e SHA512 7870e536d834360dfec446493815b675a305f6bec1b79d0caae6fb546d2f694e77ce52e547bbcdb22cda272272bf3d5a427960b4aa76fb987d06ab035298007d
 DIST libseccomp-2.5.5.tar.gz 642445 BLAKE2B d770cee1f3e02fbbcd9f25655b360ab38160ad800e2829a67f2b9da62b095a90be99ac851a67344cf95bd6810a6268da4655dc1d37d996e58239c4999eb41998 SHA512 f630e7a7e53a21b7ccb4d3e7b37616b89aeceba916677c8e3032830411d77a14c2d74dcf594cd193b1acc11f52595072e28316dc44300e54083d5d7b314a38da
-EBUILD libseccomp-2.5.5-r1.ebuild 3028 BLAKE2B d3bee995e94088d7bb3193d57a46af968c7e5216aff493423b220504c839f06b3fd91e080e31edbc80b55f378151c69cef0466df78422bd3e179e5ec98a4fd48 SHA512 8f0c4c3c85529772b81d73a519bc377a02da569059026b5929453eab8721540515eea5f415015eb1019f8f5c85574342f89bc76fe8a59e1f37068acd74b3bfb1
+EBUILD libseccomp-2.5.5-r1.ebuild 3246 BLAKE2B eff144266545ca7a1918b7c53dc1bcc68917e0ffe2d391c13693498559aa1f15c23433d745b46fee734e20809febf1c597991c67443813cd252cf933a0b757bc SHA512 f3807133054f8985135b6c0b9a2406a6e51fe24fcf6ad968a35a394e3f35565493e9317c5c637887dd541bc703618c8fc520eed15c475b3c7d8df1951d60c4b0
 EBUILD libseccomp-2.5.5.ebuild 2933 BLAKE2B d2b8b53e01877d343de0b6838b2bf4b3addeec676fbd89fae289788da03fb4b9b7af89e193e17621361bb39e33f77f80393a7807887010016dc7d49120653b1d SHA512 9f911a3647dac012b5cad4c919ba1a286fbc9348320810f7b772125da4250c4d26ae5cb870caf96a45930f3f040296f375b31818e69c0ccee826b497208d7d86
 EBUILD libseccomp-9999.ebuild 2433 BLAKE2B 50afb42077d398c80404844c9d865b2b5760f157c7455f8b74ab666f16ebec647f413649091a4d1406f7b7d5e0b9daf1a0edf4a3ee83f9eb7c495b8817cf06e4 SHA512 c0abf7f041c37df9047fb4e7e9c4632978be2d90c93b5756bdfff9167d2cd11df5065266c23eefd70feb67cf731cb653d6ab9154ae077bcb714c11c38aacea18
 MISC metadata.xml 506 BLAKE2B 44dc13629234226f9314270c05d5c7c87575639fe12282e73697ead63d016ee9b52a89d673be5881bfcbf4d605024ecfcc3e19510581d334a6d5737df6a36b50 SHA512 93b0a53783499eab6b6264867a049830d765ee56d19b0c60e764f6651dff9f0d11efbec0783fdeb17c2c64d3f409bb4b1b1f74f267022775b992b61a1df03100
diff --git a/sys-libs/libseccomp/libseccomp-2.5.5-r1.ebuild b/sys-libs/libseccomp/libseccomp-2.5.5-r1.ebuild
index 347a6274d5f7..ecedd688b53f 100644
--- a/sys-libs/libseccomp/libseccomp-2.5.5-r1.ebuild
+++ b/sys-libs/libseccomp/libseccomp-2.5.5-r1.ebuild
@@ -16,10 +16,14 @@ HOMEPAGE="https://github.com/seccomp/libseccomp"
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/seccomp/libseccomp.git"
 	PRERELEASE="2.6.0"
+	AUTOTOOLS_AUTO_DEPEND=yes
 	inherit autotools git-r3
 else
+	AUTOTOOLS_AUTO_DEPEND=no
+	inherit autotools
 	SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz
-		experimental-loong? ( https://dev.gentoo.org/~xen0n/distfiles/${PN}-2.5.5-loongarch64-20231204.patch.xz )"
+		experimental-loong? ( https://github.com/matoro/libseccomp/compare/v${PV}..loongarch-r1.patch
+			-> ${P}-loongarch-r1.patch )"
 	KEYWORDS="-* amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
 fi
 
@@ -39,6 +43,7 @@ RDEPEND="${DEPEND}"
 BDEPEND="
 	${DEPEND}
 	dev-util/gperf
+	experimental-loong? ( ${AUTOTOOLS_DEPEND} )
 	python? (
 		${DISTUTILS_DEPS}
 		dev-python/cython[${PYTHON_USEDEP}]
@@ -54,11 +59,15 @@ PATCHES=(
 
 src_prepare() {
 	if use experimental-loong; then
-		PATCHES+=( "${WORKDIR}/${PN}-2.5.5-loongarch64-20231204.patch" )
+		PATCHES+=( "${DISTDIR}/${P}-loongarch-r1.patch" )
 	fi
 
 	default
 
+	if [[ ${PV} == *9999 ]] ; then
+		sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac || die
+	fi
+
 	if use experimental-loong; then
 		# touch generated files to avoid activating maintainer mode
 		# remove when loong-fix-build.patch is no longer necessary
@@ -66,9 +75,8 @@ src_prepare() {
 		find . -name Makefile.in -exec touch {} + || die
 	fi
 
-	if [[ ${PV} == *9999 ]] ; then
-		sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac || die
-
+	if [[ ${PV} == *9999 ]] || use experimental-loong; then
+		rm -f "include/seccomp.h" || die
 		eautoreconf
 	fi
 }
diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest
index 48b671e56f0a..1409c2494b4b 100644
--- a/sys-libs/talloc/Manifest
+++ b/sys-libs/talloc/Manifest
@@ -1,5 +1,7 @@
 DIST talloc-2.4.0.tar.gz 676054 BLAKE2B 71b3f21fa7cd114579e1dc064aadda447c0d196beaa27a5919acebdce668f6b768dd7c293c056ae4c096f31d8e931255ee2b71728c4b7b0bbb7818169380e9ca SHA512 810d92a614d0b9e0ac6fe403c1643c4dda435f79c4627d3c3be228f94b4b2ee8e528efbbed07f7d1a16043d6e55bdf4f10826f31fb8ca1c649c4126ea09a3aff
 DIST talloc-2.4.1.tar.gz 679160 BLAKE2B a7913b25930c77da53c17c2e0d71386402b1059f93c751084037c5068a035bd543c2d7e24a2d8dc989bb4eea13fa1a3c7a362e4d6c14af0b2030fbfb2f513801 SHA512 4de3b66d7cd1ff3f53e28e86bf9e89528635465c67868e1262aab6946106c228b2c184e988561361c3194fb260d83e016477254c9dbea7abff40c4dc0d31c76c
+DIST talloc-2.4.2.tar.gz 679750 BLAKE2B 1f836d6b11e096e399ad7b99ad4abd3c140e75ee307695659c35b89eca600de247e5432bce523a299334f20ca2dad4c726b783a94c546b67fe25b2b7199b2915 SHA512 fb91665ffbe0cce96b1359940ff3ed21330c81c5331140788a26aa94f82b50492176e6000ff54b31d1a434bb1cb53a6a2c7894153545252a1fd91bda7c05a213
 EBUILD talloc-2.4.0.ebuild 3592 BLAKE2B 3d8b4568d1cbda2cdaf252f76c674e6fb7aca55f447da413b81b33b1a7efe709d91cdd5f356af3c5f2ffceb38b5b6d4c80595ed2e7b18270c48ac3992e70e0b7 SHA512 12a10afe731405a613b7309a4b43475fa679b28b21b98910a4c90ce4a061b92f964ee2b17dbc59077e77eaf3865afb3f2c7563ba1df68855396585e4ed8b04e1
 EBUILD talloc-2.4.1.ebuild 3671 BLAKE2B 28e22e77183d6ca8b6a1eba26c71ac32a2c14bd5e73262ac927e6fb11b6e0da167fe2dd681673632a3387f16b3eb336825562ed546f48facf0bbde659a2ba00e SHA512 08ff57f85b92245dfe79f8f5c202fd250e8ca670786676a6d0f04cf097a56a8a11018b41b774001806c699338c5f5039c0436d54c80274f06d15cee9168897e3
+EBUILD talloc-2.4.2.ebuild 3671 BLAKE2B 28e22e77183d6ca8b6a1eba26c71ac32a2c14bd5e73262ac927e6fb11b6e0da167fe2dd681673632a3387f16b3eb336825562ed546f48facf0bbde659a2ba00e SHA512 08ff57f85b92245dfe79f8f5c202fd250e8ca670786676a6d0f04cf097a56a8a11018b41b774001806c699338c5f5039c0436d54c80274f06d15cee9168897e3
 MISC metadata.xml 326 BLAKE2B 4788d8b536b43840fc3a6d6ef36d860589ebb1137cd07d11ce75c54869b8b65027f9332901c1882ce8fd97f446d90973cec03332b4e693283162f3c731b7627e SHA512 e700e6f5810ad2d6618f52ff3607a2dc3254751dc8172744512c956f001045accfa28d8aa79be67935c02aead13c2c22c54aa4e221f487ba3cb25ebe9273d57f
diff --git a/sys-libs/talloc/talloc-2.4.2.ebuild b/sys-libs/talloc/talloc-2.4.2.ebuild
new file mode 100644
index 000000000000..47470a52c629
--- /dev/null
+++ b/sys-libs/talloc/talloc-2.4.2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="threads(+)"
+inherit waf-utils python-single-r1 multilib-minimal
+
+DESCRIPTION="Samba talloc library"
+HOMEPAGE="https://talloc.samba.org/"
+SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3+ LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE="compat +python test valgrind"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!elibc_SunOS? (
+		!elibc_Darwin? (
+			dev-libs/libbsd[${MULTILIB_USEDEP}]
+		)
+	)
+	python? ( ${PYTHON_DEPS} )
+"
+# Valgrind is automagic here but it's a build-only dep so it's not so bad.
+DEPEND="
+	${RDEPEND}
+	valgrind? ( dev-debug/valgrind )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libxslt
+	sys-devel/gettext
+"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# python goes only for native
+	/usr/include/pytalloc.h
+)
+
+pkg_setup() {
+	# Try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Drop irritating ABI names (e.g. cpython-37m)
+		# We're only installing one implementation anyway
+		sed -i "s/+ conf.all_envs\['default'\]\['PYTHON_SO_ABI_FLAG'\]//" wscript || die
+		sed -i "s/name = bld.pyembed_libname('pytalloc-util')/name = 'pytalloc-util'/" wscript || die
+	fi
+
+	if use test ; then
+		# TODO: Fix python tests to run w/ USE=python.
+		truncate -s0 test_pytalloc.py || die
+	fi
+
+	# WAF
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local extra_opts=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--disable-dependency-tracking
+		--disable-warnings-as-errors
+
+		$(usev compat --enable-talloc-compat1)
+		$(multilib_native_usex python '' --disable-python)
+		$([[ ${CHOST} == *-solaris* ]] && echo '--disable-symbol-versions')
+	)
+
+	waf-utils_src_configure "${extra_opts[@]}"
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# waf is stupid, and no, we can't fix the build-system, since it's provided
+	# as a brilliant binary blob thats decompressed on the fly
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		install_name_tool \
+			-id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+			"${ED}"/usr/$(get_libdir)/libtalloc.${PV}.dylib || die
+
+		if use python ; then
+			install_name_tool \
+				-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.${PV}.dylib || die
+			install_name_tool \
+				-change "${BUILD_DIR}/bin/default/libtalloc.dylib" \
+				"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.${PV}.dylib || die
+
+			install_name_tool \
+				-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.dylib || die
+			install_name_tool \
+				-change "${BUILD_DIR}/bin/default/libtalloc.dylib" \
+				"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.dylib || die
+
+			install_name_tool \
+				-change "${BUILD_DIR}/bin/default/libpytalloc-util.dylib" \
+				"${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.dylib \
+				"${D}"$(python_get_sitedir)/talloc*.bundle || die
+			install_name_tool \
+				-change "${BUILD_DIR}/bin/default/libtalloc.dylib" \
+				"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${D}"$(python_get_sitedir)/talloc*.bundle || die
+		fi
+	fi
+}
diff --git a/sys-libs/tdb/Manifest b/sys-libs/tdb/Manifest
index b750e79dc8e8..e81d663b5f22 100644
--- a/sys-libs/tdb/Manifest
+++ b/sys-libs/tdb/Manifest
@@ -1,5 +1,7 @@
+DIST tdb-1.4.10.tar.gz 747139 BLAKE2B e271f824acc8c691a6e88f5e5f73d0673a132134d025e84461520108b94cd7a5db587a0012ad1172270d29042f29336aab6ca59a735d611d6529f81ec3c195e9 SHA512 b5147d811617d90a025d1070abf16c42744b3fc3cac1042fbff03b1e635af2eaf9c957a7bffdb3f56b4a0c775b44f8027def9f23deb1b3ede817b95bbece2ce9
 DIST tdb-1.4.8.tar.gz 742791 BLAKE2B dc2705cb16ee59f4d5bf25602032b25fd5338caa890db19939996a40cd19c4c999f9a74786d5754dbbd1de54d818541cf56844beeb33008aaee507d5dfcdba85 SHA512 763beebe923aa04303cbb91ce5970e6bbd13546888cff75ea9ab025afff3ef88fee539ae173fc2fb7ec661b6c337b0c2da361ce3d318f51ef6627bdb3fe6ca63
 DIST tdb-1.4.9.tar.gz 746608 BLAKE2B 2cdcf636b9ef5445d48ca2aab79d4ffd137a8409b6d7b1fcdbcd28797d4bbe617f768a5ef92a14c4ae6dddfc37576f5d411cf4d67edeb4319f46a1a15ffd94ee SHA512 6b0109075826b8630f6b5a7e7ade2fcff95c5d05338340af78219422610947c520707b3e484ff13fbd40bbfffe13977976e8ddcb1be7b13e13ac78b4e3ec06c2
+EBUILD tdb-1.4.10.ebuild 1590 BLAKE2B 4d96ec2dd2c1835fb5729e2aa3d32f09fc51a9d7741c6c5253a3699fe25072534c11aa7196dacfc559c35e2e3ebfe5cff52d401c989a8c943879717668396854 SHA512 9dfca3b1c8babc18fdb52e965389266a584c5a3e828007c90d9cafa33d3503f2b30625c2fc2aa64582c4509123a383e6d3be4e3998e27f989ea5f7f72adbbc9e
 EBUILD tdb-1.4.8.ebuild 1443 BLAKE2B 977a7a412c0ab6f969acdd35ea2f256d1e961a11fd20b643c7b33ed5d6155fd26a63f8457902e95df6b9a4854d1ae5d33d5f1bbcccfe4b954635188ebafc6445 SHA512 1b3c755a1e9907b41b05cbf315b14f43c1c7b64bc9eb3787e23070170f0b79d93d60b0cc6a09aaada8201f638818fbd5b4fcb228ece8938769ff2c085b554eb0
 EBUILD tdb-1.4.9.ebuild 1590 BLAKE2B 4d96ec2dd2c1835fb5729e2aa3d32f09fc51a9d7741c6c5253a3699fe25072534c11aa7196dacfc559c35e2e3ebfe5cff52d401c989a8c943879717668396854 SHA512 9dfca3b1c8babc18fdb52e965389266a584c5a3e828007c90d9cafa33d3503f2b30625c2fc2aa64582c4509123a383e6d3be4e3998e27f989ea5f7f72adbbc9e
 MISC metadata.xml 245 BLAKE2B 015a6303c153dcdb4a4b6ec58ea97e6798d3316c6d211559022bd2a26d481356e481ba2ade200171bb182264ce9c132727cf8ce077fba38fabcef92c3431b6ba SHA512 5d1b6ef089165b3325df35b31d33f7c994bbc302399bb47abf3138885f0dd7b04176114de8ffea6ee1ae26a53fc83be9016426714e547fd6405c454b918e39da
diff --git a/sys-libs/tdb/tdb-1.4.10.ebuild b/sys-libs/tdb/tdb-1.4.10.ebuild
new file mode 100644
index 000000000000..aaa8bb18ce55
--- /dev/null
+++ b/sys-libs/tdb/tdb-1.4.10.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="threads(+)"
+inherit waf-utils multilib-minimal python-single-r1
+
+DESCRIPTION="Simple database API"
+HOMEPAGE="https://tdb.samba.org/"
+SRC_URI="https://samba.org/ftp/tdb/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="python test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/libcrypt
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	app-text/docbook-xml-dtd:4.2
+"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+src_prepare() {
+	default
+
+	python_fix_shebang .
+
+	if use test ; then
+		# TODO: Fix python tests to run w/ USE=python.
+		truncate -s0 python/tests/simple.py || die
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	#MAKEOPTS+=" -j1"
+
+	local extra_opts=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--disable-dependency-tracking
+		--disable-warnings-as-errors
+	)
+
+	if ! multilib_is_native_abi || ! use python ; then
+		extra_opts+=( --disable-python )
+	fi
+
+	waf-utils_src_configure "${extra_opts[@]}"
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_test() {
+	# the default src_test runs 'make test' and 'make check', letting
+	# the tests fail occasionally (reason: unknown)
+	emake check
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+	use python && python_optimize
+}
diff --git a/sys-libs/tevent/Manifest b/sys-libs/tevent/Manifest
index 4e25b55b7cf9..dbd6d2b4ed07 100644
--- a/sys-libs/tevent/Manifest
+++ b/sys-libs/tevent/Manifest
@@ -3,9 +3,11 @@ DIST tevent-0.13.0.tar.gz 880601 BLAKE2B 4e2a2c055bac28cecae1a95b7ddab349ed780f4
 DIST tevent-0.14.0.tar.gz 878142 BLAKE2B 8c1c2b4cb683a3ca2630181904566c3cf9d0151c7e280f86e0ce24febfc5d0a1e85757e3ad9d635205bbcbe3e0d0a060dedb3207fb4e91ea76f36246f0a2704a SHA512 5e9525b2f8f8014d1147244dcccd6cf5ac49e383c49b19480ac1256dc7ccf60705960e87b8f63348fca3f4f496861f3d307ee5e0fde8189d93a596c5e689f2b1
 DIST tevent-0.14.1.tar.gz 881979 BLAKE2B 272b7d0029061dfd172a39135d806b937ee6f5bb9eb4c9c8d68a6e5cb3d9eca01582f7ddf5a15d7f033d3322c7fd4d6e87d697f76e4d44565c8e757398a5f0f8 SHA512 0bcc87c10f84e947edad8f8c31f3923253c599b7a69a1db1c21ab292e02937ccb8bad9f0f70e27420ead687aaed1a9b3830b6daa903b8a9bd48cc035a6e5f4ec
 DIST tevent-0.15.0.tar.gz 884634 BLAKE2B 071906dc0cc199a9b550e74ca7fcd3555e54a1c48a9be2c107c498ccf2157521336c3ec63fd776e3551064e9baf1ebcf9c7ff5eb0f04375b7d714056331476aa SHA512 470cc4489255a4f122ba1d680669589ba375d4081ff46631dd56f5104202d175bfb13356820eb9108a6b768b3837b2f5d26cc7b0acc3071c4787fb070df3cbab
+DIST tevent-0.16.1.tar.gz 890010 BLAKE2B 34639cf0e63193eebdb9c3f845390685d66916c6a687f22fbe25dbe175d3279752dfea1e3567fdb2eed3bea17108b9b226039cb1218c0536fc1eb7f4e0a025ab SHA512 cda001d91728b2f28dd081e9c5f6d8ede345dcd9ce1dca04394860cd83090c15aa8dfef1c53b73e120bd17f0d95551fa9301eb4927963314556d016fe5420a39
 EBUILD tevent-0.12.1.ebuild 1649 BLAKE2B d2304e9a7b79936bfb107cc8425b655d309091ebee54564dc2353695bed7427eb1be44afd368bed36ab3ca3a63715f87113f3a35cd1637c37fe9eb09103098a1 SHA512 39eb19659060d6ffeebdbfa5feb9994c9f52d23d6d238910bc4b12cb7971d2e08faaf6676a2d289b903018966c97267cd442c843357452d7b9493621c6667359
 EBUILD tevent-0.13.0.ebuild 2460 BLAKE2B 7836a61116d0721c0c50e31f691ecea1a55124d52b9bb9d48db71c33e52c0440d95a8cb6163751da73567e0024aa3caf91d868dc7d86782ff87d4825ee520503 SHA512 a61ca9ca0e91eb649e1b429c985078155668a5e60fac5b9aee9e6c44a0f25fce91653056a1d25775a8fb70c078a189bd8471c8ba1704b2b91911db830b82ec17
 EBUILD tevent-0.14.0.ebuild 2394 BLAKE2B 406ffbb4cc1fe6e0fddb01fee0d22ae2c887a8bdef7f9bd70349729c08a1ed57adc782e4206e6205981cf5b67f1f970ce0230b63a825ec515883e68b161999d3 SHA512 76ad5b726a22bf44be9c5a0baa7ef42f8e51d28908215391075b46346dbbc9f9f45404bd8eb75a621e43d04a78ecd7f8aba03ae1f886e934c40459abe63f1b59
 EBUILD tevent-0.14.1.ebuild 2385 BLAKE2B 474d44ffb5fb5cccb1402522ba75c40d81dfdbcefbaf1984f8b90845414b57ee8fa93ec3b34e0cb50b875ef4eb44b968696a5eef24d55123745f17a3c216086f SHA512 b52e989ebc65f2b023e46db4263ee138f6efed0502a34b8e939794ed6bbe80a3137f228de4acbd19e011d1d5d68bbe25253527ec30da9a6e37081e19fc947da2
 EBUILD tevent-0.15.0.ebuild 2542 BLAKE2B 6e63e2508ec430877a2142a9ca0720acc1bc996d9e06fca82d49a2dba24c79841a4a6fe9f3d5b2a01e2defa9c3883c20d506c5a28ea5b84a1017dfced6564e90 SHA512 171e9e0a593838598d1d8b74e408f6708d3340cb975a6a10c06f9396cd9f62bf946b1f7bb58f37f3f2802499deb408eb6e0679f233ad8ec57fd14acd21acebc4
+EBUILD tevent-0.16.1.ebuild 2542 BLAKE2B 3f39e1b19e5740364b7f0385007e33434ed747b717f995cc6ff9c4c7e5faeb33776770ab2b26965b802a409abf5ea80b8c32b89178c993c864a7054e0ae9ff70 SHA512 ffe5a89e3ff195f44b14c24bbf4fafcc83d7bffb633d90cacf347482bf402c26bafa7acfe159b795a50123c6150bfa10fd72cdc4f5f2ecd30ce4366163c49c62
 MISC metadata.xml 239 BLAKE2B 7127a2a67e79dc98a78fcaca706fd348389c7f08465112215855afe5978d2932ecbee93944efb1df528fbb6d09e884b277cb1d55a8b3926487b6ca07f9330b8a SHA512 4ea42efe4d083d013b85796ca25a132678bcefe6e3687fd6dd371814fd307118fbc8da8c15ce7f4d956e5f824cd0202f49d3469406c88008e84ff9f4d360f424
diff --git a/sys-libs/tevent/tevent-0.16.1.ebuild b/sys-libs/tevent/tevent-0.16.1.ebuild
new file mode 100644
index 000000000000..30eeb780afc8
--- /dev/null
+++ b/sys-libs/tevent/tevent-0.16.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="threads(+)"
+inherit waf-utils multilib-minimal python-single-r1
+
+DESCRIPTION="Samba tevent library"
+HOMEPAGE="https://tevent.samba.org/"
+SRC_URI="https://samba.org/ftp/tevent/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="python test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+TALLOC_VERSION="2.4.2"
+
+RDEPEND="
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}]
+	python? (
+		${PYTHON_DEPS}
+		>=sys-libs/talloc-${TALLOC_VERSION}[python,${PYTHON_SINGLE_USEDEP}]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	elibc_glibc? (
+		net-libs/libtirpc[${MULTILIB_USEDEP}]
+		net-libs/rpcsvc-proto
+	)
+	test? ( >=dev-util/cmocka-1.1.3 )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+check_samba_dep_versions() {
+	actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die)
+	if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then
+		eerror "Source talloc version: ${TALLOC_VERSION}"
+		eerror "Ebuild talloc version: ${actual_talloc_version}"
+		die "Ebuild needs to fix TALLOC_VERSION!"
+	fi
+}
+
+src_prepare() {
+	default
+
+	check_samba_dep_versions
+
+	if use test ; then
+		# TODO: Fix python tests to run w/ USE=python.
+		# (depsite the name. bindings.py is just for Python tests.)
+		truncate -s0 bindings.py || die
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# When specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+
+	# We "use" bundled cmocka when we're not running tests as we're
+	# not using it anyway. Means we avoid making users install it for
+	# no reason. bug #802531
+	if ! use test ; then
+		bundled_libs="cmocka,${bundled_libs}"
+	fi
+
+	waf-utils_src_configure \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--disable-dependency-tracking \
+		--disable-warnings-as-errors \
+		--bundled-libraries="${bundled_libs}" \
+		--builtin-libraries=NONE \
+		$(multilib_native_usex python '' '--disable-python')
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	multilib_is_native_abi && use python && python_domodule tevent.py
+}
+
+multilib_src_install_all() {
+	insinto /usr/include
+	doins tevent_internal.h
+}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 6b1316cab7e9..4a57f32c2858 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/karma-bin/Manifest b/www-apps/karma-bin/Manifest
index 7182a178ca3e..caedc265923f 100644
--- a/www-apps/karma-bin/Manifest
+++ b/www-apps/karma-bin/Manifest
@@ -2,4 +2,4 @@ AUX karma-0.24.yaml 946 BLAKE2B 9cee1af92d690892b6160d43e086ee20b24b525cb821848e
 AUX karma.initd 410 BLAKE2B 0aecc0b88a1b89bda32bea7a15571826fd6598d74258a12aeed1a0549776e9eebc7c11ef216db00ed107146e32df0915569e326f85694cea1429640becb411f7 SHA512 bdd469311aabc663ce59ed14044c0e201ba32d7c9e54df73b0b92a5b5dbef7ed1b5b229fbcdd0a048aa5d3f42223a58e4a3da01fe43ff59db91b54017130fc53
 DIST karma-bin-0.90-amd64.tar.gz 12821866 BLAKE2B db6fed9451f1bd641eb9f00692ad41d4a55a2303c02be07987c7aaebe26be5f1d0b049d4d80c68f8e21ba8460ed206101b7ec1e4c4746e3a509a5260d20e7508 SHA512 c9a6f257796c02c8ded4bf634528eb7b148ad68d42b85dcd760818e164742f5e02033e3e5de4f02ef2689ff4a53ae2e82a59ff42c28668ac733c65e43b69ac15
 EBUILD karma-bin-0.90.ebuild 950 BLAKE2B b8412212234229bba6e064212ba874e6285d1497a3e3317f045c38f17d1dd8cb9861b9f1d96d5a09d768b0f263d22f904ff9183e2b66a94683a87098f4124ab2 SHA512 9ba236700d503ba25fa2d5cdee0368eb17b2511dc6b548dac8ab784f7016145d01c28bf24e3060592d348fd8e97376af1d1e8e891190e65c4f426761482b4b4a
-MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
+MISC metadata.xml 329 BLAKE2B a3b09039ae8483cd5b474d978bb02c2635bc99cbe47dee299ce00aac5346a33661dfd56406c3f06e1109ca627be66fa89fd32182ade7dfabf168c3856dd6f1dd SHA512 84cca6425d22f5f4674960fb3f6ceeae4c08ecbfa4848f09c52e2171e23d3bf10d9d1ebeb1447f2e4f71a40e2a9adfb41d313e1756515507a93b3cc2842a5046
diff --git a/www-apps/karma-bin/metadata.xml b/www-apps/karma-bin/metadata.xml
index db463f3eeb66..f7a57b87d659 100644
--- a/www-apps/karma-bin/metadata.xml
+++ b/www-apps/karma-bin/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">prymitive/karma</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/trickster/Manifest b/www-apps/trickster/Manifest
index d29574cc5646..f4953352dd48 100644
--- a/www-apps/trickster/Manifest
+++ b/www-apps/trickster/Manifest
@@ -2,4 +2,4 @@ AUX trickster.conf 4759 BLAKE2B 223e0061992a9d3c0aad85d344cac0af00eb19e527a82e97
 AUX trickster.initd 495 BLAKE2B 3ae2f752269665ce0a855a3b937625db4c7d3d077ecc59bb8a9acff4e78d38531fd392ec3cb1a05ab204f83ac50e25d1aa27344dac405eb37dd0a71c732a463c SHA512 2c7fade0e6e91ac10e1c9a9ab312e2fb794f5fd86332b780a2d5b076ca00e460dac11cc3486bf43dceda7be1baa29b57a298fe257229012cf48b9f92861c7c8f
 DIST trickster-1.1.5.tar.gz 5170485 BLAKE2B e0f0df7bf6c810d6cedfc6175dd8413adfeccdeca3329dbf1bf0f38d612ecb4c9692fa1b5560cf91fda9213c57c268f5fbe16608a8eb5932219abe026cd581ef SHA512 da06e05436f6019b677b2d5d04e6b8aa1cd15a7ba1962b64101569c64e17f3132e71528f3925a3772d2ad7faf9435c987ffaacffd07961ab8526b68fbfd58135
 EBUILD trickster-1.1.5.ebuild 876 BLAKE2B 62665d5166810b8cfc6e90c8090c51164ee44c8ce44d675ccd1145ad1e1870e8f0e4c9857bcd9e9a88049c2c4103e29a030896b64e02b9f857819cea76cd0683 SHA512 942554b1b540e91179a474a811a0d0eb8a486f8d775ece7da67289aba091f49c3aaaf9a3bfcfc519883b91b1926c091104d72d16c393f2f0a8a4a5ffdf6512ce
-MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
+MISC metadata.xml 338 BLAKE2B 2bd04d4bb4091cc9dd126481ded20669169b94b98dfd88827aab2d66b27f207a4b0c3b1e8610844f1a00e484b9f4eea30154055460ea0e2aeb1e2e2827309878 SHA512 73251b784f8c3dcd95c9732306ea24f77da1097b448abcf863ff88b650041cbea7875a830874c08ee04ff9e789fb3ce6e7bee175bbfc235b27fa4d66df18cd32
diff --git a/www-apps/trickster/metadata.xml b/www-apps/trickster/metadata.xml
index db463f3eeb66..25774c34d3a1 100644
--- a/www-apps/trickster/metadata.xml
+++ b/www-apps/trickster/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">trickstercache/trickster</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 10faf98b0d66..12aa3fe1527a 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index b1c33da001cd..4389c4dd74fc 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -3,5 +3,5 @@ DIST epiphany-45.3.tar.xz 4005168 BLAKE2B 9f8965d310efcfa21e133a24a29ce97ffff94e
 DIST epiphany-46.0.tar.xz 4014980 BLAKE2B e9e72dc562b4ee63698e5b2c8f87945988cd5c585a10ee6782cd2a2fadbdb363292227869ed7f39f46305e007729594a37fc06a384a7a53e2061c2b3da181ce5 SHA512 55d1e89294e0f7cfae10b6aa28f43028bd34053e1d829168bf59b9cce8a8128a2ed7e9b94b8665e0f36e03adae845e0a26ff40c83abbc9962f06ac75e3c36a79
 EBUILD epiphany-44.6.ebuild 1741 BLAKE2B 6edd7d4bfdf34503ef1691d0f75b373ec2a6c83d60c1dc4b967b60717d2962dcd7870fd7b222d0e312e4d6273d11f67c6376d33ca17e5b5507c0ebce11c011a3 SHA512 84a12388cabb1a4c8098c02935dab00947b68365251504d24751d5fcbcebbe352ef2f8a66b98f2ca2cd8b6ee49d6bd2ea5f69c6e6db60ef48bedd24efb1036d3
 EBUILD epiphany-45.3.ebuild 1744 BLAKE2B 8400ac7789deb5e43c9d164ace17d342487316a48bc13e1b3deac1e9460dfd22dad54fd475a5e026eefe5b7bcb16df83384ae261cc11d7df364c85ccf6f9eaa3 SHA512 3dbeb59d7016e721842e34b008b818e06b3122b291e5214ec94e5b8b7350357c263094ad6cee92af3aee3a88b490c3203b96e9a80f7fda967d531a19e634686f
-EBUILD epiphany-46.0.ebuild 1598 BLAKE2B dbc0198f3b1cb219b19a73da5160a51f15b760722c283ea20c52f47990adfd23560d7f01edf4c4c9d55bc7f6e476a2c81dec028c18256f4411c2889a2564fe81 SHA512 097f3f1dc72971b615280bced1188c8cd089dab310db86ebcd2d279b6c90b90931a0120e66a81b3555140d21ffd6b8841190b4d82ef4f735ebce187a9b185cc3
+EBUILD epiphany-46.0.ebuild 1595 BLAKE2B 1dda241ee5264689c3537bfb4fc0bd9b5e0501ef5866fd8a342e2cfd170e1cd80b5937f5101f84ef5dc8e02398e93dd9efefcbb18111ee9a8238ec57db8ea357 SHA512 4ae214ad4fac3d20aef2de7f85bbc2ce24ba6e96cd78898a20462dccc24d1d2e3c54c809a0f71c0103a4c3ee99dd9263ae5fd85ddcb10d2ba0a42a57a436b764
 MISC metadata.xml 349 BLAKE2B 3d863d6eb39cc99c7587d53af80d4df96f5c1bb534e406ee904d3b39f947c24e1153707581473e1477d984cd7be541925b4ff002d546f5d50f1115d1ad639362 SHA512 10d54acb787b2d9dab84b43fcc0e578d7afcae36142bef5028ac3838bfce6ae63348a4e05ee97eaa2f7d90204457990c9cf604c8df0dd714d62b907bf4da3019
diff --git a/www-client/epiphany/epiphany-46.0.ebuild b/www-client/epiphany/epiphany-46.0.ebuild
index 03ac7c36b230..add8946d7852 100644
--- a/www-client/epiphany/epiphany-46.0.ebuild
+++ b/www-client/epiphany/epiphany-46.0.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 
 DEPEND="
 	>=x11-libs/cairo-1.2
@@ -20,7 +20,7 @@ DEPEND="
 	>=x11-libs/gdk-pixbuf-2.36.5:2
 	>=dev-libs/glib-2.74.0:2
 	gnome-base/gsettings-desktop-schemas
-	>=media-libs/gstreamer-1.0
+	media-libs/gstreamer:1.0
 	>=gui-libs/gtk-4.12.0:4
 	>=app-text/iso-codes-0.35
 	>=dev-libs/json-glib-1.6
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 796d9e4eff95..2f517b0a13af 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -612,10 +612,112 @@ DIST firefox-124.0.2-xh.xpi 410993 BLAKE2B cd7436a833ea5672766a60441fd44ac8be56c
 DIST firefox-124.0.2-zh-CN.xpi 640173 BLAKE2B 981d6819da6600b28fd3fb10b7adc6fbd14607eac0ac718124ee4d5befbf139e140d731a87938e4d348b9aa258477e82b86ef66b07ed204790e9ce859d9befa1 SHA512 d659578ad68bcc0433ea6f03f272fbd9dd6292efda0a2d84a33b987858e54deca10a5bc1d8bd68c721bea258a57296fc93e29fb72fc9fa0286afe0ca65d364fd
 DIST firefox-124.0.2-zh-TW.xpi 642118 BLAKE2B 56be8d7c6c780688b0160ec0bbab7258ee9d88b1087a0faf95b40f11dfd18acbf676eedecef7a9c45a5fe82d09f5f9a815ca69aab4a44fcbcadb81bb6909671e SHA512 5bc8540068fcdec6728d743f123db6a4d7936b63b1dbf1a669d1dc7745b9e9ba1512860408acb3adebb987cfbcda0ea8c23eb998bc3e056dee5799092a0a8fe5
 DIST firefox-124.0.2.source.tar.xz 555223648 BLAKE2B eaa35c3967514cb9f9ca48e32414bdecead3147a3d5ba8e9648be32f04b5d9e209ce71e02029851e1654c66d5cefd9a7b1a2a0fa68558a856c2ae3b1112d04d6 SHA512 8cf340de6e34812f8ae3363265859a263330af770d981c3dd1ca1e7e0cfe513604d3e68184d4aa1446569aefbdf359d561fbc200faf19a5ed020a1709d9ef10e
-EBUILD firefox-115.10.0.ebuild 40022 BLAKE2B 9986da732a0b96f425be4d5f92e10f84d07b3509147fec54a7d80d43791a8ec6f8fe644733e72dbee8bbd0c0d708691bf088ce37e32c37aa67f1b0f6e9d3ca36 SHA512 9496865d91398f83915c5c9681f151eeac262d0048bc3eb17db5f4f36dbfc49bbc67ea35c35d9b357fafc3e8ac29265e0f46555edc83f3cc74c8116e8acfd6bd
+DIST firefox-125-patches-01.tar.xz 16268 BLAKE2B c3c022c6cf4a08cbff908a5a30e90ac8304a94ffd50e1cb23c026c70d467aedb595837260219269340fb31033f18fca2abe429662292e39a996a4507f58e8308 SHA512 95ad5f78950548d020fca743822cd13b632f08252900d4d52bf3cd4019c16ed44fdb46a9fb9fdc2a0ffea76868eb13ac3ec3bff6a7d8cad724373a6a82a8449c
+DIST firefox-125.0.1-ach.xpi 460887 BLAKE2B a913ba363cb5247fbb2c9dea479be40cb3f35f49c148211bd64d4e6c11fea171d1f1a120cad331a956dcbb7503db96f08cccb534da65ab044e49663013a11dc4 SHA512 75690d40034f978c0f634c69a6d4e0951b80ca1fd9d824d39c2d89a4dde5c84c8308388fc40398abf2478aeb25beae1ea1258f8ac3fa1a1739e63d361cc16fb8
+DIST firefox-125.0.1-af.xpi 414680 BLAKE2B 0d11aa6ee8d683e8d301f3e116b88ec963b0b354288f21ecaecb7ad1454b79bf84494dea138f85a59bbcb78fdd75e59eaa409715311bd7c65b2b38c6396308e1 SHA512 671c5d99ad4a37d7c674a00683a37db48d93738b050bf652a2cce265612efd00601deb018dc994df84d4831707c7c8dc8891db82a2d1d32b89bb4f76e28d7049
+DIST firefox-125.0.1-an.xpi 502779 BLAKE2B e39de73c29211d1e894fb2c74a71a2b3095df75acfd8f5976bf8d5b1919e22afdea6b4f1e635794af3de3383d48dde491c5ee47411b1d1b5169bd910e4aed747 SHA512 816bbb51a6cb64c3c09febe2f06a248c02297d2347d108b09a8e6e4e76fecfdb8e981b4e347cae446ec58a91069ff6d881c00b50e95c261383b5f6bb6da5671b
+DIST firefox-125.0.1-ar.xpi 603588 BLAKE2B 2aebc42d07a9b3a3368cb2c6788e1726c83345b4664aa401cd747fe0a87689c4f7eac7095d2d75f26607de11a1f748bac3a632ad2257bc576aaec261f122f9ea SHA512 eaf3973e401efc45d72a14d186849943318a0c1e940331b4fde47c342df37ca01a563e5d9c8291ce39c2275b6d814b6715bb37452979afef8fe28e496d4d1ef3
+DIST firefox-125.0.1-ast.xpi 493041 BLAKE2B fd1b377a9d619599ddd6b626babbcb18c5a310cbbbc0ed45c84a282e4617c82cfe01d62579622415ed396bac5687f43163f12f9dc1070d8fdee31848d51b9ebd SHA512 2edcbb84e17523a11b46d920b0f815f49fd907412ae744628c3c74af244be25ab858ee6468810066a1a9537fc61199fc3fd49249611c57589d0f1f00fc652630
+DIST firefox-125.0.1-az.xpi 487517 BLAKE2B c75f8572887da2fa0312b6ac2257ae70c793d6268353aac0ab349262ef5b3aa80f2a23ad46342a4cfdad97144fa5065707e5a904a78b9d2e1e4b1e3e6c896063 SHA512 f5f76338ecb25f6d1facdb40cc6037ddd24e788609f9374bd1bc1a181546d13980844971e8de10cebf018d94c51c1b41fc64e473df174746300cca5c9506ede1
+DIST firefox-125.0.1-be.xpi 702925 BLAKE2B 04c0a694077208df50aa0830acc9553bfc103ed6fd1e09410a25a7b35aa9d37b15cb58517fbfb75554ce2827365412907af9a0d3471df4bacd7e9b0a04666641 SHA512 26daec37cc6aa9e62b1a3b90b7a13c7d461040182130296447494eaee10fc6c23693dc53999c38eb6e4974474e2b9ac501bc96360bc91ec06dd2cb6c0f7f074a
+DIST firefox-125.0.1-bg.xpi 600536 BLAKE2B 9a205c90c9e15ca6fa5e63bc5c0524168be32986a3c3dc672b734a38415ac6993201263cb1f0d7272cc7931e8b290110e1739b457c2c6f33328618a99dec9a32 SHA512 3371be7a1ca871c3aaeaa120785f51846f0a2d8c76a6be61ce1f84d5fdc69d515b11d1d6eda40b90d8179d4a21af5db0089a7d4e4c5da41434f5285fc80e68da
+DIST firefox-125.0.1-bn.xpi 578153 BLAKE2B 4010bc4b4008dd64b80e019254aa29d4c71ced2f2cfbc059ec2fc2470c5fe531cbfc30c24b701359a07ca7aaf49a7fdc50976c0f0a962a93692fba2a599ff5c6 SHA512 a0b582c67f4c1308f8cd77594ad8c139bd9c9d00183e33a81378d9d0cee1ed284a936601d2dbab22fa576a37fc91abb06b16b9a1b9b4fdb8e503fad98d5b78d4
+DIST firefox-125.0.1-br.xpi 583259 BLAKE2B e1e4fe325c66efe770dae67d4e2ec63337ef88bd0e6d011495d71d98fbbc5cb97b2d620c4e354663db8575be86b9cd6d866847d29788bccbe041fd4d6f8ea6cf SHA512 792e2957ba69a74c69c4ab013d990f623a8ae198fe0f1a40f740b1c55d5a495ddb9761008e7aaedf0e9a5a0c0639e9abe55c6d0d5457af7b2c182578775653f6
+DIST firefox-125.0.1-bs.xpi 472657 BLAKE2B 7024fa52f951b37917658075c1f4e849700d1da40b3ed9d226f41f8197aceb2d633e8aa8c7575df72a203b9e58a8b8afe48441c3ebafe9ead9a93e365d64f620 SHA512 2e639d5518b7c09ed1183c0895c2aee6dca9f8ed921dc01dee66b285c9a428437a7de3b7f0bc8282f1640960b0150200507e098ea989eb960b1528019e329a04
+DIST firefox-125.0.1-ca-valencia.xpi 542904 BLAKE2B 0e32b7d422f483945c5c09ed4ea1d1ec1a488bb896d06b170b69346fafce0544b498d39115c733394f41fbbf6910ce859bc7897b27cec8baa3f95c0e07beff20 SHA512 3e427d5fa954f006405ba1cf6c3ea842ba4843ddd8df690fd134709ad50180d25329deccf3af5e0739cbf92a530e33f3eaa81ce6d9cdf109016865c58828a9c3
+DIST firefox-125.0.1-ca.xpi 581610 BLAKE2B a269581b8f4ad2296df2e42c5bf3e217ff5f7e283a0ef8a58e3a00db183a9935f5a6d849f42f4d9641fb51cbab0d00d4b03a7abf5dfc141e9826b483a725d462 SHA512 8b4f741e2d5f66999ac6f61e82662d6f9e306fed92dc0a1542fce95badc017e15ee8a1e4af3da63273f15f20333c40897acba57b6bad607001abaeb702b0130c
+DIST firefox-125.0.1-cak.xpi 589368 BLAKE2B c8653c3e064ccea5b44d0aa35274ddeede45f9e85ac22682b076581795c968a44886a458948bfb13211f6a784d3bad6569eeaeb2742469773a4d9c24e9698baa SHA512 3991571c240612087ee703cc3225309525ab87f14c673ff73a1169d207eba7ad9a32aa55b61e4f6ceef4214a7bb61e965b88886ba11ffc6e07a7042f8459d9b2
+DIST firefox-125.0.1-cs.xpi 647926 BLAKE2B c4ec4d30b331456c4f88621d9de1482b8c417108411ac2e9c238798d8b274ab0fcb442858561304f65f09da696ee652dba0fa718576ced8c511afc77762b96a9 SHA512 7b12978a446df6f6bf81e0b5466c3be31f5a731acf227b095d639dbd4e67fc9e982f0a2df165d6d5169a9e5c76ca8eb08a4c44253eb7ad1c474e53b446b7e5df
+DIST firefox-125.0.1-cy.xpi 613446 BLAKE2B d1ed0b51fcfba73a30a81116a0800674019f019100f5b2ca47423233ccdf44fc333d338e47bdf1b6d6d890032f74c896a9d4ff6a9076d21a16313f3dcf1c8ddc SHA512 19450d700fc5432c50d9adb46351203a1efef2f67603c04956a326be947ae65edc41923a9a730416536a12ae5d6aff6eb34298d498d151eec76687e71b7c813a
+DIST firefox-125.0.1-da.xpi 601720 BLAKE2B 8cff4f1f94d6dc9af1cdfcc04cd84ee7eed53ba8159bde6558700660718f38d0390386e6b588dbbdf0867372d242430df6e022cf1c24c785b6860bbcd0cd92f5 SHA512 2f240bcd31ebaa1a98e59bd6862efb73d5279f3a76c3bf887969025860e406255bead315a266106dcba02e989a3bb9c9787cc84b767e6316b23c7677d4a2303b
+DIST firefox-125.0.1-de.xpi 622991 BLAKE2B 12fcb87f0336d2b09356a4addef2420eef7c8335b09ca23202c2d71e00aed49a6922f676f9fdde6629beb589c68b09cd52c1b8dcc0b99a35467d86cb261a3a30 SHA512 37c57e98e452a1d87e886cf50d59e1df0cdf0f54a3435a457561664c340540f686cb27a6484a91d7b617eee674ba722d7f8eb1ef8114ab1cfbe5117222e7e6fc
+DIST firefox-125.0.1-dsb.xpi 639406 BLAKE2B f3f5fbf52830f6757b4744d89114f457796b98ed0c0567b0148dddb585c5b0a709060b900ce15d2f67cd60fc46b8b3e2434007c0cc3b07979c3b56f7ef4407e7 SHA512 62da847da462bc7b577ae5ef0979daa2c0936149cbe1d4659e3835a7af4ad92aa28f65ad6bde4d47343448be92416cfa16912515669ca99902714cb10cf094d8
+DIST firefox-125.0.1-el.xpi 720363 BLAKE2B 11908bc969b89311382add3017ca2e337ecff59a7d2f51389f78432aa809cf948467b54e8163e721f5e316a038454025c993d55ec21e14d5214211e5b8ae6f76 SHA512 bd9b5017683cba3964b8f5be991af15c2f21d91a1720c5aa2e0cadf973a9cc088b5431e052e5e35f87ab31ff18624a422f87d2dab226d8fd7d4905fd20529d4c
+DIST firefox-125.0.1-en-CA.xpi 574330 BLAKE2B ff75374fc088d7d44228653ab07b493e0ba2e20304ac10ee89f129843d4d9f6b43652b7f789c0ac7587ac380b4ee539603d69d05fe251d88643965f7556346e4 SHA512 ebce5559b51c81970bf13c64d7eb5d7f21830816e28e9ce70c7749ec6ba5146e726d69cfce56fba94179acf65752f40b2ee094d3e7144996564c051444788fd9
+DIST firefox-125.0.1-en-GB.xpi 574947 BLAKE2B bd22b4f8fd97ad9fb2457af175dca6b81b90be63a87ba4aeca411e6e12525c6926216a0c7bfb9ff00917e0521565dc576a271c617f45fbe8736ffdd854c3519c SHA512 b35ddeeb9be0c6a9e185a2fb21942298284e305d3351d94f6f95d3aaff2a4142560a24ce9fdaef799f2891185527c40f29563d73cfffe2227fe9efbfa2af34d5
+DIST firefox-125.0.1-eo.xpi 603682 BLAKE2B 4f0b9a9ce93b5c02faf034d93d003f6003dd6d7309d943e5fd0b19a65869282b1f89251d98fa6594b4656cbf3df7d3b81bf5eece069b4b929290cea795883e62 SHA512 b5cc4b5763fa6432daa12f8715cf3e9346116a15dcdb969efe5cf041cf0be9d4187690121088cc4ceb3d9ea323d16c1395f2e9f8e518dfd6e4fe42ba477b2a4e
+DIST firefox-125.0.1-es-AR.xpi 616951 BLAKE2B 4a6f7f94de8151433a557d97a8faeafd4b0009a6e887ffcfdf439601d10ed3969bedbe2c8f4252742d03f632259d98436e99b9f74253e7b785c6b2e30ae671a3 SHA512 c898c379af4a5409a3c717f6592205dac017dcfd5c718e6e95898e35e8cb6cd761d8ac3bcda7bd4b9b7e2b63f1887e690a3fd324d261e626054dbc04927d656d
+DIST firefox-125.0.1-es-CL.xpi 616149 BLAKE2B 5ee8c975e8de263cc3112ac19a6a07bd537e5e889736b7f30d0d1e3900c27669157c4952090b945f017f98710eb65cfcb43a400c5cd351d1cbd4e1106ceb004d SHA512 1e3518cadd22c21cc2add90499da3756897f06fa7e2b70be8afb4524cd6a88169b6bef5606241ff451caaa3e426626df145a3b059355a66472491fb40658af77
+DIST firefox-125.0.1-es-ES.xpi 610881 BLAKE2B ded36da18b4a6f82d8b9dadf1e6ba07746715ac78a740b0df12af0f66abb8b312ed4027d53da22a00959e0dcea0609554b99b4d246467f08b8e0c2932b98feac SHA512 b206709e823c9c941a5d62ac9c4cfe6b167097d3da58bf9496bff5977a8c8693aa12aaa57b9e8fc8669fd4e8669bc1b6e0cc51bf4c2054c7c2f8c90cfb95f692
+DIST firefox-125.0.1-es-MX.xpi 588102 BLAKE2B 2931b35df33035cb70a8f43862198a91cbc667f04c619e0cd2fee342cdcffee9676afa3efcf1bdc12bcb31955de04ace8cdb54dc38d29f3c43f7599088cbf211 SHA512 0e9b2d407b0e450fdd30b86ad1b46b4c85a022cdd8d24618483f069cb72426b03c4fe9dd10e5d6b36a4a93598b0380ecf91d8805e0c239c7bf2d733e9887dbc7
+DIST firefox-125.0.1-et.xpi 536104 BLAKE2B 32d45c7681b1b18f0254a80d1a68c66c76d6d1bf63e4d1cfdaf995a4d2f8dd26f2cced21d3c8e08db9950b9ea8a5b0077fe1f0d783e9053d71016d8c19405c0b SHA512 2a366096c94f026d77044a3fa3016cb06fdba2ceee6670dbc72e9fc9d566b1e403158e7a700fdfc26c90f9174a46761400370248ad45557ba59b2bd77548541d
+DIST firefox-125.0.1-eu.xpi 590743 BLAKE2B 13e28eb68ce978ca743b0e69248da18592d419fcf4f7bf8feb6fb541eb063b29ee1a5ee8182b05cce04528d4469282230721bdbba295b3637a04be3caf07ace9 SHA512 d087e0724a9797deb99430e8c08c0b267d997b6506d4afd8b94844f597ab21a212ccadef7dc2dd9239713434ad089b6074cd851ce7b4c773d5d77710a5b37520
+DIST firefox-125.0.1-fa.xpi 586594 BLAKE2B bd3b827d8a67b4d9589eea7683f1fa7e22647aa6b79e20dafa9ef5001f560461e3395f310f0d9fe017ac2dec4b0a5943df9b12bcf0b40f8550f3e33c0f070b57 SHA512 88d8852f53f52dcfb053e3991583cd20d51d63bd0924ca3ae035219fe7f632fd002f15cffa2d05edb17d0d1e62b210f3d3d3e055fb92c27c1bcfa82bbd567deb
+DIST firefox-125.0.1-ff.xpi 472980 BLAKE2B ce94f0ce255d87f7c1eff807e4af17e93482d7187d0bf3ad8ba7725859bb92c5b58ab3da2d3f8335a746688e5a7c9cfa07c2497691a554f0c28dcc0a02700e6a SHA512 5b422d256daf751f69a37d6b7d38b0f86b692af9fd29474b2cbbc72d4c4cada253de77e5ba801bdaab98d4e2fcfc4d26818fed4b9fcdf79fb1cb0606ac247f5c
+DIST firefox-125.0.1-fi.xpi 597110 BLAKE2B 482653dcfa285a1ca0a4716caa9b986996ece9e16cfe051dfedcf50a466386c8c29c673623ce801dc5e8f0c3301c98ec9150eab887c6bd91cb97c23ccf1b4c8d SHA512 fe99420f2895487ce09a28719e5622555078b343168240accd67486a42cb87bd774c60abacb2af58745534c42551e4eeb8becf6d71898cf20c57be6a9d25b789
+DIST firefox-125.0.1-fr.xpi 628600 BLAKE2B 375cfa89750cb872d8b767c7c7bf09fececebb75334c6d606968c24da5016b2e638fa0b88dbd34a2387e865336df935114716d499dca5633ae72c697ce4c1486 SHA512 347ddb4303f6a8328da79713ecf76a058a53bb721ae462d20be88425c84855427b901973fc5ff19f36ac49edfd0b0b70e66a71c6b3df3066a7cab8af4d4ca3fe
+DIST firefox-125.0.1-fur.xpi 622701 BLAKE2B 648892e72fdb09d98179146b726341a430e96a876ac40ab3ba136652e0a7fe623a7f1205c0b37b2bb2d38b25dd84d788c9bf6f30842ee7495ebdf8f0bff3bad8 SHA512 0898c28026d33af60634b38196d92e3be0b829f768dbe89e3298bb207d8b957d276dc08c3f761733394360b54cc02cf2af64846ca7d34ab7fa76357f7075d5c6
+DIST firefox-125.0.1-fy-NL.xpi 612544 BLAKE2B c9b337ec1fe38edd5adac7d23acab3fba6739e31561171885c7a1253b4cbb2893a2bcb6756eb25a20aee11f6a1c82cad7c95b8c91ce40a365118b148f41dfc0c SHA512 7e92fe5cc99cfe3728c86575fe833bf0649b1846f16a73184985af496082fcfc8f8111832bcb8ef23b016c18a1d4cdb196c843eb92be20fc0d483ebc10f6db52
+DIST firefox-125.0.1-ga-IE.xpi 468139 BLAKE2B 15f50a67bb0d10656bf89de4e6f167985c0b8e49fe492c70417595de8058caf61b5a40a263ad25831e530f9e637bd160016918a808e7cd4128d784f2b4fd17ec SHA512 70d272b93c3d58b3d6b6a323577c017c2a48523d41b96a2e249385fbc8eada6b0b64b1cb4a6312f51ff457db7da282df0d99838f65043d2587c2d78718c49245
+DIST firefox-125.0.1-gd.xpi 587926 BLAKE2B ac92191e8d231e2f3f51a5134baaf0bf92e82ee5d671dbb3d5ede4ccf4920978a8e01ea2ab65fa1fbdd13ae6d3039ea7bc5aa2aa9832eaac0735bbaa4e620023 SHA512 98375a722f8791580fb2dd9e2193b9f57f67d85af14f190bec58dbc0a2e3e558f0ceb8003e735bf6fb587f68918dc1ce2a0a7606ec62134a45b2d919c27cd1e9
+DIST firefox-125.0.1-gl.xpi 600491 BLAKE2B 12ab649f84c6147acdba375c91f8ecf32bdb1100a4ebbfda1569afa3a91ebb7d6b3691d38488036ed1101f1240cc787161f89dcd74a18721784cd54bf349e39d SHA512 b1db600ef2b528e3c4206b949970602ee1bbfd1fee4fb885f6db93933b2c060cdbcacff7d17ed41a62ba1f4df386d03ced8e5c6ac3b09edab145d3a9ddf6f6fa
+DIST firefox-125.0.1-gn.xpi 627335 BLAKE2B f794194e206b54c4e6ef3d98e9ac573f5b056339f6d8bd29bd084beb2e070e579304931af253c3c3bc916946ec644392800d1f2adfa1d6286e2f3d09dc25ae81 SHA512 67538525bd73abefbcbf16f4e8622db0389094b062db29b02dd91dab5f19c017f8884a9c52e179e26f66dd6336f755acdaf7e108d3db28b23aed6b37796a79fc
+DIST firefox-125.0.1-gu-IN.xpi 524056 BLAKE2B b19a12a47bc4dd751e2c4a6e8a0b5ddc6045a243efbafd974904fca75fbd35c24d7f2b0dd682d195b90c41c1b0f2a5d50bdbbbb15a27063b558a7c76937a0a6f SHA512 0695d4bf5e07d799cd75136fe002f727abd730b3dc20587ad596831e0b14ef1df4acaef61ecb88d203d7a2ed8baa2f7e44873985ca6f2737724f328f37abab54
+DIST firefox-125.0.1-he.xpi 621328 BLAKE2B 65f2e90b0113a9bc5b215ecee323bd3de2154f164faf87efcb221a24d6e58cbedd9568a46847c1ccd5ef684906aa6c4e81baa88c343fd8737a430b7922bb3d10 SHA512 ae36d202eb4b0d965153cada7c20203e131589bec71d4c4596aeb155d8044f9062dcfdadea6b4c1f457b8c1aa8c9999c5c09de205dbb5b19b07008c78610583d
+DIST firefox-125.0.1-hi-IN.xpi 562172 BLAKE2B 26e9ce03550e037fdfdaca0ea5c50d1dfd86e937d2c218ef426e4630368a92c387707618bf148d3b8100dc2145972f072655f2e752fd87f62d0c1a592b7dffaa SHA512 8432809c03e68ab4ac477cbb9e776a217f3967555b3d34989dd6865c11afb0eaf3c9a37fb01be78777f7ba3cfc0d1ececc681f0935edcd9ee00e5627a6d881bf
+DIST firefox-125.0.1-hr.xpi 553375 BLAKE2B 2c389548403ef8c2511f855a13494c2f597f709873a16124c283deac70ba95260e80ba3214e2efc7a51c23e5e6be1e3b2f555f49545cbb2635710b65a8b426cc SHA512 820a324768a1f6577786199d280077c8caaf934f06e94e819861e0e70f25eb7f0e282105df9992ddcb5aad84ae085efe67d5b069054a7063ea4eba0cbc183f5d
+DIST firefox-125.0.1-hsb.xpi 635468 BLAKE2B f48afedcd79c0d1ea1c091e127c294333c4c2c333bde64cc45a4496b3abd3752367d9b465fe83715db35766d0c98fee6f390ef82542485a53009d6abc70ddd6d SHA512 9f8812800b1efa79d18116ecf890a676f77337c1cea32e37b348bb009dec0a8050f42080a4195812300f25ff60207a28567c2b107a83e399a5fe33efa9b66f3f
+DIST firefox-125.0.1-hu.xpi 638699 BLAKE2B e031d221e0866aeb8775d1883c7d7cc4420fbbf94fb8aec357e5bc0f92c41a0f8ca4eb7264f8d3a093148694eed98e25cdbd351394ea10a3edfe00dd2bbde02c SHA512 c2a075ba2c015c77225e79967750bfec0f8c6c3a3e66a5cf45780b11601b3bccaef61f82d01b82b95982e8a2ca420c7dc7c964ce0f20eb64d98b2d2ee56da048
+DIST firefox-125.0.1-hy-AM.xpi 615229 BLAKE2B 13a60e9dd9c2a4a6da8190527be5f5e4d518943ae8a778d5e2740fbd918ee5ac760ceffc82cfc3a66060418baf9d74adf893d426a4a966b59e751614c4aa077a SHA512 03ce01ade8ad1ea34c8bafd8af205c3e4d766e13fb2c12f367d0fdf7180814a3854beab55794b663dffc94864c338ddfcb03b6b1c04e80adadbc5377b05cd1a2
+DIST firefox-125.0.1-ia.xpi 598620 BLAKE2B 5ff1f7f9617924f505b5b32cc00272f6a7167e6e9ce070fdd5afc8e2c426628210edef7946e9216947ccd6ee46a03c4857672c54cf6fba3d5e3a0f6a592366aa SHA512 3cf868e30cf5db5f9435cebc41307cc90bb46fcf078947655670ec32e1daf9a17074c1a9421817cd372c20e4fad4b955e3bd4e47788307588ea92c0b968a4906
+DIST firefox-125.0.1-id.xpi 570672 BLAKE2B f1d556a488b9beefd620cdc0c5c79440114511b4fe4cbbec80c9feb76cbd236bc659db2ecfa39b41b502487279ec70d979beb0f891047ccbb8b0134085dee52a SHA512 85f15bc38e793eb31a2891ae03458d377fd5474f0b7c51a2fe2df0d69a7cea7c81e06350093251a7a231f2b968738861682ce8175c8af768125c1509ea743bf2
+DIST firefox-125.0.1-is.xpi 606633 BLAKE2B f04fc014037eecb3db2f1a3428cedc39eefcac7523fb5d9b515d654626f9b3ab564cec4da8674c7652ac77381ceccd6601b4444ffcb75a7ee17e0c4dc3fed35a SHA512 7fe06fb1efd07b6f0f0a0b029924ce8cefb79e735e9c2dd7b6620254c37929d472eea30b1112d3792ee2a8a766c9dd6343e93644c1cab73718e6f4a7dc3715c7
+DIST firefox-125.0.1-it.xpi 557447 BLAKE2B b226339685e6e8bb8a22757daa0232e1e200431e16df826b21a59bd8d7312e7441e140b91342cf4a9a5f38cafcdb2c08ba0dc3e42285d85240bc061ccdcee0ee SHA512 c2a0ea18137f0270d8027f744262066b3873255551cd4872d7f5a1d7ac1a06a506bb3a3813d2731edcf374d7094d802b96bb217c59cfe4381af27f9a6d74286b
+DIST firefox-125.0.1-ja.xpi 668140 BLAKE2B c8e0935d9999adc03460fa04f4e98f90fa952b3ebfa5f7ea18fab4a6837ce78c04069980eb3d9a6994b3029cd63ca6237ca10ee56fe721821826d8e4afca7bba SHA512 746b21b72eb80ccab673f6c463d61f7eb308aa272db50d08864c7b9589559d9ead4ef225a5e50a7dc4f68c743512260c0e054550e952db76983b230b7354a778
+DIST firefox-125.0.1-ka.xpi 657026 BLAKE2B 1eecef3c13fb2bac30522b24e9e25561245470073856e2c4733a5754de8f5fe8dd9962cfd4ea506ff250c62acf3b6e39bf2a290027a4a5d5985bc2283eb20c7c SHA512 2057daf7487992e3053e1741051226355c9555e00d11116bc29d76d0d6fa9c61acabf5ce995329f96d9b5af4d845a9e2ca11672b58b7a4a1f39fdf5571617904
+DIST firefox-125.0.1-kab.xpi 598288 BLAKE2B 1359ad11d164b8cf838afba397643c268a04827a65f21bd06eaa384859f635430a63b445cafc449340249a720382059278e1a95586a5fdb28096f7c046267751 SHA512 025d3a5b01f1504a521d6bb162c5ecea146ea4804ec971b4de5367a2acd07ed8dc979b3c7537520e2b91a9a89d5db4188cf05bfee4415f3e3fd8e9a6ee2e50ff
+DIST firefox-125.0.1-kk.xpi 695566 BLAKE2B c4d32f8430cdf4da3e9b415cc634ddf8c30c0b0f8cc42640a0396ad871327c4c1ca27368eae558afa3a15e4c3996ba3871871afd3f7ff54bface45a269f139d6 SHA512 f960e0651af71c31bf0813519a1d1fb08142eeb332e8dc7f70eedb98ca439f87e4d0229745d7462b75ec5d32d0a545d5936eb9769976bc249337f2809839626d
+DIST firefox-125.0.1-km.xpi 522566 BLAKE2B ebe133a410b1d2c89acf584bf8ae801f55efcaba8e66859a90dadfb22dd3f7a883d403c453f23146089da93ed7026466a9a53548ded0b304cf98e539fc213b18 SHA512 8167a8e606915272c31628781ae535bcf7b9cdfb4b204fe4363ac4360712d428d349fc97bd29f8d187eb9756c1e90b2a80467707c041f266c0d3352c37bffc49
+DIST firefox-125.0.1-kn.xpi 488072 BLAKE2B 500eb82b412ece6cd5d7a1bd11f49e4c3c71386d5419d3d749c3d54417e95b93f24ff862e7f23184948980d8c86a7884a037860eb01cbcc7ed45dd5cbfa62f05 SHA512 76e8a0ec44e1f85698119048d9c45fb3f1f725692a93b28f06029e956268cb68a831c2a17125ffe5a656747f537cdad0b4404de5c2845d54a05c379ca103fcc2
+DIST firefox-125.0.1-ko.xpi 650094 BLAKE2B e02a65dcfa1f182a99487a481da714203c47c3616dfc434c78c4f365cd3e61b344cc436d1e2258fb91c8b1ab1889f515c1d1b2a8c9f0468c8681dd001a463dac SHA512 53d90f3cf00426f70162e5a674c0a5e903bcd3cad5d344d3f8d6ce92af54f3268d0e0ed87766a37cfdd2f102dd0d2b5a6253a1758f69dd732afe3f0c58f1cbb8
+DIST firefox-125.0.1-lij.xpi 480897 BLAKE2B 0278b714fa932457c3f8cad76200fe0bc9cbac46ee879d1b163001a1d81c44f1da53564e1793d88d1ef6bd3e22a31af747f20605ebcce51f52f497baab7bd16e SHA512 a965d27221702e2a51abb7f83fb43e93a790552627ed09518965f62470c1fde538a31c0a0f9ca124b060a3920de8e8312da11d8c3f3adb366afcaf8a5ecf9a9b
+DIST firefox-125.0.1-lt.xpi 569233 BLAKE2B 16c40e396f770c7b46fec05f58d948fead494f85f6027c3d1d0e2e3effe2849b6ea7212d7aba2a4f7695361fa885a79c921c1a6951481fc32f441f652de72f72 SHA512 fdc914ef78b1198aff0fb0f416b3a3624f44e2a87bbaf0e5636d139119a1aa43ce0e1b1dfbd25d9ad6be4742df580ab1dc62a5c7b7ae04f69a34f38b7cfc6d4a
+DIST firefox-125.0.1-lv.xpi 564980 BLAKE2B 00f3214039b1893f4bd89d562c808aedf2717a13a4a5bb5c1177389403896580f8a904e1d9e6265e052eacc832d4d2691dcc8ce7a1702dffcfea23caae99de7d SHA512 20dbb02bb09434d0fcc4ef794ebed5621a28aa665cfc3d2d603916faf451c9a61e85bedec318e0b91cdb500c1bdc9d730681a251266ac165070e98d3da30c6de
+DIST firefox-125.0.1-mk.xpi 490012 BLAKE2B d25545abda01326f7ed80f076a1451e9d01493915c1a6cb65bb8bc994217712fca3bd0d93e95a44f12fceb906931664f063b81e3159ca2d253f266fdefc78d2e SHA512 706faf3fc044b911aa9321f0d12f5f0a6995b65317ad2cd3dca11b3f5c902d47cee43477f492973918002e7aa9ab2caabe791d785a2ba3e7524762e2e4370d42
+DIST firefox-125.0.1-mr.xpi 528859 BLAKE2B c36328dc63e5ec436c05687aab1a35a0bc7513412c8ca340c9063258adeadfc04dd85e58e8a01c7161e5f429aab970a1bdae62e696a7e873a98969ba298d5859 SHA512 ba4afa6dc46439a26e590acedf7bcbbbce67f00b4b722c3fff72ce0cb21c6d1045f3579539a62a58a9c3373d31364fcf7860e179869f4c01e485be2884fa9cfe
+DIST firefox-125.0.1-ms.xpi 446535 BLAKE2B 5d2462fa8879af9a7d45100717800509d0eb591ae711ac9685b302c4cdae0058371cc33100622b862bfda6f4ea4e4c54411c2e94d7bfecc70b24a786547a96a5 SHA512 f6d76f80c7ac03b62c428cab8553b0ab0905fbb06850122908d0f42f4d7f72c129af66d3eca9232a47d38fd4aefa1bccee76238f2eb8ce5504a0e0c114323737
+DIST firefox-125.0.1-my.xpi 515535 BLAKE2B 6d8850b952b206a01915665f9bddc0a5f71053d4441371b329d1f95af6606c21361ffe84139ec2e98ea2bbe772b8d596c39e0c5a9dbe64dc49cea1f9c05d9f95 SHA512 041c4cca306a1546459e5dd5cf9dec63ae2d95b9fe930c863747a22889f553165c64b9c300f033c412c82bba3cb503ad88a37eeb3bcc82af087261d95824474f
+DIST firefox-125.0.1-nb-NO.xpi 595777 BLAKE2B 891e50efbc7b04f3691f866328992cbb46bc3302321e1e5f9c786fb5aae4fcaa3e446aa4fb97cd62273e05fc238526407bdcad83da248605646250ba425070e9 SHA512 54fa81113d243073cb498fc659c26634f3412426450192176229a2a5483cb8d7b35394c67587d3d074949ade61939a237c647f7e62da06fd27e20d0368ffb06d
+DIST firefox-125.0.1-ne-NP.xpi 494581 BLAKE2B a976caf916c2a33d2dc163213786bbc6818786c2a1de0a9b804479ccc48a8cfd483eb1dc404a8e756e6d9b49db21ae8557b1061414a75910e290a6d5d85adac4 SHA512 bebf5bbecbca6a98f143367b6022fff60171bc6f781e8a4d31318bf6af15680549727a6ffdbd8be5108f4a85c344acd55b02c28c0aa2cff47d1b0027e17b77cc
+DIST firefox-125.0.1-nl.xpi 606357 BLAKE2B 953823bfe0064cef4b40bab96a134328b6bb04c0adc5f86288b048173c00c6564fe239ad5db12eebc0980b0ea0fbff67c204ec94ce9fed012ec2fdcb9541a0ab SHA512 c90614a686c0419dcf68d3a69c313556df0d73a560c1beb465e2d8de768a16c4af863ae8823465683204d2e8303cf5d489608d3e348414b4404b7ab1fb18f76f
+DIST firefox-125.0.1-nn-NO.xpi 591638 BLAKE2B 017c9abdacd36d9a044a5f354b91bf9a48f9c4ca1542ed5dc5bfdbf1bacc905912184cf832d1608260a9775a3bea8a45cc8531fc678f9aa434532d6a26e44804 SHA512 59e59672059754c01f1bdfd4e68b106fa4592af0400b7b8d4cfc48a5003328a72d3296eff2bb4f1fce1325b51fc8b5cb41a9d6a57ce74fdb286ed484eb5a4dd3
+DIST firefox-125.0.1-oc.xpi 606786 BLAKE2B bb82832201bcf2db7522343cbf23655f7da5bb44c7297d3436167bf34c70efe8f63f8bf0a99df0911c1dd38fdbd3428c2dee6ad92048ae168ea6a8110ca85661 SHA512 64935b19a18f19d7d9059dd99f0204e6a65c3a2abc4d7415727d45e4a657252804c1c5aa38e33fff0854655c7c45e243db6232811083206a10ae4d6d99f87d45
+DIST firefox-125.0.1-pa-IN.xpi 679000 BLAKE2B c89a47282c5aed06ddca1a1e0474fee67627ccc0aaa04f721fa50080ee9d73c3af2733fddc8d957279528ad096d90c441fd9cef4d460eaa02cc497c996afe019 SHA512 a29879c03b10c47580ea3273d8694d05d084f819ded523afd046c1ca34b4a69fff8a42d6967cc51a71adf4fbf340d008821340c0be9f2a700c084e2e1e4e8dcd
+DIST firefox-125.0.1-pl.xpi 626580 BLAKE2B 1a0ac22ddaf672ee52fed9ab5035398195bcdd2509217e3e92e039cb9186f0811f98aced53236535990faad0aeb22ea7d2ffa1b70840d28fb6de5b58ba436d49 SHA512 d77f90d441bf59fea1fa51a1655164d3945c4b59d7f8d6e25ba89a8b87b1edd19ca169e63928f2c4f48d9289153a7ccc26a7891e70eaf7e500a4ff47d814860e
+DIST firefox-125.0.1-pt-BR.xpi 611067 BLAKE2B b59fc2ed84658f9bacf5bb51f02c27eb10c20d265e865750302571332ae5dca824dd9a94f93a888fe4a7f5a18daa537478c3957abef8dba1570b82d03e1e9d57 SHA512 356f4d363cdeafecdcdbc5832cec959a913401d08dcba9b2cc1d6df1020e47f77f99545c5a0ecfc7d039ed5484130b75ed5ab7a81b85fbbdd4641096498bd327
+DIST firefox-125.0.1-pt-PT.xpi 617156 BLAKE2B 74654a900f0b9eb27b6a039f328e3ec6dc47a511f0cf562933c49d38875fda6475afc50fb672146c26b8dd1c773c85b966c4440a2ca83577f441873d73f63f9f SHA512 a18e605c6732976ee9c7d3b371b9dc129ca5fbb0cc769aa09bc71ee0e218317b766eae5bc007e35603775b0abdb964870ace81ebc39e145b9270f48075d31a1f
+DIST firefox-125.0.1-rm.xpi 605676 BLAKE2B 1a69af26ea266c9f9aca596878300b457a4a2a516a2b6ab269c154f5d838c2bb53ba3e67885777fd54c576e5499e331c90fa403f963c22570d17a8e6c773ab80 SHA512 cc6b612f9a7286323f949b7054ec64a71ec15aa488f4fd1522cb324f3c2552ed8ee32114dd5150f9f5a81bf8391d47aa6c7c7bbf5c6d524855e42cc61dde99d6
+DIST firefox-125.0.1-ro.xpi 546375 BLAKE2B 921901f5df9f5ecb2e2655fe8b76b9a99ca51863d90e7da07628e3ed2cb7baf5a1027c4506040fb2c402a414e2da0a844a109d1e0221523c089a7a4311b36f1d SHA512 66708942d15a538f952cf3913d7b0d4bf6809b26777bfc260311cdb31ccc99173d484beaf71d6d055f4d9a1e37d8188062bd1c1816d5c5d78e881deb42551c84
+DIST firefox-125.0.1-ru.xpi 707741 BLAKE2B d23574875494993f84c9563a5c4e6253f6ff35ff43a2cce96921d1ab68dda9ac44031e750a12e63ecbaf7808ad0613976be1153a91a0c11ef91274598bfef1c7 SHA512 01805d4ddc536ee6863e9b4400ba35d9a82a618f376a8d79022dca92bff3e4bf8bb38d7ce4f319a4f3ba638e8aca9b8167261db9fc66fe6582c452733bcb5deb
+DIST firefox-125.0.1-sc.xpi 575327 BLAKE2B fee50050eede96ee428401fec90f191bb5dc64e205b62664b6b42e7ca8a8e9e39a2ab8ffa222ed2ceee61b4de7650578fa238f612e41fe21df70a4aea6edca1f SHA512 079b9c141cb8833bb6a16f6d0063c8420415acc5d6c7fc4c48d9c1e281c81858a3e34acc14101caebc233b86f7db505e2956c246d581447a20cc699dd43ed27d
+DIST firefox-125.0.1-sco.xpi 507982 BLAKE2B 9429a3c642538a3d3cfd1dad34a176c046e1df0719ec2de1c20582e16d03f10b46f46c3cf48422ea7a238401631d41ee590accf6c72a2b71c7a93e519152d0a4 SHA512 bba3eb47916c951bd8962e453143410b17cf9befdc44c20e473259d09dbb8d08dd8687fbc4297143b2f6cf5e35d33ad1df4133c4d228b500ab1dd52e6f4d8596
+DIST firefox-125.0.1-si.xpi 602488 BLAKE2B 252cb9876d1e70580e385462cd447e37127fb6dfea3291ed39519c323d6a76b811228e1360ace745a63611b49da75cc21b259112f5177274bc43d3228e8bf1f4 SHA512 d3c10d083ebced33b77cf44c46e785af5c25ee9aed56661b3d73f816bb4d734b62cdb145c9f60167d5c80ddba04c7cd40c781e81a437e8702fe1d5ba0e3667f7
+DIST firefox-125.0.1-sk.xpi 640883 BLAKE2B 7d0af03cba1a999b608b8e623579b1c4a0fda6d2f795e0946d905917002353f947b5d227243335dc28a59c591b4b32f4fbd0404628ffecd7a7f01bf670a9fe45 SHA512 f8e6e5d5a3f615c081892c18d8fe0a31bb767d5fa2a7b02c8ad91788e6961e92c70cebdfff194c2c3bb2603a3a5ca52f178ed296d9f24e12ca02f664477f7cd3
+DIST firefox-125.0.1-sl.xpi 606609 BLAKE2B 51b632d4f0181a789da93a135d2ff329c44e2f561253868928c7a4b8d830f49193029df87e44e99320fb8b00332fff53e1c9906ce205998a92cb75333d5589e6 SHA512 5965a45288d3c5dca4b865a0b8efa0c6284f99605f17fb5ffe6ab486cc894c66043746ec77f3e967b0d4d146ca1faa3ab61cc5bea9d5b97d297359bc49e50c6a
+DIST firefox-125.0.1-son.xpi 413592 BLAKE2B e7b2c689a3e71e25bf0d318ccbfa95684744a2d172575e9e6d274b579719dbe89c4cdb0819482984ff24a69cf006a24841aa064597b7ad35a13cb33927387cee SHA512 818e2b531f4674ae25d14a2f375af97be84a2c477f45fcbf740ace9788c6000ccdc12611f95a1f2227a8a84818afd3ffad3c9a402b5816355fc1ac7d6ff38bf6
+DIST firefox-125.0.1-sq.xpi 625801 BLAKE2B b5ce6c07f16bac8754bbdf6e82ee1ebd19c28170ed5d7ae282257a324bf7859be307836b1432ff70381834856c7c39e0157eeef9e69e661f9f0c9377ae0c234a SHA512 91fe8403b9e3f6afad49b7bbf6a9c2d020f471675c8861d89273ebd1fd9922e10420a1b577cfc5b6a8858a92a3d2f1ec878ba201432b6c9737f183332cd2a62f
+DIST firefox-125.0.1-sr.xpi 635841 BLAKE2B 2b0216addbcb129cc72e0a18f71600bb5deddc6580ef521a66e39bc796fc51140313c15c54b4e708c4e330e509872abbf8c5981d78765c8585a360619beeab9c SHA512 7cc17db38f1682bf260153852822c3a3015e159d90d5d956fde7c81134a9c065cd4fa5ef4ffec509023783a520903e867d8511a38437a2ae2d425a6f9aec2361
+DIST firefox-125.0.1-sv-SE.xpi 608293 BLAKE2B 459fadfc5e22a5d4662e14d10af0d0d21067981bc772c86ba1ec773d4f28c8bc763828aebad858b54a50328f29a28e8a75414ba0fd5e4345e56b68f02958c9cf SHA512 ed7f63bf3450bd94e1314c8c60219609774098dee0e1c712ef1d6e5ec4ae5a86d0e8d04be0c0b297e9de8fb6abb89dd44dd4266fff2af4727e4c2882d9569d33
+DIST firefox-125.0.1-szl.xpi 522966 BLAKE2B d44813478df3ae5d383f515fd73d87d671de4cd84ddf9fea4c3f654912d888188d18a6bee39c2b535acd42d8a04d0adeb494817bad3e032106ee5c319ced8f54 SHA512 d9208d9b75efab524026624d279873bacba9eb1b56713632e2372f8f686ad29b8dd201f5e9ee2cd37c4b0b43582230a8d3fb9140f4ebf8b2856fadef2751e382
+DIST firefox-125.0.1-ta.xpi 504351 BLAKE2B 71ac9e0ed62a6888140542fff772387e68f24fec5bb9fac26ee36161512bc4d321c56aad197b3ed4f5faa94b4526551852c02082a705d34417a945f4246c0b09 SHA512 c1e6cb541b9bfd7ed340711e377278b8a8219c8c460262124705fa3a47551f581a6640eb785ee6ce298e4ecdb22a0964533e14a35bd112583ec942e4daab8c09
+DIST firefox-125.0.1-te.xpi 555762 BLAKE2B 27165f87c64347c119dba2341e484a63f1cd66906570b00b5eb07d0b3f0408af669ccd6152e8edbb523dade06d12dd3c9c5f32d3d78944944a6ecbe59cb46050 SHA512 78847b07edfc09a5aa3fc7d17acc3607ce33bde3620f55733438c23c2d86baa9948e0844e7f5542b449b89da1581d96b49de5a876eacd2f69cb7cff8a9cd22e2
+DIST firefox-125.0.1-th.xpi 685321 BLAKE2B 26cafe81618d9abb347e011fa6fd755e45cc78e563bd3a6d715d2135650a7f65efd04ad8c3b006802bebf2356d58abb966446bec764071d1de6f7c20508e8864 SHA512 11f27eb365e8dae0e4691ef4c2255cfe4b49ac6dd5eb32ac91961944ef21f73bbac042c6c2d8606f32eeefe620648d7dd20b900883976679ccfb38387e569dd8
+DIST firefox-125.0.1-tl.xpi 530819 BLAKE2B bef20fc30aabf9ae162683f4498d4244a8a182a841f067ed527b1d9c38db8df4ffb5615992324f3bed15934c91672bd277379dba881f574856828d0ac32e11d6 SHA512 6065b207b12aa83bbaf705945c211b360d8550795aab0a956049901696401ef9aaf90e4a055b4f7e43ddc07a312e4d01072171475b8b77aefbd5f5a127418e6b
+DIST firefox-125.0.1-tr.xpi 621046 BLAKE2B 8cf175eb18bb43c4ed440f57ace11f99cd0c25e5e8fe8c5d1f4cfdc559095241e711e0d76a35b73038af7b924e849663e30d17a9a480adc2955dfb464d2d3ffd SHA512 ed5a2e1366b757f6341c46760f006f8eb65f5fd0e438ece8486c9f12cab12f8fdce7c2a02ba213a0c23056a1276723116879dfde86a14e94ed15e5e5936ed08b
+DIST firefox-125.0.1-trs.xpi 500780 BLAKE2B 526b6cedf898c99a7ce9cdd0de805ce1e1b70dea5fb549dbaec93964b7154e9a72c6a71c95554e4f8bf911874578a85a1a283a1ad26d75f1d2e1e626cc09c353 SHA512 8fe9925d9d63ec33f422f11079070fd9fb7a0f569bd8b6f3dfbae67a0435b2310dff7d237b8e18352eda8a3c55645da44570ea36cce5cec68b7ef46ebdd7cc9b
+DIST firefox-125.0.1-uk.xpi 700075 BLAKE2B ff840dfd6462a532f41891b474562f3a094cdf51b00872de3e61fd3fae11ff221b3d6c3edfdb37308e12a498f016e04a010e9533a882147c86b223262cfdd882 SHA512 f340f1441e689d77c54b285a6d89ac7e49cacf7514fe1ed7a47f92da9e8d6961cef0aebbf97bc38e1078a5e99223c74ece9a92b154f70ded3d28d704384295f6
+DIST firefox-125.0.1-ur.xpi 557251 BLAKE2B 0a8e1721455e391a23441f171cbd6b6617e9823b4926f754c1bb47f225bc0e8027a94b7784efe8be38e61e35176c34e463a6006fd7232251c6cbbd3bcdcb88d0 SHA512 7544bbb9e54dedcfd956eb7f42aa312a8595f345efde59a926bfe5bcf4d636bd7d29e2b28ffa9228ef398f13b2d1e64955e0c1116f258d287d6d170b8a05292b
+DIST firefox-125.0.1-uz.xpi 475755 BLAKE2B c74b05c830b1ba4d2f2307b24dbb4db1c264e33fea3f8488c1c28b84fd8f9fbced1f6c1f5b6148ddac7d6eda39f3dc66b2a5dda240ce3237fece816f87e73e71 SHA512 dfbcf44f057bef5f0771217cd2269597d1783bc951b7b8a934601034e38bb98f9b217004f6aba10fab1c956d41596dd33a09d4b38c70ec1b63e20f99191e3c68
+DIST firefox-125.0.1-vi.xpi 645249 BLAKE2B 97ea0b6d646708352c61f0daad3798fda8ebceb7a56172f0f7d9d4cf78efb448e1a7e033306a3466ff4d65318b09f86836e3cc0bb9597f0e67c68a3f8306e450 SHA512 9055b36cbe4f7ae7a015042c310b8117d1d12bfdcc076afe1ebbf9a312cee6143506462e234f99f68dc6cf9ca15e3fb3a7e5e12f1936e178456a2118213fd9b1
+DIST firefox-125.0.1-xh.xpi 414339 BLAKE2B 4f5d61a63cc8e8ce8e10cd65ad0e9183a320131e01289783505e1843c8eb72f45716e61cb1c432f8255d4cfa9f6075560fa3a83bc70bfd8ccbd1e7264ab949f4 SHA512 f112727e43f84634e0c0488480e7bd95f88b1a7141b0d23a98decf6542e1b4a92432906073b1f3091266c41d583f1f95f7fb2bcb6294bb0e0aa79d86429d8103
+DIST firefox-125.0.1-zh-CN.xpi 645742 BLAKE2B 755fb1abb57b3e38d1ddea69a72b6cb0eecaff98bafc46555c449d9d60a3db30135d1b6a37c23da5d02c16f2e993a5d1358594cc3941d7371438c7e40e045059 SHA512 bb12d80156938fd03b90c4dc0b30c944913c4c60bd697b97d9adef0c74f48531c793010f84680127b9c8685eeb8194ab12fb1d495d52d8e49c3c843a3576b6c4
+DIST firefox-125.0.1-zh-TW.xpi 647637 BLAKE2B 036b026687d33217b854438da76df09ac2fdd94d4504ad9f9334650e453b96e8122c139f598a526798e3291ceea813b63ecbb05b1e57503507ad4ffae9c996ab SHA512 10c395063dc7b0d0633cade6571ed5abe7388932b5b8c05297efbce2ad98652a0314823865f486cfe019f8885ac0f6afd0149d0752bf63fb5f8f626824441d35
+DIST firefox-125.0.1.source.tar.xz 553213768 BLAKE2B 5b29fd638903617c5bd0716b304ae2d96390264f4fafda8a31698c25438635e865a34221d0e11b440c38f34095bbae0a322694870e09885f4acababf944bb338 SHA512 6f2f336de8b0ec9cb19ba20c909407b7b88c0319ee3b2f1f3429133516b0c45b4c7846f287985a0cdb9f34acc7d5378ed14fb48e26bef113c8ac360501a30c4d
+EBUILD firefox-115.10.0.ebuild 40021 BLAKE2B e24bc93eb0caf9b29677b6389da80d323b08c756ac58f908eb77855c145b92abc1ac9282ca5c1571d80874adce0a3b985f1224b9a6c4947a394edc1ac7c9a285 SHA512 4226648f64951c4e1d4657548388d9dadd1d9871b07a18b6098f3bfc44f315736121b7c7855af2424a6ffbef3d0559182dd87599e2260460e0acc6101cf9f8b9
 EBUILD firefox-115.9.0.ebuild 40131 BLAKE2B 075005b8f056a3220b0e25860e87698e377388471f90e156dff30fa0c554d48317ec5b0784f9058cf8e6e109ad290eea7db4bc2ee0df63d6b0d17a493f6fa7b1 SHA512 cda2b831f8738e2fc67894ac22e913cbda202d1e72f204655fcd7169b12cb1a7aa7c10a1b24ca61328ea4bdf0427a8b76a497d1be3d3fee77539caf4e2b573a3
 EBUILD firefox-115.9.1.ebuild 40019 BLAKE2B 575bc61867dca8459f3eef56dc9cd42f74e85d16ac519e13a02f008183bbc462c2aaf72003454ac1e5e7303d4721a422333a1f465c5bedc1f4c3f83b5f447eb6 SHA512 4c5dc8c49d1e9e6eec7f330e20c9e67dbdffb337637b96a520c39cde22219369d8abae5ba498cb693835d8e333182b12802313dd896d131758e2a83b0abb5915
 EBUILD firefox-122.0.1.ebuild 43363 BLAKE2B d215e52ef1a0c12c36c1956ce551ffb80fef00c8dadc60b0a8d4e08f22308fc4216a0c02abf81490b9ee54abdc9a8c2edbdab4939df9282608a427d19cae9423 SHA512 0195715e17e34da674ef69785af0261ef4a229f55679b088cbdfff25e89cebe5f965a3f42ad48226c9eb47ab3951c88969e256a26f6639ba3d74d42ed7b21fe7
 EBUILD firefox-124.0.1.ebuild 42533 BLAKE2B d0463da13e3e8f3c38ca8890186352e69e18ab39bc2143bb6fc4fabbe17af777ee14624f5c4b9a11449cdba7062f2331cf82a11ab26a34cd9d1bf4b376e98244 SHA512 9de09b56d40257d7c9aabc5806a61235ba66b5701ed7c329d5e0cd0544d9e64f85ccdc2923b7f51996e489e42cf4064c3b3675fd4918f1c9d0d1e0cd6a013833
 EBUILD firefox-124.0.2.ebuild 42554 BLAKE2B 7b2d19ba6bd75dc29fe05b8133fba8f971d49c03a68338b449a58837c4457f8f66df90cd64b8b3ada13dd61c406226b97fda5a4e7c3dedd670dd03136eb98892 SHA512 4fa2363e85d9c5e78e676f41f11d75c684d32b92adb45fe8ea39eb288750d89e93e15b181755e550b66508a922686d97d9322b74e3085e7a1e3f674b05b245b9
+EBUILD firefox-125.0.1.ebuild 42509 BLAKE2B a39135e7170fc7eac35aae19904369b9028b5d22d05b4a01c47c921c9ca4105773bf2f6f7ec3c6a2b1da0c5d68ed1ab94d84e7b45e7f69a0b19f9bfbbc50dd56 SHA512 8f62385b79ad5608731f1c53c666ee899dd746548fb70cbfe25d52d928edcaa90c3017593e72abe73f7e447be40a339e71f51b587f88d49726958f6d6d61fa91
 MISC metadata.xml 2597 BLAKE2B b449997bc096ed8fb7bde41a5acb8d9f4c1c8cfc9663c06ff603cca756e8868d40049fd292a459a00d80b4e8c3a74e91e29fcb04abe87277640fe65d070f0bda SHA512 703c7f6a2b46748786145b0973a7b8439e530c96fd7c50d773efac7d5d9bf74ccb4f0c252f2701459944f2b3ced22d3e57ddf049b9aed0c8f0e094cabddda251
diff --git a/www-client/firefox/firefox-115.10.0.ebuild b/www-client/firefox/firefox-115.10.0.ebuild
index c4f574e5ee71..ffb6bbe1660e 100644
--- a/www-client/firefox/firefox-115.10.0.ebuild
+++ b/www-client/firefox/firefox-115.10.0.ebuild
@@ -56,7 +56,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="https://www.mozilla.com/firefox"
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv x86"
 
 SLOT="esr"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
diff --git a/www-client/firefox/firefox-125.0.1.ebuild b/www-client/firefox/firefox-125.0.1.ebuild
new file mode 100644
index 000000000000..f3f0bcb2fde6
--- /dev/null
+++ b/www-client/firefox/firefox-125.0.1.ebuild
@@ -0,0 +1,1419 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FIREFOX_PATCHSET="firefox-125-patches-01.tar.xz"
+
+LLVM_COMPAT=( 17 )
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="manual"
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multiprocessing \
+	optfeature pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~juippis/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+SLOT="rapid"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+
+IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
+IUSE+=" jack +jumbo-build libproxy lto openh264 pgo pulseaudio sndio selinux"
+IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp"
+IUSE+=" +telemetry valgrind wayland wifi +X"
+
+# Firefox-only IUSE
+IUSE+=" geckodriver +gmp-autoupdate"
+
+# "-jumbo-build +system-icu": build failure on firefox-120:
+#   firefox-120.0/intl/components/src/TimeZone.cpp:345:3: error: use of undeclared identifier 'MOZ_TRY'
+REQUIRED_USE="|| ( X wayland )
+	debug? ( !system-av1 )
+	pgo? ( lto )
+	wifi? ( dbus )"
+
+FF_ONLY_DEPEND="!www-client/firefox:0
+	!www-client/firefox:esr
+	selinux? ( sec-policy/selinux-mozilla )"
+BDEPEND="${PYTHON_DEPS}
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}
+		sys-devel/llvm:${LLVM_SLOT}
+		clang? (
+			sys-devel/lld:${LLVM_SLOT}
+			virtual/rust:0/llvm-${LLVM_SLOT}
+		)
+		pgo? ( sys-libs/compiler-rt-sanitizers:${LLVM_SLOT}[profile] )
+	')
+	app-alternatives/awk
+	app-arch/unzip
+	app-arch/zip
+	>=dev-util/cbindgen-0.26.0
+	net-libs/nodejs
+	virtual/pkgconfig
+	!clang? ( >=virtual/rust-1.74 )
+	!elibc_glibc? ( dev-lang/rust )
+	amd64? ( >=dev-lang/nasm-2.14 )
+	x86? ( >=dev-lang/nasm-2.14 )
+	pgo? (
+		X? (
+			sys-devel/gettext
+			x11-base/xorg-server[xvfb]
+			x11-apps/xhost
+		)
+		!X? (
+			>=gui-libs/wlroots-0.15.1-r1[tinywl]
+			x11-misc/xkeyboard-config
+		)
+	)"
+COMMON_DEPEND="${FF_ONLY_DEPEND}
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/libffi:=
+	>=dev-libs/nss-3.99
+	>=dev-libs/nspr-4.35
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/mesa
+	media-video/ffmpeg
+	sys-libs/zlib
+	virtual/freedesktop-icon-theme
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/pango
+	x11-libs/pixman
+	dbus? (
+		sys-apps/dbus
+	)
+	jack? ( virtual/jack )
+	pulseaudio? (
+		|| (
+			media-libs/libpulse
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	libproxy? ( net-libs/libproxy )
+	selinux? ( sec-policy/selinux-mozilla )
+	sndio? ( >=media-sound/sndio-1.8.0-r1 )
+	system-av1? (
+		>=media-libs/dav1d-1.0.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-gfx/graphite2-1.3.13
+		>=media-libs/harfbuzz-2.8.1:0=
+	)
+	system-icu? ( >=dev-libs/icu-73.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
+	system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	valgrind? ( dev-debug/valgrind )
+	wayland? (
+		>=media-libs/libepoxy-1.5.10-r1
+		x11-libs/gtk+:3[wayland]
+		x11-libs/libxkbcommon[wayland]
+	)
+	wifi? (
+		kernel_linux? (
+			net-misc/networkmanager
+			sys-apps/dbus
+		)
+	)
+	X? (
+		virtual/opengl
+		x11-libs/cairo[X]
+		x11-libs/gtk+:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libxkbcommon[X]
+		x11-libs/libXrandr
+		x11-libs/libXtst
+		x11-libs/libxcb:=
+	)"
+RDEPEND="${COMMON_DEPEND}
+	hwaccel? (
+		media-video/libva-utils
+		sys-apps/pciutils
+	)
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )"
+DEPEND="${COMMON_DEPEND}
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libICE
+		x11-libs/libSM
+	)"
+
+S="${WORKDIR}/${PN}-${PV%_*}"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang && ! tc-ld-is-mold ; then
+		if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
+			einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
+			einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
+				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+MOZ_LANGS=(
+	af ar ast be bg br ca cak cs cy da de dsb
+	el en-CA en-GB en-US es-AR es-ES et eu
+	fi fr fy-NL ga-IE gd gl he hr hsb hu
+	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
+	pa-IN pl pt-BR pt-PT rm ro ru
+	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
+)
+
+# Firefox-only LANGS
+MOZ_LANGS+=( ach )
+MOZ_LANGS+=( an )
+MOZ_LANGS+=( az )
+MOZ_LANGS+=( bn )
+MOZ_LANGS+=( bs )
+MOZ_LANGS+=( ca-valencia )
+MOZ_LANGS+=( eo )
+MOZ_LANGS+=( es-CL )
+MOZ_LANGS+=( es-MX )
+MOZ_LANGS+=( fa )
+MOZ_LANGS+=( ff )
+MOZ_LANGS+=( fur )
+MOZ_LANGS+=( gn )
+MOZ_LANGS+=( gu-IN )
+MOZ_LANGS+=( hi-IN )
+MOZ_LANGS+=( hy-AM )
+MOZ_LANGS+=( ia )
+MOZ_LANGS+=( km )
+MOZ_LANGS+=( kn )
+MOZ_LANGS+=( lij )
+MOZ_LANGS+=( mk )
+MOZ_LANGS+=( mr )
+MOZ_LANGS+=( my )
+MOZ_LANGS+=( ne-NP )
+MOZ_LANGS+=( oc )
+MOZ_LANGS+=( sc )
+MOZ_LANGS+=( sco )
+MOZ_LANGS+=( si )
+MOZ_LANGS+=( son )
+MOZ_LANGS+=( szl )
+MOZ_LANGS+=( ta )
+MOZ_LANGS+=( te )
+MOZ_LANGS+=( tl )
+MOZ_LANGS+=( trs )
+MOZ_LANGS+=( ur )
+MOZ_LANGS+=( xh )
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_clear_vendor_checksums() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -ne 1 ]] ; then
+		die "${FUNCNAME} requires exact one argument"
+	fi
+
+	einfo "Clearing cargo checksums for ${1} ..."
+
+	sed -i \
+		-e 's/\("files":{\)[^}]*/\1/' \
+		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
+		|| die
+}
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+mozconfig_add_options_ac() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_add_options_mk() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_use_enable() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_enable "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+mozconfig_use_with() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_with "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+# This is a straight copypaste from toolchain-funcs.eclass's 'tc-ld-is-lld', and is temporarily
+# placed here until toolchain-funcs.eclass gets an official support for mold linker.
+# Please see:
+# https://github.com/gentoo/gentoo/pull/28366 ||
+# https://github.com/gentoo/gentoo/pull/28355
+tc-ld-is-mold() {
+	local out
+
+	# Ensure ld output is in English.
+	local -x LC_ALL=C
+
+	# First check the linker directly.
+	out=$($(tc-getLD "$@") --version 2>&1)
+	if [[ ${out} == *"mold"* ]] ; then
+		return 0
+	fi
+
+	# Then see if they're selecting mold via compiler flags.
+	# Note: We're assuming they're using LDFLAGS to hold the
+	# options and not CFLAGS/CXXFLAGS.
+	local base="${T}/test-tc-linker"
+	cat <<-EOF > "${base}.c"
+	int main() { return 0; }
+	EOF
+	out=$($(tc-getCC "$@") ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -Wl,--version "${base}.c" -o "${base}" 2>&1)
+	rm -f "${base}"*
+	if [[ ${out} == *"mold"* ]] ; then
+		return 0
+	fi
+
+	# No mold here!
+	return 1
+}
+
+virtwl() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	[[ $# -lt 1 ]] && die "${FUNCNAME} needs at least one argument"
+	[[ -n $XDG_RUNTIME_DIR ]] || die "${FUNCNAME} needs XDG_RUNTIME_DIR to be set; try xdg_environment_reset"
+	tinywl -h >/dev/null || die 'tinywl -h failed'
+
+	local VIRTWL VIRTWL_PID
+	coproc VIRTWL { WLR_BACKENDS=headless exec tinywl -s 'echo $WAYLAND_DISPLAY; read _; kill $PPID'; }
+	local -x WAYLAND_DISPLAY
+	read WAYLAND_DISPLAY <&${VIRTWL[0]}
+
+	debug-print "${FUNCNAME}: $@"
+	"$@"
+	local r=$?
+
+	[[ -n $VIRTWL_PID ]] || die "tinywl exited unexpectedly"
+	exec {VIRTWL[0]}<&- {VIRTWL[1]}>&-
+	return $r
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has usersandbox $FEATURES ; then
+				die "You must enable usersandbox as X server can not run as root!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6600M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm-r1_pkg_setup
+
+		if use clang && use lto && tc-ld-is-lld ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
+				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		python-any-r1_pkg_setup
+
+		# Avoid PGO profiling problems due to enviroment leakage
+		# These should *always* be cleaned up anyway
+		unset \
+			DBUS_SESSION_BUS_ADDRESS \
+			DISPLAY \
+			ORBIT_SOCKETDIR \
+			SESSION_MANAGER \
+			XAUTHORITY \
+			XDG_CACHE_HOME \
+			XDG_SESSION_COOKIE
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if use pgo ; then
+			# Update 105.0: "/proc/self/oom_score_adj" isn't enough anymore with pgo, but not sure
+			# whether that's due to better OOM handling by Firefox (bmo#1771712), or portage
+			# (PORTAGE_SCHEDULING_POLICY) update...
+			addpredict /proc
+
+			# Clear tons of conditions, since PGO is hardware-dependant.
+			addpredict /dev
+		fi
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
+			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
+		fi
+
+		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
+			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
+		fi
+
+		# Mozilla API keys (see https://location.services.mozilla.com/api)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
+			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_prepare() {
+	if use lto; then
+		rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die
+	fi
+
+	if ! use ppc64 && ! use riscv; then
+		rm -v "${WORKDIR}"/firefox-patches/*ppc64*.patch || die
+	fi
+
+	# Workaround for bgo#917599
+	if has_version ">=dev-libs/icu-74.1" && use system-icu ; then
+		eapply "${WORKDIR}"/firefox-patches/*-bmo-1862601-system-icu-74.patch
+	fi
+	rm -v "${WORKDIR}"/firefox-patches/*-bmo-1862601-system-icu-74.patch || die
+
+	# Workaround for bgo#915651 on musl
+	if use elibc_glibc ; then
+		rm -v "${WORKDIR}"/firefox-patches/*bgo-748849-RUST_TARGET_override.patch || die
+	fi
+
+	eapply "${WORKDIR}/firefox-patches"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Make cargo respect MAKEOPTS
+	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
+
+	# Workaround for bgo#915651
+	if ! use elibc_glibc ; then
+		if use amd64 ; then
+			export RUST_TARGET="x86_64-unknown-linux-musl"
+		elif use x86 ; then
+			export RUST_TARGET="i686-unknown-linux-musl"
+		else
+			die "Unknown musl chost, please post your rustc -vV along with emerge --info on Gentoo's bug #915651"
+		fi
+	fi
+
+	# Make LTO respect MAKEOPTS
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure || die "Failed sedding multiprocessing.cpu_count"
+
+	# Make ICU respect MAKEOPTS
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/intl/icu_sources_data.py || die "Failed sedding multiprocessing.cpu_count"
+
+	# Respect MAKEOPTS all around (maybe some find+sed is better)
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/python/mozbuild/mozbuild/base.py || die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/third_party/libwebrtc/build/toolchain/get_cpu_count.py || die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/third_party/libwebrtc/build/toolchain/get_concurrent_links.py || die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/third_party/python/gyp/pylib/gyp/input.py || die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/python/mozbuild/mozbuild/code_analysis/mach_commands.py || die "Failed sedding multiprocessing.cpu_count"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
+		|| die "sed failed to set toolchain prefix"
+
+	sed -i \
+		-e 's/ccache_stats = None/return None/' \
+		"${S}"/python/mozbuild/mozbuild/controller/building.py \
+		|| die "sed failed to disable ccache stats call"
+
+	einfo "Removing pre-built binaries ..."
+
+	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Clear checksums from cargo crates we've manually patched.
+	# moz_clear_vendor_checksums xyz
+	moz_clear_vendor_checksums proc-macro2
+
+	# Respect choice for "jumbo-build"
+	# Changing the value for FILES_PER_UNIFIED_FILE may not work, see #905431
+	if [[ -n ${FILES_PER_UNIFIED_FILE} ]] && use jumbo-build; then
+		local my_files_per_unified_file=${FILES_PER_UNIFIED_FILE:=16}
+		elog ""
+		elog "jumbo-build defaults modified to ${my_files_per_unified_file}."
+		elog "if you get a build failure, try undefining FILES_PER_UNIFIED_FILE,"
+		elog "if that fails try -jumbo-build before opening a bug report."
+		elog ""
+
+		sed -i -e "s/\"FILES_PER_UNIFIED_FILE\", 16/\"FILES_PER_UNIFIED_FILE\", "${my_files_per_unified_file}"/" python/mozbuild/mozbuild/frontend/data.py ||
+			die "Failed to adjust FILES_PER_UNIFIED_FILE in python/mozbuild/mozbuild/frontend/data.py"
+		sed -i -e "s/FILES_PER_UNIFIED_FILE = 6/FILES_PER_UNIFIED_FILE = "${my_files_per_unified_file}"/" js/src/moz.build ||
+			die "Failed to adjust FILES_PER_UNIFIED_FILE in js/src/moz.build"
+	fi
+
+	# Create build dir
+	BUILD_DIR="${WORKDIR}/${PN}_build"
+	mkdir -p "${BUILD_DIR}" || die
+
+	# Write API keys to disk
+	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
+	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
+	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	local have_switched_compiler=
+	if use clang; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+
+		local version_clang=$(clang --version 2>/dev/null | grep -F -- 'clang version' | awk '{ print $3 }')
+		[[ -n ${version_clang} ]] && version_clang=$(ver_cut 1 "${version_clang}")
+		[[ -z ${version_clang} ]] && die "Failed to read clang version!"
+
+		if tc-is-gcc; then
+			have_switched_compiler=yes
+		fi
+
+		AR=llvm-ar
+		CC=${CHOST}-clang-${version_clang}
+		CXX=${CHOST}-clang++-${version_clang}
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain,
+	# AS is used in a non-standard way by upstream, #bmo1654031
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	export AS="$(tc-getCC) -c"
+
+	# Configuration tests expect llvm-readelf output, bug 913130
+	READELF="llvm-readelf"
+
+	tc-export CC CXX LD AR AS NM OBJDUMP RANLIB READELF PKG_CONFIG
+
+	# Pass the correct toolchain paths through cbindgen
+	if tc-is-cross-compiler ; then
+		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
+	fi
+
+	# Set MOZILLA_FIVE_HOME
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set state path
+	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	# Initialize MOZCONFIG
+	mozconfig_add_options_ac '' --enable-application=browser
+	mozconfig_add_options_ac '' --enable-project=browser
+
+	# Set Gentoo defaults
+	if use telemetry; then
+		export MOZILLA_OFFICIAL=1
+	fi
+
+	mozconfig_add_options_ac 'Gentoo default' \
+		--allow-addon-sideload \
+		--disable-cargo-incremental \
+		--disable-crashreporter \
+		--disable-disk-remnant-avoidance \
+		--disable-gpsd \
+		--disable-install-strip \
+		--disable-legacy-profile-creation \
+		--disable-parental-controls \
+		--disable-strip \
+		--disable-tests \
+		--disable-updater \
+		--disable-wmf \
+		--enable-negotiateauth \
+		--enable-new-pass-manager \
+		--enable-official-branding \
+		--enable-release \
+		--enable-system-ffi \
+		--enable-system-pixman \
+		--enable-system-policies \
+		--host="${CBUILD:-${CHOST}}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--target="${CHOST}" \
+		--without-ccache \
+		--without-wasm-sandboxed-libraries \
+		--with-intl-api \
+		--with-libclang-path="$(llvm-config --libdir)" \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system \
+		--x-includes="${ESYSROOT}/usr/include" \
+		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
+
+	# Set update channel
+	local update_channel=release
+	[[ -n ${MOZ_ESR} ]] && update_channel=esr
+	mozconfig_add_options_ac '' --update-channel=${update_channel}
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		mozconfig_add_options_ac '' --enable-rust-simd
+	fi
+
+	# For future keywording: This is currently (97.0) only supported on:
+	# amd64, arm, arm64 & x86.
+	# Might want to flip the logic around if Firefox is to support more arches.
+	# bug 833001, bug 903411#c8
+	if use ppc64 || use riscv; then
+		mozconfig_add_options_ac '' --disable-sandbox
+	elif use valgrind; then
+		mozconfig_add_options_ac 'valgrind requirement' --disable-sandbox
+	else
+		mozconfig_add_options_ac '' --enable-sandbox
+	fi
+
+	# Enable JIT on riscv64 explicitly
+	# Can be removed once upstream enable it by default in the future.
+	use riscv && mozconfig_add_options_ac 'Enable JIT for RISC-V 64' --enable-jit
+
+	if [[ -s "${S}/api-google.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
+	else
+		einfo "Building without Google API key ..."
+	fi
+
+	if [[ -s "${S}/api-location.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-location-service-api-keyfile="${S}/api-location.key"
+	else
+		einfo "Building without Location API key ..."
+	fi
+
+	if [[ -s "${S}/api-mozilla.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
+	else
+		einfo "Building without Mozilla API key ..."
+	fi
+
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libevent
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-png
+	mozconfig_use_with system-webp
+
+	mozconfig_use_enable dbus
+	mozconfig_use_enable libproxy
+	mozconfig_use_enable valgrind
+
+	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
+
+	mozconfig_use_enable geckodriver
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+
+		# Increase the FORTIFY_SOURCE value, #910071.
+		sed -i -e '/-D_FORTIFY_SOURCE=/s:2:3:' "${S}"/build/moz.configure/toolchain.configure || die
+	fi
+
+	local myaudiobackends=""
+	use jack && myaudiobackends+="jack,"
+	use sndio && myaudiobackends+="sndio,"
+	use pulseaudio && myaudiobackends+="pulseaudio,"
+	! use pulseaudio && myaudiobackends+="alsa,"
+
+	mozconfig_add_options_ac '--enable-audio-backends' --enable-audio-backends="${myaudiobackends::-1}"
+
+	mozconfig_use_enable wifi necko-wifi
+
+	! use jumbo-build && mozconfig_add_options_ac '--disable-unified-build' --disable-unified-build
+
+	if use X && use wayland ; then
+		mozconfig_add_options_ac '+x11+wayland' --enable-default-toolkit=cairo-gtk3-x11-wayland
+	elif ! use X && use wayland ; then
+		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland-only
+	else
+		mozconfig_add_options_ac '+x11' --enable-default-toolkit=cairo-gtk3-x11-only
+	fi
+
+	# LTO is handled via configure
+	filter-lto
+
+	if use lto ; then
+		if use clang ; then
+			# Upstream only supports lld or mold when using clang.
+			if tc-ld-is-mold ; then
+				# mold expects the -flto line from *FLAGS configuration, bgo#923119
+				append-ldflags "-flto=thin"
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+			fi
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+
+		else
+			# ThinLTO is currently broken, see bmo#1644409.
+			# mold does not support gcc+lto combination.
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		fi
+
+		if use pgo ; then
+			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
+
+			if use clang ; then
+				# Used in build/pgo/profileserver.py
+				export LLVM_PROFDATA="llvm-profdata"
+			fi
+		fi
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# lld is upstream's default
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+			fi
+
+		else
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "linker is set to bfd due to USE=-clang" --enable-linker=bfd
+			fi
+		fi
+	fi
+
+	mozconfig_use_enable debug
+	if use debug ; then
+		mozconfig_add_options_ac '+debug' --disable-optimize
+		mozconfig_add_options_ac '+debug' --enable-real-time-tracing
+	else
+		mozconfig_add_options_ac 'Gentoo defaults' --disable-real-time-tracing
+
+		if is-flag '-g*' ; then
+			if use clang ; then
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
+			else
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
+			fi
+		else
+			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
+		fi
+
+		if is-flag '-O0' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
+		elif is-flag '-O4' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
+		elif is-flag '-O3' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
+		elif is-flag '-O1' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
+		elif is-flag '-Os' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
+		else
+			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
+		fi
+	fi
+
+	# Debug flag was handled via configure
+	filter-flags '-g*'
+
+	# Optimization flag was handled via configure
+	filter-flags '-O*'
+
+	# Modifications to better support ARM, bug #553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
+				--with-thumb=yes \
+				--with-thumb-interwork=no
+		fi
+	fi
+
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
+
+		if ! use system-libvpx ; then
+			sed -i \
+				-e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build \
+				|| die
+		fi
+	fi
+
+	# elf-hack
+	# Filter "-z,pack-relative-relocs" and let the build system handle it instead. 
+	if use amd64 || use x86 ; then
+		filter-flags "-z,pack-relative-relocs"
+
+		if tc-ld-is-mold ; then
+			# relr-elf-hack is currently broken with mold, bgo#916259
+			mozconfig_add_options_ac 'disable elf-hack with mold linker' --disable-elf-hack
+		else
+			mozconfig_add_options_ac 'relr elf-hack' --enable-elf-hack=relr
+		fi
+	elif use ppc64 || use riscv ; then
+		# '--disable-elf-hack' is not recognized on ppc64/riscv,
+		# see bgo #917049, #930046
+		:;
+	else
+		mozconfig_add_options_ac 'disable elf-hack on non-supported arches' --disable-elf-hack
+	fi
+
+	# Additional ARCH support
+	case "${ARCH}" in
+		arm)
+			# Reduce the memory requirements for linking
+			if use clang ; then
+				# Nothing to do
+				:;
+			elif use lto ; then
+				append-ldflags -Wl,--no-keep-memory
+			else
+				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+			fi
+			;;
+	esac
+
+	if ! use elibc_glibc; then
+		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
+	fi
+
+	if use valgrind; then
+		mozconfig_add_options_ac 'valgrind requirement' --disable-jemalloc
+	fi
+
+	# System-av1 fix
+	use system-av1 && append-ldflags "-Wl,--undefined-version"
+
+	# Allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	# Make revdep-rebuild.sh happy; Also required for musl
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+
+	# Use system's Python environment
+	export PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
+
+	if use system-python-libs; then
+		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="system"
+	else
+		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
+	fi
+
+	if ! use telemetry; then
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_CRASHREPORTER=0"
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_DATA_REPORTING=0"
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_SERVICES_HEALTHREPORT=0"
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_TELEMETRY_REPORTING=0"
+	fi
+
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# Portage sets XARGS environment variable to "xargs -r" by default which
+	# breaks build system's check_prog() function which doesn't support arguments
+	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
+
+	# Set build dir
+	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
+
+	# Show flags we will use
+	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	# Handle EXTRA_CONF and show summary
+	local ac opt hash reason
+
+	# Apply EXTRA_ECONF entries to $MOZCONFIG
+	if [[ -n ${EXTRA_ECONF} ]] ; then
+		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
+		for opt in "${ac[@]}"; do
+			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
+		done
+	fi
+
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
+		[[ -z ${hash} || ${hash} == \# ]] \
+			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
+		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
+	done
+	echo "=========================================================="
+	echo
+
+	if use valgrind; then
+		sed -i -e 's/--enable-optimize=-O[0-9s]/--enable-optimize="-g -O2"/' .mozconfig || die
+	fi
+
+	./mach configure || die
+}
+
+src_compile() {
+	local virtx_cmd=
+
+	if tc-ld-is-mold && use lto; then
+		# increase ulimit with mold+lto, bugs #892641, #907485
+		if ! ulimit -n 16384 1>/dev/null 2>&1 ; then
+			ewarn "Unable to modify ulimits - building with mold+lto might fail due to low ulimit -n resources."
+			ewarn "Please see bugs #892641 & #907485."
+		else
+			ulimit -n 16384
+		fi
+	fi
+
+	if use pgo; then
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+
+		if ! use X; then
+			virtx_cmd=virtwl
+		else
+			virtx_cmd=virtx
+		fi
+	fi
+
+	if ! use X; then
+		local -x GDK_BACKEND=wayland
+	else
+		local -x GDK_BACKEND=x11
+	fi
+
+	${virtx_cmd} ./mach build --verbose || die
+}
+
+src_install() {
+	# xpcshell is getting called during install
+	pax-mark m \
+		"${BUILD_DIR}"/dist/bin/xpcshell \
+		"${BUILD_DIR}"/dist/bin/${PN} \
+		"${BUILD_DIR}"/dist/bin/plugin-container
+
+	DESTDIR="${D}" ./mach install || die
+
+	# Upstream cannot ship symlink but we can (bmo#658850)
+	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
+	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
+		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/distribution.ini distribution.ini
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
+
+	# Set dictionary path to use system hunspell
+	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
+	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
+	EOF
+
+	# Force hwaccel prefs if USE=hwaccel is enabled
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-r2 \
+		>>"${GENTOO_PREFS}" \
+		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
+
+		if use wayland; then
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel wayland prefs"
+			pref("gfx.x11-egl.force-enabled",          false);
+			EOF
+		else
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel x11 prefs"
+			pref("gfx.x11-egl.force-enabled",          true);
+			EOF
+		fi
+
+		# Install the vaapitest binary on supported arches (122.0 supports all platforms, bmo#1865969)
+		exeinto "${MOZILLA_FIVE_HOME}"
+		doexe "${BUILD_DIR}"/dist/bin/vaapitest
+
+		# Install the v4l2test on supported arches (+ arm, + riscv64 when keyworded)
+		if use arm64 ; then
+			exeinto "${MOZILLA_FIVE_HOME}"
+			doexe "${BUILD_DIR}"/dist/bin/v4l2test
+		fi
+	fi
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
+	if use system-harfbuzz ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
+		sticky_pref("gfx.font_rendering.graphite.enabled", true);
+		EOF
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install geckodriver
+	if use geckodriver ; then
+		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
+		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
+		exeinto "${MOZILLA_FIVE_HOME}"
+		doexe "${BUILD_DIR}"/dist/bin/geckodriver
+
+		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
+	fi
+
+	# Install icons
+	local icon_srcdir="${S}/browser/branding/official"
+	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^}"
+	local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop"
+	local desktop_filename="${PN}.desktop"
+	local exec_command="${PN}"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" \
+		|| die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" \
+		|| die
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# does not need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		einfo "APULSE found; Generating library symlinks for sound support ..."
+		local lib
+		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# A quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+
+	# bug 835078
+	if use hwaccel && has_version "x11-drivers/xf86-video-nouveau"; then
+		ewarn "You have nouveau drivers installed in your system and 'hwaccel' "
+		ewarn "enabled for Firefox. Nouveau / your GPU might not support the "
+		ewarn "required EGL, so either disable 'hwaccel' or try the workaround "
+		ewarn "explained in https://bugs.gentoo.org/835078#c5 if Firefox crashes."
+	fi
+
+	readme.gentoo_print_elog
+
+	optfeature_header "Optional programs for extra features:"
+	optfeature "desktop notifications" x11-libs/libnotify
+	optfeature "fallback mouse cursor theme e.g. on WMs" gnome-base/gsettings-desktop-schemas
+	optfeature "screencasting with pipewire" sys-apps/xdg-desktop-portal
+	if use hwaccel && has_version "x11-drivers/nvidia-drivers"; then
+		optfeature "hardware acceleration with NVIDIA cards" media-libs/nvidia-vaapi-driver
+	fi
+
+	if ! has_version "sys-libs/glibc"; then
+		elog
+		elog "glibc not found! You won't be able to play DRM content."
+		elog "See Gentoo bug #910309 or upstream bug #1843683."
+		elog
+	fi
+}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 5531bdc7a805..d4bb27e9b946 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest
index 13cf3257e3ae..48425ea59c65 100644
--- a/www-servers/gunicorn/Manifest
+++ b/www-servers/gunicorn/Manifest
@@ -1,3 +1,5 @@
 DIST gunicorn-21.2.0.gh.tar.gz 361112 BLAKE2B 94c868435ecca25d4c83e348bff219d26f53fe28e15d284c00f6f981ee88a5a32e802014b121f1314ec337684fa7bb37fcc21e2ec2aeab4275e526aa84f22677 SHA512 47c21293bd5340e43074c87694d13241b2867437ad993b204ee4bd21ea923350763a424b3f7ce59737b10cd526d12127b1ae95ef60410eca9924605b522d637c
+DIST gunicorn-22.0.0.gh.tar.gz 368152 BLAKE2B 9d3e2955140d299af86b9370c352d0d7ae2b631a5cdf72200550d3ac8b2e5f51edbc686475d3507f8dfb5f4249ef261e29a6d5fa172e5356777297f5497c7c20 SHA512 cb366cfc2875a32e1e6ddd3bd521650cb87a51c29b036b2cfbd9f8371307d1ffefafbcc85d45753c29186a92def77112e2ddd49fdc2116d2d32702635e88ba53
 EBUILD gunicorn-21.2.0.ebuild 1118 BLAKE2B cd24e33e02efaa1e476727b297f744ef9f63cb71eec48c03fbcf8d99702933acff44c9f82c6e5d1c5c397f6d21a6c547aeb96ac66f08b0fcd8537170fcd1b893 SHA512 033f5be0cd6644c9c2d0f837c5f6860dc7d21e429900571f52dc65edd597167fc33575160dd277bfedf27cc10f8e7b230c3aa688962f66573cf6fdd6a16b5d34
+EBUILD gunicorn-22.0.0.ebuild 1109 BLAKE2B d5c8984ee07d51e8d3b4f03682e751b96c3396bfcbf2f71245f35da2a89d54ef774d75c3625a322e599020390e8dfcd65dc3d33e347a20a5602b0327adb14e2f SHA512 c27322044eb83c7d3a7ef075eac90cefe34deb82c7db666cc041f51bd77053ed9e9cd32dc89a00c06f9eac4533cc4c1aa3758340fe89f8b95dbf3221d3c3ace7
 MISC metadata.xml 821 BLAKE2B aa75468eafd9c717f3b3b55b4c91917cd94e612f591e752c93bec95b57e5abd4f46fd98de88c52ca5c624dc00f6d45afbd03f04743f962f87be9321902142712 SHA512 c7746b7036159f99a67dcc688a839ec06adf85d2bfb2214a2ec0b961bfcbd9a72fb5f2dd66dc3868f0d50e5d99386e4a4251f872afd7ad932dc4cca6fc33dff3
diff --git a/www-servers/gunicorn/gunicorn-22.0.0.ebuild b/www-servers/gunicorn/gunicorn-22.0.0.ebuild
new file mode 100644
index 000000000000..d8eb6eabad27
--- /dev/null
+++ b/www-servers/gunicorn/gunicorn-22.0.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="A WSGI HTTP Server for UNIX"
+HOMEPAGE="
+	https://gunicorn.org/
+	https://github.com/benoitc/gunicorn/
+	https://pypi.org/project/gunicorn/
+"
+SRC_URI="
+	https://github.com/benoitc/gunicorn/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT PSF-2 doc? ( BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+"
+
+DOCS=( README.rst )
+
+distutils_enable_sphinx 'docs/source' --no-autodoc
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# removed deps
+		tests/workers/test_geventlet.py
+		tests/workers/test_ggevent.py
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -o addopts=
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/source/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 28ffa474e2ef..6dc8565d3d8c 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -15,6 +15,7 @@ DIST modsecurity-nginx-1.0.3.tar.gz 34063 BLAKE2B 859a29eb7f67d53a818578f1008f0d
 DIST nginx-1.24.0.tar.gz 1112471 BLAKE2B 7f671c57666dec822bff72fcf0e4eec35ecf981b8f1e489827f9bbbf9179036f61c9fdc7e497c076ccaeb35b9ba3dfe7684e4fc91ee9cae52601f68859bb034d SHA512 1114e37de5664a8109c99cfb2faa1f42ff8ac63c932bcf3780d645e5ed32c0b2ac446f80305b4465994c8f9430604968e176ae464fd80f632d1cb2c8f6007ff3
 DIST nginx-1.25.3.tar.gz 1216580 BLAKE2B f7a77b92b80197ce6cff477dac42169d638f69a4a408e979daa4f5e87ca0e4d18e366b8c2b0fc686cd69f5f926b5b097a8893f3c5295387bcc6f174a2f72e7f4 SHA512 46fcbf6b540a2e47f192453b9686a701e3abe5a41a3275e36c9fca6c3f9ef0aa8d705cc5ad63257d662a5432109e4ce125d330cdeb547914bceac19e885dba1f
 DIST nginx-1.25.4.tar.gz 1236273 BLAKE2B 3236751f9e7ced1a6b79e957c7a4cf19070bf430a30b322b09924a72574ad514bf2989829d5da599c6058fc5f8673b2ad608a3bd57380578883f2c091ff70983 SHA512 72a4aa8ed675f5a27ac723a73e556bbb5ae979a2fe79f9c2f4fb20bd7e719c797af8e2868044b7f2cf58be2a351a268599c8eb1e66719098d4142abab7632bb5
+DIST nginx-1.25.5.tar.gz 1244060 BLAKE2B 75ff068554d96063d1c7cb18d84df4fe8b820f6065f3464efde055c707e94ff13c45bea261619a453f04abed1fa3f9baccf81c29ca0e956ef0535e9a5c931dc6 SHA512 4a069ec08af46e42a72e263291fc84a67605d817ece1ea7092a5da5babced96ef27eb370ad6f7558b2f5973406080240080aaf4b27fc2d8b41f6853601563cb7
 DIST nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz 18457 BLAKE2B 22225ca9e5299b20ab5a93a001cac48e446bd86b3a24ac49e716bc975b128890bdb4b0dbbf5730fbaaeadfd958160093c7a6af798dd0e6de27062f149a760333 SHA512 ec59637fda5acac053e815cb1d04b545fc6b765e5ec63d8c2c9c301abad87afaa2698145acac08e9e14c91e1423ebff7aff0cca2b940b19ccccbf4cf53973269
 DIST nginx-tests-24482e311749.tar.gz 282605 BLAKE2B 987b3a224966fbe44ccdd0375aa6b09b683738b6531599259cbea03491c056e4f4dd8e67b6f51555db936e8f0e93cfc669d8a884082d6015c5fd5f8b2dcf6207 SHA512 80d163226bdbfcf4bd8556316a1dcc5b048fa87357f83f5cac3b13917043dad0c96b9bc67ac886b421cc4954ddf7603256fe77d85fda406f8ed8c9231fc1cf3e
 DIST nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 124047 BLAKE2B d37ef9a15c91abe3c6258e420d1f99fa452f9d9966a0e13102174973314a3bac5413957a5fe632a9dcb1163b3be5df8116e05cc053ee061e19319ec25f341570 SHA512 6c1bfdcf89884b2855d51ae7da0f6e53a4ca3629e1aaf58433b70c07dcb2af797ba6e87d9b3eb4fe2fb6d4d697e862f2b4c2f8d8b3fdaea201740c97ec936529
@@ -42,9 +43,11 @@ DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4
 DIST ngx_rtmp-1.2.2.tar.gz 519934 BLAKE2B 8745816b879f506720955d6c7e5e8af036e88b3601a680071ffb255a3ec31d69e132b5cc8b493202fa985eb30b8529428f683b5154a0054c0ee990d3185c7abf SHA512 3f8c803221854c4b1a06aadc6313fbfec74bd7179c0ee51d4365b26ffa8875881a6e1e48f777a9c9efbb9170ab7478a82920d5448a2c2df485503d37bb03ab81
 DIST njs-0.7.12.tar.gz 662554 BLAKE2B 3e925dbbd5e664fc083b3147b6fa353744ab45b50cb2d3feb3f1cf5a4c024440c24b7af08e8a285db7b8e4b48efc776a8a1cb78c6d7ff79d011e127a61e09f6c SHA512 a65a6c6aa3fbd499536284f8d8610f61b87112156885e6c3b1f73872df22195af897766f266b4569098a70e1680aef66594da17d13519f16687b4e43dce49062
 DIST njs-0.8.2.tar.gz 733916 BLAKE2B 08dcaae18d5bf9b4294cb49d001549d5476176599a45c84d255f456ebbf16dad40a33be18c48f303984f7fce1fc0c397b454ffaf71f985ae9ff55e81e63cb2fd SHA512 2fdaa1953d0ea9f639fcba1077b47a98c58f9d287d4c41b2551b1540279c7e4549c254f86b38ddd81b7d69adaf13bd7dd86e8d75da1c432f0d096285aa3f2363
+DIST njs-0.8.4.tar.gz 743910 BLAKE2B cad96f0e7ccac928506bc7822310750921b7ebb1ed87903a6335988b3e42b264179b699455439140c80afd9f93ecb63877cc7327919ebb29d7ad391e9d378367 SHA512 450f6866141f6f370767149c8749e84c4373f401d6d2237ca85365a851ebe7bdbd8a3c25e85a55747673e8bef2238a979dd237d5fc5c641b2f3f2cf7f26dffc8
 EBUILD nginx-1.24.0-r1.ebuild 40459 BLAKE2B 5df8b1d18042d471bb3b7ad76778b77ff14a9295ca7148f13190bda6a01508a53748bb636392984f13aef1a0cafe893f140bc009dfcca17828889277b41c71c5 SHA512 d4cf46bc5f283038a676bd013773d78d8ea6127dd598d00d5d1d9225785f6fdf520a9e3b2211ca06c63856f3f27a8507fa9eef000a5ec3da6d2cf696b9303af1
-EBUILD nginx-1.24.0-r2.ebuild 41292 BLAKE2B 70caa3690962b4a6f89b2927cc7544bdc2df110455bfc17e2dcb8f4ca6af0c29068f49bed2e488969b7f76167c7231609113159c213eb6156c87cf8bd1c346a0 SHA512 18f8a2be69f09ecd07393f25e3ba9d5033303e6065b0e2f263259a16191b7bc86b7e05bec0657643cbc5036fcba5a2381dd59ea94d6654aae1e56f8f64abcfba
+EBUILD nginx-1.24.0-r2.ebuild 41316 BLAKE2B 768ef4c66701d551b829833f67100ca599bea6b57aa02c934d508ff50e60c952e61b3655d361019017e4fd966cc1fdc1fba84af23a496346b30450d9f9febfe7 SHA512 11abc60df7e88eabbcca66ea244e990b07b5e583e32200a26bf9cc9783f07b87a74ca1a54bf556259c60c0b0a182ad8a882d0d4140a39e042348ed389382f68c
 EBUILD nginx-1.25.3-r1.ebuild 41620 BLAKE2B 76565a70bfbaab858300e676bc601dade800d4cf9460e9bea5e2d6b23179dfd7f7b0a76dcfc067cb38da48545c217b50eadc5f9527aadf90eabf5167368b6f69 SHA512 26992c1961f28af890da3234f29e98a662b5545b392ec7ed9f995aa938b884fa424797e9e2c8f6320259409ea4c070ca5189e2fc7cfd4d2954c55976b9f9018a
 EBUILD nginx-1.25.3.ebuild 40770 BLAKE2B fc42b1bf841ec600966cbc18c686af69a6d83db79cc233ff5577b254d3f72d6651ce2d089c9004efc5fffe18f0e49b2ac9144e73b25265497394aa325a443d74 SHA512 89fafb69c30378c33f17f1b24101b787d87b42bec9a85faaa69ada8c52a91f38eed117adf8cc25810b0a65cf09691a472d4d5e39e64d6edc41b76be53113fed6
-EBUILD nginx-1.25.4.ebuild 41634 BLAKE2B fd0b3f3f90d496d2ff315fe85cb7ecf122ed8416ac2ed670935479dc9a4d2969df9e955323f7fdc13704e6353f1afbeb371e9f10957197c1f16fcb459ddf5ffd SHA512 03c47dff1961b8ccdce33631b27320c8ee5c6c3b8e9021de263cd077b1aeabab44530c09256e37d8b7af195139523035846f71d0b5daaa66aff0eba2a1c847b3
+EBUILD nginx-1.25.4.ebuild 41631 BLAKE2B 569191c209da42e1aed12e043728ef12ad21d6ad196b1f110a9f70fda74db0b0d5378adfefe4242eb28974c76435677d78529c06d223dc622c5db32b20c0cea1 SHA512 07006e7a5c57aa3d8f8593b3584ed53227a19b69e45bcab71be891baa10306db069f88a6184cb512d68f52a0bb3960934fb12f8b3be95097fc02e5f0cf32cf48
+EBUILD nginx-1.25.5.ebuild 41634 BLAKE2B 749c0d5d2ba008d3851291450b5b298e8480227d76dbd08cb11966e93c917315714a3d55e5884d6beef60e4547176af5d2fc57c433c1c3813c0c651ca6fc2c4c SHA512 e0a2dffed6dec8fc425a7a48dbbc18655b9e8d1c1e1f01ba88f743d32f90db094303ee7fa6a266ddd4fb00f8b5e12b4e98b0b04b593f55d70bc9aae52cbe581b
 MISC metadata.xml 1189 BLAKE2B 9e65f404d2be335d14ffb087be60847a2508de79baae7ee0e3bd7021dbfbbc1f18b93ed758d107ef3a9738ab32889f106a5eb8232f8f4190d57c175eed60ddd5 SHA512 8077d4da43250c5cc783451682047460b093cf1e751e0b0d75a21bb42baf83fd31b1bb3a574ed6e7ab89286afb331c23915c676ed80c7b4cc5fd9f84a40da893
diff --git a/www-servers/nginx/nginx-1.24.0-r2.ebuild b/www-servers/nginx/nginx-1.24.0-r2.ebuild
index bb53b28c567f..18a7c23a6c61 100644
--- a/www-servers/nginx/nginx-1.24.0-r2.ebuild
+++ b/www-servers/nginx/nginx-1.24.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -213,7 +213,7 @@ LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
 	nginx_modules_http_push_stream? ( GPL-3 )"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 RESTRICT="!test? ( test )"
 
diff --git a/www-servers/nginx/nginx-1.25.4.ebuild b/www-servers/nginx/nginx-1.25.4.ebuild
index 25a807d6806b..6e81dcda84b8 100644
--- a/www-servers/nginx/nginx-1.25.4.ebuild
+++ b/www-servers/nginx/nginx-1.25.4.ebuild
@@ -213,7 +213,7 @@ LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
 	nginx_modules_http_push_stream? ( GPL-3 )"
 
 SLOT="mainline"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RESTRICT="!test? ( test )"
 
diff --git a/www-servers/nginx/nginx-1.25.5.ebuild b/www-servers/nginx/nginx-1.25.5.ebuild
new file mode 100644
index 000000000000..f5bb4dfa7402
--- /dev/null
+++ b/www-servers/nginx/nginx-1.25.5.ebuild
@@ -0,0 +1,1112 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainer notes:
+# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
+# - any http-module activates the main http-functionality and overrides USE=-http
+# - keep the following requirements in mind before adding external modules:
+#	* alive upstream
+#	* sane packaging
+#	* builds cleanly
+#	* does not need a patch for nginx core
+# - Update NGINX_TESTS_REV to the current available revision and run tests.
+# - TODO: test the google-perftools module (included in vanilla tarball)
+
+# prevent perl-module from adding automagic perl DEPENDs
+GENTOO_DEPEND_ON_PERL="no"
+
+# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
+DEVEL_KIT_MODULE_PV="0.3.1"
+DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
+DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+
+# ngx_brotli (https://github.com/google/ngx_brotli, BSD-2)
+HTTP_BROTLI_MODULE_PV="1.0.0rc"
+HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+HTTP_BROTLI_MODULE_URI="https://github.com/google/ngx_brotli/archive/v${HTTP_BROTLI_MODULE_PV}.tar.gz"
+HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+
+# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
+HTTP_UPLOAD_PROGRESS_MODULE_PV="68b3ab3b64a0cee7f785d161401c8be357bbed12"
+HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
+HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+
+# http_headers_more (https://github.com/openresty/headers-more-nginx-module, BSD license)
+HTTP_HEADERS_MORE_MODULE_PV="0.34"
+HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
+HTTP_HEADERS_MORE_MODULE_URI="https://github.com/openresty/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
+HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
+
+# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
+HTTP_CACHE_PURGE_MODULE_PV="2.3"
+HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
+HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+
+# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
+HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
+HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
+HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+
+# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
+HTTP_FANCYINDEX_MODULE_PV="0.4.4"
+HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
+HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+
+# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
+HTTP_LUA_MODULE_PV="0.10.25"
+HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
+HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
+HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
+LUA_COMPAT=( luajit )
+
+# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
+HTTP_AUTH_PAM_MODULE_PV="1.5.2"
+HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
+HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
+HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
+
+# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
+HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
+HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
+HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+
+# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
+HTTP_METRICS_MODULE_PV="0.1.1"
+HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+HTTP_METRICS_MODULE_URI="https://github.com/liquidm/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
+HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+
+# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="0.2.1"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/v${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
+
+# naxsi-core (https://github.com/wargio/naxsi, GPL-3)
+HTTP_NAXSI_MODULE_PV="4140b2ded624eb36f04c783c460379b9403012d0"
+HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
+HTTP_NAXSI_MODULE_URI="https://github.com/wargio/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
+HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
+HTTP_NAXSI_LIBINJECTION_MODULE_PV="49904c42a6e68dc8f16c022c693e897e4010a06c"
+HTTP_NAXSI_LIBINJECTION_MODULE_P="ngx_http_naxsi_libinjection-${HTTP_NAXSI_LIBINJECTION_MODULE_PV}"
+HTTP_NAXSI_LIBINJECTION_MODULE_URI="https://github.com/libinjection/libinjection/archive/${HTTP_NAXSI_LIBINJECTION_MODULE_PV}.tar.gz"
+
+# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
+RTMP_MODULE_PV="1.2.2"
+RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
+RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
+RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
+
+# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
+HTTP_DAV_EXT_MODULE_PV="3.0.0"
+HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
+HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
+HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
+
+# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
+HTTP_ECHO_MODULE_PV="0.63"
+HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
+HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
+HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
+
+# modsecurity for nginx (https://github.com/SpiderLabs/ModSecurity-nginx, https://github.com/SpiderLabs/ModSecurity, Apache-2.0)
+HTTP_SECURITY_MODULE_PV="1.0.3"
+HTTP_SECURITY_MODULE_P="modsecurity-nginx-${HTTP_SECURITY_MODULE_PV}"
+HTTP_SECURITY_MODULE_URI="https://github.com/SpiderLabs/ModSecurity-nginx/archive/refs/tags/v${HTTP_SECURITY_MODULE_PV}.tar.gz"
+HTTP_SECURITY_MODULE_WD="${WORKDIR}/ModSecurity-nginx-${HTTP_SECURITY_MODULE_PV}"
+
+# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
+HTTP_PUSH_STREAM_MODULE_PV="8c02220d484d7848bc8e3a6d9b1c616987e86f66"
+HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
+HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
+HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
+
+# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
+HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
+HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
+HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
+HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
+
+# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
+HTTP_MOGILEFS_MODULE_PV="1.0.4"
+HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
+HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+
+# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
+HTTP_MEMC_MODULE_PV="0.19"
+HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
+HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
+HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
+
+# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
+HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
+HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
+HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+
+# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
+GEOIP2_MODULE_PV="3.4"
+GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
+GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
+GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
+
+# njs-module (https://github.com/nginx/njs, as-is)
+NJS_MODULE_PV="0.8.4"
+NJS_MODULE_P="njs-${NJS_MODULE_PV}"
+NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
+NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
+
+# nginx-tests (http://hg.nginx.org/nginx-tests, BSD-2)
+NGINX_TESTS_REV="24482e311749"
+
+# We handle deps below ourselves
+SSL_DEPS_SKIP=1
+AUTOTOOLS_AUTO_DEPEND="no"
+
+inherit autotools lua-single multiprocessing ssl-cert toolchain-funcs perl-module systemd pax-utils
+
+DESCRIPTION="Robust, small and high performance http and reverse proxy server"
+HOMEPAGE="https://nginx.org"
+SRC_URI="https://nginx.org/download/${P}.tar.gz
+	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
+	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
+	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
+	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
+	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
+	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
+	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
+	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
+	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
+	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
+	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
+	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
+	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
+	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
+	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
+	nginx_modules_http_naxsi? (
+		${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz
+		${HTTP_NAXSI_LIBINJECTION_MODULE_URI} -> ${HTTP_NAXSI_LIBINJECTION_MODULE_P}.tar.gz
+	)
+	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
+	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
+	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
+	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
+	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
+	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
+	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
+	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
+	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
+	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )
+	test? ( https://hg.nginx.org/nginx-tests/archive/${NGINX_TESTS_REV}.tar.gz -> nginx-tests-${NGINX_TESTS_REV}.tar.gz )"
+
+LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
+	nginx_modules_http_security? ( Apache-2.0 )
+	nginx_modules_http_push_stream? ( GPL-3 )"
+
+SLOT="mainline"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RESTRICT="!test? ( test )"
+
+NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
+	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
+	proxy referer rewrite scgi ssi split_clients upstream_hash
+	upstream_ip_hash upstream_keepalive upstream_least_conn
+	upstream_zone userid uwsgi"
+NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
+	gzip_static image_filter mp4 perl random_index realip secure_link
+	slice stub_status sub xslt"
+NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
+	upstream_hash upstream_least_conn upstream_zone"
+NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
+NGINX_MODULES_MAIL="imap pop3 smtp"
+NGINX_MODULES_3RD="
+	http_auth_ldap
+	http_auth_pam
+	http_brotli
+	http_cache_purge
+	http_dav_ext
+	http_echo
+	http_fancyindex
+	http_geoip2
+	http_headers_more
+	http_javascript
+	http_lua
+	http_memc
+	http_metrics
+	http_mogilefs
+	http_naxsi
+	http_push_stream
+	http_security
+	http_slowfs_cache
+	http_sticky
+	http_upload_progress
+	http_upstream_check
+	http_vhost_traffic_status
+	stream_geoip2
+	stream_javascript
+"
+
+IUSE="aio debug +http +http2 http3 +http-cache ktls libatomic pcre +pcre2 pcre-jit rtmp selinux ssl test threads vim-syntax"
+
+for mod in $NGINX_MODULES_STD; do
+	IUSE="${IUSE} +nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_OPT; do
+	IUSE="${IUSE} nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_STD; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_OPT; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_MAIL; do
+	IUSE="${IUSE} nginx_modules_mail_${mod}"
+done
+
+for mod in $NGINX_MODULES_3RD; do
+	IUSE="${IUSE} nginx_modules_${mod}"
+done
+
+# Add so we can warn users updating about config changes
+# @TODO: jbergstroem: remove on next release series
+IUSE="${IUSE} nginx_modules_http_spdy"
+
+CDEPEND="
+	acct-group/nginx
+	acct-user/nginx
+	virtual/libcrypt:=
+	pcre? ( dev-libs/libpcre:= )
+	pcre2? ( dev-libs/libpcre2:= )
+	pcre-jit? ( dev-libs/libpcre:=[jit] )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	http2? (
+		>=dev-libs/openssl-1.0.1c:0=
+	)
+	http-cache? (
+		dev-libs/openssl:0=
+	)
+	ktls? (
+		>=dev-libs/openssl-3:0=[ktls]
+	)
+	nginx_modules_http_brotli? ( app-arch/brotli:= )
+	nginx_modules_http_geoip? ( dev-libs/geoip )
+	nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
+	nginx_modules_http_gunzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip_static? ( sys-libs/zlib )
+	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
+	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
+	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
+	nginx_modules_http_secure_link? ( dev-libs/openssl:0= )
+	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
+	nginx_modules_http_lua? ( ${LUA_DEPS} )
+	nginx_modules_http_auth_pam? ( sys-libs/pam )
+	nginx_modules_http_metrics? ( dev-libs/yajl:= )
+	nginx_modules_http_dav_ext? ( dev-libs/libxml2 )
+	nginx_modules_http_security? ( dev-libs/modsecurity )
+	nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] )
+	nginx_modules_stream_geoip? ( dev-libs/geoip )
+	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
+RDEPEND="${CDEPEND}
+	app-misc/mime-types[nginx]
+	selinux? ( sec-policy/selinux-nginx )
+	!www-servers/nginx:0"
+DEPEND="${CDEPEND}
+	arm? ( dev-libs/libatomic_ops )
+	libatomic? ( dev-libs/libatomic_ops )"
+BDEPEND="
+	nginx_modules_http_brotli? ( virtual/pkgconfig )
+	test? (
+		dev-lang/perl
+		dev-perl/Cache-Memcached
+		dev-perl/Cache-Memcached-Fast
+		dev-perl/CryptX
+		dev-perl/FCGI
+		dev-perl/GD
+		dev-perl/Net-SSLeay
+	)"
+# Unpackaged perl modules which would be used by tests
+# Protocol::WebSocket
+# SCGI
+
+# Uwsgi doesn't start in tests
+# www-servers/uwsgi
+
+PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
+
+REQUIRED_USE="pcre-jit? ( pcre )
+	ktls? ( ssl )
+	nginx_modules_http_fancyindex? ( nginx_modules_http_addition )
+	nginx_modules_http_grpc? ( http2 )
+	nginx_modules_http_lua? (
+		${LUA_REQUIRED_USE}
+		nginx_modules_http_rewrite
+		pcre
+		!pcre2
+	)
+	nginx_modules_http_naxsi? ( nginx_modules_http_rewrite pcre )
+	nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt )
+	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
+	nginx_modules_http_security? ( pcre )
+	nginx_modules_http_push_stream? ( ssl )"
+
+pkg_setup() {
+	NGINX_HOME="/var/lib/nginx"
+	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
+
+	if use libatomic; then
+		ewarn "GCC 4.1+ features built-in atomic operations."
+		ewarn "Using libatomic_ops is only needed if using"
+		ewarn "a different compiler or a GCC prior to 4.1"
+	fi
+
+	if [[ -n $NGINX_ADD_MODULES ]]; then
+		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
+		ewarn "This nginx installation is not supported!"
+		ewarn "Make sure you can reproduce the bug without those modules"
+		ewarn "_before_ reporting bugs."
+	fi
+
+	if use !http; then
+		ewarn "To actually disable all http-functionality you also have to disable"
+		ewarn "all nginx http modules."
+	fi
+
+	if use nginx_modules_http_mogilefs && use threads; then
+		eerror "mogilefs won't compile with threads support."
+		eerror "Please disable either flag and try again."
+		die "Can't compile mogilefs with threads support"
+	fi
+
+	use nginx_modules_http_lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
+	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
+
+	if use nginx_modules_http_auth_ldap; then
+		cd "${HTTP_LDAP_MODULE_WD}" || die
+		eapply "${FILESDIR}/${PN}-1.23.2-mod_auth_ldap-fix.patch"
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_javascript; then
+		cd "${NJS_MODULE_WD}" || die
+		sed -e 's/-Werror//g' -i auto/cc || die
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_sticky; then
+		cd "${HTTP_STICKY_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_sticky-nginx-1.23.0.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_naxsi; then
+		cd "${HTTP_NAXSI_MODULE_WD}" || die
+		rm -r libinjection || die
+		mv ../../libinjection-${HTTP_NAXSI_LIBINJECTION_MODULE_PV} libinjection || die
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_brotli; then
+		cd "${HTTP_BROTLI_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_brotli-detect-brotli-r3.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_upload_progress; then
+		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_uploadprogress-nginx-1.23.0.patch
+		cd "${S}" || die
+	fi
+
+	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
+	# We have config protection, don't rename etc files
+	sed -i 's:.default::' auto/install || die
+	# remove useless files
+	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
+
+	# don't install to /etc/nginx/ if not in use
+	local module
+	for module in fastcgi scgi uwsgi ; do
+		if ! use nginx_modules_http_${module}; then
+			sed -i -e "/${module}/d" auto/install || die
+		fi
+	done
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=() http_enabled= mail_enabled= stream_enabled=
+
+	use aio       && myconf+=( --with-file-aio )
+	use debug     && myconf+=( --with-debug )
+	use http2     && myconf+=( --with-http_v2_module )
+	use http3     && myconf+=( --with-http_v3_module )
+	use ktls      && myconf+=( --with-openssl-opt=enable-ktls )
+	use libatomic && myconf+=( --with-libatomic )
+	use pcre      && myconf+=( --with-pcre --without-pcre2 )
+	use pcre-jit  && myconf+=( --with-pcre-jit )
+	use threads   && myconf+=( --with-threads )
+
+	# HTTP modules
+	for mod in $NGINX_MODULES_STD; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+		else
+			myconf+=( --without-http_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_OPT; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+			myconf+=( --with-http_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_http_fastcgi; then
+		myconf+=( --with-http_realip_module )
+	fi
+
+	# third-party modules
+	if use nginx_modules_http_upload_progress; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_headers_more; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_lua; then
+		http_enabled=1
+		export LUAJIT_LIB=$(dirname $(lua_get_shared_lib))
+		export LUAJIT_INC=$(lua_get_include_dir)
+		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
+		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_metrics; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_naxsi ; then
+		http_enabled=1
+		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
+	fi
+
+	if use rtmp ; then
+		http_enabled=1
+		myconf+=( --add-module=${RTMP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_dav_ext ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_echo ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_security ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_push_stream ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_sticky ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_mogilefs ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_memc ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_vhost_traffic_status; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
+		myconf+=( --add-module=${GEOIP2_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
+		myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
+	fi
+
+	if use nginx_modules_http_brotli; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
+	fi
+
+	if use http || use http-cache || use http2 || use http3 || use nginx_modules_http_javascript; then
+		http_enabled=1
+	fi
+
+	if [ $http_enabled ]; then
+		use http-cache || myconf+=( --without-http-cache )
+		use ssl && myconf+=( --with-http_ssl_module )
+	else
+		myconf+=( --without-http --without-http-cache )
+	fi
+
+	# Stream modules
+	for mod in $NGINX_MODULES_STREAM_STD; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+		else
+			myconf+=( --without-stream_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_STREAM_OPT; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+			myconf+=( --with-stream_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
+		stream_enabled=1
+	fi
+
+	if [ $stream_enabled ]; then
+		myconf+=( --with-stream )
+		use ssl && myconf+=( --with-stream_ssl_module )
+	fi
+
+	# MAIL modules
+	for mod in $NGINX_MODULES_MAIL; do
+		if use nginx_modules_mail_${mod}; then
+			mail_enabled=1
+		else
+			myconf+=( --without-mail_${mod}_module )
+		fi
+	done
+
+	if [ $mail_enabled ]; then
+		myconf+=( --with-mail )
+		use ssl && myconf+=( --with-mail_ssl_module )
+	fi
+
+	# custom modules
+	for mod in $NGINX_ADD_MODULES; do
+		myconf+=(  --add-module=${mod} )
+	done
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	tc-export AR CC
+
+	if ! use prefix; then
+		myconf+=( --user=${PN} )
+		myconf+=( --group=${PN} )
+	fi
+
+	if [[ -n "${EXTRA_ECONF}" ]]; then
+		myconf+=( ${EXTRA_ECONF} )
+		ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
+	fi
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
+		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
+		--pid-path="${EPREFIX}"/run/${PN}.pid \
+		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
+		--with-cc-opt="-I${ESYSROOT}/usr/include" \
+		--with-ld-opt="-L${ESYSROOT}/usr/$(get_libdir)" \
+		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
+		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
+		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
+		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
+		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
+		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
+		--with-compat \
+		"${myconf[@]}" || die "configure failed"
+
+	# A purely cosmetic change that makes nginx -V more readable. This can be
+	# good if people outside the gentoo community would troubleshoot and
+	# question the users setup.
+	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
+}
+
+src_compile() {
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	cp "${FILESDIR}"/nginx.conf-r3 "${ED}"/etc/nginx/nginx.conf || die
+
+	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
+	newconfd "${FILESDIR}"/nginx.confd nginx
+
+	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
+
+	doman man/nginx.8
+	dodoc CHANGES* README
+
+	# just keepdir. do not copy the default htdocs files (bug #449136)
+	keepdir /var/www/localhost
+	rm -rf "${ED}"/usr/html || die
+
+	# set up a list of directories to keep
+	local keepdir_list="${NGINX_HOME_TMP}"/client
+	local module
+	for module in proxy fastcgi scgi uwsgi; do
+		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
+	done
+
+	keepdir /var/log/nginx ${keepdir_list}
+
+	# this solves a problem with SELinux where nginx doesn't see the directories
+	# as root and tries to create them as nginx
+	fperms 0750 "${NGINX_HOME_TMP}"
+	fowners ${PN}:0 "${NGINX_HOME_TMP}"
+
+	fperms 0700 ${keepdir_list}
+	fowners ${PN}:${PN} ${keepdir_list}
+
+	fperms 0710 /var/log/nginx
+	fowners 0:${PN} /var/log/nginx
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
+
+	# Don't create /run
+	rm -rf "${ED}"/run || die
+
+	if use lua_single_target_luajit; then
+		pax-mark m "${ED}/usr/sbin/nginx"
+	fi
+
+	if use nginx_modules_http_perl; then
+		cd "${S}"/objs/src/http/modules/perl/ || die
+		emake DESTDIR="${D}" INSTALLDIRS=vendor
+		perl_delete_localpod
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		docinto ${HTTP_CACHE_PURGE_MODULE_P}
+		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
+		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		docinto ${HTTP_FANCYINDEX_MODULE_P}
+		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_lua; then
+		docinto ${HTTP_LUA_MODULE_P}
+		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		docinto ${HTTP_AUTH_PAM_MODULE_P}
+		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
+		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
+	fi
+
+	if use nginx_modules_http_naxsi; then
+		insinto /etc/nginx/naxsi
+		doins "${HTTP_NAXSI_MODULE_WD}"/../distros/nginx/*
+		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_rules/naxsi_core.rules
+		doins -r "${HTTP_NAXSI_MODULE_WD}"/../naxsi_rules/blocking
+		doins -r "${HTTP_NAXSI_MODULE_WD}"/../naxsi_rules/whitelists
+	fi
+
+	if use rtmp; then
+		docinto ${RTMP_MODULE_P}
+		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
+	fi
+
+	if use nginx_modules_http_dav_ext; then
+		docinto ${HTTP_DAV_EXT_MODULE_P}
+		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_echo; then
+		docinto ${HTTP_ECHO_MODULE_P}
+		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_security; then
+		docinto ${HTTP_SECURITY_MODULE_P}
+		dodoc "${HTTP_SECURITY_MODULE_WD}"/{AUTHORS,CHANGES,README.md}
+	fi
+
+	if use nginx_modules_http_push_stream; then
+		docinto ${HTTP_PUSH_STREAM_MODULE_P}
+		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
+	fi
+
+	if use nginx_modules_http_sticky; then
+		docinto ${HTTP_STICKY_MODULE_P}
+		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
+	fi
+
+	if use nginx_modules_http_memc; then
+		docinto ${HTTP_MEMC_MODULE_P}
+		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		docinto ${HTTP_LDAP_MODULE_P}
+		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
+	fi
+}
+
+src_test() {
+	pushd "${WORKDIR}"/nginx-tests-"${NGINX_TESTS_REV}" > /dev/null || die
+
+	# FIXME: unsure why uwsgi fails to start
+	rm uwsgi*.t || die
+
+	local -x TEST_NGINX_BINARY="${S}/objs/nginx"
+	local -x TEST_NGINX_VERBOSE=1
+
+	prove -v -j $(makeopts_jobs) . || die
+	popd > /dev/null || die
+}
+
+pkg_postinst() {
+	if use ssl; then
+		if [[ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]]; then
+			install_cert /etc/ssl/${PN}/${PN}
+			use prefix || chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
+		fi
+	fi
+
+	if use nginx_modules_http_spdy; then
+		ewarn ""
+		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
+		ewarn "Update your configs and package.use accordingly."
+	fi
+
+	if use nginx_modules_http_lua; then
+		ewarn ""
+		ewarn "While you can build lua 3rd party module against ${P}"
+		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
+		ewarn "officially supported target yet. You are on your own."
+		ewarn "Expect runtime failures, memory leaks and other problems!"
+	fi
+
+	if use nginx_modules_http_lua && use http2; then
+		ewarn ""
+		ewarn "Lua 3rd party module author warns against using ${P} with"
+		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
+	fi
+
+	local _n_permission_layout_checks=0
+	local _has_to_adjust_permissions=0
+	local _has_to_show_permission_warning=0
+
+	# Defaults to 1 to inform people doing a fresh installation
+	# that we ship modified {scgi,uwsgi,fastcgi}_params files
+	local _has_to_show_httpoxy_mitigation_notice=1
+
+	local _replacing_version=
+	for _replacing_version in ${REPLACING_VERSIONS}; do
+		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
+
+		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
+			# Should never happen:
+			# Package is abusing slots but doesn't allow multiple parallel installations.
+			# If we run into this situation it is unsafe to automatically adjust any
+			# permission...
+			_has_to_show_permission_warning=1
+
+			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
+				"You will have to adjust permissions on your own."
+
+			break
+		fi
+
+		local _replacing_version_branch=$(ver_cut 1-2 "${_replacing_version}")
+		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
+
+		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
+		# This was before we introduced multiple nginx versions so we
+		# do not need to distinguish between stable and mainline
+		local _need_to_fix_CVE2013_0337=1
+
+		if ver_test ${_replacing_version} -ge 1.4.1-r2; then
+			# We are updating an installation which should already be fixed
+			_need_to_fix_CVE2013_0337=0
+			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
+		else
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
+		fi
+
+		# Do we need to inform about HTTPoxy mitigation?
+		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
+		if ver_test ${_replacing_version_branch} -lt 1.10; then
+			# Updating from <1.10
+			_has_to_show_httpoxy_mitigation_notice=1
+			debug-print "Need to inform about HTTPoxy mitigation!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.1-r2"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.3-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that the user has
+					# already seen the HTTPoxy mitigation notice because he/she is doing
+					# an update from previous version where we have already shown
+					# the warning. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
+				# We are updating an installation where we already informed
+				# that we are mitigating HTTPoxy per default
+				_has_to_show_httpoxy_mitigation_notice=0
+				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
+			else
+				_has_to_show_httpoxy_mitigation_notice=1
+				debug-print "Need to inform about HTTPoxy mitigation!"
+			fi
+		fi
+
+		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
+		# All branches up to 1.11 are affected
+		local _need_to_fix_CVE2016_1247=1
+
+		if ver_test ${_replacing_version_branch} -lt 1.10; then
+			# Updating from <1.10
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.2-r3"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.6-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that we have already
+					# adjusted permissions or were never affected because user is
+					# doing an update from previous version which was safe or did
+					# the adjustments. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
+				# We are updating an installation which should already be adjusted
+				# or which was never affected
+				_need_to_fix_CVE2016_1247=0
+				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
+			else
+				_has_to_adjust_permissions=1
+				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+			fi
+		fi
+	done
+
+	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
+		# We do not DIE when chmod/chown commands are failing because
+		# package is already merged on user's system at this stage
+		# and we cannot retry without losing the information that
+		# the existing installation needs to adjust permissions.
+		# Instead we are going to a show a big warning ...
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The world-readable bit (if set) has been removed from the"
+			ewarn "following directories to mitigate a security bug"
+			ewarn "(CVE-2013-0337, bug #458726):"
+			ewarn ""
+			ewarn "  ${EPREFIX}/var/log/nginx"
+			ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'"
+			chmod o-rwx \
+				"${EPREFIX}"/var/log/nginx \
+				"${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
+				_has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The permissions on the following directory have been reset in"
+			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
+			ewarn ""
+			ewarn "  ${EPREFIX}/var/log/nginx"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "Also ensure that no other log directory used by any of your"
+			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+			ewarn "used by nginx can be abused to escalate privileges!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
+			chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
+			# Should never happen ...
+			ewarn ""
+			ewarn "*************************************************************"
+			ewarn "***************         W A R N I N G         ***************"
+			ewarn "*************************************************************"
+			ewarn "The one-time only attempt to adjust permissions of the"
+			ewarn "existing nginx installation failed. Be aware that we will not"
+			ewarn "try to adjust the same permissions again because now you are"
+			ewarn "using a nginx version where we expect that the permissions"
+			ewarn "are already adjusted or that you know what you are doing and"
+			ewarn "want to keep custom permissions."
+			ewarn ""
+		fi
+	fi
+
+	# Sanity check for CVE-2016-1247
+	# Required to warn users who received the warning above and thought
+	# they could fix it by unmerging and re-merging the package or have
+	# unmerged a affected installation on purpose in the past leaving
+	# /var/log/nginx on their system due to keepdir/non-empty folder
+	# and are now installing the package again.
+	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
+	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
+	if [ $? -eq 0 ] ; then
+		# Cleanup -- no reason to die here!
+		rm -f "${_sanity_check_testfile}"
+
+		ewarn ""
+		ewarn "*************************************************************"
+		ewarn "***************         W A R N I N G         ***************"
+		ewarn "*************************************************************"
+		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
+		ewarn "(bug #605008) because nginx user is able to create files in"
+		ewarn ""
+		ewarn "  ${EPREFIX}/var/log/nginx"
+		ewarn ""
+		ewarn "Also ensure that no other log directory used by any of your"
+		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+		ewarn "used by nginx can be abused to escalate privileges!"
+	fi
+
+	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
+		# HTTPoxy mitigation
+		ewarn ""
+		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
+		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
+		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
+		ewarn "are sourcing one of the default"
+		ewarn ""
+		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
+		ewarn "  - 'scgi_params'"
+		ewarn "  - 'uwsgi_params'"
+		ewarn ""
+		ewarn "files in your server block(s)."
+		ewarn ""
+		ewarn "If this is causing any problems for you make sure that you are sourcing the"
+		ewarn "default parameters _before_ you set your own values."
+		ewarn "If you are relying on user-supplied proxy values you have to remove the"
+		ewarn "correlating lines from the file(s) mentioned above."
+		ewarn ""
+	fi
+}
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 4bc542451f8e..4dc84f51d306 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -19,8 +19,6 @@ DIST apache-tomcat-8.5.100-src.tar.gz 6172727 BLAKE2B c56a0c02fcac8b70186edfcf91
 DIST apache-tomcat-8.5.100-src.tar.gz.asc 833 BLAKE2B 1c763b792d0259fad7d26aef6ee70ceb840fd9491e2d0492d9db5edcc20ea08b0ad38f878ccf49d662a6891f0e3a6cfd772dd6e5b9073a142093a4eab9e97ece SHA512 39d9a361e03574ea1a6f28df7148e4db8dae33a8978ee3f883169b789e37c8d91b41cbe159a26dc03013f53b5914915d5c2adafd9225f8d085c083eca1e47c1d
 DIST apache-tomcat-8.5.99-src.tar.gz 6162573 BLAKE2B 4443dc4865a16e60e9b9224fcd9947b36f316c4d2a81207fbb1204a1b12952275e995028eb5280a962d3488c1c43fc81bace6bb0fdf252cfb1e9025ef85da8b0 SHA512 a8aabf6d12ef89d2b908f0739392e595b3d481ceca124580323e3f3d3c26f4a39c960dcc3686efb5219bf10a7b5b55fc8c9f742a87eb975e04ed40415cab2e51
 DIST apache-tomcat-8.5.99-src.tar.gz.asc 833 BLAKE2B 55d39f5b9e821baab51a617b1c9df0e7f7192ace642eaa637c9e870b0ffdbe1ba5d58b132111eaf3417d26572d3e6650f316def53a6b2489bc820880464fddfc SHA512 b93eeaf4ae2f08d7f1cb5de09fcffa561202d852422f2464ffa61b98afd867237a0a0239caa176975b77c550d69b21bb41b681c1d655372c8b63930db7bbe483
-DIST apache-tomcat-9.0.86-src.tar.gz 6324982 BLAKE2B 2f7d1251ec3db1012f8f90691b6c7aa18ee2be9204ee27209af4d3a9d6505e1ce172a4babbffd42f56fd784aabddff41998980f578337372df6c721089e9d67d SHA512 02b5100f18233b4b20e6f03e455daf67b842ec2f894ff6f6971383f1a8f8c8ebbb098cb7f16be73f69e3f8cd1f3a2ce1ca78948aa7cc788fc316e0e8f68f4cde
-DIST apache-tomcat-9.0.86-src.tar.gz.asc 833 BLAKE2B bb7a0bbbeceabc40acd87bc561ea35eebc8cb9ff06c0507243438c7d8b0b1ef43bd91b017bbed5b367835bf916f5dac7dd748717b83990cc2bf7eee0b82d23d6 SHA512 cedb95a61be312a3b47f5ed0b5528c7e3649b1a7d530a4dedf8a9e5a25ef887b52a7282ed5b4ca5121d130bbbf4428914bba415fc7fc211309540a938224b2f8
 DIST apache-tomcat-9.0.87-src.tar.gz 6332438 BLAKE2B 8f4a89d3f5770abe6f60ba0dcac24bfe441b7d33bbde301ba99efed37af6f599e30b42332c2708dca6a572dd703a9adfade42dde9977d4442acc2b8dbad2be44 SHA512 bdfa66fc63c78cf7e2d35c13426b7a0781a3d084a9263a199005b022cfb77bf392e328f604f943e60bb462312ad60f1f12f5785eaf1c4b12ea931f1e96a4e2db
 DIST apache-tomcat-9.0.87-src.tar.gz.asc 833 BLAKE2B 31c0266c0819a2daf6192f7feebfaf534bcdbfda72de169f8c63b017c2a686d191765ec0dd1cb1a63293d03e519747aa85281fd8041482aaf53f80f43db45875 SHA512 e765abdf4442c94422f752578d96d75b1242859bf5d19b8b08d2487f3531ef652eb4b2a4bd70eab5e5c5e83f07fb335b44dda1eec4ea9dacffbb9dfca5d145da
 DIST apache-tomcat-9.0.88-src.tar.gz 6327717 BLAKE2B e79db61e3a8e368124ff151de2d25daf11a65fce9e93a38648d88c2dcdb99524fc34f84832cb02fe8aeda58a84bbc0273613db50c6f85a79d525f9a9227b740e SHA512 bcd568ad5ea4baee23eebd0566c672417c1c9005d6e97dd66edbad8fd82a8a1b5ff9a2867dd2bf5e04f2c056ea3debd67cbe4132e3ef8929ca30c4529b45e6ed
@@ -30,8 +28,7 @@ EBUILD tomcat-10.1.19-r1.ebuild 5442 BLAKE2B 0f5cbc25167222f86fe5c8af93d5a9a0498
 EBUILD tomcat-10.1.20-r1.ebuild 5572 BLAKE2B c46800aa4523de3a45762e3477aff91958ce9caf11ad36f22678dfc5238056ffaad27055b9287663d2480894f4bd317d4a032946c4d04884fc0ef045eb38adbc SHA512 dbbdb16d07bafa857aef8de54f195b0a59fd98febadf463a8c3422f8e62d3fd010d4c2f6d1c9ab40173c1216066c7456aae82696b16ff32bdcd9df560bf8d242
 EBUILD tomcat-8.5.100.ebuild 4684 BLAKE2B f0d08a35d90ae9043022eb03375a5fc6b76a63835806287832f1393c4e173a6a8888bbd35e7acfae83d31b1ffa5f0250bd1960608f3221d94cc5ed2ec4b273a9 SHA512 ece6ea745ebc5c0231f3a4f8ed5cdd349a622fd627a98c7e5a34d98e872841b965f85d73e512d9dc863acf3bca61bb847773b0fc4bae72960e63bbc9726f72e4
 EBUILD tomcat-8.5.99-r1.ebuild 4683 BLAKE2B 901e81fe850c4de79952df2625f28a778daa39c7881e361094b96962eec729ba20e9bafe7ba0f44f5f1750a1321a9f2431949da8f2d31495a547be5bba18d521 SHA512 202cf2951bcbcfa31025006b93f09e611e5c1f0693db5268d2b1eea3d3ac4ef2f25629d43fb40fa9752d1bba2d0773c85418365b38d84d8451cc2e64333ecc49
-EBUILD tomcat-9.0.86-r1.ebuild 5292 BLAKE2B 995366efd1c1da549e10f80bcd231daa152c8bd75a6558e603154657964b7c0cd384bbe988b325df510a2c5978927119664b14479843369997b9c4c3f090e392 SHA512 ab71f681c9d62736a72a38443561dffd06e26eb89e1720fe6cf6da39926c476f57e23c843714d5c2341a3fd5ddb9c87c6496a88077c1350566bb3a1f739bbc68
-EBUILD tomcat-9.0.87-r1.ebuild 5293 BLAKE2B ae7e9c849f14983b68da99c3f5f259b84b30bee685a89316230b46964a2359d0e03572bc19da3bd60f1778dd01d9be6bab5e4577266130a670afc988983ad323 SHA512 d983d899a0b1221bf8b5310d68598fcca2154b1dd488183df8970f4933e454efe923bf515caabb89a82abcc4fcf65e8b9c5410a58ca29267db71dae3115d161f
+EBUILD tomcat-9.0.87-r1.ebuild 5292 BLAKE2B 995366efd1c1da549e10f80bcd231daa152c8bd75a6558e603154657964b7c0cd384bbe988b325df510a2c5978927119664b14479843369997b9c4c3f090e392 SHA512 ab71f681c9d62736a72a38443561dffd06e26eb89e1720fe6cf6da39926c476f57e23c843714d5c2341a3fd5ddb9c87c6496a88077c1350566bb3a1f739bbc68
 EBUILD tomcat-9.0.87-r3.ebuild 5118 BLAKE2B 1f78e34462424fcd1a5a44c44e40942d1931bac8b0f945addd66c3367fd4aaf3a3a464ee93122fea987d6d2388cca2083bb7408e26e96d826d270cc09d6b7727 SHA512 6b4a84414a824b40e1e39fb6f16698b11d830d246c95b8d15d9c76bfd5d25e2503248a69a97b88b11a89852ab3dffc168fe509c745c0876b0b5c1eb7b2ac66de
-EBUILD tomcat-9.0.88.ebuild 5118 BLAKE2B 1f78e34462424fcd1a5a44c44e40942d1931bac8b0f945addd66c3367fd4aaf3a3a464ee93122fea987d6d2388cca2083bb7408e26e96d826d270cc09d6b7727 SHA512 6b4a84414a824b40e1e39fb6f16698b11d830d246c95b8d15d9c76bfd5d25e2503248a69a97b88b11a89852ab3dffc168fe509c745c0876b0b5c1eb7b2ac66de
+EBUILD tomcat-9.0.88-r1.ebuild 5105 BLAKE2B d5c19d7b1f0223424051d2cdf64fde97c0ae27b4760ba6096dc23453974a55ee6659d9e72972e2709e630fa48f669c1381e4162b3d049e6b04876c50284e89ed SHA512 baa041ebce176430550f1a47e9ef757930671f1201ca59c9bdd4e21ea8c8ae5d7eec2ec4d066dc80431ec94e69f0bdf7385479a2d609f9fe38e27c26a3b846a3
 MISC metadata.xml 699 BLAKE2B 66aff1137e5d4ad92749176a5375c1c27c1e6cde936e05ce904d965eb71a985c421235917742d4065765e1ebf9f9e3faa51c3de109a9e5a169000b4263c3cd97 SHA512 b50874d1e741835bf8cb839517241465018254eba1ddb0e691f2b5b188eca97dd27394c29d2082654049d9ee0898c1e5e4e625666cf8abe029b8e6085122d9a0
diff --git a/www-servers/tomcat/tomcat-9.0.86-r1.ebuild b/www-servers/tomcat/tomcat-9.0.86-r1.ebuild
deleted file mode 100644
index 62209bd563d6..000000000000
--- a/www-servers/tomcat/tomcat-9.0.86-r1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix verify-sig
-
-MY_P="apache-${PN}-${PV}-src"
-
-# Currently we bundle binary versions of bnd.jar
-# See bugs #203080 and #676116
-BND_VERSION="7.0.0"
-BND="biz.aQute.bnd-${BND_VERSION}.jar"
-
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
-	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="9"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-# though it could work with 4.22 and upstream uses 4.20,
-# we still use 4.15 because 4.20+ is currently built with java 11
-# and it would force Tomcat to use at least java 11 too
-ECJ_SLOT="4.15"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/jax-rpc-api:0
-	dev-java/wsdl4j:0"
-RDEPEND="${COMMON_DEP}
-	acct-group/tomcat
-	acct-user/tomcat
-	>=virtual/jre-1.8:*"
-DEPEND="${COMMON_DEP}
-	app-admin/pwgen
-	>=dev-java/ant-1.10.14-r3:0
-	>=virtual/jdk-17:*
-	test? (
-		>=dev-java/ant-1.10.14-r3:0[junit]
-		dev-java/easymock:3.2
-	)"
-
-BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
-	"${FILESDIR}/${PN}-9.0.72-build.xml.patch"
-)
-
-BND_HOME="${S}/tomcat-build-libs/bnd"
-BND_JAR="${BND_HOME}/${BND}"
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
-	fi
-
-	unpack ${MY_P}.tar.gz
-
-	mkdir -p "${BND_HOME}" || die "Failed to create dir"
-	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
-}
-
-src_prepare() {
-	default
-
-	find -name '*.jar' -type f -delete -print || die
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-
-	java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},wsdl4j"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR}"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_configure() {
-	java-ant-2_src_configure
-
-	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
-}
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant ant.jar):$(java-pkg_getjars --build-only jax-rpc-api)"
-	LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	# add missing docBase
-	local apps="host-manager manager"
-	for app in ${apps}; do
-		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
-			output/build/webapps/${app}/META-INF/context.xml || die
-	done
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw="$(pwgen -s -B 15 1)"
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:"
-	einfo "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
-	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-9.0.87-r1.ebuild b/www-servers/tomcat/tomcat-9.0.87-r1.ebuild
index d6183d244461..62209bd563d6 100644
--- a/www-servers/tomcat/tomcat-9.0.87-r1.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.87-r1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="9"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-9.0.88.ebuild b/www-servers/tomcat/tomcat-9.0.88-r1.ebuild
index 2d8069b5c3da..5e19c3cce87d 100644
--- a/www-servers/tomcat/tomcat-9.0.88.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.88-r1.ebuild
@@ -24,7 +24,8 @@ RESTRICT="test" # can we run them on a production system?
 
 ECJ_SLOT="4.20"
 
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+COMMON_DEP="dev-java/bnd-annotation:0
+	dev-java/eclipse-ecj:${ECJ_SLOT}
 	dev-java/jax-rpc-api:0
 	dev-java/wsdl4j:0"
 RDEPEND="${COMMON_DEP}
@@ -34,7 +35,6 @@ RDEPEND="${COMMON_DEP}
 DEPEND="${COMMON_DEP}
 	app-admin/pwgen
 	>=dev-java/ant-1.10.14-r3:0
-	dev-java/bnd-annotation:0
 	dev-java/bnd-ant:0
 	dev-java/bnd-util:0
 	dev-java/bndlib:0
@@ -65,7 +65,7 @@ src_prepare() {
 		execute.download=false
 		exist=true # skip target="downloadfile-2"
 		ant.jar=$(java-pkg_getjar --build-only ant ant.jar)
-		bnd-annotation.jar=$(java-pkg_getjars --build-only bnd-annotation)
+		bnd-annotation.jar=$(java-pkg_getjars bnd-annotation)
 		bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant)
 		bnd-util.jar=$(java-pkg_getjars --build-only bnd-util)
 		bnd.jar=$(java-pkg_getjars --build-only bnd)
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 7e08fc9f7545..b20043f5f184 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 7fc12d3257cf..2a14f8974fe0 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -24,6 +24,7 @@ DIST NVIDIA-Linux-aarch64-525.147.05.run 262738232 BLAKE2B 742feded05f659fa9965b
 DIST NVIDIA-Linux-aarch64-535.161.07.run 269759554 BLAKE2B 1f2fa0b9b4d535198778cc443dc262add2f9071a60e39714fb9e35b73db34f50043b55eb9cf645a50f55191abc81825c0e733e2bd7bfa8753a1668f9d5f7c607 SHA512 bb96a28b45197003480ae223c71a5426ef5258a31eaa485cab0cf4b86bed166482734784f20c6370a1155f3ff991652cac15f1b1083d2fb056677e6881b219e2
 DIST NVIDIA-Linux-aarch64-535.171.04.run 269824478 BLAKE2B 9dee3a4cf649c02a18cf6f7ede664f474a438f56949fae048389b3964bb8b226ad9bc39c96da40da3a1bb20e2c8cf58e18176bfd5b44b3677f8e60826c5ae0d0 SHA512 b8829fcba9b1a077c075b515449ded0675ac3cd68fc2f5167d25c9a1a5b4f2515c77d3893678e7a08f625d984eca9be025c6f5b7e0d28475709b6d1aa0b4601e
 DIST NVIDIA-Linux-aarch64-550.67.run 236002639 BLAKE2B a4986dfc317ba8df35b614b57db9c0b7f11b7d5c10952d7dbf9046bbd16d43f65a19891f3038b41fbc34724dd2800397686c078839ec00af6a8a1aa9647fbbf9 SHA512 7f1d497879c87ec08d5768307cdba3977ff38d1ba51de4bd70228c4d46bc0a9689ec22a92b99271ca548adeceb82ded0891523ec2e46ba2963c23aed1eba47cd
+DIST NVIDIA-Linux-aarch64-550.76.run 236182995 BLAKE2B 540fa27af0d063da4a480a0039020dafa3038ccdbd2ea505149aedc129420b31b2e25f3b86f72b2dad3d216dc80243749b426beb6de5a7856b41b34752a896da SHA512 0b7a6c253029e6331456decfd792ad1b1fe2a37a7a13e9bcf00df6c6fc8fe36e0202110e23d073cfb8a400c82265be0ea18a6aebdbb77489096d56b208dbf6f6
 DIST NVIDIA-Linux-x86-390.157.run 49417041 BLAKE2B 435b5e0e60468cc74b41cc5d9b5bb0105d29c11a2d408457835212a96519c9334ecf19278b36749d3ff7f498f5b0ae45a2efae2d428703dac21245c62f1efebe SHA512 dae9ac2c12f9ad90f7441e00e01a984147c577892421911d7f67f6a31e616ac1cb7d434bc9c7f58fbd9b8ae909521b5bece607a63c79588c0bb9d99c6bad5fb0
 DIST NVIDIA-Linux-x86_64-390.157.run 85835541 BLAKE2B 44b855cd11f3b2f231f9fb90492ae2e67a67ea3ea83c413e7c90956d38c9730a8bd0321281ae03c6afce633d102f5b499aed25622b9bfd31bdd2c98f0717e95b SHA512 4780503a4cff0180b1b1f37d20a6ba3438dd78b51fa7f69b98d35521835e5d61099129746929d51d63afa2d47b672b3e145e1e1897584dc3799e7f822c5b3a0a
 DIST NVIDIA-Linux-x86_64-470.239.06.run 272849102 BLAKE2B 556c8f7058b83d8c4c7ccb2f62619ac001f7c3868b80ee091e2949fb7b35e136fec83c15efcf4dd4c99d312f8c36f83c76e250d18d091e053355396b8347af11 SHA512 92bdfb11db405071cd58deed2a0853448932657e256258e0a0bda5069f00485e2b6e49b4a0eeff499a4991be4f884273f3564c164110b1ed1f5d924506f13e2d
@@ -32,40 +33,47 @@ DIST NVIDIA-Linux-x86_64-535.161.07.run 341770032 BLAKE2B e6d741a59d6cc9273f889f
 DIST NVIDIA-Linux-x86_64-535.171.04.run 341705434 BLAKE2B 2d5dc19e8f80710a3a4324555ccabbf262552ebd71454a60541d9a726ace74697f37d112f8c38999bd5eb577dbf96cbd8c6c835a17c72140ad8deb96036a8a0a SHA512 5db0f8bedb0667d08beb56592cb1f1d3510906dd9b931899dabac289a73f26ff35d68ede8523af4e3226421fb5c18b86106c8f1cb4ad635a53cd037c46e8762f
 DIST NVIDIA-Linux-x86_64-550.40.59.run 307020856 BLAKE2B 1b2e4960d80ff3ce9d53484baf6961879dc2dd2bf6d328667d9f1dabf75cb5e7f326186f01b9022823062b03bd8a026fb0ce8f5e95f075867215b9251d21e28e SHA512 e2742141c46dc583807b05e879952bb913a58c671ba4c8903c42b325506f0d7f97f2e62d326e30f04646473ebc27593508f5b065ddf72323d9c0b9bce8b8812f
 DIST NVIDIA-Linux-x86_64-550.67.run 306736632 BLAKE2B eabc86883af003bf2cf33748400c73882ed318833c156053a06b0f1c487622621d155131c5a339a04a59eb7dbf2a7efa70e955faa38d8b83a04a86675cdb489b SHA512 7d6a6215756678b656b748b1ed63ba957bd5e408adde9d554b0f873e9b8f024d2e08a9d8caf45e0bd6a9b7a6be81dea96aa42a8fcca1a6519ed1b56a0136d65f
+DIST NVIDIA-Linux-x86_64-550.76.run 306984718 BLAKE2B 231c53a9b9822ce5d8b66b9655f0e3ea8a6d28fcc94df47d05d7e6218a4d1d3f0a28490b54cdab94cfcd95b14ec7489eae19ec9c2b598e79de3503a5ec12fe09 SHA512 a3804501b220d4acbda9633b92c4515bb14d0b5233f3ffd5e173290d310efdb1ed9a9602f727c117c1d0746d596c1125c51cc3e1fde65c79905e60e1d35f50ec
 DIST NVIDIA-kernel-module-source-525.147.05.tar.xz 10140684 BLAKE2B a8ce7c1d1047be9154fd67366c5bfa13a19f03c883f24ee35043d17d517e83303420449750f9e7adc7142f61564dd5d8e5a19884dbe540514979df6381ff7f1f SHA512 58920b26081a68e05178176edb0ce8ac4a5d365492adf51d6ffe57102385ff08abc5e14741e0500419e62a752441c97051d60939245eea64b039cc7efca15b7d
 DIST NVIDIA-kernel-module-source-535.161.07.tar.xz 12494976 BLAKE2B a1e57af4ae2cb8100d3d52e5117fa3dee50f1b97e4fce59b1e1a87885765b32c4d661cfb2735f60f479d9513bb5de0a3bee0ca424a798473da9cfb22abea4c39 SHA512 8c53decfd2152480a4ef0b4a3ba5a58d6c2ea18642cca01f1e41b97ba34ba23e7a8bc8d563f1e1e7f2278f7835028d317f3ae2dabba063a9e826c1c6aaea5624
 DIST NVIDIA-kernel-module-source-535.171.04.tar.xz 12523644 BLAKE2B 8917cc65166618db4b3fc6ecc77b3093885acf4cf1f8b10698c04ab3574d4b7ed8712766e198e6344c2abfae7d18f4401c00df86953849e37fc2dce9b228515f SHA512 fddb112b782176d51305b9b6ff3dfe610c6ce0a5c3b382fd04bbc9fe4da36daf06f435b2159a1baa8516bb1227d2f468b23a46b0adfa166315ffa433e38bc64c
 DIST NVIDIA-kernel-module-source-550.67.tar.xz 13405332 BLAKE2B fe7b7b314660a6d33d6554fdd9865cee8a7f349ace991405370afc16abf6616bd8b20f71b1acf8670cc44ff02f99aeab145ff2e097622c6b0795b0b9f0593ced SHA512 0d8350e39c81ba572344f953af05fa5dd666f1f5e16459a418f636d9427533b0d5398852db5d97a58e4cc98a8013179194b24a356520d95153a1abd04245a8e9
+DIST NVIDIA-kernel-module-source-550.76.tar.xz 13468828 BLAKE2B 4d2e1432a9237cbe811360d87b21d18468422786814a0aca163001d932f99eee3447e68c468322906bf2e2cbcd26e7041bba301f9358f6be45d721f73d1c843f SHA512 4984624976833108394021a900e326b36c3be3e8977bb41adf142a2c3befcf4e0d027bc4d4944c5c0d34e2a3ca22a0889c3e5d783bd1ae262219db6eece4d50d
 DIST nvidia-installer-390.157.tar.bz2 150323 BLAKE2B 8058ca87a6dea956d564af9f7eab9b1fc82b1f2382bd5cb2f6d97cbe2e19292533522d5f8f2eacbeb16520372715fcb72f8f9b0998962af5d4e75522c8d74524 SHA512 93a7ece648602157496c8e27a88864ede341a100f5328a4c1a25faf8f0b94d252060e5e2f71d0c302fd0566c10773c30b76b3b5f431d8039b71c90a7969f7d7e
 DIST nvidia-installer-470.239.06.tar.bz2 146286 BLAKE2B c288c0455e6426d0e18ab7b9f5c0437af50420bdf86cebd798dd3aca463341e831808ecb297d9c3233d50a4e9dac435f8114d6eb2ed2fcb6c39be7824c3dc95c SHA512 e60f6d295649557c3c316174fb37ca0ae6e57604bc3880a3b5929b33ff6d7cc8ef74a118f9075795b81d36b6a4107a02fbad0acbca18b78d05e5d9e7998c82a8
 DIST nvidia-installer-525.147.05.tar.bz2 147986 BLAKE2B 982e1a95bc255b960913cba1e78675845db472534af6cae054c74ebf82b1e4407211166249b164299f0f81ec643b7c1190e5960ac3c7844322ca42c23dc0a90a SHA512 171f9c235b2bf41dc40a875576e8cad0f4c78ba574e72db3f1ff3644701f327916121ae493cea1aed93f4826d96ef1833e98502d2d4272f4f536bab03f20e5cb
 DIST nvidia-installer-535.161.07.tar.bz2 148590 BLAKE2B 046f8153c7164799d4a608c913b615c94cb5acbb16728b33b84e8f09bf4358410c929af1f460afc78bc9c026f178b7c57967a58665f5892fdcf96811931381ef SHA512 3196f9527cb3e6d13e37cb3043298ddabd845f825560ae98fde5a54763c6e017d1d933f789cf39f82f9238708bb08244fb5b8210529e09aa19694e231c1773f8
 DIST nvidia-installer-535.171.04.tar.bz2 148469 BLAKE2B fd63add7fecdd5761e7f51e96d7ff77064c93c419c37f52b6a3d8aaeffd2ce0f5685c2114de7e09b9507cc11c312144b1c62c1ab2a0564ad6a351dfe9069977f SHA512 672e0fb503d8ddda6c5ccb3aac9cc2fcc1684856ab35b0b365916ddf7153ba6aaa24704c750eac7ea7c4e0fa54de99ac77dad8eb0d17ade902049ba211dadd68
 DIST nvidia-installer-550.67.tar.bz2 155762 BLAKE2B 84b39bafeff5addb5e5b107b550981f0a508b2f7f2c321618d82783c797806a6c4db571e6d57c260a14e6c37ad3aea56258304d5d91b26ab33413ce3daea7c52 SHA512 387c9ec7b50ddb3d8a0d6b55c5fcb627aa9294922f77a636a2ba83b4c1a16a591515b7fbbf67a3b1ddb6a4d01c35cae000a31e66bfaf2415cd5685bf855edc76
+DIST nvidia-installer-550.76.tar.bz2 155497 BLAKE2B 0e0d3d52614b35cc12cbc8d697cd2dd4b67e36f28eb30ab01942d8296a11191ba6b02c4bb5a02beded1e4bc9751ac0528f8421ec512bd2d1aa651c3ea69c869c SHA512 62dc1e25a0bc0faf64c028056e2c2bb6b8f9f9cd598e3a9d9fd9f210400b3fef5d78fe47b556e05fd7e7b033657310bb9263c56fc3e2ff4911fc2620828ec6f5
 DIST nvidia-modprobe-390.157.tar.bz2 35306 BLAKE2B 80d202b39c2f95ec0f909712c2e101483af50124092c32efb33bd98ff58ddfb97b737ff07f1ddc941f688c1b4c26a15f392566d522e18506771f10422fcd571c SHA512 109bbe24a3758b568ea65fe1e9d78f69fae6108ec0497b796c885a3912825fe04ffd7389a3e22987f1a10a2926bf6eaa384faabc59478aa3ee244dd3ac91c6d3
 DIST nvidia-modprobe-470.239.06.tar.bz2 38783 BLAKE2B d572bfb18b0ff99606a5ca909c0f4e45709d69dbcbba43ce37e570d4dfa2dae11fab352129879418af2af26d8ad20eb976e9c2e4d181895bdbec00beb61a9fc6 SHA512 9293b33b4c14e5f873846fba3526059b6605d70a4d7e35c7032c3ed89cc7a6a71e04b344695093d97ed3280ec2094988105144e8c66dc037ed5eb8292022eec0
 DIST nvidia-modprobe-525.147.05.tar.bz2 40439 BLAKE2B 3029d39cce928b3f6a6baeb57391ddd412a35e36d880b3036dedf083b6df979ec531360421bdd347aa223821006ae3610b115277804c22614a221258944ea37f SHA512 25939b278bd2354ff787f1d10771d19baa6c691c5243bc647a556e40c4f38c16f6a248b2ce0b4a328d80b768147a188cb2d8b54e39fbfa4cf436d1f3b1b6440f
 DIST nvidia-modprobe-535.161.07.tar.bz2 40692 BLAKE2B 3bf7ee5f743b097e0172dd619ee59d1de3a0195287e20ac3538bd1d63e354a0f8dbda2d5a60efb0dc1fd66ca7149c7da02273bf59b32a992045f4c90b18812b8 SHA512 44191af90d97f0264dc399d54ddea852e9149d6de4b6a772cb50a1d93dfe79ab7fd8915215a6f016a84691245685dd50745b3524b51db7646bad68416f924fad
 DIST nvidia-modprobe-535.171.04.tar.bz2 40702 BLAKE2B c7e04b7e776c0f7f43577b9a13e7476cff2eb3a2bb7516d59557666b6b0bd90bc44ffe78f14aede4c31e7946221f5f97448e5ebc74ddda0146cb4702a16413cb SHA512 5d6fdafd64b7ddbeeea0c7c9812d4d04e2cd551440119b6fdc37c57f32f94b7c7c8578959c6cccd45e91e6eff040e274474e1089ced3e9bf5b0ae9166a47b2f6
 DIST nvidia-modprobe-550.67.tar.bz2 41539 BLAKE2B e3e486a4ebd2053b1a8bf0feca1ca2f2168d69ff8ce7ae2869cca5de034cf34838bdcb590fdc089329cb938ca8587d691ff51656a20607be5411745c12fcd41a SHA512 f67f852104b6cb1ec389f0363ee38e40dc2ec17eaf8ebdc5f3e4d9ab260a97ee4f58499b99ba881bb313ff21d4fc9e74f7f7b8c4a51ef544eab03776bfde3168
+DIST nvidia-modprobe-550.76.tar.bz2 41523 BLAKE2B 3c2aad629017129a555f36f5327605c3716f42d991a5064c26de97812468aea616b3bc1e24e7cb9e9cf6c6aca5fec998a01ea0f3b1e5dbaaa6c39744367df1c6 SHA512 00d0816bf0788466ef9509b8778a08178280c869a81d125deee25d7d215854c1143abd89cde325c0a377a602e03bdd32371c595b68f608d7cef52737e57fe330
 DIST nvidia-persistenced-390.157.tar.bz2 48654 BLAKE2B 2cf6c92da90acff55e8c180a06b0c6a29d48be9fd8ca3c541202fd14f0697220fba6b66452942aa7ae7cc8821f5c5eb9fa8f7a31d2248624e5f9141d83a176b8 SHA512 70f0707ed6f2b877e69ef90cf782f66cbc9d2071db53ca09ceb7b89427b0fe176708517340621fa251539b7d481b238adeeb60261674eed74de1f62db6dbb72e
 DIST nvidia-persistenced-470.239.06.tar.bz2 46554 BLAKE2B 41d8ba35f68dd4609cd215249913790b150c22410c3c6b3675d7003136b660f427e14d48abb9495851d18028042ecbd1cf0557bad877fe5b0e5e6cf15d90b77c SHA512 69ff1cf92e90e5ef87d44764abf165cf3540d321264962dc09e093bb9c1e767f468e9d1e989f43a14d1ba47fc24f1e34252bf478743a80f51373d4bd20baf6fa
 DIST nvidia-persistenced-525.147.05.tar.bz2 48089 BLAKE2B a9cbf291fae9d7af50a9633fa5e197939674825e72150883b4e89e72165a512c164b4d79522f5b6c329e980e1145d958ba592202e5b73edfd32b149457714982 SHA512 e9685d330d32a5e9864b45a7e099e78ef873188972700747c158c3ab1fc95ea036726c793207fba33d4a50f17b92802366ce1ad38dd110b86ee923f48e622cfe
 DIST nvidia-persistenced-535.161.07.tar.bz2 48575 BLAKE2B 77f0c28f2ee87c6e46c3555f272fca3cc01e6561f24277247c53cd5999820bd1327f3b0cfd3dae3e341239c35c8dc820bcce2c184b6e8911fc5762def2f34fda SHA512 00736047b9ad61e11e11c9b133d8d80d005bcdcd64ecb1a0bcb15ebf8e02110069a11581eabba989952a481819f8ddb4c9d88a85365dd1c3a550fb4535299a2d
 DIST nvidia-persistenced-535.171.04.tar.bz2 48591 BLAKE2B f15db40686e422fec6f1da28a39de55478d80a527b085d12896ad059fce697bade243f003defc09041aa676562fc58f74ab7f7d463bcff1cd929ebb5335020ca SHA512 ffbe0fcc11ff152e43f69f0d44f90b767e805a2f5aeac0c75fb58fa8ff5eb81d74a97e06ad1de36f4c9c5e25960417cdee14916a1a2dade514abe8dae3679d7f
 DIST nvidia-persistenced-550.67.tar.bz2 49692 BLAKE2B 5ad52ca58da8654493fc648ffde0518a62e9ad3d609a342671c78ebae541139919eae5a7d5b8cde5d4be483c7ee38130d9370566e83475cb8f2c7551482801a1 SHA512 e3a52297591b43b44a1aceb2a4ef776c2597222c9eb4f9cbadc49591a8cde612ca5a46eeef32be5935106b264c4956aed92ac17f603cc154e523e1c31655950e
+DIST nvidia-persistenced-550.76.tar.bz2 49704 BLAKE2B 540bc85478c4458611fc2a9b251408704a89479b5bd77b994704f3c675eddb17cb3dbe3572c09381e1ac6fbd02839ea83988766c70e6f9d9af1fd22d03220811 SHA512 79d877808fd5f86fb9ee9994bbce3f12e82146372b09da41ebd23cc50e0cfb7182c365cc9829379087db51fdcafd76e7a3c1488b380f7433b61a0230debf78d2
 DIST nvidia-settings-390.157.tar.bz2 1108938 BLAKE2B d9ec1ab5d7f157d74627272adf752a671dd17e2ede02069437b6180b927fe315b15cc6416d584ab2f038b76fe01e5b64514a834f24d88ac16676e55205fdecdd SHA512 b16699009bf56a1ff3b623a528c58061c4f5a2c5c4a373756a07bcd667743a1df7c733a572d2d0baa835a904ac2fda8a5c85890dcc00c3a0f223e0467aea902d
 DIST nvidia-settings-470.239.06.tar.bz2 1062310 BLAKE2B 1154421feafe40a0ce0e980374a60f325801f52a03af9f96ea9411c61de6c7bf8049dd2750204ae53a570ebe600c7972cdefcee84886fb2a6c170affd00d51bc SHA512 a1f70491bb8bb06a802c3db36858c8956fb93db463b46c13bd8dc4fa81ff4aea01bb53ebbc9b4d18da241c4442e8d17cb4204fdcbb5a8ad3e23275b7205bf3c1
 DIST nvidia-settings-525.147.05.tar.bz2 1088088 BLAKE2B cea74a20ed8208f99cb586bd40fe2cafeec55ca2db19b2c0691d3bcabadc09941ff8288e940582e63f10d8f6cd7e8813e1c5776bf65cdc7b6ee291a8b3a7e28f SHA512 9c29a477b32db3f4324d7c6d28b8da9f3de5286e39f8c67bae88a93c3d3ee0c3f0a0f3e0c29c1fa8ba01b7311623569df27e349d6148ed70b3fd42ebd36f0dcd
 DIST nvidia-settings-535.161.07.tar.bz2 1094800 BLAKE2B 77931240f932a9b4e2566f81b9c16141e2cfd0d074583e1a91cb0f674f49ec5a63401250b10d48e274e27850da6d704c823375f4b3121e33ffa3db032ac2b756 SHA512 2cb7061dfa636f23309f67614d3fff37c9b16d7f0b5554d559cb837ed0bcc46463819f15885c4f92cf1b125cf3e143b07d6592354cdf4b8ebd777f5b6cdb0d6e
 DIST nvidia-settings-535.171.04.tar.bz2 1094654 BLAKE2B 566b649615b414bf6e9a52839e9e12ae68208edd67970f2d8117ecfb7d9cffb0b6138b1e3594477b6e117825dd8af17fcb3c1834886b2575a597735dd462e817 SHA512 e93ffaae481cb0235c52c10e9d65a25475e8c32e348d7916d0824f691e34fbece7ffea6906e84cfa08bcd829e8cfae8b1fb13046835f4f6cba22cddf40e34258
 DIST nvidia-settings-550.67.tar.bz2 1099418 BLAKE2B 7abc90c717f925fa608ea29536ac7f7d93901a123f50ad6b657af47d6001b6ff2eb0b40fa3d2b2b18ef5a7e9c392a2bd97e04711ece9ee1f20fc4643afd1a455 SHA512 2cd29c33e9b7a4806d815d53d8f6ca17c308741412e40af0cabfdfdf88f148286ce9628edf3df2b76437c2f6233d3fb3a5c3928d3428ee732f3099d8ca03633d
+DIST nvidia-settings-550.76.tar.bz2 1099706 BLAKE2B d8cf5d054dbcf973e6caaaacbfd122f22e09953831c5886c2e9203b5c69146ab0ebcdfc9074373245b381b4e6a4aa8c8f4aa07c28acee90427b316546ddb3411 SHA512 299ea5995c4105a62e4bf815e7d1f977808015c3fb21ba2088955109c9272435f7dcc2abfc4d49cb2b7d86257f77560b71f9ad1e463b1a92cbbfacdea3f1d4b8
 DIST nvidia-xconfig-390.157.tar.bz2 107399 BLAKE2B 0cbb3b1ba508ddc3ba4a161c290b31bf7a67f67880bdbd01171a962c5fa97ca945b1ef17932403f8589309380743f1da632c728d8accb6d4e56dbd895e7486bb SHA512 50b390811c9bf091b14add41f886925b17496b41006b7d3981d2398caa65cf5db8a579c8cebed78278384bf3acc629befb07b54339c61abcc75852c0dcb8b8ca
 DIST nvidia-xconfig-470.239.06.tar.bz2 108687 BLAKE2B e400a59b4626b37abd12893438774737f18500771c8fd8d63e7060e80463a8599f7248fda542096a5e9bcac700595cec151494695e68dc7667c89509eeb14646 SHA512 aec235f65c9f568c6717a37fe0f16b8100ffbba7731975bac5c17802b70f1ec1ff235e08c09a0bc9de0c63a705018ce76acc8252a39f56c300b9e2a556f3612a
 DIST nvidia-xconfig-525.147.05.tar.bz2 110987 BLAKE2B 49116c8922b5c14eaa88b6230a824447609a885f7d97df28ed4f3b9a2e146a213f31f9f184aadd38c4c9f692f0a1476d0db0704b55947ce95cbbeebcb9a683da SHA512 4b7c02de6080924eee5ee9fe770e632404b380529e5ee40a8d0f259a5c96d6915e83c26113b3c65434ce461c959347b3651abc15de7c40def16c46bb3f6faeae
 DIST nvidia-xconfig-535.161.07.tar.bz2 111040 BLAKE2B 3ecfc95beb88671f463cb48285ba8c2d70901028e8a6571c7c0041ceeebc6f40ee648f09289f1a3e342a565504841265a7f3cc080f4ac192951a494c5289aced SHA512 3edc2b643f62c091493797e5584479af19e8d0f64b6b88dcb183eaa12217de87f67f1facd56881bbfcd5fa6dde51f3880133273c86039d63a93eae222dd04166
 DIST nvidia-xconfig-535.171.04.tar.bz2 111107 BLAKE2B 8f640c6a4b93d12f085fc8df042b0930ac23e98f5ef76b2daa83856bb39a2f71b3596ebb3a6b2f83bbbf932111d7b5a3d232c751aa818bcdab9a9336700a1228 SHA512 d30466fb9b6d254573460fb9d38b59a1948caf6531dfd2655ac96ffe28ff42ead048f4083c6150479931a7a695e810de75d704533a37781958aa5a74cfc83457
 DIST nvidia-xconfig-550.67.tar.bz2 111172 BLAKE2B a010b728e8ac70f24e8b1bfdaf496361c109afbf8f62d97eb286867838787d6a2845e7f29082bcf398840d0e1151e7da7432cf31d24a10f2ef5185e52c60a57b SHA512 8f4afc0195a130e43c44fb65508d3a4a38112a73226477c03503386397e8581ab6cd5038d3f37d7ac216ab1bf6a598b933c47c59212196adf604957c345c31e3
+DIST nvidia-xconfig-550.76.tar.bz2 111169 BLAKE2B 2a02227d80974795648c5b5bedd1f01834360f0252ced2b53946b53e80be063e5297477c52b77f338c5f732e71b8b2e53118f01412d573800faecbb6903fc422 SHA512 1bcff751df31bbd3da5fa40462f98b6e3a08a3b4e7f0bebcf9a26084b3699ce20abdc54381fb69d6a48533cb43d7374c563277cc3ac5ad502c49ad0eacb7f96a
 DIST open-gpu-kernel-modules-550.40.59.tar.gz 13728211 BLAKE2B e05e59636eb08d48f6b919eb4a58bd5677948db18c85a4dd5c848f8de2f65b9d421078b17cbca414646c7b2d0549822c9f1328fafe198d9bdb3e1c81981a8703 SHA512 54a10c9d0fa2051db2cfeb7dd0338f5deddd9b4aaf0ff8dc26cdc29fe4c9618d213b0b9aed7d09d4967e3af94258eaf7728034c27b4b28e245ed817b53eb8be4
 EBUILD nvidia-drivers-390.157.ebuild 14621 BLAKE2B 1220d88746beb2785b85ad587ceb26d11e9955ef95512d4f29a1f7d065396841848b9f1e6531e2c30da01fc63612e5d3167a244f5175205a932454e47499a4a1 SHA512 632aca465943c7b4fbdf8627854a6fe952195fbb997b050d8c0a5d141af18e9eac7b9ad2664d5c59aa2c9238416cd36525518a030451ed778a88b37cb3fc707f
 EBUILD nvidia-drivers-470.239.06.ebuild 14335 BLAKE2B 76c8102dc3be541531d7e1c47fff70eb1a229b6fbf0d54c01814b9b60b468c6321d9071f895d1c36943faa51dc055a8c234f08ffebefc4e3c6e8c422e6c1c490 SHA512 a6789cbc30556683ef58a6d116eab2703ea18f02526bf07a6859c6fb9563dfd7b5c1328dc51c59569bd88db5eb678c427b1b615abcb4f70f0df97a73d82aaa1e
@@ -74,4 +82,5 @@ EBUILD nvidia-drivers-535.161.07.ebuild 17552 BLAKE2B 03525c2d05d96d7af3dc177cca
 EBUILD nvidia-drivers-535.171.04.ebuild 17499 BLAKE2B ec57afdaaef0ac70979a78421d100746eb31256ead1c391b3ee9838b364521919ee688874978d520c30c39044973ea614773fe747e226e6550472b119c1b69b4 SHA512 d7d93512a9e229aa9d896c4b52c5e07df4e141316dfa99e83cbb4459ccb1561b03514474357877aee6b5448772c1b3c1ad794a23ec5c391c87de2ef296c57310
 EBUILD nvidia-drivers-550.40.59.ebuild 16595 BLAKE2B e37b14ffc62620d34bbdb5498fac9b4a3746da3aba084a40631af36edb8e4d1d4442fc316445fc705012eb9957773c59db2781f459ee4e32acc94f118eee7297 SHA512 5e5419ad272111d9066e85716551114dd39069a465e4ce618fed23a60a6c4dad4dc5cd5b8402946e5d4d1e33ca7cd8e820302eaaca13fa9273d84a8264c95a57
 EBUILD nvidia-drivers-550.67.ebuild 16588 BLAKE2B 34b41bc2f7c6adf302b69dc029c959d48483b4a6e3b06cd5e234d3684f8d7ad45832010a5022acb13217113ba227ee10d6441a68c4e607371b468ac0ce43d3ba SHA512 f6b24f831656965aeac4c4533656da43b5ae74f615ba8e3fb4f2f509fddfb9fbb031a580a1925759e6034224eb7b90ab411584afb799860f573bd46b35035fb9
+EBUILD nvidia-drivers-550.76.ebuild 16589 BLAKE2B 8c9322f7511572e03b0398ae57595bafd35d9f943407c9d963b78d2e7b6a4cfafcdac2232568b1e7fab4cda80815106e7a491c6def1f1258cef9a4fc2a323521 SHA512 d27d1e8029717a1fb7da8a233d0402acacb67b69c5d5adbe2e698c005c7884d0722b69ea1cea7379bb1387bd9fe82298db2cb8ba27656a978a2502ebfde721ce
 MISC metadata.xml 1407 BLAKE2B c0d284fde68808892e17edbb2b1e43b059388306eae874276d4a3f336a5dc2a41cc025a834466b2ad96112b550e0bc0f759f683bd6c58ba64a41cbc8ddebd92f SHA512 39be6982c1177961706ba6426861752339373241c959fd06504e314c9f0313677ff7c7341e7d9fb41cad2b768b99f6474e087b9813016d33cd6a9c77567c50cb
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.76.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.76.ebuild
new file mode 100644
index 000000000000..7eb11d852d79
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.76.ebuild
@@ -0,0 +1,500 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_OPTIONAL_IUSE=+modules
+inherit desktop flag-o-matic linux-mod-r1 readme.gentoo-r1
+inherit systemd toolchain-funcs unpacker user-info
+
+MODULES_KERNEL_MAX=6.8
+NV_URI="https://download.nvidia.com/XFree86/"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="https://www.nvidia.com/download/index.aspx"
+SRC_URI="
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run )
+	arm64? ( ${NV_URI}Linux-aarch64/${PV}/NVIDIA-Linux-aarch64-${PV}.run )
+	$(printf "${NV_URI}%s/%s-${PV}.tar.bz2 " \
+		nvidia-{installer,modprobe,persistenced,settings,xconfig}{,})
+	${NV_URI}NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-${PV}.tar.xz
+"
+# nvidia-installer is unused but here for GPL-2's "distribute sources"
+S=${WORKDIR}
+
+LICENSE="NVIDIA-r2 Apache-2.0 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
+SLOT="0/${PV%%.*}"
+KEYWORDS="-* ~amd64 ~arm64"
+IUSE="+X abi_x86_32 abi_x86_64 kernel-open persistenced powerd +static-libs +tools wayland"
+REQUIRED_USE="kernel-open? ( modules )"
+
+COMMON_DEPEND="
+	acct-group/video
+	X? ( x11-libs/libpciaccess )
+	persistenced? (
+		acct-user/nvpd
+		net-libs/libtirpc:=
+	)
+	tools? (
+		>=app-accessibility/at-spi2-core-2.46:2
+		dev-libs/glib:2
+		dev-libs/jansson:=
+		media-libs/harfbuzz:=
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3[X]
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXxf86vm
+		x11-libs/pango
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-libs/openssl:0/3
+	sys-libs/glibc
+	X? (
+		media-libs/libglvnd[X,abi_x86_32(-)?]
+		x11-libs/libX11[abi_x86_32(-)?]
+		x11-libs/libXext[abi_x86_32(-)?]
+	)
+	powerd? ( sys-apps/dbus[abi_x86_32(-)?] )
+	wayland? (
+		gui-libs/egl-gbm
+		>=gui-libs/egl-wayland-1.1.10
+	)
+"
+DEPEND="
+	${COMMON_DEPEND}
+	static-libs? (
+		x11-base/xorg-proto
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	tools? (
+		media-libs/libglvnd
+		sys-apps/dbus
+		x11-base/xorg-proto
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libvdpau
+	)
+"
+BDEPEND="
+	sys-devel/m4
+	virtual/pkgconfig
+"
+
+QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
+
+PATCHES=(
+	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
+	"${FILESDIR}"/nvidia-settings-530.30.02-desktop.patch
+)
+
+pkg_setup() {
+	use modules && [[ ${MERGE_TYPE} != binary ]] || return
+
+	local CONFIG_CHECK="
+		PROC_FS
+		~DRM_KMS_HELPER
+		~SYSVIPC
+		~!LOCKDEP
+		~!SLUB_DEBUG_ON
+		!DEBUG_MUTEXES
+		$(usev powerd '~CPU_FREQ')
+	"
+
+	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
+	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
+	Cannot be directly selected in the kernel's menuconfig, and may need
+	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
+	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
+
+	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
+
+	use kernel-open && CONFIG_CHECK+=" MMU_NOTIFIER" #843827
+	local ERROR_MMU_NOTIFIER="CONFIG_MMU_NOTIFIER: is not set but needed to build with USE=kernel-open.
+	Cannot be directly selected in the kernel's menuconfig, and may need
+	selection of another option that requires it such as CONFIG_KVM."
+
+	linux-mod-r1_pkg_setup
+}
+
+src_prepare() {
+	# make patches usable across versions
+	rm nvidia-modprobe && mv nvidia-modprobe{-${PV},} || die
+	rm nvidia-persistenced && mv nvidia-persistenced{-${PV},} || die
+	rm nvidia-settings && mv nvidia-settings{-${PV},} || die
+	rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
+	mv NVIDIA-kernel-module-source-${PV} kernel-module-source || die
+
+	default
+
+	# prevent detection of incomplete kernel DRM support (bug #603818)
+	sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
+		-i kernel{,-module-source/kernel-open}/conftest.sh || die
+
+	# adjust service files
+	sed 's/__USER__/nvpd/' \
+		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
+		> "${T}"/nvidia-persistenced.service || die
+	sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die
+
+	# use alternative vulkan icd option if USE=-X (bug #909181)
+	use X || sed -i 's/"libGLX/"libEGL/' nvidia_{layers,icd}.json || die
+
+	# enable nvidia-drm.modeset=1 by default with USE=wayland
+	cp "${FILESDIR}"/nvidia-545.conf "${T}"/nvidia.conf || die
+	use !wayland || sed -i '/^#.*modeset=1$/s/^#//' "${T}"/nvidia.conf || die
+
+	# makefile attempts to install wayland library even if not built
+	use wayland || sed -i 's/ WAYLAND_LIB_install$//' \
+		nvidia-settings/src/Makefile || die
+}
+
+src_compile() {
+	tc-export AR CC CXX LD OBJCOPY OBJDUMP PKG_CONFIG
+
+	local xnvflags=-fPIC #840389
+	# lto static libraries tend to cause problems without fat objects
+	tc-is-lto && xnvflags+=" $(test-flags-CC -ffat-lto-objects)"
+
+	NV_ARGS=(
+		PREFIX="${EPREFIX}"/usr
+		HOST_CC="$(tc-getBUILD_CC)"
+		HOST_LD="$(tc-getBUILD_LD)"
+		BUILD_GTK2LIB=
+		NV_USE_BUNDLED_LIBJANSSON=0
+		NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
+		WAYLAND_AVAILABLE=$(usex wayland 1 0)
+		XNVCTRL_CFLAGS="${xnvflags}"
+	)
+
+	if use modules; then
+		local o_cflags=${CFLAGS} o_cxxflags=${CXXFLAGS} o_ldflags=${LDFLAGS}
+
+		local modlistargs=video:kernel
+		if use kernel-open; then
+			modlistargs+=-module-source:kernel-module-source/kernel-open
+
+			# environment flags are normally unused for modules, but nvidia
+			# uses it for building the "blob" and it is a bit fragile
+			filter-flags -fno-plt #912949
+			filter-lto
+			CC=${KERNEL_CC} CXX=${KERNEL_CXX} strip-unsupported-flags
+		fi
+
+		local modlist=( nvidia{,-drm,-modeset,-peermem,-uvm}=${modlistargs} )
+		local modargs=(
+			IGNORE_CC_MISMATCH=yes NV_VERBOSE=1
+			SYSOUT="${KV_OUT_DIR}" SYSSRC="${KV_DIR}"
+		)
+
+		# temporary workaround for bug #914468
+		CPP="${KERNEL_CC} -E" tc-is-clang && addpredict "${KV_OUT_DIR}"
+
+		linux-mod-r1_src_compile
+		CFLAGS=${o_cflags} CXXFLAGS=${o_cxxflags} LDFLAGS=${o_ldflags}
+	fi
+
+	emake "${NV_ARGS[@]}" -C nvidia-modprobe
+	use persistenced && emake "${NV_ARGS[@]}" -C nvidia-persistenced
+	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig
+
+	if use tools; then
+		# avoid noisy *very* noisy logs with deprecation warnings
+		CFLAGS="-Wno-deprecated-declarations ${CFLAGS}" \
+			emake "${NV_ARGS[@]}" -C nvidia-settings
+	elif use static-libs; then
+		# pretend GTK+3 is available, not actually used (bug #880879)
+		emake "${NV_ARGS[@]}" BUILD_GTK3LIB=1 \
+			-C nvidia-settings/src out/libXNVCtrl.a
+	fi
+}
+
+src_install() {
+	local libdir=$(get_libdir) libdir32=$(ABI=x86 get_libdir)
+
+	NV_ARGS+=( DESTDIR="${D}" LIBDIR="${ED}"/usr/${libdir} )
+
+	local -A paths=(
+		[APPLICATION_PROFILE]=/usr/share/nvidia
+		[CUDA_ICD]=/etc/OpenCL/vendors
+		[EGL_EXTERNAL_PLATFORM_JSON]=/usr/share/egl/egl_external_platform.d
+		[FIRMWARE]=/lib/firmware/nvidia/${PV}
+		[GBM_BACKEND_LIB_SYMLINK]=/usr/${libdir}/gbm
+		[GLVND_EGL_ICD_JSON]=/usr/share/glvnd/egl_vendor.d
+		[OPENGL_DATA]=/usr/share/nvidia
+		[VULKAN_ICD_JSON]=/usr/share/vulkan
+		[WINE_LIB]=/usr/${libdir}/nvidia/wine
+		[XORG_OUTPUTCLASS_CONFIG]=/usr/share/X11/xorg.conf.d
+
+		[GLX_MODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules/extensions
+		[GLX_MODULE_SYMLINK]=/usr/${libdir}/xorg/modules
+		[XMODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules
+	)
+
+	local skip_files=(
+		$(usev !X "libGLX_nvidia libglxserver_nvidia")
+		libGLX_indirect # non-glvnd unused fallback
+		libnvidia-{gtk,wayland-client} nvidia-{settings,xconfig} # from source
+		libnvidia-egl-gbm 15_nvidia_gbm # gui-libs/egl-gbm
+		libnvidia-egl-wayland 10_nvidia_wayland # gui-libs/egl-wayland
+		libnvidia-pkcs11.so # using the openssl3 version instead
+	)
+	local skip_modules=(
+		$(usev !X "nvfbc vdpau xdriver")
+		$(usev !modules gsp)
+		$(usev !powerd powerd)
+		installer nvpd # handled separately / built from source
+	)
+	local skip_types=(
+		GLVND_LIB GLVND_SYMLINK EGL_CLIENT.\* GLX_CLIENT.\* # media-libs/libglvnd
+		OPENCL_WRAPPER.\* # virtual/opencl
+		DOCUMENTATION DOT_DESKTOP .\*_SRC DKMS_CONF SYSTEMD_UNIT # handled separately / unused
+	)
+
+	local DOCS=(
+		README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
+		nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
+	)
+	local HTML_DOCS=( html/. )
+	einstalldocs
+
+	local DISABLE_AUTOFORMATTING=yes
+	local DOC_CONTENTS="\
+Trusted users should be in the 'video' group to use NVIDIA devices.
+You can add yourself by using: gpasswd -a my-user video\
+$(usev modules "
+
+Like all out-of-tree kernel modules, it is necessary to rebuild
+${PN} after upgrading or rebuilding the Linux kernel
+by for example running \`emerge @module-rebuild\`. Alternatively,
+if using a distribution kernel (sys-kernel/gentoo-kernel{,-bin}),
+this can be automated by setting USE=dist-kernel globally.
+
+Loaded kernel modules also must not mismatch with the installed
+${PN} version (excluding -r revision), meaning should
+ensure \`eselect kernel list\` points to the kernel that will be
+booted before building and preferably reboot after upgrading
+${PN} (the ebuild will emit a warning if mismatching).
+
+See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.")\
+$(use amd64 && usev !abi_x86_32 "
+
+Note that without USE=abi_x86_32 on ${PN}, 32bit applications
+(typically using wine / steam) will not be able to use GPU acceleration.")
+
+For additional information or for troubleshooting issues, please see
+https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers and NVIDIA's own
+documentation that is installed alongside this README."
+	readme.gentoo_create_doc
+
+	if use modules; then
+		linux-mod-r1_src_install
+
+		insinto /etc/modprobe.d
+		doins "${T}"/nvidia.conf
+
+		# used for gpu verification with binpkgs (not kept, see pkg_preinst)
+		insinto /usr/share/nvidia
+		doins supported-gpus/supported-gpus.json
+	fi
+
+	emake "${NV_ARGS[@]}" -C nvidia-modprobe install
+	fowners :video /usr/bin/nvidia-modprobe #505092
+	fperms 4710 /usr/bin/nvidia-modprobe
+
+	if use persistenced; then
+		emake "${NV_ARGS[@]}" -C nvidia-persistenced install
+		newconfd "${FILESDIR}"/nvidia-persistenced.confd nvidia-persistenced
+		newinitd "${FILESDIR}"/nvidia-persistenced.initd nvidia-persistenced
+		systemd_dounit "${T}"/nvidia-persistenced.service
+	fi
+
+	if use tools; then
+		emake "${NV_ARGS[@]}" -C nvidia-settings install
+
+		doicon nvidia-settings/doc/nvidia-settings.png
+		domenu nvidia-settings/doc/nvidia-settings.desktop
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	if use static-libs; then
+		dolib.a nvidia-settings/src/out/libXNVCtrl.a
+
+		insinto /usr/include/NVCtrl
+		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
+	fi
+
+	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig install
+
+	# mimic nvidia-installer by reading .manifest to install files
+	# 0:file 1:perms 2:type 3+:subtype/arguments -:module
+	local m into
+	while IFS=' ' read -ra m; do
+		! [[ ${#m[@]} -ge 2 && ${m[-1]} =~ MODULE: ]] ||
+			[[ " ${m[0]##*/}" =~ ^(\ ${skip_files[*]/%/.*|\\} )$ ]] ||
+			[[ " ${m[2]}" =~ ^(\ ${skip_types[*]/%/|\\} )$ ]] ||
+			has ${m[-1]#MODULE:} "${skip_modules[@]}" && continue
+
+		case ${m[2]} in
+			MANPAGE)
+				gzip -dc ${m[0]} | newman - ${m[0]%.gz}; assert
+				continue
+			;;
+			GBM_BACKEND_LIB_SYMLINK) m[4]=../${m[4]};; # missing ../
+			VDPAU_SYMLINK) m[4]=vdpau/; m[5]=${m[5]#vdpau/};; # .so to vdpau/
+		esac
+
+		if [[ -v 'paths[${m[2]}]' ]]; then
+			into=${paths[${m[2]}]}
+		elif [[ ${m[2]} == EXPLICIT_PATH ]]; then
+			into=${m[3]}
+		elif [[ ${m[2]} == *_BINARY ]]; then
+			into=/opt/bin
+		elif [[ ${m[3]} == COMPAT32 ]]; then
+			use abi_x86_32 || continue
+			into=/usr/${libdir32}
+		elif [[ ${m[2]} == *_@(LIB|SYMLINK) ]]; then
+			into=/usr/${libdir}
+		else
+			die "No known installation path for ${m[0]}"
+		fi
+		[[ ${m[3]: -2} == ?/ ]] && into+=/${m[3]%/}
+		[[ ${m[4]: -2} == ?/ ]] && into+=/${m[4]%/}
+
+		if [[ ${m[2]} =~ _SYMLINK$ ]]; then
+			[[ ${m[4]: -1} == / ]] && m[4]=${m[5]}
+			dosym ${m[4]} ${into}/${m[0]}
+			continue
+		fi
+		[[ ${m[0]} =~ ^libnvidia-ngx.so|^libnvidia-egl-gbm.so ]] &&
+			dosym ${m[0]} ${into}/${m[0]%.so*}.so.1 # soname not in .manifest
+
+		printf -v m[1] %o $((m[1] | 0200)) # 444->644
+		insopts -m${m[1]}
+		insinto ${into}
+		doins ${m[0]}
+	done < .manifest || die
+	insopts -m0644 # reset
+
+	# MODULE:installer non-skipped extras
+	: "$(systemd_get_sleepdir)"
+	exeinto "${_#"${EPREFIX}"}"
+	doexe systemd/system-sleep/nvidia
+	dobin systemd/nvidia-sleep.sh
+	systemd_dounit systemd/system/nvidia-{hibernate,resume,suspend}.service
+
+	dobin nvidia-bug-report.sh
+
+	# MODULE:powerd extras
+	if use powerd; then
+		newinitd "${FILESDIR}"/nvidia-powerd.initd nvidia-powerd #923117
+		systemd_dounit systemd/system/nvidia-powerd.service
+
+		insinto /usr/share/dbus-1/system.d
+		doins nvidia-dbus.conf
+	fi
+
+	# symlink non-versioned so nvidia-settings can use it even if misdetected
+	dosym nvidia-application-profiles-${PV}-key-documentation \
+		${paths[APPLICATION_PROFILE]}/nvidia-application-profiles-key-documentation
+
+	# don't attempt to strip firmware files (silences errors)
+	dostrip -x ${paths[FIRMWARE]}
+
+	# sandbox issues with /dev/nvidiactl others (bug #904292,#921578)
+	# are widespread and sometime affect revdeps of packages built with
+	# USE=opencl/cuda making it hard to manage in ebuilds (minimal set,
+	# ebuilds should handle manually if need others or addwrite)
+	insinto /etc/sandbox.d
+	newins - 20nvidia <<<'SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-caps:/dev/char"'
+}
+
+pkg_preinst() {
+	has_version "${CATEGORY}/${PN}[kernel-open]" && NV_HAD_KERNEL_OPEN=
+	has_version "${CATEGORY}/${PN}[wayland]" && NV_HAD_WAYLAND=
+
+	use modules || return
+
+	# set video group id based on live system (bug #491414)
+	local g=$(egetent group video | cut -d: -f3)
+	[[ ${g} =~ ^[0-9]+$ ]] || die "Failed to determine video group id (got '${g}')"
+	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
+
+	# try to find driver mismatches using temporary supported-gpus.json
+	for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
+		g=$(grep -io "\"devid\":\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
+			"${ED}"/usr/share/nvidia/supported-gpus.json 2>/dev/null)
+		if [[ ${g} ]]; then
+			g=$((${g##*\"}+1))
+			if ver_test -ge ${g}; then
+				NV_LEGACY_MASK=">=${CATEGORY}/${PN}-${g}"
+				break
+			fi
+		fi
+	done
+	rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
+}
+
+pkg_postinst() {
+	linux-mod-r1_pkg_postinst
+
+	readme.gentoo_print_elog
+
+	if [[ -r /proc/driver/nvidia/version &&
+		$(</proc/driver/nvidia/version) != *"  ${PV}  "* ]]; then
+		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
+		ewarn "libraries and may prevent launching GPU-accelerated applications."
+		if use modules; then
+			ewarn "Easiest way to fix this is normally to reboot. If still run into issues"
+			ewarn "(e.g. API mismatch messages in the \`dmesg\` output), please verify"
+			ewarn "that the running kernel is ${KV_FULL} and that (if used) the"
+			ewarn "initramfs does not include NVIDIA modules (or at least, not old ones)."
+		fi
+	fi
+
+	if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
+		ewarn "Detected that the current kernel command line is using 'slub_debug=',"
+		ewarn "this may lead to system instability/freezes with this version of"
+		ewarn "${PN}. Bug: https://bugs.gentoo.org/796329"
+	fi
+
+	if [[ -v NV_LEGACY_MASK ]]; then
+		ewarn
+		ewarn "***WARNING***"
+		ewarn
+		ewarn "You are installing a version of ${PN} known not to work"
+		ewarn "with a GPU of the current system. If unwanted, add the mask:"
+		if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
+			ewarn "  echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
+		else
+			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
+		fi
+		ewarn "...then downgrade to a legacy[1] branch if possible (not all old versions"
+		ewarn "are available or fully functional, may need to consider nouveau[2])."
+		ewarn "[1] https://www.nvidia.com/object/IO_32667.html"
+		ewarn "[2] https://wiki.gentoo.org/wiki/Nouveau"
+	fi
+
+	if use kernel-open && [[ ! -v NV_HAD_KERNEL_OPEN ]]; then
+		ewarn
+		ewarn "Open source variant of ${PN} was selected, be warned it is experimental"
+		ewarn "and only for modern GPUs (e.g. GTX 1650+). Try to disable if run into issues."
+		ewarn "Please also see: ${EROOT}/usr/share/doc/${PF}/html/kernel_open.html"
+	fi
+
+	if use wayland && use modules && [[ ! -v NV_HAD_WAYLAND ]]; then
+		elog
+		elog "With USE=wayland, this version of ${PN} sets nvidia-drm.modeset=1"
+		elog "in '${EROOT}/etc/modprobe.d/nvidia.conf'. This feature is considered"
+		elog "experimental but is required for wayland."
+		elog
+		elog "If you experience issues, either disable wayland or edit nvidia.conf."
+		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
+	fi
+}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index fededc568225..e9372216b8c7 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 893ed633ed6c..c4d76fe9e8bc 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -14,5 +14,5 @@ DIST gtk+-3.24.41.tar.xz 13188312 BLAKE2B fbded114fe2b5c1c7bffe79d0a22d559f97081
 EBUILD gtk+-2.24.33-r3.ebuild 9873 BLAKE2B 2c8a9b6615fbf5a53f6bc4ffbe35455029a9401886a7c74258c52a542615a47ef67b3cc59a1b96fab194d8ce4106469d13b7466462473265b3c7d83beb5e14ff SHA512 c807aa90c4289afcebd66ea67b77dd844ff74e3aa7f54ddd0276b4d6df5286f5331ff5a05a88133f67ef4fcee50fb671e96d064acb40b0c03d69043d780be4e2
 EBUILD gtk+-3.24.35.ebuild 6975 BLAKE2B 0f546d052435348f1eb7fe32c286e599d949d078170034f43ff145ad37f5b7212bf39bbd6efe6e6a700ea9d803145b44f1c20db411676b0e43a7cbe78685e3aa SHA512 8567a382f37b0ee50ab8a38104ed9027b4b36f97e23db6ea9ed62d9031e2526d8382fd483363bb5d3133b1178a1addf747218945fd52f845e2540a729bd90a4e
 EBUILD gtk+-3.24.39.ebuild 5692 BLAKE2B 31a0d449153f1ce7ecebd1f1bab8309accae2f80e0f25648172150508b58e2a8ec81bb68ea8706a1a0ae4be7fc58e5f696428f69df1c04bbf832be0d72a3a45e SHA512 38079f36b740c6787c287506420e2aa7b228de83986386811c329e2227e5b4e8f2a9680acb91c401e30082f7d42bbb1d4db617994f2d6243895656835c3cb574
-EBUILD gtk+-3.24.41.ebuild 5694 BLAKE2B 0166af1529147818810fd3da62372aeaa757dd8760031635d55e3a51a31b19f2ea810f183f964f4f546d939b099394cf4e3a4bcc64142679b3c93e9f52350f30 SHA512 395b04880258142854309fc0815315fd4d445230796c38229ea7112a96baa9549a165a573f6c64973008112c3c120e137e240831aa690e43d515b4af0620730c
+EBUILD gtk+-3.24.41.ebuild 5693 BLAKE2B 5019e079b574cb64bc0c9e4de1176ecfd21704d61ecb1b89cc3a31f331ec927575129bcec362272635ab69bd6119b7aaea85c85ec2b9a6dd3dbd490475772450 SHA512 97ed6ad174d1530c12c29952d9973ddfed25ff017a81310d537802f0352fcebe22fa943ddaae427192e0d705e1dc381d6532d2c3b58e0e0766a86853a3eac4e0
 MISC metadata.xml 1041 BLAKE2B 00e12e2caeeb34f9b79de3340f677ee56569fdd977169e5d7c28678936646170b8e5c51c697385453eae323e6dd8948b074caa5928298afb46717589def22a6f SHA512 82401f5bdd721846511ce9364b672a0dfb47c434ac9187bdb361265c7c83698f0777f99ce563f65daddeb03e4abf3741721de3a4589980779d3a7417f64f427e
diff --git a/x11-libs/gtk+/gtk+-3.24.41.ebuild b/x11-libs/gtk+/gtk+-3.24.41.ebuild
index 1e1bfd79460d..14b6bfc00a1f 100644
--- a/x11-libs/gtk+/gtk+-3.24.41.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.41.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 "
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 
 COMMON_DEPEND="
 	>=app-accessibility/at-spi2-core-2.46.0[introspection?,${MULTILIB_USEDEP}]
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 995acc795d64..78d965cc177e 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index ca06c9de592f..1740c56875e7 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -1,8 +1,6 @@
 DIST dunst-1.10.0.tar.gz 4639084 BLAKE2B 29056b55aa53e20d4d9f0be5ff560aaad3829a933f30fd6a6f17f5e6adb9f4ca3b659dc977959f69224a2847a116043215e05097e9eaae4556ec02c1852c4a05 SHA512 e7e453c9470a063cdee4602315b22c1c8bcbf1405d3c295bccf01ae4e1b535e11b7323313b63cfc510e38ea8243117d550e6057df15924bbd4efb7e0b7f9a709
-DIST dunst-1.9.1.tar.gz 4614410 BLAKE2B f2d3b5ca28ac74461e31c09f7c5f8369dd6d05e8133d184625344b5445fac8e673cf5c57d44ea8bf0f3d320167663529ea49e8de0ed873afae327cb7db55d5ff SHA512 6045529196c2d8bd89d2976db9712bf15ec75923fdab414870e1ae2af2eb87afc2b5886cb707a19ea113ec746f90fde1e52631eec9b7a96f1af03acbe6445f32
-DIST dunst-1.9.2.tar.gz 4614703 BLAKE2B bcdb3f36dd9af546288c35ffc90f08b219b1b4d1d11233b09acfbe9e6287dcfd856200310d88115a6009485af5e9b0d4e2933bff9cade38969cea31b167c9b5b SHA512 fab14212dc41e8deed97320c18b88e0be576f0404406691dcedb9620a1382dfdfc501e4ff2005b1ce8b4a61b52f1a9cf161f20a1eae15aa2382f3fedc99a2dbc
-EBUILD dunst-1.10.0.ebuild 1931 BLAKE2B 17090fe07748d628ed3b58dc247aaab8daeae5ed66bda098fcd53312a7c093775ca6450cba834a37ca128c29c9690b90e6c8f2262ec3d38e193b77c3d81ebfd3 SHA512 46aa0fb19ab3d8f698fdf2c4941586f255e5256f799de6b8ce765d67c6505e5b15d0c38d4eab21b662649f0ff87e4e3279688eaa040e0f64d8ac6609a91c2ca9
-EBUILD dunst-1.9.1.ebuild 1715 BLAKE2B 3b9208e105c31b2f70ce48198fbfe707291ccd29d89c049a91e9331fb0351186a4a59755f77dbe0d2b8b70063032fca7f2434855743a6f421875715d28fe5f46 SHA512 bf0fba1d98d126ea3fc287d6fbe702bbf9e20db1122fd7d40d86ecb0a0f04a558621d678995e90f199ea7b2864afdce4341ca2f937c5e856fe1574f74f953051
-EBUILD dunst-1.9.2.ebuild 1715 BLAKE2B 3b9208e105c31b2f70ce48198fbfe707291ccd29d89c049a91e9331fb0351186a4a59755f77dbe0d2b8b70063032fca7f2434855743a6f421875715d28fe5f46 SHA512 bf0fba1d98d126ea3fc287d6fbe702bbf9e20db1122fd7d40d86ecb0a0f04a558621d678995e90f199ea7b2864afdce4341ca2f937c5e856fe1574f74f953051
-EBUILD dunst-9999.ebuild 1795 BLAKE2B 8fdb494697a62b6765d7b99f4d627cff8516345e889876598a2f0e60d58b4bcaa71574e20ae3b9b42253a0c13c7c684685fd0233c1e87e847bb24b7b8787ad83 SHA512 bf310cc1673e81fe7b21e9a22d1ca1c8b3ac23c4db4e262e448d56a1daad1aed43045b5296b4b00bd5f049d940fed074ba5c0d90f59463fc023e98ff3f5db447
+DIST dunst-1.11.0.tar.gz 4645279 BLAKE2B 0daa8d098f032a0e3b16872bc2e33c8411e8eed543fc13533e649935d2d0796ad74b3fb27769f839972b335b7a2f7ae6b5efd9f324a8bb807ac2f82fa8611a5d SHA512 84c9edccddd183fb867233cb5377115d96735f4c1be84007194ac39dd48d913e5bb021d2952057aecdb978564c2471a8974c4ee4eeccfb188e5345527007a5c4
+EBUILD dunst-1.10.0.ebuild 1929 BLAKE2B 8d57c4c4002a5a997074a9456a024bf1e6c30cd5e286d8bc761cf5759542cdbda25ea3ffdeb2e223d440e46cf7e23522ae8e8210e3bed409dea0ddaac623bbe8 SHA512 b3757cf02871dd1aef6325c14a5af33060527121ee2682139db8da9a1c8fcd0fb09f083d67bb7827a12c9616c2b212d16503fa006dce1a9332baa9379d859d8b
+EBUILD dunst-1.11.0.ebuild 1595 BLAKE2B bac04bdc0579bf88041a3d8d395b10edb9e9ab57915fecd7a2e7eaf326b0b2f15d7214d2d9a7552f863847eb8b9df4410ecc84ac73ef0f64c1c833977a9945c3 SHA512 e4798e02c03ecbe5bbe45f9ba931255c04344563ef55bfb5315f104f490a0680d1f7558c7a86228892a6f7f487e67fede7fbadc8a06f6177fa1c17fb31260047
+EBUILD dunst-9999.ebuild 1431 BLAKE2B 1080fd19995417f83864689dee591fde1fd01d25a0fd6a4950baf751702c40d68cab2b3c8ead8a1012864faeb7fc1e497dd169f5706b10a24ec7c0d117a34833 SHA512 1f26d5d0d4ced83ebf460b19b197f2b06059131cc5ca50b08b68366da049c1ed905a5350cf0133dc26aac9bc687be3952b8ce9b64d9ffac58c3b0758f67fb106
 MISC metadata.xml 335 BLAKE2B a51f44edaf12235d9edf8f84d2df6d1a94ddd894075d708f0dfd4b3d289b0225797083cfe7c02a92688d23bb47daadcdd9751c6b740ca1cf0d69b9c1ab957b8e SHA512 7010391e438ab56478c3f2c0bd92afcbe9dcedb55ec89ee3af75c89365811af2b7f198bc64adae95de5fadd6603792d1d3fd60b46840d564a920c571d3c67e20
diff --git a/x11-misc/dunst/dunst-1.10.0.ebuild b/x11-misc/dunst/dunst-1.10.0.ebuild
index a8f132ef8e64..5ac47fb06765 100644
--- a/x11-misc/dunst/dunst-1.10.0.ebuild
+++ b/x11-misc/dunst/dunst-1.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="wayland"
 
 DEPEND="
diff --git a/x11-misc/dunst/dunst-1.9.1.ebuild b/x11-misc/dunst/dunst-1.11.0.ebuild
index f054ef05620c..37b4346e96b7 100644
--- a/x11-misc/dunst/dunst-1.9.1.ebuild
+++ b/x11-misc/dunst/dunst-1.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="wayland"
 
 DEPEND="
@@ -75,9 +75,5 @@ src_install() {
 
 	emake "${myemakeargs[@]}" install
 
-	insinto /usr/share/zsh/site-functions
-	newins contrib/_dunst.zshcomp _dunst
-	newins contrib/_dunstctl.zshcomp _dunstctl
-
 	systemd_newuserunit dunst.systemd.service.in dunst.service
 }
diff --git a/x11-misc/dunst/dunst-1.9.2.ebuild b/x11-misc/dunst/dunst-1.9.2.ebuild
deleted file mode 100644
index f054ef05620c..000000000000
--- a/x11-misc/dunst/dunst-1.9.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="Lightweight replacement for common notification daemons"
-HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst"
-SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="wayland"
-
-DEPEND="
-	dev-libs/glib:2
-	sys-apps/dbus
-	x11-libs/cairo[X,glib]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXScrnSaver
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libnotify
-	x11-libs/pango[X]
-	x11-misc/xdg-utils
-	wayland? ( dev-libs/wayland )
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig
-	wayland? ( dev-libs/wayland-protocols )
-"
-
-src_prepare() {
-	default
-
-	# Respect users CFLAGS
-	sed -e 's/-Os//' -i config.mk || die
-
-	# Use correct path for dbus and system unit
-	sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i dunst.systemd.service.in || die
-	sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i org.knopwob.dunst.service.in || die
-}
-
-src_configure() {
-	tc-export CC PKG_CONFIG
-
-	default
-}
-
-src_compile() {
-	local myemakeargs=(
-		SYSCONFDIR="${EPREFIX}/etc/xdg"
-		SYSTEMD="0"
-		WAYLAND="$(usex wayland 1 0)"
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	local myemakeargs=(
-		PREFIX="${ED}/usr"
-		SYSCONFDIR="${ED}/etc/xdg"
-		SYSTEMD="0"
-		WAYLAND="$(usex wayland 1 0)"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	insinto /usr/share/zsh/site-functions
-	newins contrib/_dunst.zshcomp _dunst
-	newins contrib/_dunstctl.zshcomp _dunstctl
-
-	systemd_newuserunit dunst.systemd.service.in dunst.service
-}
diff --git a/x11-misc/dunst/dunst-9999.ebuild b/x11-misc/dunst/dunst-9999.ebuild
index f69ffaa99763..901f3e6a33b9 100644
--- a/x11-misc/dunst/dunst-9999.ebuild
+++ b/x11-misc/dunst/dunst-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit git-r3 shell-completion systemd toolchain-funcs
+inherit git-r3 systemd toolchain-funcs
 
 EGIT_REPO_URI="https://github.com/dunst-project/dunst"
 
@@ -74,13 +74,5 @@ src_install() {
 
 	emake "${myemakeargs[@]}" install
 
-	newbashcomp completions/dunst.bashcomp dunst
-	newbashcomp completions/dunstctl.bashcomp dunstctl
-	newfishcomp completions/dunst.fishcomp dunst
-	newfishcomp completions/dunstctl.fishcomp dunstctl
-	newfishcomp completions/dunstify.fishcomp dunstify
-	newzshcomp completions/_dunst.zshcomp _dunst
-	newzshcomp completions/_dunstctl.zshcomp _dunstctl
-
 	systemd_newuserunit dunst.systemd.service.in dunst.service
 }
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 9ceed6533560..42bf3942f12e 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/thunar-vcs-plugin/Manifest b/xfce-extra/thunar-vcs-plugin/Manifest
index f89b5198b936..8567e2e69449 100644
--- a/xfce-extra/thunar-vcs-plugin/Manifest
+++ b/xfce-extra/thunar-vcs-plugin/Manifest
@@ -1,3 +1,4 @@
 DIST thunar-vcs-plugin-0.2.0.tar.bz2 546608 BLAKE2B ccd0d057e358b321b6287284c25ee03c4252f5e120fcba9272139ebf0739ee7363e619da12f86e725abc70d4834451ec112386ba2b008b038c03571d26349f51 SHA512 c33f54caa2f27de6c8f9e5cb8368f7538ea82730f1364ad974b19017a25bc6a398c19dfe861b0d0133db08ee36e4e209c8d824ce07de0c2ae6da830aca9e7e68
+EBUILD thunar-vcs-plugin-0.2.0-r1.ebuild 1017 BLAKE2B 6eef4999d72949ec270df2f9386b7975985c2abbd3dadec373ba135ae9222ac41b8a282c8c818ff43336e7a9f9210337c753f370c07db7bd91ac0d8c2f5052d2 SHA512 b3da9d8f40919a230d682db742ca1b0a2976c60547473bbc00d9385b876043eb283468917ab92ff0eb700f4e7918fc26700288ff032bd206d5c69a36ce406635
 EBUILD thunar-vcs-plugin-0.2.0.ebuild 1016 BLAKE2B c5fe0ac3fe6d1d4abc5c5853311c70c8d9851dc4b737488af6a9d4e69db4c9fe6fcffca762ccc5715882cde1da46baefecddd391cbecda652167975b4c1d563f SHA512 1725a2c89dfca909a880ee4b4a0d97f131090da5a175fd381e0938d5634bd06c7d3f8dd1192b163e6e2040cd8ccb81a504b10c216ff9f96cf1dfa84c443f7ba1
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.2.0-r1.ebuild b/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..172f183a5c92
--- /dev/null
+++ b/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.2.0-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Adds Subversion and GIT actions to the context menu of thunar"
+HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-vcs-plugin"
+SRC_URI="https://archive.xfce.org/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="+git +subversion"
+
+RDEPEND=">=dev-libs/glib-2.32:2=
+	>=x11-libs/gtk+-3.20:3=
+	>=xfce-base/exo-0.11.4:=
+	>=xfce-base/libxfce4util-4.12:=
+	>=xfce-base/thunar-1.7:=
+	git? ( dev-vcs/git )
+	subversion? (
+		>=dev-libs/apr-0.9.7:=
+		>=dev-vcs/subversion-1.5:=
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/intltool
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		$(use_enable subversion)
+		$(use_enable git)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
author	V3n3RiX <venerix@koprulu.sector>	2024-04-18 12:04:39 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2024-04-18 12:04:39 +0100
commit	2d01b3d133c0fbf17de8d7b47905585af88bd6e4 (patch)
tree	f74eb9a3d16ed25f8c15b825f4d28b759ae99a42
parent	97bacba3ead078e5db8b87ab651a3ffa7d82f60f (diff)