gentoo auto-resync : 29:03:2024 - 19:13:18

420 files changed, 2940 insertions, 6288 deletions

diff --git a/Manifest b/Manifest
index eb76c0984488..1a779aabd248 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29786 BLAKE2B 6e0334edee8c4a5de214b413f4c2056a2b7c4287fd1f312f955048a830406dad6a11e9a2c258b4d42d52affee6882103a913e1fc2bebd3fe9bcdbf27625f6f98 SHA512 52f6b745aebf280e3cd19688220f148c96a839ca23406e40f16cbece10d9a5b8c3db8a2056d291c7f93fc00be9adfd8bcdc8e63e723d3dd9073f034e5b458a04
-TIMESTAMP 2024-03-29T12:40:31Z
+MANIFEST Manifest.files.gz 29777 BLAKE2B 8d7dca10e28f6f606c8b6b87f51cca00f89f69f4e5ffbc73b4a4d51d020a2ace83161d5efa998ef337fbb3d0f4b9717b71d8e98a1fd3fd31843aed778707721e SHA512 7a794e919621be6b99820582ddef8eadf3fd6b404cb304d3602425ab6d63392ed11da18adc47d38e66a582b0bf9a6ba07da8526b4c26d0b4799f3e6e086c5457
+TIMESTAMP 2024-03-29T18:40:31Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYGtr9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYHCx9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBjGBAAoa3MDYT5UB90FCe8s2BPcqHqb/qMCoGwzkzm4iCLuIlb2bFw3iYe085I
-0jEp2za3RcWbH/4j1YFJVYVntY4e8oRGbz7E4Nh0Fo0/LBXXEhLHP0XxVRbSghRl
-IMeGKNdnEy/SHH9PQr6bCsTm7+JPpdg2gwssHBzVsWpLhnbVAVXuNuX8GaDxglvZ
-QVf2CQXEzx1/3Jj7Fo3X3fJ0OhwQkYrTeif8jlMFoFiO+uNDWpcrdS0pbi3Zx+Mx
-mUGmeVbxhlD9q1/oHg+TRYlaHs6wOECDvAXBIg/REuejH0KEdZdY3eufNOdfBvt+
-mQOlC1APqx3TJzT8bxcoywy8AUQNx8UGN5qD5CkxMXkXVaFArl2DsU3yHJiWD6Wi
-xNXq55rc6SqXikpWgdZuq8qdy3pWIY5a6ET/qbEHhgMlBHQPPHtqtAuR/mpzWVB5
-J8v2U6vpaqMRQf47WtSqb3V7cczGX/eUVBzwTy60U9mCVpJg98nlMIPpl5WGYdCq
-eHy+RyiBX3dUxd6U4nynNQi+6L4kKZ9elw7EvWY4RbekC0C+Vmrk3B4dnB3v+ua6
-b40/5FXzV0y6UqZMCFT/sQwxfkIVmyQg9ssNpe5NOXx5+IFAQCMT+JGoUtzc6hjP
-SUlKHa38BvegZGsvZrTKlDDEgvC1K1ODs32v1Rpswwamo0tlgfc=
-=y2jv
+klCWYg//bXuXVEZt8RoFoRM7AdUL56T/thfqv+MHbHmErNs85J2pumIqtkky5z40
+uwV1y0fcYhS82WnDT8TmeEsCJjIig20P8nBTTFdFn3OXNGbsTi9JC0OQz087oXs/
+1dd6yx1/+qt3J8Vklp0NLo5S23va06IrGg67lFylEWSp7arXAA6nKiFC80sj5hBp
+rKZBD6sFsdJ85axtosFcAqGk4WounQ8IC4QOSSg4J+FrSUkWaRsQ+TeY2ZrNfALe
+C7lvZOsNuuBjG3p72EqkuiTl3+JFkvMIYf0O7vrjSbcaRVbEXMN4xDz18BbZ38gn
+9jmgY1BMvmxf5ZqrXIUqf85/sNdS09n9Sf5vMGCtY+AD11waBBTzVJlVMJqE74sa
+n7/Jt2dihGzXeZoC7cEhwny3mv7gIDXwF+BpBjDlXins3DpUioKQie5sMAuFlwu0
+XSI7ywP7is4EhQnhU9TZmrLXd1vGUyRDW6q22qGpsEY4NaYwh5KbLyqPIiYUIpGS
+K1INdHWfDAcFckIZcwJoXJa4qI8Th3k+C9Jc0Q+FU9NDCkoUIHiIexyTQIS5K0LL
+nnkWlkLtchsEwv9NPGqnapGWWhBiEY+ujgCrqbgwH9ocx3KeMEPNvyc0NJ94BJb1
+5zC0kkgs6LbDILfRv4eyC5aGVhpsaueUr0D98o/onK3BX1FX5OI=
+=Qra5
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index b652438e7ddb..5974c4570042 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f93e0fdf0c02..b2973639aa4d 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ps_mem/Manifest b/app-admin/ps_mem/Manifest
index f8f73c7c8966..a51eed6f03a9 100644
--- a/app-admin/ps_mem/Manifest
+++ b/app-admin/ps_mem/Manifest
@@ -1,3 +1,3 @@
 DIST ps_mem-3.14.tar.gz 18539 BLAKE2B 29046d2bcef7eafea72921440664ec40b235ddb45d068e1b2edbb40e8318b0245ec320dd6d3b96e3aad9dc2666dd8bdf88686e4bab5ccff832a4de30e4644a15 SHA512 53d9e87e6a35f48b013c7280a954fb95373668e30f41fe3e5a9d2af9b7fb9060f113a80ac5ee3af6e23370058ff3afc8b2c88c99e1666d8422e3c73dc848ee81
-EBUILD ps_mem-3.14-r1.ebuild 665 BLAKE2B 498c712ac47a626d640e2ac9aee33370aea29c7b2f4f50baf23e22f6744a2c87e17a8fb7b73ff2d4460d607910309d31c4f8d6466f2d2fb0fcefde12dcfa0744 SHA512 91f1fc3efd5ac7c972cd119c7425683a3e291a6a4889e3487fe3229e4ee17e76bd865d04be7ec3587a4902bc6d15e97fb8e8a3579a3df197eed0267e5513882a
+EBUILD ps_mem-3.14-r1.ebuild 657 BLAKE2B af67ac022cc9a228419323461e71f2b4eba9c368743d755b532518e38dde1f52eab090b9384b186d9195650462b86bba4725d86352a746362b357e0f9671a877 SHA512 d9f49e7ff7624148d425dc04b546a909df2e127129b44e6aba8bdc5c6223b8a70568c852441c65f4d38f0680862c6459c86622c062b55bbf54f3747dd7378de8
 MISC metadata.xml 316 BLAKE2B bbf16e534e768183ea26fa3e25202cc08b40e2a0c01380903de019963114bd95d144361124279c9ae2e74c3ad75eff5030c2bbdb66b9e51cc5fdefd8b488e274 SHA512 8ac1f79e0f242442d741c3b214c15e0563d8a41a211991eb67f6a2001a6448e078f525c1025bae79d42a129458e945aadbf10648425f6090fcc170d6e6559e88
diff --git a/app-admin/ps_mem/ps_mem-3.14-r1.ebuild b/app-admin/ps_mem/ps_mem-3.14-r1.ebuild
index 59f3c0578f52..b5474c4c3e05 100644
--- a/app-admin/ps_mem/ps_mem-3.14-r1.ebuild
+++ b/app-admin/ps_mem/ps_mem-3.14-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# 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_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1
@@ -16,7 +16,6 @@ SRC_URI="https://github.com/pixelb/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ppc64 sparc x86"
-IUSE=""
 
 python_install() {
 	distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin"
diff --git a/app-admin/xkcdpass/Manifest b/app-admin/xkcdpass/Manifest
index f1c9cb9c8c67..320a4438f92d 100644
--- a/app-admin/xkcdpass/Manifest
+++ b/app-admin/xkcdpass/Manifest
@@ -1,10 +1,4 @@
 AUX xkcdpass-1.19.4-no-examples-in-site-packages.patch 571 BLAKE2B 1e12132799bd9e699ed5ebf2c3b87efd57123a797ad9456c665c37e6f98dce106cc010e84a0dfb8fa6f64a63a22f828ddaddb640672facb24e7ece2971f83285 SHA512 504affb76dfc39b74c03a5ab563e376ea781ea31f9e6a630225b2bae15f9b8e3a9757a8a6b90e613360917578730d42d310e9bd344e84620a4af88079567cf32
-DIST xkcdpass-1.19.4.tar.gz 2572291 BLAKE2B f36299ab66bc02f95a7811ebdf40fa62f441a0ef1eac27af8d380fca9643eb9c2444c988392900e5add8a2a22f4ef33766bc5904fb350520b0b7572e95898ecd SHA512 2a83473f6e2426f34ee89297056ca7d3949044f7e818f6d6501fd7852ac1ba9f860f8287ad6d366f13f46f580b0f3f7e9a3dfa160b262b4d00b00ed1c9f5da59
-DIST xkcdpass-1.19.5.tar.gz 2572430 BLAKE2B e955780492d2771558bc1f0716913f4e84a408d98049b2f5f23d53a56e6d660bc1afb2539b3f422bdc98df05ae065c51f0303ddaf2e268994420a22580aba2a2 SHA512 8a560247cb860377ef723b26610a6f784a891b4c8dfb2c5b55187df70e326d6ff2f1d31128dfc4e7136cbc15108c470658d896056177900e0eb419d14458348f
-DIST xkcdpass-1.19.6.tar.gz 2572473 BLAKE2B 638aaa482f5d468e89daef7cb59dcba183b11280356a9e3a6aa518a0e8c0b9931057c1ffc6ebf3fd45111389a3f2952c4a668421f1b4822e64cbe0f1ade8d702 SHA512 ca61424432ab3749ee5a3fca884ed0897e5f342a84bfe208e4ae1dde3db60218f99f60d62cb77c05ccf8fd81ae393779869236aa2ee7cd7ebd3cf89663d47c13
 DIST xkcdpass-1.19.8.tar.gz 2689908 BLAKE2B 68d0e6b2799773433962ee19ede47f5983839f4e4cecd4939205c2f0872228b4da5a107176d3931fc41aa47be8e51b7fb7383c1da1898684484be98913c088f9 SHA512 f218a9afdf103444558233f9fe32655d2c604f3553d2782a923f73baa4d69495871557a753a5f38be4607bd373df43cf425c0cc6675b0b1b34723098fdeff7b5
-EBUILD xkcdpass-1.19.4.ebuild 1140 BLAKE2B 3c58527e7b78f8599a653e171cd970b66ca2d2bd28b378f9e3938ae885e592f0a6f41c0292865b1e2e65ce1d296d55fa9e30c72f01e5a9ce3a4f49ab1596caad SHA512 f29a80b06a2f86d75b4c5f1d76b4c5a6869202570beda6be0ce86fdf66873717412ed8304e3dc18b970e2ba7173626e7490eb5dd5940b562aa2460b68790d7db
-EBUILD xkcdpass-1.19.5.ebuild 1140 BLAKE2B 3c58527e7b78f8599a653e171cd970b66ca2d2bd28b378f9e3938ae885e592f0a6f41c0292865b1e2e65ce1d296d55fa9e30c72f01e5a9ce3a4f49ab1596caad SHA512 f29a80b06a2f86d75b4c5f1d76b4c5a6869202570beda6be0ce86fdf66873717412ed8304e3dc18b970e2ba7173626e7490eb5dd5940b562aa2460b68790d7db
-EBUILD xkcdpass-1.19.6.ebuild 1140 BLAKE2B 3c58527e7b78f8599a653e171cd970b66ca2d2bd28b378f9e3938ae885e592f0a6f41c0292865b1e2e65ce1d296d55fa9e30c72f01e5a9ce3a4f49ab1596caad SHA512 f29a80b06a2f86d75b4c5f1d76b4c5a6869202570beda6be0ce86fdf66873717412ed8304e3dc18b970e2ba7173626e7490eb5dd5940b562aa2460b68790d7db
-EBUILD xkcdpass-1.19.8.ebuild 1062 BLAKE2B b7592baa18d407caf2161cc981a1644d3e2e7cf3dae600ea6a7ee307ca6278127f9e33dda1cdc86d56149d23a8c6b8a58b0af1f4dd00549040bbfc9b8745bfd0 SHA512 d948975e29b8e4802205a80768111cd366a43f0f0a2ed3ee7a73c9cd0995e5d2dd9f1cf325062e4de57126ae5b28f94792b1f2ca07e162325e954120559a6692
+EBUILD xkcdpass-1.19.8.ebuild 1062 BLAKE2B f683309d78534e2d082c2dd5f3bd68adaa10ca30bb27e16b07ddfc6e59d7e78210573958c007705de97c79f380fcd2ef4011e737199a918620f160f016c5437e SHA512 cffae44eb4c4bff9cc41e30699b1ed49e7be79f55ec7a63d5385e5a66df3f3ac76c555ba41c26a835fc310760cfd471c4be888a38a8bb980aeee4b77559b2462
 MISC metadata.xml 388 BLAKE2B a1477ba7c23e7ddab97dd869612794c1e1d0876cf9564bc54ecc6858280d6cc23dfac4e83d78f0f18543c5ae3804e1a701701e08ae6722e533c8c6f1dca29e71 SHA512 6a6bf779b5e0de8bb4a8be49253981590ee039b252db6bc4f25a8e1db6123a832fc7d628302e192aedd485e864b528d272da8a4e0f557987d4b7104c5d0ce985
diff --git a/app-admin/xkcdpass/xkcdpass-1.19.4.ebuild b/app-admin/xkcdpass/xkcdpass-1.19.4.ebuild
deleted file mode 100644
index 767282c1f31d..000000000000
--- a/app-admin/xkcdpass/xkcdpass-1.19.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="Password generator inspired by XKCD 936"
-HOMEPAGE="https://github.com/redacted/XKCD-password-generator"
-
-LICENSE="BSD CC-BY-3.0
-	l10n_de? ( GPL-3 )
-	l10n_it? ( CC-BY-SA-3.0 )
-	l10n_no? ( CC-BY-4.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="l10n_de +l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt"
-
-distutils_enable_tests pytest
-REQUIRED_USE="test? ( l10n_en )"
-
-PATCHES=( "${FILESDIR}"/xkcdpass-1.19.4-no-examples-in-site-packages.patch )
-
-src_prepare() {
-	default
-
-	use l10n_de || rm ${PN}/static/{ger-anlx,eff_large_de_sample.wordlist}
-	use l10n_en || rm ${PN}/static/{eff-short,eff-special,legacy}
-	use l10n_es || rm ${PN}/static/spa-mich
-	use l10n_fi || rm ${PN}/static/fin-kotus
-	use l10n_fr || rm ${PN}/static/fr-*
-	use l10n_it || rm ${PN}/static/ita-wiki
-	use l10n_no || rm ${PN}/static/nor-nb
-	use l10n_pt || rm ${PN}/static/pt-*
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman ${PN}.1
-}
diff --git a/app-admin/xkcdpass/xkcdpass-1.19.5.ebuild b/app-admin/xkcdpass/xkcdpass-1.19.5.ebuild
deleted file mode 100644
index 767282c1f31d..000000000000
--- a/app-admin/xkcdpass/xkcdpass-1.19.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="Password generator inspired by XKCD 936"
-HOMEPAGE="https://github.com/redacted/XKCD-password-generator"
-
-LICENSE="BSD CC-BY-3.0
-	l10n_de? ( GPL-3 )
-	l10n_it? ( CC-BY-SA-3.0 )
-	l10n_no? ( CC-BY-4.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="l10n_de +l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt"
-
-distutils_enable_tests pytest
-REQUIRED_USE="test? ( l10n_en )"
-
-PATCHES=( "${FILESDIR}"/xkcdpass-1.19.4-no-examples-in-site-packages.patch )
-
-src_prepare() {
-	default
-
-	use l10n_de || rm ${PN}/static/{ger-anlx,eff_large_de_sample.wordlist}
-	use l10n_en || rm ${PN}/static/{eff-short,eff-special,legacy}
-	use l10n_es || rm ${PN}/static/spa-mich
-	use l10n_fi || rm ${PN}/static/fin-kotus
-	use l10n_fr || rm ${PN}/static/fr-*
-	use l10n_it || rm ${PN}/static/ita-wiki
-	use l10n_no || rm ${PN}/static/nor-nb
-	use l10n_pt || rm ${PN}/static/pt-*
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman ${PN}.1
-}
diff --git a/app-admin/xkcdpass/xkcdpass-1.19.6.ebuild b/app-admin/xkcdpass/xkcdpass-1.19.6.ebuild
deleted file mode 100644
index 767282c1f31d..000000000000
--- a/app-admin/xkcdpass/xkcdpass-1.19.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="Password generator inspired by XKCD 936"
-HOMEPAGE="https://github.com/redacted/XKCD-password-generator"
-
-LICENSE="BSD CC-BY-3.0
-	l10n_de? ( GPL-3 )
-	l10n_it? ( CC-BY-SA-3.0 )
-	l10n_no? ( CC-BY-4.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="l10n_de +l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt"
-
-distutils_enable_tests pytest
-REQUIRED_USE="test? ( l10n_en )"
-
-PATCHES=( "${FILESDIR}"/xkcdpass-1.19.4-no-examples-in-site-packages.patch )
-
-src_prepare() {
-	default
-
-	use l10n_de || rm ${PN}/static/{ger-anlx,eff_large_de_sample.wordlist}
-	use l10n_en || rm ${PN}/static/{eff-short,eff-special,legacy}
-	use l10n_es || rm ${PN}/static/spa-mich
-	use l10n_fi || rm ${PN}/static/fin-kotus
-	use l10n_fr || rm ${PN}/static/fr-*
-	use l10n_it || rm ${PN}/static/ita-wiki
-	use l10n_no || rm ${PN}/static/nor-nb
-	use l10n_pt || rm ${PN}/static/pt-*
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman ${PN}.1
-}
diff --git a/app-admin/xkcdpass/xkcdpass-1.19.8.ebuild b/app-admin/xkcdpass/xkcdpass-1.19.8.ebuild
index d76304959988..206d383064ae 100644
--- a/app-admin/xkcdpass/xkcdpass-1.19.8.ebuild
+++ b/app-admin/xkcdpass/xkcdpass-1.19.8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 inherit distutils-r1 pypi
 
 DESCRIPTION="Password generator inspired by XKCD 936"
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 955cc3c25e9d..71f04756bf29 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/backupninja/Manifest b/app-backup/backupninja/Manifest
index c42d564e3fa6..10114666563e 100644
--- a/app-backup/backupninja/Manifest
+++ b/app-backup/backupninja/Manifest
@@ -1,3 +1,3 @@
 DIST backupninja-backupninja_upstream-1.2.2.tar.gz 187862 BLAKE2B cfc2c31a4e53179f9167874d1d5785a9dfdb4bc0e891ea353b5f5ff44dc5eb4f86358b210a96327de9701f7e6913f7afbf8fe104fea138f8006835e2bf04a7e6 SHA512 a11085998ff7342baa242e31a64ddc1d6e6cabd43572435b444ef0523ef8644ed9d362392bfb5c8ade06fbf046fecccf5c05ba2ae4345c65551dddcaa25a13a6
-EBUILD backupninja-1.2.2.ebuild 538 BLAKE2B 54f366d7c052c7285f55bcbf899d7139eae6fb27bee17616c55dfa303c9783b36fd1fd3abc555d70f2615e2222503214f655e8482c8e0dd94a807c46f9c03835 SHA512 9dd10ad2874ed0080c7404ef53e783e12e6f722991f7581dfeb83d18b2934bed6a4d16ad8744ac0ccb92ecbda0148efca5d78b89fbf69bf70a93dd667f75fb2d
+EBUILD backupninja-1.2.2.ebuild 527 BLAKE2B efa56e5a807b29b1a4c9de1afe48dc625be560e14cd866e46f49efa122140cbd13d8dce82eac32c10acea06b6cc9f3e01a6db27355ddd065a30a1f77086bc84e SHA512 63a64f564f5cdb2463cd922a887b06391a8093b975a236c544e649837a14800e3cb766c727b775702bd8832fe7aa0b457092e91bff542e38c49a9e2ab59a7272
 MISC metadata.xml 241 BLAKE2B 21028072176eba52753ea8ad1554d6581dc934f0177e558f0b8c2addc0f6b6cc41d612205e7872032d97344c147a08899ae6cc78eac0442e2869c5ebfd204951 SHA512 c9a5430a3f74432f15277d9477cb811c3728735456de4aec57372e20eda20fef2c94392342955b030fc77f1297780bf59448fb2fd5251bd3dc2382561995f2b7
diff --git a/app-backup/backupninja/backupninja-1.2.2.ebuild b/app-backup/backupninja/backupninja-1.2.2.ebuild
index 64318068ab22..82d9fd8b5cd0 100644
--- a/app-backup/backupninja/backupninja-1.2.2.ebuild
+++ b/app-backup/backupninja/backupninja-1.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
@@ -6,15 +6,13 @@ EAPI=8
 DESCRIPTION="lightweight, extensible meta-backup system"
 HOMEPAGE="https://0xacab.org/liberate/backupninja"
 SRC_URI="https://0xacab.org/liberate/backupninja/-/archive/backupninja_upstream/${PV}/backupninja-backupninja_upstream-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}_upstream-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
 RDEPEND="dev-util/dialog"
-DEPEND=""
-
-S="${WORKDIR}/${PN}-${PN}_upstream-${PV}"
 
 src_configure() {
 	econf --localstatedir=/var #578614
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 2af787e0fd23..b397e20dded2 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/apptainer/Manifest b/app-containers/apptainer/Manifest
index d82eb4d73020..381c147914e9 100644
--- a/app-containers/apptainer/Manifest
+++ b/app-containers/apptainer/Manifest
@@ -1,6 +1,4 @@
 AUX apptainer-1.0.2-trim_upstream_cflags.patch 1142 BLAKE2B 7238229b70a8ac37f3401a163d19dc705adb6a4ab6355e4eaa386ad5c639bfc1443cf61507112a53b66816399ca5fe2c32de964dd602ea16c5dfbf9003343f8c SHA512 1351ee000274567bb5a63aa740fbc43510d84ccad42c9af0c555943b99d93d86a2b036801c1681b93548a874bda1bab3304c2bf0da83bbca102a71e82574a032
-DIST apptainer-1.2.4.tar.gz 14387522 BLAKE2B 8435bf590149c4e83dc32a866198fdcaa44270cad4e6722e9174352c7b00e4b13c1aa4c290991c289d71797afcd9e2411e3bcc0a2b80440528babdcf3e19bec5 SHA512 bc2ad5f10f2c8e69b4bc5b997083e2dd5f62913d195eda6213d572c3dbfe03923845882e55e1a60d395ed3019100ce26919323f9523c59ccda51d7f1397bcba3
 DIST apptainer-1.3.0.tar.gz 17103544 BLAKE2B ed42b763a20b2b71cce6081b903697dc506073f91f9d928d49801165289d15c1416044af8fcedddcbd2a260c17a2e6488ed3d06b1edb4fb5f5ca5e9d14a14312 SHA512 a72afcac8e783f43732517314a94ffe039ab8f29027bcc398295fed97b123e6777039c016b6655a3cefbcba7e69832f62f3418b11e1bbd0452edc702ecaef69e
-EBUILD apptainer-1.2.4.ebuild 2462 BLAKE2B 1a06bf82e2b38d450b97e525b39b882695f66d6d585b38bda337d24a8f7acae772ca82f0aaf6b0879fa76cab5a03fa2abbbb335cdb07b52174cb751ec7b90489 SHA512 7f6623d33ca9c34a7be5edf861c0e2cece3349bff73a8bd66d9995ab1e5207a40877623040a8c318668cee4d3200692a02c645c0ec43560fa667083fff68929a
-EBUILD apptainer-1.3.0.ebuild 2463 BLAKE2B c9cda77312f224b05c5c7b6e397285aa79de7e341ada93b956f91d788d188f97ec1ea834fd1b7ac776dbb78953bdabb8ff2427f3cdc28487d7e61faf8991d288 SHA512 194881776343a2abd556dcc34efc0a8422ffddf0e96bd69016f758f680cb08bd66411c010e3e3b65647c2028f07c7e2ec62a94570e134d75248b566467d08336
+EBUILD apptainer-1.3.0.ebuild 2462 BLAKE2B 497f8306a9cf565584cf8b0aeca3b4dd39a3bacb78b1373257aca172bebf9ce25bd58273970687ad2ef8f5e52886cae5e35191767ca95f064c3f92325d2a4346 SHA512 cfb415e29601c5b0a2c86f67bb5cf4b89cbc5ca933707d606c09f227014a7a925f0a2482be4e06ef1701a35c94a5df015bda2850d4fbf1ae2c96450fbb91ab6a
 MISC metadata.xml 454 BLAKE2B 7891b6acae30424b8b6877166b856c1113a13e40ebec9051935df10a0650bf941f52d75bdb6a4258795e07b080082979469b8b8242d2ddd56c52f9c5b6759f0e SHA512 ef53c2dee45734f36403ab71549494f3c24707bc183353e4bd9c548a97b3ab5d7877f4fc9d311d9e86ab249cbdb379f0a1a211ee36afda99fd552f0a5cac30bb
diff --git a/app-containers/apptainer/apptainer-1.2.4.ebuild b/app-containers/apptainer/apptainer-1.2.4.ebuild
deleted file mode 100644
index f32ad5c89751..000000000000
--- a/app-containers/apptainer/apptainer-1.2.4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info toolchain-funcs
-
-DESCRIPTION="The container system for secure high-performance computing"
-HOMEPAGE="https://apptainer.org/"
-SRC_URI="https://github.com/apptainer/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples +network suid systemd"
-
-# Do not complain about CFLAGS etc. since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-DEPEND="app-crypt/gpgme
-	>=dev-lang/go-1.19.0
-	dev-libs/openssl
-	sys-apps/util-linux
-	sys-fs/cryptsetup
-	sys-fs/squashfs-tools
-	sys-libs/libseccomp
-	!suid? (
-		sys-fs/e2fsprogs[fuse]
-		sys-fs/squashfuse
-	)"
-RDEPEND="${DEPEND}
-	!sys-cluster/singularity"
-BDEPEND="virtual/pkgconfig"
-
-CONFIG_CHECK="~SQUASHFS"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.2-trim_upstream_cflags.patch
-)
-
-DOCS=( README.md CONTRIBUTORS.md CONTRIBUTING.md )
-
-src_configure() {
-	local myconfargs=(
-		-c "$(tc-getBUILD_CC)" \
-		-x "$(tc-getBUILD_CXX)" \
-		-C "$(tc-getCC)" \
-		-X "$(tc-getCXX)" \
-		--prefix="${EPREFIX}"/usr \
-		--sysconfdir="${EPREFIX}"/etc \
-		--runstatedir="${EPREFIX}"/run \
-		--localstatedir="${EPREFIX}"/var \
-		$(usex network "" "--without-network") \
-		$(use_with suid)
-	)
-	./mconfig -v ${myconfargs[@]} || die "Error invoking mconfig"
-}
-
-src_compile() {
-	emake -C builddir
-}
-
-src_install() {
-	emake DESTDIR="${D}" -C builddir install
-	keepdir /var/${PN}/mnt/session
-
-	if use systemd; then
-		sed -i -e '/systemd cgroups/ s/no/yes/' "${ED}"/etc/${PN}/${PN}.conf \
-			|| die "Failed to enable systemd use in configuration"
-	else
-		sed -i -e '/systemd cgroups/ s/yes/no/' "${ED}"/etc/${PN}/${PN}.conf \
-			|| die "Failed to disable systemd use in configuration"
-	fi
-
-	einstalldocs
-	if use examples; then
-		dodoc -r examples
-	fi
-}
-
-pkg_postinst() {
-	if ! use suid; then
-		local oldver
-		for oldver in ${REPLACING_VERSIONS}; do
-			if ver_test "${oldver}" -lt 1.1.0; then
-				ewarn "Since version 1.1.0 ${PN} no longer installs setuid-root components by default, relying on unprivileged user namespaces instead. For details, see https://apptainer.org/docs/admin/main/user_namespace.html"
-				ewarn "Make sure user namespaces (possibly except network ones for improved security) are enabled on your system, or re-enable installation of setuid root components by passing USE=suid to ${CATEGORY}/${PN}"
-				break
-			fi
-		done
-	fi
-}
diff --git a/app-containers/apptainer/apptainer-1.3.0.ebuild b/app-containers/apptainer/apptainer-1.3.0.ebuild
index 98dac6fa2dbb..5f69289300ad 100644
--- a/app-containers/apptainer/apptainer-1.3.0.ebuild
+++ b/app-containers/apptainer/apptainer-1.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/apptainer/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples +network suid systemd"
 
 # Do not complain about CFLAGS etc. since go projects do not use them.
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 06b2fca519e8..ca8cedb480a2 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index 6a13f72ab26f..87797ad5a405 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -4,7 +4,10 @@ DIST yubikey_manager-5.2.1.tar.gz 185533 BLAKE2B 7aa61043eb7f8a9502ee3c3aaea8d2c
 DIST yubikey_manager-5.2.1.tar.gz.sig 310 BLAKE2B 1338fd7f05766629790188e20d0dc71548941522ce02e0b3d0f7db0be6ee61655000aeb45b3a58c80d0cb891a13a816f4af2f145339d2fb09b9c6293a882bf86 SHA512 57a63bd272e61f93182fb26e1378d8e355efd91c2e2eede70744223fd47e02f4e210725ad31b1ce1bfdc81a67183159054a8238930ca4bdaec2aa7970b170f35
 DIST yubikey_manager-5.3.0.tar.gz 188418 BLAKE2B cd33d3a22c82ef1588121b7f8ff1c724d1fe7c9a58daa68938c2c3c4f1f0bbcdd4b04c3a0d2c51db6a2184038e67cb62f452583e1304e23c3ea9df0e0f16aa4e SHA512 6cdcb10e490319344f3afb18a6826b4a83bd2ea388b2942b57b3e3eff7a21384df8e183989281eb30375dd371dfcfdf6504195144515439190f6c49f6b9e6a49
 DIST yubikey_manager-5.3.0.tar.gz.sig 310 BLAKE2B 7dbf245d168872ec59b37f8b676f8ae230dd27642f532526aa8edf64dd3da5f2492aeff73ce7e0b4b48eda00af8880d7b889aae653d38028e67233ebdc895a5f SHA512 5f1e690afa5bee00c2bdaea7e33686280d856a217953fc8d951eb8b2111ae67eb6f817db3e92b0f5b515ca1ab6b5d53f14ec68629728ddb2f210ef58e6e871cb
+DIST yubikey_manager-5.4.0.tar.gz 188859 BLAKE2B e83d74b0d512b7a1076bf6de0860c3a29259e337ccf508e81572e5802b1b1dced4c098ea21b4a3d63294b51a042780bf875536c30f65d46ce76b7a80c0bc1fce SHA512 c773895957d17ceac8e944958435071fbb3a80469016a22aa13785a5bc009406870366e5b65d3d2ddbd2ed1722f84b377a49101f4db67f0d3c04daee852301b3
+DIST yubikey_manager-5.4.0.tar.gz.sig 310 BLAKE2B 933a6638b754a8d3f23486f8adeb03e1b9c54d313370675f3e9e517751b495a5f3afae048b9740360459c86bef754618d9b8308cc30d8ae027421ee6f972fef1 SHA512 825d3e455b9cb9263a1336ac2d601fc2e25146ca45f143c16e559c5374c2aa0fc27f0330f5114e58186e02784e1ebda5e864726fea009dfb47377dcf5a3a32f4
 EBUILD yubikey-manager-5.2.0.ebuild 1662 BLAKE2B c18184a7e54caf9c8b0a081d7ab070f2779fb2ad50a2b7dfca8c126def4e411bc60fde4d7ec474f6453e332b8fdc8f3b5563f4b91986ed54038cee40703e739a SHA512 5612bd8f4726774b69782b15fed9398c1cbd0d6bdfdc405552f2e1dcb49a69c13c353c14e6d943e00363620d1d65bb5fada754b09de20789c1081041629ed50a
 EBUILD yubikey-manager-5.2.1.ebuild 1661 BLAKE2B cb9d692c1aafe44a922509eb7ed0080c05669d797045c036977bafd3b2ba0bf8f5c848220c0c3fdf51a0986bd42b96920c2271481e9c68c33485dae80e010037 SHA512 96e32a7793b091df4d7c817a37dfe7d761dbf8237502199d8bd312bad79293fd53068aa7e6e0177222a868790f6bc1cb43aefa5e78586d4db6fc50ca058fc3b8
 EBUILD yubikey-manager-5.3.0.ebuild 1661 BLAKE2B ad28a63babbb61734ade2d895914972f8159ec558765782e99c2fcb7b8f8a3140c993080722b3a0b84e01e609301f5d632c95656b5c33e4b1d2ad68b94166e71 SHA512 9e9d58de47af7b044c0b5ef39804cbd3193fcc95e6aedd3f0a05048c59155cd5a8259bd4964d18d852a5068984f82c89eae738c07b7f28ba5bae3c87d71dae96
+EBUILD yubikey-manager-5.4.0.ebuild 1661 BLAKE2B ad28a63babbb61734ade2d895914972f8159ec558765782e99c2fcb7b8f8a3140c993080722b3a0b84e01e609301f5d632c95656b5c33e4b1d2ad68b94166e71 SHA512 9e9d58de47af7b044c0b5ef39804cbd3193fcc95e6aedd3f0a05048c59155cd5a8259bd4964d18d852a5068984f82c89eae738c07b7f28ba5bae3c87d71dae96
 MISC metadata.xml 534 BLAKE2B 1dc91b31fae812c9abf38e762d18db228cf07cb29dc41f5c7928ef417002826acaaabaa3b1374433f9fdfc251b5f5fbabbc43e66e3b94cc6df3174d3ae5aa059 SHA512 cf47e3400679f7f4feb73ef3b8282d3f4dae6b6d0e5034cbc22935fd0196be0784946bf9ac93dea7fb36a16347f867d092845c1ce3528a00c704de9657ad3821
diff --git a/app-crypt/yubikey-manager/yubikey-manager-5.4.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-5.4.0.ebuild
new file mode 100644
index 000000000000..a3f8053a2c6a
--- /dev/null
+++ b/app-crypt/yubikey-manager/yubikey-manager-5.4.0.ebuild
@@ -0,0 +1,53 @@
+# 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=poetry
+
+inherit distutils-r1 verify-sig
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python library and command line tool for configuring a YubiKey"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
+# According to https://github.com/Yubico/yubikey-manager/issues/518 the release
+# tarballs on Yubico Web site and on GitHub should be identical, and at least
+# for recent releases the latter are signed as well. Only the automatically
+# generated "Source code (tar.gz)" tarballs should not be used.
+# Still, prefer the former if available.
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${MY_P}.tar.gz
+	verify-sig? ( https://developers.yubico.com/${PN}/Releases/${MY_P}.tar.gz.sig )"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="ssl"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/yubico.com.asc"
+
+# app-crypt/ccid required for
+# - 'ykman oath'
+# - 'ykman openpgp'
+# - 'ykman piv'
+RDEPEND="
+	app-crypt/ccid
+	>=dev-python/click-8.0[${PYTHON_USEDEP}]
+	<dev-python/cryptography-45[${PYTHON_USEDEP}]
+	dev-python/fido2:0/1.0[${PYTHON_USEDEP}]
+	<dev-python/keyring-25[${PYTHON_USEDEP}]
+	>=dev-python/pyscard-2.0[${PYTHON_USEDEP}]
+	ssl? ( >=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}] )"
+BDEPEND="
+	test? ( dev-python/makefun[${PYTHON_USEDEP}] )
+	verify-sig? ( >=sec-keys/openpgp-keys-yubico-20220824 )"
+
+S="${WORKDIR}"/${MY_P}
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman man/ykman.1
+}
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 733651392c84..f585b7feb102 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/radamsa/Manifest b/app-forensics/radamsa/Manifest
index 199be9667616..0d7546ea5168 100644
--- a/app-forensics/radamsa/Manifest
+++ b/app-forensics/radamsa/Manifest
@@ -1,4 +1,8 @@
+AUX radamsa-0.7_prebuilt-c.patch 228 BLAKE2B b67da8f61046508acb76eb22cd988e622f2dbf5b65177cf82d5f3729f404ff18c2e7d932f3c782da607ed77e3c432611b9b1a7eee929164e37254b30c5e0f546 SHA512 95f4a52bd26cb2748174634445b0f39220bcfd63dff0fb7495144e1b1481b425d695daa03c011de5b1ba75d4476da0cedb5aabbc71e5989cd27c27845bdf76da
 DIST radamsa-0.6.c.gz 142359 BLAKE2B e9cfda273ca78e97d7e8a94f0399c2c8d7b543c578a7b6745a03c9a2a18aa965a13ead55e15aab27c5386bb4d4ab961cedfbdca72c72013dc1ace0931c237199 SHA512 b9f0b8801063821ebd435464057aa119c5eae2dec8c39b5ec295854832e25dd8b102d6beec2084a71c380dd0e1419fbce6ee2acc1064c8a4491ad32ff94673f9
 DIST radamsa-0.6.tar.gz 51962 BLAKE2B c909b917e55ea2d69f4bec22981afb73dabc0d380d6942167f805ecfd96c3f3d724a5e6d80acf4b2abe2ddf9141dd596a9c0b2e22db98e6c441236c49a06502d SHA512 6808a7f9a42c1a38bfa18ca8613067f4550a5960500e7438011ff26a37a663707a92597f869678600a7bd20df9d2bda19d3c80b07cd12fc49bad3b123739bae7
+DIST radamsa-0.7.c.gz 139939 BLAKE2B ae3e2fca777bdc672431810ec6e9a245774e3f761fb4552ae973caf3b82348c73221e9cfac023e80f161c37fb3e63ff043aac2f98cb932056c1618a842245f52 SHA512 f0b0c21034cb33182be74d8927c879a2a49cb20c992e97556bb9d76c35c8a39f1caf2042a3d001f0063b09e80705fa5d285d1d95b9f8a2dd5c62deb9a18d9bde
+DIST radamsa-v0.7.tar.bz2 49194 BLAKE2B a3e24302c67ed887373109ce3bd1b3b796c742ad50c04d83980caf7b5e92793668c9262791749653e72e15d65d7a4971d498013d3c5a8fafda9033cddc5b3e03 SHA512 ca55e499b739e4a24038b36115106dc10b6f68e3e127d3c45b0ab79676a1e6e82021be02e378bd6fd09f6df537d266ea4cf8f3528a25ed9e788548d6edc62fb5
 EBUILD radamsa-0.6.ebuild 768 BLAKE2B 2d3a4434720dc4deed968aa129aa7ce72f39424c6d4a057a75b8b71971a3767c93c565295ba4f3d038c056c5aa7bdcf7b86c6c92d1f5f3c61b1be7fb205e4787 SHA512 c7a21fefeacddb4eac833b85c5b45c17f35e09051337ccec97c70a5af061aa3979595db6e55a0d746e848c20035c26d2f70067d4452e78643b9198c96d18c3db
+EBUILD radamsa-0.7.ebuild 827 BLAKE2B b7b97af05c051261253276a2125dca4ccc4d3c54b9c854a7d9d8867d36a99e0d33a6f152ce710c777486bd39d39e061d23029efb228b53236d7b1400a0d3822a SHA512 dbd5ffa6900ccd3c935806aba2b41a72341a511f9a494b2f80d688a10e586aba5b8669bc9c9ffd8f6a3fb2c1d0ebeb2f332f357a0564e394e627c4ed8cfb544f
 MISC metadata.xml 324 BLAKE2B 0be5b56178679f25c317fa02dc1ba540dad20d5de1bfa10ed11534452eaf2be3aeb7a50f23089f58026a58f9fbec91b3fdc923110e296e77b6303fff887f5e5b SHA512 1da465ff0f52746165f94971e59c27d6225d0343eb54850cb4832f70fab811036c3517b247428723e01c6f4def81142116e13bf0994ec99a95ea30d51c824667
diff --git a/app-forensics/radamsa/files/radamsa-0.7_prebuilt-c.patch b/app-forensics/radamsa/files/radamsa-0.7_prebuilt-c.patch
new file mode 100644
index 000000000000..94fad4879f91
--- /dev/null
+++ b/app-forensics/radamsa/files/radamsa-0.7_prebuilt-c.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -15,7 +15,7 @@
+ 	mkdir -p bin
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o bin/radamsa radamsa.c
+ 
+-bin/radamsa: radamsa.c
++bin/radamsa:
+ 	mkdir -p bin
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o bin/radamsa radamsa.c
+ 
diff --git a/app-forensics/radamsa/radamsa-0.7.ebuild b/app-forensics/radamsa/radamsa-0.7.ebuild
new file mode 100644
index 000000000000..baf922c968eb
--- /dev/null
+++ b/app-forensics/radamsa/radamsa-0.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="A general-purpose fuzzer"
+HOMEPAGE="https://gitlab.com/akihe/radamsa"
+SRC_URI="
+	https://gitlab.com/akihe/${PN}/-/archive/v${PV}/${MY_P}.tar.bz2
+	https://gitlab.com/akihe/${PN}/uploads/d774a42f7893012d0a56c490a75ae12b/${P}.c.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# needs an owl-lisp
+RESTRICT=test
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7_prebuilt-c.patch
+)
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	default
+
+	cp "${WORKDIR}"/${P}.c "${S}"/${PN}.c || die
+}
+
+src_compile() {
+	emake bin/radamsa CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin bin/radamsa
+	# avoid man compression by build system
+	doman doc/radamsa.1
+
+	einstalldocs
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index e102bfbf04ff..7d44f0387110 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/rmlint/Manifest b/app-misc/rmlint/Manifest
deleted file mode 100644
index 95a14e6c1c24..000000000000
--- a/app-misc/rmlint/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-AUX rmlint-2.10.1-cflags.patch 626 BLAKE2B e34590b6cb83399444f6a29379f0c84f3d442ead5dfdcc542822d34da50f00eebcc6b2eb26bf627710b2b8ded428471f22d3bcfa9b2ac367362fcafe208b92e6 SHA512 644ae7ea5dfaefd78942f89d93937598c9ed6c8edc1ee1a342ff35f040e75d7e38e285ad5436ee33597604c6cb456f51624a6f8225c25a62ed727797633139d6
-AUX rmlint-2.10.1-fix-cc.patch 1619 BLAKE2B d0b7267d33e1fd906c6d914c1030e143e42b92d9f814c02b6476e1ccd23af20c810b02a2ddfe2d4b5e2f6e7b5a8a8fbc3225aeca56cb78bb84450e9dca07c925 SHA512 e83a90650e434cee31b889f238bee7c0905abd787931fb7752c82c17e927f840de83790e7258526836e14289c2aaa3dcfc94b2097c19e3ac3ab5ac41a6380951
-AUX rmlint-2.10.1-fix-gui-install.patch 322 BLAKE2B 314a8912b2173f207ff642f1147be501969eb5aeeec96e1a77ecab2c0689dac20cf0dd4571d77f764a4224e99aed6f547bca609dd1721ee7d0d2e207934028c6 SHA512 8209959e8f4087871da09070c635a5d116209b32aaa06043ee52bbaa7683b6fee1a302547202250c5a547ca2ab71534ca67541042b3a717a4c7268400329f245
-AUX rmlint-2.10.1-fix-tests.patch 4833 BLAKE2B 75b1e0a732c833f5684a0d6b3870d9f65d4eb62018728353f24e956be1b3fb12cd98f1cc385c398a8b7ad524b50059f04e9200fd1b07519ce5e4a8d042556dec SHA512 8ad1ac7c0812b0414935b49391152507ef043143a2d13d89d9be590b5eee9e42654869282d989c6ff26a5dc178e76e2b3157b1b3fae57ab6d64a3ff91c7f8b60
-AUX rmlint-2.10.1-scons.patch 3626 BLAKE2B cc9187d2b8926eb36071462d02a60f3a4b06de99ad97adf5b9dbb4bca3f9a42ccb8fd863ec9f78500acabdfe692d18c7141fb165c6c13661463b704117c308c6 SHA512 bf585930651101e3057547442527ad571c193a9e7bcff976544f16fd9bac75e0cc074bbf60bf31c1dd50538aa961a0143b46cd3feac6deec014b8689da048c85
-AUX rmlint-2.10.1-skip-tests.patch 1216 BLAKE2B 8fa9727f5146a26fbd91e8e6c4f8b903e432c386ca8f97b4591bd9244940bf94aa476dfb0390c332fe8fa7e777e31890046423cd88e47181f3a8f30e3fead4be SHA512 c66812da8860a714d1ae368039f95dd86d59b3ba6164fc9141f0c1c0ab6ab7c7245dcef9785a179dc437615cd5d9e8af1a1ee60354e99c02fd3c345fd2e91608
-AUX rmlint-2.10.1-x86-fix-size.patch 1092 BLAKE2B 2cd3e7e68d5252c89b84d1d78a17520e6c5f7b61f5d9bfc05bd25ea96b9057bb195c7afc6e61a8bac121ae749b5f84d28dc032be2d92bd6f5a2ab04f5b3cae9d SHA512 78a41f52aa1af9f9d63227b9a2100cf87806a442f07d153e83ccedf7110a14e4c7fec8c9a4fdf21284301927895a62eedaf666cbfe90092eb4ac41e68bf34c6e
-AUX rmlint-2.10.2-fix-sorting-tests.patch 1912 BLAKE2B f76a3076b747445387a035185efe7d60d597e88453b55beaba54a1e0d35f36943100bffa9cc7419ed70af359112d159c338d943915e99487df58b527bb061b1d SHA512 74a342c866cc09a74d149c410623b067f15eed607aecc0f828bcaea765d11254699820fce4d8d368e5b312ca5dfca2055689a43d0224726a61e914d256de9a77
-DIST rmlint-2.10.1.tar.gz 2494474 BLAKE2B 40219ff64d54f0e2fc66a958c6ca51520152f77f9038e9756ab601da5180502528be7b2d750c85b5991c31db96c3eb7415841084b6c90db103dc212947864034 SHA512 a1281359798816dadaf3a1e706e671dc63edf8f7d176c114a924a1e03fc9ad6fa54d10de701b09b5e364a9a815e0d11bdbef3d16fb7fec74eb85af20a106db1a
-DIST rmlint-2.10.2.tar.gz 2499695 BLAKE2B 07c887f660685b5ec86c8a448d482c96cc40b129fc906d0c31c01e07617bf0167055145050c21b565cb1551ccc1ce6329593d92473c371125b2c91d31d9d601c SHA512 8f8d58892785e9012cb15f3e89480d9d04772fa3f923064520bf17afcc8948b1a24d6f8399176a1a26bd5036553c605958f3720e40cf6cba135a4f3381131180
-EBUILD rmlint-2.10.1-r2.ebuild 3405 BLAKE2B 1bb99670dbd83e5053b83c562eff6bc6623825edad15e6e208beda309c634914f22ab2022ff5f299ce0650a8a68390bd2001093af8f8f578dfa8bea544112d62 SHA512 2eccca7653895fe9e3c9dfe0a26bdfd6aa6b6586a409d3b72a627c4a08e783aca6819a08dfd5424980e726c8530c5d5c708a346d8b271a011644fe543b8691bf
-EBUILD rmlint-2.10.2.ebuild 2984 BLAKE2B cb0a2d0b0b4db1ed58f52a11b9a82233d22cf17462f4fa277676e9b9eac1373ede620e4b1e05a73c63e71013619b8bcd4ef71ad9f16c6f77dad12a91a4c45558 SHA512 cc1ca4af76405dcb6f2878ecc64ada5c7f93093a4554000e114ad2f4ad3899a8054fb35366b51f1c2c8948d6fd17986613d86b400f5e534c616618b8ebfa224a
-MISC metadata.xml 383 BLAKE2B 5ac0b3d0708812cfcd5f432f43556ea55a2e7686447e06d876ae686befb854831415f1e5713cab07f3ba9f87c7cd982e17342423630eae4ea9656cbce29ed957 SHA512 d42c9219374f548e8105f7463156895e584c0b5863788fb9214633c9dc5c46dc8f2f4c53a00c411dd32aa1f3b83d9b9e9bd24508a2f18f69e7032aaf4c1de218
diff --git a/app-misc/rmlint/files/rmlint-2.10.1-cflags.patch b/app-misc/rmlint/files/rmlint-2.10.1-cflags.patch
deleted file mode 100644
index 6ddfd98d956a..000000000000
--- a/app-misc/rmlint/files/rmlint-2.10.1-cflags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -724,7 +724,6 @@ if ARGUMENTS.get('DEBUG') == "1":
-     O_value = ARGUMENTS.get('O', O_DEBUG)
- else:
-     conf.env.Append(CCFLAGS=['-DG_DISABLE_ASSERT', '-DNDEBUG'])
--    conf.env.Append(LINKFLAGS=['-s'])
-     O_value = ARGUMENTS.get('O', O_RELEASE)
- 
- if O_value == 'debug':
-@@ -735,7 +734,6 @@ elif O_value == 'release':
- cc_O_option = '-O' + O_value
- 
- print("Using compiler optimisation {} (to change, run scons with O=[0|1|2|3|s|fast])".format(cc_O_option))
--conf.env.Append(CCFLAGS=[cc_O_option])
- 
- if ARGUMENTS.get('SYMBOLS') == '1':
-     print("Compiling with debugging symbols")
diff --git a/app-misc/rmlint/files/rmlint-2.10.1-fix-cc.patch b/app-misc/rmlint/files/rmlint-2.10.1-fix-cc.patch
deleted file mode 100644
index 78aac09ce2a7..000000000000
--- a/app-misc/rmlint/files/rmlint-2.10.1-fix-cc.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit 41056d132ae772b3c050020d68b7daa585e4143c
-Author: Louis Sautier <sautier.louis@gmail.com>
-Date:   Thu Sep 9 13:29:37 2021 +0200
-
-    Never hardcode compiler, select it based on CC environment variable
-
-diff --git a/SConstruct b/SConstruct
-index 7e12d413..20b080da 100755
---- a/SConstruct
-+++ b/SConstruct
-@@ -37,8 +37,9 @@ Export('VERSION_MAJOR VERSION_MINOR VERSION_PATCH VERSION_NAME')
- def check_gcc_version(context):
-     context.Message('Checking for GCC version... ')
- 
-+    gcc = os.environ.get("CC", "gcc")
-     try:
--        v = subprocess.check_output("printf '%s\n' __GNUC__ | gcc -E -P -", shell=True)
-+        v = subprocess.check_output("printf '%s\n' __GNUC__ | {} -E -P -".format(gcc), shell=True)
-         try:
-             v = int(v)
-             context.Result(str(v))
-diff --git a/tests/test_types/test_nonstripped.py b/tests/test_types/test_nonstripped.py
-index a18648c9..d3190d1b 100644
---- a/tests/test_types/test_nonstripped.py
-+++ b/tests/test_types/test_nonstripped.py
-@@ -21,8 +21,12 @@ def create_binary(path, stripped=False):
-     path = path + '.stripped' if stripped else path + '.nonstripped'
-     full_path = os.path.join(TESTDIR_NAME, path)
- 
--    command = 'echo \'{src}\' | cc -o {path} {option} -std=c99 -xc -'.format(
--        src=SOURCE, path=full_path, option=('-s' if stripped else '-ggdb3')
-+    cc = os.environ.get("CC", "cc")
-+    command = 'echo \'{src}\' | {cc} -o {path} {option} -std=c99 -xc -'.format(
-+        cc=cc,
-+        src=SOURCE,
-+        path=full_path,
-+        option=('-s' if stripped else '-ggdb3')
-     )
-     subprocess.call(command, shell=True)
- 
diff --git a/app-misc/rmlint/files/rmlint-2.10.1-fix-gui-install.patch b/app-misc/rmlint/files/rmlint-2.10.1-fix-gui-install.patch
deleted file mode 100644
index 2ae13cd4abb0..000000000000
--- a/app-misc/rmlint/files/rmlint-2.10.1-fix-gui-install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gui/setup.py
-+++ b/gui/setup.py
-@@ -19,7 +19,7 @@ def read_version():
-     with open('../.version', 'r') as handle:
-         version_string = handle.read()
-
--    return version_string.strip()
-+    return version_string.split()[0]
-
- class install_glib_resources(install):
-     user_options = install.user_options + [
diff --git a/app-misc/rmlint/files/rmlint-2.10.1-fix-tests.patch b/app-misc/rmlint/files/rmlint-2.10.1-fix-tests.patch
deleted file mode 100644
index db43e366b389..000000000000
--- a/app-misc/rmlint/files/rmlint-2.10.1-fix-tests.patch
+++ /dev/null
@@ -1,135 +0,0 @@
---- a/tests/test_options/test_replay.py
-+++ b/tests/test_options/test_replay.py
-@@ -69,7 +69,7 @@ def test_replay_match_basename():
-     create_file('xxx', 'test1/b')
-     create_file('xxx', 'test2/a')
- 
--    replay_path = '/tmp/replay.json'
-+    replay_path = os.path.join(TESTDIR_NAME, 'replay.json')
- 
-     head, *data, footer = run_rmlint('-o json:{p}'.format(
-         p=replay_path
-@@ -104,7 +104,7 @@ def test_replay_hidden():
-     create_file('xxx', 'test/.a')
-     create_file('xxx', 'test/.b')
- 
--    replay_path = '/tmp/replay.json'
-+    replay_path = os.path.join(TESTDIR_NAME, 'replay.json')
- 
-     head, *data, footer = run_rmlint('--hidden -o json:{p}'.format(
-         p=replay_path
-@@ -130,7 +130,7 @@ def test_replay_must_match_tagged():
-     create_file('xxx', 'test_a/a')
-     create_file('xxx', 'test_b/a')
- 
--    replay_path = '/tmp/replay.json'
-+    replay_path = os.path.join(TESTDIR_NAME, 'replay.json')
- 
-     head, *data, footer = run_rmlint('-o json:{p}'.format(
-         p=replay_path
-@@ -182,7 +182,7 @@ def test_sorting():
-             (''.join(p) for p in permutations(all_opts, n_terms))
-         )
- 
--    replay_path = '/tmp/replay.json'
-+    replay_path = os.path.join(TESTDIR_NAME, 'replay.json')
- 
-     for combo in combos:
-         combo_str = '-y ' + combo
-@@ -218,7 +218,7 @@ def test_replay_no_dir():
- 
-     try:
-         os.chdir(TESTDIR_NAME)
--        replay_path = '/tmp/replay.json'
-+        replay_path = os.path.join(TESTDIR_NAME, 'replay.json')
-         head, *data, footer = run_rmlint(
-                 '-o json:{p}'.format(p=replay_path),
-                 use_default_dir=False,
-@@ -242,7 +242,7 @@ def test_replay_unicode_fuckup():
-     create_file('xxx', names[1])
-     create_file('xxx', names[2])
- 
--    replay_path = '/tmp/replay.json'
-+    replay_path = os.path.join(TESTDIR_NAME, 'replay.json')
- 
-     head, *data, footer = run_rmlint('-o json:{p}'.format(p=replay_path))
-     assert len(data) == 3
-@@ -260,8 +260,8 @@ def test_replay_tagged_order():
-     create_file('xxx', 'b/1')
-     create_file('xxx', 'b/2')
- 
--    replay_path_a = '/tmp/replay-a.json'
--    replay_path_b = '/tmp/replay-b.json'
-+    replay_path_a = os.path.join(TESTDIR_NAME, 'replay-a.json')
-+    replay_path_b = os.path.join(TESTDIR_NAME, 'replay-b.json')
- 
-     # Create replay-a.json
-     head, *data, footer = run_rmlint(
-@@ -326,7 +326,7 @@ def test_replay_duplicate_directory_size():
-     create_file('xxx', 'a/xxx')
-     create_file('xxx', 'b/xxx')
- 
--    replay_path = '/tmp/replay.json'
-+    replay_path = os.path.join(TESTDIR_NAME, 'replay.json')
-     head, *data, footer = run_rmlint('-o json:{p} -S a'.format(p=replay_path))
-     assert len(data) == 2
- 
-@@ -427,7 +427,7 @@ def test_replay_pack_directories():
-     create_pack_and_unpack_scenario()
- 
-     # Do a run without -D and pack it later during --replay.
--    replay_path = '/tmp/replay.json'
-+    replay_path = os.path.join(TESTDIR_NAME, 'replay.json')
- 
-     head, *data, footer = run_rmlint('-o json:{p} -S ahD'.format(p=replay_path))
-     assert len(data) == 13
-@@ -449,7 +449,7 @@ def test_replay_unpack_directories():
-     create_pack_and_unpack_scenario()
- 
-     # Do a run with -D and pack it later during --replay.
--    replay_path = '/tmp/replay.json'
-+    replay_path = os.path.join(TESTDIR_NAME, 'replay.json')
-     head, *data, footer = run_rmlint('-o json:{p} -S ahD -D'.format(p=replay_path))
- 
-     assert len(data) == 21
---- a/tests/test_options/test_size.py
-+++ b/tests/test_options/test_size.py
-@@ -90,7 +90,7 @@ def test_replay_size():
-     create_file('yyy', 'b/yyy')
-     create_testdir('empty_dir')
- 
--    replay_path = '/tmp/replay.json'
-+    replay_path = os.path.join(TESTDIR_NAME, 'replay.json')
-     head, *data, footer = run_rmlint('-o json:{p}'.format(
-         p=replay_path
-     ))
---- a/tests/test_options/test_stdin.py
-+++ b/tests/test_options/test_stdin.py
-@@ -69,7 +69,6 @@ def test_path_starting_with_dash():
-         os.chdir(TESTDIR_NAME)
-         data = check_output(
-             [cwd + '/rmlint', '-o', 'json', '-S', 'a', '--', subdir],
--            stderr=STDOUT
-         )
-     finally:
-         os.chdir(cwd)
---- a/tests/utils.py
-+++ b/tests/utils.py
-@@ -133,7 +133,7 @@ def run_rmlint_once(*args,
- 
-     cmd += shlex.split(' '.join(args))
-     if with_json:
--        cmd += ['-o', 'json:/tmp/out.json', '-c', 'json:oneline']
-+        cmd += ['-o', 'json:' + os.path.join(TESTDIR_NAME, 'out.json'), '-c', 'json:oneline']
- 
-     for idx, output in enumerate(outputs or []):
-         cmd.append('-o')
-@@ -168,7 +168,7 @@ def run_rmlint_once(*args,
-         return output
- 
-     if with_json:
--        with open('/tmp/out.json', 'r') as f:
-+        with open(os.path.join(TESTDIR_NAME, 'out.json'), 'r') as f:
-             json_data = json.loads(f.read())
-     else:
-         json_data = []
diff --git a/app-misc/rmlint/files/rmlint-2.10.1-scons.patch b/app-misc/rmlint/files/rmlint-2.10.1-scons.patch
deleted file mode 100644
index a60aafe1fa67..000000000000
--- a/app-misc/rmlint/files/rmlint-2.10.1-scons.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -515,7 +515,7 @@ AddOption(
-     action='store', metavar='DIR', help='libdir name (lib or lib64)'
- )
- 
--for suffix in ['libelf', 'gettext', 'fiemap', 'blkid', 'json-glib', 'gui']:
-+for suffix in ['libelf', 'gettext', 'fiemap', 'blkid', 'json-glib', 'gui', 'docs']:
-     AddOption(
-         '--without-' + suffix, action='store_const', default=False, const=False,
-         dest='with_' + suffix
-@@ -804,7 +804,8 @@ env.Default(library)
- 
- SConscript('tests/SConscript', exports='programs')
- SConscript('po/SConscript')
--SConscript('docs/SConscript')
-+if GetOption("with_docs"):
-+    SConscript('docs/SConscript')
- SConscript('gui/SConscript')
- 
- 
-@@ -883,7 +884,6 @@ if 'config' in COMMAND_LINE_TARGETS:
-     Find non-stripped binaries (needs libelf)             : {libelf}
-     Optimize using ioctl(FS_IOC_FIEMAP) (needs linux)     : {fiemap}
-     Support for SHA512 (needs glib >= 2.31)               : {sha512}
--    Build manpage from docs/rmlint.1.rst                  : {sphinx}
-     Support for caching checksums in file's xattr         : {xattr}
-     Support for reading json caches (needs json-glib)     : {json_glib}
-     Checking for proper support of big files >= 4GB       : {bigfiles}
-@@ -898,6 +898,9 @@ if 'config' in COMMAND_LINE_TARGETS:
-         (needs <locale.h> for compile side support)       : {locale}
-         (needs msgfmt to compile .po files)               : {msgfmt}
- 
-+    Enable GUI                                            : {gui}
-+    Build docs                                            : {docs}
-+
- {grey}The following constants will be used during the build:{end}
- 
-     Version information  : {version}
-@@ -925,6 +928,8 @@ Type 'scons' to actually compile rmlint now. Good luck.
-             bigfiles=yesno(env['HAVE_BIGFILES']),
-             bigofft=yesno(env['HAVE_BIG_OFF_T']),
-             bigstat=yesno(env['HAVE_BIG_STAT']),
-+            gui=yesno(GetOption("with_gui")),
-+            docs=yesno(GetOption("with_docs")),
-             sphinx=COLORS['green'] + 'yes, using ' + COLORS['end'] + sphinx_bin if sphinx_bin else yesno(sphinx_bin),
-             compiler=env['CC'],
-             prefix=GetOption('prefix'),
---- a/gui/setup.py
-+++ b/gui/setup.py
-@@ -37,7 +37,7 @@ def get_prefix():
- PREFIX = get_prefix()
- 
- 
--class PrePlusPostInstall(install):
-+class PreInstall(install):
-     def run(self):
-         # Compile the resource bundle freshly
-         print('==> Compiling resource bundle')
-@@ -59,24 +59,6 @@ class PrePlusPostInstall(install):
-         # Run the usual distutils install routine:
-         install.run(self)
- 
--        # Make sure the schema file is updated.
--        # Otherwise the gui will trace trap.
--        print('==> Compiling GLib Schema files')
--
--        try:
--            subprocess.call([
--                'glib-compile-schemas',
--                os.path.join(PREFIX, 'share/glib-2.0/schemas')
--            ])
--        except subprocess.CalledProcessError as err:
--            print('==> Could not update schemas: ', err)
--            print('==> Please run the following manually:\n')
--            print('    sudo glib-compile-schemas {prefix}'.format(
--                prefix=os.path.join(PREFIX, 'share/glib-2.0/schemas')
--            ))
--        else:
--            print('==> OK!')
--
- 
- setup(
-     name='Shredder',
-@@ -88,7 +70,7 @@ setup(
-     url='https://rmlint.rtfd.org',
-     license='GPLv3',
-     platforms='any',
--    cmdclass={'install': PrePlusPostInstall},
-+    cmdclass={'install': PreInstall},
-     packages=['shredder', 'shredder.views'],
-     package_data={'': [
-         'resources/*.gresource'
diff --git a/app-misc/rmlint/files/rmlint-2.10.1-skip-tests.patch b/app-misc/rmlint/files/rmlint-2.10.1-skip-tests.patch
deleted file mode 100644
index f5f81fd6d0a0..000000000000
--- a/app-misc/rmlint/files/rmlint-2.10.1-skip-tests.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 566198730352f2353fd8332794409d7c9edf80e2
-Author: Louis Sautier <sautier.louis@gmail.com>
-Date:   Wed Sep 8 00:53:28 2021 +0200
-
-    tests: skip man and python2
-    
-    Those tests fail respectively when the documentation isn't built and when
-    python2 isn't available (probably specific to Gentoo).
-
-diff --git a/tests/test_formatters/test_py.py b/tests/test_formatters/test_py.py
-index 92b17604..28d2dd42 100644
---- a/tests/test_formatters/test_py.py
-+++ b/tests/test_formatters/test_py.py
-@@ -16,7 +16,7 @@ def _check_interpreter(interpreter):
-         return False
- 
- 
--@parameterized(["python2", "python3"])
-+@parameterized(["python3"])
- @with_setup(usual_setup_func, usual_teardown_func)
- def test_paranoia(interpreter):
-     if not _check_interpreter(interpreter):
-diff --git a/tests/test_options/test_help.py b/tests/test_options/test_help.py
-index d934724a..60bc40a0 100644
---- a/tests/test_options/test_help.py
-+++ b/tests/test_options/test_help.py
-@@ -17,7 +17,7 @@ def test_help():
- 
- 
- @with_setup(usual_setup_func, usual_teardown_func)
--def test_man():
-+def _test_man():
-     yelp = subprocess.check_output(
-         ['./rmlint', '--show-man'], stderr=subprocess.STDOUT
-     ).decode('utf-8')
diff --git a/app-misc/rmlint/files/rmlint-2.10.1-x86-fix-size.patch b/app-misc/rmlint/files/rmlint-2.10.1-x86-fix-size.patch
deleted file mode 100644
index b67c13f527ee..000000000000
--- a/app-misc/rmlint/files/rmlint-2.10.1-x86-fix-size.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 87c53a5cb0ec37412cf9fe748dc90dddc6812733
-Author: Louis Sautier <sautier.louis@gmail.com>
-Date:   Wed Sep 8 19:39:07 2021 +0200
-
-    Fix max sizes on x86, closes #522
-    
-    strtoull returns ULLONG_MAX, not ULONG_MAX.
-
-diff --git a/lib/cmdline.c b/lib/cmdline.c
-index 56141d94..36f48c1b 100644
---- a/lib/cmdline.c
-+++ b/lib/cmdline.c
-@@ -351,7 +351,7 @@ static RmOff rm_cmd_size_string_to_bytes(const char *size_spec, GError **error)
-             return 0;
-         }
- 
--        if(fraction_num == ULONG_MAX && errno == ERANGE) {
-+        if(fraction_num == ULLONG_MAX && errno == ERANGE) {
-             g_set_error(error, RM_ERROR_QUARK, 0, _("Fraction is too big for uint64"));
-             return 0;
-         }
-@@ -371,7 +371,7 @@ static RmOff rm_cmd_size_string_to_bytes(const char *size_spec, GError **error)
-             return 0;
-         }
- 
--        if(base_size == ULONG_MAX && errno == ERANGE) {
-+        if(base_size == ULLONG_MAX && errno == ERANGE) {
-             g_set_error(error, RM_ERROR_QUARK, 0, _("Size is too big for uint64"));
-             return 0;
-         }
diff --git a/app-misc/rmlint/files/rmlint-2.10.2-fix-sorting-tests.patch b/app-misc/rmlint/files/rmlint-2.10.2-fix-sorting-tests.patch
deleted file mode 100644
index 77f47b18c853..000000000000
--- a/app-misc/rmlint/files/rmlint-2.10.2-fix-sorting-tests.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 69d9dcb60c9e88084aba37545c77fd02fdc7df33 Mon Sep 17 00:00:00 2001
-From: Cebtenzzre <cebtenzzre@gmail.com>
-Date: Wed, 9 Aug 2023 18:42:00 -0400
-Subject: [PATCH] tests: fix failures caused by certain directory names
-
-Fixes #630
---- a/tests/test_options/test_sorting.py
-+++ b/tests/test_options/test_sorting.py
-@@ -158,15 +158,15 @@ def test_sort_by_regex():
-     create_file('xxx', 'aaab')
-     create_file('xxx', 'b')
-     create_file('xxx', 'c')
--    create_file('xxx', '1/c')
--    create_file('xxx', 'd')
-+    create_file('xxx', 'd/e')
-+    create_file('xxx', 'f')
- 
--    head, *data, footer = run_rmlint("-S 'r<1/c>x<d$>a'")
-+    head, *data, footer = run_rmlint("-S 'r<d/e>x<f$>a'")
- 
-     paths = [p['path'] for p in data]
- 
--    assert paths[0].endswith('1/c')
--    assert paths[1].endswith('d')
-+    assert paths[0].endswith('d/e')
-+    assert paths[1].endswith('f')
-     assert paths[2].endswith('aaaa')
-     assert paths[3].endswith('aaab')
-     assert paths[4].endswith('b')
-@@ -206,16 +206,16 @@ def test_sort_by_regex_bad_input():
- # regression test for GitHub issue #484
- @with_setup(usual_setup_func, usual_teardown_func)
- def test_regex_multiple_matches():
--    paths = [
--        '1/a', '1/a2', '1/b',
--        '2/a', '2/a2', '2/b',
--    ]
-+    paths = [os.path.join(dname, bname)
-+             for dname in ['unique_1', 'unique_2']
-+             for bname in ['a', 'a2', 'b']]
-+
-     for path in reversed(paths):
-         create_file('xxx', path)
- 
-     # when multiple paths matched a regex, rmlint would not try the next criterion
-     # check multiple times because sort order was inconsistent before the fix
-     for _ in range(3):
--        head, *data, foot = run_rmlint("-S 'r<1>x<a>l'")
-+        head, *data, foot = run_rmlint("-S 'r<unique_1>x<a>l'")
-         assert len(data) == len(paths)
-         assert [e['path'] for e in data] == [os.path.join(TESTDIR_NAME, p) for p in paths]
diff --git a/app-misc/rmlint/metadata.xml b/app-misc/rmlint/metadata.xml
deleted file mode 100644
index 9a07ca2b4a52..000000000000
--- a/app-misc/rmlint/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>sbraz@gentoo.org</email>
-		<name>Louis Sautier</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">sahib/rmlint</remote-id>
-		<bugs-to>https://github.com/sahib/rmlint/issues</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/app-misc/rmlint/rmlint-2.10.1-r2.ebuild b/app-misc/rmlint/rmlint-2.10.1-r2.ebuild
deleted file mode 100644
index 4d755cc14da3..000000000000
--- a/app-misc/rmlint/rmlint-2.10.1-r2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit gnome2-utils python-single-r1 scons-utils toolchain-funcs
-
-DESCRIPTION="Extremely fast tool to remove duplicates and other lint from your filesystem"
-HOMEPAGE="https://rmlint.readthedocs.io/"
-SRC_URI="https://github.com/sahib/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gui nls test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	virtual/libelf:0=
-"
-RDEPEND="
-	${DEPEND}
-	gui? (
-		${PYTHON_DEPS}
-		gnome-base/librsvg:2[introspection]
-		sys-auth/polkit[introspection]
-		x11-libs/gdk-pixbuf[introspection]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/gtksourceview:3.0[introspection]
-		x11-libs/pango[introspection]
-		$(python_gen_cond_dep '
-			dev-python/colorlog[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-		')
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
-		')
-	)
-	nls? ( sys-devel/gettext )
-	test? (
-		${PYTHON_DEPS}
-		app-shells/dash
-		$(python_gen_cond_dep '
-			dev-python/nose[${PYTHON_USEDEP}]
-			dev-python/parameterized[${PYTHON_USEDEP}]
-			dev-python/psutil[${PYTHON_USEDEP}]
-			dev-python/pyxattr[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-DOCS=(CHANGELOG.md README.rst)
-PATCHES=(
-	# The build system tries to override several CFLAGS
-	"${FILESDIR}/${PN}-2.10.1-cflags.patch"
-	# https://github.com/sahib/rmlint/pull/520
-	"${FILESDIR}/${PN}-2.10.1-scons.patch"
-	# https://github.com/sahib/rmlint/pull/521
-	"${FILESDIR}/${PN}-2.10.1-fix-tests.patch"
-	# Skip problematic tests
-	"${FILESDIR}/${PN}-2.10.1-skip-tests.patch"
-	# https://github.com/sahib/rmlint/pull/523
-	"${FILESDIR}/${PN}-2.10.1-x86-fix-size.patch"
-	# https://github.com/sahib/rmlint/pull/526
-	"${FILESDIR}/${PN}-2.10.1-fix-cc.patch"
-	# https://github.com/sahib/rmlint/issues/608#issuecomment-1406811107
-	"${FILESDIR}/${PN}-2.10.1-fix-gui-install.patch"
-)
-
-src_prepare() {
-	default
-	# Force the GUI to run with the correct PYTHON_SINGLE_TARGET
-	sed -i "/const char \*commands/s/python3/${EPYTHON}/" \
-		lib/cmdline.c || die
-	if use test && use x86; then
-		# Skip part of a test until this is fixed:
-		# https://github.com/sahib/rmlint/issues/522
-		sed -i '/--size 0-18446744073709551615\.1/d' \
-			tests/test_options/test_size.py || die
-	fi
-}
-
-src_configure() {
-	# Needed for USE=-native-symlinks
-	tc-export AR CC
-	scons_opts=(
-		VERBOSE=1
-		$(use_with doc docs)
-		$(use_with gui)
-		$(use_with nls gettext)
-	)
-	escons "${scons_opts[@]}" config
-}
-
-src_compile() {
-	escons "${scons_opts[@]}"
-}
-
-src_test() {
-	RM_TS_DIR="${T}/tests" nosetests -s -v -a '!slow' || \
-		die "Tests failed"
-}
-
-src_install() {
-	escons "${scons_opts[@]}" --prefix="${ED}/usr" --actual-prefix="${EPREFIX}/usr" install
-
-	# https://github.com/sahib/rmlint/pull/525
-	if use doc; then
-		gzip -d "${ED}/usr/share/man/man1/rmlint.1.gz" || die
-	fi
-	if use gui; then
-		python_optimize
-	fi
-	einstalldocs
-}
-
-pkg_preinst() {
-	if use gui; then
-		gnome2_schemas_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use gui; then
-		gnome2_schemas_update
-		xdg_icon_cache_update
-	fi
-}
-
-pkg_postrm() {
-	if use gui; then
-		gnome2_schemas_update
-		xdg_icon_cache_update
-	fi
-}
diff --git a/app-misc/rmlint/rmlint-2.10.2.ebuild b/app-misc/rmlint/rmlint-2.10.2.ebuild
deleted file mode 100644
index 93b2c479581f..000000000000
--- a/app-misc/rmlint/rmlint-2.10.2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit gnome2-utils python-single-r1 scons-utils toolchain-funcs
-
-DESCRIPTION="Extremely fast tool to remove duplicates and other lint from your filesystem"
-HOMEPAGE="https://rmlint.readthedocs.io/"
-SRC_URI="https://github.com/sahib/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gui nls test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	virtual/libelf:0=
-"
-RDEPEND="
-	${DEPEND}
-	gui? (
-		${PYTHON_DEPS}
-		gnome-base/librsvg:2[introspection]
-		x11-libs/gdk-pixbuf[introspection]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/gtksourceview:3.0[introspection]
-		x11-libs/pango[introspection]
-		$(python_gen_cond_dep '
-			dev-python/colorlog[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-		')
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
-		')
-	)
-	nls? ( sys-devel/gettext )
-	test? (
-		${PYTHON_DEPS}
-		app-shells/dash
-		$(python_gen_cond_dep '
-			dev-python/nose[${PYTHON_USEDEP}]
-			dev-python/parameterized[${PYTHON_USEDEP}]
-			dev-python/psutil[${PYTHON_USEDEP}]
-			dev-python/pyxattr[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-DOCS=(CHANGELOG.md README.rst)
-PATCHES=(
-	# The build system tries to override several CFLAGS
-	"${FILESDIR}/${PN}-2.10.1-cflags.patch"
-	# https://github.com/sahib/rmlint/pull/520
-	"${FILESDIR}/${PN}-2.10.1-scons.patch"
-	# Skip problematic tests
-	"${FILESDIR}/${PN}-2.10.1-skip-tests.patch"
-	# https://github.com/sahib/rmlint/pull/526
-	"${FILESDIR}/${PN}-2.10.1-fix-cc.patch"
-	# https://github.com/sahib/rmlint/commit/69d9dcb60c9e88084aba37545c77fd02fdc7df33
-	"${FILESDIR}/${P}-fix-sorting-tests.patch"
-)
-
-src_prepare() {
-	default
-	# Force the GUI to run with the correct PYTHON_SINGLE_TARGET
-	sed -i "/const char \*commands/s/python3/${EPYTHON}/" \
-		lib/cmdline.c || die
-}
-
-src_configure() {
-	# Needed for USE=-native-symlinks
-	tc-export AR CC
-	scons_opts=(
-		VERBOSE=1
-		$(use_with doc docs)
-		$(use_with gui)
-		$(use_with nls gettext)
-	)
-	escons "${scons_opts[@]}" config
-}
-
-src_compile() {
-	escons "${scons_opts[@]}"
-}
-
-src_test() {
-	RM_TS_DIR="${T}/tests" nosetests -s -v -a '!slow' || \
-		die "Tests failed"
-}
-
-src_install() {
-	escons "${scons_opts[@]}" --prefix="${ED}/usr" --actual-prefix="${EPREFIX}/usr" install
-
-	# https://github.com/sahib/rmlint/pull/525
-	if use doc; then
-		gzip -d "${ED}/usr/share/man/man1/rmlint.1.gz" || die
-	fi
-	if use gui; then
-		python_optimize
-	fi
-	einstalldocs
-}
-
-pkg_preinst() {
-	if use gui; then
-		gnome2_schemas_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use gui; then
-		gnome2_schemas_update
-		xdg_icon_cache_update
-	fi
-}
-
-pkg_postrm() {
-	if use gui; then
-		gnome2_schemas_update
-		xdg_icon_cache_update
-	fi
-}
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 32a0f16bc3ac..56d946f9e557 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index 6e34113deaed..b123df9745b7 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -1,4 +1,6 @@
 DIST gentoo-syntax-13.tar.bz2 20995 BLAKE2B 90196be7b1f0bbbe8398f327cebe2bbbcffbf8db2e27debc321478911d2413de51ef29d3a94e936e1d92eb4d246237d66d4fa8742fd165e4043ceb2dd80beb9a SHA512 c695dd8c80b551307381a4fb0656adc07321cf60f88e1888ce3a2080343d458a35bb4bda785e233fa4907534b35114c83b5d4b5e3f3bd02d0d6c2dd7ab7deda1
+DIST gentoo-syntax-14.tar.bz2 20988 BLAKE2B 2f11628bec985ef486ad6f04b694df7a2b1e5ef34f5ddb364c7d9dea4a507d9bae4d8de6b00b33358cf651b4fc6816164f22f7760275a1fd0668b89927859cfb SHA512 63914ffb1911d83fa8991a901f9a23ccfc30f0170a6a730cb02919f4adf0ad34c70f4457e006b1c08a004448c6b9e85d97634a8ed8fdf0b4f98ef9fd804eef00
 EBUILD gentoo-syntax-13.ebuild 1200 BLAKE2B 9ed0951f9dfc4eb1f37ec1a195c608b2a208d032b92c8dd9c1911250924d0264bee185eff45dddec3681e05c7d2b8e975db57afae506b2d65ccc90cd83d4aba7 SHA512 e5d35275a915fda4a3c4457e5b2f71f0752580d26134dde0b79ba366c95cfc208e1a364a4deeb4733bd08ba5dc2f1806db0ff3f824ac07d693ec99dffd2112ec
+EBUILD gentoo-syntax-14.ebuild 1208 BLAKE2B 66e2a0eb04eda0d4660d5826d00ab95f54ffd5b32d0c227068a3d28e9a651f66c3910c12cf9d3026897c64f02d2f7021b6de0c0c309195c811c9e2b64acdd3e6 SHA512 b44dc2338d8184b9d41cfb616c5de5ab5f9ab40e3d4b242210cecc4b1889bbb55dea1aa0cc91d19ee8881564be7f7dd33ceca0f2f0a71111d59f405ec4d025a2
 EBUILD gentoo-syntax-9999.ebuild 1076 BLAKE2B 0688da77100e073b40e8b72bd97a6c3cce176f73a36e89489a5536b73a1cd9896222c967c564aa8cac53c5be61be6e7495b4f460f413d899f23a250108d5eb4a SHA512 ee83565cc9c614275d5bbfc5cc33b19cc8af0d170837358e663a63f8de95d86c37f33995e878355dc482d5381ae9dd77fb891c2d484d5e2307d20d85f053a3b8
 MISC metadata.xml 646 BLAKE2B d33ab1ce3b852316a114a27c7768310491f51669a44a183c5b2fe639a0d2e65439759de9a83cb019467ef5d206470454bfe1939906d32c1a7fe6ebad0458e14b SHA512 a75bc08e066deac74dc6a8a9927e232be4facc31e0810121480c07e75549de2cbc974eff9f71f2c59fb17f0739bd0cd9cede9a048af4715047a796b6a5afea7d
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-14.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-14.ebuild
new file mode 100644
index 000000000000..fae057eb2f06
--- /dev/null
+++ b/app-vim/gentoo-syntax/gentoo-syntax-14.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
+HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
+SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
+
+LICENSE="vim"
+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"
+IUSE="ignore-glep31"
+
+VIM_PLUGIN_HELPFILES="gentoo-syntax"
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_prepare() {
+	default
+	if use ignore-glep31 ; then
+		for f in ftplugin/*.vim ; do
+			ebegin "Removing UTF-8 rules from ${f} ..."
+			sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \
+				|| die "waah! bad sed voodoo. need more goats."
+			eend $?
+		done
+	fi
+}
+
+pkg_postinst() {
+	vim-plugin_pkg_postinst
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		if use ignore-glep31 1>/dev/null ; then
+			ewarn "You have chosen to disable the rules which ensure GLEP 31"
+			ewarn "compliance. When editing ebuilds, please make sure you get"
+			ewarn "the character set correct."
+		fi
+	fi
+}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 1645d4fdd60d..2d777be30d1b 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/libodb-sqlite/Manifest b/dev-cpp/libodb-sqlite/Manifest
deleted file mode 100644
index 4753e6b88d91..000000000000
--- a/dev-cpp/libodb-sqlite/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch 912 BLAKE2B e3e90530c8593be5a6853542299081d795c0ae1719d68fb9c68e1bb7007aa6e43c7311721be5fb7886c5e67f3151a4fa0dbb244a6ee1916f17d6f29f5ce7990c SHA512 262feeffe5cbe9dade81d903c4d07bd1526f7942e42febdf84017d8190d4abcae0e39a8a1799db63018cb62dab0cb9c94f1a8de330aef96549a242f6da54a4cf
-AUX build2-0.13.0_alpha0_pre20200710-nousrlocal.patch 1931 BLAKE2B 5faca35d7501cd0348910719286bcab2736cd94166db626bd77a62b90512ed6d99fbc2548a6ff30b0f5badecdcaa67a462a6ff11f51af8f9b9faba24fd8edefd SHA512 f57de10af06aa138a7c153e56d35b173a4804324557611baabb38ac00cfde0c8db2b59b57d5ad23a3f76877168745f1d40be1b7527241b47a163df4cc5879967
-DIST build2-toolchain-0.13.0.tar.xz 4218940 BLAKE2B ed27290df21e5db843325b3e42c43c6934ce8f2b9b157538b921f9cfe3a7dccc3b56e261053373553cbd7fbff39e912ffe2282f812d0e6f158749ed5748d5e33 SHA512 0485872acd40beb700739b2995f76efcc9811dd52a38ee049576e45fcb5a7d7ae9c718beca8aeab9ab3f1c5e0270d3946f2335f88ec19476577c195417c2dbd4
-DIST build2-toolchain-0.14.0.tar.xz 4687616 BLAKE2B 98b2ec93c18027cbb3294650b3ad5d3dc97c1f06a6580437eac2db0297d3517cf327179f3a7c6efc611bffed5d028a034382d408ca58a976311d50a26534323c SHA512 d238a4ddfce8506b51b3b775738e818e7e0b36961a09ae0912c0c8688057b8393afebd4c0a28c6e6827c2e72ad5b82bc5e1231f798a66c2bb86b2b1e4ece73ef
-DIST build2-toolchain-0.15.0.tar.xz 5122496 BLAKE2B 6170ccf7e251e189369873ae81a4c24fdfd7b3beb38728da0c40284a8e6329d1dd152e861bbb5d2dbc0b4931af6e72c191c52abe98111c5dbf7922df888b046e SHA512 3dba63813a227a1542bcec52406c98e6d61fb366f0fe2617fac130906d0811d00356330bcd03faabf83f30604044f92e40476669a4b04060f83ede7a4db88ecb
-DIST libodb-sqlite-2.5.0-b.19.tar.gz 74822 BLAKE2B e9a5d3be8b453bcdc026b6349572c3bd88eb468329216bee535f4e1ac72bfe6c88b485efe2476303600209df42023099fdda88b410d9295e8cab73ed9dd03fc0 SHA512 be6dbc731d9f45dfc7e9246f404edad78d59c9d38cff6599aed56d60d4f0e8391336e2da3608f66d74559f0a8d34243eb38e7e6a1221188959321810193ae901
-DIST libodb-sqlite-2.5.0-b.21.tar.gz 79975 BLAKE2B f9dca03ba909276ed137c15cbe32a8227b688f8b1c2d3e98b7040f3463359400fd5116088ae77722651589788e2d8e1367bc135ed2104dbc2d624ff4910f3fce SHA512 a84ea3847c64e5beffcb1f3958583bc02d371a4eb354ad32d0083b01e27362905bdcf09913c9b4cd6fc977eeaba95fd46cf953332e4fd0d673ca2f7521c71a1f
-DIST libodb-sqlite-2.5.0-b.25.tar.gz 77096 BLAKE2B 594e805428c4b6f20cefa9838175831278166e6d5612be4a79da972ca85ca95f6f8b18adadfd11ba4adcb7751f83bea8b5e3ce1f6e7ae76c5b361fcabfc633be SHA512 886119c8524939fa7c094afc157ada1797dca338d6e1a488aca8552615e2050c9d555e3784226e2d28faee58019a8e51b990ee9df1af1bdfe00d591d7268d673
-EBUILD libodb-sqlite-2.5.0_beta19.ebuild 3047 BLAKE2B d8f3ad6f4a660578ef18be3f424070fc0b76506deacf615fd0fb3a6bf06bf53a506b0a61193dbe1b21d8fd72add63ea131b1bd78e04bb9eeb500817622aed443 SHA512 c9dadbb3dbc3fa009ac4fc6b9779955011acdfca6792bf8d853cd789ca6d1aa25f813e52a4a11138d734f24e694b51055996c77397efd7b7a24ae878306a9909
-EBUILD libodb-sqlite-2.5.0_beta21.ebuild 2944 BLAKE2B 3f1b342dcbd02217e0433c2a957d4219636a9e2e47f805aaf902db6c6bf43941641a6ce1a034356ae22681755881af1501df7448950a442d33725fa83a4806d5 SHA512 3e5a3b7dc5b12e254f0faf216c00a049bf192e996943f4cdabfa2adcbc24a3230a37214f89608328e83a4b5194272efb68ef9dc3c13833874f4736b8678a429d
-EBUILD libodb-sqlite-2.5.0_beta25.ebuild 3128 BLAKE2B 9e29b0aa4df1db6b571a0d9f134efb6e9e51406e716b473cc127c05d188ab150dd6acb857cd03e3b274cc05d5a69630a31a162c2647ac98e9eff8101699fb261 SHA512 f1c72d13f490902085935e1589691c65b8ba50e145f1619e78ec35ba8bd76285a8d70e70f79d38c23a04f2c44a27f202049584b966abf778e8011416e756634b
-MISC metadata.xml 833 BLAKE2B 3aec2098c3bdba7d29682b81454bad993ed77e3c68b52a253a51aee66a352a290fd31e82a9dd9b7a7bce953c540efecdc21ccd8f567fbd0cfeb9d85226a3df04 SHA512 1eefb417b674e4060530144d98f47f55ba6d831ebf8005a4f831a83a1a4924914d5efbd64f7714d7ddbd831613e25aa03b185cc62c8f68cfff6bd1200fb65b50
diff --git a/dev-cpp/libodb-sqlite/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch b/dev-cpp/libodb-sqlite/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
deleted file mode 100644
index 00b685600c8e..000000000000
--- a/dev-cpp/libodb-sqlite/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- build2-toolchain-0.13.0-orig/build2/libbuild2/script/regex.cxx	2020-06-10 19:25:37.000000000 +1000
-+++ build2-toolchain-0.13.0/build2/libbuild2/script/regex.cxx	2020-08-10 14:00:05.698012838 +1000
-@@ -5,6 +5,35 @@
- 
- #include <libbuild2/script/regex.hxx>
- 
-+#if defined(_LIBCPP_VERSION)
-+template <>
-+void
-+std::__1::__match_any_but_newline<build2::script::regex::line_char>::__exec(__state& __s) const
-+{
-+  if (__s.__current_ != __s.__last_)
-+  {
-+    switch (*__s.__current_)
-+    {
-+      case '\r':
-+      case '\n':
-+        __s.__do_ = __state::__reject;
-+        __s.__node_ = nullptr;
-+        break;
-+      default:
-+        __s.__do_ = __state::__accept_and_consume;
-+        ++__s.__current_;
-+        __s.__node_ = this->first();
-+        break;
-+    }
-+  }
-+  else
-+  {
-+    __s.__do_ = __state::__reject;
-+    __s.__node_ = nullptr;
-+  }
-+}
-+#endif
-+
- using namespace std;
- 
- namespace build2
diff --git a/dev-cpp/libodb-sqlite/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch b/dev-cpp/libodb-sqlite/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
deleted file mode 100644
index c3717856b6b7..000000000000
--- a/dev-cpp/libodb-sqlite/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- build2-toolchain-e135a3112b15c88f0601583ca068f8adea7b605d-orig/build2/libbuild2/cc/module.cxx	2020-07-10 20:12:57.000000000 +1000
-+++ build2-toolchain-e135a3112b15c88f0601583ca068f8adea7b605d/build2/libbuild2/cc/module.cxx	2020-07-14 14:33:58.939950579 +1000
-@@ -323,8 +323,6 @@
- 
- #ifndef _WIN32
-     static const dir_path usr_inc     ("/usr/include");
--    static const dir_path usr_loc_lib ("/usr/local/lib");
--    static const dir_path usr_loc_inc ("/usr/local/include");
- #  ifdef __APPLE__
-     static const dir_path a_usr_inc (
-       "/Library/Developer/CommandLineTools/SDKs/MacOSX*.sdk/usr/include");
-@@ -486,7 +484,6 @@
-         auto& ls (lib_dirs.first);
- 
-         bool ui  (find (is.begin (), is.end (), usr_inc)     != is.end ());
--        bool uli (find (is.begin (), is.end (), usr_loc_inc) != is.end ());
- 
- #ifdef __APPLE__
-         // On Mac OS starting from 10.14 there is no longer /usr/include.
-@@ -509,7 +506,7 @@
-         //
-         // Is Apple's /usr/include.
-         //
--        if (!ui && !uli)
-+        if (!ui)
-         {
-           for (const dir_path& d: is)
-           {
-@@ -521,22 +518,16 @@
-           }
-         }
- #endif
--        if (ui || uli)
-+        if (ui)
-         {
--          bool ull (find (ls.begin (), ls.end (), usr_loc_lib) != ls.end ());
--
-           // Many platforms don't search in /usr/local/lib by default (but do
-           // for headers in /usr/local/include). So add it as the last option.
-           //
--          if (!ull && exists (usr_loc_lib, true /* ignore_error */))
--            ls.push_back (usr_loc_lib);
- 
-           // FreeBSD is at least consistent: it searches in neither. Quoting
-           // its wiki: "FreeBSD can't even find libraries that it installed."
-           // So let's help it a bit.
-           //
--          if (!uli && exists (usr_loc_inc, true /* ignore_error */))
--            is.push_back (usr_loc_inc);
-         }
-       }
- #endif
diff --git a/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta19.ebuild b/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta19.ebuild
deleted file mode 100644
index 667455d569ee..000000000000
--- a/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta19.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)"
-
-BUILD2_PN=build2-toolchain
-BUILD2_PV="0.13.0"
-BUILD2_P="${BUILD2_PN}-${BUILD2_PV}"
-
-inherit toolchain-funcs multiprocessing
-SRC_URI="https://pkg.cppget.org/1/beta/odb/${MY_P}.tar.gz
-	https://download.build2.org/${BUILD2_PV}/${BUILD2_P}.tar.xz"
-KEYWORDS="~amd64 ~x86"
-DESCRIPTION="Common ODB runtime library"
-HOMEPAGE="https://codesynthesis.com/products/odb/"
-
-LICENSE="|| ( Code-Synthesis-ODB GPL-2 )"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-cpp/libodb
-	dev-db/sqlite:3
-"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${DEPEND}
-	!<dev-util/build2-0.13.0
-"
-
-BS="${WORKDIR}/${BUILD2_P}"
-S="${WORKDIR}/${MY_P}"
-
-b() {
-	local myargs=(
-		--jobs $(makeopts_jobs)
-		--verbose 3
-	)
-	export LD_LIBRARY_PATH="${BS}/libbutl/libbutl:${BS}/build2/libbuild2:${BS}/build2/libbuild2/bash:${BS}/build2/libbuild2/in:${BS}/build2/libbuild2/bin:${BS}/build2/libbuild2/c:${BS}/build2/libbuild2/cc:${BS}/build2/libbuild2/cxx:${BS}/build2/libbuild2/version:${BS}/libpkgconf/libpkgconf:${LD_LIBRARY_PATH}"
-	set -- "${BS}"/build2/build2/b-boot "${@}" "${myargs[@]}"
-	echo "${@}"
-	"${@}" || die "${@} failed"
-}
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	for i in ${BUILD2_P}/libodb-sqlite/buildfile ${MY_P}/buildfile; do
-		printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-			"-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 --libs)" \
-			"$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \
-			${i} \
-			|| die
-	done
-
-	cd "${BS}" || die
-	eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
-	eapply "${FILESDIR}"/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
-	sed \
-		-e 's:libsqlite3[/]\?::' \
-		-i buildfile build/bootstrap.build \
-		|| die
-
-	if has_version dev-util/pkgconf; then
-		for i in build2/build2/buildfile build2/libbuild2/buildfile; do
-			printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-				"$($(tc-getPKG_CONFIG) libpkgconf --libs)" \
-				"$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> \
-				"${i}" \
-				|| die
-		done
-		sed \
-			-e 's:libpkgconf[/]\?::' \
-			-i buildfile build/bootstrap.build \
-			|| die
-	fi
-
-	cd "${S}" || die
-	default
-}
-
-src_configure() {
-	pushd ${BS} || die
-	emake -C build2 -f bootstrap.gmake \
-		CXX=$(tc-getCXX) \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-	popd || die
-
-	b configure \
-		config.cxx="$(tc-getCXX)" \
-		config.cxx.coptions="${CXXFLAGS}" \
-		config.cxx.loptions="${LDFLAGS}" \
-		config.c="$(tc-getCC)" \
-		config.cc.coptions="${CFLAGS}" \
-		config.cc.loptions="${LDFLAGS}" \
-		config.bin.ar="$(tc-getAR)" \
-		config.bin.ranlib="$(tc-getRANLIB)" \
-		config.bin.lib=shared \
-		config.install.root="${EPREFIX}"/usr \
-		config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
-		config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_compile() {
-	b update-for-install
-	use test && b update-for-test
-}
-
-src_test() {
-	b test
-}
-
-src_install() {
-	b install \
-		config.install.chroot="${D}"
-}
diff --git a/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta21.ebuild b/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta21.ebuild
deleted file mode 100644
index 996133e1f47f..000000000000
--- a/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta21.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)"
-
-BUILD2_PN=build2-toolchain
-BUILD2_PV="0.14.0"
-BUILD2_P="${BUILD2_PN}-${BUILD2_PV}"
-
-inherit toolchain-funcs multiprocessing
-SRC_URI="https://pkg.cppget.org/1/beta/odb/${MY_P}.tar.gz
-	https://download.build2.org/${BUILD2_PV}/${BUILD2_P}.tar.xz"
-KEYWORDS="~amd64 ~x86"
-DESCRIPTION="Common ODB runtime library"
-HOMEPAGE="https://codesynthesis.com/products/odb/"
-
-LICENSE="|| ( Code-Synthesis-ODB GPL-2 )"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-cpp/libodb
-	dev-db/sqlite:3
-"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${DEPEND}
-	!<dev-util/build2-0.14.0
-"
-
-BS="${WORKDIR}/${BUILD2_P}"
-S="${WORKDIR}/${MY_P}"
-
-b() {
-	local myargs=(
-		--jobs $(makeopts_jobs)
-		--verbose 3
-	)
-	export LD_LIBRARY_PATH="${BS}/libbutl/libbutl:${BS}/build2/libbuild2:${BS}/build2/libbuild2/bash:${BS}/build2/libbuild2/in:${BS}/build2/libbuild2/bin:${BS}/build2/libbuild2/c:${BS}/build2/libbuild2/cc:${BS}/build2/libbuild2/cxx:${BS}/build2/libbuild2/version:${BS}/libpkgconf/libpkgconf:${LD_LIBRARY_PATH}"
-	set -- "${BS}"/build2/build2/b-boot "${@}" "${myargs[@]}"
-	echo "${@}"
-	"${@}" || die "${@} failed"
-}
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	for i in ${BUILD2_P}/libodb-sqlite/buildfile ${MY_P}/buildfile; do
-		printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-			"-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 --libs)" \
-			"$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \
-			${i} \
-			|| die
-	done
-
-	cd "${BS}" || die
-	eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
-	sed \
-		-e 's:libsqlite3[/]\?::' \
-		-i buildfile build/bootstrap.build \
-		|| die
-
-	if has_version dev-util/pkgconf; then
-		for i in build2/build2/buildfile build2/libbuild2/buildfile; do
-			printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-				"$($(tc-getPKG_CONFIG) libpkgconf --libs)" \
-				"$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> \
-				"${i}" \
-				|| die
-		done
-		sed \
-			-e 's:libpkgconf[/]\?::' \
-			-i buildfile build/bootstrap.build \
-			|| die
-	fi
-
-	cd "${S}" || die
-	default
-}
-
-src_configure() {
-	pushd ${BS} || die
-	emake -C build2 -f bootstrap.gmake \
-		CXX=$(tc-getCXX) \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-	popd || die
-
-	b configure \
-		config.cxx="$(tc-getCXX)" \
-		config.cxx.coptions="${CXXFLAGS}" \
-		config.cxx.loptions="${LDFLAGS}" \
-		config.c="$(tc-getCC)" \
-		config.cc.coptions="${CFLAGS}" \
-		config.cc.loptions="${LDFLAGS}" \
-		config.bin.ar="$(tc-getAR)" \
-		config.bin.ranlib="$(tc-getRANLIB)" \
-		config.bin.lib=shared \
-		config.install.root="${EPREFIX}"/usr \
-		config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
-		config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_compile() {
-	b update-for-install
-	use test && b update-for-test
-}
-
-src_test() {
-	b test
-}
-
-src_install() {
-	b install \
-		config.install.chroot="${D}"
-}
diff --git a/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta25.ebuild b/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta25.ebuild
deleted file mode 100644
index c1b349bd0db1..000000000000
--- a/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta25.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)"
-
-# Compare BUILD2_PV with the version in the tarball in the 'manifest' file.
-# e.g. from 2.5.0_beta25's manifest:
-# +depends: * build2 >= 0.15.0
-# +depends: * bpkg >= 0.15.0
-BUILD2_PN=build2-toolchain
-BUILD2_PV="0.15.0"
-BUILD2_P="${BUILD2_PN}-${BUILD2_PV}"
-
-inherit toolchain-funcs multiprocessing
-
-DESCRIPTION="Common ODB runtime library"
-HOMEPAGE="https://codesynthesis.com/products/odb/"
-SRC_URI="
-	https://pkg.cppget.org/1/beta/odb/${MY_P}.tar.gz
-	https://download.build2.org/${BUILD2_PV}/${BUILD2_P}.tar.xz
-"
-BS="${WORKDIR}/${BUILD2_P}"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="|| ( Code-Synthesis-ODB GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-cpp/libodb
-	dev-db/sqlite:3
-"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	${DEPEND}
-	!<dev-util/build2-${BUILD2_PV}
-"
-
-b() {
-	local myargs=(
-		--jobs $(makeopts_jobs)
-		--verbose 3
-	)
-	export LD_LIBRARY_PATH="${BS}/libbutl/libbutl:${BS}/build2/libbuild2:${BS}/build2/libbuild2/bash:${BS}/build2/libbuild2/in:${BS}/build2/libbuild2/bin:${BS}/build2/libbuild2/c:${BS}/build2/libbuild2/cc:${BS}/build2/libbuild2/cxx:${BS}/build2/libbuild2/version:${BS}/libpkgconf/libpkgconf:${LD_LIBRARY_PATH}"
-	set -- "${BS}"/build2/build2/b-boot "${@}" "${myargs[@]}"
-	echo "${@}"
-	"${@}" || die "${@} failed"
-}
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	for i in ${BUILD2_P}/libodb-sqlite/buildfile ${MY_P}/buildfile; do
-		printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-			"-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 --libs)" \
-			"$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \
-			${i} \
-			|| die
-	done
-
-	cd "${BS}" || die
-	eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
-	sed \
-		-e 's:libsqlite3[/]\?::' \
-		-i buildfile build/bootstrap.build \
-		|| die
-
-	if has_version dev-util/pkgconf; then
-		for i in build2/build2/buildfile build2/libbuild2/buildfile; do
-			printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-				"$($(tc-getPKG_CONFIG) libpkgconf --libs)" \
-				"$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> \
-				"${i}" \
-				|| die
-		done
-		sed \
-			-e 's:libpkgconf[/]\?::' \
-			-i buildfile build/bootstrap.build \
-			|| die
-	fi
-
-	cd "${S}" || die
-	default
-}
-
-src_configure() {
-	pushd ${BS} || die
-	emake -C build2 -f bootstrap.gmake \
-		CXX=$(tc-getCXX) \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-	popd || die
-
-	b configure \
-		config.cxx="$(tc-getCXX)" \
-		config.cxx.coptions="${CXXFLAGS}" \
-		config.cxx.loptions="${LDFLAGS}" \
-		config.c="$(tc-getCC)" \
-		config.cc.coptions="${CFLAGS}" \
-		config.cc.loptions="${LDFLAGS}" \
-		config.bin.ar="$(tc-getAR)" \
-		config.bin.ranlib="$(tc-getRANLIB)" \
-		config.bin.lib=shared \
-		config.install.root="${EPREFIX}"/usr \
-		config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
-		config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_compile() {
-	b update-for-install
-	use test && b update-for-test
-}
-
-src_test() {
-	b test
-}
-
-src_install() {
-	b install \
-		config.install.chroot="${D}"
-}
diff --git a/dev-cpp/libodb-sqlite/metadata.xml b/dev-cpp/libodb-sqlite/metadata.xml
deleted file mode 100644
index 835563982136..000000000000
--- a/dev-cpp/libodb-sqlite/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		ODB is an open-source, cross-platform, and cross-database
-		object-relational mapping (ORM) system for C++. It allows you
-		to persist C++ objects to a relational database without having
-		to deal with tables, columns, or SQL and without manually
-		writing any mapping code. ODB supports MySQL, SQLite,
-		PostgreSQL, Oracle, and Microsoft SQL Server relational
-		databases as well as C++98/03 and C++11 language standards. It
-		also comes with optional profiles for Boost and Qt which allow
-		you to seamlessly use value types, containers, and smart
-		pointers from these libraries in your persistent C++ classes.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-cpp/libodb/Manifest b/dev-cpp/libodb/Manifest
deleted file mode 100644
index 75e8e6c6ba4b..000000000000
--- a/dev-cpp/libodb/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch 912 BLAKE2B e3e90530c8593be5a6853542299081d795c0ae1719d68fb9c68e1bb7007aa6e43c7311721be5fb7886c5e67f3151a4fa0dbb244a6ee1916f17d6f29f5ce7990c SHA512 262feeffe5cbe9dade81d903c4d07bd1526f7942e42febdf84017d8190d4abcae0e39a8a1799db63018cb62dab0cb9c94f1a8de330aef96549a242f6da54a4cf
-AUX build2-0.13.0_alpha0_pre20200710-nousrlocal.patch 1931 BLAKE2B 5faca35d7501cd0348910719286bcab2736cd94166db626bd77a62b90512ed6d99fbc2548a6ff30b0f5badecdcaa67a462a6ff11f51af8f9b9faba24fd8edefd SHA512 f57de10af06aa138a7c153e56d35b173a4804324557611baabb38ac00cfde0c8db2b59b57d5ad23a3f76877168745f1d40be1b7527241b47a163df4cc5879967
-DIST build2-toolchain-0.13.0.tar.xz 4218940 BLAKE2B ed27290df21e5db843325b3e42c43c6934ce8f2b9b157538b921f9cfe3a7dccc3b56e261053373553cbd7fbff39e912ffe2282f812d0e6f158749ed5748d5e33 SHA512 0485872acd40beb700739b2995f76efcc9811dd52a38ee049576e45fcb5a7d7ae9c718beca8aeab9ab3f1c5e0270d3946f2335f88ec19476577c195417c2dbd4
-DIST build2-toolchain-0.14.0.tar.xz 4687616 BLAKE2B 98b2ec93c18027cbb3294650b3ad5d3dc97c1f06a6580437eac2db0297d3517cf327179f3a7c6efc611bffed5d028a034382d408ca58a976311d50a26534323c SHA512 d238a4ddfce8506b51b3b775738e818e7e0b36961a09ae0912c0c8688057b8393afebd4c0a28c6e6827c2e72ad5b82bc5e1231f798a66c2bb86b2b1e4ece73ef
-DIST build2-toolchain-0.15.0.tar.xz 5122496 BLAKE2B 6170ccf7e251e189369873ae81a4c24fdfd7b3beb38728da0c40284a8e6329d1dd152e861bbb5d2dbc0b4931af6e72c191c52abe98111c5dbf7922df888b046e SHA512 3dba63813a227a1542bcec52406c98e6d61fb366f0fe2617fac130906d0811d00356330bcd03faabf83f30604044f92e40476669a4b04060f83ede7a4db88ecb
-DIST libodb-2.5.0-b.19.tar.gz 101239 BLAKE2B d6c32e4e5bbacafbecf9e992f91604dac4bb50359d41709b81116f09ce805cd2a3388cf14b47acc60d9b5a52867de0725c1dbbc7603dda8ffaf64589b3057ecb SHA512 0a3e70afd2c2ba573676e1a2630986215b4c8e57a004f7d2f2227f301b6c58f739397a0efc8877902baf88b93aff83c9b67c9f5b5e87cc570d64bb76b7b8f66b
-DIST libodb-2.5.0-b.21.tar.gz 101775 BLAKE2B 5417c5dd4540ab6014005803ec505e9dfc8f30125f573bac045306470eb8947fe800717fc02d8af138f7dd50bb82d19f01099f28421733809ccd1858bdc0f941 SHA512 68fa486b3a6f1254fb57e480bdf8e1d008fe38f29c47d5a4648ff44dc964dd7f3ee9d07510d742db15120f272aa6152bf08ca9d7689e4b34b0f5e5910ea71c0e
-DIST libodb-2.5.0-b.25.tar.gz 100681 BLAKE2B 8fbb1a4db2fc994ae490f7e72be2109e0973fb6f29a6435535446e8769d7e123e85b4e6a56566e96485c9b36116a0580f2b2d32b68116e39f1a63baa63618842 SHA512 f99eba87130f7c3ed0b707e1f4efdb839c97c221fee24056d955072767c36106297abe76e5f82054cf5bc3bf0fda631e7c92e4943645d6ff2be57831006505ef
-EBUILD libodb-2.5.0_beta19.ebuild 2929 BLAKE2B 3876b91e9ec8420acf48d7cf9e30099b6ae3966a9613d563d8c720b383b73f829fe626bee93e74201954461f891223510e49efaeb7c604c7caae4960760eadad SHA512 53c399515584df75ba9b1e5b73220dd22f46a3d1a133e225f2f8f3869ed035655bf7a55bc901948ac34475577463d30dc31890ab5862fee627601b19145f9dd4
-EBUILD libodb-2.5.0_beta21.ebuild 2826 BLAKE2B 8581864e1a30971f89439fc823d85e7d7c3c7b31788edb3af7827c4333f417285ef211256f4279ac0e34bdfe680dec9914461f4c7223741ddbf039298651cbc6 SHA512 54bda0a50b2d9f8c25890ac33c1b8543325a4577fa16e13f0b7c5ff10d216f50a74cfab305b87b946c0a8db68d1c435fe9d629b69e738466b3bfa2bfda7298c8
-EBUILD libodb-2.5.0_beta25.ebuild 2985 BLAKE2B 21b1aa4839446f397d0396394cae6728383612007b9474b64caaa4998927e025b197db55e3f5738dc42d326e46801e5d90021a155890442b8a0a1f3cef339203 SHA512 7fbde5524b4e92075756bc2901bd00992ae5184c8e8193ec9e33d45208c201ebf6b2728dc39320f620c8dc1293eabf705251c075cfb98461ff7c35c148c917b4
-MISC metadata.xml 833 BLAKE2B 3aec2098c3bdba7d29682b81454bad993ed77e3c68b52a253a51aee66a352a290fd31e82a9dd9b7a7bce953c540efecdc21ccd8f567fbd0cfeb9d85226a3df04 SHA512 1eefb417b674e4060530144d98f47f55ba6d831ebf8005a4f831a83a1a4924914d5efbd64f7714d7ddbd831613e25aa03b185cc62c8f68cfff6bd1200fb65b50
diff --git a/dev-cpp/libodb/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch b/dev-cpp/libodb/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
deleted file mode 100644
index 00b685600c8e..000000000000
--- a/dev-cpp/libodb/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- build2-toolchain-0.13.0-orig/build2/libbuild2/script/regex.cxx	2020-06-10 19:25:37.000000000 +1000
-+++ build2-toolchain-0.13.0/build2/libbuild2/script/regex.cxx	2020-08-10 14:00:05.698012838 +1000
-@@ -5,6 +5,35 @@
- 
- #include <libbuild2/script/regex.hxx>
- 
-+#if defined(_LIBCPP_VERSION)
-+template <>
-+void
-+std::__1::__match_any_but_newline<build2::script::regex::line_char>::__exec(__state& __s) const
-+{
-+  if (__s.__current_ != __s.__last_)
-+  {
-+    switch (*__s.__current_)
-+    {
-+      case '\r':
-+      case '\n':
-+        __s.__do_ = __state::__reject;
-+        __s.__node_ = nullptr;
-+        break;
-+      default:
-+        __s.__do_ = __state::__accept_and_consume;
-+        ++__s.__current_;
-+        __s.__node_ = this->first();
-+        break;
-+    }
-+  }
-+  else
-+  {
-+    __s.__do_ = __state::__reject;
-+    __s.__node_ = nullptr;
-+  }
-+}
-+#endif
-+
- using namespace std;
- 
- namespace build2
diff --git a/dev-cpp/libodb/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch b/dev-cpp/libodb/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
deleted file mode 100644
index c3717856b6b7..000000000000
--- a/dev-cpp/libodb/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- build2-toolchain-e135a3112b15c88f0601583ca068f8adea7b605d-orig/build2/libbuild2/cc/module.cxx	2020-07-10 20:12:57.000000000 +1000
-+++ build2-toolchain-e135a3112b15c88f0601583ca068f8adea7b605d/build2/libbuild2/cc/module.cxx	2020-07-14 14:33:58.939950579 +1000
-@@ -323,8 +323,6 @@
- 
- #ifndef _WIN32
-     static const dir_path usr_inc     ("/usr/include");
--    static const dir_path usr_loc_lib ("/usr/local/lib");
--    static const dir_path usr_loc_inc ("/usr/local/include");
- #  ifdef __APPLE__
-     static const dir_path a_usr_inc (
-       "/Library/Developer/CommandLineTools/SDKs/MacOSX*.sdk/usr/include");
-@@ -486,7 +484,6 @@
-         auto& ls (lib_dirs.first);
- 
-         bool ui  (find (is.begin (), is.end (), usr_inc)     != is.end ());
--        bool uli (find (is.begin (), is.end (), usr_loc_inc) != is.end ());
- 
- #ifdef __APPLE__
-         // On Mac OS starting from 10.14 there is no longer /usr/include.
-@@ -509,7 +506,7 @@
-         //
-         // Is Apple's /usr/include.
-         //
--        if (!ui && !uli)
-+        if (!ui)
-         {
-           for (const dir_path& d: is)
-           {
-@@ -521,22 +518,16 @@
-           }
-         }
- #endif
--        if (ui || uli)
-+        if (ui)
-         {
--          bool ull (find (ls.begin (), ls.end (), usr_loc_lib) != ls.end ());
--
-           // Many platforms don't search in /usr/local/lib by default (but do
-           // for headers in /usr/local/include). So add it as the last option.
-           //
--          if (!ull && exists (usr_loc_lib, true /* ignore_error */))
--            ls.push_back (usr_loc_lib);
- 
-           // FreeBSD is at least consistent: it searches in neither. Quoting
-           // its wiki: "FreeBSD can't even find libraries that it installed."
-           // So let's help it a bit.
-           //
--          if (!uli && exists (usr_loc_inc, true /* ignore_error */))
--            is.push_back (usr_loc_inc);
-         }
-       }
- #endif
diff --git a/dev-cpp/libodb/libodb-2.5.0_beta19.ebuild b/dev-cpp/libodb/libodb-2.5.0_beta19.ebuild
deleted file mode 100644
index 32154f060860..000000000000
--- a/dev-cpp/libodb/libodb-2.5.0_beta19.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)"
-
-BUILD2_PN=build2-toolchain
-BUILD2_PV="0.13.0"
-BUILD2_P="${BUILD2_PN}-${BUILD2_PV}"
-
-inherit toolchain-funcs multiprocessing
-SRC_URI="https://pkg.cppget.org/1/beta/odb/${MY_P}.tar.gz
-	https://download.build2.org/${BUILD2_PV}/${BUILD2_P}.tar.xz"
-KEYWORDS="~amd64 ~x86"
-DESCRIPTION="Common ODB runtime library"
-HOMEPAGE="https://codesynthesis.com/products/odb/"
-
-LICENSE="|| ( Code-Synthesis-ODB GPL-2 )"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${DEPEND}
-	!<dev-util/build2-0.13.0
-"
-
-BS="${WORKDIR}/${BUILD2_P}"
-S="${WORKDIR}/${MY_P}"
-
-b() {
-	local myargs=(
-		--jobs $(makeopts_jobs)
-		--verbose 3
-	)
-	export LD_LIBRARY_PATH="${BS}/libbutl/libbutl:${BS}/build2/libbuild2:${BS}/build2/libbuild2/bash:${BS}/build2/libbuild2/in:${BS}/build2/libbuild2/bin:${BS}/build2/libbuild2/c:${BS}/build2/libbuild2/cc:${BS}/build2/libbuild2/cxx:${BS}/build2/libbuild2/version:${BS}/libpkgconf/libpkgconf:${LD_LIBRARY_PATH}"
-	set -- "${BS}"/build2/build2/b-boot "${@}" "${myargs[@]}"
-	echo "${@}"
-	"${@}" || die "${@} failed"
-}
-
-src_prepare() {
-	pushd "${BS}" || die
-	eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
-	eapply "${FILESDIR}"/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
-	printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-		"-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 --libs)" \
-		"$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \
-		libodb-sqlite/buildfile \
-		|| die
-	sed \
-		-e 's:libsqlite3[/]\?::' \
-		-i buildfile build/bootstrap.build \
-		|| die
-
-	if has_version dev-util/pkgconf; then
-		for i in build2/build2/buildfile build2/libbuild2/buildfile; do
-			printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-				"$($(tc-getPKG_CONFIG) libpkgconf --libs)" \
-				"$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> \
-				"${i}" \
-				|| die
-		done
-		sed \
-			-e 's:libpkgconf[/]\?::' \
-			-i buildfile build/bootstrap.build \
-			|| die
-	fi
-	popd || die
-
-	default
-}
-
-src_configure() {
-	pushd "${BS}" || die
-	emake -C build2 -f bootstrap.gmake \
-		CXX=$(tc-getCXX) \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-	popd || die
-
-	b configure \
-		config.cxx="$(tc-getCXX)" \
-		config.cxx.coptions="${CXXFLAGS}" \
-		config.cxx.loptions="${LDFLAGS}" \
-		config.c="$(tc-getCC)" \
-		config.cc.coptions="${CFLAGS}" \
-		config.cc.loptions="${LDFLAGS}" \
-		config.bin.ar="$(tc-getAR)" \
-		config.bin.ranlib="$(tc-getRANLIB)" \
-		config.bin.lib=shared \
-		config.install.root="${EPREFIX}"/usr \
-		config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
-		config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_compile() {
-	b update-for-install
-	use test && b update-for-test
-}
-
-src_test() {
-	b test
-}
-
-src_install() {
-	b install \
-		config.install.chroot="${D}"
-}
diff --git a/dev-cpp/libodb/libodb-2.5.0_beta21.ebuild b/dev-cpp/libodb/libodb-2.5.0_beta21.ebuild
deleted file mode 100644
index 3556b3eb4d7c..000000000000
--- a/dev-cpp/libodb/libodb-2.5.0_beta21.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)"
-
-BUILD2_PN=build2-toolchain
-BUILD2_PV="0.14.0"
-BUILD2_P="${BUILD2_PN}-${BUILD2_PV}"
-
-inherit toolchain-funcs multiprocessing
-SRC_URI="https://pkg.cppget.org/1/beta/odb/${MY_P}.tar.gz
-	https://download.build2.org/${BUILD2_PV}/${BUILD2_P}.tar.xz"
-KEYWORDS="~amd64 ~x86"
-DESCRIPTION="Common ODB runtime library"
-HOMEPAGE="https://codesynthesis.com/products/odb/"
-
-LICENSE="|| ( Code-Synthesis-ODB GPL-2 )"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${DEPEND}
-	!<dev-util/build2-0.14.0
-"
-
-BS="${WORKDIR}/${BUILD2_P}"
-S="${WORKDIR}/${MY_P}"
-
-b() {
-	local myargs=(
-		--jobs $(makeopts_jobs)
-		--verbose 3
-	)
-	export LD_LIBRARY_PATH="${BS}/libbutl/libbutl:${BS}/build2/libbuild2:${BS}/build2/libbuild2/bash:${BS}/build2/libbuild2/in:${BS}/build2/libbuild2/bin:${BS}/build2/libbuild2/c:${BS}/build2/libbuild2/cc:${BS}/build2/libbuild2/cxx:${BS}/build2/libbuild2/version:${BS}/libpkgconf/libpkgconf:${LD_LIBRARY_PATH}"
-	set -- "${BS}"/build2/build2/b-boot "${@}" "${myargs[@]}"
-	echo "${@}"
-	"${@}" || die "${@} failed"
-}
-
-src_prepare() {
-	pushd "${BS}" || die
-	eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
-	printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-		"-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 --libs)" \
-		"$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \
-		libodb-sqlite/buildfile \
-		|| die
-	sed \
-		-e 's:libsqlite3[/]\?::' \
-		-i buildfile build/bootstrap.build \
-		|| die
-
-	if has_version dev-util/pkgconf; then
-		for i in build2/build2/buildfile build2/libbuild2/buildfile; do
-			printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-				"$($(tc-getPKG_CONFIG) libpkgconf --libs)" \
-				"$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> \
-				"${i}" \
-				|| die
-		done
-		sed \
-			-e 's:libpkgconf[/]\?::' \
-			-i buildfile build/bootstrap.build \
-			|| die
-	fi
-	popd || die
-
-	default
-}
-
-src_configure() {
-	pushd "${BS}" || die
-	emake -C build2 -f bootstrap.gmake \
-		CXX=$(tc-getCXX) \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-	popd || die
-
-	b configure \
-		config.cxx="$(tc-getCXX)" \
-		config.cxx.coptions="${CXXFLAGS}" \
-		config.cxx.loptions="${LDFLAGS}" \
-		config.c="$(tc-getCC)" \
-		config.cc.coptions="${CFLAGS}" \
-		config.cc.loptions="${LDFLAGS}" \
-		config.bin.ar="$(tc-getAR)" \
-		config.bin.ranlib="$(tc-getRANLIB)" \
-		config.bin.lib=shared \
-		config.install.root="${EPREFIX}"/usr \
-		config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
-		config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_compile() {
-	b update-for-install
-	use test && b update-for-test
-}
-
-src_test() {
-	b test
-}
-
-src_install() {
-	b install \
-		config.install.chroot="${D}"
-}
diff --git a/dev-cpp/libodb/libodb-2.5.0_beta25.ebuild b/dev-cpp/libodb/libodb-2.5.0_beta25.ebuild
deleted file mode 100644
index bb378d985315..000000000000
--- a/dev-cpp/libodb/libodb-2.5.0_beta25.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)"
-
-# Compare BUILD2_PV with the version in the tarball in the 'manifest' file.
-# e.g. from 2.5.0_beta25's manifest:
-# +depends: * build2 >= 0.15.0
-# +depends: * bpkg >= 0.15.0
-BUILD2_PN=build2-toolchain
-BUILD2_PV="0.15.0"
-BUILD2_P="${BUILD2_PN}-${BUILD2_PV}"
-
-inherit toolchain-funcs multiprocessing
-
-DESCRIPTION="Common ODB runtime library"
-HOMEPAGE="https://codesynthesis.com/products/odb/"
-SRC_URI="
-	https://pkg.cppget.org/1/beta/odb/${MY_P}.tar.gz
-	https://download.build2.org/${BUILD2_PV}/${BUILD2_P}.tar.xz
-"
-BS="${WORKDIR}/${BUILD2_P}"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="|| ( Code-Synthesis-ODB GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="!<dev-util/build2-${BUILD2_PV}"
-
-b() {
-	local myargs=(
-		--jobs $(makeopts_jobs)
-		--verbose 3
-	)
-	export LD_LIBRARY_PATH="${BS}/libbutl/libbutl:${BS}/build2/libbuild2:${BS}/build2/libbuild2/bash:${BS}/build2/libbuild2/in:${BS}/build2/libbuild2/bin:${BS}/build2/libbuild2/c:${BS}/build2/libbuild2/cc:${BS}/build2/libbuild2/cxx:${BS}/build2/libbuild2/version:${BS}/libpkgconf/libpkgconf:${LD_LIBRARY_PATH}"
-	set -- "${BS}"/build2/build2/b-boot "${@}" "${myargs[@]}"
-	echo "${@}"
-	"${@}" || die "${@} failed"
-}
-
-src_prepare() {
-	pushd "${BS}" || die
-	eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
-	printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-		"-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 --libs)" \
-		"$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \
-		libodb-sqlite/buildfile \
-		|| die
-	sed \
-		-e 's:libsqlite3[/]\?::' \
-		-i buildfile build/bootstrap.build \
-		|| die
-
-	if has_version dev-util/pkgconf; then
-		for i in build2/build2/buildfile build2/libbuild2/buildfile; do
-			printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-				"$($(tc-getPKG_CONFIG) libpkgconf --libs)" \
-				"$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> \
-				"${i}" \
-				|| die
-		done
-		sed \
-			-e 's:libpkgconf[/]\?::' \
-			-i buildfile build/bootstrap.build \
-			|| die
-	fi
-	popd || die
-
-	default
-}
-
-src_configure() {
-	pushd "${BS}" || die
-	emake -C build2 -f bootstrap.gmake \
-		CXX=$(tc-getCXX) \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-	popd || die
-
-	b configure \
-		config.cxx="$(tc-getCXX)" \
-		config.cxx.coptions="${CXXFLAGS}" \
-		config.cxx.loptions="${LDFLAGS}" \
-		config.c="$(tc-getCC)" \
-		config.cc.coptions="${CFLAGS}" \
-		config.cc.loptions="${LDFLAGS}" \
-		config.bin.ar="$(tc-getAR)" \
-		config.bin.ranlib="$(tc-getRANLIB)" \
-		config.bin.lib=shared \
-		config.install.root="${EPREFIX}"/usr \
-		config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
-		config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_compile() {
-	b update-for-install
-	use test && b update-for-test
-}
-
-src_test() {
-	b test
-}
-
-src_install() {
-	b install \
-		config.install.chroot="${D}"
-}
diff --git a/dev-cpp/libodb/metadata.xml b/dev-cpp/libodb/metadata.xml
deleted file mode 100644
index 835563982136..000000000000
--- a/dev-cpp/libodb/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		ODB is an open-source, cross-platform, and cross-database
-		object-relational mapping (ORM) system for C++. It allows you
-		to persist C++ objects to a relational database without having
-		to deal with tables, columns, or SQL and without manually
-		writing any mapping code. ODB supports MySQL, SQLite,
-		PostgreSQL, Oracle, and Microsoft SQL Server relational
-		databases as well as C++98/03 and C++11 language standards. It
-		also comes with optional profiles for Boost and Qt which allow
-		you to seamlessly use value types, containers, and smart
-		pointers from these libraries in your persistent C++ classes.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 7ea7bdee5f12..ab8a789a8212 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index bb7e42e4cbe4..95318cfdc6b5 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -2,12 +2,16 @@ AUX ecj-4.15 354 BLAKE2B e8ddbe928140e99fa36f0e4937cf1e9bf06bc3660ffdfba91099b35
 AUX ecj-4.20 365 BLAKE2B a7fcb25e74cb19f1b61b940f63b2db0d54c34381a030d0c4e9ec825e3bdc2580d18bee1d9dbf9e3943f5ee8767aa17672cddae8a313201ac22c0d5256b8c2555 SHA512 4a1c4fe7640880ddc0735cec79873ee9e8cc2f430ddd8b4676974f669f5097e46cbcda9b50668df48cb0f3ce39a169934ece785aabfd59af697c44f255951dd9
 AUX ecj-4.26 390 BLAKE2B 42e06c8114370763caeee14aee4e4471ba5781f2257abab6ba69ff8657946681e06994804b5ba5d23547b066e8784bdda3bc2ba254ae357f98d234bd4da7a415 SHA512 9b29d5e650ec30e9d493d48c29820dbb2de79fa1cc897de3ccfc2558814a882e5ba0a35567d1fbcea11b050a2ced7b48f2c53a97a9f420ef81e715ab5156f9e0
 AUX ecj-4.30 402 BLAKE2B e95fd45bcd60440c8b11fc8f0e34eaf40674cd004939ffcaea392f3e899f9afaae7bf1dd21525099a93012338363a4a1450d69645aa9bb91153a41dc25985e6e SHA512 50623fe3dff25d0451e4dbb8e1ab14c7f5eb566adc999eeb1612b1d4e2672a5289f6a2383a40465884d26b702efc9cd7d099843c8ea4af5d23511dfa1cae5e67
+AUX ecj-4.31 383 BLAKE2B 9e24fde1df96bb18397386d2a371b8a5b6b2501cfb460379c1ce2e14ebb31ee5d80863643b47e46dd01763a9b104cb5097b283d8b2d13ae6158ffa10d906d235 SHA512 4a636356192836067d67096af43cbf1811cba211a7918e4ce27ef87cd192e6bc0246febd9278a78682aa504b215f8524de8779d920b15eea87c677496059f13b
+AUX eclipse-ecj-4.31-java21.patch 736 BLAKE2B dbf787118caeeff454b75e9a1f0e6c66cc3c636ad5271694778901f35d2835303273889f70c4463370bb69e02d120c965ae123c980b485b2e9a3886cec7fbc1f SHA512 03b8e67dc30f802d956dbaa262452ede4b880317193127ad45ccf3829ba15bbbf1239c7aff253c3bc3d358cb2c9bea6a342fa0518338691bfae4dad9d20b5f37
 DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
 DIST ecjsrc-4.20.jar 2255761 BLAKE2B 42e16e1bd3d90b8d9bf3e57f83b3e06f2857a20db3e3ac065ce39e95fc47e75de33186115c36dede691bc37fd55fa8123f2220d13f3d5819404f5de702b10fd2 SHA512 fb27c0a37ed5cdfdcdbc904d067bfdd0477ddfd873a6cd8477d3b473734fd0e37329f0e9ab85dc5f89994d68d9886a488bd88568bc00e25f54c1a5a468dc1384
 DIST ecjsrc-4.26.jar 2347137 BLAKE2B 22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534 SHA512 e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f
 DIST ecjsrc-4.30.jar 2330181 BLAKE2B 7f3ba7f8dbfcaea9f8bbcdb8161ae8f164e2bf3469cf2242b6b7df5d375c98322f810b9c6de7209f622740a2cc61704915d255559bd376bf158b114e30a17d40 SHA512 ddc1569082fad0dcf91a9d41d5ef5f2f694f007e1378af5f5f28893aeb91e99acef91af59c762010eba071fa8b8b8a9d367b08e23f91b8c73ceacc6e6150bb23
+DIST ecjsrc-4.31.jar 2347993 BLAKE2B edb1a525646fc3152661a6583ab5c50a1dd7f06dac0b7cdae0913843e0ed6ef2c9862889351557857140c79c479505aeca154958b649d05ace6a5b83f6ccac45 SHA512 3e72ae5e5209dd80f7b3f208aeb0a6eece28ab416c56eedd590c67724c6a905b39b8f27a41394e3cf6a96acc16a9c7dd91d12df9651bc289839648036ac2d430
 EBUILD eclipse-ecj-4.15-r1.ebuild 1469 BLAKE2B 53b1b66884af0137998d4ef9429dfc55fffbf25e524e0f3232326e101f79a92aae211598fc9325c0b68f97b6cef22d8034d9eee8f3c07f3fe8df3a32da32873f SHA512 9680872cc1a183d1e45eab18929ca211d1aa8f9174ea4a49ddef2ca5a2f042dba36fac7b74b36d47995d46525a2a83076cf0b4dae83c6f03d46a64464e95024f
 EBUILD eclipse-ecj-4.20.ebuild 1572 BLAKE2B 335c982e1e6411c9265f50b514578b24f1cf6363f4fc29cd97ebc680fe865c188c7e48d6c55da802654204a23ca6c1e0c1518f58baec0856ad2d66b03a4d5312 SHA512 eb6f302e8f996053ee56d181d88a433fe56508116e1d1dfb0c35245b1c110bb621c295cf3f4c3216e2ac459472980848b2bcb5c91d800391114877f0eecda693
 EBUILD eclipse-ecj-4.26-r2.ebuild 1799 BLAKE2B 6ddf7a6394b83267619cdc9124de4677e6537e38c86de05c3fb6521ebcd44ef39f81c85cafe303b4e8fa9b1a7e0e0389308d4dc0dc2d38a0fdfce8d8e17d2bc1 SHA512 b571687d63759b351388051bc1001fd12b506659035d73ef2c3af6b227408e1987f488d9540f6c4af82f5757e8bd5e9ee4b065c68a1022916544e0e5e14c574e
 EBUILD eclipse-ecj-4.30-r1.ebuild 2258 BLAKE2B 41ecb0bdf6ab8b3dd2539521561b7d9e9e4a660837bd5309a0c57409a03ccc7ba2c2a2648b92cb3d82c588a2ba092dde5d0e78ddb2fffdd969938bc2b13d7703 SHA512 807b63fcfcac8379f9605b2773f49778d6ee504f7950505bf45510eb1ca10b83f70bcccd5b893a87bbd5489b5fa7754b1a7f2995167709fc665d041b248112c5
+EBUILD eclipse-ecj-4.31.ebuild 2072 BLAKE2B 73243a9948dca2d9f65ce27e6c74259e8a5c6a3823fa397f7f2c0b97d4370925ca241ba69a1b637fec2fe3c218b410bb5bd3dd4e25ffc89c9778986dc3f3dbc9 SHA512 26c731ad350455b7ec012007b5d586c0bd90b2ab7b791252f77cf02799080f3cd56f5d7970b55cbdba47d24c1cee487ea8ff7dd2d8595576054acceaa9420703
 MISC metadata.xml 637 BLAKE2B fd8214d9377a8a4101b3fd5041e17fbed9c6f5ffc8586b328db92120fc780c16d4b1152d4137a2e5554f77f60e9fe24ea3d133fc3469a4e78da7e84244bcb951 SHA512 0a0f6d8bcac2bef3a74e6328a65ecab490fcd437e8107fd1087d17ca158da29d1044d9e06d05e2781e97df88e6aec30db185c97bb9b2bdbd9b257332ce0232e0
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild
new file mode 100644
index 000000000000..a85b35c482a6
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+# 3.36.0 according to
+# https://github.com/eclipse-jdt/eclipse.jdt.core/blob/R4_30/org.eclipse.jdt.core.compiler.batch/pom.xml#L20
+MAVEN_ID="org.eclipse.jdt:org.eclipse.jdt.core.compiler.batch:3.37.0"
+
+inherit java-pkg-2 java-pkg-simple prefix
+
+DMF="R-${PV/_rc/RC}-202402290520"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="https://www.eclipse.org/"
+SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar"
+S="${WORKDIR}"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+SLOT="4.31"
+
+BDEPEND="app-arch/unzip"
+COMMON_DEP="app-eselect/eselect-java"
+# ElementsImpl9.java:206: error:
+# method does not override or implement a method from a supertype
+DEPEND="${COMMON_DEP}
+	>=dev-java/ant-1.10.14:0
+	>=virtual/jdk-21:*"
+# Parser.java:1095: error:
+# pattern matching in instanceof is not supported in -source 11
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-17:*"
+
+DOCS=( org/eclipse/jdt/core/README.md )
+PATCHES=( "${FILESDIR}/eclipse-ecj-4.31-java21.patch" )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch"
+JAVA_CLASSPATH_EXTRA="ant"
+JAVA_JAR_FILENAME="ecj.jar"
+JAVA_LAUNCHER_FILENAME="ecj-${SLOT}"
+JAVA_MAIN_CLASS="org.eclipse.jdt.internal.compiler.batch.Main"
+JAVA_RESOURCE_DIRS="res"
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+
+	# Exception in thread "main" java.lang.SecurityException: Invalid signature file digest for Manifest main attributes
+	rm META-INF/ECLIPSE_* || die
+
+	mkdir "${JAVA_RESOURCE_DIRS}" || die
+	find -type f \
+		! -name '*.java' \
+		| xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	insinto /usr/share/java-config-2/compiler
+	doins "${FILESDIR}/ecj-${SLOT}"
+	eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+}
+
+pkg_postinst() {
+	einfo "To select between slots of ECJ..."
+	einfo " # eselect ecj"
+
+	eselect ecj update ecj-${SLOT}
+}
+
+pkg_postrm() {
+	eselect ecj update
+}
diff --git a/dev-java/eclipse-ecj/files/ecj-4.31 b/dev-java/eclipse-ecj/files/ecj-4.31
new file mode 100644
index 000000000000..b5ed4e32a326
--- /dev/null
+++ b/dev-java/eclipse-ecj/files/ecj-4.31
@@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.31"
+PACKAGE="=dev-java/eclipse-ecj-4.31*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19 20 21 22"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19 20 21 22"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.31"
+GENERATION="2"
diff --git a/dev-java/eclipse-ecj/files/eclipse-ecj-4.31-java21.patch b/dev-java/eclipse-ecj/files/eclipse-ecj-4.31-java21.patch
new file mode 100644
index 000000000000..fc131777bcba
--- /dev/null
+++ b/dev-java/eclipse-ecj/files/eclipse-ecj-4.31-java21.patch
@@ -0,0 +1,12 @@
+# ./org/eclipse/jdt/internal/compiler/parser/Parser.java:4511: \
+# error: reference to StringTemplate is ambiguous
+--- a/org/eclipse/jdt/internal/compiler/parser/Parser.java
++++ b/org/eclipse/jdt/internal/compiler/parser/Parser.java
+@@ -56,6 +56,7 @@ import org.eclipse.jdt.core.compiler.InvalidInputException;
+ import org.eclipse.jdt.internal.compiler.ASTVisitor;
+ import org.eclipse.jdt.internal.compiler.CompilationResult;
+ import org.eclipse.jdt.internal.compiler.ast.*;
++import org.eclipse.jdt.internal.compiler.ast.StringTemplate;
+ import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
+ import org.eclipse.jdt.internal.compiler.codegen.ConstantPool;
+ import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
deleted file mode 100644
index f55f2733c7fe..000000000000
--- a/dev-java/icedtea/Manifest
+++ /dev/null
@@ -1,18 +0,0 @@
-AUX icedtea.env.sh 954 BLAKE2B 4cb0d8baef5f9a6527b8d15e7258805bb859cd79aec1ee0dbbb2aa369d0ecc83cb11a482d6bf5a17a6692da1bdf40ec1544ecdf31d46bcded7a3832d0553ee1a SHA512 80161624e52e705cab16edf04e304906dc0a37b86442e63a9ff8fdda321c4888ab12e8b66dc2f4487fe9bd86bb9f33d597b489d2d486894a36e91ed7563ef23a
-AUX openjdk-8-hotspot-arrayallocator.patch 647 BLAKE2B b2403d842ace7198520a25bf7c2027e6d74b5d418b52321722b21cac866df883d47e53e4f5e040aed55a9cc4bf03b5a62d008a0877add6c649a41f6230d78a38 SHA512 4bf002ec25844f4e55b588d0516e658c548700d3bcae79be74bf75d9cf30cf9cd448767db36935924dd3b07f34d0cf087321cb35abb4943690353d11485ab0de
-AUX openjdk-8-make-4.4.patch 750 BLAKE2B a4d798d0438813917a7a0fc13758711009e8448ec2283f6aaf7c790ce3cba1bfb67b7c66b8ff91526024b4d8426154a069e016d252e7e1563a56bcccb5200c49 SHA512 010bd46f87f37b6e370b0d50cdc663855b0358b3af839871895058beeff94bcfc1aa788dc669b327b908cda3c5cf5f3bf8847a37143ce706fd0867df3f971ee1
-DIST icedtea-3.21-aarch32-3.21.0.tar.xz 7207712 BLAKE2B bb9001aa31011fd0b29141caa1ba48344f2ca08e5dbe69cb3501a4830886d02b7a8782336a84273aad2ea721f26db2d3f51cdc72a9eccde1ad45a2790fb2caf1 SHA512 fc44c3c59164f6904ad92e04cb8023f39e82d6a2704fb5a91bf84d41066183ca6140273fa4c13d08a0dda47f263bd2d7d5138a5c45f205c58f649e6b87f15a9e
-DIST icedtea-3.21-corba-3.21.0.tar.xz 949700 BLAKE2B b845a46b5dcb22545073f894fbc5464e014f8f0e02e0cc66bccda0db6bd5566908a886823189ecf476847adb7f3fa5c009814e54c69d65a3a4a6c3cfc692564d SHA512 55110b92c6eddeb29eab97cbe644d8cc171a489b9fa806c81e4af88a1e5e3e6776fb97371715782935222944464f68e7d6783c46bd0d0de5659123f46c577a7a
-DIST icedtea-3.21-hotspot-3.21.0.tar.xz 7121192 BLAKE2B 64813c6a71405c5c093792dadf8613361a056b590fa4fa7453887ac5eb1eda1da63777a2f1e529e50eefe033d6f7f757d3235d53ba8f0f45d40dad6f0c215334 SHA512 678f6c53db5858ba828e063eeeddb727dbeb0586ff26a4287f9735dc01ad00ddcd9f41fa65343b81d5f5c512a944f47a447d4bdc929ca26ba78a68a7e3dfc1cd
-DIST icedtea-3.21-jaxp-3.21.0.tar.xz 2269276 BLAKE2B a1848fa6832a8c87c9a6edcfc5ac45fc487b5378368c07bafe5a3e54b849b81b781fb3652593e3506ffbd220a933cb5a04ae6dee86b3a44be7a1138813f5454c SHA512 ff14c9b63cee2a7b9213872b8710b1c5b901ccaf4122c8ddf5d8437d1cdd35cf9af50f461d05f004b74802ba8a21c7e9f288ec080b2b5f7daad065d40dc39258
-DIST icedtea-3.21-jaxws-3.21.0.tar.xz 2278396 BLAKE2B 1fb8608df94937447e192d010465379b2c3aa578f9c1ebd2eba445b1cd92ea9427511fd72351537ae78796d90d130497b02bc3e89b9e1ff1765013c681e6cf83 SHA512 e21bd36b6cfa92f648856532647150243f2184943dc6f5003fea02cf69aa9b6a94fb18d6478db28d5ee5e3af9b780122c0539fd3207cf4dfcb69a042835c13d6
-DIST icedtea-3.21-jdk-3.21.0.tar.xz 40714380 BLAKE2B be2bda5027d20515717ffecef71996bd56c4246a2a0e4d670bb386ea9ed2ff71c91ca8faa17ee209a5894784dff8e1b7d8df544c0b88b8f9da946514d9070bc7 SHA512 06385f14d093be250aa530d0659576d75aed57b0264ec7329d6b2c9309cf4ed660a9ecbfb6f199868ae23aedfbdb97036fccda501c00e9d2e3b1562c92b0ed37
-DIST icedtea-3.21-langtools-3.21.0.tar.xz 2081452 BLAKE2B 97c0820a9c734fc8d155fd5ec8fa9c56b4eaa0bf6fe5df5235b2dc5680f8c1989e608210007faa8e0120ad7dadfe682f4fe174e5cdae64d34624f239a7b1bb16 SHA512 949366138278104fc06452d8227bbe5d0829a9124503928cab34e5e9df37e25d25964a5c755e46d9ca74e63f1b318b2e3366f8f08e144524a8043bc2a7ca626e
-DIST icedtea-3.21-nashorn-3.21.0.tar.xz 2324264 BLAKE2B d7bcd9dd6df244004e3cb3ea1cdc178d781dd7f1b1d7b97df32385b67829bc3d9cb168caa64dc13fc15f27a9eeab276576d22cb804de5bc0d0209b98308a7105 SHA512 eda17f94ed2f34dd5bc4670dd3340d50de956723213948fd15963b0a589433bbe2e0ba8be7761974754b6a5d875ef58c31839daa6fef7215af552842f787bb44
-DIST icedtea-3.21-openjdk-3.21.0.tar.xz 367068 BLAKE2B 7fe212e84f1f527c229a854212617cd99457c0a4c5fdbd41a1ae65098706a22843e52a108cbf62fac341b9aa85e22f00746bb5a84e7d249ebbd605630bee127a SHA512 6a1706dfcb5e5d79191c01db6da30ca0ca48cea628a26a3a35f6e43c710091e25c97ec95122e8bc19b4ac69ede27a8dae37b49e1a7e4db07a635ded69e2e0336
-DIST icedtea-3.21-shenandoah-3.21.0.tar.xz 7295776 BLAKE2B c139711d81ccf593a93f786c398371eaddbaa9aa5044683669204ef9671cd17e80488ba2d290565ba5f1e27a62fa696c3d331c215442ddd29f3067b60682adec SHA512 c0282207854ad13d57dc7e1dd73412fb184406e7783d720cacbf58152177ae70af51bb4d577442bc1bebc75e88458cdb86356b79857b01eafb1eb214dbc439f4
-DIST icedtea-3.21.0.tar.xz 1574548 BLAKE2B 55dca04bf55a272a92f161a96a1cabe7c0e1f46289d95d74e9253c4da45d8df00e292e5d806118805241ea5c4b914643e380b05ad7996d850a8e5eebd7a2959a SHA512 874f91f3c3311d7017efb91aaff4e2fb660f55c58a626bcf5b120b7158df15e9b94abda7cd28f9620ad76c50bfa89cc8c1d251c193404c0db51ff1430167b018
-DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
-DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
-EBUILD icedtea-3.21.0.ebuild 12521 BLAKE2B 3f90e3a88997d138f8bfda451bee0abdd3dea9097925ebce90533185ef00c84c21a15d3a7c38c1960060579ac09a93c471ea797a4250aef3b1e4d99b58d53600 SHA512 2305d94c8276614d48ecbaa3de73fa2f778716e2ff49e264364c6df25c351275b4c4cf7d2a3ba65481046f3523c24bf81a42235d22a756ca43dcad4ff5a77948
-MISC metadata.xml 1997 BLAKE2B f513496c3f33d056a65a9fa7ba8d632b8d6d9fc709b111c94f6be6c3e349249c1658d8eb12bae930beff8c01aa258459d108b57f6a430778185883a1c77eee14 SHA512 e39e16d1e4c4a1473a71c3f356929edd93e358fab448b039641423f63d515149d3335930377ecd9dfff51f665d115e6e7327e7500176d8eede8460b7e7439c24
diff --git a/dev-java/icedtea/files/icedtea.env.sh b/dev-java/icedtea/files/icedtea.env.sh
deleted file mode 100644
index ac8303bda073..000000000000
--- a/dev-java/icedtea/files/icedtea.env.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-VERSION="IcedTea JDK ${PV}"
-JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}"
-JDK_HOME="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}"
-JAVAC="\${JAVA_HOME}/bin/javac"
-PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
-ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
-LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/"
-MANPATH="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.${SLOT}"
-# Taken from sun.boot.class.path property
-BOOTCLASSPATH="\${JAVA_HOME}/jre/lib/resources.jar:\${JAVA_HOME}/jre/lib/rt.jar:\${JAVA_HOME}/jre/lib/sunrsasign.jar:\${JAVA_HOME}/jre/lib/jsse.jar:\${JAVA_HOME}/jre/lib/jce.jar:\${JAVA_HOME}/jre/lib/charsets.jar:\${JAVA_HOME}/jre/lib/jfr.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/icedtea/files/openjdk-8-hotspot-arrayallocator.patch b/dev-java/icedtea/files/openjdk-8-hotspot-arrayallocator.patch
deleted file mode 100644
index ba5283f15771..000000000000
--- a/dev-java/icedtea/files/openjdk-8-hotspot-arrayallocator.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Workarounds build error:
-Error: dl failure on line 895
-Error relocating .../libjvm.so: _ZN14ArrayAllocatorImL10MemoryType7EE4freeEv: symbol not found
-
-Possibly due to g++ 10.x error on not properly instantiating the template.
-
---- openjdk/hotspot/src/share/vm/utilities/bitMap.cpp.orig	2020-11-10 14:07:08.372045326 +0200
-+++ openjdk/hotspot/src/share/vm/utilities/bitMap.cpp	2020-11-10 14:08:07.911412813 +0200
-@@ -42,6 +42,7 @@
- # include "os_bsd.inline.hpp"
- #endif
- 
-+template class ArrayAllocator<BitMap::bm_word_t, mtInternal>;
- 
- BitMap::BitMap(bm_word_t* map, idx_t size_in_bits) :
-   _map(map), _size(size_in_bits), _map_allocator(false)
diff --git a/dev-java/icedtea/files/openjdk-8-make-4.4.patch b/dev-java/icedtea/files/openjdk-8-make-4.4.patch
deleted file mode 100644
index 1217895b7547..000000000000
--- a/dev-java/icedtea/files/openjdk-8-make-4.4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/882611
-https://build.opensuse.org/package/view_file/openSUSE:Factory/java-1_8_0-openjdk/make-jobserver-detection.patch?expand=1
---- openjdk/make/MakeHelpers.gmk
-+++ openjdk/make/MakeHelpers.gmk
-@@ -145,7 +145,7 @@ endef
- 
- # Hook to be called as the very first thing when running a normal build
- define AtMakeStart
--	$(if $(findstring --jobserver,$(MAKEFLAGS)),$(error make -j is not supported, use make JOBS=n))
-+	$(if $(findstring jobserver,$(.FEATURES)),,$(error make -j is not supported, use make JOBS=n))
- 	$(call CheckEnvironment)
- 	@$(PRINTF) $(LOG_INFO) "Running make as '$(MAKE) $(MFLAGS) $(MAKE_ARGS)'\n"
- 	@$(PRINTF) "Building $(PRODUCT_NAME) for target '$(call GetRealTarget)' in configuration '$(CONF_NAME)'\n\n"
diff --git a/dev-java/icedtea/icedtea-3.21.0.ebuild b/dev-java/icedtea/icedtea-3.21.0.ebuild
deleted file mode 100644
index c4fd8dd748b4..000000000000
--- a/dev-java/icedtea/icedtea-3.21.0.ebuild
+++ /dev/null
@@ -1,387 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
-EAPI=6
-SLOT="8"
-
-inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs xdg-utils
-
-ICEDTEA_VER=$(ver_cut 1-3)
-ICEDTEA_BRANCH=$(ver_cut 1-2)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-
-CORBA_TARBALL="${PV}.tar.xz"
-JAXP_TARBALL="${PV}.tar.xz"
-JAXWS_TARBALL="${PV}.tar.xz"
-JDK_TARBALL="${PV}.tar.xz"
-LANGTOOLS_TARBALL="${PV}.tar.xz"
-OPENJDK_TARBALL="${PV}.tar.xz"
-NASHORN_TARBALL="${PV}.tar.xz"
-HOTSPOT_TARBALL="${PV}.tar.xz"
-SHENANDOAH_TARBALL="${PV}.tar.xz"
-AARCH32_TARBALL="${PV}.tar.xz"
-
-CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
-JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
-
-CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
-JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
-JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
-JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
-LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
-OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
-NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
-HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
-SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}"
-AARCH32_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch32-${AARCH32_TARBALL}"
-
-CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
-
-DROP_URL="https://icedtea.classpath.org/download/drops"
-ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="https://icedtea.classpath.org"
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
-	https://icedtea.classpath.org/download/source/${SRC_PKG}
-	${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
-	${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
-	${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
-	shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} )
-	arm? ( ${ICEDTEA_URL}/aarch32.tar.xz -> ${AARCH32_GENTOO_TARBALL} )
-	${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
-	${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-IUSE="+alsa cacao +cups doc examples +gtk headless-awt
-	jamvm +jbootstrap kerberos pax-kernel pch
-	pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="gtk? ( !headless-awt )"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP=">=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP=">=net-print/cups-1.2.12"
-
-X_COMMON_DEP="
-	>=media-libs/giflib-4.1.6:0=
-	>=media-libs/libpng-1.2:0=
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3
-	x11-libs/libXcomposite
-"
-
-X_DEPEND="
-	x11-base/xorg-proto
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2
-"
-
-# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
-COMMON_DEP="
-	>=dev-libs/glib-2.26:2=
-	>=dev-debug/systemtap-1
-	media-libs/fontconfig:1.0=
-	>=media-libs/freetype-2.5.3:2=
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg:0=
-	gtk? (
-		>=dev-libs/atk-1.30.0
-		>=x11-libs/cairo-1.8.8
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.8:2
-		>=x11-libs/pango-1.24.5
-	)
-	kerberos? ( virtual/krb5 )
-	sctp? ( net-misc/lksctp-tools )
-	smartcard? ( sys-apps/pcsc-lite )
-	system-lcms? ( >=media-libs/lcms-2.9:2= )
-"
-
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea:0
-	!dev-java/icedtea-web:7
-	>=gnome-base/gsettings-desktop-schemas-3.12.2
-	>=sys-apps/baselayout-java-0.1.0-r1
-	virtual/ttf-fonts
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )
-	!headless-awt? ( ${X_COMMON_DEP} )
-	selinux? ( sec-policy/selinux-java )
-"
-
-# perl is needed for running the SystemTap tests and the bootstrap javac
-# lsb-release is used to obtain distro information for the version & crash dump output
-# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
-# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
-# Ant is no longer needed under the new build system
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
-	|| (
-		dev-java/openjdk-bin:8
-		dev-java/openjdk:8
-		dev-java/icedtea-bin:8
-		dev-java/icedtea:8
-	)
-	app-alternatives/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	dev-lang/perl
-	dev-libs/openssl:0
-	sys-apps/attr
-	sys-apps/lsb-release
-	x11-libs/libXt
-	virtual/pkgconfig
-	pax-kernel? ( sys-apps/elfix )"
-
-PDEPEND="pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-icedtea_check_requirements() {
-	local CHECKREQS_DISK_BUILD
-
-	if use doc; then
-		CHECKREQS_DISK_BUILD="9000M"
-	else
-		CHECKREQS_DISK_BUILD="8500M"
-	fi
-
-	check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	icedtea_check_requirements
-}
-
-pkg_setup() {
-	icedtea_check_requirements
-
-	JAVA_PKG_WANT_BUILD_VM="
-		openjdk-8 openjdk-bin-8
-		icedtea-8 icedtea-bin-8"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${SRC_PKG}
-}
-
-src_configure() {
-	# GCC10/-fno-common handling, #723102
-	if [[ $(gcc-major-version) -ge 10 ]]; then
-		append-flags -fcommon
-		append-flags -fno-delete-null-pointer-checks -fno-lifetime-dse
-	fi
-	# this patch helps with gcc10 as well
-	# since build system unpacks tarballs itself, this is a way to force makefile
-	# to apply our patch. it expects relative path inside source, so we can't specify
-	# ${FILESDIR} directly.
-	mkdir -v gentoo_patches || die
-	cp -v "${FILESDIR}/openjdk-8-hotspot-arrayallocator.patch" gentoo_patches || die
-	cp -v "${FILESDIR}/openjdk-8-make-4.4.patch" gentoo_patches || die
-	export DISTRIBUTION_PATCHES="gentoo_patches//openjdk-8-hotspot-arrayallocator.patch"
-	DISTRIBUTION_PATCHES+=" gentoo_patches//openjdk-8-make-4.4.patch"
-
-	# For bootstrap builds as the sandbox control file might not yet exist.
-	addpredict /proc/self/coredump_filter #nowarn
-
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-
-	local cacao_config config hotspot_port hs_config jamvm_config use_cacao use_jamvm use_zero zero_config
-	local vm=$(java-pkg_get-current-vm)
-
-	# gcj-jdk ensures ecj is present.
-	if use jbootstrap || has "${vm}" gcj-jdk; then
-		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
-		config+=" --enable-bootstrap"
-	else
-		config+=" --disable-bootstrap"
-	fi
-
-	# Use Zero if requested
-	if use zero; then
-		use_zero="yes"
-	fi
-
-	# Use JamVM if requested
-	if use jamvm; then
-		use_jamvm="yes"
-	fi
-
-	# Use CACAO if requested
-	if use cacao; then
-		use_cacao="yes"
-	fi
-
-	# Are we on a architecture with a HotSpot port?
-	# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
-	if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
-		hotspot_port="yes"
-		# Work around stack alignment issue, bug #647954.
-		use x86 && append-flags -mincoming-stack-boundary=2
-	fi
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use Zero for now until alternate VMs are working
-	if test "x${hotspot_port}" != "xyes"; then
-			use_zero="yes"
-	fi
-
-	if use shenandoah; then
-		if { use amd64 || use arm64; }; then
-			hs_config="--with-hotspot-build=shenandoah"
-			hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
-		else
-			eerror "Shenandoah is only supported on arm64 and x86_64. Please re-build with USE="-shenandoah""
-		fi
-	else
-		if use arm ; then
-			hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}""
-		else
-			hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
-		fi
-	fi
-
-	# Turn on JamVM if needed (non-HS archs) or requested
-	if test "x${use_jamvm}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-jamvm"'
-		fi
-		ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
-		jamvm_config="--enable-jamvm"
-	fi
-
-	# Turn on CACAO if needed (non-HS archs) or requested
-	if test "x${use_cacao}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-cacao"'
-		fi
-		ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
-		cacao_config="--enable-cacao"
-	fi
-
-	# Turn on Zero if needed (non-HS/CACAO archs) or requested
-	if test "x${use_zero}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
-		fi
-		zero_config="--enable-zero"
-	fi
-
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		config+=" --enable-precompiled-headers"
-	else
-		config+=" --disable-precompiled-headers"
-	fi
-
-	config+=" --with-parallel-jobs=$(makeopts_jobs)"
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	# force bash for now https://bugs.gentoo.org/722292
-	CONFIG_SHELL="${EPREFIX}/bin/bash" econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
-		--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
-		--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
-		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
-		--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
-		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
-		--with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
-		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
-		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
-		--mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
-		--with-pkgversion="Gentoo ${PF}" \
-		--disable-ccache \
-		--disable-downloading --disable-Werror --disable-tests \
-		--disable-systemtap-tests --enable-improved-font-rendering \
-		--enable-system-jpeg --enable-system-zlib \
-		$(use_enable headless-awt headless) \
-		$(use_enable !headless-awt system-gif) \
-		$(use_enable !headless-awt system-png) \
-		$(use_enable doc docs) \
-		$(use_enable kerberos system-kerberos) \
-		$(use_enable system-lcms) \
-		$(use_with pax-kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
-		$(use_enable sctp system-sctp) \
-		$(use_enable smartcard system-pcsc) \
-		${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
-}
-
-src_compile() {
-	default
-}
-
-src_test() {
-	default
-}
-
-src_install() {
-	default
-
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}${dest#/}"
-
-	if ! use alsa; then
-		rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	if ! use examples; then
-		rm -r "${ddest}"/demo "${ddest}"/sample || die
-	fi
-
-	if ! use source; then
-		rm -v "${ddest}"/src.zip || die
-	fi
-
-	dosym ../../../usr/share/doc/"${PF}" usr/share/doc/"${PN}${SLOT}"
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
-	java-vm_install-env "${FILESDIR}/icedtea.env.sh"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	java-vm-2_pkg_postinst
-	einfo "JavaWebStart functionality provided by icedtea-web package"
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	java-vm-2_pkg_postrm
-}
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
deleted file mode 100644
index 8887f265c2c5..000000000000
--- a/dev-java/icedtea/metadata.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>gnu_andrew@member.fsf.org</email>
-		<name>Andrew John Hughes</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription>
-		The IcedTea project provides a harness to build the source code from OpenJDK (http://openjdk.java.net) using Free Software 	build tools along with additional tools such as a browser plugin and Web Start support via NetX.
-	</longdescription>
-	<use>
-		<flag name="cacao">Use the CACAO virtual machine rather than HotSpot.</flag>
-		<flag name="cups">Link against the CUPS library at compile time, rather than using it dynamically at runtime.</flag>
-		<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
-		<flag name="jamvm">Use the JamVM virtual machine rather than HotSpot.</flag>
-		<flag name="jbootstrap">If possible, recompile the final IcedTea executables with itself.</flag>
-		<flag name="kerberos">Link against Kerberos in order to obtain the cache location.</flag>
-		<flag name="pax-kernel">Apply patch needed for pax enabled kernels.</flag>
-		<flag name="pch">Build using pre-compiled headers.</flag>
-		<flag name="sctp">Build the SCTP NIO channel implementation against lksctp</flag>
-		<flag name="shenandoah">Include the Shenandoah ultra-low pause time garbage collector (-XX:+UseShenandoahGC) (arm64 and x86_64 only)</flag>
-		<flag name="smartcard">Build the PCSC driver against pcsc-lite</flag>
-		<flag name="system-lcms">Build against the system LCMS installation rather than the in-tree copy.</flag>
-		<flag name="zero">Enable Zero assembler port (usually for non-HotSpot architectures)</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 1c76f7931452..098ae4940328 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -17,8 +17,12 @@ DIST swt-4.29-gtk-linux-x86_64.zip 3857122 BLAKE2B ac4416044f93eaed396ac10edb74e
 DIST swt-4.30-gtk-linux-aarch64.zip 3836637 BLAKE2B 4cedb6eae73e03c32f6c226560f8e7bcbde5b6fc57579255e793fd5d01a5ff80f8b673dd7035eb7f2693abadd98bd0cfdb2eec632c05995552a9a1f1b673b8cc SHA512 dfdddd12ba30373d3ee7f0337b42d3a4f55a55dc898be9c97fbcc3d841c082d00190a75513272076c5709ee626e8af3f77c7c2dc518aa9289e80e33f4b134907
 DIST swt-4.30-gtk-linux-ppc64le.zip 3860636 BLAKE2B a535c1bcc6c668905f4d4aaa8c5ae7f3b8f48fc95004522d09924ae54d5172b18f80169d78633e960ce0c5141e5b34492d1dd05188a0b1f48d9f79d286bd2982 SHA512 5a17bd7752343da638466ac28de460d9fa9f0e777d1e48625ddb6c5538704e36cd97439d1bf8f07ad34a32b7d5f27f19d8877e8a9bb9094b4a74bdbb1dc126f7
 DIST swt-4.30-gtk-linux-x86_64.zip 3856990 BLAKE2B 0ea29a5f286fb4bb362758629226bcd6f27716afae7abb80cb37e7d4b72f0c835d63a196384465d3bc74135c42454a74c75455c094204e6329229ad8ca1fda78 SHA512 3802bd1dc84c7d684dac6b0b21de6b4958dd0c736a6b42176cf734806f04ae9dfdb18515ec5249eeff5f6bb716bf327a7a10e79d68cc487a1ad02267394507a1
+DIST swt-4.31-gtk-linux-aarch64.zip 4019864 BLAKE2B 597f9c2ce1382aacd4667c7d1fc350b2318d8b1577dfc32a0139efb9d26e7c32703a0fb2507876ef441c47901d46ba522ea40714f9b88f1d517e3d9d24c2416a SHA512 636e3a4e7adc21ab8ee3ecdc3f85bbd0ad5786836492cf0096f99177716043150b41807cc456f4813ebb1797092761bb227809e8594bf64155b438973cc84bfc
+DIST swt-4.31-gtk-linux-ppc64le.zip 4036590 BLAKE2B da9ad8a7e0bf168b024c4e1fbdbcc01154ec0d7e8b38b2912ba7edf1bf8239f05a9ce1f08790174158ebb788c9cc3adf754d13942fc8aa0fe9d4a53177a814ff SHA512 bf8f3f45b4229db383839a64b7d08294340ab2f0c623be8e382609b5ff9a59683229bb308d49480ffb01596ab050d45f97894fec99c0d4eb710e60c40b864531
+DIST swt-4.31-gtk-linux-x86_64.zip 4039479 BLAKE2B 6f7e434acf57cd03dd5e938b1b1c578339b3d7817202681a15420ebdec3be10b95b1bf5eca6f1cf71de9a5a0c390d2d6ee903c2a71e8974e03987cc52322e44d SHA512 da61610ce00fc46893ec3ee6d5d7ed5cc59312002c6946a3748cff1a776af75bad0026512b412ef1622ca0bee124764ed8ee7f5f87364cff945b296feb86e74b
 EBUILD swt-3.7.2-r3.ebuild 4286 BLAKE2B 40e4b69caa7d503bbe4a832a7b3d685fc88c6469a10bad3321b33f97959e46f4af4677afaac824526c97f683a43644e4f0fd7c45b47ba360a3e9c5f18c01edc6 SHA512 517cd181329938b7bf6108713827c29825410e3053b38c3971cfbdeacc7012c3385717e130d244f7e02d96dc18d7349d52656df552c26a452d903d2be1bee995
 EBUILD swt-4.10-r2.ebuild 4528 BLAKE2B 71b929a9ca02b5918314b5bf2631aa374c089d3a749e645c84865266f1cc5eebc2de5cea17471834fc329012276722c6a922c9d9266d9c9f24c45362af3b5b9b SHA512 5d7bf83a2c1b664e5e2b76336b35100eed8eef45986dc896ef5751b50431b34cfe99d9084ecae547e54dc5b250fc793fe7dd5f8c52294c442f193c2acabec480
 EBUILD swt-4.29.ebuild 3440 BLAKE2B ac5dabbbcace7d28eb352a8851a0f1dd1ed72f3285215b639221c99db118c831524f563162876be9cca02ce21bd8b2d8a0b90f2983a68000cdbca562ce2c6d73 SHA512 7b1eacbda33353ab91d7deeb73889e9245664862c6c279def64a60a351f91b0b917223a4da9af2279416d1a2992383587a1427f15188b7ef6ecd1e62b7f465c5
 EBUILD swt-4.30-r1.ebuild 3510 BLAKE2B 74d7f75d69a3a6afeb61d0ff3f2a184093b94642a15507fb0291264925cb3238a238f901793c689475a4a6a2f33996932eb10ebabb27e785a0bf90bd92d02e19 SHA512 fd6a05e634a852b3400285afc951e8ee7a493d636e887cde369140b34795cc69c32e6f1ae7d06d689b271eb39120ee52e4e4c5d4f0792b847effb257fdb3bc8d
+EBUILD swt-4.31.ebuild 3583 BLAKE2B ab58cc7551b5fccb4480b9c52e4f2585e75da542a4f470d4e15d3e91616d05dbb34cecf813bcb03ab65c2f8c4966349c138319d25d6362795f50e4c80615e0fc SHA512 d93215f225faa43a74889d2ee8d142da7d04e050d0438f3be0a9ef2d4bd5af39e7b0cbdd64f2267682e250828be46d81907a910b2a70c281ce7684d019d76106
 MISC metadata.xml 761 BLAKE2B f70a4d3ff5fcfad5705772396957664e700bd3ffe9580ac141c5faa11e24562b0cbc199a2f49d61d6a2a08058374dc1b7bfd9ae258e4a692e5b3c340f478da25 SHA512 1e8b8ceb30071c8271365a2d515e094c11ab569c4fee7b7f905d5de0a7613518320a1912b2b958d816e04d9876ed75425e16de9a35e1d6be6466888e08a420b3
diff --git a/dev-java/swt/swt-4.31.ebuild b/dev-java/swt/swt-4.31.ebuild
new file mode 100644
index 000000000000..bcfb034a7ae1
--- /dev/null
+++ b/dev-java/swt/swt-4.31.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit flag-o-matic java-pkg-2 java-pkg-simple toolchain-funcs
+
+MY_PV="${PV/_rc/RC}"
+MY_DMF="https://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-202402290520"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="GTK based SWT Library"
+HOMEPAGE="https://www.eclipse.org/swt/"
+SRC_URI="
+	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
+	arm64? ( ${MY_DMF}/${MY_P}-gtk-linux-aarch64.zip )
+	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )"
+S="${WORKDIR}/library"
+
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+SLOT="4.31"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE="cairo opengl webkit"
+
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+"
+COMMON_DEP="
+	app-accessibility/at-spi2-core:2
+	dev-libs/glib
+	x11-libs/gtk+:3
+	x11-libs/libXtst
+	cairo? ( x11-libs/cairo )
+	opengl?	(
+		virtual/glu
+		virtual/opengl
+	)
+	webkit? (
+		net-libs/webkit-gtk:4.1
+	)"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-17:*[-headless-awt]
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXtst"
+# error: pattern matching in instanceof is not supported in -source 11
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-17:*"
+
+HTML_DOCS=( ../about.html )
+
+JAVA_RESOURCE_DIRS="../resources"
+JAVA_SRC_DIR="../src"
+
+PATCHES=(
+	"${FILESDIR}/swt-4.27-as-needed-and-flag-fixes.patch"
+)
+
+src_unpack() {
+	default
+	unpack "./src.zip"
+}
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	# .css stuff is essential at least for running net-p2p/biglybt
+	unzip ../swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d resources || die
+	java-pkg_clean
+	cd .. || die
+	mkdir resources src || die "mkdir failed"
+	find org -type f -name '*.java' \
+		| xargs \
+		cp --parent -t src -v \
+		|| die "copying resources failed"
+	find org -type f ! -name '*.java' \
+		| xargs \
+		cp --parent -t resources -v \
+		|| die "copying resources failed"
+	cp version.txt resources || die "adding version.txt failed"
+}
+
+src_compile() {
+	append-cflags -fcommon # https://bugs.gentoo.org/707838
+
+	local JAWTSO="libjawt.so"
+	IFS=":" read -r -a ldpaths <<< $(java-config -g LDPATH)
+
+	for libpath in "${ldpaths[@]}"; do
+		if [[ -f "${libpath}/${JAWTSO}" ]]; then
+			export AWT_LIB_PATH="${libpath}"
+			break
+		# this is a workaround for broken LDPATH in <=openjdk-8.292_p10 and <=dev-java/openjdk-bin-8.292_p10
+		elif [[ -f "${libpath}/$(tc-arch)/${JAWTSO}" ]]; then
+			export AWT_LIB_PATH="${libpath}/$(tc-arch)"
+			break
+		fi
+	done
+
+	if [[ -z "${AWT_LIB_PATH}" ]]; then
+		eerror "${JAWTSO} not found in the JDK being used for compilation!"
+		die "cannot build AWT library"
+	fi
+
+	# Fix the pointer size for AMD64
+	export SWT_PTR_CFLAGS=-DJNI64
+
+	# Bug #461784, g_thread_init is deprecated since glib-2.32.
+	append-cflags -DNO__1g_1thread_1init
+
+	local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
+
+	einfo "Building AWT library"
+	export SWT_JAVA_HOME="$(java-config -g JAVA_HOME)"
+	${make} make_awt AWT_LIBS="-L\$(AWT_LIB_PATH) -Wl,-rpath,\$(AWT_LIB_PATH) -ljawt \`pkg-config --libs x11\`"
+
+	einfo "Building SWT library"
+	${make} make_swt
+
+	einfo "Building JAVA-AT-SPI bridge"
+	${make} make_atk
+
+	if use cairo ; then
+		einfo "Building CAIRO support"
+		${make} make_cairo
+	fi
+
+	if use opengl ; then
+		einfo "Building OpenGL component"
+		${make} make_glx
+	fi
+
+	if use webkit ; then
+		einfo "Building WebKit component"
+		${make} make_webkit
+	fi
+
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	java-pkg_sointo "/usr/$(get_libdir)/swt"
+	java-pkg_doso *.so
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index dc6c6d03d517..5c500fd61c1e 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index ce065eb73ab3..e0987e9fdb13 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,10 +1,6 @@
-DIST ell-0.58.tar.xz 564908 BLAKE2B 8c3d2913db05186b22315f8b9eb62c6009d64d0c30dba4da4eacd92ca3c675a0c6e11aa23b76af710691ef1cabc14dafa157708aa7793939d36eee467a7e543d SHA512 28f0d215d05ae67a9d5aaa0de6c54d2b69d847a6a3127bebabe504c63083937b07d7dfb498f946bd6a40b22387946557dc886591ef87a7d5b926084083146950
-DIST ell-0.61.tar.xz 565920 BLAKE2B 994a5b8b7eaffcf2274e1d020f54ce3f829a50de352a79744de156b59cb9f5b8db39adc53ab6f5728abd501a13815e58eac1c3359024bb22cd28e248a4b8f289 SHA512 0e57125a924ab4772c3c7ccf97040e416810bccd05ce8f0cb4525a4483f32eabc0f431fac3fff7afdc8bb0e145611b944e1f7fa8d10e6337fc7f97f190d9b0f8
 DIST ell-0.62.tar.xz 567188 BLAKE2B f7539c5f6eac6150d10b317ec5c5296e2005130c34e43c60cb1ac758fd629b00de81da6ff816031c486986732a707e81eb71ec3dd9dbfafd1e7af53ffd73eca1 SHA512 f0019cddba737879f2567b0295ec4cdf8589b989fdaba70a885253140f742e67e33abfe25fabbf8ecfd5c61336ec9cfe359193e0579b9120a66b13e9593beabf
-DIST ell-0.63.tar.xz 567344 BLAKE2B de007676bd7a53c16d7a373aaf4039947daf079efaae1a7185a8f2b2a53bd2a2dfc7dd5c24c2c1f37d539323f9413b21fe072f7d4099e144aa4e4c2efb42c06a SHA512 e91dd7be6a84c5f69351f34695919c93e9171608d9177d92ee2eb0d0a1e50504e554a94bd69b878b94612e535bab045eefb9a1da12790cdada2ec46bf780fe30
-EBUILD ell-0.58.ebuild 1205 BLAKE2B 0ee1c2fc5874e2e7715f7c8c85d64a304957dfabb964734e279ea6b15a615d769f8e56bb653be178dab9a88921d6284e28a0093327f044c52cccf86e9603b58c SHA512 adaed23eccafaa72e1f0a09c11a56775cf15ce0fe2acccb4891863afe0100deb4a1a07e1d92411e8e4b282f12bbf1dbd6978cbce91d955c359dff2fb9c9fa739
-EBUILD ell-0.61.ebuild 1211 BLAKE2B af4d68aeab21ca440793e13fde095665abf991c388dfbb3c1c9bbcec4f62816a9b00c334cdf61deeb570355d464bd6d4d64fabb76918b4dd8bbaa2f067cda9c3 SHA512 e298d3c78a250ff8b057b158e11662d3bd1d3a9945befe0fbb71068597e2b7a98226345c00708949cce1b06a5bb52fcf45466d89d12fa8812c47cfb43a301f39
+DIST ell-0.64.tar.xz 567908 BLAKE2B 8f49441b0775626170a682d88c704292d2141fa7ad6427e410f96f0d863d60298178c4216194c575b83db1dc4c067665fdb89eb6af4afb17a93d1b47c0bcc2ab SHA512 21035965b6c9d5fced834b8ff232e3c2113ed2061c9e07a2e1a2acddd964e861dfa25d115b8a367e5c980ba7e356a557b750e1abd3f19bcc4456840157114928
 EBUILD ell-0.62.ebuild 1205 BLAKE2B 0ee1c2fc5874e2e7715f7c8c85d64a304957dfabb964734e279ea6b15a615d769f8e56bb653be178dab9a88921d6284e28a0093327f044c52cccf86e9603b58c SHA512 adaed23eccafaa72e1f0a09c11a56775cf15ce0fe2acccb4891863afe0100deb4a1a07e1d92411e8e4b282f12bbf1dbd6978cbce91d955c359dff2fb9c9fa739
-EBUILD ell-0.63.ebuild 1211 BLAKE2B b03899815dbc3f40142afaaa8a68e9ea04784f58e5bf0dcc716cc5fb5fa442dff8c15c4c3abdb9671365abf1143c31a9c18e8e9b1989decc3ab25287ac3d20c2 SHA512 72a3372139c2430893029075c350ee5f2e383a22cd2d20508f67c707c8b66ef58b9d7d5659b4378af7f0d75630416b9f6255817623ecfdeefb02c45a4ac3f7e2
+EBUILD ell-0.64.ebuild 1211 BLAKE2B b03899815dbc3f40142afaaa8a68e9ea04784f58e5bf0dcc716cc5fb5fa442dff8c15c4c3abdb9671365abf1143c31a9c18e8e9b1989decc3ab25287ac3d20c2 SHA512 72a3372139c2430893029075c350ee5f2e383a22cd2d20508f67c707c8b66ef58b9d7d5659b4378af7f0d75630416b9f6255817623ecfdeefb02c45a4ac3f7e2
 EBUILD ell-9999.ebuild 1211 BLAKE2B af4d68aeab21ca440793e13fde095665abf991c388dfbb3c1c9bbcec4f62816a9b00c334cdf61deeb570355d464bd6d4d64fabb76918b4dd8bbaa2f067cda9c3 SHA512 e298d3c78a250ff8b057b158e11662d3bd1d3a9945befe0fbb71068597e2b7a98226345c00708949cce1b06a5bb52fcf45466d89d12fa8812c47cfb43a301f39
 MISC metadata.xml 251 BLAKE2B a9af03a4a233a890a554ab68f1876580e3720a72c1f946ea6dbb82c49afd94243ea4017cd8a392fa2adea53c588646fd0ebccb948dde0340ec2ff05c0381fb99 SHA512 0837c31655f6a725b0fad20c8998a3a4645dc8049e14980b0097776cf59b4288276489dfddc149893f29844175eeb187a54af7d28690de4afe18ef9fd4c1f98f
diff --git a/dev-libs/ell/ell-0.58.ebuild b/dev-libs/ell/ell-0.58.ebuild
deleted file mode 100644
index aaabc3bdf016..000000000000
--- a/dev-libs/ell/ell-0.58.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
-
-inherit flag-o-matic linux-info
-
-DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
-HOMEPAGE="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-fi
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-IUSE="pie test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( sys-apps/dbus )"
-
-CONFIG_CHECK="
-	~TIMERFD
-	~EVENTFD
-	~CRYPTO_USER_API
-	~CRYPTO_USER_API_HASH
-	~CRYPTO_MD5
-	~CRYPTO_SHA1
-	~KEY_DH_OPERATIONS
-"
-
-src_prepare() {
-	default
-	sed -i -e "s#/tmp/ell-test-bus#/tmp/ell-test-bus-$(uuidgen)#" \
-		unit/test-dbus*.c unit/dbus.conf || die
-	[[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	append-cflags "-fsigned-char" #662694
-	local myeconfargs=(
-		$(use_enable pie)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/ell/ell-0.61.ebuild b/dev-libs/ell/ell-0.61.ebuild
deleted file mode 100644
index 367a5a212600..000000000000
--- a/dev-libs/ell/ell-0.61.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic linux-info
-
-DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
-HOMEPAGE="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-IUSE="pie test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( sys-apps/dbus )"
-
-CONFIG_CHECK="
-	~TIMERFD
-	~EVENTFD
-	~CRYPTO_USER_API
-	~CRYPTO_USER_API_HASH
-	~CRYPTO_MD5
-	~CRYPTO_SHA1
-	~KEY_DH_OPERATIONS
-"
-
-src_prepare() {
-	default
-	sed -i -e "s#/tmp/ell-test-bus#/tmp/ell-test-bus-$(uuidgen)#" \
-		unit/test-dbus*.c unit/dbus.conf || die
-	[[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	append-cflags "-fsigned-char" #662694
-	local myeconfargs=(
-		$(use_enable pie)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/ell/ell-0.63.ebuild b/dev-libs/ell/ell-0.64.ebuild
index 966be50f1a4d..966be50f1a4d 100644
--- a/dev-libs/ell/ell-0.63.ebuild
+++ b/dev-libs/ell/ell-0.64.ebuild
diff --git a/dev-libs/libtsm/Manifest b/dev-libs/libtsm/Manifest
index c8964f1bbf10..6868bf6da5a8 100644
--- a/dev-libs/libtsm/Manifest
+++ b/dev-libs/libtsm/Manifest
@@ -1,4 +1,4 @@
 AUX libtsm-cmake.patch 500 BLAKE2B b666c52e7c271df3499134cf6f90a9ade31158fdf862851945434df6b40305c785f011ee447a1460b8a783089d69627e075762d55012a8075982dbeeb093d91c SHA512 53673ed55b66bc196cda7cb9aaf151304cfb3e6127be1c349a7b14dd250b346e4b544e7a1f2b03f7da090b33a459cf2e801daa8de74a3e5d04daa1fcdf09ab29
-DIST libtsm-4.0.2.tar.gz 148135 BLAKE2B 4d81d5a19003ca1487e85bcea22604990e88770484a08a072105a2f193a0c7aa40832c9a81197c0fa26acc9c8d39d1ab796d4b92fa6af790f5ef803b8c68af05 SHA512 58eb955012fd154b7c165d799d0f80c9a71a504481e78471103fd299f2e73f3b7d89487387166895a9a5996165344335baa56f0550317caaa2eec6b0bad55e59
-EBUILD libtsm-4.0.2.ebuild 404 BLAKE2B e1704f91deb0ffe5e94b27c8c78e7e7dc7abb44f21f6857309e7e6f9b0815fdf19f7fda9371d24cbae5bb153614cd29d5b02775b0bf349ac052db0a9db103ab0 SHA512 b88d84bdf5b883c23fc9810aa6abb6f7154c6979010b194e109679612ee9b36d2e8a38524eafe2a8cf46688f0ef40ca31018e7af7313f27b9760f3f9f14d8093
+DIST libtsm-4.0.2_p20231223.tar.gz 157342 BLAKE2B 082637022397b210ef95e1a0f827d4d340f60bf7a6f962d4c86087c0c604dea5fe2bd3a9e879008353726a5d6b4588da93b5c68b37501fa47c9c3cccf10de431 SHA512 f428969b8e108159671c6bb10898dcf07e829b7f2118e52331ca48d5f0efc212c14e42f5ac909adda5c5473980341828d085043687636c378f598479d7cb37ef
+EBUILD libtsm-4.0.2_p20231223.ebuild 479 BLAKE2B 500d0e5d86f94274c5e10d4421ba6e36bb67550295409f2440998007d98f53bd400b902a09325b76d48e51ae03a2b3c03cea3341bfcfecc6e25791cd9294d730 SHA512 b39b35e867d6e3f0ccae1ee6839a728012e57e55441d5295b85aa9e7afc1e3158440607dde010fa94d86f3ffd7e7168bba75234f822d69c7c6b9a1bfa8a19423
 MISC metadata.xml 314 BLAKE2B dc20ed24813bd8e2505c4dedf05346a3020120f7615f36077f6e44fb4dd9fa9c56552a8981d428795a74b986d73ff8fbb9071a74e906805930887328f1c28a21 SHA512 2da2ce098698f75d07c22696e2059e89d03072d52c5764d49aa8b948ee91850c51d4f8009ad4eae53abf1ee816b6ae0e76fa8d50725dcbfbb8c431b5d4f835a8
diff --git a/dev-libs/libtsm/libtsm-4.0.2.ebuild b/dev-libs/libtsm/libtsm-4.0.2_p20231223.ebuild
index eb01dbb7c6d8..c40acccb78a9 100644
--- a/dev-libs/libtsm/libtsm-4.0.2.ebuild
+++ b/dev-libs/libtsm/libtsm-4.0.2_p20231223.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
+COMMIT="69922bde02c7af83b4d48a414cc6036af7388626"
+
 DESCRIPTION="Terminal Emulator State Machine"
 HOMEPAGE="https://github.com/Aetf/libtsm"
-SRC_URI="https://github.com/Aetf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Aetf/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${PN}-${COMMIT}
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/4"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 PATCHES=( "${FILESDIR}/${PN}-cmake.patch" )
diff --git a/dev-libs/zlog/Manifest b/dev-libs/zlog/Manifest
deleted file mode 100644
index ae9e95964163..000000000000
--- a/dev-libs/zlog/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX zlog_no_static_lib.patch 1974 BLAKE2B 67c9cc1f7c6856b44096648d36085ddf9ee41074a82ff2dfb4a3b9feb13968bb6da53797f7a63f969b3a34dd1cc2e61a36eeb63b9d78512294e8dcb9e0313f75 SHA512 fb4acd9937112bb1bd044db0446618bc098e8cf87156f792dbe98c4c6e3ca9a66f4c047639562485acf371c20d12754bbd6b233d5bdc45c28b99e67779c3d5ad
-DIST zlog-v1.2.15.tar.gz 124794 BLAKE2B a60ef362269d48672c7f0f4321b6c4f50241c7c1abcc2c3a3a888d7838018edaba103cbb985fda02db719dcb8553bad3f84bfd715f3fdb34ad64557107d24e44 SHA512 88c741b58e7857c573e4da0b3999a23c00d339e45eb4f7d3e07c03dbe8ebf4cae62720208c9759871969bb4959d2f081b6a8955e229d3872f99cde3e650702e4
-EBUILD zlog-1.2.15.ebuild 676 BLAKE2B 20f6fac27b0ab76a90d5499d0c4271b4a5d36a0d26f61adfb575a9b09d17bf5a06f333d7081936ef858d5ff4a0a161f679ea6added8de83a1b44f786002c8869 SHA512 d69125bd69bf602fed0b9302ab15a7c8e496be9590e188e0028daf7357d7c56aed737a276b07f66d7c8b3c1f0b38aab20d05ba2433c1a6d746bc865ef577eb08
-MISC metadata.xml 255 BLAKE2B b4a437af0e97611ad305b6e0c87449b732be402063caa90f8b213050a8182a544b90149631dcc2237bfafb4e84bf3af9ab0c3736737bd06d3294a30baacfec17 SHA512 7f35220b2103be49aa1b9780d6027040096f2546b6fd6e72bbc73e477e2b77ce8a8cd04a9bdc95b9c4d663daacc7076a83e5d7456bec009152be1c5375e93ebd
diff --git a/dev-libs/zlog/files/zlog_no_static_lib.patch b/dev-libs/zlog/files/zlog_no_static_lib.patch
deleted file mode 100644
index f2ad8c65a126..000000000000
--- a/dev-libs/zlog/files/zlog_no_static_lib.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/src/makefile	2020-06-05 15:29:43.926423440 +0200
-+++ b/src/makefile	2020-06-05 15:30:26.266501492 +0200
-@@ -43,8 +43,6 @@
- DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(ZLOG_MAJOR)
- DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX)
- DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
--STLIBNAME=$(LIBNAME).$(STLIBSUFFIX)
--STLIB_MAKE_CMD=ar rcs $(STLIBNAME)
- 
- # Installation related variables
- PREFIX?=/usr/local
-@@ -78,7 +76,6 @@
-   # not to mention dynamic linker .a preference...
-   DYLIB_MAKE_CMD=$(CC) -shared -Wl,-G,-b64 -maix64 -pthread -o $(DYLIBNAME) $(LDFLAGS)
-   REAL_CFLAGS+= -maix64
--  STLIB_MAKE_CMD=OBJECT_MODE=64 ar rcs $(STLIBNAME) $(DYLIB_MAJOR_NAME)
- endif
- 
- all: $(DYLIBNAME) $(BINS)
-@@ -139,21 +136,17 @@
- 	cp -f $(DYLIBNAME) $(DYLIB_MAJOR_NAME)
- 	cp -f $(DYLIBNAME) $(DYLIB_MINOR_NAME)
- 
--$(STLIBNAME): $(OBJ)
--	$(STLIB_MAKE_CMD) $(OBJ)
--
- dynamic: $(DYLIBNAME)
--static: $(STLIBNAME)
- 
- # Binaries:
--zlog-chk-conf: zlog-chk-conf.o $(STLIBNAME) $(DYLIBNAME)
-+zlog-chk-conf: zlog-chk-conf.o $(DYLIBNAME)
- 	$(CC) -o $@ zlog-chk-conf.o -L. -lzlog $(REAL_LDFLAGS)
- 
- .c.o:
- 	$(CC) -std=c99 -pedantic -c $(REAL_CFLAGS) $<
- 
- clean:
--	rm -rf $(DYLIBNAME) $(STLIBNAME) $(BINS) *.o *.gcda *.gcno *.gcov $(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME)
-+	rm -rf $(DYLIBNAME) $(BINS) *.o *.gcda *.gcno *.gcov $(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME)
- 
- dep:
- 	$(CC) -MM *.c
-@@ -171,14 +164,13 @@
- 
- INSTALL?= cp -a
- 
--install: $(DYLIBNAME) $(STLIBNAME)
-+install: $(DYLIBNAME)
- 	mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH) $(INSTALL_BINARY_PATH)
- 	$(INSTALL) zlog.h $(INSTALL_INCLUDE_PATH)
- 	$(INSTALL) zlog-chk-conf $(INSTALL_BINARY_PATH)
- 	$(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME)
- 	cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME)
- 	cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MAJOR_NAME) $(DYLIBNAME)
--	$(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH)
- 
- 32bit:
- 	@echo ""
diff --git a/dev-libs/zlog/metadata.xml b/dev-libs/zlog/metadata.xml
deleted file mode 100644
index 986cdb9c5854..000000000000
--- a/dev-libs/zlog/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">HardySimpson/zlog</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-libs/zlog/zlog-1.2.15.ebuild b/dev-libs/zlog/zlog-1.2.15.ebuild
deleted file mode 100644
index 221a11e0e522..000000000000
--- a/dev-libs/zlog/zlog-1.2.15.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A reliable, thread safe, clear-model, pure C logging library"
-HOMEPAGE="http://hardysimpson.github.io/zlog/"
-SRC_URI="https://github.com/HardySimpson/${PN}/archive/${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-PATCHES="${FILESDIR}/zlog_no_static_lib.patch"
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_test() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" test
-}
-
-src_install() {
-	emake LIBRARY_PATH="$(get_libdir)" PREFIX="${D}/usr" install
-}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 919c9779af5a..68d92081fb7a 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/boto/Manifest b/dev-python/boto/Manifest
deleted file mode 100644
index ebe5a4252bc5..000000000000
--- a/dev-python/boto/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX boto-2.49.0-mock-spec.patch 694 BLAKE2B e9b3142dd9e15c2236bae155cdb5b0085db694c36b742b8b86c3465ee0af4a568a3c13c4d28750aaf77509cdb65d8efbab8020e9d386e575124429394fca225c SHA512 8ee698a9582593864abaff506fdad9611eee784840876fe089c355b624c64fa60e1904248ed6fa5aa7a6b4c505dabc80db90293145fd9f628bc29faeb4e666f4
-AUX boto-2.49.0-py3-httplib-strict.patch 1244 BLAKE2B d37ff98891e4378bc869aaae7cde5596f1747a1851b6fbccc78ffcdac52d0583eba826cd1d101b3c04b4940ca982fd0ef8e1604d141bec170d63ec8049636f3e SHA512 fd1a7b4196918e43e88150ea5e633a537920202a51ede6381a0ebc23b8f1773e59ef7e6a4c4be2fc40356860aaf5b32d0069f93f4be165ab57d9f5334c7d9a93
-AUX boto-2.49.0-py3-server-port.patch 1840 BLAKE2B d147459970a9e39fba8599c9dff6dcbe1842714bbd45cca008be6c49840c812bf4a5fb97099614f6fe931807725268601a889f85b111fa7e1e3072c938c67a69 SHA512 f05f5c152fd52425b63cd5788f603430c30d679db3ca5145dc174f455636562d730bca990a0507a5e497b388b559d3a9e03bd84313284bfa27acb4031ab151c3
-AUX boto-2.49.0-py3-socket-binary.patch 2736 BLAKE2B b37879bf6ddf5e61df79cf482d8596e8aec42c929888f37a4fb8c4e1a47b8e12b89e26aa402cf90a768a159bef9daab1f2328a8fe5809fe343235ff9906fa411 SHA512 b89ec80242cbb10646d3c9995fa00438066569f77f39eccc7a8fd2a6d2b58977a9c252a8a4411438c7d89b69adcce28a9614f599488e53d3089722ddb1d6ea04
-AUX boto-2.49.0-py310.patch 1835 BLAKE2B 447ed20a244075e8e87ce72444fb6cac8199c4e70c470a3d50a5948737b23793858494e06849d86b9a0788ee1c5ff63205b3dd4149c29cf17c825be49ff82585 SHA512 4cac5c77e18b414de3a95405b12120ad314054c3838cd9eb8264bcd87e4a3fd09836a6157dbbf9f36c3bd36e667576d42583d48370b023b86695c51b033c842c
-AUX boto-2.49.0-py38.patch 2061 BLAKE2B a17cc48925216f333a12631051f177c9d91199eddcb5dd08c22a3c8381af743b0aeeb7cd5642bb030e951596ee98477abf1e7507a4bfabc9d36706e7809bf031 SHA512 ba42dee03c39cf238c6cb1864500f5d6c0fabcc395021cba8745c3e4fc4e59828eb7f461d5251367d37c4e0709162117e97aeabc08f941fe07c65f6b179244d8
-AUX boto-2.49.0-try-to-add-SNI-support-v3.patch 4727 BLAKE2B 197d4e6cc632e372faedac8812eb6dc250124555705d5b8d3b5ffe3718315043cf0bab5b9270d0dbd2ce333dbe074583cc7bd1f6057e324d13aea6f39e9b05e5 SHA512 0be17ce24149bfa02f6614fdc37b0e4c4018f78516348a6dc0f3d90f3e22405262a2ab61c36dd1fa6134d7cfdde422a5e06bbe855c6df5e5d7c77e0a9125f348
-AUX boto-2.49.0-unbundle-six.patch 1122 BLAKE2B bfaeaf7fea01e662d19caa6c040aaad9a2ce6544c105865a8b79255057d662c30478b6fb884b9a088f861c99a4d8399c0e503711e36e0581cbeeec3c5b2e1ba0 SHA512 7dd51b6a48f718475e18ac97584a508aee75b69dbfee9e91fa2955feec49cb1786662276a4519438cccc49b4d55a5d8536192bfe47a20a36a6a01f4bc3bfb9cc
-DIST boto-2.49.0.tar.gz 1478498 BLAKE2B 6a897ea162f5f4bd34a2d488a3e3897f7f2f5b8707dd0922c01b6a0b90ea577223bf3e588b6685bda1f2bc0e92af426711fcba67a70377183465a530065c6c84 SHA512 2175cf30cd25bbc05812e83e5ade7668c3e21b1bb09aa1b43f0f0ac7d6967a646394fb52c9be673ebb65618c5b33a52d6f31f6da702f5cd1d6c9a18169476dd4
-EBUILD boto-2.49.0-r6.ebuild 1584 BLAKE2B e22611b628e258a968b24049079106690584c24cd6389132bec9a4af0edd6d58a3c38cf5d882239e62f6c0e22705926e8c00882097b7ecc60ec20757d8d52079 SHA512 2ec4b832ad46a8f206cf9fb58f42715346d0a5d7ad9871d843a9142c71bb4a27dcb504db04f64d826f549c7d3fd8a9d7dc191ace4038b451337bfa22468cb300
-MISC metadata.xml 445 BLAKE2B 69850f4bbb872a5770f7e79319e071cc78d5b4433c534595698696ea0a3db20500191c21fdb01fba7cbb212b46bdb658381914e9e08df677526a693ba57bae14 SHA512 aa512a8964ad197d0257187db54815478207b0829132e36895cd2e66f47338c8f9f2f1e614ded361170ce780775c085f493332f79889bd352d40952350e14c09
diff --git a/dev-python/boto/boto-2.49.0-r6.ebuild b/dev-python/boto/boto-2.49.0-r6.ebuild
deleted file mode 100644
index 00502f5ae5de..000000000000
--- a/dev-python/boto/boto-2.49.0-r6.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Amazon Web Services API"
-HOMEPAGE="https://github.com/boto/boto https://pypi.org/project/boto/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-PATCHES=(
-	# taken from https://bugs.debian.org/909545
-	"${FILESDIR}"/${P}-try-to-add-SNI-support-v3.patch
-	"${FILESDIR}"/${P}-py38.patch
-	"${FILESDIR}"/${P}-py3-socket-binary.patch
-	"${FILESDIR}"/${P}-py3-httplib-strict.patch
-	"${FILESDIR}"/${P}-py3-server-port.patch
-	"${FILESDIR}"/${P}-unbundle-six.patch
-	"${FILESDIR}"/${P}-py310.patch
-	"${FILESDIR}"/${P}-mock-spec.patch
-)
-
-RDEPEND="
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/httpretty[${PYTHON_USEDEP}]
-		dev-python/keyring[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/paramiko[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	# remove bundled libs.
-	rm -f "${S}"/boto/vendored/six.py || die
-	# broken, not worth fixing
-	rm tests/unit/cloudfront/test_signed_urls.py || die
-	# fix tests
-	mkdir -p "${HOME}"/.ssh || die
-	touch "${HOME}"/.ssh/known_hosts || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	distutils-r1_python_test tests/unit
-}
diff --git a/dev-python/boto/files/boto-2.49.0-mock-spec.patch b/dev-python/boto/files/boto-2.49.0-mock-spec.patch
deleted file mode 100644
index d8c8db2f1e9f..000000000000
--- a/dev-python/boto/files/boto-2.49.0-mock-spec.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur boto-2.49.0.orig/tests/unit/ec2/test_volume.py boto-2.49.0/tests/unit/ec2/test_volume.py
---- boto-2.49.0.orig/tests/unit/ec2/test_volume.py	2022-11-02 22:22:36.173725700 -0000
-+++ boto-2.49.0/tests/unit/ec2/test_volume.py	2022-11-02 22:24:26.502590025 -0000
-@@ -55,7 +55,7 @@
-     @mock.patch("boto.resultset.ResultSet")
-     def test_startElement_with_name_tagSet_calls_ResultSet(self, ResultSet, startElement):
-         startElement.return_value = None
--        result_set = mock.Mock(ResultSet([("item", Tag)]))
-+        result_set = ResultSet([("item", Tag)])
-         volume = Volume()
-         volume.tags = result_set
-         retval = volume.startElement("tagSet", None, None)
diff --git a/dev-python/boto/files/boto-2.49.0-py3-httplib-strict.patch b/dev-python/boto/files/boto-2.49.0-py3-httplib-strict.patch
deleted file mode 100644
index 209b01aa74a0..000000000000
--- a/dev-python/boto/files/boto-2.49.0-py3-httplib-strict.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://github.com/boto/boto/commit/4f4dcb31fe852c05ce19b44eb9d5b5d747e36f7c
-https://github.com/boto/boto/pull/2718
-
-From 4f4dcb31fe852c05ce19b44eb9d5b5d747e36f7c Mon Sep 17 00:00:00 2001
-From: Lee Ball <43632885+catleeball@users.noreply.github.com>
-Date: Mon, 10 Jun 2019 16:02:53 -0700
-Subject: [PATCH] Remove `strict=True` from http_client (#6)
-
-In Python 3.4, the `strict` kwarg was removed[1]. We are removing it
-here too.
-
-Alternatively, we can leave in `strict=True` for 2.x, but I chose to
-remove it entirely to maintain consistent behavior across versions.
-
-[1]: https://docs.python.org/3/library/http.client.html
----
- boto/connection.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/boto/connection.py b/boto/connection.py
-index c731173bb4eb..54e26fb2de16 100644
---- a/boto/connection.py
-+++ b/boto/connection.py
-@@ -807,7 +807,7 @@ class AWSAuthConnection(object):
-                 sock.sendall(six.ensure_binary("\r\n"))
-         else:
-             sock.sendall(six.ensure_binary("\r\n"))
--        resp = http_client.HTTPResponse(sock, strict=True, debuglevel=self.debug)
-+        resp = http_client.HTTPResponse(sock, debuglevel=self.debug)
-         resp.begin()
- 
-         if resp.status != 200:
--- 
-2.28.0
-
diff --git a/dev-python/boto/files/boto-2.49.0-py3-server-port.patch b/dev-python/boto/files/boto-2.49.0-py3-server-port.patch
deleted file mode 100644
index 62e331921980..000000000000
--- a/dev-python/boto/files/boto-2.49.0-py3-server-port.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://github.com/boto/boto/commit/b9f6cb0ab717ea76e2780c7fddd1cd36b3bf7d63
-
-From b9f6cb0ab717ea76e2780c7fddd1cd36b3bf7d63 Mon Sep 17 00:00:00 2001
-From: Matt Houglum <houglum@google.com>
-Date: Fri, 21 Jun 2019 15:09:11 -0700
-Subject: [PATCH] Make server_name() behave correctly for PY3
-
-...because Python-2.6-or-newer doesn't just include Python 2.6 and 2.7.
----
- boto/connection.py | 14 +++++---------
- 1 file changed, 5 insertions(+), 9 deletions(-)
-
-diff --git a/boto/connection.py b/boto/connection.py
-index 54e26fb2de16..bbb25d8fb842 100644
---- a/boto/connection.py
-+++ b/boto/connection.py
-@@ -650,17 +650,13 @@ class AWSAuthConnection(object):
-         if port == 80:
-             signature_host = self.host
-         else:
--            # This unfortunate little hack can be attributed to
--            # a difference in the 2.6 version of http_client.  In old
--            # versions, it would append ":443" to the hostname sent
--            # in the Host header and so we needed to make sure we
--            # did the same when calculating the V2 signature.  In 2.6
--            # (and higher!)
--            # it no longer does that.  Hence, this kludge.
--            if ((ON_APP_ENGINE and sys.version[:3] == '2.5') or
--                    sys.version[:3] in ('2.6', '2.7')) and port == 443:
-+            ver_int = sys.version_info[0] * 10 + sys.version_info[1]
-+            if port == 443 and ver_int >= 26:  # Py >= 2.6
-                 signature_host = self.host
-             else:
-+                # In versions < 2.6, Python's http_client would append ":443"
-+                # to the hostname sent in the Host header and so we needed to
-+                # make sure we did the same when calculating the V2 signature.
-                 signature_host = '%s:%d' % (self.host, port)
-         return signature_host
- 
--- 
-2.28.0
-
diff --git a/dev-python/boto/files/boto-2.49.0-py3-socket-binary.patch b/dev-python/boto/files/boto-2.49.0-py3-socket-binary.patch
deleted file mode 100644
index 1d109a3f4995..000000000000
--- a/dev-python/boto/files/boto-2.49.0-py3-socket-binary.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-https://github.com/boto/boto/commit/d2cb697b32c297858ecc36701a5a4176818ab36d
-https://github.com/boto/boto/pull/2718
-https://github.com/boto/boto/pull/2893
-https://github.com/boto/boto/pull/3699
-
-From d2cb697b32c297858ecc36701a5a4176818ab36d Mon Sep 17 00:00:00 2001
-From: Cat Lee Ball <cball@google.com>
-Date: Mon, 10 Jun 2019 13:31:11 -0700
-Subject: [PATCH] Ensure binary strings sent to socket
-
-When running pre-release tests with proxied connections, it appeared a
-few spots in connection.py would fail under Python 3 since the
-socket.sendall method expects binary strings rather than unicode.
----
- boto/connection.py | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/boto/connection.py b/boto/connection.py
-index a0d89a51f49c..d084d1f881fb 100644
---- a/boto/connection.py
-+++ b/boto/connection.py
-@@ -796,17 +796,17 @@ class AWSAuthConnection(object):
-         else:
-             sock = socket.create_connection((self.proxy, int(self.proxy_port)))
-         boto.log.debug("Proxy connection: CONNECT %s HTTP/1.0\r\n", host)
--        sock.sendall("CONNECT %s HTTP/1.0\r\n" % host)
--        sock.sendall("User-Agent: %s\r\n" % UserAgent)
-+        sock.sendall(six.ensure_binary("CONNECT %s HTTP/1.0\r\n" % host))
-+        sock.sendall(six.ensure_binary("User-Agent: %s\r\n" % UserAgent))
-         if self.proxy_user and self.proxy_pass:
-             for k, v in self.get_proxy_auth_header().items():
--                sock.sendall("%s: %s\r\n" % (k, v))
-+                sock.sendall(six.ensure_binary("%s: %s\r\n" % (k, v)))
-             # See discussion about this config option at
-             # https://groups.google.com/forum/?fromgroups#!topic/boto-dev/teenFvOq2Cc
-             if config.getbool('Boto', 'send_crlf_after_proxy_auth_headers', False):
--                sock.sendall("\r\n")
-+                sock.sendall(six.ensure_binary("\r\n"))
-         else:
--            sock.sendall("\r\n")
-+            sock.sendall(six.ensure_binary("\r\n"))
-         resp = http_client.HTTPResponse(sock, strict=True, debuglevel=self.debug)
-         resp.begin()
- 
-@@ -814,9 +814,10 @@ class AWSAuthConnection(object):
-             # Fake a socket error, use a code that make it obvious it hasn't
-             # been generated by the socket library
-             raise socket.error(-71,
-+                               six.ensure_binary(
-                                "Error talking to HTTP proxy %s:%s: %s (%s)" %
-                                (self.proxy, self.proxy_port,
--                                resp.status, resp.reason))
-+                                resp.status, resp.reason)))
- 
-         # We can safely close the response, it duped the original socket
-         resp.close()
--- 
-2.28.0
-
diff --git a/dev-python/boto/files/boto-2.49.0-py310.patch b/dev-python/boto/files/boto-2.49.0-py310.patch
deleted file mode 100644
index 7b427f1f15e3..000000000000
--- a/dev-python/boto/files/boto-2.49.0-py310.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/boto/dynamodb/types.py b/boto/dynamodb/types.py
-index d9aaaa4c..3f8d8601 100644
---- a/boto/dynamodb/types.py
-+++ b/boto/dynamodb/types.py
-@@ -27,7 +27,7 @@ Python types and vice-versa.
- import base64
- from decimal import (Decimal, DecimalException, Context,
-                      Clamped, Overflow, Inexact, Underflow, Rounded)
--from collections import Mapping
-+from collections.abc import Mapping
- from boto.dynamodb.exceptions import DynamoDBNumberError
- from boto.compat import filter, map, six, long_type
- 
-diff --git a/boto/mws/connection.py b/boto/mws/connection.py
-index 687fae74..3a1f5f80 100644
---- a/boto/mws/connection.py
-+++ b/boto/mws/connection.py
-@@ -21,7 +21,7 @@
- import xml.sax
- import hashlib
- import string
--import collections
-+import collections.abc
- from boto.connection import AWSQueryConnection
- from boto.exception import BotoServerError
- import boto.mws.exception
-@@ -109,7 +109,7 @@ def http_body(field):
- def destructure_object(value, into, prefix, members=False):
-     if isinstance(value, boto.mws.response.ResponseElement):
-         destructure_object(value.__dict__, into, prefix, members=members)
--    elif isinstance(value, collections.Mapping):
-+    elif isinstance(value, collections.abc.Mapping):
-         for name in value:
-             if name.startswith('_'):
-                 continue
-@@ -117,7 +117,7 @@ def destructure_object(value, into, prefix, members=False):
-                                members=members)
-     elif isinstance(value, six.string_types):
-         into[prefix] = value
--    elif isinstance(value, collections.Iterable):
-+    elif isinstance(value, collections.abc.Iterable):
-         for index, element in enumerate(value):
-             suffix = (members and '.member.' or '.') + str(index + 1)
-             destructure_object(element, into, prefix + suffix,
diff --git a/dev-python/boto/files/boto-2.49.0-py38.patch b/dev-python/boto/files/boto-2.49.0-py38.patch
deleted file mode 100644
index 0052c6e32e86..000000000000
--- a/dev-python/boto/files/boto-2.49.0-py38.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/boto/ecs/item.py b/boto/ecs/item.py
-index 79177a31..292b05af 100644
---- a/boto/ecs/item.py
-+++ b/boto/ecs/item.py
-@@ -21,7 +21,7 @@
- 
- 
- import xml.sax
--import cgi
-+import html
- from boto.compat import six, StringIO
- 
- class ResponseGroup(xml.sax.ContentHandler):
-@@ -67,7 +67,7 @@ class ResponseGroup(xml.sax.ContentHandler):
-         return None
- 
-     def endElement(self, name, value, connection):
--        self._xml.write("%s</%s>" % (cgi.escape(value).replace("&amp;amp;", "&amp;"), name))
-+        self._xml.write("%s</%s>" % (html.escape(value).replace("&amp;amp;", "&amp;"), name))
-         if len(self._nodepath) == 0:
-             return
-         obj = None
-diff --git a/tests/unit/utils/test_utils.py b/tests/unit/utils/test_utils.py
-index db15b56d..89d1a524 100644
---- a/tests/unit/utils/test_utils.py
-+++ b/tests/unit/utils/test_utils.py
-@@ -85,7 +85,7 @@ class TestPassword(unittest.TestCase):
-         def hmac_hashfunc(cls, msg):
-             if not isinstance(msg, bytes):
-                 msg = msg.encode('utf-8')
--            return hmac.new(b'mysecretkey', msg)
-+            return hmac.new(b'mysecretkey', msg, digestmod='MD5')
- 
-         class HMACPassword(Password):
-             hashfunc = hmac_hashfunc
-@@ -95,15 +95,15 @@ class TestPassword(unittest.TestCase):
-         password.set('foo')
- 
-         self.assertEquals(str(password),
--                          hmac.new(b'mysecretkey', b'foo').hexdigest())
-+                          hmac.new(b'mysecretkey', b'foo', digestmod='MD5').hexdigest())
- 
-     def test_constructor(self):
--        hmac_hashfunc = lambda msg: hmac.new(b'mysecretkey', msg)
-+        hmac_hashfunc = lambda msg: hmac.new(b'mysecretkey', msg, digestmod='MD5')
- 
-         password = Password(hashfunc=hmac_hashfunc)
-         password.set('foo')
-         self.assertEquals(password.str,
--                          hmac.new(b'mysecretkey', b'foo').hexdigest())
-+                          hmac.new(b'mysecretkey', b'foo', digestmod='MD5').hexdigest())
- 
- 
- class TestPythonizeName(unittest.TestCase):
diff --git a/dev-python/boto/files/boto-2.49.0-try-to-add-SNI-support-v3.patch b/dev-python/boto/files/boto-2.49.0-try-to-add-SNI-support-v3.patch
deleted file mode 100644
index 11d346a2199e..000000000000
--- a/dev-python/boto/files/boto-2.49.0-try-to-add-SNI-support-v3.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From f5e7f6c98b46ff622f60a4661ffc9ce07216d109 Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Date: Sat, 29 Sep 2018 21:47:11 +0200
-Subject: [PATCH] boto: try to add SNI support
-
-Add SNI support. Newer OpenSSL (with TLS1.3) fail to connect if the
-hostname is missing.
-
-Link: https://bugs.debian.org/bug=909545
-Tested-by: Witold Baryluk <witold.baryluk@gmail.com>
-Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
----
- boto/connection.py       | 19 ++++++++++---------
- boto/https_connection.py | 22 +++++++++++-----------
- 2 files changed, 21 insertions(+), 20 deletions(-)
-
-diff --git a/boto/connection.py b/boto/connection.py
-index 34b428f101df7..b4867a7657465 100644
---- a/boto/connection.py
-+++ b/boto/connection.py
-@@ -778,8 +778,10 @@
- 
-     def proxy_ssl(self, host=None, port=None):
-         if host and port:
-+            cert_host = host
-             host = '%s:%d' % (host, port)
-         else:
-+            cert_host = self.host
-             host = '%s:%d' % (self.host, self.port)
-         # Seems properly to use timeout for connect too
-         timeout = self.http_connection_kwargs.get("timeout")
-@@ -824,23 +824,24 @@ DEFAULT_CA_CERTS_FILE = os.path.join(os.path.dirname(os.path.abspath(boto.cacert
-         h = http_client.HTTPConnection(host)
- 
-         if self.https_validate_certificates and HAVE_HTTPS_CONNECTION:
-+            context = ssl.create_default_context()
-+            context.verify_mode = ssl.CERT_REQUIRED
-+            context.check_hostname = True
-+
-             msg = "wrapping ssl socket for proxied connection; "
-             if self.ca_certificates_file:
-                 msg += "CA certificate file=%s" % self.ca_certificates_file
-+                context.load_verify_locations(cafile=self.ca_certificates_file)
-             else:
-                 msg += "using system provided SSL certs"
-+                context.load_default_certs()
-             boto.log.debug(msg)
-             key_file = self.http_connection_kwargs.get('key_file', None)
-             cert_file = self.http_connection_kwargs.get('cert_file', None)
--            sslSock = ssl.wrap_socket(sock, keyfile=key_file,
--                                      certfile=cert_file,
--                                      cert_reqs=ssl.CERT_REQUIRED,
--                                      ca_certs=self.ca_certificates_file)
--            cert = sslSock.getpeercert()
--            hostname = self.host.split(':', 0)[0]
--            if not https_connection.ValidateCertificateHostname(cert, hostname):
--                raise https_connection.InvalidCertificateException(
--                    hostname, cert, 'hostname mismatch')
-+            if key_file:
-+                context.load_cert_chain(certfile=cert_file, keyfile=key_file)
-+
-+            sslSock = context.wrap_socket(sock, server_hostname=cert_host)
-         else:
-             # Fallback for old Python without ssl.wrap_socket
-             if hasattr(http_client, 'ssl'):
-diff --git a/boto/https_connection.py b/boto/https_connection.py
-index ddc31a152292e..a5076f6f9b261 100644
---- a/boto/https_connection.py
-+++ b/boto/https_connection.py
-@@ -119,20 +119,20 @@ from boto.compat import six, http_client
-             sock = socket.create_connection((self.host, self.port), self.timeout)
-         else:
-             sock = socket.create_connection((self.host, self.port))
-+
-+        context = ssl.create_default_context()
-+        context.verify_mode = ssl.CERT_REQUIRED
-+        context.check_hostname = True
-+        if self.key_file:
-+            context.load_cert_chain(certfile=self.cert_file, keyfile=self.key_file)
-+
-         msg = "wrapping ssl socket; "
-         if self.ca_certs:
-             msg += "CA certificate file=%s" % self.ca_certs
-+            context.load_verify_locations(cafile=self.ca_certs)
-         else:
-             msg += "using system provided SSL certs"
-+            context.load_default_certs()
-         boto.log.debug(msg)
--        self.sock = ssl.wrap_socket(sock, keyfile=self.key_file,
--                                    certfile=self.cert_file,
--                                    cert_reqs=ssl.CERT_REQUIRED,
--                                    ca_certs=self.ca_certs)
--        cert = self.sock.getpeercert()
--        hostname = self.host.split(':', 0)[0]
--        if not ValidateCertificateHostname(cert, hostname):
--            raise InvalidCertificateException(hostname,
--                                              cert,
--                                              'remote hostname "%s" does not match '
--                                              'certificate' % hostname)
-+
-+        self.sock = context.wrap_socket(sock, server_hostname=self.host)
--- 
-2.19.0
-
diff --git a/dev-python/boto/files/boto-2.49.0-unbundle-six.patch b/dev-python/boto/files/boto-2.49.0-unbundle-six.patch
deleted file mode 100644
index 188dae7eb6fd..000000000000
--- a/dev-python/boto/files/boto-2.49.0-unbundle-six.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-use the system copy of six
-
---- a/boto/compat.py
-+++ b/boto/compat.py
-@@ -46,16 +46,16 @@ except (AttributeError, ImportError):
-     # This is probably running on App Engine.
-     expanduser = (lambda x: x)
- 
--from boto.vendored import six
-+import six
- 
--from boto.vendored.six import BytesIO, StringIO
--from boto.vendored.six.moves import filter, http_client, map, _thread, \
-+from six import BytesIO, StringIO
-+from six.moves import filter, http_client, map, _thread, \
-                                     urllib, zip
--from boto.vendored.six.moves.queue import Queue
--from boto.vendored.six.moves.urllib.parse import parse_qs, quote, unquote, \
-+from six.moves.queue import Queue
-+from six.moves.urllib.parse import parse_qs, quote, unquote, \
-                                                  urlparse, urlsplit
--from boto.vendored.six.moves.urllib.parse import unquote_plus
--from boto.vendored.six.moves.urllib.request import urlopen
-+from six.moves.urllib.parse import unquote_plus
-+from six.moves.urllib.request import urlopen
- 
- if six.PY3:
-     # StandardError was removed, so use the base exception type instead
diff --git a/dev-python/boto/metadata.xml b/dev-python/boto/metadata.xml
deleted file mode 100644
index 3ab9e0b0a8a3..000000000000
--- a/dev-python/boto/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="google-code">boto</remote-id>
-    <remote-id type="pypi">boto</remote-id>
-    <remote-id type="github">boto/boto</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
deleted file mode 100644
index 613acbb8d520..000000000000
--- a/dev-python/bsddb3/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST bsddb3-6.2.9-fix-py3.10.patch.gz 3153 BLAKE2B dfdd00e90c683557bafe7d5f0d5c9a6f944fb8495bf1baef8857f6e771cef58c8e5feac9b3d345ebf6403ba73ceaa7f9077f221ad6bad9916b756e6605b30d3d SHA512 3c6157110c94b842811301f4e48c0f1690d9c75379abe7a04bf76f7136d25decbf79673ca2940c5dbb97802acc8c7a9312a24a79e7dfcc3971f9dc250353d732
-DIST bsddb3-6.2.9.tar.gz 230475 BLAKE2B 68c7c498d581dd5ca860060a3152f7ae135bbc75d00714764446d071e8ea88d303a73d1aa411db1ff8fc922aa6d486632fe38bef3596550150ed511a97fc9c9c SHA512 9e878ef865cba608fafe4274b660234927b9106323c3e4ddd728682b0f11b3c7edb9a3dd56cdfe8665eba890df4121695c9710b95bb2f43b8a0be3ec4050f61e
-EBUILD bsddb3-6.2.9-r1.ebuild 1663 BLAKE2B 166926bd7bcce0f5ce5351e2266a80cd648b91ee500e6700415d5458a726fb0d9de2cc716d811e4a03ffd08f458ecc92cc3a95f4ced6463550e0cbd40e808701 SHA512 f4b8085f993183c11c23a795d374717b82364b44193a12a960d29e8e0eb1fb0e99cc1d82265174ca7c4485ef1febfce026fb65c0c5b9fbdf078352ac8ad8fe49
-MISC metadata.xml 310 BLAKE2B 060fc4b0a3a1821d830a1a5f8aa85e6c3485a8e9495f6dc53a9e0f79e2365249b84c2b5d3d92f9023c5ff6a6292d2a556cbf9706d652a7d33fddfc6cd929987d SHA512 4be1100a09d494b8ff85902a0352180ee978627cabd047c01a999b49f4ab2120050a9c4ce0e254df346dbb2ec78e2fce16b8664d755938a57e28bb16decaf5a6
diff --git a/dev-python/bsddb3/bsddb3-6.2.9-r1.ebuild b/dev-python/bsddb3/bsddb3-6.2.9-r1.ebuild
deleted file mode 100644
index 0557a01edbe9..000000000000
--- a/dev-python/bsddb3/bsddb3-6.2.9-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_IN_SOURCE_BUILD=1
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit db-use distutils-r1 pypi
-
-DESCRIPTION="Python bindings for Berkeley DB"
-HOMEPAGE="https://www.jcea.es/programacion/pybsddb.htm https://pypi.org/project/bsddb3/"
-SRC_URI+=" https://dev.gentoo.org/~arthurzam/patches/dev-python/${P}-fix-py3.10.patch.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<sys-libs/db-6.1:=
-	|| (
-		sys-libs/db:5.3
-		sys-libs/db:4.8
-	)
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${WORKDIR}/${P}-fix-py3.10.patch"
-)
-
-python_prepare_all() {
-	# This list should be kept in sync with setup.py.
-	if [[ -z ${DB_VER} ]]; then
-		for DB_VER in 5.3 4.8; do
-			has_version "sys-libs/db:${DB_VER}" && break
-		done
-	fi
-
-	# Force version.
-	sed -e "s/db_ver = None/db_ver = (${DB_VER%.*}, ${DB_VER#*.})/" \
-		-e "s/dblib = 'db'/dblib = '$(db_libname ${DB_VER})'/" \
-		-i setup2.py setup3.py || die
-
-	# Adjust test.py to look in build/lib.
-	sed -e "s/'lib.%s' % PLAT_SPEC/'lib'/" \
-		-i test2.py test3.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	# These are needed for both build and install.
-	export BERKELEYDB_DIR="${EPREFIX}/usr"
-	export BERKELEYDB_INCDIR="$(db_includedir ${DB_VER})"
-	export BERKELEYDB_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-	export YES_I_HAVE_THE_RIGHT_TO_USE_THIS_BERKELEY_DB_VERSION=1
-}
-
-python_test() {
-	PYTHONPATH=Lib3 "${EPYTHON}" test3.py -vv || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/bsddb3/metadata.xml b/dev-python/bsddb3/metadata.xml
deleted file mode 100644
index b754d39265ed..000000000000
--- a/dev-python/bsddb3/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">bsddb3</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/debugpy/Manifest b/dev-python/debugpy/Manifest
deleted file mode 100644
index 213a27af3796..000000000000
--- a/dev-python/debugpy/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX debugpy-1.6.6-unbundle-pydevd.patch 2531 BLAKE2B c7cf5cc10a75393b191ab3ecd3137b2d4df30a0611b76fd18bf1822aa61c06ec912358afe6da420c1ace3314e12b57079cadb0deebeb19fc3242f75f7ef5860a SHA512 98d6557c516617273a1a75c5269733f02d55754078ba9a5137f9abdcddc58275a7ea451f290ecf809003abc614b0865d235a8b712caec71e3811911a4f231448
-AUX debugpy-1.8.0-unbundle-pydevd.patch 1480 BLAKE2B 6694cbb68e8e5793f22fedc9351875810c86c1add4299bbb5360dedc24bcbdbb0128163cc11dab3effc611dbe5ef43ea45e9504914f6c55f4f66b76b9da0b804 SHA512 553ce357019e561e50770bf747adc33ac037cf5aa9fc08c44ce9c1cb87ecba28b7c632adb5b743c38067c1bb6b97f1d239ad8dee404332bc8028be44afd018ce
-DIST debugpy-1.6.6.gh.tar.gz 6942488 BLAKE2B 18c6eee2322239e5cbbacf9431fa7480abcf14a68f290d2228edc8b2ead042e7b09d19ee5bcc60be32e8a6b0b34b925eaa8246991298744f3ca74d4ed2ea3f3e SHA512 1a209bfd702d5f0649ce50b0910023e295953dd39cefdefb0b5af1d6023e629a727610789cd244e656bdf4276cee957fa463506ddaca603ab3ee85cc250dc212
-DIST debugpy-1.8.0.gh.tar.gz 6760323 BLAKE2B 99c4188c0b0383dc4dcbdd86c4d35e6eb973ca32ba56b757adea9668b161f20f17b436e0dc019790b1e85586387fc848712143c5e3d3814e2522850d97a4048e SHA512 f9e47371ca854c12811d1c0984f063b1ad5cac2bea769f91a67f9fa125cfcbeccbecafca9b9d5ea16a4ed8a1c123f34db3ba19efe1567b93a86cbd325239b355
-EBUILD debugpy-1.6.6.ebuild 1145 BLAKE2B c9fab7600289a7c493412da331daf21d570536187d44ee0f9985a7007393413643e1a28f51e71f22430b58646140cc08aea05eaf227fd47cb22e50ba7affad07 SHA512 a80aea8f84167cfbc8a54dcb183f7ce71cba4e6ab288351223c83820aaa68a0f60d56f97cbe5499163712130ea3689d6bb8b0de3b009f829a5fc61be3c0e979c
-EBUILD debugpy-1.8.0.ebuild 1978 BLAKE2B 6c9a21a7cf8b76aaa82efe3f7a9f367858458338e2b93cb1f85885e65f6d71f720272729b05431eb035dd0932e4b48d702dd98eea334de901c86b36961635d88 SHA512 84457bb3da5f1240e38aa341d72cdd024013120ee9990de08c4e4587ecc1a650c35c9a9b6d6992e4d6ab8d739f65240476f2d9e1cdaa07c03f4690d017c568d5
-MISC metadata.xml 508 BLAKE2B f5af1472be02222c1eb89246c4c4b782aaf5de8dd785aa983bbee6df69982b96c276310480a7ffbf2ac0105268507474d3b0823fc9e0bff89acfe648a2cc490f SHA512 d4697748bc79f4c684dd3bf58e52b211e8ba7816041840e705b896f2731a1a0518a01d7b7cca5e441bbc88e6eb272175c26681517873883068c4fe1bc864c09b
diff --git a/dev-python/debugpy/debugpy-1.6.6.ebuild b/dev-python/debugpy/debugpy-1.6.6.ebuild
deleted file mode 100644
index 1d59edda4b4d..000000000000
--- a/dev-python/debugpy/debugpy-1.6.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the Debug Adapter Protocol for Python"
-HOMEPAGE="https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/"
-SRC_URI="
-	https://github.com/microsoft/${PN}/archive/v${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"
-
-# This is completely broken
-RESTRICT="test"
-
-RDEPEND="dev-python/pydevd[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.6.6-unbundle-pydevd.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Drop unnecessary and unrecognized option
-	# __main__.py: error: unrecognized arguments: -n8
-	# Do not timeout
-	sed -e '/addopts/d' -e '/timeout/d' -i pytest.ini || die
-
-	# Unbundle dev-python/pydevd
-	rm -r src/debugpy/_vendored tests/tests/test_vendoring.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/debugpy/debugpy-1.8.0.ebuild b/dev-python/debugpy/debugpy-1.8.0.ebuild
deleted file mode 100644
index 71f66c164616..000000000000
--- a/dev-python/debugpy/debugpy-1.8.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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 multiprocessing
-
-DESCRIPTION="An implementation of the Debug Adapter Protocol for Python"
-HOMEPAGE="
-	https://github.com/microsoft/debugpy/
-	https://pypi.org/project/debugpy/
-"
-SRC_URI="
-	https://github.com/microsoft/${PN}/archive/v${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"
-
-RDEPEND="
-	dev-python/pydevd[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Unbundle dev-python/pydevd
-	rm -r src/debugpy/_vendored/pydevd || die
-	local PATCHES=(
-		"${FILESDIR}/${PN}-1.8.0-unbundle-pydevd.patch"
-	)
-
-	# Drop unnecessary and unrecognized option
-	# __main__.py: error: unrecognized arguments: -n8
-	# Do not timeout
-	sed -e '/addopts/d' -e '/timeout/d' -i pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local EPYTEST_DESELECT=(
-		tests/debugpy/test_gevent.py::test_gevent
-		tests/debugpy/test_run.py::test_custom_python_args
-		tests/tests/test_timeline.py::test_occurrences
-		# TODO: random regressions
-		tests/debugpy/test_flask.py::test_flask_breakpoint_multiproc
-		tests/debugpy/test_exception.py::test_raise_exception_options
-		tests/debugpy/test_exception.py::test_vsc_exception_options_raise_without_except
-	)
-	local EPYTEST_IGNORE=(
-		tests/tests/test_vendoring.py
-	)
-
-	case ${EPYTHON} in
-		python3.12)
-			EPYTEST_DESELECT+=(
-				tests/debugpy/test_flask.py
-			)
-			;;
-	esac
-
-	epytest -p timeout -p xdist -n "$(makeopts_jobs)" --dist=worksteal \
-		-k "not attach_pid"
-}
diff --git a/dev-python/debugpy/files/debugpy-1.6.6-unbundle-pydevd.patch b/dev-python/debugpy/files/debugpy-1.6.6-unbundle-pydevd.patch
deleted file mode 100644
index d285775c9246..000000000000
--- a/dev-python/debugpy/files/debugpy-1.6.6-unbundle-pydevd.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index 9a79e55..8725d19 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -8,7 +8,6 @@ exclude = '''
- ( __pycache__
- | ^/.tox
- | ^/versioneer.py
--| ^/src/debugpy/_vendored
- | ^/src/debugpy/_version.py
- )
- '''
-diff --git a/setup.py b/setup.py
-index 3abc811..c11924c 100644
---- a/setup.py
-+++ b/setup.py
-@@ -18,12 +18,10 @@ del sys.path[0]
- 
- sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "src"))
- import debugpy
--import debugpy._vendored
- 
- del sys.path[0]
- 
- 
--PYDEVD_ROOT = debugpy._vendored.project_root("pydevd")
- DEBUGBY_ROOT = os.path.dirname(os.path.abspath(debugpy.__file__))
- 
- 
-@@ -146,8 +144,6 @@ if __name__ == "__main__":
-         extras["platforms"] = platforms
- 
-     cmds = versioneer.get_cmdclass()
--    override_build(cmds)
--    override_build_py(cmds)
- 
-     setuptools.setup(
-         name="debugpy",
-@@ -183,14 +179,9 @@ if __name__ == "__main__":
-             "debugpy.common",
-             "debugpy.launcher",
-             "debugpy.server",
--            "debugpy._vendored",
-         ],
-         package_data={
-             "debugpy": ["ThirdPartyNotices.txt"],
--            "debugpy._vendored": [
--                # pydevd extensions must be built before this list can be computed properly,
--                # so it is populated in the overridden build_py.finalize_options().
--            ],  
-         },
-         ext_modules=ExtModules(),
-         has_ext_modules=lambda: True,
-diff --git a/src/debugpy/server/__init__.py b/src/debugpy/server/__init__.py
-index 42d5367..e333dcf 100644
---- a/src/debugpy/server/__init__.py
-+++ b/src/debugpy/server/__init__.py
-@@ -1,7 +1,3 @@
- # Copyright (c) Microsoft Corporation. All rights reserved.
- # Licensed under the MIT License. See LICENSE in the project root
- # for license information.
--
--# "force_pydevd" must be imported first to ensure (via side effects)
--# that the debugpy-vendored copy of pydevd gets used.
--import debugpy._vendored.force_pydevd  # noqa
-diff --git a/src/debugpy/server/attach_pid_injected.py b/src/debugpy/server/attach_pid_injected.py
-index a8df6e1..a29a969 100644
---- a/src/debugpy/server/attach_pid_injected.py
-+++ b/src/debugpy/server/attach_pid_injected.py
-@@ -31,7 +31,6 @@ def attach(setup):
-                 pydevd_attach_to_process_path = os.path.join(
-                     _debugpy_dir,
-                     "debugpy",
--                    "_vendored",
-                     "pydevd",
-                     "pydevd_attach_to_process",
-                 )
diff --git a/dev-python/debugpy/files/debugpy-1.8.0-unbundle-pydevd.patch b/dev-python/debugpy/files/debugpy-1.8.0-unbundle-pydevd.patch
deleted file mode 100644
index 54ccdae4ca01..000000000000
--- a/dev-python/debugpy/files/debugpy-1.8.0-unbundle-pydevd.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 0bb4f00..abfce1c 100644
---- a/setup.py
-+++ b/setup.py
-@@ -18,12 +18,10 @@ del sys.path[0]
- 
- sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "src"))
- import debugpy
--import debugpy._vendored
- 
- del sys.path[0]
- 
- 
--PYDEVD_ROOT = debugpy._vendored.project_root("pydevd")
- DEBUGBY_ROOT = os.path.dirname(os.path.abspath(debugpy.__file__))
- 
- 
-@@ -146,8 +144,6 @@ if __name__ == "__main__":
-         extras["platforms"] = platforms
- 
-     cmds = versioneer.get_cmdclass()
--    override_build(cmds)
--    override_build_py(cmds)
- 
-     setuptools.setup(
-         name="debugpy",
-diff --git a/src/debugpy/_vendored/force_pydevd.py b/src/debugpy/_vendored/force_pydevd.py
-index cfd8927..0cb1bca 100644
---- a/src/debugpy/_vendored/force_pydevd.py
-+++ b/src/debugpy/_vendored/force_pydevd.py
-@@ -8,15 +8,6 @@ import warnings
- 
- from . import check_modules, prefix_matcher, preimport, vendored
- 
--# Ensure that pydevd is our vendored copy.
--_unvendored, _ = check_modules('pydevd',
--                               prefix_matcher('pydev', '_pydev'))
--if _unvendored:
--    _unvendored = sorted(_unvendored.values())
--    msg = 'incompatible copy of pydevd already imported'
--    # raise ImportError(msg)
--    warnings.warn(msg + ':\n {}'.format('\n  '.join(_unvendored)))
--
- # If debugpy logging is enabled, enable it for pydevd as well
- if "DEBUGPY_LOG_DIR" in os.environ:
-     os.environ[str("PYDEVD_DEBUG")] = str("True")
diff --git a/dev-python/debugpy/metadata.xml b/dev-python/debugpy/metadata.xml
deleted file mode 100644
index a6c53f2a9008..000000000000
--- a/dev-python/debugpy/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">debugpy</remote-id>
-		<remote-id type="github">microsoft/debugpy</remote-id>
-		<maintainer status="unknown">
-			<email>ptvshelp@microsoft.com</email>
-			<name>Microsoft Corporation</name>
-		</maintainer>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/elastic-transport/Manifest b/dev-python/elastic-transport/Manifest
index 2dd24ba4315c..7f04f3e05e7a 100644
--- a/dev-python/elastic-transport/Manifest
+++ b/dev-python/elastic-transport/Manifest
@@ -1,3 +1,5 @@
 DIST elastic-transport-python-8.12.0.gh.tar.gz 72207 BLAKE2B 7777484c965eb893cd7d2cba1d39c2b33a005e7f6d6b3c12dd1cd0fb4e5c396abf36686421817ba1272e814ffef299453c885a6dcc3efe5cacd753bcd621384e SHA512 45834ccb4793d7aa7c7d1774ef26381b7ff0cf69221cc628efeb63a7ff8b163a68ff7f0ef4fa3a2b5ffd45e9374441d8b61b8a9b900f9055ddd67425cf0d727a
+DIST elastic-transport-python-8.13.0.gh.tar.gz 75950 BLAKE2B 5a62d28ece9570d8fc4fff30cf04f88e7e138276054bb191c883c156995effcb750aef874836e5fb32cecedf79641f8faa08ab2e3c74bf5d0c2ba950f490ffb8 SHA512 65239951d56efa4273b8023cf4caa04f44196d0f9bcad91fe5376139adbd669d76a9c0e673f8eec23aadf107fea315216ecf95064acfa5eeb769ca3b92885fb6
 EBUILD elastic-transport-8.12.0.ebuild 1603 BLAKE2B 95871fe70ab33e20550de8a46d4aac28f638b583f3f781653930b49d3ecd1d51ae6430de7a92e1a1bf558ea12be8c66b92447e21701077687832b64f2c4475ff SHA512 2537e2e34fc88ffd49a96e02057b2cb9a118e2e4a1d02a71e78efddcab45ba8e96b08674bb1166af282fb5fe1ca575837bc7981327a2be4fc6f73f69e45e8c01
+EBUILD elastic-transport-8.13.0.ebuild 1820 BLAKE2B afca69427409085051b83f698814ae1e7cf1bdd13eb2c733a833c58b01be3bda46fcc3d5fdb86a2da3a90504a383b9277cdb236e142533a5868483909584d8b1 SHA512 5d1dfa953ccd505473a1ff42602a974ab217ce8a5b91e3af58372ef2e3f0ad96d3bb67f5502c876ee609b309ee3f19cf74f033eaa966e65c17f69ea47ac7beb5
 MISC metadata.xml 658 BLAKE2B 7ba1da27d590421cdd7a24d01d38771b27ae65f09521e39bc84e691f3e587a3bccabcdd297350166e00324ca482dd0459e8213ed578d81f9e93469fd3efec48d SHA512 c39cf837ff098fb09c25d1933f43c0f20e1b2b5ae4e1bb5aa172aac43f8f36ea80437e3e59909b0c51d0f8301853bdb6b5dbd7f3498502baa8936939bc0210d8
diff --git a/dev-python/elastic-transport/elastic-transport-8.13.0.ebuild b/dev-python/elastic-transport/elastic-transport-8.13.0.ebuild
new file mode 100644
index 000000000000..929ad572fafa
--- /dev/null
+++ b/dev-python/elastic-transport/elastic-transport-8.13.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..12} )
+
+inherit distutils-r1
+
+MY_P=elastic-transport-python-${PV}
+DESCRIPTION="Transport classes and utilities shared among Python Elastic client libraries"
+HOMEPAGE="
+	https://github.com/elastic/elastic-transport-python/
+	https://pypi.org/project/elastic-transport/
+"
+SRC_URI="
+	https://github.com/elastic/elastic-transport-python/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.26.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/httpx[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/opentelemetry-api[${PYTHON_USEDEP}]
+		dev-python/opentelemetry-sdk[${PYTHON_USEDEP}]
+		dev-python/orjson[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/respx[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/sphinx \
+	dev-python/furo \
+	dev-python/sphinx-autodoc-typehints
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e 's:, *<[0-9.]*::' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# fragile to random warnings
+		tests/node/test_http_aiohttp.py::TestAiohttpHttpNode::test_uses_https_if_verify_certs_is_off
+		tests/node/test_urllib3_chain_certs.py::test_assert_fingerprint_in_cert_chain
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p asyncio -o addopts=
+}
diff --git a/dev-python/elasticsearch/Manifest b/dev-python/elasticsearch/Manifest
index 488c4b6527f5..a4b73f4e1bda 100644
--- a/dev-python/elasticsearch/Manifest
+++ b/dev-python/elasticsearch/Manifest
@@ -1,3 +1,5 @@
 DIST elasticsearch-py-8.12.1.gh.tar.gz 909340 BLAKE2B 3c5823ccdfa291406b53cbee9d85d65703eb4bc91cf1e244afd1da355c6ed034c8c5f1eca0fca2a3497f2b49c20545f2dfbea8fd4944fe0a8933a753edbd02a2 SHA512 51206fd4dace033a698dc7c40a568f81d622b6d54c7f930a3bbbd719347dea656f82f04ab517a688d5c0fe835d73d4a041ff1945a2fa530c71a7c7c9621c9b00
+DIST elasticsearch-py-8.13.0.gh.tar.gz 1052777 BLAKE2B 90d6677fe40a635f33e37b4da90c0d8c6d3cde10a815932ee91b5e411162322edc22d13fe231b5d514f350a2b448ce1722e75426b5b5e08b711f3193d2963453 SHA512 fee1ba95d65be424f4ffeb65898bbafd5860358864d9706c82be663139e4543bce54c57bb21188c5ab6cdf5e15323cb1698bfb17715a7be38f844d3781840c97
 EBUILD elasticsearch-8.12.1.ebuild 2075 BLAKE2B 65b527a55e30801a4d8629804a18e471a97fd2ff422d6c960dd7f88d12caa0aa5a6183edaaf34221f70ed2d703eeacd979fa3e8129a566050dddb6ef9dd11976 SHA512 f44d386eaa2d5024fb3015e3ab636da1b9debd4cb1ecdb43290fcc9114d511dfc959418ac8830a07eeb7357cc30abe1413594745a044262e4e5147506e9fdb20
+EBUILD elasticsearch-8.13.0.ebuild 2234 BLAKE2B 8d68a560c4aef82649f3f945b3df9377ccb72fc29c17230d0ab3427816bdb38e15d73eb4e429c481f53277d7dfd1b91eb3a68ad5a2601d1362b8660c94c97e5d SHA512 fde71181bedef7458026d26b01cae5f774e33c9bbe519744efc198bbd58c4f541789a83a26a233246b7d47336229b1ef72299424dadefc31ad0ee7faf3928da5
 MISC metadata.xml 617 BLAKE2B f87827e173c4284a6ac830c48f92384140ad388a1c35562e5522ffc7fa654a9fc1eca14fd55b4365aec7ecbe1ca54f1a58772e240f09c3a56aaf25114b807cae SHA512 dc52446e828b8506e5144fb77e2bf5f761afeed8dda67c1aa72f0f67a3df838712d3deceba12c434b2d53923130e55ba6a71086ec289d90d5577cb5950b46999
diff --git a/dev-python/elasticsearch/elasticsearch-8.13.0.ebuild b/dev-python/elasticsearch/elasticsearch-8.13.0.ebuild
new file mode 100644
index 000000000000..f9fe86ba320f
--- /dev/null
+++ b/dev-python/elasticsearch/elasticsearch-8.13.0.ebuild
@@ -0,0 +1,75 @@
+# 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_{11..12} )
+
+inherit distutils-r1
+
+MY_P="elasticsearch-py-${PV}"
+DESCRIPTION="Official Elasticsearch client library for Python"
+HOMEPAGE="
+	https://ela.st/es-python
+	https://github.com/elastic/elasticsearch-py/
+	https://pypi.org/project/elasticsearch/
+"
+SRC_URI="
+	https://github.com/elastic/elasticsearch-py/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	<dev-python/aiohttp-4[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-3[${PYTHON_USEDEP}]
+	<dev-python/elastic-transport-9[${PYTHON_USEDEP}]
+	>=dev-python/elastic-transport-8.13[${PYTHON_USEDEP}]
+	>=dev-python/orjson-3[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mapbox-vector-tile[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/opentelemetry-api[${PYTHON_USEDEP}]
+		dev-python/opentelemetry-sdk[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+		dev-python/unasync[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_IGNORE=(
+	# REST api tests are a black hole for effort. It downloads the tests
+	# so its an ever moving target. It also requires effort to blacklist
+	# tests for apis which are license restricted.
+	"test_elasticsearch/test_server/test_rest_api_spec.py"
+	# Counting deprecation warnings from python is bound to fail even
+	# if all are fixed in this package. Not worth it.
+	"test_elasticsearch/test_client/test_deprecated_options.py"
+	# Running daemon for tests is finicky and upstream CI fails at it
+	# as well.
+	"test_elasticsearch/test_server/"
+	"test_elasticsearch/test_async/test_server/"
+)
+
+distutils_enable_sphinx docs/sphinx \
+	dev-python/sphinx-autodoc-typehints \
+	dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+python_test() {
+	local -x TEST_WITH_OTEL=1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -o addopts= -p asyncio
+}
diff --git a/dev-python/fb-re2/Manifest b/dev-python/fb-re2/Manifest
deleted file mode 100644
index fca739a41e84..000000000000
--- a/dev-python/fb-re2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyre2-1.0.7.gh.tar.gz 11684 BLAKE2B 748a409aa56dab0e088961bdd0b8659dfe0ed817ed1f6fe1dce15fd03e32b30472776c4e21a4f39e66aa5b3539650a657c36acf8b857332b255a139ef0f890a9 SHA512 c4579bf73af2f0a5ccbb6a28b87ce777ef08199947c1bdf740b426960f41b3530c97a7158fac7768b51c92b8a3797f8e66de61e0c942f239920bd5397d63e2c4
-EBUILD fb-re2-1.0.7-r1.ebuild 794 BLAKE2B 348d5b9d6f457083f1ce5b7b6bfcb45a57759546b1ec24eb70adf9e8c6e0c226011383f1b631c88403f0e833b7ddc269cfdb02ea79fccfb96dfda4537b17d9e0 SHA512 b7021e02985133e10cfd21befeb2de5af7cf2b8a05fe34f43bce5b17f9153218388465eb367497470fd3d6847c6f9cec31fda78e35614ce8f59e2511c51601db
-MISC metadata.xml 478 BLAKE2B f2283b1a19187b55a685f3fdeaa453b04f15b33318665383d5e082ec33e474647bc57610abfeda670736eca6108edcc167efb88e245372ffee938c6a9eb64685 SHA512 de5f466c3d94a98777ce707cfc4d169213d537e908ab54c290a3ad3edbd4abd4e869db259e38fbc9e475d1581a161766aa1590cd6b30b4807c36b7b20c4a8190
diff --git a/dev-python/fb-re2/fb-re2-1.0.7-r1.ebuild b/dev-python/fb-re2/fb-re2-1.0.7-r1.ebuild
deleted file mode 100644
index 31d33cd6b0eb..000000000000
--- a/dev-python/fb-re2/fb-re2-1.0.7-r1.ebuild
+++ /dev/null
@@ -1,43 +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=pyre2-${PV}
-DESCRIPTION="Python bindings for dev-libs/re2"
-HOMEPAGE="
-	https://github.com/facebook/pyre2/
-	https://pypi.org/project/fb-re2/
-"
-SRC_URI="
-	https://github.com/facebook/pyre2/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-libs/re2:=
-"
-RDEPEND="
-	${DEPEND}
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# py3.12
-	# https://github.com/facebook/pyre2/pull/26
-	sed -e 's:assertRaisesRegexp:assertRaisesRegex:' \
-		-i tests/test_match.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/fb-re2/metadata.xml b/dev-python/fb-re2/metadata.xml
deleted file mode 100644
index 02411b37bc6a..000000000000
--- a/dev-python/fb-re2/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>chutzpah@gentoo.org</email>
-		<name>Patrick McLean</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-		<name>Zac Medico</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">fb-re2</remote-id>
-		<remote-id type="github">facebook/pyre2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/flask-gravatar/Manifest b/dev-python/flask-gravatar/Manifest
deleted file mode 100644
index 03e173a9af56..000000000000
--- a/dev-python/flask-gravatar/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Flask-Gravatar-0.5.0.tar.gz 17299 BLAKE2B 7dc16c609cdfbf690a39fbb3bd2810398030bd5c7a54394468902dd131116509da8de448a55907e4738fc984ef422f3c7970b8453b27971eadb106cbb8648562 SHA512 bb4ff064489a030fd763a46fc045109104535474d115aaabdf5c4d1a82a1e3303ee34f590a3f1203a9d009307fc8c45c37af7c30e76a4fb10bc46dd684d37751
-EBUILD flask-gravatar-0.5.0-r2.ebuild 809 BLAKE2B fd0519f2ddf88bffe18cd1194036132a7298c88cd01ac5192e3609c1b394ce44e0f30c63f9900b2a5883bd1bb6e0b3e9933c353e3b27d22d7bc1c861e63f0336 SHA512 e05bb73728c8e20acf73c1532a729ab34d146e1153cb9406f09e57968a47bdbd62b78a17d9e660277e4b82c7f0f96b971f5e252b3d91a8621329c254be6722ad
-MISC metadata.xml 519 BLAKE2B 789e80f12265b3fa1380ee6be57f9ab8cd76bf92eef8e484845f1c2c855f0795d52bf190a66d68b5105236ca469eee526e6c5d0c76eea59752f8d2b200b3aef9 SHA512 69966562ebc6020fff360d783a9a9da4bf5d6ef1d43e288b3c6541496b3681a3c83736f34072e13f2ca821bcb4d00b20b07b41b1329c1ca139219e3d1aeffed4
diff --git a/dev-python/flask-gravatar/flask-gravatar-0.5.0-r2.ebuild b/dev-python/flask-gravatar/flask-gravatar-0.5.0-r2.ebuild
deleted file mode 100644
index 95e8deca89d9..000000000000
--- a/dev-python/flask-gravatar/flask-gravatar-0.5.0-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-PYPI_NO_NORMALIZE=1
-PYPI_PN="Flask-Gravatar"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Small extension for Flask to make usage of Gravatar service easy"
-HOMEPAGE="
-	https://github.com/zzzsochi/Flask-Gravatar/
-	https://pypi.org/project/Flask-Gravatar/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	<dev-python/flask-3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/pytest-runner/d' setup.py || die
-	sed -e 's:--pep8::' \
-		-e 's:--cov=flask_gravatar --cov-report=term-missing::' \
-		-i pytest.ini || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	cd tests || die
-	epytest
-}
diff --git a/dev-python/flask-paginate/Manifest b/dev-python/flask-paginate/Manifest
index 7af7690b6b79..bf8acfb90e32 100644
--- a/dev-python/flask-paginate/Manifest
+++ b/dev-python/flask-paginate/Manifest
@@ -1,3 +1,5 @@
 DIST flask-paginate-2023.10.24.gh.tar.gz 121423 BLAKE2B 100cad03bb015fd5aba26faeaa1d9a62489b85cc0bf36176507af206bb01bdadae3c53802b53483d1482250ab4f0004c9800c61c8c210966b59b1339894d43d5 SHA512 9673698e394f9e11d56dec1a8a57310a963cd15f2fa4784d92e5a8af5d9fbe8e4b59bbd7e34e4e50a38c3ddc936222c19497ddcc233564c4a6aa61c83cd78efa
+DIST flask-paginate-2024.3.28.gh.tar.gz 121638 BLAKE2B 55fe7570a84e5cce0c2e071bf2c5ef2ad8271f69aef7f8ec6bf1bfcbc4608e0498570907c22e01aaf961a6b75e698261b1931521b886c7e2e891a3539c6c91a0 SHA512 31cb4aacdbfbb50c0aced5aeb46c5bbaf25ee2e323ab321f8b1cd8d258b8cef1aa07e30e3b2bd1673662de0aced1f7d5c914ce2b9dbb54072a71ca7a8019d99f
 EBUILD flask-paginate-2023.10.24.ebuild 661 BLAKE2B 55367dd46c8342ad7d624e482304fa5a05e878ff7e0089d1142273fd9eea703758521ec816d99a912945be52d18535b07ed184994f529694917e76f67611eec4 SHA512 f53a6655b8a4dcf3832dec529436692270b29affac5b7b0617c634222c514706ac6725c2b3a8d6d30b5c5bea49c9e0b5210a91ccf7b7a707b36296dc9ce4f2a4
+EBUILD flask-paginate-2024.3.28.ebuild 661 BLAKE2B 72f64e3ea267a91764bdc56fd6f4af5789fa1dec5a2a326ebec7ecbaa7e309009377128dff1637fb9172d61de226a9342c5a3b37b046030892570c05a4685b82 SHA512 fb38f421d18d6eeefecb6786e290874c8af8f8dc0106dff49fe8438eb8cac06e3b35ce7d0dc673df123f634d955e72b14dd94e98f0da6fbf8e7aafdc69f33bc7
 MISC metadata.xml 659 BLAKE2B aa9bb930f20057e07df9b82804e8638b99f63e0773c11408617bc1c3c09f0cf8ce1d3383bbf577c42baa0149c271ddc8da113d5a31056e8ad41d4ac8ec4b64eb SHA512 660aba4453bb417b9a54dcf0b190ae16599c00203a19b4c53615b972595e223fb2f6ce8da6f097b34a5408c4cfe09b2a02a2ad19928352acbc8a4ee53b822a41
diff --git a/dev-python/flask-paginate/flask-paginate-2024.3.28.ebuild b/dev-python/flask-paginate/flask-paginate-2024.3.28.ebuild
new file mode 100644
index 000000000000..e76b6ec74b90
--- /dev/null
+++ b/dev-python/flask-paginate/flask-paginate-2024.3.28.ebuild
@@ -0,0 +1,34 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Pagination support for flask"
+HOMEPAGE="
+	https://flask-paginate.readthedocs.io/
+	https://github.com/lixxu/flask-paginate/
+	https://pypi.org/project/flask-paginate/
+"
+SRC_URI="
+	https://github.com/lixxu/flask-paginate/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest tests/tests.py
+}
diff --git a/dev-python/irc/Manifest b/dev-python/irc/Manifest
index 1aeaaf8a9940..e6edd2bd32a7 100644
--- a/dev-python/irc/Manifest
+++ b/dev-python/irc/Manifest
@@ -1,3 +1,5 @@
 DIST irc-20.3.1.tar.gz 91115 BLAKE2B f2d89ee1a31edd163d3921f01e47ff865198a6cccf0efefe0a6a8ade2038dad91864f89756a4aaef578b85d57415cf6bda9f307250ead939d66e9fa0525d94bd SHA512 b8ecc313907c006d2dbf493e216a78d73e49e63a5c48f5672a4b33f0432a66e6c411b7807094f582a6be2d421bd020b2c7304cfbdcccfaeda046df4c370e1ba3
+DIST irc-20.4.0.tar.gz 91215 BLAKE2B 39244605b7ad47d4fd9c22b4040f14ad46ec79c339e1ffd8451fad04a3d2b7c4945d8474f4c9c9cf3c620cfc3b0298123ba21844849d5070cc85993f46997025 SHA512 ff75593cf9606c724232517c8340beb115ceda254acb5989c043bd0653f215b928b663570c98c27b845cc7431ea142514c85968e3e3b9bda0406ce799a2b1d2e
 EBUILD irc-20.3.1.ebuild 1083 BLAKE2B aecc1bb79a23d33f01fc484b814a5a6026f723ded604e190ac4248e99678c91ba4b053592f3d4e4ecd5f6e7af019d4104d65a83323d7410db758cd74e677552f SHA512 f58bc9d647b328703e6fd323c7ec70cf39940a06898af7e488660e6d0684af707d7f1684e90783ba49f70a563d9eaf0cf17b777cf4983912d2da696a9a12d910
+EBUILD irc-20.4.0.ebuild 1086 BLAKE2B 2db3e4d9000497f2809163dbd99e5721b193e4a7ac1979af8ad41e6c2f043b15230604f4bd1af6e2b182e1012ea44b44b0934046f885dbf4a4e079b4ca8c934b SHA512 9ed879778bd77d2832aab50454ccacbce832ff2a1fac4fa33b6f15329bc1863e59357907fabb764457d5b52b8efc3b3babce55e67f3f17a13e1ae27e261b09cf
 MISC metadata.xml 737 BLAKE2B 403cd376ce9a723ab2052f9a2622ab29fa48350a68ff9e51dd7d73b295aa90357b110a96644ad3cf1dee8381176a2a44d2576687b5764faf873408431b0752eb SHA512 351d9c81ba9516dbe1738d5130abb6250ccf47f4a518443823e918c0105cd8873595fb9b5016d82704639b1d690cf702ed75f24cb82b4f43a1efe2f659cdbee8
diff --git a/dev-python/irc/irc-20.4.0.ebuild b/dev-python/irc/irc-20.4.0.ebuild
new file mode 100644
index 000000000000..e4bd5bdf4e88
--- /dev/null
+++ b/dev-python/irc/irc-20.4.0.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 pypi
+
+DESCRIPTION="IRC client framework written in Python"
+HOMEPAGE="
+	https://github.com/jaraco/irc/
+	https://pypi.org/project/irc/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/jaraco-collections[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-itertools-1.8[${PYTHON_USEDEP}]
+	dev-python/jaraco-logging[${PYTHON_USEDEP}]
+	dev-python/jaraco-stream[${PYTHON_USEDEP}]
+	dev-python/jaraco-text[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/tempora-1.6[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools-scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/scripts"
+		dodoc -r scripts
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 628508319919..dfb178b7f4b6 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,7 +1,10 @@
 AUX lxml-5.1.0-pypy.patch 6885 BLAKE2B 132f2b9037c662f41fd55a0846ac211a6a54a7ac0d976aee815f4dfc787636da2c479f1cd7b2152ad3bbd47fd12e1c0307188f94f8a0c86789d7a84910e46c58 SHA512 4a10ac07626cc69c64ca87ac6c63b03fb1d05631bd7433fac6eca5c46ed896be5d8bc0598d833d6a117adf88d537d8b7b07adbff0457e168def4d6139f11ac9f
+AUX lxml-5.1.1-pypy.patch 6414 BLAKE2B 367cb47fe9466a1f0035fc26884cc55109b2dd69291993f7f2711a943023e5d2b3436f26c879126b4df1b50f0829845fb312eaae6f3bc40cb083a62c6504dc54 SHA512 b95790c42023a296f2eee06b93b381d74e2b7742eb833c22a8a98888cbbadd84032295bdc880c7df98e7ca7aeb8b66c6114e902cdeba0910a91dd8a46269e470
 DIST lxml-4.9.3-patches-2.tar.xz 24288 BLAKE2B 47b7c486a1c1616c875111bd53b14d4211a1eee3f412985f4022e71b85b087abd71d36919fb025257f17de404329284898ddc639f85e8b15ade21778fa218d98 SHA512 713172b4c907db6479a0a803a842824825b212a9b645c1ca356f793658bd6c63113ea248278e7c46b512e22e3130696e9fc5127fea82a67372d920733fc160b0
 DIST lxml-4.9.4.gh.tar.gz 960009 BLAKE2B 7d31095dcf1f73c1026e7378e6adb19a053edc116b119ae415c3324134d3700822bf4611dc3cbf7c216d396e1404b143c8ebfdfb7e5a71b9ef6ec187898cc699 SHA512 528ef4ae057a7ee54d3193a042a6db500ada883d1d506829b6824d91ec979feb69ec79239420112eae0e08a437b2e5da8efc35feb5d04d119bfae2679e918d29
 DIST lxml-5.1.0.gh.tar.gz 962111 BLAKE2B 31c82eb198911d82fd9f7882bf94547b2367f3b3d1183eb8e8f97297b96faa69230d27b3367160b1f732a5d0878296b2d11787c3b220416c81a920e62ebec4f2 SHA512 1fadfeac1fb8b1e4fb1f7f2acb056865eb2567300a6c728eaede380d846ac75a6e33ebebcbbc6d60f54102152afd5dddf970058c4e27af396e9fa58e83c407a7
+DIST lxml-5.1.1.gh.tar.gz 963649 BLAKE2B 0cb7b4e39539ee962cd590b2b2dc644a111a094da9cbccc2ee0c29b9a758d8aca967f989693c76532252909dc44a96a3815273f04f28be2dbeb57d4daae2e6fd SHA512 bb479ca7dcce944a9a3597f67da1b12fb9f3a05592fb8342fe01bc569a86df95c32c7bf1bc0b9cfc0ddffb85adf12612fb2d8622a460357c1aaa56e033476375
 EBUILD lxml-4.9.4.ebuild 2996 BLAKE2B e612e66cb1b7e6fdb8cb661d253f7c1ccb25b31c9cf620eccae2454e113749aab3841d54384483da7a9754d0bc30f0f65db66ad712f5c47a10e1d797705af197 SHA512 ef01bc8f91818b6a809edc9c27823f86dcac5ca5ceb6f2239785c7ac91fea85e3003a4e32ca78efb001d672a2e4fff0c27a1db24d5dbba5cdd2daad288f0a626
 EBUILD lxml-5.1.0.ebuild 2902 BLAKE2B 10c758230f1c4fdb3084295749f3d2a0752983b142a56cd6d9362be2dd8d99c7d9bdc72ce74b02b1c5df5fc505ce5df65d87a9297367dfa5f72af83573563962 SHA512 d278b800a03de26b91873dedb0d7c8643f2cfb3e3e691b50e318a8d5575f11359239323fab141fce64a5b04c3d4db9dab3803e62fe85cfb3647023fb692bbd52
+EBUILD lxml-5.1.1.ebuild 2917 BLAKE2B da7c786b8a21a844c6b1f7fea8124fa900bfcacb6a0cda1f34a5b997878ec4ae4ba112ff8f61c661236129115468e901e4442e0849114059d033a5c103d2b6ea SHA512 8267821e6d1bfc08e1d3200a3129376852419854568c1be3110749a78fd270fcffde1b9a77daf0620787b875429e4c4b116c2ade5fc1241a76d25ada279076cb
 MISC metadata.xml 463 BLAKE2B 9bcd092b61568f5d467230617b101f36245c41078e6a66c7ff63b22a6b4095de2ba3a59e48ce8b7842ce58d1255fa293995652daa3fab4c3af988498eaa30e97 SHA512 2ba5e340b59e0de4e472380e9c19b1f6f573e86e5c3c2e075f6151d369e94eea70e3ce36bfb5ece4da3fa69459e3ff83368f1df8302aa5754ae52f13c8f2312e
diff --git a/dev-python/lxml/files/lxml-5.1.1-pypy.patch b/dev-python/lxml/files/lxml-5.1.1-pypy.patch
new file mode 100644
index 000000000000..2f6a75781fb8
--- /dev/null
+++ b/dev-python/lxml/files/lxml-5.1.1-pypy.patch
@@ -0,0 +1,162 @@
+diff --git a/src/lxml/tests/test_http_io.py b/src/lxml/tests/test_http_io.py
+index 8385e393..0b259299 100644
+--- a/src/lxml/tests/test_http_io.py
++++ b/src/lxml/tests/test_http_io.py
+@@ -10,3 +10,3 @@ import gzip
+ 
+-from .common_imports import etree, HelperTestCase, BytesIO, _bytes
++from .common_imports import etree, HelperTestCase, BytesIO, _bytes, IS_PYPY
+ from .dummy_http_server import webserver, HTTPRequestCollector
+@@ -14,2 +14,3 @@ from .dummy_http_server import webserver, HTTPRequestCollector
+ 
++@unittest.skipIf(IS_PYPY, "broken on pypy")
+ class HttpIOTestCase(HelperTestCase):
+diff --git a/src/lxml/tests/test_nsclasses.py b/src/lxml/tests/test_nsclasses.py
+index 750dc1ed..adbec11c 100644
+--- a/src/lxml/tests/test_nsclasses.py
++++ b/src/lxml/tests/test_nsclasses.py
+@@ -8,3 +8,3 @@ import unittest
+ 
+-from .common_imports import etree, HelperTestCase, _bytes, make_doctest
++from .common_imports import etree, HelperTestCase, _bytes, make_doctest, IS_PYPY
+ 
+@@ -45,2 +45,3 @@ class ETreeNamespaceClassesTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_ns_classes(self):
+diff --git a/src/lxml/tests/test_objectify.py b/src/lxml/tests/test_objectify.py
+index 1c8ff47c..326c5316 100644
+--- a/src/lxml/tests/test_objectify.py
++++ b/src/lxml/tests/test_objectify.py
+@@ -10,3 +10,4 @@ import unittest
+ from .common_imports import (
+-    etree, HelperTestCase, fileInTestDir, doctest, make_doctest, _bytes, _str, BytesIO
++    etree, HelperTestCase, fileInTestDir, doctest, make_doctest, _bytes, _str, BytesIO,
++    IS_PYPY
+ )
+@@ -383,2 +384,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_setattr(self):
+@@ -818,2 +820,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_build_tree(self):
+@@ -847,2 +850,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_bool(self):
+@@ -884,2 +888,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_str(self):
+@@ -891,2 +896,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_str_intliteral(self):
+@@ -898,2 +904,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_str_floatliteral(self):
+@@ -905,2 +912,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_str_mul(self):
+@@ -917,2 +925,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_str_add(self):
+@@ -992,2 +1001,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_ustr(self):
+@@ -999,2 +1009,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_ustr_intliteral(self):
+@@ -1006,2 +1017,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_ustr_floatliteral(self):
+@@ -1013,2 +1025,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_ustr_mul(self):
+@@ -1025,2 +1038,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_ustr_add(self):
+@@ -1050,2 +1064,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_int(self):
+@@ -1066,2 +1081,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_float(self):
+@@ -1082,2 +1098,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_float_precision(self):
+@@ -1101,2 +1118,3 @@ class ObjectifyTestCase(HelperTestCase):
+   
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_float_precision_consistency(self):
+@@ -1187,2 +1205,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_unregistered(self):
+@@ -1349,2 +1368,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_str_cmp(self):
+@@ -1376,2 +1396,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_int_cmp(self):
+@@ -1398,2 +1419,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_bool_cmp(self):
+@@ -2067,2 +2089,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_registered_type_stringify(self):
+@@ -2537,2 +2560,3 @@ class ObjectifyTestCase(HelperTestCase):
+     # type-looked-up as ObjectifiedElement (no annotations)
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_int(self):
+@@ -2542,2 +2566,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_float(self):
+@@ -2547,2 +2572,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_str(self):
+@@ -2552,2 +2578,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_unicode(self):
+@@ -2557,2 +2584,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_bool(self):
+@@ -2562,2 +2590,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_none(self):
+@@ -2567,2 +2596,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_value_concatenation(self):
+@@ -2577,2 +2607,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_nested(self):
+@@ -2745,3 +2776,4 @@ def test_suite():
+     suite.addTests(doctest.DocTestSuite(objectify))
+-    suite.addTests([make_doctest('../../../doc/objectify.txt')])
++    if not IS_PYPY:
++        suite.addTests([make_doctest('../../../doc/objectify.txt')])
+     return suite
diff --git a/dev-python/lxml/lxml-5.1.1.ebuild b/dev-python/lxml/lxml-5.1.1.ebuild
new file mode 100644
index 000000000000..73d2ad106a01
--- /dev/null
+++ b/dev-python/lxml/lxml-5.1.1.ebuild
@@ -0,0 +1,117 @@
+# 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 optfeature toolchain-funcs
+
+DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
+HOMEPAGE="
+	https://lxml.de/
+	https://pypi.org/project/lxml/
+	https://github.com/lxml/lxml/
+"
+SRC_URI="
+	https://github.com/lxml/lxml/archive/${P}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/lxml-${P}
+
+LICENSE="BSD ElementTree GPL-2 PSF-2"
+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"
+IUSE="doc examples +threads test"
+RESTRICT="!test? ( test )"
+
+# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
+DEPEND="
+	>=dev-libs/libxml2-2.10.3
+	>=dev-libs/libxslt-1.1.38
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+	>=dev-python/cython-3.0.9[${PYTHON_USEDEP}]
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/docutils[${PYTHON_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+		')
+	)
+	test? (
+		dev-python/cssselect[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.1.1-pypy.patch"
+)
+
+python_check_deps() {
+	use doc || return 0
+	python_has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/pygments[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
+}
+
+python_prepare_all() {
+	# avoid replacing PYTHONPATH in tests.
+	sed -i -e '/sys\.path/d' test.py || die
+
+	# don't use some random SDK on Darwin
+	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
+		setupinfo.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local DISTUTILS_ARGS=(
+		# by default it adds -w to CFLAGS
+		--warnings
+	)
+	tc-export PKG_CONFIG
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && emake html
+}
+
+python_test() {
+	local dir=${BUILD_DIR}/test$(python_get_sitedir)/lxml
+	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
+
+	cp -al "${BUILD_DIR}"/{install,test} || die
+	cp -al src/lxml/tests "${dir}/" || die
+	cp -al src/lxml/html/tests "${dir}/html/" || die
+	ln -rs "${S}"/doc "${dir}"/../../ || die
+
+	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		local DOCS=( README.rst *.txt doc/*.txt )
+		local HTML_DOCS=( doc/html/. )
+	fi
+	if use examples; then
+		dodoc -r samples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup4
+	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
+}
diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
deleted file mode 100644
index ea375594e134..000000000000
--- a/dev-python/nose/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST nose-1.3.7_p20221026.gh.tar.gz 325421 BLAKE2B 3762e1703a6a9c90d1569d21efa9ba100f52a8b3660022694133a763d995e19a6eef2398f5013b4827e4c334a2d5e3cd14a9704a50cd822c2d554a0ed6008f2c SHA512 3cb97b58525bee0cf88328ba865dc039bf3b76c56b4b42dd9dcf68f7b7585a91fb7e9b0c419668eccc0e242b2bcbb77eb197a0954ee9ad50051ef3af1a81dac3
-EBUILD nose-1.3.7_p20221026.ebuild 1440 BLAKE2B ecc84c466335cd0ad1c1509d9889f63877152611701c21bef5d91613f0d5bb35b9ac28b9947ae2d72730691b149335fda5a78da970ec2b31172407af308710d2 SHA512 c9974fb71e2a2c8843902a42542bf89f395ef0b1e2f8ab03584d1b32709a9ef9b4979fc2aacdc5b4d81d2432ffb56415e5e2ec5a7f72deef22ef7ff595fa1ecd
-MISC metadata.xml 399 BLAKE2B bccd250e005dc4b4921b8affffa56c918069576663c44671189d40dea344c0fb880fcf41656b1c9c5043cea9a0203b3ad3b980f7920ecebab82b4c71f75214d4 SHA512 15fd9ea9d0c09833f25497e2715a15cb2b2dbcbe042e0a3fa24525455eaeb470d6c799fddcd635a5197c984252649a26352713fcd069123fe2546edc20566fa6
diff --git a/dev-python/nose/metadata.xml b/dev-python/nose/metadata.xml
deleted file mode 100644
index 554766d8e7d1..000000000000
--- a/dev-python/nose/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">nose</remote-id>
-    <remote-id type="github">nose-devs/nose</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/nose/nose-1.3.7_p20221026.ebuild b/dev-python/nose/nose-1.3.7_p20221026.ebuild
deleted file mode 100644
index de12a5102c63..000000000000
--- a/dev-python/nose/nose-1.3.7_p20221026.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-EGIT_COMMIT="8def1b4dcf2ef6b4a34bffdfacea0018a78b06b6"
-DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
-HOMEPAGE="
-	https://pypi.org/project/nose/
-	https://nose.readthedocs.io/en/latest/
-	https://github.com/nose-devs/nose
-"
-SRC_URI="
-	https://github.com/arthurzam/nose/archive/${EGIT_COMMIT}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-LICENSE="LGPL-2.1"
-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 test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			!hppa? ( dev-python/coverage[${PYTHON_USEDEP}] )
-		' python3_{8..10} pypy3)
-		$(python_gen_cond_dep '
-			dev-python/twisted[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-
-src_prepare() {
-	# failing to find configuration file
-	sed -e 's/test_cover_options_config_file/_&/' \
-		-i unit_tests/test_cover_plugin.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" -m nose -v -a "!network" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-src_install() {
-	distutils-r1_src_install
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/opentelemetry-api/Manifest b/dev-python/opentelemetry-api/Manifest
new file mode 100644
index 000000000000..fabfa144a560
--- /dev/null
+++ b/dev-python/opentelemetry-api/Manifest
@@ -0,0 +1,3 @@
+DIST opentelemetry-python-1.23.0.gh.tar.gz 523456 BLAKE2B 94047e0d806ce17f0116fd6343daeecbf738c41e3e1cc1cbf8af9a0b1c44b29cecbc597011a7ffe15ffc656f2744750d9117d63bdaa77c7971248f58f9580c8e SHA512 8a2cb94d774db15eb6bb7fd97d5b761d35066779072c0ce0cf51b6d1083d115120b932598c0da2efb20060e8a4c65415a74f508011ccca7242e2d79705f0c246
+EBUILD opentelemetry-api-1.23.0.ebuild 1795 BLAKE2B cc9c21dca69e03352a879e042f32a343c0af552921003498dfa11b98a7a9295ea6b9d3336d28c7932b9ac8f72580f3ad40b3024f7dbb4d36cece2ef5ea69fb51 SHA512 bfecfad922cb247c665cdb3d2375eb61df92d8caeb8f789e48e58f889332a72d276395dadf1bf0cbefe4f9bf6f8cc1bcdf7233fd6fd4dc589bbcad588e82b1a7
+MISC metadata.xml 643 BLAKE2B 47c86acb0093f5c596de91afcfaa9f2297f541327d008d33bbe6c542b98e8ae3cf7208c00b0d66d1050a14b5d68439ddcba5ed4449bbe05da3afb8433b95da59 SHA512 20439a62491c5e7a538bc6ec5c9f90cd9473b08d71813d19899fa538f033b164a9bf2fed01d7a90788ad4ce0768fb71bb9e00f6536ffe82da322a73a88459713
diff --git a/dev-python/opentelemetry-api/metadata.xml b/dev-python/opentelemetry-api/metadata.xml
new file mode 100644
index 000000000000..c98d276f46d8
--- /dev/null
+++ b/dev-python/opentelemetry-api/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>parona@protonmail.com</email>
+		<name>Alfred Wingate</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">opentelemetry-api</remote-id>
+		<remote-id type="github">open-telemetry/opentelemetry-python</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/opentelemetry-api/opentelemetry-api-1.23.0.ebuild b/dev-python/opentelemetry-api/opentelemetry-api-1.23.0.ebuild
new file mode 100644
index 000000000000..47504cdddb30
--- /dev/null
+++ b/dev-python/opentelemetry-api/opentelemetry-api-1.23.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="opentelemetry-python-${PV}"
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{11..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenTelemetry Python API"
+HOMEPAGE="
+	https://opentelemetry.io/
+	https://pypi.org/project/opentelemetry-api/
+	https://github.com/open-telemetry/opentelemetry-python/
+"
+SRC_URI="
+	https://github.com/open-telemetry/opentelemetry-python/archive/refs/tags/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/${PN}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/deprecated-1.2.6[${PYTHON_USEDEP}]
+	dev-python/importlib-metadata[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asgiref[${PYTHON_USEDEP}]
+		dev-python/attrs[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/iniconfig[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pluggy[${PYTHON_USEDEP}]
+		dev-python/py-cpuinfo[${PYTHON_USEDEP}]
+		dev-python/py[${PYTHON_USEDEP}]
+		dev-python/tomli[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+		dev-python/wrapt[${PYTHON_USEDEP}]
+		dev-python/zipp[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+
+	# Unnecessary restriction
+	# https://github.com/open-telemetry/opentelemetry-python/pull/3576
+	sed -i -e '/importlib-metadata/s:, < 7.0::' pyproject.toml || die
+}
+
+python_test() {
+	cp -a "${BUILD_DIR}"/{install,test} || die
+	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
+
+	for dep in opentelemetry-semantic-conventions opentelemetry-sdk tests/opentelemetry-test-utils ; do
+		pushd "${WORKDIR}/${MY_P}/${dep}" >/dev/null || die
+		distutils_pep517_install "${BUILD_DIR}"/test
+		popd >/dev/null || die
+	done
+
+	epytest
+}
diff --git a/dev-python/opentelemetry-sdk/Manifest b/dev-python/opentelemetry-sdk/Manifest
new file mode 100644
index 000000000000..bbeae0076873
--- /dev/null
+++ b/dev-python/opentelemetry-sdk/Manifest
@@ -0,0 +1,3 @@
+DIST opentelemetry-python-1.23.0.gh.tar.gz 523456 BLAKE2B 94047e0d806ce17f0116fd6343daeecbf738c41e3e1cc1cbf8af9a0b1c44b29cecbc597011a7ffe15ffc656f2744750d9117d63bdaa77c7971248f58f9580c8e SHA512 8a2cb94d774db15eb6bb7fd97d5b761d35066779072c0ce0cf51b6d1083d115120b932598c0da2efb20060e8a4c65415a74f508011ccca7242e2d79705f0c246
+EBUILD opentelemetry-sdk-1.23.0.ebuild 2010 BLAKE2B 00960c70b6a6621212e402fbf7cefb179cc89f15d2da1ddb95056d053a3b0adb21e62842bf060da58fa9655c8bbfe33ac90700c905ec581fe2eb6bb7999510fc SHA512 2ab4955c6f5a3789bb214c34b31d252e26827ee66205ac214bbaabedca0b9635486fb0360411662b3de9f1d7689ea3ed4bbdec03329322f87aa7921fc4f895a0
+MISC metadata.xml 643 BLAKE2B 76dfef2a0bbc6ca40385189ccbb4dc8284b807dc873c3d7a02e171dd35fde051289bdb673b5f445c0b080e3b310b8e0d99311db283a6645c4f8ff8bff856d474 SHA512 8899744243bcbed9b286104609532c281d04febbb7a9da4f7c71aad177f6dcf728f008355fa6c0c1d201701360b3430084fe223d5cffa9af09adbbbde7292595
diff --git a/dev-python/opentelemetry-sdk/metadata.xml b/dev-python/opentelemetry-sdk/metadata.xml
new file mode 100644
index 000000000000..a1109c9c4db7
--- /dev/null
+++ b/dev-python/opentelemetry-sdk/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>parona@protonmail.com</email>
+		<name>Alfred Wingate</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">opentelemetry-sdk</remote-id>
+		<remote-id type="github">open-telemetry/opentelemetry-python</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.23.0.ebuild b/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.23.0.ebuild
new file mode 100644
index 000000000000..03fc6082d363
--- /dev/null
+++ b/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.23.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="opentelemetry-python-${PV}"
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{11..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenTelemetry Python SDK"
+HOMEPAGE="
+	https://opentelemetry.io/
+	https://pypi.org/project/opentelemetry-sdk/
+	https://github.com/open-telemetry/opentelemetry-python/
+"
+SRC_URI="
+	https://github.com/open-telemetry/opentelemetry-python/archive/refs/tags/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+
+S="${WORKDIR}/${MY_P}/${PN}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	~dev-python/opentelemetry-api-${PV}[${PYTHON_USEDEP}]
+	~dev-python/opentelemetry-semantic-conventions-${PV}[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asgiref[${PYTHON_USEDEP}]
+		dev-python/attrs[${PYTHON_USEDEP}]
+		dev-python/deprecated[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/importlib-metadata[${PYTHON_USEDEP}]
+		dev-python/iniconfig[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pluggy[${PYTHON_USEDEP}]
+		dev-python/py-cpuinfo[${PYTHON_USEDEP}]
+		dev-python/py[${PYTHON_USEDEP}]
+		dev-python/tomli[${PYTHON_USEDEP}]
+		dev-python/wrapt[${PYTHON_USEDEP}]
+		dev-python/zipp[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+
+	# Use the same version with all opentelemetry components
+	# # https://github.com/gentoo/gentoo/pull/35962#issuecomment-2025466313
+	sed -i -e "s/\"\(opentelemetry-semantic-conventions == \).*\"/\"\1 ${PV}\"/" pyproject.toml || die
+}
+
+python_test() {
+	cp -a "${BUILD_DIR}"/{install,test} || die
+	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
+
+	for dep in tests/opentelemetry-test-utils; do
+		pushd "${WORKDIR}/${MY_P}/${dep}" >/dev/null || die
+		distutils_pep517_install "${BUILD_DIR}"/test
+		popd >/dev/null || die
+	done
+
+	local -x EPYTEST_IGNORE=(
+		tests/performance/benchmarks/
+	)
+
+	epytest
+}
diff --git a/dev-python/opentelemetry-semantic-conventions/Manifest b/dev-python/opentelemetry-semantic-conventions/Manifest
new file mode 100644
index 000000000000..2bc72834da5f
--- /dev/null
+++ b/dev-python/opentelemetry-semantic-conventions/Manifest
@@ -0,0 +1,3 @@
+DIST opentelemetry-python-1.23.0.gh.tar.gz 523456 BLAKE2B 94047e0d806ce17f0116fd6343daeecbf738c41e3e1cc1cbf8af9a0b1c44b29cecbc597011a7ffe15ffc656f2744750d9117d63bdaa77c7971248f58f9580c8e SHA512 8a2cb94d774db15eb6bb7fd97d5b761d35066779072c0ce0cf51b6d1083d115120b932598c0da2efb20060e8a4c65415a74f508011ccca7242e2d79705f0c246
+EBUILD opentelemetry-semantic-conventions-1.23.0.ebuild 1836 BLAKE2B bcae4dfd701cba14e6e65ee03aebc1ef3b941973b06173f3d614397f3d3f4eff59eaaa325656d704c709ef86fdf2605e86c349fad6badd6e7feecb46f93a428d SHA512 bcd6c6624638b79ae2c217d2329aa22a1c7d98293245c11b906e85991149a4986a4980b32f51a73bba548c0ec78d4242354560dfcb64c54db460c55af44b2fc8
+MISC metadata.xml 660 BLAKE2B b231081049a3c5830c7d3d5494261d24ade30de731cf7b4186273af4521db9d1e56c6811ef90b6b763354e67d198c3edefb055bb76f23fb14097df57709546da SHA512 1b6869a2b3918e48f376261d70bcaa9789511ba06cb988e9484a64dcfb57b1494300b29fd6316e39dc23e0d295d6c087e5a07dedf268ca62cd9d555b356379b7
diff --git a/dev-python/opentelemetry-semantic-conventions/metadata.xml b/dev-python/opentelemetry-semantic-conventions/metadata.xml
new file mode 100644
index 000000000000..4f1084df480f
--- /dev/null
+++ b/dev-python/opentelemetry-semantic-conventions/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>parona@protonmail.com</email>
+		<name>Alfred Wingate</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">opentelemetry-semantic-conventions</remote-id>
+		<remote-id type="github">open-telemetry/opentelemetry-python</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.23.0.ebuild b/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.23.0.ebuild
new file mode 100644
index 000000000000..321404550b34
--- /dev/null
+++ b/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.23.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="opentelemetry-python-${PV}"
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{11..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="OpenTelemetry Semantic Conventions"
+HOMEPAGE="
+	https://opentelemetry.io/
+	https://pypi.org/project/opentelemetry-sdk/
+	https://github.com/open-telemetry/opentelemetry-python/
+"
+SRC_URI="
+	https://github.com/open-telemetry/opentelemetry-python/archive/refs/tags/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/${PN}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	test? (
+		dev-python/asgiref[${PYTHON_USEDEP}]
+		dev-python/attrs[${PYTHON_USEDEP}]
+		dev-python/deprecated[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/importlib-metadata[${PYTHON_USEDEP}]
+		dev-python/iniconfig[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pluggy[${PYTHON_USEDEP}]
+		dev-python/py-cpuinfo[${PYTHON_USEDEP}]
+		dev-python/py[${PYTHON_USEDEP}]
+		dev-python/tomli[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+		dev-python/wrapt[${PYTHON_USEDEP}]
+		dev-python/zipp[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+
+	# Use the same version with all opentelemetry components
+	# https://github.com/gentoo/gentoo/pull/35962#issuecomment-2025466313
+	sed -i -e "s/\(__version__ =\) .*/\1 \"${PV}\"/" src/opentelemetry/semconv/version.py || die
+}
+
+python_test() {
+	cp -a "${BUILD_DIR}"/{install,test} || die
+	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
+
+	for dep in opentelemetry-api opentelemetry-sdk tests/opentelemetry-test-utils ; do
+		pushd "${WORKDIR}/${MY_P}/${dep}" >/dev/null || die
+		distutils_pep517_install "${BUILD_DIR}"/test
+		popd >/dev/null || die
+	done
+
+	epytest
+}
diff --git a/dev-python/pendulum/Manifest b/dev-python/pendulum/Manifest
deleted file mode 100644
index c1b78d2793eb..000000000000
--- a/dev-python/pendulum/Manifest
+++ /dev/null
@@ -1,43 +0,0 @@
-AUX pendulum-3.0.0-system-tzdata.patch 1809 BLAKE2B 05b33d6ae6d673f82953c3128f9305ca58dc5fa9eef9a40b227f2e44ab973319402bf9b04a9e8f2d6f79265cf6366811b2daa60356d1f8b1c8a91ea4a2af5df2 SHA512 c3920988393b657543cae0594c3ca7e0d34460f27740d5b70aa2c708437571508a81d344ca9bf7f25972b5daafa4a139f2667127ddff8465d1230391ff3ac6cb
-DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
-DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
-DIST cc-1.0.79.crate 62624 BLAKE2B b3cbed3bd6fcac1c6ea258ec96cd107f859947a35dc89c3dc8f314741b0f668e61518f896ec32ce10c9a7eb20dd350bc177a71810d53ebea59fda062ed9d27db SHA512 cbf0a25f3a23fc540e9d638fabc23f761f1c240ebb4814e761e90437d71fc559cd155768ab9e78fc192220d8a605c66c3af342ed736b719181656170b98d7bf5
-DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST indoc-1.0.9.crate 13475 BLAKE2B a9696788574e56dd125c3371169fd59d6947d188f76e2669b21c0304692efd6709cd048920f7822e92c6a5620fb178e0e85c7776118cef8ccee0f58398e14abf SHA512 db8aef4a7bb606452dc8ed45aa29a255c7a135357a0bd586fb4429c5f56a1aa2ca9400d6fac39956aeb486a15d25cf5d1b9524967867f2c651d9d563e3e85be8
-DIST libc-0.2.139.crate 638983 BLAKE2B e92b296cf8c916e10e859722ed75f4790401662ff7aa2fe8ed84ef9b94a00538768be33c272f0881e42da887c8c43e1fd44d061343386216492a76fe5d308598 SHA512 ff5fae517c49c382dee9b1d7479b65b0a818780453e5c00c416847d02f42186e2fcf19a8a8dc5e9cc2611300690c6ad324f9c0f0e8172e913a1b781fb7c0b5b4
-DIST libmimalloc-sys-0.1.35.crate 184695 BLAKE2B 13d7793a67c6e2bf2377af59818c2e109e7b9f6d6415089970626b614bb33e96fd30bc962f820d5bb2beeefae6e155a30b7584e7027e3187f088c190eb8115f7 SHA512 7f9ef551d23d7e22073cf9d8593103a4ca17cf82b65b2bc1404dbfc2cec46c4f305ad9dfda9ca1c61e7ff3a617196c6798f505d62c90552dd25b4ba0c05e5847
-DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990
-DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed SHA512 2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55
-DIST mimalloc-0.1.39.crate 3727 BLAKE2B f61007119805ec636fef03acb096c97ad65d1fdd548eb2c2b7d1fffb8bf4f2a1cdc0b27d05965adbe917390474f93499341084179ce82698bba87d8a58e52fbb SHA512 6fc9116ed74bca69ca4c4944c37ba235105c631960779a1becaafd2cdefb83566c8403e9636f73922bd7a628a168713d1e7651600c4dbf132b16cc9080ee23f3
-DIST once_cell-1.17.1.crate 32856 BLAKE2B 8bde2aaaf9ef45d1f6b8458686179f1fe9295ee8faea269e9b49779583ce26ab9dafe988c3584e841a9e5d05e28430ca967ef3b25e755f48f0120d9c99cdb7bc SHA512 1302d51801e38bfee23e74c0046f1ecb1d3c27309b5fe11c2b6c99553b357db502ce1718695602f9d8b10429e8ff03f91c016d5d604957083728293824c05904
-DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
-DIST parking_lot_core-0.9.7.crate 32412 BLAKE2B fec3ed2cf28e6d5090aae6a7c0ad583acf3ce6e54e881b78a9cb6721ca1e7040d46c044d405852728e74baff6ff1feaee7a89a64c69d20531f29942dfaafcc72 SHA512 1f232f1a87ba9377621244ba49378663f3113da7192a399fdb70be971ff5e5ca0d0601e1210a3fd8ab75ef464dc8505e719f81902e3448cce5e7848ef4bdbef0
-DIST pendulum-2.1.2.gh.tar.gz 159885 BLAKE2B c95cd131fc95a0d19ef11f180cc42126cb8a6ea3aaf4b3bbedbc5ce4c1b37a6624f2a1be92f1a6fd6b1f14f5d20fa5f32e8230f896ab7a216f02f00e85b98738 SHA512 c367320ade0d10b7eb9c880286176161b925d7df052f7de85ddd169594bbe778776ea74df451f00186df98be3e32b7399c68ca4b40123e2c456206410e3a1ab2
-DIST pendulum-3.0.0.gh.tar.gz 179981 BLAKE2B 5cbf0e2e504964e75c45ad41fcdab5a2ef0be91d9f4a8898305d15a5dc124abc3dc0986c7559d45091325bf4819f5e854ce87f92d534b24d1ac8c0852097df09 SHA512 f4cab40bec00029ccda44f15c71cf07a4518b6d86570b2f3425db2e3bb96151b22aa5065b1e21cc4b2b0cfef216f6af1ae6a16eb4efdb811dbdb18a7eab6c24a
-DIST proc-macro2-1.0.51.crate 41804 BLAKE2B 579e5a157da81cd8350a6407603e5f8102bb9b6618ea8e81ced1692a6a6f4b57bec35aeb965b643f2542f65a3b9965fbbcf7e0ade35cf159270583d34665a628 SHA512 10ad77a5d05437c1b2c40a8f82389d081e64993171aa6259e8dca98d9afb04f5fb870f2037ad626a280d59c1a89fd4482bead701d744d6fb7c893bd9e78dfc1f
-DIST pyo3-0.19.1.crate 418297 BLAKE2B 19ad6aa4fba175961b7fe97ae0bc45050f930859972b1b25cf0139bb3436c050ba76b63894f0df26174f141a52ac6abf10fd84c03c056af5a0665e723ae24195 SHA512 b27500cf49f1c6f217d21344d24ac96c07b82c157dd36fa4550b94059da5715ba7d0e085ec07dd5f8a8ac9de4d7e9239c1cceac4337294eb0dc9f6102049d5ff
-DIST pyo3-build-config-0.19.1.crate 29205 BLAKE2B f88cbf9763fd68f7b30d109ae608efc29e0d4bf6672ee5f31b77342b5f37baa4f981916124af6897ccea3d93990ff889815fc3abbe9ce3fdbd860b6d5698b7da SHA512 311fef01ac2c3ce12485849cb99eba038a36260206308c5af4621fc5393f942e03aae4f6a5fe24ef3005eb781d2161453667ad552d6a371ddd96460b05a2e710
-DIST pyo3-ffi-0.19.1.crate 64837 BLAKE2B deb3065ce99b4bd3b5dee182f7cc20dbbb1792e792e78425f30a71ad3e45aa8552f99f02debd640e16db44cbcad58f67b04ca6e08cb964e788d41dca64500a0c SHA512 6293d75c71ebe80c320f0a240716a2e0c62f66aecc58320f2f40a81f85390c7d9174b4888ead89818b73fdc8d3d21df12adc6625087f0c9ebb82767d4a7c5adc
-DIST pyo3-macros-0.19.1.crate 7173 BLAKE2B b8d53ed51e2454abb77528c9e08315f288718dca08888bc24752f156942c27ffff75c88504bddcf05cc89d16b3fd2cd86280b0b94bd09947a2ffa4c800dfde68 SHA512 2c12cff4a8af948f9ecaadb83d1ed5199758f9e9c626c5930a1b74c65027a8b74dcf989ee470798aeff7c1165650d5d3dd75cb1f813859b7b8e241cd2bb8f2eb
-DIST pyo3-macros-backend-0.19.1.crate 49916 BLAKE2B 930774ee7ec936bbefc4ea81e2496cd15438dc82954ec7b85c0bc42b290b41c60869f8b31e109ba16a373d3ebf1e0058c0c7ef7d4911ae40feb99fb61d66a745 SHA512 7c7949588a15ef57b12f11e903c1110228bb653212761c97ff50399aa39be97108b471a2cdf47afb307f6c86bfb24b3e9ab32fd08e0550ee27e8808f2acd5145
-DIST python3-dll-a-0.2.9.crate 66092 BLAKE2B 2c4baa31df7f55da8f1c6073525b4498bae7207ee38ef0eba4dbe58088609937a7d7b851c603ae62e5eb5361881e67a05d8c112d0a76aba5d99b13cdccd59d59 SHA512 1914d3ce67284f13551a4efefaeb9c11138fcca3d5082746282f64b7a36f732c6834766d981f27d862a61410eed09b3d281e0cab8cc1a46d424d04823ffaee35
-DIST quote-1.0.23.crate 28058 BLAKE2B 81c483fa26b36b5c4dbe85b386a74f5bfeaa854a99c0d678374507613da916a60e3f5b14d4a4d295e1c9ef0413fa1f16447df8f19a9db8cb0485b7a5c327fdc1 SHA512 3bce6846dda94d285de15771549099e60df39c8395c498b372c90a240f77df31d6d9048127913ec1c7ed8f3a189470ade1db2bede406bb00fa715ea641ec87c2
-DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
-DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
-DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f010363984c439e3fe4f75aecb9720648aa1e9bcc56bb3be848dd40cee578212439f78f07a807c9441c3c3e0147 SHA512 a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae
-DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
-DIST target-lexicon-0.12.6.crate 24357 BLAKE2B 5d9aef958155bdc1b546b9940083cf81ba4c638525e2d46340e50c4274764b39ac19a12214f3ff64a6830524a2ecea9d555db3f07d5d7dbccd7dd809255c4499 SHA512 63ccc047d10ebff55c3b9be400e2deafcaba7beb28ee67bae6d5df58e7c08362b2c4e0004f6daa582928850701969015ad43714c7ad46df665474667ff4db58f
-DIST unicode-ident-1.0.6.crate 42158 BLAKE2B 6e4ef61fcac69b4ccbf743a2c2f857a6ea9fcbac9b9890f5b7208cc0732c6892aa5889b3030e87c8c29ce4ce24ddb7adec6bcf47b7aefe9cb5d19f920f12cfbd SHA512 ee1dc78fe535f46bdaf3e19dd8dfc859bf3133d9271026cadf626a07ba586c39caca4e45d905156a6276cf852f9cebef196b2229c3ba4b5e2b26c956fd6cff86
-DIST unindent-0.1.11.crate 7700 BLAKE2B d4d1dde410c4194acb51f74f374cf11fa872e49fad8f5f24b596d72476403e5e312fedf7b0bcb1027384d53c8de565368d63c30eaf70a6e6cd958b82e5288ca3 SHA512 f800d6c37fe72477908c91457a738a73d2b8085bb5ae303d6d954405d6ccd98833b5da16a12c3ad1ab75d32a68dedc706dfaacc0fcbb95571dd829cdc03a356a
-DIST windows-sys-0.45.0.crate 2568659 BLAKE2B 6f2d634d121a9bf41e2887e277a73f33aee69b04c7fcfc6ff973d21902787997f1e186f530e9226cddc003ffc3f85a179c069c8a8688de459f617df92d33f94f SHA512 f239346c0141b95aa76e0771e2f4e38b9a592f3cd92c6001de353637cd65cd73b94cbf9917a4eaa9b0c0b2e6e2af920b9cf6b3fccb52770df5160254cffc1c47
-DIST windows-targets-0.42.1.crate 5524 BLAKE2B 755cb6184733417763bb650fb0bd84bc757503aacbf0d91b811d42e9e8efda05434bbe5518006a88937a82a2a607605a9b609df4f34eb58674d09564667d95f3 SHA512 940c85f6214aa4da17787d3bbfe8d6107a9a7fe4f2e2fcf2b1634facf4619620ac2a7a835ebdd0f57970c992c459ba0a780e64e89945005b240c92563c42711a
-DIST windows_aarch64_gnullvm-0.42.1.crate 362795 BLAKE2B 722b45789bcd1d973803b327d44072fbf9c904d448e29ae9e56d2f9d1a3e9b64e06883e4bf5ebf141f1e924235858fd1472e07a744cc5b16a0a3a4fc8ec8f6d4 SHA512 51eb9fa7ea441a9fef590c12576a8bbef74932d40fafde8f9e3a28f2734ce5aee6dd5fa478fb3847443241c8c392bb4abbc6014c71260bf924431779f7184f73
-DIST windows_aarch64_msvc-0.42.1.crate 664655 BLAKE2B f4a060b802016a6d77a8ea6ac44c35dfec384acef9c45f932e2b6aca9d3ac48ae031f99e5b58f270d6020b8796e9dd06f7e8ffa7cc5610ea3f69181c2be7adc8 SHA512 f6412bae4b041201ef94e5a159ce90fd6b09816350204d4f573c1afdfb0a6d62d7887fbc2e416b40ec1d4478db521be492edf4703d87482d6d0006a51b827538
-DIST windows_i686_gnu-0.42.1.crate 733428 BLAKE2B c1ca24973aca06b255d9317735cca7a13f7f69293da52dad41df43a5cdf48aac3d40d8b6765cf564905fb71cb548308d757f01167efe7a61da7bd2e2a7080f0a SHA512 61c3271b07df1d4585c875d27cf1686c8f595dcbb79626e8d15ff47228f7b7a4556d3d994566ccceee0d6795a4c76767f85f4579282fc9eed731e04c7e193a57
-DIST windows_i686_msvc-0.42.1.crate 722583 BLAKE2B e03978daa0ac95d7bd9f594b28360dab647a1fe525f0ae4b44e6842d93c5674d9f202e8bbca99a0d30ecf7d138af0c48eec8e69e08bf285db51e32bcf83a2c54 SHA512 8afa4f92cb7bd96d4fdbefbd8e7bcaa37dee52224d5d8b950c5a537d3bb805bf9781097b8bd44d96e8b62b1290e3a3020557502fa3b357a53df6fea36b318932
-DIST windows_x86_64_gnu-0.42.1.crate 697614 BLAKE2B 3cef0a3da3ce142bbdf932dbb54eb6473070c5722c9ec791dc4077efe2d774d51f8b3d06b3321f8f21cc49764f44d54b3432ee7a0d9376925b422b197f5d557e SHA512 f4c16b587fe407dee1f39df029c52302a0fbd5f519816a8d974fe9c2f928043b14037c701c0f3c9cf2e5c765e82430fd4b71615fe63a66a88159f7b15506f892
-DIST windows_x86_64_gnullvm-0.42.1.crate 362788 BLAKE2B fff81e63b86ad04ce22ad3e05ec4cc02c0b791384c93bafb50832f6db9cb7fd9301ad3845339a08dd8cadac1d59f3e8dc9d5f56d7a987989dbfc16b9131af67b SHA512 8cc988b5995a4726bb7518b7fccff528274ad9b2b0160fe247eb240f9ced10db95afe7bff91bfc5a08ebd8237b6821e4a4abad1ff9da45022f1ce7e7586bcf05
-DIST windows_x86_64_msvc-0.42.1.crate 664606 BLAKE2B 6c460cfa392aad0d11add200d652a42ee1a60052570527c4e85405f765255375729d4e26287f5246dcad65fa89ccadea23c5135171b311e6da5027e33149c547 SHA512 a651b1a34f101125f929c1d1f5e933691c7a5c19d0bb0c501fb6812236d2771805428e3bd5e05be7d72715595f5fc9e7978dd7934e5d92e9b78a41c2ece695b2
-EBUILD pendulum-2.1.2-r2.ebuild 1016 BLAKE2B 00f262dcd729c6eb67a9a38a32254df8c3ef3160b0d4f97dafbbd15cf37bb61d1e8d13ec09f4eee30b87281cb3c404b73450e7cec40d8da5167b909c5d458339 SHA512 8ecb0412003f734d3ada27d610a4da348691fee07fe8649e0567a5dece5d7e5e557f10983453958df311ea389425fe071a4adb2c17dc7f8c7230d9fe033e2759
-EBUILD pendulum-3.0.0-r1.ebuild 1927 BLAKE2B 721f269473a39450f454386cd5226ffb9c56d45545d78aae7dbcda1864c52dcca90c80bb5a842dec7a7a25698cd273248db4c40152f92a59b55344b09bfa51ba SHA512 e6056321806516d862c0992dc3d37062028c1268adb3e4f729009cfe1b060943ed434891a6b938561a0fe1a01fe5da195b4f846d238dacde35d7bf302307084a
-MISC metadata.xml 389 BLAKE2B 516d7400e97ab8c53ea341d642ac5d7098232b8bc5e622308a535ca3ae3f34f08893954b820232467bd66da7bed729e10205ac20e75190347ae5aa607b4bd88b SHA512 f5d036a5075eeaedfd073671a10bb2972912760549db758d126273abcb18e68ea057dbad0d3bc7915406ee0e519bf10e6ae1cb15c2f0ecd64303a456440987ca
diff --git a/dev-python/pendulum/files/pendulum-3.0.0-system-tzdata.patch b/dev-python/pendulum/files/pendulum-3.0.0-system-tzdata.patch
deleted file mode 100644
index c99bbb3ca9ea..000000000000
--- a/dev-python/pendulum/files/pendulum-3.0.0-system-tzdata.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0143f10dfcc94f5cba1a83912e055026a0282c19 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 2 Feb 2024 17:48:55 +0100
-Subject: [PATCH] Fix `pendulum.tz.timezones()` to use system tzdata
-
-Fix the `pendulum.tz.available_timezones()` to use
-`available_timezones()` function instead of iterating over the files
-in `tzdata` package.  This is more in line with PEP 615, as the system
-timezone functions will operate on system-provided tzdata when
-available, and use the `tzdata` package only if it's not available.
-Therefore, the previous code would yield a potentially different list
-of timezones than the system actually provides.
-
-Furthermore, Gentoo provides a dummy `tzdata` package that does not
-provide any data, since Python always uses system tzdata.  This change
-is necessary to make pendulum work again on Gentoo.
-
-Fixes #769
----
- src/pendulum/tz/__init__.py | 10 ++--------
- 1 file changed, 2 insertions(+), 8 deletions(-)
-
-diff --git a/src/pendulum/tz/__init__.py b/src/pendulum/tz/__init__.py
-index 36c2c692..8dc64705 100644
---- a/src/pendulum/tz/__init__.py
-+++ b/src/pendulum/tz/__init__.py
-@@ -9,7 +9,7 @@
- from pendulum.tz.timezone import UTC
- from pendulum.tz.timezone import FixedTimezone
- from pendulum.tz.timezone import Timezone
--from pendulum.utils._compat import resources
-+from pendulum.utils._zoneinfo import available_timezones
- 
- 
- PRE_TRANSITION = "pre"
-@@ -22,13 +22,7 @@
- 
- 
- def timezones() -> tuple[str, ...]:
--    global _timezones
--
--    if _timezones is None:
--        with cast(Path, resources.files("tzdata").joinpath("zones")).open() as f:
--            _timezones = tuple(tz.strip() for tz in f.readlines())
--
--    return _timezones
-+    return available_timezones()
- 
- 
- def fixed_timezone(offset: int) -> FixedTimezone:
diff --git a/dev-python/pendulum/metadata.xml b/dev-python/pendulum/metadata.xml
deleted file mode 100644
index 732b97cab77a..000000000000
--- a/dev-python/pendulum/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>jsmolic@gentoo.org</email>
-    <name>Jakov Smolić</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">sdispater/pendulum</remote-id>
-    <remote-id type="pypi">pendulum</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pendulum/pendulum-2.1.2-r2.ebuild b/dev-python/pendulum/pendulum-2.1.2-r2.ebuild
deleted file mode 100644
index c3d9505127c0..000000000000
--- a/dev-python/pendulum/pendulum-2.1.2-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Drop-in replacement for the standard datetime class"
-HOMEPAGE="
-	https://pendulum.eustace.io/
-	https://github.com/sdispater/pendulum/
-	https://pypi.org/project/pendulum/
-"
-SRC_URI="
-	https://github.com/sdispater/pendulum/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"
-
-DEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytzdata[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	test? (
-		dev-python/Babel[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_DESELECT=(
-	# sigh
-	tests/datetime/test_behavior.py::test_proper_dst
-	tests/tz/test_timezone.py::test_dst
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/pendulum/pendulum-3.0.0-r1.ebuild b/dev-python/pendulum/pendulum-3.0.0-r1.ebuild
deleted file mode 100644
index 3b9e83a00602..000000000000
--- a/dev-python/pendulum/pendulum-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=maturin
-PYTHON_COMPAT=( python3_{10..12} )
-
-CRATES="
-	autocfg@1.1.0
-	bitflags@1.3.2
-	cc@1.0.79
-	cfg-if@1.0.0
-	indoc@1.0.9
-	libc@0.2.139
-	libmimalloc-sys@0.1.35
-	lock_api@0.4.9
-	memoffset@0.9.0
-	mimalloc@0.1.39
-	once_cell@1.17.1
-	parking_lot@0.12.1
-	parking_lot_core@0.9.7
-	proc-macro2@1.0.51
-	pyo3-build-config@0.19.1
-	pyo3-ffi@0.19.1
-	pyo3-macros-backend@0.19.1
-	pyo3-macros@0.19.1
-	pyo3@0.19.1
-	python3-dll-a@0.2.9
-	quote@1.0.23
-	redox_syscall@0.2.16
-	scopeguard@1.1.0
-	smallvec@1.10.0
-	syn@1.0.109
-	target-lexicon@0.12.6
-	unicode-ident@1.0.6
-	unindent@0.1.11
-	windows-sys@0.45.0
-	windows-targets@0.42.1
-	windows_aarch64_gnullvm@0.42.1
-	windows_aarch64_msvc@0.42.1
-	windows_i686_gnu@0.42.1
-	windows_i686_msvc@0.42.1
-	windows_x86_64_gnu@0.42.1
-	windows_x86_64_gnullvm@0.42.1
-	windows_x86_64_msvc@0.42.1
-"
-
-inherit cargo distutils-r1
-
-DESCRIPTION="Drop-in replacement for the standard datetime class"
-HOMEPAGE="
-	https://pendulum.eustace.io/
-	https://github.com/sdispater/pendulum/
-	https://pypi.org/project/pendulum/
-"
-SRC_URI="
-	https://github.com/sdispater/pendulum/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016
-"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.6[${PYTHON_USEDEP}]
-	>=dev-python/tzdata-2020.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/time-machine-2.6.0[${PYTHON_USEDEP}]
-	' 'python*')
-"
-BDEPEND="
-	test? (
-		dev-python/Babel[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2022.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/sdispater/pendulum/pull/801
-	"${FILESDIR}/${P}-system-tzdata.patch"
-)
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/pendulum/_pendulum.*.so"
diff --git a/dev-python/pplpy/Manifest b/dev-python/pplpy/Manifest
index 24e67d0fba00..ed05d1802a90 100644
--- a/dev-python/pplpy/Manifest
+++ b/dev-python/pplpy/Manifest
@@ -1,5 +1,5 @@
 DIST pplpy-0.8.10.tar.gz 64203 BLAKE2B b0735722a051ef33b7415528147a84a163ac49bf5d07e2f6599a7bbf004140abf5e6a09b7f0555ac57b55614a1c059bba20cc7ac7fe47a83f429e33d7f0dd1bc SHA512 982d36291cd0108786e47cb1ff73127ba2b2a619edc697e28360a87ace743e7fc6dd04e32aab38d41724d455de4861065f9ac3d409fd2f68114b07f4d1328c23
 DIST pplpy-0.8.9.tar.gz 66017 BLAKE2B 90da3b4c3e992d0ca969925d8142b114fbbfd5214a768f2e56825d8689e2c4aa2e68a3fa45da9df68168a28413153eb189df277157823e88503668be5c26505c SHA512 618a0a1d603e2859313ad4f71b3cc40156a06371c6b8971fdab8275f6676fc19510e3927828c641819399b5ea6646e954738309fbf8c10fba5733c7410ed75fc
-EBUILD pplpy-0.8.10.ebuild 900 BLAKE2B 651366d248ecc7e0f6f137cb3c4eefa7c19a7d25e6771e512ef6f2c047069497c04b050dddede74460ba1904b6734a9b020ae79e1f1a291da16b1803ca4dab05 SHA512 dd0aadd3a10db37c393f11ff1aed5c6dcaf37253d269c107895e56fdfefe85a6e88b16e6e4439105a261507f66cd8e646a68921958dcaca2bdbf404f8fcc2554
+EBUILD pplpy-0.8.10.ebuild 989 BLAKE2B 98cc485d1f06b44c9ec3eeb69ab411cd1b822ec6959af03262588e9b68b389b8549c4a1aca65106524ca72e3bd4d270087f8796be9e16fb8c875bf70d990c279 SHA512 a997c7c3b5d73fe3cf37786341720b40a532f7415032f8f8c5c0ff973ce84944096b865f1d2cc35ad49979044d9e7a429d99a413a6f5c14ef281a801581615cb
 EBUILD pplpy-0.8.9.ebuild 1177 BLAKE2B 003564826013c4f1887663b6a500e8b18d33154358d4b233ae0fa4b861a15eb4372e07c66bec34e57f780c207af78c70d63a36cd879b48d21d7fcf04fccdfe5f SHA512 dbec427c8e82b69cf9939012ef5739b6b9d162ee270ecd692660815bd90e2fdd61ea652398357761a53ee1629329f8459846084fce8027ce54c8775738e86b32
 MISC metadata.xml 759 BLAKE2B 0c4fcc6e475fae1a8565c392dd82261d796b96aad68d614790e07271057b46eec4b4f89fe3be2185bc9793e828568a85df488ce568daf84555638e0516898086 SHA512 773f95dbb5635a1ffcbff57d00e6af93e173945738e67deb79bb4c628abde3793488b889bb96e9a74832d0b8c42e7274edb479c64e726ddde10ef5297be979a7
diff --git a/dev-python/pplpy/pplpy-0.8.10.ebuild b/dev-python/pplpy/pplpy-0.8.10.ebuild
index 377d267f9379..4a82eb78892a 100644
--- a/dev-python/pplpy/pplpy-0.8.10.ebuild
+++ b/dev-python/pplpy/pplpy-0.8.10.ebuild
@@ -35,6 +35,11 @@ BDEPEND="
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 "
 
+python_compile() {
+	# https://bugs.gentoo.org/927770
+	distutils-r1_python_compile -j1
+}
+
 python_compile_all() {
 	rm -r ppl || die
 	use doc && build_sphinx docs/source
diff --git a/dev-python/python-lsp-server/Manifest b/dev-python/python-lsp-server/Manifest
index f305a8730ecd..bf920a2f00e1 100644
--- a/dev-python/python-lsp-server/Manifest
+++ b/dev-python/python-lsp-server/Manifest
@@ -1,5 +1,7 @@
 DIST python-lsp-server-1.10.0.tar.gz 112917 BLAKE2B 2429e136ea2732d3bdfc2c77424a864364a7eb98bd447273d514fa53238b1ec276d46a51e558be8d959f100cd4dcfadf3a3eac996aa49b6b011babea84e8e3a8 SHA512 342452a5e3b1ae448a993f64501b2162b286f009026f1b5d306621c4befd0188699fc682206d50d06a93d8780862c8476186f8d0e4bb20592ddbbade1276445c
 DIST python-lsp-server-1.10.1.tar.gz 113136 BLAKE2B d1e39e3354d5ab67bb465265c6c3514f25ba4857fa3379e502d3c40b456f6d228c63ad759af1832b4d089fb93a03c7f3d6797cea4079b63cdc58e3591e9d783a SHA512 4c8e6a72ef6004248a5cb4a1e4c251b9d487cd4ce39d6c7268ce611c8537d6a5912eeb49d2eb1a25c230934b17e9a624504591c25f0291e07971eeccb70b09ba
+DIST python-lsp-server-1.11.0.tar.gz 113347 BLAKE2B d8417fb63447c5130d88dd6583ef0dc0c724076b22006a59da914a10440e67a4fc2362fd677a45b257fcca804c965920d54ff47568ad607e49f05d13d6d3e1ee SHA512 bd96850b822dc3c2e97d5ee38f25c9f7731dc68b31fedcc2d3e0ff373bc3ad8a989f1a4b85527477bbbc875e853d5513d8583bc3cdc22a3c0545716e68382093
 EBUILD python-lsp-server-1.10.0.ebuild 3318 BLAKE2B 8758c248906254e9052d73d5531be9a82c141b72406823a6d139d9e1bcf8ed93cce0d78bf37b30e1ac5303ed6a0df0ea36ad63df9bd8d2bba27dab0d1ebb66f4 SHA512 b77ceabf24bbc79cf99279cca6b7f6779ad3357359ae4fac2ef266cef303e057eaa5819376f0d9080365f04ebc8ad2643ea6d7edade017a5f7fa4678b9095e2f
 EBUILD python-lsp-server-1.10.1.ebuild 3321 BLAKE2B 1753b371ed7e385643f42e67450991d64ebaf0cefbcd62a9d4a55f5b9bccf5265071b2410ff509ce7d73280a20b3f546b6a23cf63b44e676a321330cedd8d29b SHA512 403c9d7dbd863e6ee0ff80877550b6152f5a437c454e9767ea00f93ade74c7b858379f49a60c89cb7cd2dd37685a812319a571947207f2804ccd5b965940c38c
+EBUILD python-lsp-server-1.11.0.ebuild 3012 BLAKE2B 1b4b9708f307649a9b0b5e167a5b2989837d1d3fb386f84fbec46548c6361d07202b2b33bf6aa9ee4cba4f5a4d0f2fd2db4e81e29e6f711918d1f2e6fc14a3ba SHA512 62b35a47be61898f4c4d46bde6855c107eb4ead174c473a81df49b1c1033c26386ff60f91092f7ebb46a16f11620f66eba69e925785ef780749e44c1ec76b9b9
 MISC metadata.xml 610 BLAKE2B e111007adc2612409df72955babe0c4725fd5726449435988cf13c1142049d78089d38e54783712e2c70c74437157ffb2049bd9d63322cec084204eb5038e724 SHA512 5e1e4b43a5bfacb6a2fcae57413ebf79c6aed917b00022140d855acd773d82e56b2d73ae8270d42675a34d9f37f9ad53c8f61930c3f447d8a9e45a521a20e9bb
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.11.0.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.11.0.ebuild
new file mode 100644
index 000000000000..6fc4eb44863c
--- /dev/null
+++ b/dev-python/python-lsp-server/python-lsp-server-1.11.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-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=( python3_{10..12} )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="Python Language Server for the Language Server Protocol"
+HOMEPAGE="
+	https://github.com/python-lsp/python-lsp-server/
+	https://pypi.org/project/python-lsp-server/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="all-plugins"
+
+RDEPEND="
+	dev-python/docstring-to-markdown[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
+	>=dev-python/python-lsp-jsonrpc-1.1.0[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	all-plugins? (
+		>=dev-python/autopep8-2.0.4[${PYTHON_USEDEP}]
+		>=dev-python/flake8-7[${PYTHON_USEDEP}]
+		>=dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pycodestyle-2.11.0[${PYTHON_USEDEP}]
+		>=dev-python/pyflakes-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pylint-3.1[${PYTHON_USEDEP}]
+		>=dev-python/whatthepatch-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/yapf-0.33.0[${PYTHON_USEDEP}]
+		>=dev-python/rope-1.11.0[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		>=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/flake8-5.0.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		>=dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
+		>=dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/whatthepatch-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/yapf-0.33.0[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
+		>=dev-python/rope-1.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+# Note: xdist breaks some tests
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dep
+	sed -i -e '/addopts =/d' pyproject.toml || die
+	# unpin all the deps
+	sed -i -e 's:,<[0-9.]*::' pyproject.toml || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# broken by presence of pathlib2
+		'test/plugins/test_autoimport.py'
+	)
+	local EPYTEST_IGNORE=(
+		# pydocstyle is archived upstream and broken with py3.12
+		test/plugins/test_pydocstyle_lint.py
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
+
+pkg_postinst() {
+	optfeature "Automatically format Python code to conform to the PEP 8 style guide" dev-python/autopep8
+	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
+	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
+	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
+	optfeature "Python docstring style checker" dev-python/pydocstyle
+	optfeature "Passive checker for Python programs" dev-python/pyflakes
+	optfeature "Python code static checker" dev-python/pylint
+	optfeature "Python refactoring library" dev-python/rope
+	optfeature "A formatter for Python files" dev-python/yapf
+}
diff --git a/dev-python/respx/Manifest b/dev-python/respx/Manifest
new file mode 100644
index 000000000000..00f41cb05d63
--- /dev/null
+++ b/dev-python/respx/Manifest
@@ -0,0 +1,3 @@
+DIST respx-0.21.1.gh.tar.gz 432341 BLAKE2B b375e8bc9370e13855197487e1e8139cf3fede0f03d7ad034ef2c78bce5ad95d3cb8cc7440c2566d188a98a52d0068c13288c7d4ec802e04d2f269a64e1ce326 SHA512 156f34f4635012230b68812f24978136f37f96dc0cf0ea9e80ed2d6a3e0639eb7591ed34933f75d5cda32993852aa034b22389af0fed341ab4ad1002482f2e9c
+EBUILD respx-0.21.1.ebuild 869 BLAKE2B d1f8742231293c814f2bfc209aaf573c9b945533d07f23cb9ea5ea10b9c545598502b9f73c83fe1a18148750c5bbf0e81e7234c547b88b388047e27c5db5f9a8 SHA512 6a2cf2c5a10eb68858f11c6895b3ea711aa4d377e602d2215adf99bf523b4df12c40b0415f8cc30193fb2ffd67ea05bf600afd7759723a76605a95905bce5070
+MISC metadata.xml 610 BLAKE2B 3e77efa934fcb00a190e062741e0233a1c9f99619c612efa02e797f133661523b408fec5bda914a6180808370faec6e8928c2c77aa71ed9d4124b8933f7a62e8 SHA512 9fdc4f2a5f0fd9e6095123729fc030ed2baeafd975094a0fc24baae33dcddc08cd59f8ece99196a0fb64a2cad4bbf898a4817a0126d08e3d2b5309fc13d9ca7e
diff --git a/dev-python/flask-gravatar/metadata.xml b/dev-python/respx/metadata.xml
index b0c16af1df81..75a5ff3e72ad 100644
--- a/dev-python/flask-gravatar/metadata.xml
+++ b/dev-python/respx/metadata.xml
@@ -3,15 +3,18 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
-		<name>Python</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>titanofold@gentoo.org</email>
-		<name>Aaron W. Swenson</name>
+		<email>parona@protonmail.com</email>
+		<name>Alfred Wingate</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="pypi">Flask-Gravatar</remote-id>
-		<remote-id type="github">zzzsochi/Flask-Gravatar</remote-id>
+		<remote-id type="pypi">respx</remote-id>
+		<remote-id type="github">lundberg/respx</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/respx/respx-0.21.1.ebuild b/dev-python/respx/respx-0.21.1.ebuild
new file mode 100644
index 000000000000..398d107c282b
--- /dev/null
+++ b/dev-python/respx/respx-0.21.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mock HTTPX with awesome request patterns and response side effects"
+HOMEPAGE="
+	https://lundberg.github.io/respx/
+	https://pypi.org/project/respx/
+	https://github.com/lundberg/respx/
+"
+# no tests in pypi sdist
+SRC_URI="
+	https://github.com/lundberg/respx/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/httpx[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/httpcore[${PYTHON_USEDEP}]
+		dev-python/starlette[${PYTHON_USEDEP}]
+		dev-python/trio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -p 'no:*' -o addopts=
+}
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 4ef813dfff07..348e9eb0927e 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,3 +1,4 @@
+DIST sip-6.8.3.gh.tar.gz 585528 BLAKE2B 2a58edba0f7ca9da02399df9fe71f152ef8446c38886ca2a21c00ef3ac65e0a82493a6047120d6f786e5b26f974c9cac24a329f1a52d9c47f9669afe2f0789b4 SHA512 6ff5fa59a55d71a3303553d2c53879fc9ccc01b9db34da149a7b81e252613327c7390c5a2edeaec03381dbc36ed38aa4ce44d69560c277ecc3875a57e7d75a60
 DIST sip-6.8.3.tar.gz 987656 BLAKE2B 57cc4010aae64eec7e0f338d9653463c7381b639aa8efca978a3f3296550a37b3a09b52933a2c2cd354a65155841952d7ca045b0b774945a382c29a8d597951e SHA512 8a0ff1c16ead4c2b1c53963a015fb3d149362f649eeec2523e6b243945493f28f5ecf29aabbf5cee5f7909ded40d64a1f469d2d0c1b3c33244e6213ab23ec733
-EBUILD sip-6.8.3.ebuild 674 BLAKE2B 188f59f1a812580f85a74613c5fda7ea54915c1aab5317a841399cacaebf87d3b4be1cb79d5dbab33ff83aa2792662fa9cec6774b97c4805864ef72d6d1c83f5 SHA512 8dd8b713f1dcca84bdb026bd4e03c3dfa1252010c6b913962b4081bd8e615f984c7590336395660c89a61465acdf4ed7338f4bbc0a1ccdd95d3acbe117f97902
+EBUILD sip-6.8.3.ebuild 855 BLAKE2B 1dac6859a559eec6a4e0aa7fc4f28b3fad45cb571a3fad1ba0309f1dabb8c13644c28ebe50df56e5a62fc8f5ecbe28d5d0035bae5fe0d0d8ca59c0c1fee3215a SHA512 97e7ed802158ae3444d06d512a0910303ed92d8bad85342ba89272c14cf245cc0082e84a32a57aefdd567e4ccac752be221b223983a786a7a2ff31794918bf33
 MISC metadata.xml 524 BLAKE2B 57657d01dc5be425f66f1136356fa028a32ad6a2ca79cadf4b9ed6a940b414b0e3efa161895d1858ab3d4977241883f9dfefbe37a8cbaad10589d57f598856a1 SHA512 82208b61b297d8c2110ea47a82c046118afd9332c52fa6590f7ed11b4e70af8b75f087b006fa5ed9058dbd2f98f02104559e085f781f2fc887396b7ff9d1b859
diff --git a/dev-python/sip/sip-6.8.3.ebuild b/dev-python/sip/sip-6.8.3.ebuild
index aaed5118beb9..5f9ffe71e07e 100644
--- a/dev-python/sip/sip-6.8.3.ebuild
+++ b/dev-python/sip/sip-6.8.3.ebuild
@@ -5,13 +5,16 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{10..12} )
-
 inherit distutils-r1 pypi
 
 DESCRIPTION="Python bindings generator for C/C++ libraries"
-HOMEPAGE="
-	https://github.com/Python-SIP/sip/
-	https://pypi.org/project/sip/
+HOMEPAGE="https://github.com/Python-SIP/sip/"
+# gh does not include a way to generate some files, so combine with pypi
+SRC_URI+="
+	test? (
+		https://github.com/Python-SIP/sip/archive/refs/tags/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	)
 "
 
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
@@ -25,3 +28,4 @@ RDEPEND="
 "
 
 distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
diff --git a/dev-python/tempest/Manifest b/dev-python/tempest/Manifest
index 06f00513d59c..745e1e9c8487 100644
--- a/dev-python/tempest/Manifest
+++ b/dev-python/tempest/Manifest
@@ -1,3 +1,5 @@
 DIST tempest-37.0.0.tar.gz 1146330 BLAKE2B 51acf1e0e8ce3a95d54e7b916100c32cee34f9546166fd43883f9bd5c4d4aad7d846b17c4c805392b64b9a0a02fea903c59b799f14d7e459d337eeb11c62cb6a SHA512 1de0e26c86a59c0e3f3dc494d4fdb4d3ca5ab215c1d52b34b4618e9c939ecd59b29c09bccb31bed7911517edce4cae4f9acbd2d1e28be75b0305850230528c67
+DIST tempest-38.0.0.tar.gz 1148398 BLAKE2B 2905b24ebad4b5e5c83575f0d51de7eae23567dc508367a1c7a40eccbde33990152f7eebe6b7af7b9a1379b72178684b2dbf1e6d87b848b85c06ace98c8f4116 SHA512 d3a57b73e58b4898abc57e004da4a7d7e544612c498d03d4b8b2e88b36f5a160c2e74e6fea0ebd022f86dc6eb963125c45df8b932e7e012210a36e9318b548cd
 EBUILD tempest-37.0.0.ebuild 2158 BLAKE2B b7c10b1cce5f0f665bf16bf338d6ff0e1c7fdddb13a477a23b76539903fb70cacd03233a38f9bf295fae473d1df91661aa1758f39d681e0ea139a93fdf0c71af SHA512 e1e9cea83bfcc02588119d25cda7995e65b9d4f5d3af37031b112da6f1d00b77e4441b9c820f35a1ef674c5bd5e719f038c46ef439dd2a8c05c0842c908357d0
+EBUILD tempest-38.0.0.ebuild 2161 BLAKE2B 71369c13ecf600033f40a588afc14a0fd854b9be5b2647e9e54126756595a1cd4fdb596800193be5138fcb0f0673fd02232cd90a752debb4283d52bdb4c09177 SHA512 00d8febef75cbd09b421b2c3262897ce92ebcca58cd06f4b8422cef59fa3a257c0204779f73fac604804fe9cf2d4eec005e7dbc52e23e520d8a15f92c756d9d7
 MISC metadata.xml 442 BLAKE2B 30b474d10a59f53672390e029ffaf894cfe52862af42814ca09500372d4c94afc596177100b9ba69cfd12965e98809de363527d9db345c3b4cf499eaab0375f9 SHA512 d84466ecac31486c92a6c5f87089616b65a1f3cbe9447c3382021af57bec3964a80d4d4421783560528e80e70afb4f4ba604bf2a4e23ac7fcbd873ef3d789859
diff --git a/dev-python/tempest/tempest-38.0.0.ebuild b/dev-python/tempest/tempest-38.0.0.ebuild
new file mode 100644
index 000000000000..6821a436d77d
--- /dev/null
+++ b/dev-python/tempest/tempest-38.0.0.ebuild
@@ -0,0 +1,74 @@
+# 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 multiprocessing pypi
+
+DESCRIPTION="OpenStack Integration Testing"
+HOMEPAGE="
+	https://pypi.org/project/tempest/
+	https://docs.openstack.org/tempest/latest/
+	https://launchpad.net/tempest/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
+	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.16.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		dev-python/stestr[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	# Small subset of tests, which fail as result of not using specific
+	# testing environment.
+	rm -r tempest/tests/lib/services/volume/v3/ || die
+
+	# remove dep on hacking
+	rm tempest/tests/test_hacking.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	mv "${BUILD_DIR}"/install/{usr/,}etc || die
+}
+
+python_test() {
+	local -x OS_LOG_CAPTURE=1 OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1
+	local -x OS_TEST_TIMEOUT=300
+	stestr --test-path ./tempest/tests run --concurrency="$(makeopts_jobs)" ||
+		die "Tests failed for ${EPYTHON}"
+}
diff --git a/dev-texlive/Manifest.gz b/dev-texlive/Manifest.gz
index 78de691d8d99..319f054034eb 100644
--- a/dev-texlive/Manifest.gz
+++ b/dev-texlive/Manifest.gz
diff --git a/dev-texlive/texlive-context/Manifest b/dev-texlive/texlive-context/Manifest
index 3dfb41babff2..26b14ab4877f 100644
--- a/dev-texlive/texlive-context/Manifest
+++ b/dev-texlive/texlive-context/Manifest
@@ -117,5 +117,5 @@ DIST tl-jmn-2021.tar.xz 40048 BLAKE2B e3f6d9bff7a3a5d438a688baf76c0bdd58797461c0
 DIST tl-npp-for-context-2021.tar.xz 664 BLAKE2B 5882669c85f04553ad8d5f1722f4f27b967367cfb109ef782a90b3fc1fe42c8a898129f296e61e6ab3825447e798544109e1556533aeecad01137396058649ac SHA512 6d5da8b6e2f2bb6b514d43e8b72157a81285b6c15cbe74891a94f21a09a313813ebcf9e3a0a12847875f13d5599436ada4e5febb694c0a480931dd62a23035c6
 DIST tl-npp-for-context.doc-2021.tar.xz 2136232 BLAKE2B 241dd233f3faec33222496aca1c6a9823772af68b2daff4256f532e2f5a28634bf0ded0c733524a053b6b985472009409fd99ac0daff719f8c54f9b181f632da SHA512 b3bddb0b9254ef9755628097ccb24ccbe86c25d3cba7a120c5d55da98a19061b716df1590a39323f57a8a698c5aafb5ecbe8b27d6505f2ba4acdf1ccdbcf82cd
 EBUILD texlive-context-2021.ebuild 3328 BLAKE2B 6e1bd326b502190278ce66a3fe5e6716d86e667baeb17ca72811b101f2891a57036707b03d9231905e3ec13587c30092c6c4df0c3b6a90ae5739da07441b4000 SHA512 ad0b3a2694e3deffd9555e987d261c5981304937c2a17463918a28b43093884f5db7eb2472a82fa39370e93b98ecd137cc87c0827362491a0243bdfdfae1ee37
-EBUILD texlive-context-2023_p69108.ebuild 2231 BLAKE2B ab0d1b84b95f56a235d98c902c262538586f2f25f202fe791f35122a6f44c2b8e87c34f2f60989dbeda5adbc50cca46bbef7464138f1495e684e30d915fc9191 SHA512 baee385c8669dcceeec00de6663fb751be632637e58270d889ba9c0b71e1799204df7e2c38d0c7c8bae50e232f437720fe5e028943d4cf6b7e78f5b2ccf365fb
-MISC metadata.xml 518 BLAKE2B 4f1bb46596517c4ca589b5b42971521d7b32cb555a913db2739abe92e4eb4cf84ce1070f641105854ac4f82a6d9d40d07a4e76f1f8e79536ecaeeb38c4ca662f SHA512 1ca4088892a62994ed83929c8ba701a732dc46104d253469a4a6a98e183262ce010d2e7402fe181126c2b956690479e7b3f673cbb967c04cb86c15287636d58d
+EBUILD texlive-context-2023_p69108-r1.ebuild 2286 BLAKE2B 87fbdb21b7c73968f8b259e1320c7b82f344c082c995936000853fcf8d13a55268b5bb9a3dd89ef8a791fdf7fed82abebdff11628b1cc57f509ff115954af224 SHA512 f21014739e9bebe3e726c14e4d54da3122bb881601a62462bdd6bbde32a37eaf1ab6d4ea8dfeb1438655c9bfb99e403257b50835ccede3126716e6658f46c8a9
+MISC metadata.xml 640 BLAKE2B df6206d129c39035f5a95f4e91613a5d1f87fa050e2f9b24836f0e540c9a7eae3e0448f98d4c5e2557f725a1797f6ba10053244ab61909e7e3ef8d362b6de486 SHA512 012bc4d22e234c3b666765b7d6430922350129d82fcc2b6ded7a24588d099ec74867304b8b4a5eb92b438dcdc6072a2900762c3cafa9075018426e57e1a5f8cc
diff --git a/dev-texlive/texlive-context/metadata.xml b/dev-texlive/texlive-context/metadata.xml
index a91e8498da9f..631cd7535765 100644
--- a/dev-texlive/texlive-context/metadata.xml
+++ b/dev-texlive/texlive-context/metadata.xml
@@ -13,4 +13,7 @@
 		Hans Hagen's powerful ConTeXt system, http://pragma-ade.com.
 		Also includes third-party ConTeXt packages.
 	</longdescription>
+	<use>
+		<flag name="luajittex">Add support for LuaJitTeX: LuaTeX based on LuaJIT which is usually faster.</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-context/texlive-context-2023_p69108.ebuild b/dev-texlive/texlive-context/texlive-context-2023_p69108-r1.ebuild
index 763d3d6a8d0e..2619f7d82809 100644
--- a/dev-texlive/texlive-context/texlive-context-2023_p69108.ebuild
+++ b/dev-texlive/texlive-context/texlive-context-2023_p69108-r1.ebuild
@@ -53,6 +53,8 @@ TEXLIVE_MODULE_SRC_CONTENTS="
 	context-visualcounter.source.r47085
 "
 
+TEXLIVE_MODULE_OPTIONAL_ENGINE="luajittex"
+
 inherit texlive-module
 
 DESCRIPTION="TeXLive ConTeXt and packages"
@@ -69,7 +71,7 @@ RDEPEND="
 "
 DEPEND="
 	${COMMON_DEPEND}
-	>=app-text/texlive-core-2023[xetex]
+	>=app-text/texlive-core-2023[xetex,luajittex?]
 "
 
 src_prepare() {
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 2cb1bca2c6b3..f6c4c1b3f48f 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/build2/Manifest b/dev-util/build2/Manifest
deleted file mode 100644
index 3ccb6a757357..000000000000
--- a/dev-util/build2/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch 912 BLAKE2B e3e90530c8593be5a6853542299081d795c0ae1719d68fb9c68e1bb7007aa6e43c7311721be5fb7886c5e67f3151a4fa0dbb244a6ee1916f17d6f29f5ce7990c SHA512 262feeffe5cbe9dade81d903c4d07bd1526f7942e42febdf84017d8190d4abcae0e39a8a1799db63018cb62dab0cb9c94f1a8de330aef96549a242f6da54a4cf
-AUX build2-0.13.0_alpha0_pre20200710-nousrlocal.patch 1931 BLAKE2B 5faca35d7501cd0348910719286bcab2736cd94166db626bd77a62b90512ed6d99fbc2548a6ff30b0f5badecdcaa67a462a6ff11f51af8f9b9faba24fd8edefd SHA512 f57de10af06aa138a7c153e56d35b173a4804324557611baabb38ac00cfde0c8db2b59b57d5ad23a3f76877168745f1d40be1b7527241b47a163df4cc5879967
-AUX build2-0.14.0-update-for-install.patch 508 BLAKE2B 71de52e22fe72ced3368fec8badaa82bd3665706142ba99b602bb5a18203f858b0d8ff4a27cf7041deb5a11f16f544006af04583188ca587a0e8c6b5ffea1851 SHA512 a4fc266ee6904a92bacb83080d19a71f178fb92e38957fe29fe35220f64d1bac5a78306d35b0dfa7086580de597c601a1679f03375590ce76b4fcb52aa435ac9
-DIST build2-toolchain-0.13.0.tar.xz 4218940 BLAKE2B ed27290df21e5db843325b3e42c43c6934ce8f2b9b157538b921f9cfe3a7dccc3b56e261053373553cbd7fbff39e912ffe2282f812d0e6f158749ed5748d5e33 SHA512 0485872acd40beb700739b2995f76efcc9811dd52a38ee049576e45fcb5a7d7ae9c718beca8aeab9ab3f1c5e0270d3946f2335f88ec19476577c195417c2dbd4
-DIST build2-toolchain-0.14.0.tar.xz 4687616 BLAKE2B 98b2ec93c18027cbb3294650b3ad5d3dc97c1f06a6580437eac2db0297d3517cf327179f3a7c6efc611bffed5d028a034382d408ca58a976311d50a26534323c SHA512 d238a4ddfce8506b51b3b775738e818e7e0b36961a09ae0912c0c8688057b8393afebd4c0a28c6e6827c2e72ad5b82bc5e1231f798a66c2bb86b2b1e4ece73ef
-DIST build2-toolchain-0.16.0.tar.xz 5545392 BLAKE2B daefa8745cd342b0de7d74c3b66e3811b95fec9b8c14b29b1fd030d796a31586e0ef401b296cdae5a2d27cf9c337092b707e5fb0673356edff35800bb4be5004 SHA512 f926f3be07287ae8d0ff44e04fdee8c80982db2fa9e33012afb3fe21ee6973d771a3df33a7b976cc714c905d443020501dc96ea3546c76600760c3574e6ae625
-EBUILD build2-0.13.0.ebuild 3396 BLAKE2B 2d16b9376910721e4af95c6166e535f059312c7abab5d66e43a2db22288039b3fe346409e5aa7ebbd06a062c7573da88406ac054ae049bb6829f54fdb4f04637 SHA512 9eddaf2a6ba49bc24039b1c2ecae8141f49653418357a8b968bd0baa29d21704b6a73b92028e7dc9a62ab907d4c235f8ac316a73d5d6dbca7439ef9e96c252dc
-EBUILD build2-0.14.0.ebuild 4141 BLAKE2B 068e3004941fcff986a2bfa41c23c572cce402ffb4b9d450f94a852089f01f93095dbf3dfb717b8b4f0fe278ae625d356173b8efd0f348f6ef81407096bb04f7 SHA512 5a446d755e7a8cb572246d94a8472151d5e239ba4a8a153f55eb9b99a1c91dfc2c562c4be99cb7cdd781d28e24d9f7a2238584cf263d6679fe616c9e227ce1ce
-EBUILD build2-0.16.0.ebuild 4129 BLAKE2B e5a6353ae7cadf74d5ea04bc77aa366068781603116d5a60990c8ec9d432342bcaa85686d47275624a2878d9078df9765ad4b0b9244b66ee5e3c7cc8b4787302 SHA512 43623d2fd28624baf60427bb04b00cf3f97d07c22f8d4f30a34a1bf4b200c43a8a232ff6d8d29bd1c028f9d5df5812b08a472f53e201ff0d7600cf8a56eda56b
-MISC metadata.xml 1017 BLAKE2B 98dd17cc6c43e98da737a735622a060d39d6d97d4ef7f923ca5d51cba94b1fba6ec5f030922ce022c8a884a0b0c4f7b614c2deed9dc6a1cde0cbacb745b225a0 SHA512 1d8cb4f1e27ece47fcb10dbffa4b2888dda5700c5418539506437ee2cb1aaf136969ea231675f991d8de80e0bc8a3e020307e0ba4d1164278d0a776d1fbe8276
diff --git a/dev-util/build2/build2-0.13.0.ebuild b/dev-util/build2/build2-0.13.0.ebuild
deleted file mode 100644
index be9a2ab78a0a..000000000000
--- a/dev-util/build2/build2-0.13.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=build2-toolchain
-MY_P="${MY_PN}-${PV}"
-
-inherit toolchain-funcs multiprocessing
-SRC_URI="https://download.build2.org/${PV}/${MY_P}.tar.xz"
-KEYWORDS="~amd64 ~x86"
-DESCRIPTION="cross-platform toolchain for building and packaging C++ code"
-HOMEPAGE="https://build2.org"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~dev-cpp/libodb-2.5.0_beta19
-	~dev-cpp/libodb-sqlite-2.5.0_beta19
-	dev-db/sqlite:3
-"
-BDEPEND="virtual/pkgconfig"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.13.0_alpha0_pre20200710-nousrlocal.patch
-	"${FILESDIR}"/${PN}-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-b() {
-	local myargs=(
-		--jobs $(makeopts_jobs)
-		--verbose 3
-	)
-	export LD_LIBRARY_PATH="${S}/libbutl/libbutl:${S}/build2/libbuild2:${S}/build2/libbuild2/bash:${S}/build2/libbuild2/in:${S}/build2/libbuild2/bin:${S}/build2/libbuild2/c:${S}/build2/libbuild2/cc:${S}/build2/libbuild2/cxx:${S}/build2/libbuild2/version:${S}/libpkgconf/libpkgconf:${LD_LIBRARY_PATH}"
-	set -- "${S}"/build2/build2/b-boot "${@}" "${myargs[@]}"
-	echo "${@}"
-	"${@}" || die "${@} failed"
-}
-
-src_prepare() {
-	printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-		"-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 --libs)" \
-		"$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \
-		libodb-sqlite/buildfile \
-		|| die
-	sed \
-		-e 's:libsqlite3[/]\?::' \
-		-i buildfile build/bootstrap.build \
-		|| die
-
-	for i in build2/build2/buildfile build2/libbuild2/buildfile; do
-		printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-			   "$($(tc-getPKG_CONFIG) libodb --libs)" \
-			   "$($(tc-getPKG_CONFIG) libodb --cflags)" >> \
-			   "${i}" \
-			|| die
-		printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-			   "$($(tc-getPKG_CONFIG) libodb-sqlite --libs)" \
-			   "$($(tc-getPKG_CONFIG) libodb-sqlite --cflags)" >> \
-			   "${i}" \
-			|| die
-	done
-	sed \
-		-e 's:libodb[/]\?::' \
-		-e 's:libodb-sqlite[/]\?::' \
-		-i buildfile build/bootstrap.build \
-		|| die
-
-	if has_version dev-util/pkgconf; then
-		for i in build2/build2/buildfile build2/libbuild2/buildfile; do
-			printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-				"$($(tc-getPKG_CONFIG) libpkgconf --libs)" \
-				"$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> \
-				"${i}" \
-				|| die
-		done
-		sed \
-			-e 's:libpkgconf[/]\?::' \
-			-i buildfile build/bootstrap.build \
-			|| die
-	fi
-
-	default
-}
-
-src_configure() {
-	emake -C build2 -f bootstrap.gmake \
-		CXX=$(tc-getCXX) \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-
-	b configure \
-		config.cxx="$(tc-getCXX)" \
-		config.cxx.coptions="${CXXFLAGS}" \
-		config.cxx.loptions="${LDFLAGS}" \
-		config.c="$(tc-getCC)" \
-		config.cc.coptions="${CFLAGS}" \
-		config.cc.loptions="${LDFLAGS}" \
-		config.bin.ar="$(tc-getAR)" \
-		config.bin.ranlib="$(tc-getRANLIB)" \
-		config.bin.lib=shared \
-		config.install.root="${EPREFIX}"/usr \
-		config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
-		config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_compile() {
-	b update-for-install
-	use test && b update-for-test
-}
-
-src_test() {
-	b test
-}
-
-src_install() {
-	b install \
-		config.install.chroot="${D}"
-	mkdir -p "${ED}"/usr/share/doc/${PF}/html || die
-	mv -f "${ED}"/usr/share/doc/${PF}/*.xhtml "${ED}"/usr/share/doc/${PF}/html || die
-}
diff --git a/dev-util/build2/build2-0.14.0.ebuild b/dev-util/build2/build2-0.14.0.ebuild
deleted file mode 100644
index 7382fef53347..000000000000
--- a/dev-util/build2/build2-0.14.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=build2-toolchain
-MY_P="${MY_PN}-${PV}"
-
-inherit toolchain-funcs multiprocessing
-SRC_URI="https://download.build2.org/${PV}/${MY_P}.tar.xz"
-KEYWORDS="~amd64 ~x86"
-DESCRIPTION="cross-platform toolchain for building and packaging C++ code"
-HOMEPAGE="https://build2.org"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~dev-cpp/libodb-2.5.0_beta21
-	~dev-cpp/libodb-sqlite-2.5.0_beta21
-	dev-db/sqlite:3
-"
-BDEPEND="virtual/pkgconfig"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.13.0_alpha0_pre20200710-nousrlocal.patch
-	"${FILESDIR}"/${PN}-0.14.0-update-for-install.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-b() {
-	local myargs=(
-		--jobs $(makeopts_jobs)
-		--verbose 3
-	)
-	export LD_LIBRARY_PATH="${S}/libbutl/libbutl:${S}/build2/libbuild2:${S}/build2/libbuild2/bash:${S}/build2/libbuild2/in:${S}/build2/libbuild2/bin:${S}/build2/libbuild2/c:${S}/build2/libbuild2/cc:${S}/build2/libbuild2/cxx:${S}/build2/libbuild2/version:${S}/libpkgconf/libpkgconf:${LD_LIBRARY_PATH}"
-	set -- "${S}"/build2/build2/b-boot "${@}" "${myargs[@]}"
-	echo "${@}"
-	"${@}" || die "${@} failed"
-}
-
-src_prepare() {
-	printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-		"-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 --libs)" \
-		"$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \
-		libodb-sqlite/buildfile \
-		|| die
-	sed \
-		-e 's:libsqlite3[/]\?::' \
-		-i buildfile build/bootstrap.build \
-		|| die
-
-	for i in build2/build2/buildfile build2/libbuild2/buildfile; do
-		printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-			   "$($(tc-getPKG_CONFIG) libodb --libs)" \
-			   "$($(tc-getPKG_CONFIG) libodb --cflags)" >> \
-			   "${i}" \
-			|| die
-		printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-			   "$($(tc-getPKG_CONFIG) libodb-sqlite --libs)" \
-			   "$($(tc-getPKG_CONFIG) libodb-sqlite --cflags)" >> \
-			   "${i}" \
-			|| die
-	done
-	sed \
-		-e 's:libodb[/]\?::' \
-		-e 's:libodb-sqlite[/]\?::' \
-		-i buildfile build/bootstrap.build \
-		|| die
-
-	if has_version dev-util/pkgconf; then
-		for i in build2/build2/buildfile build2/libbuild2/buildfile; do
-			printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-				"$($(tc-getPKG_CONFIG) libpkgconf --libs)" \
-				"$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> \
-				"${i}" \
-				|| die
-		done
-		sed \
-			-e 's:libpkgconf[/]\?::' \
-			-i buildfile build/bootstrap.build \
-			|| die
-	fi
-
-	default
-}
-
-src_configure() {
-	emake -C build2 -f bootstrap.gmake \
-		CXX=$(tc-getCXX) \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-
-	b configure \
-		config.cxx="$(tc-getCXX)" \
-		config.cxx.coptions="${CXXFLAGS}" \
-		config.cxx.loptions="${LDFLAGS}" \
-		config.c="$(tc-getCC)" \
-		config.cc.coptions="${CFLAGS}" \
-		config.cc.loptions="${LDFLAGS}" \
-		config.bin.ar="$(tc-getAR)" \
-		config.bin.ranlib="$(tc-getRANLIB)" \
-		config.bin.lib=shared \
-		config.install.root="${EPREFIX}"/usr \
-		config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
-		config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_compile() {
-	b update-for-install
-	use test && b update-for-test
-}
-
-src_test() {
-	b test
-}
-
-src_install() {
-	b install: build2/ bpkg/ bdep/ libbuild2-kconfig/ \
-		config.install.chroot="${D}"
-	rm -rf "${ED}"/usr/include/odb \
-	   "${ED}"/usr/include/pkgconf/libpkgconf \
-		|| die
-	rm -f "${ED}"/usr/include/sqlite3.h \
-	   "${ED}"/usr/include/sqlite3ext.h \
-	   "${ED}"/usr/$(get_libdir)/libodb.so \
-	   "${ED}"/usr/$(get_libdir)/libodb-*.so \
-	   "${ED}"/usr/$(get_libdir)/libodb-sqlite.so \
-	   "${ED}"/usr/$(get_libdir)/libodb-sqlite-*.so \
-	   "${ED}"/usr/$(get_libdir)/libpkgconf.so \
-	   "${ED}"/usr/$(get_libdir)/libsqlite3.so \
-	   "${ED}"/usr/$(get_libdir)/pkgconfig/libodb-sqlite.pc \
-	   "${ED}"/usr/$(get_libdir)/pkgconfig/libodb.shared.pc \
-	   "${ED}"/usr/$(get_libdir)/pkgconfig/libodb-sqlite.shared.pc \
-	   "${ED}"/usr/$(get_libdir)/pkgconfig/libpkgconf.pc \
-	   "${ED}"/usr/$(get_libdir)/pkgconfig/libodb.pc \
-	   || die
-	mkdir -p "${ED}"/usr/share/doc/${PF}/html || die
-	mv -f "${ED}"/usr/share/doc/${PF}/*.xhtml "${ED}"/usr/share/doc/${PF}/html || die
-}
diff --git a/dev-util/build2/build2-0.16.0.ebuild b/dev-util/build2/build2-0.16.0.ebuild
deleted file mode 100644
index e823b9f35655..000000000000
--- a/dev-util/build2/build2-0.16.0.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=build2-toolchain
-MY_P="${MY_PN}-${PV}"
-
-inherit toolchain-funcs multiprocessing
-
-DESCRIPTION="Cross-platform toolchain for building and packaging C++ code"
-HOMEPAGE="https://build2.org"
-SRC_URI="https://download.build2.org/${PV}/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~dev-cpp/libodb-2.5.0_beta25
-	~dev-cpp/libodb-sqlite-2.5.0_beta25
-	dev-db/sqlite:3
-"
-BDEPEND="virtual/pkgconfig"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.14.0-update-for-install.patch
-)
-
-b() {
-	local myargs=(
-		--jobs $(makeopts_jobs)
-		--verbose 3
-	)
-	export LD_LIBRARY_PATH="${S}/libbutl/libbutl:${S}/build2/libbuild2:${S}/build2/libbuild2/bash:${S}/build2/libbuild2/in:${S}/build2/libbuild2/bin:${S}/build2/libbuild2/c:${S}/build2/libbuild2/cc:${S}/build2/libbuild2/cxx:${S}/build2/libbuild2/version:${S}/libpkgconf/libpkgconf:${LD_LIBRARY_PATH}"
-	set -- "${S}"/build2/build2/b-boot "${@}" "${myargs[@]}"
-	echo "${@}"
-	"${@}" || die "${@} failed"
-}
-
-src_prepare() {
-	# Unbundle dev-cpp/libodb and dev-cpp/libodb-sqlite
-	printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-		"-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 --libs)" \
-		"$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \
-		libodb-sqlite/buildfile \
-		|| die
-	sed -i \
-		-e 's:libsqlite3[/]\?::' \
-		buildfile build/bootstrap.build \
-		|| die
-	for i in build2/build2/buildfile build2/libbuild2/buildfile; do
-		printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-			   "$($(tc-getPKG_CONFIG) libodb --libs)" \
-			   "$($(tc-getPKG_CONFIG) libodb --cflags)" >> \
-			   "${i}" \
-			|| die
-		printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-			   "$($(tc-getPKG_CONFIG) libodb-sqlite --libs)" \
-			   "$($(tc-getPKG_CONFIG) libodb-sqlite --cflags)" >> \
-			   "${i}" \
-			|| die
-	done
-	sed -i \
-		-e 's:libodb-sqlite[/]\?::' \
-		-e 's:libodb[/]\?::' \
-		buildfile build/bootstrap.build \
-		|| die
-
-	if has_version dev-util/pkgconf; then
-		for i in build2/build2/buildfile build2/libbuild2/buildfile; do
-			printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-				"$($(tc-getPKG_CONFIG) libpkgconf --libs)" \
-				"$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> \
-				"${i}" \
-				|| die
-		done
-		sed \
-			-e 's:libpkgconf[/]\?::' \
-			-i buildfile build/bootstrap.build \
-			|| die
-	fi
-
-	default
-}
-
-src_configure() {
-	emake -C build2 -f bootstrap.gmake \
-		CXX=$(tc-getCXX) \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-
-	b configure \
-		config.cxx="$(tc-getCXX)" \
-		config.cxx.coptions="${CXXFLAGS}" \
-		config.cxx.loptions="${LDFLAGS}" \
-		config.c="$(tc-getCC)" \
-		config.cc.coptions="${CFLAGS}" \
-		config.cc.loptions="${LDFLAGS}" \
-		config.bin.ar="$(tc-getAR)" \
-		config.bin.ranlib="$(tc-getRANLIB)" \
-		config.bin.lib=shared \
-		config.install.root="${EPREFIX}"/usr \
-		config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
-		config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_compile() {
-	b update-for-install
-	use test && b update-for-test
-}
-
-src_test() {
-	b test
-}
-
-src_install() {
-	b install: build2/ bpkg/ bdep/ libbuild2-kconfig/ \
-		config.install.chroot="${D}"
-	rm -rf "${ED}"/usr/include/odb \
-	   "${ED}"/usr/include/pkgconf/libpkgconf \
-		|| die
-	rm -f "${ED}"/usr/include/sqlite3.h \
-	   "${ED}"/usr/include/sqlite3ext.h \
-	   "${ED}"/usr/$(get_libdir)/libodb.so \
-	   "${ED}"/usr/$(get_libdir)/libodb-*.so \
-	   "${ED}"/usr/$(get_libdir)/libodb-sqlite.so \
-	   "${ED}"/usr/$(get_libdir)/libodb-sqlite-*.so \
-	   "${ED}"/usr/$(get_libdir)/libpkgconf.so \
-	   "${ED}"/usr/$(get_libdir)/libsqlite3.so \
-	   "${ED}"/usr/$(get_libdir)/pkgconfig/libodb-sqlite.pc \
-	   "${ED}"/usr/$(get_libdir)/pkgconfig/libodb.shared.pc \
-	   "${ED}"/usr/$(get_libdir)/pkgconfig/libodb-sqlite.shared.pc \
-	   "${ED}"/usr/$(get_libdir)/pkgconfig/libpkgconf.pc \
-	   "${ED}"/usr/$(get_libdir)/pkgconfig/libodb.pc \
-	   || die
-	mkdir -p "${ED}"/usr/share/doc/${PF}/html || die
-	mv -f "${ED}"/usr/share/doc/${PF}/*.xhtml "${ED}"/usr/share/doc/${PF}/html || die
-}
diff --git a/dev-util/build2/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch b/dev-util/build2/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
deleted file mode 100644
index 00b685600c8e..000000000000
--- a/dev-util/build2/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- build2-toolchain-0.13.0-orig/build2/libbuild2/script/regex.cxx	2020-06-10 19:25:37.000000000 +1000
-+++ build2-toolchain-0.13.0/build2/libbuild2/script/regex.cxx	2020-08-10 14:00:05.698012838 +1000
-@@ -5,6 +5,35 @@
- 
- #include <libbuild2/script/regex.hxx>
- 
-+#if defined(_LIBCPP_VERSION)
-+template <>
-+void
-+std::__1::__match_any_but_newline<build2::script::regex::line_char>::__exec(__state& __s) const
-+{
-+  if (__s.__current_ != __s.__last_)
-+  {
-+    switch (*__s.__current_)
-+    {
-+      case '\r':
-+      case '\n':
-+        __s.__do_ = __state::__reject;
-+        __s.__node_ = nullptr;
-+        break;
-+      default:
-+        __s.__do_ = __state::__accept_and_consume;
-+        ++__s.__current_;
-+        __s.__node_ = this->first();
-+        break;
-+    }
-+  }
-+  else
-+  {
-+    __s.__do_ = __state::__reject;
-+    __s.__node_ = nullptr;
-+  }
-+}
-+#endif
-+
- using namespace std;
- 
- namespace build2
diff --git a/dev-util/build2/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch b/dev-util/build2/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
deleted file mode 100644
index c3717856b6b7..000000000000
--- a/dev-util/build2/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- build2-toolchain-e135a3112b15c88f0601583ca068f8adea7b605d-orig/build2/libbuild2/cc/module.cxx	2020-07-10 20:12:57.000000000 +1000
-+++ build2-toolchain-e135a3112b15c88f0601583ca068f8adea7b605d/build2/libbuild2/cc/module.cxx	2020-07-14 14:33:58.939950579 +1000
-@@ -323,8 +323,6 @@
- 
- #ifndef _WIN32
-     static const dir_path usr_inc     ("/usr/include");
--    static const dir_path usr_loc_lib ("/usr/local/lib");
--    static const dir_path usr_loc_inc ("/usr/local/include");
- #  ifdef __APPLE__
-     static const dir_path a_usr_inc (
-       "/Library/Developer/CommandLineTools/SDKs/MacOSX*.sdk/usr/include");
-@@ -486,7 +484,6 @@
-         auto& ls (lib_dirs.first);
- 
-         bool ui  (find (is.begin (), is.end (), usr_inc)     != is.end ());
--        bool uli (find (is.begin (), is.end (), usr_loc_inc) != is.end ());
- 
- #ifdef __APPLE__
-         // On Mac OS starting from 10.14 there is no longer /usr/include.
-@@ -509,7 +506,7 @@
-         //
-         // Is Apple's /usr/include.
-         //
--        if (!ui && !uli)
-+        if (!ui)
-         {
-           for (const dir_path& d: is)
-           {
-@@ -521,22 +518,16 @@
-           }
-         }
- #endif
--        if (ui || uli)
-+        if (ui)
-         {
--          bool ull (find (ls.begin (), ls.end (), usr_loc_lib) != ls.end ());
--
-           // Many platforms don't search in /usr/local/lib by default (but do
-           // for headers in /usr/local/include). So add it as the last option.
-           //
--          if (!ull && exists (usr_loc_lib, true /* ignore_error */))
--            ls.push_back (usr_loc_lib);
- 
-           // FreeBSD is at least consistent: it searches in neither. Quoting
-           // its wiki: "FreeBSD can't even find libraries that it installed."
-           // So let's help it a bit.
-           //
--          if (!uli && exists (usr_loc_inc, true /* ignore_error */))
--            is.push_back (usr_loc_inc);
-         }
-       }
- #endif
diff --git a/dev-util/build2/files/build2-0.14.0-update-for-install.patch b/dev-util/build2/files/build2-0.14.0-update-for-install.patch
deleted file mode 100644
index 28467f67dc24..000000000000
--- a/dev-util/build2/files/build2-0.14.0-update-for-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- build2-toolchain-0.14.0-orig/buildfile	2021-10-19 20:44:33.000000000 +1100
-+++ build2-toolchain-0.14.0/buildfile	2022-03-26 20:47:10.191006537 +1100
-@@ -6,9 +6,6 @@
- #       installation instructions in the BOOTSTRAP-* file corresponding to
- #       your platform/compiler.
- #
--assert ($build.meta_operation == 'dist'      || \
--        $build.meta_operation == 'configure' || \
--        $build.meta_operation == 'disfigure') 'only dist and configure supported'
- 
- # Package repository URL (or path).
- #
diff --git a/dev-util/build2/metadata.xml b/dev-util/build2/metadata.xml
deleted file mode 100644
index 9ebc6959458d..000000000000
--- a/dev-util/build2/metadata.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		build2 is an open source (MIT), cross-platform build toolchain
-		for developing and packaging C and C++ code. It is a hierarchy
-		of tools that includes the build system, package dependency
-		manager (for package consumption), and project dependency
-		manager (for project development). Key features:
-
-		Next-generation, Cargo-like integrated build toolchain for C
-		and C++.
-
-		Covers entire project lifecycle: creation, development,
-		testing, and delivery.
-
-		Uniform and consistent interface across all platforms and
-		compilers.
-
-		Fast, multi-threaded build system with parallel building and
-		testing.
-
-		Archive and version control-based package repositories.
-
-		Dependency-free, all you need is a C++ compiler.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">build2/build2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/gnustep-apps/Manifest.gz b/gnustep-apps/Manifest.gz
index be4b892d26a7..904cfe4025fa 100644
--- a/gnustep-apps/Manifest.gz
+++ b/gnustep-apps/Manifest.gz
diff --git a/gnustep-apps/gnumail/Manifest b/gnustep-apps/gnumail/Manifest
index c04d608c1e37..24a4493e660f 100644
--- a/gnustep-apps/gnumail/Manifest
+++ b/gnustep-apps/gnumail/Manifest
@@ -1,5 +1,5 @@
 DIST GNUMail-1.3.0.tar.gz 1499242 BLAKE2B 074b83fd5fc9599ccae8a9f286db77ce4d61db7bbc9c33d1fd86cef818831d05b297c598c776ec0254a379daa8fc73776857ff2578ec2e83835c5525def459f8 SHA512 9b3ccf0a2e086129d8f96cf1de38ceb16033ef4509c3fe15af2afe43c31eaad32d121c0f9cf53f3d86472067d4207736523a125162e632572c7d1aee1fbefd78
 DIST GNUMail-1.4.0.tar.gz 1873175 BLAKE2B c87efb48b30c1d5fa40789d7db3165e1be2c1b9847ed3e71cca28e90fe353ee562709c93ad10a6cb6284338f66f6786286f613a398669d22abbee63da97de1e5 SHA512 c6b8b94462a5d5620586e38b50030ed8dda4a54286e9fa38f68159c54e6c72e8ad470ff63394b8dc2649da63b3164b52ff072298a794622b6e0b32b7e29de991
 EBUILD gnumail-1.3.0.ebuild 710 BLAKE2B ce21e688e779877b11c4e5c33c7ab13b4e6249db84c4263792952d8f97298ff60364426f0f0d081ebed94ce7852d01cd85cb925558ab333ea1e28773d207d9ad SHA512 f1898b71ad11d2af77c332ab8716a5e58d1b87aad7f668102adedf36cc91a2ee9e06592adc4c6fc98010b96fd0f7c32a8e4d46ba1a54e0558090be9facc8ac67
-EBUILD gnumail-1.4.0.ebuild 716 BLAKE2B 70486e969fbf88c371d8fb6355305953042c261df555253ef747233a8708555a8d9a62204e897860ddf65b63e01038cf5e54901569dc74220a43685305521d28 SHA512 6569fcb974dbdc3cd7ec1114d1b16297bada7f8298301e0eb8e5ea43ef7927b0ec6881f3a7b1efe5f76c4454e0a0690e3d1c54119ddafaf29cdc391d3dea764c
+EBUILD gnumail-1.4.0.ebuild 715 BLAKE2B e36e5202ae332c353cadc244b0aa1979341f24c99d62b684929aec1d21cf529a66401d2fca46e7f2e0fdb407aa8bbff2f6746295d51537e7e66a0eca4036b3aa SHA512 ed5501fae6dc8b1ab992e88f3c1fe62449a3c4c46edee1952167499122cb7d18ba840039496c7a01e5a67086b2a7f8d260be80383bb6e678a56618c78bed1d8f
 MISC metadata.xml 714 BLAKE2B bd9b5b2530033e89981335f975759578aedc8aa4e6270b3f8d6868c260c6274d88b1a3865f2ed6f45f9dd64c181628458ae55ad77ffa2e1c2e0f151960978c67 SHA512 b5c7416251d44541609275f4fe23079b9edfb60c1597cc2a155a52de8eff2da8a0e91bfe4ff4637f5937bcaad931a03cb4e6b1efd55a29b67134ed14bcbf081b
diff --git a/gnustep-apps/gnumail/gnumail-1.4.0.ebuild b/gnustep-apps/gnumail/gnumail-1.4.0.ebuild
index 62420f334158..79c4f81299d0 100644
--- a/gnustep-apps/gnumail/gnumail-1.4.0.ebuild
+++ b/gnustep-apps/gnumail/gnumail-1.4.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.nongnu.org/gnustep-nonfsf/gnumail/"
 SRC_URI="mirror://nongnu/gnustep-nonfsf/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 ppc x86"
 LICENSE="GPL-2+"
 SLOT="0"
 
diff --git a/gnustep-libs/Manifest.gz b/gnustep-libs/Manifest.gz
index 85ae72ec719b..e734a85bc4e5 100644
--- a/gnustep-libs/Manifest.gz
+++ b/gnustep-libs/Manifest.gz
diff --git a/gnustep-libs/dbuskit/Manifest b/gnustep-libs/dbuskit/Manifest
index 8f7920d2caf4..b0a6e0763444 100644
--- a/gnustep-libs/dbuskit/Manifest
+++ b/gnustep-libs/dbuskit/Manifest
@@ -1,5 +1,4 @@
 AUX dbuskit-0.1.1-remove_gc.patch 926 BLAKE2B 16ba95a5966f4c3e666ad786dcd9d4f3a6db3aef0ebdbeab1f7882d931d4a935cd956ada3f9b2d85905bbd0a38b118e630fd4789bbf5907b925c465c12a9dc2d SHA512 37e72f44aaaa670ea61511592a899fd9573c838c93f2a7da246d8aaeceeac03454369887f5c63fdfd778cbddd78fc89440f07ebb5e0089f4035a830bdf1497a4
 DIST dbuskit-0.1.1.tar.gz 467141 BLAKE2B 7133c100771507b84893a0f91a11d32555f01e8425c3d4b9e848f05e3eff9ffab02b91f7a686cbf125ef6ad565c897056139d6ac28e8f5dffe41ee33c11ec095 SHA512 795fc5e42842d689af024754cf141822405b13a00da446eb6a0d631ed226c9a56de7d1ba3d4b9fd52921dc34f5845294cf4368a714c080fd3a335e8c8cc7319b
-EBUILD dbuskit-0.1.1-r1.ebuild 868 BLAKE2B 1d8130d8219c6c79ee45863daad99873a121283f88032abf273ff054c49f5c921b05d8122e0121c2e5fa922780078de81026154c3c356743ecbb240092aa060d SHA512 82288deb823d7f3bb10b8d52bd4059d1c3dbbc7d74bb8ab64c1174f456db0d6d08f14c249b688702eb763205c3c4dcc561c58c94d33df1110e0a649447431e66
-EBUILD dbuskit-0.1.1-r2.ebuild 864 BLAKE2B 17fc3382e45995dc7232073e632807174a743b9144c1fe645225526612b6d275ee0e73239d4d52af722675a7c4149b5d645ed92f56b01191be79cf1b3b55bad5 SHA512 2708a8f657c499061624abb4821d49819b3f066d78b25904800f571280645911c0cafbf0f37df52771f4ae9d8af966540af51f324fb65e159459a521fb8b74a6
+EBUILD dbuskit-0.1.1-r2.ebuild 863 BLAKE2B 7d38443ae5d7b1c2c94c892e753681e148f68ba55640865594f033871d24b05fe10f8bf3752dc2e54458e8df1eaac122268dedc75ade02baa5d3e699e739ac5e SHA512 36ae7e6e79a5401ca311364e51ddaacf6406d5bde4d7acc16729cab8f006b7e231810f681d865abd3ba230bcb1ffc70bdaeedf500af7aec5394fd5c271796ac8
 MISC metadata.xml 705 BLAKE2B 1a1fb0b8bbf139c17de611ce1531f30d4b9d97a1bc366c0a4dbe8a9cacbe8abdd9da81b627d04e764ee2928d6258c973372671b47e150422a5411a8feb778c77 SHA512 2d76722ee5aae9d8bf9a531431fddd743edbbe241633dc556181629c13bd2df1c52abcff17e354747e18f76769e59fd924a727f4bda6efc8721f0221182291fc
diff --git a/gnustep-libs/dbuskit/dbuskit-0.1.1-r1.ebuild b/gnustep-libs/dbuskit/dbuskit-0.1.1-r1.ebuild
deleted file mode 100644
index e2cb6e3fa8d5..000000000000
--- a/gnustep-libs/dbuskit/dbuskit-0.1.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnustep-2
-
-DESCRIPTION="framework that interfaces Objective-C applications with the D-Bus IPC service"
-HOMEPAGE="https://github.com/gnustep/libs-dbuskit"
-SRC_URI="https://github.com/gnustep/libs-dbuskit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND=">=sys-apps/dbus-1.2.1"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-remove_gc.patch )
-
-S=${WORKDIR}/libs-${P}
-
-src_prepare() {
-	default
-
-	if ! use doc; then
-		# Remove doc target
-		sed -i -e "/SUBPROJECTS/s/Documentation//" GNUmakefile \
-			|| die "doc sed failed"
-	fi
-
-	# Bug 410697
-	sed -e "s#ObjectiveC2/runtime.h#ObjectiveC2/objc/runtime.h#" \
-		-i configure.ac || die "ObjectiveC2 runtime sed failed"
-
-	eautoreconf
-}
diff --git a/gnustep-libs/dbuskit/dbuskit-0.1.1-r2.ebuild b/gnustep-libs/dbuskit/dbuskit-0.1.1-r2.ebuild
index d482e1b162de..5162b5fc615e 100644
--- a/gnustep-libs/dbuskit/dbuskit-0.1.1-r2.ebuild
+++ b/gnustep-libs/dbuskit/dbuskit-0.1.1-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/libs-${P}"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND=">=sys-apps/dbus-1.2.1"
 RDEPEND="${DEPEND}"
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 6834721ed51c..06ef449f74fd 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/nm-tray/Manifest b/gui-apps/nm-tray/Manifest
index cac7f8aceca0..7d2d0c054bc2 100644
--- a/gui-apps/nm-tray/Manifest
+++ b/gui-apps/nm-tray/Manifest
@@ -1,3 +1,3 @@
 DIST nm-tray-0.5.0.tar.gz 53854 BLAKE2B e83c31606905909a62df57b2e744ff133a5cff91673ff229bd53ca1cca17840989efb6d813053700562dc8b434a6676a9310ff4d50b39fde7daf580986a19cad SHA512 ba118f7fd07a60af5ed6b7b53cf771f339c89f9bef02aeb2f59bfbddd3e896bdc31aa506437e33cb8fe2ef921c595b76527d61cefd202e9e1f5197762b69ab51
-EBUILD nm-tray-0.5.0-r1.ebuild 705 BLAKE2B 833cf5a1aabf42d37cd2d8dea8b94bb9640d335d949f03d731501f4d6ae49f5c4ac29e73d5453c0caf8ad5cd79b60597433044020b0d95ab8bebb188894160c9 SHA512 28793ae5862159fa49753d5f22950cf904b377c341c255be1419cc027ed95e2180c2c3ffd70c82d130e71f068ee4f6ab9aa725f49f966ff48fb5da7a81fd8bb2
+EBUILD nm-tray-0.5.0-r1.ebuild 697 BLAKE2B 32d8d19a5c33bb75c795ce8190479fa1e05274352492d325277dfa2b79f22c9da051350f613e6828a930a9cea81b6b58cdd09ed5038f4938d24b8339cb3410d3 SHA512 f84c1b792b4136a9ee31270ab69327cca5c6360334e83a71a406d63ca1d698728478a45224494d3e148452a47ec384c033e2de5e4e98946e272b750f821500d2
 MISC metadata.xml 325 BLAKE2B 0fbbf41ade30ab41cf768a22720c7762b0137cc3d372530566847327b97c6f77398d62d03c8490e0dfd64c5e5aa24d86d88518d495cf5947f6ecd1fd70f11e37 SHA512 8658afa9a2d887f67b3acb6d130b295fdb536a7a1dd11919cb1715d82daa4d507809b900238d0f10ce68d473fe4e479c5768ab444f7501ed8738f2e99cec28f9
diff --git a/gui-apps/nm-tray/nm-tray-0.5.0-r1.ebuild b/gui-apps/nm-tray/nm-tray-0.5.0-r1.ebuild
index 983e7a8d4c7f..9e02433392e4 100644
--- a/gui-apps/nm-tray/nm-tray-0.5.0-r1.ebuild
+++ b/gui-apps/nm-tray/nm-tray-0.5.0-r1.ebuild
@@ -12,7 +12,6 @@ SRC_URI="https://github.com/palinek/nm-tray/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 BDEPEND="
 	dev-qt/linguist-tools:5
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 7707d9e1eb94..201ecb9425c5 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/bismuth/Manifest b/kde-misc/bismuth/Manifest
deleted file mode 100644
index f7ad7b35e274..000000000000
--- a/kde-misc/bismuth/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST bismuth-3.1.4-binary-release.tar.gz 131470 BLAKE2B 435ec224ed589300f48bfd0f25aec75cb955ca7b6948ec48cdf0f8b53b92d262366e4159fb02862fde5bf676a99bfce38b521bcb670285fde7bb7dbda3e596d3 SHA512 90693137fa9527ed7aca9c0cad18d849491a166d3f6e6d4545f3c325a062589a196e1bfc36569f94551ba8a112e3f0be9a9d14dcb6cad0c8bc4e49bdd61f6488
-DIST bismuth-3.1.4.tar.gz 5456820 BLAKE2B 397f1f2ab89b92a2d0e9aa37f0cb42282f40b581de499860617ab2333a56e503bd8b76c4e6c909ec16df5ed56eb38019d559333c670898ab3f79fc1ab24310ad SHA512 3318f010dc9bf217536cccf2b9a683637172fae90409c2fbae4152a6b613d1a850cd7c7a03880e46f812aaa3a8d66bb829ba70f028a6a320db7844e254d73cc3
-EBUILD bismuth-3.1.4.ebuild 1597 BLAKE2B 957b8218eac4a791b872487972e50eab3b456f55fcd77bf48e85369a38667fe067ccb40de00ed54b8fe03883381b5ffa73de12e8733ea5e80fcaf2b5da97d366 SHA512 be38ec3904b0ca01dfda28393a39bf67a22089b713ac8867bfb29fbdf3cef163721c742077a28eef7219f78a5a4d473fc58989b615394f2505ddc3b8dda70a46
-MISC metadata.xml 485 BLAKE2B fb441979c9147516d065d63a8b1a151849c3f70284805d01d4f50a0ef4aee43f71344318d2c797c5360acc3a062c87c18cb05051d96fb40f8ef84c65ee2b8579 SHA512 3df0cc2f29de7bbba669a571fee74cdda64a99c6025fa61a87738afa5c64341bed003cb3f951b294b947672c38af405387045fffd2bc6a9956f423914a7c8cf9
diff --git a/kde-misc/bismuth/bismuth-3.1.4.ebuild b/kde-misc/bismuth/bismuth-3.1.4.ebuild
deleted file mode 100644
index d723f4a4350c..000000000000
--- a/kde-misc/bismuth/bismuth-3.1.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Tiling window management script for Kwin"
-HOMEPAGE="https://github.com/Bismuth-Forge/bismuth"
-SRC_URI="
-	https://github.com/Bismuth-Forge/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/Bismuth-Forge/bismuth/releases/download/v${PV}/binary-release.tar.gz -> ${P}-binary-release.tar.gz
-"
-
-LICENSE="CC-BY-4.0 LGPL-3+ MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-QTMIN=5.15.0
-KFMIN=5.78.0
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-plasma/kwin-5.24.0:5
-"
-
-RDEPEND="${DEPEND}"
-
-RESTRICT=test # npm + js + hell + network
-
-src_prepare() {
-	# we are not building npm hell or tests
-	cmake_comment_add_subdirectory tests
-	cmake_run_in src cmake_comment_add_subdirectory kwinscript
-	cmake_src_prepare
-}
-
-src_configuire() {
-	# cmake calls git describe --tags --abbrev=0
-	# let's just echo expected output, e.g. v1.2.3
-	git() { echo "v${PV}" ; }
-	export -f git || die
-
-	local mycmakeargs=(
-		-DBUILD_TESTING=OFF
-		-DUSE_NPM=OFF
-		-DUSE_TSC=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/kwin/scripts
-	doins -r ../share/kwin/scripts/"${PN}"
-}
diff --git a/kde-misc/bismuth/metadata.xml b/kde-misc/bismuth/metadata.xml
deleted file mode 100644
index 3d9ae735e688..000000000000
--- a/kde-misc/bismuth/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<bugs-to>https://github.com/Bismuth-Forge/bismuth/issues</bugs-to>
-		<changelog>https://github.com/Bismuth-Forge/bismuth/blob/master/CHANGELOG.md</changelog>
-		<doc>https://github.com/Bismuth-Forge/bismuth/tree/master/docs</doc>
-		<remote-id type="github">Bismuth-Forge/bismuth</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 60d3fc7a8178..4ecadc560c38 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/proton-mail-bridge/Manifest b/mail-mta/proton-mail-bridge/Manifest
index c4adb2ce94bf..d01d764ab7ae 100644
--- a/mail-mta/proton-mail-bridge/Manifest
+++ b/mail-mta/proton-mail-bridge/Manifest
@@ -1,6 +1,9 @@
 AUX proton-mail-bridge-3.3.2-gui_gentoo.patch 2760 BLAKE2B fc31a27afd24f8f02f0e1864cbc0b863a480dc94991c30e6498dbfb7ab06243dff14f45db31ff665851feccf523310d0b396f3c8ea46e8416b34330f9080b3cc SHA512 d1955987ea62c4148792372cb34f84e828a9b56c29ae04480b66de1f97435ed54d6bc038ca4bb89b0683fbc0d3befd8f4b1355512805e3bbde635f1a3e3ec3f4
 AUX proton-mail-bridge.service-r1 341 BLAKE2B 056e68d9d2f009b60708c5bea58e851b3955e3292e44af114976815f597ca813917b2b74082fae5d0146288aefa9a38993d791272073b23bcff51cbed4f4bbdf SHA512 bafea6004077cb2b5d77ebb9fd48ca925be20987b1a1698b68c9853e9c1d95ac2d0d8d77f78fb2b3e7c1e56d4ea4e7d2dcfeef857df189f1ae51a57ce5d0ac93
+DIST proton-mail-bridge-3.10.0-deps.tar.xz 246860004 BLAKE2B 56000b5aeb30a1dbd4f35b2b3b309bd4ab80c1ace7a7261b303231c196b698afe38754a6e779ca4313acc1fec0e7136a1783c16625f26c041f0aa4c7baa77c19 SHA512 8f314727eb1796f7c69e777ce708f45a534e352becd89a51c90cb2c9cf5367f28d6f4b34d42dce85443aca66ed3bb89404e6add19486596044fd00810f8cb65f
+DIST proton-mail-bridge-3.10.0.tar.gz 5176242 BLAKE2B a319dab8a9b6b74afe1792ee61cd2c6d3e7e93a7459477cde0b5d796e19a67be2f45766decfdc9e1ba0827a969fbb1c95557d3a6b52d9340eeec5ecbc1b4b6c5 SHA512 65d07b15053fc9b67f4792a506b5e8c07896c166bcfe34751625c98f79ab01f00da29cdb029e5276c4624af7f787392347c7555c15edb4d05be1b0415f50bbd6
 DIST proton-mail-bridge-3.6.1-deps.tar.xz 245805016 BLAKE2B 7aeab4896c9dfcba8c2c3164f441fb57f0febbdc0c49f7555cda3d930443efec85d8748a43ed2ed23982594c6f5e4b8e319cd2524bfa21797a8259252397f5a9 SHA512 46a5601606fe99af0ffcc8ba1e325d17b527d15225f6f4c339de0f828e0a17e71304886a58ccf2dde83638e83bc87abb7ef9817db44014cc38132dc65d752fdf
 DIST proton-mail-bridge-3.6.1.tar.gz 5015293 BLAKE2B 7a6bb687fd1130612a49d4336404229daece91a24a37952b3128462b81cfe83636b935d584b479d294037d0303406f2c79a6798725d7b62f55eefa9294047ba9 SHA512 39e11815cdfdcd741ba04ee6776ce4bd959715d8d5bb8345b7f7b1a66b5fa5b66890ebc0353b1f5566a822e0ad1c4757fd022b67f4c66e91113b5e700db04abd
+EBUILD proton-mail-bridge-3.10.0.ebuild 2741 BLAKE2B 517eb168d4d968daf2afbc0a0d0ec25a22b330c5988e32f464e74bac00db51c7f1a090338ab4ece8ef58e25e4a516ec82fbf2f239bf8e344fc5e12cd823d37b0 SHA512 99243641e1964529714e465beafb4b106cfa2f9525ce695d9e3f23fd94b580e013ab0e8458dff4fa6f110be8a6829732d2a1bef9a9888bc8eb4cc5377bb794cf
 EBUILD proton-mail-bridge-3.6.1.ebuild 2890 BLAKE2B 0bd7b33367b2c381099ff6a81821f444888e1da29497dd290a7bba6c14bab7ad72b671af981ac2947dc17290bc54a449ce4b3cb66afdf8eb62c2a4ba2e108b39 SHA512 dcb320ecb43d1c918c45277f23933c2abf9e4ff5b02dd8b3514336ebd5bd5263f8789d3aca90ecce85513c779e0966dba2b510895ae7d112de61cab86d6d7c36
 MISC metadata.xml 594 BLAKE2B 4a52e340f984c6a6b3175e06221d277e59b1bfa0929ac019ca56d1b0eaf8801122a3ebd596784494c85a9fa78ce99f880288785a9a0465bb6b2b44397ab5a43a SHA512 b8627546fa733b97d5aa78ed51feaafb3623b770b2e434704055c0e5e23731c18adf3a9a25c73dd77d916060d8f112959772bf4102ccda78e2188e91b9e03348
diff --git a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.10.0.ebuild b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.10.0.ebuild
new file mode 100644
index 000000000000..9df510d07186
--- /dev/null
+++ b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.10.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake go-module systemd xdg-utils
+
+MY_PN="${PN/-mail/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
+HOMEPAGE="https://proton.me/mail/bridge https://github.com/ProtonMail/proton-bridge/"
+SRC_URI="https://github.com/ProtonMail/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-3+ ISC LGPL-3+ MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gui"
+
+# Quite a few tests require Internet access
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="app-crypt/libsecret
+	gui? (
+		>=dev-libs/protobuf-21.12:=
+		>=dev-libs/sentry-native-0.6.5-r1
+		dev-qt/qtbase:6=[gui,icu,widgets]
+		dev-qt/qtdeclarative:6=[widgets]
+		dev-qt/qtsvg:6=
+		media-libs/mesa
+		net-libs/grpc:=
+	)
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.2-gui_gentoo.patch
+)
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	if use gui; then
+		local PATCHES=()
+		BUILD_DIR="${WORKDIR}"/gui_build \
+			CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \
+			cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	if use gui; then
+		local mycmakeargs=(
+			-DBRIDGE_APP_FULL_NAME="Proton Mail Bridge"
+			-DBRIDGE_APP_VERSION="${PV}+git"
+			-DBRIDGE_REPO_ROOT="${S}"
+			-DBRIDGE_TAG="NOTAG"
+			-DBRIDGE_VENDOR="Gentoo Linux"
+			-DCMAKE_DISABLE_PRECOMPILE_HEADERS=OFF
+		)
+		BUILD_DIR="${WORKDIR}"/gui_build \
+			CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \
+			cmake_src_configure
+	fi
+}
+
+src_compile() {
+	emake build-nogui
+
+	if use gui; then
+		BUILD_DIR="${WORKDIR}"/gui_build \
+			CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \
+			cmake_src_compile
+	fi
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	exeinto /usr/bin
+	newexe bridge ${PN}
+
+	if use gui; then
+		BUILD_DIR="${WORKDIR}"/gui_build \
+			CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \
+			cmake_src_install
+		mv "${ED}"/usr/bin/bridge-gui "${ED}"/usr/bin/${PN}-gui || die
+	fi
+
+	systemd_newuserunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		local oldver
+		for oldver in ${REPLACING_VERSIONS}; do
+			if ver_test "${oldver}" -lt 3.2.0; then
+				ewarn "Please note that since version 3.2.0, ${PN} by default shares usage statistics with upstream."
+				ewarn "For details, please see"
+				ewarn
+				ewarn "	https://proton.me/support/share-usage-statistics"
+				ewarn
+				ewarn "This behaviour can be disabled through ${PN}-gui, under Advanced Settings."
+				ewarn
+				break
+			fi
+		done
+	fi
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 59ce69d1a77a..3ac8de2b3066 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index aa096b0a2c0a..f999ad0e01f5 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -3,5 +3,5 @@ AUX exiv2-0.28.2-errors-localisation.patch 835 BLAKE2B af7821671a1f852d3169eb157
 DIST exiv2-0.28.1.tar.gz 45225200 BLAKE2B a26f8e54cf6284c56ff429c13d5a8985dc6181a36b4c13ea6f2e59bc00016a2a8d915ddbc0cedb441b8283e30f18312a500900ffd89ca984006ac84807a03852 SHA512 7b872a3c0cbe343014b1ca4618cecaf6ee8d78dec7ef83accfce95cb8eadc6b52116977a41e1f1be5c6149a47bdd9457fadc08d73708aa2a6ab69795fd3de23b
 DIST exiv2-0.28.2.tar.gz 45224206 BLAKE2B 9d1d05c99804032dfb9b740e543d1e3cceae011b17853c8565ccad87e726ce1d0f410c13bf4fa8839bc8e0fecdf170a3acac568f14aad4628b3b844f6c21dd7e SHA512 197cc607c0271b5731714713283756250031cef81ba7ed5d9c3e222b4c2397966cc2bbdbceaae706598329dde6f8a9729597d0ae4c36ac264c76546942e4e37b
 EBUILD exiv2-0.28.1-r2.ebuild 3305 BLAKE2B 78d91a71fea56cd4dd27916871dcb3d917ccccca7fe5334ce9729129dbf74c0d15fb496d5916ceedd685d8ed8fcf3b93f2a2a6db8f397f37a04439485d716a1a SHA512 41b659f75e7797dfdbd44c96acdc78789c8b00a773cafce3312e26fa521d7d633329dc7d61ff7a8dad385c56130b016123d06cd8188b50c200b10a404bb58d26
-EBUILD exiv2-0.28.2.ebuild 3259 BLAKE2B 95edcb5e3b36dfb5563dce4597cfc9f1dade70933fceec9352f3c511d7a271f97a93c30fd7f2280aaee275d50344cb18816260312f25289de974f243cf9b0040 SHA512 344dc3ad4662804aacc667adb2a20a6b641778cd2927da21df02bf97d3f5830942bb4d9424f8dab5ba108f7a88be3cf67dd08f8cf771c4b9301b2dac55828d74
+EBUILD exiv2-0.28.2.ebuild 3258 BLAKE2B d9838ddc51a1ddfb73589d54fe00c87325bdba61c5efb589a931b805869dcaeb8cf10b6b3a484a812326d00f3d63c8771869ab617693c9dfdd4a6be4492aa94b SHA512 85e35f969b4689acde0eb85a7bce891fdb08d97c6de95f5d65d5649635ce17b089a3ccad31639fc6edc0caeac7d7ba2d13b592e23efbbba5b92f323edfdbbff9
 MISC metadata.xml 686 BLAKE2B 2d1079660cf4268216f8835d1ae6655ebafc99d5402872bb05dac6342034a28a07dcff587fc616a5eedc8c538ea3e43e013711d39c2541295e89629e39a244ee SHA512 40f9225a42386fa6f03bf9436d675bb01bd6eb859974bfed22d1316536ceaf40752fabffdab20b439e87c57f65d193d8d249e5aa022584de3f869f4162660b4e
diff --git a/media-gfx/exiv2/exiv2-0.28.2.ebuild b/media-gfx/exiv2/exiv2-0.28.2.ebuild
index d7040350f453..d7813a403043 100644
--- a/media-gfx/exiv2/exiv2-0.28.2.ebuild
+++ b/media-gfx/exiv2/exiv2-0.28.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Exiv2/exiv2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-gfx/fotocx/Manifest b/media-gfx/fotocx/Manifest
index 65fa4bf32a06..8a7e7be8b554 100644
--- a/media-gfx/fotocx/Manifest
+++ b/media-gfx/fotocx/Manifest
@@ -6,5 +6,5 @@ DIST fotoxx-23.70-source.tar.gz 16130595 BLAKE2B d5cd0453c7cc568ddc5a8d66d5f79f4
 DIST fotoxx-23.82-source.tar.gz 16257916 BLAKE2B b985d999003ebf53dea5f4f21bca7ecd451d89a14c98aa5269f892f183e28f01a81a33bf2a92e6cef98a466069b20622e829eee897d5d818a6f27c493de48734 SHA512 1c6ded03207eaf2e890fa642ff6d9e0bfaae551e9ec1169b30f3ef8a4763cda01dddc7e0c62e7da29a397ad22c4702c0613d383804563b065ce334918381bd2d
 EBUILD fotocx-23.70.ebuild 2295 BLAKE2B 2358879706af1eb5343fdae235a5b8ce7d8297d29f585e0ff6479c4204fed8f71af361dfc18b03e70af3f39ee8e1188c2dad92069f3dcae60252a0c175a3d6e7 SHA512 2ec60ec8608a3da289f295bd08737c92f386d0d521b58e4dfee7bef2864849e10b89d4005eb4dc140779e377e77613b9e1f942561b6f54cdb1025d4c387597f5
 EBUILD fotocx-23.82.ebuild 2297 BLAKE2B 7ff3bab8c385d610375ca20a2d929036a3e409b0993e1e1d4f7faa6cc35f033d49fc3350c5fd418b424b231bb8de6d928a6ee1ebab7bc6d30eab84238c5b723e SHA512 c4905b3fedde2c628b3e25c3a1199077125151b575bc1442c16e7109ddde9eebf941b1a442cb484e0beab1c831a2e1860a5167549690b71efd635741739e2aa4
-EBUILD fotocx-24.11.ebuild 2285 BLAKE2B 5fac82f4893ac0329ed4857a02b2be482ca52650103ca3a028b8a4c04b49195d57d7ed92c5a8c351774a29495041c506a197e9d1c7477c44c21039ee7110d138 SHA512 8049fce23d0f04713ebc534fc404f8898b59139d58c43756990ef9a985daaee8ec564effe8296de85d9650e85aca98e878b1b7b0afcaf87f6d103e53effd9e73
+EBUILD fotocx-24.11-r1.ebuild 2276 BLAKE2B 20ae18597694d60c49bd6468b0e1a7bca00735a778cae9f3be506a821008d90012aeec9ced86c38d1495069d316e51a97bcd5eb2f4b2aa212ace264b99fa3995 SHA512 3f0faf71589503f942e2a00cfa9f2efb95b7132604abca1cdb625a1b23e0b7e4dbf0c02d55e55cd57d8ff4089f947792691fb1edcdaaf0d69bc0361f6a78afc7
 MISC metadata.xml 851 BLAKE2B a6c60b79fb5646c3bd7d6959d4a1b974ee714bf6ed64f205d9c00d684b3da94672005658336c1c5fcb903605d11c9a5607616151b2f6262f3173e15b8fc44655 SHA512 2794ae92afa076875c7f725969efdcf9cb84435d0ea033adc28f5860a69438b754f4d22b0db27dc7392683439e51b51ae581a6da450719276e8df51a2a306ad9
diff --git a/media-gfx/fotocx/fotocx-24.11.ebuild b/media-gfx/fotocx/fotocx-24.11-r1.ebuild
index c3e565c1342f..973a6788289e 100644
--- a/media-gfx/fotocx/fotocx-24.11.ebuild
+++ b/media-gfx/fotocx/fotocx-24.11-r1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit optfeature xdg-utils
 
 DESCRIPTION="Program for improving image files made with a digital camera"
 HOMEPAGE="https://kornelix.net/fotocx/fotocx.html"
 SRC_URI="https://kornelix.net/downloads/downloads/${P}-source.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
 
 # For required dependencies read doc/README, for required tools read
 # data/userguide [INSTALLATION]. xdg-open (x11-misc/xdg-utils) is an
@@ -35,8 +35,6 @@ RDEPEND="
 	x11-misc/xdg-utils
 "
 
-S="${WORKDIR}/${PN}"
-
 PATCHES=( "${FILESDIR}/${PN}-24.11-documentation.patch" )
 
 DOCS=()
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 61344f6d99bf..9545ead80a1f 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest
deleted file mode 100644
index f89c095d0923..000000000000
--- a/media-sound/exaile/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST exaile-4.1.3.tar.gz 3853508 BLAKE2B 3ce7bbd84dda419b817f0684b2279e29a48b7c221eb3d335f3b3797be4dbbec9158b576337084cdd0d242d79fdf14616c1e0b8b171e3995689f94945aa7385b6 SHA512 16b31331a31f0a2e088f177c8a01ef47603b07fe94cbb19869a4caeaec2da03cacaa07d5b0eb50052645449e07620e2c58f202007108af73e20cf744d70bb556
-EBUILD exaile-4.1.3.ebuild 1614 BLAKE2B 2c3975a97ff6a000e23963bf981d6a299dfedb53af7366580200a5e026e9cf8b62595d67e869519fe42ff00a6046812dcb842002a040015084d8e4e33bf2888e SHA512 5c342d86611fe93523325ee87d86357845098d05d1c10148f8f0e6b572723ff9d0d30cc04c4e9658646949a499f4996f30b092064e33c2fcfdd6dc4e38a22f98
-EBUILD exaile-9999.ebuild 1615 BLAKE2B d0c044b90c5bb445b7c84ef9dc3e86b4738680d4624b563011bb1e93fa1ef038bc9e6a6c8035ce9af227c688166257e5291060d8fd6b86a37c591725125b66c2 SHA512 b4c3e5963e4a4f22737a6d07d298a5b027950b990a5b16048f20e098a4ff27b75a7da6756387a687cebbed6640a3fabf9cce82096a1c78fb96d0e97b615fb101
-MISC metadata.xml 466 BLAKE2B 8c2ae9dfde18d1976a3c38a77de336e5f0489879adcdb030c9c6b3cb765e440d8bf908c57b2fe1670b090d90c570b3219201319d81319dda87c92c777c82757e SHA512 5bdedc04863ba9c8632a818d8f7a834687e3474cfe906b0ee82378f6c957ecc9778206f8b7f7abefda5cba06c4c0df930e5e170754fa8c59467dd4f1857be4f8
diff --git a/media-sound/exaile/exaile-4.1.3.ebuild b/media-sound/exaile/exaile-4.1.3.ebuild
deleted file mode 100644
index 56167a0672e9..000000000000
--- a/media-sound/exaile/exaile-4.1.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit python-single-r1 xdg
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/exaile/exaile.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_/-}/${PN}-${PV/_/}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-DESCRIPTION="GTK+ based media player aiming to be similar to Amarok"
-HOMEPAGE="https://www.exaile.org/"
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-# IUSE+=cddb if have dev-python/cddb-py
-IUSE="libnotify nls scrobbler"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-	)
-"
-RDEPEND="${PYTHON_DEPS}
-	media-libs/gst-plugins-base:1.0
-	media-libs/gst-plugins-good:1.0
-	media-plugins/gst-plugins-meta:1.0
-	x11-libs/gtk+:3[introspection]
-	libnotify? ( x11-libs/libnotify[introspection] )
-	$(python_gen_cond_dep '
-		dev-python/bsddb3[${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		media-libs/mutagen[${PYTHON_USEDEP}]
-		scrobbler? ( dev-python/pylast[${PYTHON_USEDEP}] )
-	')
-"
-
-RESTRICT="test" #315589
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_compile() {
-	use nls && emake locale
-}
-
-src_install() {
-	emake \
-		PREFIX=/usr \
-		LIBINSTALLDIR=/usr/$(get_libdir) \
-		DESTDIR="${D}" \
-		install$(use nls || echo _no_locale)
-
-	python_optimize "${D}/usr/$(get_libdir)/${PN}"
-	python_optimize "${D}/usr/share/${PN}"
-}
diff --git a/media-sound/exaile/exaile-9999.ebuild b/media-sound/exaile/exaile-9999.ebuild
deleted file mode 100644
index 3c7be5deff10..000000000000
--- a/media-sound/exaile/exaile-9999.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit python-single-r1 xdg
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/exaile/exaile.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_/-}/${PN}-${PV/_/}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-DESCRIPTION="GTK+ based media player aiming to be similar to Amarok"
-HOMEPAGE="https://www.exaile.org/"
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-# IUSE+=cddb if have dev-python/cddb-py
-IUSE="libnotify nls scrobbler"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-	)
-"
-RDEPEND="${PYTHON_DEPS}
-	media-libs/gst-plugins-base:1.0
-	media-libs/gst-plugins-good:1.0
-	media-plugins/gst-plugins-meta:1.0
-	x11-libs/gtk+:3[introspection]
-	libnotify? ( x11-libs/libnotify[introspection] )
-	$(python_gen_cond_dep '
-		dev-python/bsddb3[${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		media-libs/mutagen[${PYTHON_USEDEP}]
-		scrobbler? ( dev-python/pylast[${PYTHON_USEDEP}] )
-	')
-"
-
-RESTRICT="test" #315589
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_compile() {
-	use nls && emake locale
-}
-
-src_install() {
-	emake \
-		PREFIX=/usr \
-		LIBINSTALLDIR=/usr/$(get_libdir) \
-		DESTDIR="${D}" \
-		install$(use nls || echo _no_locale)
-
-	python_optimize "${D}/usr/$(get_libdir)/${PN}"
-	python_optimize "${D}/usr/share/${PN}"
-}
diff --git a/media-sound/exaile/metadata.xml b/media-sound/exaile/metadata.xml
deleted file mode 100644
index c421f9314c88..000000000000
--- a/media-sound/exaile/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">exaile</remote-id>
-		<remote-id type="github">exaile/exaile</remote-id>
-	</upstream>
-	<use>
-		<flag name="scrobbler">Enable audioscrobbler/last.fm support</flag>
-	</use>
-</pkgmetadata>
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 3835a9388a79..d67e4dba40e5 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index fa728992059b..934f0cb0f02c 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 29 Mar 2024 12:40:25 +0000
+Fri, 29 Mar 2024 18:40:26 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 60c7f7b4a0e9..27110502b717 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 569335 BLAKE2B 07f6153cc527f8ef0be40a2cc21b4fbdd6901249b5c3c569cd1c78321017cd55d98800cf292cc33ffbd6842d685a59c8343e534c4ede0d598730df983a8c33f4 SHA512 5d341348a510bcd14cd0388e2d6bdaccf622bfa08eed783dcee916769bbf2f8d31fa0fb57d0f3bfcce315df08c0e1c93572bfdc703a005d69ab200628e23c99b
-TIMESTAMP 2024-03-29T12:40:30Z
+TIMESTAMP 2024-03-29T18:40:30Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYGtr9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYHCx5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCeeA//bgD1JedhFJzTR/jH3KKSAn2H/WKfhOHf0Zeaw8pQ5FQBxyK2KUwiqYfu
-nFRc7+P4aQ9Rd2cn9/nuKFUXznzXNWKoHiZ5Hki8twT1sz3YcRLEBF1TsMgJhmnX
-eYT5k56Yve9jIBBvtqhh/jgvEp3dHSbh5p4D0dC2jdLBIcIeKz/HgTNReepDHwjU
-krMpYtj/Nv5arSxYKsKVw6eL7oZiICrfQvQUlRHE8a2Ot5AuFOPe/EjfffvcdtAq
-jXuHNCAyjZjRsE1esK7CQXmtw+GMx3Rp8KZxmXCDRpcygXs0LtKFX3mMOPfQt1sR
-xqYFs/W4E22ntDSa7hRNa5iJLYa30bCIPjt0xSTHU5w8VX8HXBkySmSGPBYZ3CBj
-2zjjMyTeKYptm8RfKH0cPTyOaSbfhd03vHVplj99KWYcFE+XVJJuiWga4nMfdaI0
-De3PUYYJG+XBlec/bXxEEA5Q7b+GJr2I7RYDIQHs6TBoM+8vcL8gF4d6+wu1vtYe
-htG/FQCHFC/pYCRnpKACxPEBf1d9IPnmRpFwlYFoPoZjds+xkcU7cO55R/qyupPF
-UH9rLraykePhD1kNdjO5mE3sLjCUsK9dbPICktaeueFJvsINkfxUNffXuudBclVv
-5YcjXm71vmHiZLFvOjCaYaYL0lLiXHAe8cKahclYqk7W6Dyomc0=
-=/BU5
+klBKZw//T5+Hw30JmSw9gh/vPUEe+EVeRZ+gYzXFwK5gChSRv/bUx0/k1/s4ngXE
+s2912xibOfNDQu1cN+vTm7rXZM6NmU0mRR75jX5KSIUIu8hJ7PM5Grplp5VYOipi
+RzitwZiiiVVUCCaGUQq0TSAqCCc7DrsuXxbsZxiDA4FUTHQ06XYNjcTs8nd6MgWg
+PUw4T/P4IIdDLFHBXQIM5Ytlb1LFV6XETAt/kIUyz6hXHay7i1WVSUbzqC5nFAwR
+zCmpbdyAqsMaoRp+d8I5TLLK6IpL1YfCdd0wuVFdp6QTjf+8DngL+mpzYt1/Zy6Q
+cDC87kZO73CYXiH1R3eCKjfqttuG32eGYDMJ44Fv/7VnWDGSH0w3XiDKTZ3P+N5q
+aVIDhWoV3BsnZu5sCIZ0P3CxeH7f7ltlN3yfFMKRm7llTBBK/mGMLYBz5xA1c50O
+6hD9V2lCDwD7nlRctDdKnj6zzWjtKa0gstMY/I3Rv3beTW5AEMI5NYqzLcnffMGV
+lJnABIiRBAj4FMVSGPOw+G6Ahwk8VWGFHcQ0BOyz0ej4Ufy4ujy0Iz+/P6k4iWE0
+GzszyyOXIUZ1ZnBO4+VMTate6FGHIhfOR9Le5/MHGi85qhhnJhwcufqLYixK2yPv
+4dazP8zWuplyrSKzASk5eTgbyA86QaTcHsq2V2hF/O/qNtiFSpI=
+=ENDy
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 0f235de3b275..454b00673c42 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 29 Mar 2024 12:40:26 +0000
+Fri, 29 Mar 2024 18:40:27 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 585be77601c5..1532cc68df2b 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 2ec80eaa3cb7..bd32a52b8135 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/ps_mem-3.14-r1 b/metadata/md5-cache/app-admin/ps_mem-3.14-r1
index 765d1521f0f0..7d6c83a6a21b 100644
--- a/metadata/md5-cache/app-admin/ps_mem-3.14-r1
+++ b/metadata/md5-cache/app-admin/ps_mem-3.14-r1
@@ -1,15 +1,15 @@
-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_10? ( >=dev-python/gpep517-15[python_targets_python3_10(-)] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-15[python_targets_python3_11(-)] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_11(-)] )
+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 ) python_single_target_python3_10? ( >=dev-python/gpep517-15[python_targets_python3_10(-)] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-15[python_targets_python3_11(-)] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/gpep517-15[python_targets_python3_12(-)] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_12(-)] )
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=A utility to report core memory usage per program
 EAPI=8
 HOMEPAGE=https://github.com/pixelb/ps_mem
 INHERIT=distutils-r1
-IUSE=python_single_target_python3_10 python_single_target_python3_11
+IUSE=python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
 KEYWORDS=amd64 ~arm64 ppc64 sparc x86
 LICENSE=LGPL-2.1
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+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 )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
 SLOT=0
 SRC_URI=https://github.com/pixelb/ps_mem/archive/refs/tags/v3.14.tar.gz -> ps_mem-3.14.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=4afb61ee34374eaa75401b9f2bd8e9f7
+_md5_=007244a4ba2b1dbb668b93c4a98fe0b8
diff --git a/metadata/md5-cache/app-admin/xkcdpass-1.19.4 b/metadata/md5-cache/app-admin/xkcdpass-1.19.4
deleted file mode 100644
index d248cf4135a6..000000000000
--- a/metadata/md5-cache/app-admin/xkcdpass-1.19.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.3.1[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 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Password generator inspired by XKCD 936
-EAPI=8
-HOMEPAGE=https://github.com/redacted/XKCD-password-generator
-INHERIT=distutils-r1 pypi
-IUSE=l10n_de +l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD CC-BY-3.0 l10n_de? ( GPL-3 ) l10n_it? ( CC-BY-SA-3.0 ) l10n_no? ( CC-BY-4.0 )
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=test? ( l10n_en ) || ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/x/xkcdpass/xkcdpass-1.19.4.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=7ca320584b8bc1787fa859e4bac4fd89
diff --git a/metadata/md5-cache/app-admin/xkcdpass-1.19.5 b/metadata/md5-cache/app-admin/xkcdpass-1.19.5
deleted file mode 100644
index a6f91dbf0231..000000000000
--- a/metadata/md5-cache/app-admin/xkcdpass-1.19.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.3.1[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 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Password generator inspired by XKCD 936
-EAPI=8
-HOMEPAGE=https://github.com/redacted/XKCD-password-generator
-INHERIT=distutils-r1 pypi
-IUSE=l10n_de +l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD CC-BY-3.0 l10n_de? ( GPL-3 ) l10n_it? ( CC-BY-SA-3.0 ) l10n_no? ( CC-BY-4.0 )
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=test? ( l10n_en ) || ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/x/xkcdpass/xkcdpass-1.19.5.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=7ca320584b8bc1787fa859e4bac4fd89
diff --git a/metadata/md5-cache/app-admin/xkcdpass-1.19.6 b/metadata/md5-cache/app-admin/xkcdpass-1.19.6
deleted file mode 100644
index 31c9e5b62131..000000000000
--- a/metadata/md5-cache/app-admin/xkcdpass-1.19.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.3.1[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 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Password generator inspired by XKCD 936
-EAPI=8
-HOMEPAGE=https://github.com/redacted/XKCD-password-generator
-INHERIT=distutils-r1 pypi
-IUSE=l10n_de +l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD CC-BY-3.0 l10n_de? ( GPL-3 ) l10n_it? ( CC-BY-SA-3.0 ) l10n_no? ( CC-BY-4.0 )
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=test? ( l10n_en ) || ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/x/xkcdpass/xkcdpass-1.19.6.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=7ca320584b8bc1787fa859e4bac4fd89
diff --git a/metadata/md5-cache/app-admin/xkcdpass-1.19.8 b/metadata/md5-cache/app-admin/xkcdpass-1.19.8
index 1d55411fec4c..b3880ed2f66e 100644
--- a/metadata/md5-cache/app-admin/xkcdpass-1.19.8
+++ b/metadata/md5-cache/app-admin/xkcdpass-1.19.8
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/pytest-7.3.1[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 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( >=dev-python/pytest-7.3.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 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Password generator inspired by XKCD 936
 EAPI=8
 HOMEPAGE=https://github.com/redacted/XKCD-password-generator
 INHERIT=distutils-r1 pypi
-IUSE=l10n_de +l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt test python_targets_python3_10 python_targets_python3_11
+IUSE=l10n_de +l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD CC-BY-3.0 l10n_de? ( GPL-3 ) l10n_it? ( CC-BY-SA-3.0 ) l10n_no? ( CC-BY-4.0 )
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=test? ( l10n_en ) || ( python_targets_python3_10 python_targets_python3_11 )
+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=test? ( l10n_en ) || ( 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/xkcdpass/xkcdpass-1.19.8.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=c39edbf116cce9263591d46fc7a85d43
+_md5_=6aa29e67ad836f868ddadcd6cb40d5db
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index fe2d302ce847..652af35c7fb9 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/backupninja-1.2.2 b/metadata/md5-cache/app-backup/backupninja-1.2.2
index 111ce4166d17..6ec48406b149 100644
--- a/metadata/md5-cache/app-backup/backupninja-1.2.2
+++ b/metadata/md5-cache/app-backup/backupninja-1.2.2
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 RDEPEND=dev-util/dialog
 SLOT=0
 SRC_URI=https://0xacab.org/liberate/backupninja/-/archive/backupninja_upstream/1.2.2/backupninja-backupninja_upstream-1.2.2.tar.gz
-_md5_=6fb47f37ad844548f63f9e296e946460
+_md5_=673446088a5fe3eeda6e047653a3cfd9
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index ff9685e82e04..e814db06ba82 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/apptainer-1.2.4 b/metadata/md5-cache/app-containers/apptainer-1.2.4
deleted file mode 100644
index abbe90c54eb3..000000000000
--- a/metadata/md5-cache/app-containers/apptainer-1.2.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst setup
-DEPEND=app-crypt/gpgme >=dev-lang/go-1.19.0 dev-libs/openssl sys-apps/util-linux sys-fs/cryptsetup sys-fs/squashfs-tools sys-libs/libseccomp !suid? ( sys-fs/e2fsprogs[fuse] sys-fs/squashfuse )
-DESCRIPTION=The container system for secure high-performance computing
-EAPI=8
-HOMEPAGE=https://apptainer.org/
-INHERIT=linux-info toolchain-funcs
-IUSE=examples +network suid systemd
-KEYWORDS=amd64 ~riscv ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=app-crypt/gpgme >=dev-lang/go-1.19.0 dev-libs/openssl sys-apps/util-linux sys-fs/cryptsetup sys-fs/squashfs-tools sys-libs/libseccomp !suid? ( sys-fs/e2fsprogs[fuse] sys-fs/squashfuse ) !sys-cluster/singularity
-SLOT=0
-SRC_URI=https://github.com/apptainer/apptainer/releases/download/v1.2.4/apptainer-1.2.4.tar.gz
-_eclasses_=linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=cce5e9f6a971cb10f0c694a0e359994b
diff --git a/metadata/md5-cache/app-containers/apptainer-1.3.0 b/metadata/md5-cache/app-containers/apptainer-1.3.0
index 73e5423a0888..5106bb84ca2d 100644
--- a/metadata/md5-cache/app-containers/apptainer-1.3.0
+++ b/metadata/md5-cache/app-containers/apptainer-1.3.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://apptainer.org/
 INHERIT=linux-info toolchain-funcs
 IUSE=examples +network suid systemd
-KEYWORDS=~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=app-crypt/gpgme >=dev-lang/go-1.20.0 dev-libs/openssl sys-apps/util-linux sys-fs/cryptsetup sys-fs/squashfs-tools sys-libs/libseccomp !suid? ( sys-fs/e2fsprogs[fuse] sys-fs/squashfuse ) !sys-cluster/singularity
 SLOT=0
 SRC_URI=https://github.com/apptainer/apptainer/releases/download/v1.3.0/apptainer-1.3.0.tar.gz
 _eclasses_=linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=5a8a9c7625539fcd9f1457c9e2a19ba8
+_md5_=601923bdf82987f78533b9187daa53f0
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index b5951b8ba0ee..377102ca732a 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-5.4.0 b/metadata/md5-cache/app-crypt/yubikey-manager-5.4.0
new file mode 100644
index 000000000000..a035af34ba15
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-5.4.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/makefun[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) verify-sig? ( >=sec-keys/openpgp-keys-yubico-20220824 ) test? ( app-crypt/ccid >=dev-python/click-8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/cryptography-45[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/fido2:0/1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/keyring-25[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyscard-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ssl? ( >=dev-python/pyopenssl-0.15.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) >=dev-python/pytest-7.3.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 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/poetry-core-1.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Python library and command line tool for configuring a YubiKey
+EAPI=8
+HOMEPAGE=https://developers.yubico.com/yubikey-manager/
+INHERIT=distutils-r1 verify-sig
+IUSE=ssl test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 verify-sig
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=BSD-2
+RDEPEND=app-crypt/ccid >=dev-python/click-8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/cryptography-45[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/fido2:0/1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/keyring-25[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyscard-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ssl? ( >=dev-python/pyopenssl-0.15.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://developers.yubico.com/yubikey-manager/Releases/yubikey_manager-5.4.0.tar.gz verify-sig? ( https://developers.yubico.com/yubikey-manager/Releases/yubikey_manager-5.4.0.tar.gz.sig )
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_md5_=26c4952d93b6e93ff399e68d047698ce
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index c174e90d13d0..a6737080390a 100644
--- a/metadata/md5-cache/app-forensics/Manifest.gz
+++ b/metadata/md5-cache/app-forensics/Manifest.gz
diff --git a/metadata/md5-cache/app-forensics/radamsa-0.7 b/metadata/md5-cache/app-forensics/radamsa-0.7
new file mode 100644
index 000000000000..6a7adda8cefc
--- /dev/null
+++ b/metadata/md5-cache/app-forensics/radamsa-0.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=A general-purpose fuzzer
+EAPI=8
+HOMEPAGE=https://gitlab.com/akihe/radamsa
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RESTRICT=test
+SLOT=0
+SRC_URI=https://gitlab.com/akihe/radamsa/-/archive/v0.7/radamsa-v0.7.tar.bz2 https://gitlab.com/akihe/radamsa/uploads/d774a42f7893012d0a56c490a75ae12b/radamsa-0.7.c.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=40e1feea3239f33434a222197a6da841
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index c223fce09c2f..f5473048ff3e 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/rmlint-2.10.1-r2 b/metadata/md5-cache/app-misc/rmlint-2.10.1-r2
deleted file mode 100644
index 4cb494898ece..000000000000
--- a/metadata/md5-cache/app-misc/rmlint-2.10.1-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_11(-)] ) ) nls? ( sys-devel/gettext ) test? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) app-shells/dash python_single_target_python3_10? ( dev-python/nose[python_targets_python3_10(-)] dev-python/parameterized[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyxattr[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/nose[python_targets_python3_11(-)] dev-python/parameterized[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] dev-python/pyxattr[python_targets_python3_11(-)] ) ) python_single_target_python3_10? ( >=dev-build/scons-4.4.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-build/scons-4.4.0[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-libs/glib:2 dev-libs/json-glib virtual/libelf:0=
-DESCRIPTION=Extremely fast tool to remove duplicates and other lint from your filesystem
-EAPI=8
-HOMEPAGE=https://rmlint.readthedocs.io/
-INHERIT=gnome2-utils python-single-r1 scons-utils toolchain-funcs
-IUSE=doc gui nls test python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib virtual/libelf:0= gui? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) gnome-base/librsvg:2[introspection] sys-auth/polkit[introspection] x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] x11-libs/gtksourceview:3.0[introspection] x11-libs/pango[introspection] python_single_target_python3_10? ( dev-python/colorlog[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/colorlog[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sahib/rmlint/archive/v2.10.1.tar.gz -> rmlint-2.10.1.tar.gz
-_eclasses_=gnome2-utils	30dbce54b89e77b86f366548f94419ad	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	scons-utils	b3544637c85286a19000d59461d3a7a5	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=073a80a406453f35b6f90e8c32f8022a
diff --git a/metadata/md5-cache/app-misc/rmlint-2.10.2 b/metadata/md5-cache/app-misc/rmlint-2.10.2
deleted file mode 100644
index 11f5bd32219d..000000000000
--- a/metadata/md5-cache/app-misc/rmlint-2.10.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_11(-)] ) ) nls? ( sys-devel/gettext ) test? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) app-shells/dash python_single_target_python3_10? ( dev-python/nose[python_targets_python3_10(-)] dev-python/parameterized[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyxattr[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/nose[python_targets_python3_11(-)] dev-python/parameterized[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] dev-python/pyxattr[python_targets_python3_11(-)] ) ) python_single_target_python3_10? ( >=dev-build/scons-4.4.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-build/scons-4.4.0[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-libs/glib:2 dev-libs/json-glib virtual/libelf:0=
-DESCRIPTION=Extremely fast tool to remove duplicates and other lint from your filesystem
-EAPI=8
-HOMEPAGE=https://rmlint.readthedocs.io/
-INHERIT=gnome2-utils python-single-r1 scons-utils toolchain-funcs
-IUSE=doc gui nls test python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib virtual/libelf:0= gui? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) gnome-base/librsvg:2[introspection] x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] x11-libs/gtksourceview:3.0[introspection] x11-libs/pango[introspection] python_single_target_python3_10? ( dev-python/colorlog[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/colorlog[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sahib/rmlint/archive/v2.10.2.tar.gz -> rmlint-2.10.2.tar.gz
-_eclasses_=gnome2-utils	30dbce54b89e77b86f366548f94419ad	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	scons-utils	b3544637c85286a19000d59461d3a7a5	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=47eba8e72e3ffb29b05d9429e98c689b
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 5e06b83314d2..b005d34e0439 100644
--- a/metadata/md5-cache/app-vim/Manifest.gz
+++ b/metadata/md5-cache/app-vim/Manifest.gz
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-14 b/metadata/md5-cache/app-vim/gentoo-syntax-14
new file mode 100644
index 000000000000..6a565a954a9d
--- /dev/null
+++ b/metadata/md5-cache/app-vim/gentoo-syntax-14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: Gentoo and Portage syntax highlighting
+EAPI=7
+HOMEPAGE=https://github.com/gentoo/gentoo-syntax
+INHERIT=vim-plugin
+IUSE=ignore-glep31
+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=vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/gentoo-syntax-14.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=b2f59b9e9d39e70c38399cd30e66e499
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index f88a20a81e4d..c5d53c891b97 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/libodb-2.5.0_beta19 b/metadata/md5-cache/dev-cpp/libodb-2.5.0_beta19
deleted file mode 100644
index 2ad543bb7c4e..000000000000
--- a/metadata/md5-cache/dev-cpp/libodb-2.5.0_beta19
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Common ODB runtime library
-EAPI=7
-HOMEPAGE=https://codesynthesis.com/products/odb/
-INHERIT=toolchain-funcs multiprocessing
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Code-Synthesis-ODB GPL-2 )
-RDEPEND=!<dev-util/build2-0.13.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://pkg.cppget.org/1/beta/odb/libodb-2.5.0-b.19.tar.gz https://download.build2.org/0.13.0/build2-toolchain-0.13.0.tar.xz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=1e06728f1beeb5f82cce128b2a8f9f34
diff --git a/metadata/md5-cache/dev-cpp/libodb-2.5.0_beta21 b/metadata/md5-cache/dev-cpp/libodb-2.5.0_beta21
deleted file mode 100644
index f8356f3a5379..000000000000
--- a/metadata/md5-cache/dev-cpp/libodb-2.5.0_beta21
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Common ODB runtime library
-EAPI=8
-HOMEPAGE=https://codesynthesis.com/products/odb/
-INHERIT=toolchain-funcs multiprocessing
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Code-Synthesis-ODB GPL-2 )
-RDEPEND=!<dev-util/build2-0.14.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://pkg.cppget.org/1/beta/odb/libodb-2.5.0-b.21.tar.gz https://download.build2.org/0.14.0/build2-toolchain-0.14.0.tar.xz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=18debd1305b45a5ffc047171b3d5b32b
diff --git a/metadata/md5-cache/dev-cpp/libodb-2.5.0_beta25 b/metadata/md5-cache/dev-cpp/libodb-2.5.0_beta25
deleted file mode 100644
index 9b4d7f015b62..000000000000
--- a/metadata/md5-cache/dev-cpp/libodb-2.5.0_beta25
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Common ODB runtime library
-EAPI=8
-HOMEPAGE=https://codesynthesis.com/products/odb/
-INHERIT=toolchain-funcs multiprocessing
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Code-Synthesis-ODB GPL-2 )
-RDEPEND=!<dev-util/build2-0.15.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://pkg.cppget.org/1/beta/odb/libodb-2.5.0-b.25.tar.gz https://download.build2.org/0.15.0/build2-toolchain-0.15.0.tar.xz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=0d66a51e3c0d9c5287b12ea365e4cf31
diff --git a/metadata/md5-cache/dev-cpp/libodb-sqlite-2.5.0_beta19 b/metadata/md5-cache/dev-cpp/libodb-sqlite-2.5.0_beta19
deleted file mode 100644
index 220c56b1203c..000000000000
--- a/metadata/md5-cache/dev-cpp/libodb-sqlite-2.5.0_beta19
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/libodb dev-db/sqlite:3
-DESCRIPTION=Common ODB runtime library
-EAPI=7
-HOMEPAGE=https://codesynthesis.com/products/odb/
-INHERIT=toolchain-funcs multiprocessing
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Code-Synthesis-ODB GPL-2 )
-RDEPEND=dev-cpp/libodb dev-db/sqlite:3 !<dev-util/build2-0.13.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://pkg.cppget.org/1/beta/odb/libodb-sqlite-2.5.0-b.19.tar.gz https://download.build2.org/0.13.0/build2-toolchain-0.13.0.tar.xz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=dd3df672dc39bb2dbc8d7a06ac9d1c8f
diff --git a/metadata/md5-cache/dev-cpp/libodb-sqlite-2.5.0_beta21 b/metadata/md5-cache/dev-cpp/libodb-sqlite-2.5.0_beta21
deleted file mode 100644
index a3bdabca67c0..000000000000
--- a/metadata/md5-cache/dev-cpp/libodb-sqlite-2.5.0_beta21
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/libodb dev-db/sqlite:3
-DESCRIPTION=Common ODB runtime library
-EAPI=8
-HOMEPAGE=https://codesynthesis.com/products/odb/
-INHERIT=toolchain-funcs multiprocessing
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Code-Synthesis-ODB GPL-2 )
-RDEPEND=dev-cpp/libodb dev-db/sqlite:3 !<dev-util/build2-0.14.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://pkg.cppget.org/1/beta/odb/libodb-sqlite-2.5.0-b.21.tar.gz https://download.build2.org/0.14.0/build2-toolchain-0.14.0.tar.xz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=906c2dca2ccfecb90b3c72b51baeda52
diff --git a/metadata/md5-cache/dev-cpp/libodb-sqlite-2.5.0_beta25 b/metadata/md5-cache/dev-cpp/libodb-sqlite-2.5.0_beta25
deleted file mode 100644
index 946706fd0268..000000000000
--- a/metadata/md5-cache/dev-cpp/libodb-sqlite-2.5.0_beta25
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/libodb dev-db/sqlite:3
-DESCRIPTION=Common ODB runtime library
-EAPI=8
-HOMEPAGE=https://codesynthesis.com/products/odb/
-INHERIT=toolchain-funcs multiprocessing
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Code-Synthesis-ODB GPL-2 )
-RDEPEND=dev-cpp/libodb dev-db/sqlite:3 !<dev-util/build2-0.15.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://pkg.cppget.org/1/beta/odb/libodb-sqlite-2.5.0-b.25.tar.gz https://download.build2.org/0.15.0/build2-toolchain-0.15.0.tar.xz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=33e3faf5f87c35192d41b0de611c9dd3
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 12a639e6078e..43841c6dccd7 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/eclipse-ecj-4.31 b/metadata/md5-cache/dev-java/eclipse-ecj-4.31
new file mode 100644
index 000000000000..93411d62315b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.31
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
+DEPEND=app-eselect/eselect-java >=dev-java/ant-1.10.14:0 >=virtual/jdk-21:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Eclipse Compiler for Java
+EAPI=8
+HOMEPAGE=https://www.eclipse.org/
+INHERIT=java-pkg-2 java-pkg-simple prefix
+IUSE=doc source
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=EPL-1.0
+RDEPEND=app-eselect/eselect-java >=virtual/jre-17:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=4.31
+SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.31-202402290520/ecjsrc-4.31.jar
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	67f37f8db9bdf7868f26504fd7bcbb22	java-utils-2	b346c3901e71ba37137bae0b25b00221	prefix	eab3c99d77fe00506c109c8a736186f7
+_md5_=80e0a3d73d352b8efc9335547efd1763
diff --git a/metadata/md5-cache/dev-java/icedtea-3.21.0 b/metadata/md5-cache/dev-java/icedtea-3.21.0
deleted file mode 100644
index 837337aa0d2c..000000000000
--- a/metadata/md5-cache/dev-java/icedtea-3.21.0
+++ /dev/null
@@ -1,17 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=>=dev-libs/glib-2.26:2= >=dev-debug/systemtap-1 media-libs/fontconfig:1.0= >=media-libs/freetype-2.5.3:2= >=sys-libs/zlib-1.2.3 virtual/jpeg:0= gtk? ( >=dev-libs/atk-1.30.0 >=x11-libs/cairo-1.8.8 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2 >=x11-libs/pango-1.24.5 ) kerberos? ( virtual/krb5 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) system-lcms? ( >=media-libs/lcms-2.9:2= ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 >=media-libs/giflib-4.1.6:0= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXcomposite x11-base/xorg-proto >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 || ( dev-java/openjdk-bin:8 dev-java/openjdk:8 dev-java/icedtea-bin:8 dev-java/icedtea:8 ) app-alternatives/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates dev-lang/perl dev-libs/openssl:0 sys-apps/attr sys-apps/lsb-release x11-libs/libXt virtual/pkgconfig pax-kernel? ( sys-apps/elfix ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java app-arch/unzip
-DESCRIPTION=A harness to build OpenJDK using Free Software build tools and dependencies
-EAPI=6
-HOMEPAGE=https://icedtea.classpath.org
-INHERIT=check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs xdg-utils
-IUSE=+alsa cacao +cups doc examples +gtk headless-awt jamvm +jbootstrap kerberos pax-kernel pch pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C
-PDEPEND=pulseaudio? ( dev-java/icedtea-sound )
-RDEPEND=>=dev-libs/glib-2.26:2= >=dev-debug/systemtap-1 media-libs/fontconfig:1.0= >=media-libs/freetype-2.5.3:2= >=sys-libs/zlib-1.2.3 virtual/jpeg:0= gtk? ( >=dev-libs/atk-1.30.0 >=x11-libs/cairo-1.8.8 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2 >=x11-libs/pango-1.24.5 ) kerberos? ( virtual/krb5 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) system-lcms? ( >=media-libs/lcms-2.9:2= ) !dev-java/icedtea:0 !dev-java/icedtea-web:7 >=gnome-base/gsettings-desktop-schemas-3.12.2 >=sys-apps/baselayout-java-0.1.0-r1 virtual/ttf-fonts alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-1.2.12 ) !headless-awt? ( >=media-libs/giflib-4.1.6:0= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXcomposite ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-REQUIRED_USE=gtk? ( !headless-awt )
-RESTRICT=!test? ( test )
-SLOT=8
-SRC_URI=https://icedtea.classpath.org/download/source/icedtea-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/openjdk.tar.xz -> icedtea-3.21-openjdk-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/corba.tar.xz -> icedtea-3.21-corba-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/jaxp.tar.xz -> icedtea-3.21-jaxp-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/jaxws.tar.xz -> icedtea-3.21-jaxws-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/jdk.tar.xz -> icedtea-3.21-jdk-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/hotspot.tar.xz -> icedtea-3.21-hotspot-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/nashorn.tar.xz -> icedtea-3.21-nashorn-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/langtools.tar.xz -> icedtea-3.21-langtools-3.21.0.tar.xz shenandoah? ( https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/shenandoah.tar.xz -> icedtea-3.21-shenandoah-3.21.0.tar.xz ) arm? ( https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/aarch32.tar.xz -> icedtea-3.21-aarch32-3.21.0.tar.xz ) https://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.xz -> icedtea-cacao-c182f119eaad.tar.xz https://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=32501b2665790bda62bfbe7900c6a8b9
diff --git a/metadata/md5-cache/dev-java/swt-4.31 b/metadata/md5-cache/dev-java/swt-4.31
new file mode 100644
index 000000000000..c98d11dc6a74
--- /dev/null
+++ b/metadata/md5-cache/dev-java/swt-4.31
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=app-accessibility/at-spi2-core:2 dev-libs/glib x11-libs/gtk+:3 x11-libs/libXtst cairo? ( x11-libs/cairo ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4.1 ) >=virtual/jdk-17:*[-headless-awt] x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt x11-libs/libXtst >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=GTK based SWT Library
+EAPI=8
+HOMEPAGE=https://www.eclipse.org/swt/
+INHERIT=flag-o-matic java-pkg-2 java-pkg-simple toolchain-funcs
+IUSE=cairo opengl webkit doc source
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
+RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/glib x11-libs/gtk+:3 x11-libs/libXtst cairo? ( x11-libs/cairo ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4.1 ) >=virtual/jre-17:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=4.31
+SRC_URI=amd64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.31-202402290520/swt-4.31-gtk-linux-x86_64.zip ) arm64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.31-202402290520/swt-4.31-gtk-linux-aarch64.zip ) ppc64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.31-202402290520/swt-4.31-gtk-linux-ppc64le.zip )
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	67f37f8db9bdf7868f26504fd7bcbb22	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=7048c5989e6bc54f1469e495b804d4b2
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 22263679d2f6..1801d8ec85c3 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/ell-0.58 b/metadata/md5-cache/dev-libs/ell-0.58
deleted file mode 100644
index e5b57eb82864..000000000000
--- a/metadata/md5-cache/dev-libs/ell-0.58
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=test? ( sys-apps/dbus )
-DESCRIPTION=Embedded Linux Library provides core, low-level functionality for system daemons
-EAPI=8
-HOMEPAGE=https://git.kernel.org/pub/scm/libs/ell/ell.git
-INHERIT=flag-o-matic linux-info
-IUSE=pie test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86
-LICENSE=LGPL-2.1+
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.58.tar.xz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=1dc32518c3296aca77045a8daa94105c
diff --git a/metadata/md5-cache/dev-libs/ell-0.61 b/metadata/md5-cache/dev-libs/ell-0.61
deleted file mode 100644
index bee18a744793..000000000000
--- a/metadata/md5-cache/dev-libs/ell-0.61
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=test? ( sys-apps/dbus )
-DESCRIPTION=Embedded Linux Library provides core, low-level functionality for system daemons
-EAPI=8
-HOMEPAGE=https://git.kernel.org/pub/scm/libs/ell/ell.git
-INHERIT=flag-o-matic linux-info
-IUSE=pie test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=LGPL-2.1+
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.61.tar.xz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=31ba45118fcbb538fe63210ed06f0318
diff --git a/metadata/md5-cache/dev-libs/ell-0.63 b/metadata/md5-cache/dev-libs/ell-0.64
index 4006cbcc804d..1497850d080d 100644
--- a/metadata/md5-cache/dev-libs/ell-0.63
+++ b/metadata/md5-cache/dev-libs/ell-0.64
@@ -9,6 +9,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~
 LICENSE=LGPL-2.1+
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.63.tar.xz
+SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.64.tar.xz
 _eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=a8ebb49db5ef599372b753adff97f233
diff --git a/metadata/md5-cache/dev-libs/libtsm-4.0.2 b/metadata/md5-cache/dev-libs/libtsm-4.0.2_p20231223
index d79ad1686b5c..b5e21d4501d7 100644
--- a/metadata/md5-cache/dev-libs/libtsm-4.0.2
+++ b/metadata/md5-cache/dev-libs/libtsm-4.0.2_p20231223
@@ -1,12 +1,12 @@
 BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Terminal Emulator State Machine
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/Aetf/libtsm
 INHERIT=cmake
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1 MIT
 SLOT=0/4
-SRC_URI=https://github.com/Aetf/libtsm/archive/v4.0.2.tar.gz -> libtsm-4.0.2.tar.gz
+SRC_URI=https://github.com/Aetf/libtsm/archive/69922bde02c7af83b4d48a414cc6036af7388626.tar.gz -> libtsm-4.0.2_p20231223.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=40c41bd6e88d16b72338e5177fe14ff9
+_md5_=4f47ec90c45887a6aaeaed445cdea8b0
diff --git a/metadata/md5-cache/dev-libs/zlog-1.2.15 b/metadata/md5-cache/dev-libs/zlog-1.2.15
deleted file mode 100644
index 77d857d59238..000000000000
--- a/metadata/md5-cache/dev-libs/zlog-1.2.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DESCRIPTION=A reliable, thread safe, clear-model, pure C logging library
-EAPI=7
-HOMEPAGE=http://hardysimpson.github.io/zlog/
-INHERIT=toolchain-funcs
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/HardySimpson/zlog/archive/1.2.15.tar.gz -> zlog-v1.2.15.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f10404e4ee4f2e0e7815d0411f395d53
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index c3ee373f9727..8e0437419665 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/boto-2.49.0-r6 b/metadata/md5-cache/dev-python/boto-2.49.0-r6
deleted file mode 100644
index b044a8de2a81..000000000000
--- a/metadata/md5-cache/dev-python/boto-2.49.0-r6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/six-1.12.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/httpretty[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/keyring[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/paramiko[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/selenium[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/six-1.12.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nose-1.3.7_p20221026[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 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Amazon Web Services API
-EAPI=8
-HOMEPAGE=https://github.com/boto/boto https://pypi.org/project/boto/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=MIT
-RDEPEND=>=dev-python/six-1.12.0[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://files.pythonhosted.org/packages/source/b/boto/boto-2.49.0.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=25b01a37682c43d04903a223f14ed553
diff --git a/metadata/md5-cache/dev-python/bsddb3-6.2.9-r1 b/metadata/md5-cache/dev-python/bsddb3-6.2.9-r1
deleted file mode 100644
index 11caa247e97a..000000000000
--- a/metadata/md5-cache/dev-python/bsddb3-6.2.9-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=<sys-libs/db-6.1:= || ( sys-libs/db:5.3 sys-libs/db:4.8 ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] )
-DESCRIPTION=Python bindings for Berkeley DB
-EAPI=8
-HOMEPAGE=https://www.jcea.es/programacion/pybsddb.htm https://pypi.org/project/bsddb3/
-INHERIT=db-use distutils-r1 pypi
-IUSE=python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=<sys-libs/db-6.1:= || ( sys-libs/db:5.3 sys-libs/db:4.8 ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/b/bsddb3/bsddb3-6.2.9.tar.gz https://dev.gentoo.org/~arthurzam/patches/dev-python/bsddb3-6.2.9-fix-py3.10.patch.gz
-_eclasses_=db-use	3807d3e43e20aaa6e4decedd2bb2db4c	distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=41fa063a3ecf383e2421cc3defc5386e
diff --git a/metadata/md5-cache/dev-python/debugpy-1.6.6 b/metadata/md5-cache/dev-python/debugpy-1.6.6
deleted file mode 100644
index 58e09a93eb2d..000000000000
--- a/metadata/md5-cache/dev-python/debugpy-1.6.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-timeout[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/pydevd[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[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 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An implementation of the Debug Adapter Protocol for Python
-EAPI=8
-HOMEPAGE=https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/pydevd[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? ( test )
-SLOT=0
-SRC_URI=https://github.com/microsoft/debugpy/archive/v1.6.6.tar.gz -> debugpy-1.6.6.gh.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=8060b660951ca6ba10679b9418e0c9b7
diff --git a/metadata/md5-cache/dev-python/debugpy-1.8.0 b/metadata/md5-cache/dev-python/debugpy-1.8.0
deleted file mode 100644
index 98d13950e4e4..000000000000
--- a/metadata/md5-cache/dev-python/debugpy-1.8.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( 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/pytest-timeout[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/pydevd[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.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 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An implementation of the Debug Adapter Protocol for Python
-EAPI=8
-HOMEPAGE=https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/
-INHERIT=distutils-r1 multiprocessing
-IUSE=test 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/pydevd[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/microsoft/debugpy/archive/v1.8.0.tar.gz -> debugpy-1.8.0.gh.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=1a8e6eb5972a64f7f6080cfe2f89ed41
diff --git a/metadata/md5-cache/dev-python/elastic-transport-8.13.0 b/metadata/md5-cache/dev-python/elastic-transport-8.13.0
new file mode 100644
index 000000000000..59d195ba2782
--- /dev/null
+++ b/metadata/md5-cache/dev-python/elastic-transport-8.13.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/aiohttp[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/httpx[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/mock[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/opentelemetry-api[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/opentelemetry-sdk[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/orjson[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-asyncio[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-httpserver[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/respx[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/trustme[python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) doc? ( || ( ( dev-lang/python:3.12 >=dev-python/sphinx-5.3.0[python_targets_python3_12(-)] dev-python/furo[python_targets_python3_12(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/furo[python_targets_python3_11(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_11(-)] ) ) ) test? ( dev-python/certifi[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/urllib3-1.26.2[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) 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_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Transport classes and utilities shared among Python Elastic client libraries
+EAPI=8
+HOMEPAGE=https://github.com/elastic/elastic-transport-python/ https://pypi.org/project/elastic-transport/
+INHERIT=distutils-r1
+IUSE=doc test python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+PROPERTIES=test_network
+RDEPEND=dev-python/certifi[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/urllib3-1.26.2[python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/elastic/elastic-transport-python/archive/v8.13.0.tar.gz -> elastic-transport-python-8.13.0.gh.tar.gz
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=81c384241ab2d5c682cf372e571c9e23
diff --git a/metadata/md5-cache/dev-python/elasticsearch-8.13.0 b/metadata/md5-cache/dev-python/elasticsearch-8.13.0
new file mode 100644
index 000000000000..492f3351d80f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/elasticsearch-8.13.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( <dev-python/aiohttp-4[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/aiohttp-3[python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/elastic-transport-9[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/elastic-transport-8.13[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/orjson-3[python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/requests-3[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.4[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/mapbox-vector-tile[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/numpy[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/opentelemetry-api[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/opentelemetry-sdk[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pandas[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-asyncio[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dateutil[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyyaml-5.4[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/unasync[python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) doc? ( || ( ( dev-lang/python:3.12 >=dev-python/sphinx-5.3.0[python_targets_python3_12(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ) ) test? ( <dev-python/aiohttp-4[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/aiohttp-3[python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/elastic-transport-9[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/elastic-transport-8.13[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/orjson-3[python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/requests-3[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.4[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) 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_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Official Elasticsearch client library for Python
+EAPI=8
+HOMEPAGE=https://ela.st/es-python https://github.com/elastic/elasticsearch-py/ https://pypi.org/project/elasticsearch/
+INHERIT=distutils-r1
+IUSE=doc test python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=<dev-python/aiohttp-4[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/aiohttp-3[python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/elastic-transport-9[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/elastic-transport-8.13[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/orjson-3[python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/requests-3[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.4[python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0/8
+SRC_URI=https://github.com/elastic/elasticsearch-py/archive/v8.13.0.tar.gz -> elasticsearch-py-8.13.0.gh.tar.gz
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=34c3bc4a4ddf03a057c14546875349cf
diff --git a/metadata/md5-cache/dev-python/fb-re2-1.0.7-r1 b/metadata/md5-cache/dev-python/fb-re2-1.0.7-r1
deleted file mode 100644
index da3893e3b200..000000000000
--- a/metadata/md5-cache/dev-python/fb-re2-1.0.7-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-libs/re2:= 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-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/re2:= 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 dev-libs/re2
-EAPI=8
-HOMEPAGE=https://github.com/facebook/pyre2/ https://pypi.org/project/fb-re2/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/re2:= 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/facebook/pyre2/archive/v1.0.7.tar.gz -> pyre2-1.0.7.gh.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=baee35ae5da200293a622cdd4806eaaf
diff --git a/metadata/md5-cache/dev-python/flask-gravatar-0.5.0-r2 b/metadata/md5-cache/dev-python/flask-gravatar-0.5.0-r2
deleted file mode 100644
index 516cc67749da..000000000000
--- a/metadata/md5-cache/dev-python/flask-gravatar-0.5.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( <dev-python/flask-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.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 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Small extension for Flask to make usage of Gravatar service easy
-EAPI=8
-HOMEPAGE=https://github.com/zzzsochi/Flask-Gravatar/ https://pypi.org/project/Flask-Gravatar/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=BSD
-RDEPEND=<dev-python/flask-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? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/F/Flask-Gravatar/Flask-Gravatar-0.5.0.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f62f9c0aa38c40adf67735ac7d9e1408
diff --git a/metadata/md5-cache/dev-python/flask-paginate-2024.3.28 b/metadata/md5-cache/dev-python/flask-paginate-2024.3.28
new file mode 100644
index 000000000000..53b0c0428e7e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-paginate-2024.3.28
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.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 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pagination support for flask
+EAPI=8
+HOMEPAGE=https://flask-paginate.readthedocs.io/ https://github.com/lixxu/flask-paginate/ https://pypi.org/project/flask-paginate/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/flask[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/lixxu/flask-paginate/archive/v2024.3.28.tar.gz -> flask-paginate-2024.3.28.gh.tar.gz
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=3fd6c0e029b1b378e4107ac048a5f0e3
diff --git a/metadata/md5-cache/dev-python/irc-20.4.0 b/metadata/md5-cache/dev-python/irc-20.4.0
new file mode 100644
index 000000000000..5d3743649ea2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/irc-20.4.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/setuptools-scm-3.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/jaraco-collections[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jaraco-functools-1.20[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jaraco-itertools-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jaraco-logging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jaraco-stream[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jaraco-text[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/more-itertools[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/tempora-1.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.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 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=IRC client framework written in Python
+EAPI=8
+HOMEPAGE=https://github.com/jaraco/irc/ https://pypi.org/project/irc/
+INHERIT=distutils-r1 pypi
+IUSE=examples test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=dev-python/jaraco-collections[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jaraco-functools-1.20[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jaraco-itertools-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jaraco-logging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jaraco-stream[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jaraco-text[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/more-itertools[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/tempora-1.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/i/irc/irc-20.4.0.tar.gz
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=2c731fc034ed9672a1f01a7c695a4fcf
diff --git a/metadata/md5-cache/dev-python/lxml-5.1.1 b/metadata/md5-cache/dev-python/lxml-5.1.1
new file mode 100644
index 000000000000..354a1bcde37c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lxml-5.1.1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig >=dev-python/cython-3.0.9[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] doc? ( || ( ( dev-lang/python:3.12 dev-python/docutils[python_targets_python3_12(-)] dev-python/pygments[python_targets_python3_12(-)] dev-python/sphinx[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/docutils[python_targets_python3_11(-)] dev-python/pygments[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/docutils[python_targets_python3_10(-)] dev-python/pygments[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( dev-python/pypy3 dev-python/docutils[python_targets_pypy3(-)] dev-python/pygments[python_targets_pypy3(-)] dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinx-rtd-theme[python_targets_pypy3(-)] ) ) ) test? ( dev-python/cssselect[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-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-libs/libxml2-2.10.3 >=dev-libs/libxslt-1.1.38 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=A Pythonic binding for the libxml2 and libxslt libraries
+EAPI=8
+HOMEPAGE=https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml/
+INHERIT=distutils-r1 optfeature toolchain-funcs
+IUSE=doc examples +threads 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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=BSD ElementTree GPL-2 PSF-2
+RDEPEND=>=dev-libs/libxml2-2.10.3 >=dev-libs/libxslt-1.1.38 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/lxml/lxml/archive/lxml-5.1.1.tar.gz -> lxml-5.1.1.gh.tar.gz
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=4d93a8d545bb2b53a4bca89fe42d6302
diff --git a/metadata/md5-cache/dev-python/nose-1.3.7_p20221026 b/metadata/md5-cache/dev-python/nose-1.3.7_p20221026
deleted file mode 100644
index 2f7b53f9cfac..000000000000
--- a/metadata/md5-cache/dev-python/nose-1.3.7_p20221026
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( !hppa? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_10? ( !hppa? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_10? ( dev-python/twisted[python_targets_python3_10(-)?] ) ) 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(+)] ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Unittest extension with automatic test suite discovery and easy test authoring
-EAPI=8
-HOMEPAGE=https://pypi.org/project/nose/ https://nose.readthedocs.io/en/latest/ https://github.com/nose-devs/nose
-INHERIT=distutils-r1
-IUSE=examples test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=LGPL-2.1
-RDEPEND=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(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/arthurzam/nose/archive/8def1b4dcf2ef6b4a34bffdfacea0018a78b06b6.tar.gz -> nose-1.3.7_p20221026.gh.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=15748610d52ab6db123e0eff3dfca820
diff --git a/metadata/md5-cache/dev-python/opentelemetry-api-1.23.0 b/metadata/md5-cache/dev-python/opentelemetry-api-1.23.0
new file mode 100644
index 000000000000..59a995f55acf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/opentelemetry-api-1.23.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/asgiref[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/attrs[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flaky[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/iniconfig[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pluggy[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/py-cpuinfo[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/py[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/typing-extensions[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/wrapt[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/zipp[python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/deprecated-1.2.6[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/importlib-metadata[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) 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_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.17.0[python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=OpenTelemetry Python API
+EAPI=8
+HOMEPAGE=https://opentelemetry.io/ https://pypi.org/project/opentelemetry-api/ https://github.com/open-telemetry/opentelemetry-python/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/deprecated-1.2.6[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/importlib-metadata[python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/open-telemetry/opentelemetry-python/archive/refs/tags/v1.23.0.tar.gz -> opentelemetry-python-1.23.0.gh.tar.gz
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=9d2b1932006918fc3d9e8d8442181270
diff --git a/metadata/md5-cache/dev-python/opentelemetry-sdk-1.23.0 b/metadata/md5-cache/dev-python/opentelemetry-sdk-1.23.0
new file mode 100644
index 000000000000..d32491e83f33
--- /dev/null
+++ b/metadata/md5-cache/dev-python/opentelemetry-sdk-1.23.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/asgiref[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/attrs[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/deprecated[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flaky[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/importlib-metadata[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/iniconfig[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pluggy[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/py-cpuinfo[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/py[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/wrapt[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/zipp[python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( ~dev-python/opentelemetry-api-1.23.0[python_targets_python3_11(-)?,python_targets_python3_12(-)?] ~dev-python/opentelemetry-semantic-conventions-1.23.0[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/typing-extensions[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) 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_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.17.0[python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=OpenTelemetry Python SDK
+EAPI=8
+HOMEPAGE=https://opentelemetry.io/ https://pypi.org/project/opentelemetry-sdk/ https://github.com/open-telemetry/opentelemetry-python/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=~dev-python/opentelemetry-api-1.23.0[python_targets_python3_11(-)?,python_targets_python3_12(-)?] ~dev-python/opentelemetry-semantic-conventions-1.23.0[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/typing-extensions[python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/open-telemetry/opentelemetry-python/archive/refs/tags/v1.23.0.tar.gz -> opentelemetry-python-1.23.0.gh.tar.gz
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=1c1038e8dee3d45aa155e092fa53f466
diff --git a/metadata/md5-cache/dev-python/opentelemetry-semantic-conventions-1.23.0 b/metadata/md5-cache/dev-python/opentelemetry-semantic-conventions-1.23.0
new file mode 100644
index 000000000000..9bf7d4fe32d0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/opentelemetry-semantic-conventions-1.23.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/asgiref[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/attrs[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/deprecated[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flaky[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/importlib-metadata[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/iniconfig[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pluggy[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/py-cpuinfo[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/py[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/typing-extensions[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/wrapt[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/zipp[python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/pytest-7.3.1[python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) 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_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.17.0[python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=OpenTelemetry Semantic Conventions
+EAPI=8
+HOMEPAGE=https://opentelemetry.io/ https://pypi.org/project/opentelemetry-sdk/ https://github.com/open-telemetry/opentelemetry-python/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/open-telemetry/opentelemetry-python/archive/refs/tags/v1.23.0.tar.gz -> opentelemetry-python-1.23.0.gh.tar.gz
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=c62b93f203e26e2a079270d155de91e7
diff --git a/metadata/md5-cache/dev-python/pendulum-2.1.2-r2 b/metadata/md5-cache/dev-python/pendulum-2.1.2-r2
deleted file mode 100644
index 1ca801d7ddec..000000000000
--- a/metadata/md5-cache/dev-python/pendulum-2.1.2-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/Babel[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/pytz[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytzdata[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.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 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/poetry-core-1.6.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytzdata[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 )
-DESCRIPTION=Drop-in replacement for the standard datetime class
-EAPI=7
-HOMEPAGE=https://pendulum.eustace.io/ https://github.com/sdispater/pendulum/ https://pypi.org/project/pendulum/
-INHERIT=distutils-r1
-IUSE=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=MIT
-RDEPEND=dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytzdata[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/sdispater/pendulum/archive/2.1.2.tar.gz -> pendulum-2.1.2.gh.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=62fa2f54ec6b7628ea9a1b7a8d6425cc
diff --git a/metadata/md5-cache/dev-python/pendulum-3.0.0-r1 b/metadata/md5-cache/dev-python/pendulum-3.0.0-r1
deleted file mode 100644
index e5ee7654daf9..000000000000
--- a/metadata/md5-cache/dev-python/pendulum-3.0.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/Babel[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytz-2022.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/python-dateutil-2.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tzdata-2020.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/time-machine-2.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( >=dev-python/time-machine-2.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( >=dev-python/time-machine-2.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) >=virtual/rust-1.53 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-util/maturin-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-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=Drop-in replacement for the standard datetime class
-EAPI=8
-HOMEPAGE=https://pendulum.eustace.io/ https://github.com/sdispater/pendulum/ https://pypi.org/project/pendulum/
-INHERIT=cargo distutils-r1
-IUSE=test debug python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-LICENSE=MIT Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016
-RDEPEND=>=dev-python/python-dateutil-2.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tzdata-2020.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/time-machine-2.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( >=dev-python/time-machine-2.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( >=dev-python/time-machine-2.6.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/sdispater/pendulum/archive/3.0.0.tar.gz -> pendulum-3.0.0.gh.tar.gz https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.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/indoc/1.0.9/download -> indoc-1.0.9.crate https://crates.io/api/v1/crates/libc/0.2.139/download -> libc-0.2.139.crate https://crates.io/api/v1/crates/libmimalloc-sys/0.1.35/download -> libmimalloc-sys-0.1.35.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/memoffset/0.9.0/download -> memoffset-0.9.0.crate https://crates.io/api/v1/crates/mimalloc/0.1.39/download -> mimalloc-0.1.39.crate https://crates.io/api/v1/crates/once_cell/1.17.1/download -> once_cell-1.17.1.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.7/download -> parking_lot_core-0.9.7.crate https://crates.io/api/v1/crates/proc-macro2/1.0.51/download -> proc-macro2-1.0.51.crate https://crates.io/api/v1/crates/pyo3-build-config/0.19.1/download -> pyo3-build-config-0.19.1.crate https://crates.io/api/v1/crates/pyo3-ffi/0.19.1/download -> pyo3-ffi-0.19.1.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.19.1/download -> pyo3-macros-backend-0.19.1.crate https://crates.io/api/v1/crates/pyo3-macros/0.19.1/download -> pyo3-macros-0.19.1.crate https://crates.io/api/v1/crates/pyo3/0.19.1/download -> pyo3-0.19.1.crate https://crates.io/api/v1/crates/python3-dll-a/0.2.9/download -> python3-dll-a-0.2.9.crate https://crates.io/api/v1/crates/quote/1.0.23/download -> quote-1.0.23.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/target-lexicon/0.12.6/download -> target-lexicon-0.12.6.crate https://crates.io/api/v1/crates/unicode-ident/1.0.6/download -> unicode-ident-1.0.6.crate https://crates.io/api/v1/crates/unindent/0.1.11/download -> unindent-0.1.11.crate https://crates.io/api/v1/crates/windows-sys/0.45.0/download -> windows-sys-0.45.0.crate https://crates.io/api/v1/crates/windows-targets/0.42.1/download -> windows-targets-0.42.1.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.1/download -> windows_aarch64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.1/download -> windows_aarch64_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.1/download -> windows_i686_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.1/download -> windows_i686_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.1/download -> windows_x86_64_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.1/download -> windows_x86_64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.1/download -> windows_x86_64_msvc-0.42.1.crate
-_eclasses_=cargo	4dede41d64d595673f6da62ab5540fa0	distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=eeb6b6a8470c0c56c467bf62e227e281
diff --git a/metadata/md5-cache/dev-python/pplpy-0.8.10 b/metadata/md5-cache/dev-python/pplpy-0.8.10
index c17cb3e69877..44047a05407d 100644
--- a/metadata/md5-cache/dev-python/pplpy-0.8.10
+++ b/metadata/md5-cache/dev-python/pplpy-0.8.10
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_tar
 SLOT=0/0.8.10
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pplpy/pplpy-0.8.10.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a970ebcda23f8b9da1fd6958090249d9
+_md5_=1f8a7fcd7f02d1fdcffe6d1c017e14dc
diff --git a/metadata/md5-cache/dev-python/python-lsp-server-1.11.0 b/metadata/md5-cache/dev-python/python-lsp-server-1.11.0
new file mode 100644
index 000000000000..c595c7146c08
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-lsp-server-1.11.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/autopep8-1.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flaky[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flake8-5.0.0[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/mccabe-0.7.0[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/pycodestyle-2.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyflakes-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pylint-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/whatthepatch-1.0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/yapf-0.33.0[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/QtPy[gui,testlib,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rope-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/docstring-to-markdown[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jedi-0.17.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-lsp-jsonrpc-1.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pluggy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] all-plugins? ( >=dev-python/autopep8-2.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flake8-7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/mccabe-0.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pycodestyle-2.11.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyflakes-3.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pylint-3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/whatthepatch-1.0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/yapf-0.33.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rope-1.11.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) >=dev-python/pytest-7.3.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 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python Language Server for the Language Server Protocol
+EAPI=8
+HOMEPAGE=https://github.com/python-lsp/python-lsp-server/ https://pypi.org/project/python-lsp-server/
+INHERIT=distutils-r1 optfeature pypi
+IUSE=all-plugins test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/docstring-to-markdown[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jedi-0.17.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-lsp-jsonrpc-1.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pluggy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] all-plugins? ( >=dev-python/autopep8-2.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flake8-7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/mccabe-0.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pycodestyle-2.11.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyflakes-3.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pylint-3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/whatthepatch-1.0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/yapf-0.33.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rope-1.11.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/p/python-lsp-server/python-lsp-server-1.11.0.tar.gz
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=eb73116e0398057e1e94cdcb2a912cf4
diff --git a/metadata/md5-cache/dev-python/respx-0.21.1 b/metadata/md5-cache/dev-python/respx-0.21.1
new file mode 100644
index 000000000000..6686f18c042e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/respx-0.21.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/flask[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/httpcore[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/starlette[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/trio[python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/httpx[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) 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_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Mock HTTPX with awesome request patterns and response side effects
+EAPI=8
+HOMEPAGE=https://lundberg.github.io/respx/ https://pypi.org/project/respx/ https://github.com/lundberg/respx/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-python/httpx[python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/lundberg/respx/archive/refs/tags/0.21.1.tar.gz -> respx-0.21.1.gh.tar.gz
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=18d8f22a37e0e229ce66060cd9ca9a93
diff --git a/metadata/md5-cache/dev-python/sip-6.8.3 b/metadata/md5-cache/dev-python/sip-6.8.3
index 6b828b780f46..5a6ffc41a85e 100644
--- a/metadata/md5-cache/dev-python/sip-6.8.3
+++ b/metadata/md5-cache/dev-python/sip-6.8.3
@@ -1,15 +1,16 @@
-BDEPEND=doc? ( >=dev-python/sphinx-5.3.0 ) 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-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+BDEPEND=doc? ( >=dev-python/sphinx-5.3.0 ) test? ( dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/setuptools[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/pytest-7.3.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 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python bindings generator for C/C++ libraries
 EAPI=8
-HOMEPAGE=https://github.com/Python-SIP/sip/ https://pypi.org/project/sip/
+HOMEPAGE=https://github.com/Python-SIP/sip/
 INHERIT=distutils-r1 pypi
-IUSE=doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+IUSE=doc test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 SIP )
 RDEPEND=dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-python/tomli[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 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
 SLOT=5
-SRC_URI=https://files.pythonhosted.org/packages/source/s/sip/sip-6.8.3.tar.gz
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sip/sip-6.8.3.tar.gz test? ( https://github.com/Python-SIP/sip/archive/refs/tags/6.8.3.tar.gz -> sip-6.8.3.gh.tar.gz )
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=8f1914590ee905c6958937da4a1f2203
+_md5_=d14fdc79ec9c98d7045ae2f5adbaf559
diff --git a/metadata/md5-cache/dev-python/tempest-38.0.0 b/metadata/md5-cache/dev-python/tempest-38.0.0
new file mode 100644
index 000000000000..c6c83294b830
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tempest-38.0.0
@@ -0,0 +1,16 @@
+BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/oslotest-3.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/stestr[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-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=OpenStack Integration Testing
+EAPI=8
+HOMEPAGE=https://pypi.org/project/tempest/ https://docs.openstack.org/tempest/latest/ https://launchpad.net/tempest/
+INHERIT=distutils-r1 multiprocessing 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/pbr-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >dev-python/cliff-2.9.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/testtools-2.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/paramiko-2.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/oslo-log-3.36.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/oslo-utils-4.7.0[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/pyyaml-3.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/subunit-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/prettytable-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/urllib3-1.21.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/defusedxml-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/fasteners-0.16.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/t/tempest/tempest-38.0.0.tar.gz
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=b185cdc9b090c9c368f53d70f506174d
diff --git a/metadata/md5-cache/dev-texlive/Manifest.gz b/metadata/md5-cache/dev-texlive/Manifest.gz
index 354e95e9baf6..e688725880da 100644
--- a/metadata/md5-cache/dev-texlive/Manifest.gz
+++ b/metadata/md5-cache/dev-texlive/Manifest.gz
diff --git a/metadata/md5-cache/dev-texlive/texlive-context-2023_p69108 b/metadata/md5-cache/dev-texlive/texlive-context-2023_p69108-r1
index 8fb62142f80c..df67c73650a5 100644
--- a/metadata/md5-cache/dev-texlive/texlive-context-2023_p69108
+++ b/metadata/md5-cache/dev-texlive/texlive-context-2023_p69108-r1
@@ -1,15 +1,15 @@
 BDEPEND=>=app-text/texlive-core-2023 app-arch/xz-utils
 DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=dev-texlive/texlive-basic-2023 >=app-text/texlive-core-2023[xetex]
+DEPEND=>=dev-texlive/texlive-basic-2023 >=app-text/texlive-core-2023[xetex,luajittex?]
 DESCRIPTION=TeXLive ConTeXt and packages
 EAPI=8
 HOMEPAGE=https://www.tug.org/texlive/
 INHERIT=texlive-module
-IUSE=doc source
+IUSE=doc source +luajittex
 KEYWORDS=~amd64 ~arm64 ~ppc ~riscv ~x86
 LICENSE=BSD BSD-2 GPL-1 GPL-2 GPL-3 LGPL-2 LPPL-1.3 LPPL-1.3c MIT TeX TeX-other-free public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2023 dev-lang/ruby >=app-text/texlive-core-2023
 SLOT=0
 SRC_URI=https://mirrors.ctan.org/systems/texlive/tlnet/archive/collection-context.r69108.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context.r69665.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-calendar-examples.r66947.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-collating-marks.r68696.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-cyrillicnumbers.r47085.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-filter.r62070.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-gnuplot.r47085.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-handlecsv.r69186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-legacy.r69173.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-letter.r60787.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-mathsets.r47085.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-pocketdiary.r66953.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-simpleslides.r67070.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-squares.r68545.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-sudoku.r67289.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-texlive.r66924.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-transliterator.r61127.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-typescripts.r60422.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-vim.r62071.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-visualcounter.r47085.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/jmn.r45751.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/luajittex.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/collection-context.r69108.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context.r69665.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-calendar-examples.r66947.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-collating-marks.r68696.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-cyrillicnumbers.r47085.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-filter.r62070.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-gnuplot.r47085.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-handlecsv.r69186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-legacy.r69173.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-letter.r60787.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-mathsets.r47085.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-pocketdiary.r66953.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-simpleslides.r67070.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-squares.r68545.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-sudoku.r67289.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-texlive.r66924.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-transliterator.r61127.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-typescripts.r60422.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-vim.r62071.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-visualcounter.r47085.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/jmn.r45751.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/luajittex.r66186.tar.xz doc? ( https://mirrors.ctan.org/systems/texlive/tlnet/archive/context.doc.r69665.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-calendar-examples.doc.r66947.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-collating-marks.doc.r68696.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-cyrillicnumbers.doc.r47085.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-filter.doc.r62070.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-gnuplot.doc.r47085.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-handlecsv.doc.r69186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-legacy.doc.r69173.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-letter.doc.r60787.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-mathsets.doc.r47085.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-notes-zh-cn.doc.r66725.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-pocketdiary.doc.r66953.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-simpleslides.doc.r67070.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-squares.doc.r68545.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-sudoku.doc.r67289.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-transliterator.doc.r61127.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-typescripts.doc.r60422.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-vim.doc.r62071.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-visualcounter.doc.r47085.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/luajittex.doc.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context.doc.r69665.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-calendar-examples.doc.r66947.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-collating-marks.doc.r68696.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-cyrillicnumbers.doc.r47085.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-filter.doc.r62070.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-gnuplot.doc.r47085.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-handlecsv.doc.r69186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-legacy.doc.r69173.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-letter.doc.r60787.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-mathsets.doc.r47085.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-notes-zh-cn.doc.r66725.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-pocketdiary.doc.r66953.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-simpleslides.doc.r67070.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-squares.doc.r68545.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-sudoku.doc.r67289.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-transliterator.doc.r61127.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-typescripts.doc.r60422.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-vim.doc.r62071.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-visualcounter.doc.r47085.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/luajittex.doc.r66186.tar.xz ) source? ( https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-visualcounter.source.r47085.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-visualcounter.source.r47085.tar.xz )
 _eclasses_=texlive-common	175686d2dfee969e2d49b1e7a997df1d	texlive-module	a049ca7a496ec92dd0cf7ee17c2c1df1
-_md5_=d84703737409a974237132c662dbbe72
+_md5_=e5653bb782d4d2ceef9180f35d19a27b
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 998017e18349..a00257147eb2 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/build2-0.13.0 b/metadata/md5-cache/dev-util/build2-0.13.0
deleted file mode 100644
index c6f1c362c14f..000000000000
--- a/metadata/md5-cache/dev-util/build2-0.13.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-cpp/libodb-2.5.0_beta19 ~dev-cpp/libodb-sqlite-2.5.0_beta19 dev-db/sqlite:3
-DESCRIPTION=cross-platform toolchain for building and packaging C++ code
-EAPI=7
-HOMEPAGE=https://build2.org
-INHERIT=toolchain-funcs multiprocessing
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=~dev-cpp/libodb-2.5.0_beta19 ~dev-cpp/libodb-sqlite-2.5.0_beta19 dev-db/sqlite:3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.build2.org/0.13.0/build2-toolchain-0.13.0.tar.xz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=33862c43de6ecf09338fb840e48d2003
diff --git a/metadata/md5-cache/dev-util/build2-0.14.0 b/metadata/md5-cache/dev-util/build2-0.14.0
deleted file mode 100644
index 8187e3566759..000000000000
--- a/metadata/md5-cache/dev-util/build2-0.14.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-cpp/libodb-2.5.0_beta21 ~dev-cpp/libodb-sqlite-2.5.0_beta21 dev-db/sqlite:3
-DESCRIPTION=cross-platform toolchain for building and packaging C++ code
-EAPI=8
-HOMEPAGE=https://build2.org
-INHERIT=toolchain-funcs multiprocessing
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=~dev-cpp/libodb-2.5.0_beta21 ~dev-cpp/libodb-sqlite-2.5.0_beta21 dev-db/sqlite:3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.build2.org/0.14.0/build2-toolchain-0.14.0.tar.xz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=03030d8ce5cd7c5c9ba17e6394a116f6
diff --git a/metadata/md5-cache/dev-util/build2-0.16.0 b/metadata/md5-cache/dev-util/build2-0.16.0
deleted file mode 100644
index 0ca38ca9d349..000000000000
--- a/metadata/md5-cache/dev-util/build2-0.16.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-cpp/libodb-2.5.0_beta25 ~dev-cpp/libodb-sqlite-2.5.0_beta25 dev-db/sqlite:3
-DESCRIPTION=Cross-platform toolchain for building and packaging C++ code
-EAPI=8
-HOMEPAGE=https://build2.org
-INHERIT=toolchain-funcs multiprocessing
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=~dev-cpp/libodb-2.5.0_beta25 ~dev-cpp/libodb-sqlite-2.5.0_beta25 dev-db/sqlite:3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.build2.org/0.16.0/build2-toolchain-0.16.0.tar.xz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=e7db3f70576d5af3b226bcbb379a723a
diff --git a/metadata/md5-cache/gnustep-apps/Manifest.gz b/metadata/md5-cache/gnustep-apps/Manifest.gz
index c25ce3d535d0..b59119c9051a 100644
--- a/metadata/md5-cache/gnustep-apps/Manifest.gz
+++ b/metadata/md5-cache/gnustep-apps/Manifest.gz
diff --git a/metadata/md5-cache/gnustep-apps/gnumail-1.4.0 b/metadata/md5-cache/gnustep-apps/gnumail-1.4.0
index f8dfc65aea3b..374d3e2e3914 100644
--- a/metadata/md5-cache/gnustep-apps/gnumail-1.4.0
+++ b/metadata/md5-cache/gnustep-apps/gnumail-1.4.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.nongnu.org/gnustep-nonfsf/gnumail/
 INHERIT=gnustep-2
 IUSE=crypt debug doc
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=~amd64 ppc x86
 LICENSE=GPL-2+
 RDEPEND=crypt? ( app-crypt/gnupg ) virtual/gnustep-back
 SLOT=0
 SRC_URI=mirror://nongnu/gnustep-nonfsf/GNUMail-1.4.0.tar.gz
 _eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	gnustep-2	191cacca9e01ae0fe9b898b09e4555b8	gnustep-base	923cb81765be4cd65f6419d3f9019af5	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=e34c04a59ee5115fa844cd288c579e40
+_md5_=055dbe2db8924ecbe95237ebdfb70d92
diff --git a/metadata/md5-cache/gnustep-libs/Manifest.gz b/metadata/md5-cache/gnustep-libs/Manifest.gz
index 6b0359dd9adb..f2b5e2f58b94 100644
--- a/metadata/md5-cache/gnustep-libs/Manifest.gz
+++ b/metadata/md5-cache/gnustep-libs/Manifest.gz
diff --git a/metadata/md5-cache/gnustep-libs/dbuskit-0.1.1-r1 b/metadata/md5-cache/gnustep-libs/dbuskit-0.1.1-r1
deleted file mode 100644
index 6df5584e4fb0..000000000000
--- a/metadata/md5-cache/gnustep-libs/dbuskit-0.1.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=sys-apps/dbus-1.2.1 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 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
-DESCRIPTION=framework that interfaces Objective-C applications with the D-Bus IPC service
-EAPI=6
-HOMEPAGE=https://github.com/gnustep/libs-dbuskit
-INHERIT=autotools gnustep-2
-IUSE=debug doc
-KEYWORDS=amd64 ppc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=sys-apps/dbus-1.2.1 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
-SLOT=0
-SRC_URI=https://github.com/gnustep/libs-dbuskit/archive/0.1.1.tar.gz -> dbuskit-0.1.1.tar.gz
-_eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	eutils	d318efeb438bbec051fa5aaf28d0d42c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	gnustep-2	191cacca9e01ae0fe9b898b09e4555b8	gnustep-base	923cb81765be4cd65f6419d3f9019af5	libtool	5f49a16f67f81bdf873e3d1f10b10001	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=df5b133e2b6b8f45c2b3b7f751f3d68d
diff --git a/metadata/md5-cache/gnustep-libs/dbuskit-0.1.1-r2 b/metadata/md5-cache/gnustep-libs/dbuskit-0.1.1-r2
index b32b95374dd1..c7b728f0d6b3 100644
--- a/metadata/md5-cache/gnustep-libs/dbuskit-0.1.1-r2
+++ b/metadata/md5-cache/gnustep-libs/dbuskit-0.1.1-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/gnustep/libs-dbuskit
 INHERIT=autotools gnustep-2
 IUSE=debug doc
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=sys-apps/dbus-1.2.1 virtual/gnustep-back
 SLOT=0
 SRC_URI=https://github.com/gnustep/libs-dbuskit/archive/0.1.1.tar.gz -> dbuskit-0.1.1.tar.gz
 _eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	gnustep-2	191cacca9e01ae0fe9b898b09e4555b8	gnustep-base	923cb81765be4cd65f6419d3f9019af5	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=50dc8f3d3e4e81dbec2de2a4bea3c123
+_md5_=d16efa0da81306cf2a8bc11695aa46e1
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index 5e6aac0d53cb..bd4d4db162ab 100644
--- a/metadata/md5-cache/gui-apps/Manifest.gz
+++ b/metadata/md5-cache/gui-apps/Manifest.gz
diff --git a/metadata/md5-cache/gui-apps/nm-tray-0.5.0-r1 b/metadata/md5-cache/gui-apps/nm-tray-0.5.0-r1
index 95df2a5f1018..898e085e75cc 100644
--- a/metadata/md5-cache/gui-apps/nm-tray-0.5.0-r1
+++ b/metadata/md5-cache/gui-apps/nm-tray-0.5.0-r1
@@ -11,4 +11,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt
 SLOT=0
 SRC_URI=https://github.com/palinek/nm-tray/archive/0.5.0.tar.gz -> nm-tray-0.5.0.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=cbd697378986d965f7e9f85f2b86f71c
+_md5_=a4750c6ca7d6d4ce0242b2cca5476854
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 1c41067baec2..6a41040383c3 100644
--- a/metadata/md5-cache/kde-misc/Manifest.gz
+++ b/metadata/md5-cache/kde-misc/Manifest.gz
diff --git a/metadata/md5-cache/kde-misc/bismuth-3.1.4 b/metadata/md5-cache/kde-misc/bismuth-3.1.4
deleted file mode 100644
index 52fcc715125c..000000000000
--- a/metadata/md5-cache/kde-misc/bismuth-3.1.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-qt/qtdbus-5.15.0:5 >=dev-qt/qtquickcontrols2-5.15.0:5 >=dev-qt/qtsvg-5.15.0:5 >=dev-qt/qttest-5.15.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-plasma/kwin-5.24.0:5
-DESCRIPTION=Tiling window management script for Kwin
-EAPI=8
-HOMEPAGE=https://github.com/Bismuth-Forge/bismuth
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake xdg
-KEYWORDS=amd64
-LICENSE=CC-BY-4.0 LGPL-3+ MIT
-RDEPEND=>=dev-qt/qtdbus-5.15.0:5 >=dev-qt/qtquickcontrols2-5.15.0:5 >=dev-qt/qtsvg-5.15.0:5 >=dev-qt/qttest-5.15.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-plasma/kwin-5.24.0:5
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/Bismuth-Forge/bismuth/archive/refs/tags/v3.1.4.tar.gz -> bismuth-3.1.4.tar.gz https://github.com/Bismuth-Forge/bismuth/releases/download/v3.1.4/binary-release.tar.gz -> bismuth-3.1.4-binary-release.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=744c6692045e60ca5268e38aad5b8264
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index ed4e076f7764..802ead618a7b 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/proton-mail-bridge-3.10.0 b/metadata/md5-cache/mail-mta/proton-mail-bridge-3.10.0
new file mode 100644
index 000000000000..f298c9581271
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/proton-mail-bridge-3.10.0
@@ -0,0 +1,17 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-lang/go-1.20:= app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=app-crypt/libsecret gui? ( >=dev-libs/protobuf-21.12:= >=dev-libs/sentry-native-0.6.5-r1 dev-qt/qtbase:6=[gui,icu,widgets] dev-qt/qtdeclarative:6=[widgets] dev-qt/qtsvg:6= media-libs/mesa net-libs/grpc:= )
+DESCRIPTION=Serves ProtonMail to IMAP/SMTP clients
+EAPI=8
+HOMEPAGE=https://proton.me/mail/bridge https://github.com/ProtonMail/proton-bridge/
+INHERIT=cmake go-module systemd xdg-utils
+IUSE=gui
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 GPL-3+ ISC LGPL-3+ MIT MPL-2.0 Unlicense
+PROPERTIES=test_network
+RDEPEND=app-crypt/libsecret gui? ( >=dev-libs/protobuf-21.12:= >=dev-libs/sentry-native-0.6.5-r1 dev-qt/qtbase:6=[gui,icu,widgets] dev-qt/qtdeclarative:6=[widgets] dev-qt/qtsvg:6= media-libs/mesa net-libs/grpc:= )
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/ProtonMail/proton-bridge/archive/refs/tags/v3.10.0.tar.gz -> proton-mail-bridge-3.10.0.tar.gz https://dev.gentoo.org/~marecki/dists/mail-mta/proton-mail-bridge/proton-mail-bridge-3.10.0-deps.tar.xz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	go-env	14f8f70fe58c14d7ab44fff15a05ac47	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=ac4155e6ff6d71ec337601c5a944fc9c
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index ed8b2261159f..0cd85560317b 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/exiv2-0.28.2 b/metadata/md5-cache/media-gfx/exiv2-0.28.2
index f4c9ff4e83c0..5c4c78cb55bc 100644
--- a/metadata/md5-cache/media-gfx/exiv2-0.28.2
+++ b/metadata/md5-cache/media-gfx/exiv2-0.28.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://exiv2.org/
 INHERIT=cmake-multilib python-any-r1
 IUSE=+bmff doc examples nls +png test webready +xmp 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 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/inih[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-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( 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(-)?] ) webready? ( net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xmp? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/0.28
 SRC_URI=https://github.com/Exiv2/exiv2/archive/refs/tags/v0.28.2.tar.gz -> exiv2-0.28.2.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	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	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e53c774425a671fc4e689742bd1254eb
+_md5_=4c83cd7ed1a4ee599fe5fd2061020217
diff --git a/metadata/md5-cache/media-gfx/fotocx-24.11 b/metadata/md5-cache/media-gfx/fotocx-24.11-r1
index 47e53144ec00..a50c13d066d4 100644
--- a/metadata/md5-cache/media-gfx/fotocx-24.11
+++ b/metadata/md5-cache/media-gfx/fotocx-24.11-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=install postinst postrm prepare
 DEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/tiff:= media-libs/libchamplain[gtk] x11-libs/gtk+:3
 DESCRIPTION=Program for improving image files made with a digital camera
-EAPI=7
+EAPI=8
 HOMEPAGE=https://kornelix.net/fotocx/fotocx.html
 INHERIT=optfeature xdg-utils
 KEYWORDS=~amd64 ~arm64 ~x86
@@ -10,4 +10,4 @@ RDEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/l
 SLOT=0
 SRC_URI=https://kornelix.net/downloads/downloads/fotocx-24.11-source.tar.gz
 _eclasses_=optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bded99d2bf0a81c34cdcfb9944fd7deb
+_md5_=c1ed00c16c52bb89e8f153ea5de6e35b
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 8e307d8ff127..ef3dbb7f1262 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/exaile-4.1.3 b/metadata/md5-cache/media-sound/exaile-4.1.3
deleted file mode 100644
index df4c23062b0b..000000000000
--- a/metadata/md5-cache/media-sound/exaile-4.1.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=nls? ( dev-util/intltool sys-devel/gettext )
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DESCRIPTION=GTK+ based media player aiming to be similar to Amarok
-EAPI=8
-HOMEPAGE=https://www.exaile.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=python-single-r1 xdg
-IUSE=libnotify nls scrobbler python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2 GPL-3
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-meta:1.0 x11-libs/gtk+:3[introspection] libnotify? ( x11-libs/libnotify[introspection] ) python_single_target_python3_10? ( dev-python/bsddb3[python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/gst-python:1.0[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] media-libs/mutagen[python_targets_python3_10(-)] scrobbler? ( dev-python/pylast[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/bsddb3[python_targets_python3_11(-)] dev-python/dbus-python[python_targets_python3_11(-)] dev-python/gst-python:1.0[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] media-libs/mutagen[python_targets_python3_11(-)] scrobbler? ( dev-python/pylast[python_targets_python3_11(-)] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/exaile/exaile/archive/4.1.3/exaile-4.1.3.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c78f93920e2bc43cb91e1cd4a054f3e8
diff --git a/metadata/md5-cache/media-sound/exaile-9999 b/metadata/md5-cache/media-sound/exaile-9999
deleted file mode 100644
index fcf0461d4f07..000000000000
--- a/metadata/md5-cache/media-sound/exaile-9999
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( dev-util/intltool sys-devel/gettext ) >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile install postinst postrm preinst setup unpack
-DESCRIPTION=GTK+ based media player aiming to be similar to Amarok
-EAPI=8
-HOMEPAGE=https://www.exaile.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=python-single-r1 xdg git-r3
-IUSE=libnotify nls scrobbler python_single_target_python3_10 python_single_target_python3_11
-LICENSE=GPL-2 GPL-3
-PROPERTIES=live
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-meta:1.0 x11-libs/gtk+:3[introspection] libnotify? ( x11-libs/libnotify[introspection] ) python_single_target_python3_10? ( dev-python/bsddb3[python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/gst-python:1.0[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] media-libs/mutagen[python_targets_python3_10(-)] scrobbler? ( dev-python/pylast[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/bsddb3[python_targets_python3_11(-)] dev-python/dbus-python[python_targets_python3_11(-)] dev-python/gst-python:1.0[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] media-libs/mutagen[python_targets_python3_11(-)] scrobbler? ( dev-python/pylast[python_targets_python3_11(-)] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=test
-SLOT=0
-_eclasses_=git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=af692d4539effe106ea02818a2484a6c
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index e8cddf5e6ce2..eaeb7a9ce61e 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/odsclient-1.03-r1 b/metadata/md5-cache/net-dns/odsclient-1.03-r1
deleted file mode 100644
index d0b2624123ef..000000000000
--- a/metadata/md5-cache/net-dns/odsclient-1.03-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Client for the Open Domain Server's dynamic dns
-EAPI=6
-HOMEPAGE=http://www.ods.org/
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64 x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=http://www.ods.org/dl/odsclient-1.03.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=05a5bdaedd7d5dca640b8934aca42228
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index a5553cc81bd4..086ea33b7b58 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/curl-8.7.1 b/metadata/md5-cache/net-misc/curl-8.7.1
index 45e865806410..5c35daaec1df 100644
--- a/metadata/md5-cache/net-misc/curl-8.7.1
+++ b/metadata/md5-cache/net-misc/curl-8.7.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://curl.se/
 INHERIT=autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig
 IUSE=+adns +alt-svc brotli +ftp gnutls gopher +hsts +http2 idn +imap kerberos ldap mbedtls nghttp3 +openssl +pop3 +psl +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls 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 ~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=BSD curl ISC test? ( BSD-4 )
 RDEPEND=>=sys-libs/zlib-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] adns? ( net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http2? ( >=net-libs/nghttp2-1.12.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(-)?] ) idn? ( net-dns/libidn2:=[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(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( >=net-nds/openldap-2.0.0:=[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(-)?] ) nghttp3? ( >=net-libs/nghttp3-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(-)?] >=net-libs/ngtcp2-0.19.1[gnutls,ssl,-openssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) psl? ( net-libs/libpsl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh2-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( app-misc/ca-certificates >=net-libs/gnutls-3.1.10:=[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(-)?] dev-libs/nettle:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( app-misc/ca-certificates net-libs/mbedtls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-0.9.7:=[sslv3(-)=,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(-)?] ) rustls? ( >=net-libs/rustls-ffi-0.12.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(-)?] ) ) 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(-)?] )
 REQUIRED_USE=ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_openssl curl_ssl_rustls ) ) curl_ssl_gnutls? ( gnutls ) curl_ssl_mbedtls? ( mbedtls ) curl_ssl_openssl? ( openssl ) curl_ssl_rustls? ( rustls ) nghttp3? ( !openssl alt-svc )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://curl.se/download/curl-8.7.1.tar.xz verify-sig? ( https://curl.se/download/curl-8.7.1.tar.xz.asc )
 _eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=076d479d34e7c013fe9616177ef8f97e
+_md5_=6e3264497f8b1b83284eaaf96d1acffc
diff --git a/metadata/md5-cache/net-misc/r8152-2.17.1 b/metadata/md5-cache/net-misc/r8152-2.17.1
index b161cc5822d6..de6bdd20bc39 100644
--- a/metadata/md5-cache/net-misc/r8152-2.17.1
+++ b/metadata/md5-cache/net-misc/r8152-2.17.1
@@ -13,4 +13,4 @@ RDEPEND=virtual/udev sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
 SLOT=0
 SRC_URI=http://rtitwww.realtek.com/rtdrivers/cn/nic1/r8152-2.17.1.tar.bz2
 _eclasses_=dist-kernel-utils	145861da258122cbba5240a850f1a5e8	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	7ca3057b277f1e5978947b4cc289ce62	linux-mod-r1	137b318f89f77c2b66124fcc7790737a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=05cd5bd16b8964687e1690310374ff5c
+_md5_=99d59134852d7ee9b3ef4f4bc6315713
diff --git a/metadata/md5-cache/net-misc/remmina-1.4.31-r2 b/metadata/md5-cache/net-misc/remmina-1.4.31-r2
index e27db13fd921..99108bce3e5f 100644
--- a/metadata/md5-cache/net-misc/remmina-1.4.31-r2
+++ b/metadata/md5-cache/net-misc/remmina-1.4.31-r2
@@ -5,7 +5,7 @@ DESCRIPTION=A GTK+ RDP, SPICE, VNC and SSH client
 EAPI=8
 HOMEPAGE=https://remmina.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake optfeature python-single-r1 xdg
+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
 KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=GPL-2+-with-openssl-exception
@@ -13,5 +13,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
 SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.31/Remmina-v1.4.31.tar.bz2
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=55f427f0c3bbbf4ca11739f8a38fa928
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=05cbc69533a3f5689df5609904aadbfa
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 32e5d3ce7e4e..68aa39115eed 100644
--- a/metadata/md5-cache/net-misc/remmina-1.4.35-r1
+++ b/metadata/md5-cache/net-misc/remmina-1.4.35-r1
@@ -5,7 +5,7 @@ DESCRIPTION=A GTK+ RDP, SPICE, VNC and SSH client
 EAPI=8
 HOMEPAGE=https://remmina.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake optfeature python-single-r1 xdg
+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
 LICENSE=GPL-2+-with-openssl-exception
@@ -13,5 +13,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:
 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	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fd2d1e4bfcc29465c0fa83e6676445ca
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=6581262429d0408db5f8ac5fb041a736
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index cc7ccd1b23d4..957115137637 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/iwd-2.16 b/metadata/md5-cache/net-wireless/iwd-2.17
index c2b4c24a300a..5e9a09b82c84 100644
--- a/metadata/md5-cache/net-wireless/iwd-2.16
+++ b/metadata/md5-cache/net-wireless/iwd-2.17
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) >=dev-libs/ell-0.63
+DEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) >=dev-libs/ell-0.64
 DESCRIPTION=Wireless daemon for linux
 EAPI=8
 HOMEPAGE=https://git.kernel.org/pub/scm/network/wireless/iwd.git/
@@ -8,8 +8,8 @@ INHERIT=flag-o-matic linux-info systemd
 IUSE=+client cpu_flags_x86_aes cpu_flags_x86_ssse3 +monitor ofono selinux standalone systemd wired
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) >=dev-libs/ell-0.63 acct-group/netdev net-wireless/wireless-regdb selinux? ( sec-policy/selinux-networkmanager ) standalone? ( systemd? ( sys-apps/systemd ) !systemd? ( virtual/resolvconf ) )
+RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) >=dev-libs/ell-0.64 acct-group/netdev net-wireless/wireless-regdb selinux? ( sec-policy/selinux-networkmanager ) standalone? ( systemd? ( sys-apps/systemd ) !systemd? ( virtual/resolvconf ) )
 SLOT=0
-SRC_URI=https://mirrors.edge.kernel.org/pub/linux/network/wireless/iwd-2.16.tar.xz
+SRC_URI=https://mirrors.edge.kernel.org/pub/linux/network/wireless/iwd-2.17.tar.xz
 _eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=bb337680b9d726b43f61173f9949e6d5
+_md5_=f95b53d2f84f471518ef45d14816ecac
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index ae9f24c6fffe..4b84bf763668 100644
--- a/metadata/md5-cache/sci-astronomy/Manifest.gz
+++ b/metadata/md5-cache/sci-astronomy/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/casa-data-20170703 b/metadata/md5-cache/sci-astronomy/casa-data-20170703
deleted file mode 100644
index f088e18195af..000000000000
--- a/metadata/md5-cache/sci-astronomy/casa-data-20170703
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Data and tables for the CASA software
-EAPI=6
-HOMEPAGE=https://github.com/casacore/casacore/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-3
-SLOT=0
-SRC_URI=ftp://ftp.astron.nl/outgoing/Measures/WSRT_Measures_20170703-000001.ztar -> casa-data-20170703.tar.Z
-_md5_=4042b933a57eb4e11365139000b61e42
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index c2dbfe97f5df..f037f182268c 100644
--- a/metadata/md5-cache/sci-biology/Manifest.gz
+++ b/metadata/md5-cache/sci-biology/Manifest.gz
diff --git a/metadata/md5-cache/sci-biology/biopandas-0.4.1 b/metadata/md5-cache/sci-biology/biopandas-0.4.1
deleted file mode 100644
index b8bca8b15f46..000000000000
--- a/metadata/md5-cache/sci-biology/biopandas-0.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pandas[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nose-1.3.7_p20221026[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 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Molecular Structures in Pandas DataFrames
-EAPI=8
-HOMEPAGE=https://rasbt.github.io/biopandas/ https://github.com/BioPandas/biopandas https://pypi.org/project/biopandas/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pandas[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/BioPandas/biopandas/archive/refs/tags/v0.4.1.tar.gz -> biopandas-0.4.1.gh.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=3b87692064234ef962aa52c8f93f9e17
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 21a3b85c25b3..bdb7f63d786e 100644
--- a/metadata/md5-cache/sci-chemistry/Manifest.gz
+++ b/metadata/md5-cache/sci-chemistry/Manifest.gz
diff --git a/metadata/md5-cache/sci-chemistry/nmrglue-0.9 b/metadata/md5-cache/sci-chemistry/nmrglue-0.9
deleted file mode 100644
index 33078a2745b1..000000000000
--- a/metadata/md5-cache/sci-chemistry/nmrglue-0.9
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( app-shells/tcsh ) test? ( dev-python/matplotlib[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nose-1.3.7_p20221026[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( dev-lang/python:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] dev-python/numpydoc[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] dev-python/numpydoc[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-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/matplotlib[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DESCRIPTION=A module for working with NMR data in Python
-EAPI=8
-HOMEPAGE=https://www.nmrglue.com/
-INHERIT=distutils-r1
-IUSE=test doc python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/matplotlib[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[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? ( test )
-SLOT=0
-SRC_URI=https://github.com/jjhelmus/nmrglue/archive/v0.9.tar.gz -> nmrglue-0.9.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=35402f3cad87acaf5206a404dff8d4ae
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 3199cbc634ee..d6f3874874ba 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/gpxlab-0.7.0 b/metadata/md5-cache/sci-geosciences/gpxlab-0.7.0-r1
index 63feafdde220..fb660714be0f 100644
--- a/metadata/md5-cache/sci-geosciences/gpxlab-0.7.0
+++ b/metadata/md5-cache/sci-geosciences/gpxlab-0.7.0-r1
@@ -1,14 +1,15 @@
 BDEPEND=dev-qt/linguist-tools:5
 DEFINED_PHASES=compile install postinst postrm preinst prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5
 DESCRIPTION=An application to display and manage GPS tracks
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/BourgeoisLab/GPXLab
-INHERIT=desktop plocale qmake-utils xdg
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=plocale qmake-utils xdg
 KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5
 SLOT=0
 SRC_URI=https://github.com/BourgeoisLab/GPXLab/archive/refs/tags/v0.7.0.tar.gz -> gpxlab-0.7.0.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	plocale	950fbaec7deeba41b5bcc0572cca99b9	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b94f7d6cf2a83b02824c550c9c1ad7be
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	plocale	950fbaec7deeba41b5bcc0572cca99b9	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=5f35cc50f683ab301f908c12689dfdc9
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index 4c20f2e85344..153daf8b3a87 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-8.5.100 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.100
new file mode 100644
index 000000000000..f0cf4d307e6a
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.100
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by tomcat.apache.org
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/download-80.cgi
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=public-domain
+SLOT=8.5.100
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-8/v8.5.100/KEYS -> openpgp-keys-apache-tomcat-8.5.100-KEYS.asc
+_md5_=84ec75234569e955e18ae7ad659b43a3
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 496e47256a47..90aa2d4a235f 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/busybox-1.36.1-r2 b/metadata/md5-cache/sys-apps/busybox-1.36.1-r2
new file mode 100644
index 000000000000..90f006819ced
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/busybox-1.36.1-r2
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare
+DEPEND=!static? ( virtual/libc virtual/libcrypt:= selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) static? ( virtual/libcrypt[static-libs] selinux? ( sys-libs/libselinux[static-libs(+)] ) ) sys-kernel/linux-headers
+DESCRIPTION=Utilities for rescue and embedded systems
+EAPI=8
+HOMEPAGE=https://www.busybox.net/
+INHERIT=flag-o-matic readme.gentoo-r1 savedconfig toolchain-funcs
+IUSE=debug livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd savedconfig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=!static? ( virtual/libc virtual/libcrypt:= selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam )
+REQUIRED_USE=pam? ( !static )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.busybox.net/downloads/busybox-1.36.1.tar.bz2
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	portability	225656ad6c6594fe3b0187bdd50707fb	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=51f79742916c4268fb3d5cad073c2a9b
diff --git a/metadata/md5-cache/sys-apps/busybox-9999 b/metadata/md5-cache/sys-apps/busybox-9999
index 43fc5f26365f..9408a41cbc05 100644
--- a/metadata/md5-cache/sys-apps/busybox-9999
+++ b/metadata/md5-cache/sys-apps/busybox-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=pam? ( !static )
 RESTRICT=test
 SLOT=0
 _eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	portability	225656ad6c6594fe3b0187bdd50707fb	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=5f92ef932b4365849ce713762f4fc621
+_md5_=51f79742916c4268fb3d5cad073c2a9b
diff --git a/metadata/md5-cache/sys-apps/gptfdisk-1.0.10 b/metadata/md5-cache/sys-apps/gptfdisk-1.0.10
new file mode 100644
index 000000000000..038d19e280a3
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/gptfdisk-1.0.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare
+DEPEND=!static? ( dev-libs/popt ncurses? ( sys-libs/ncurses:=[unicode(+)] ) kernel_linux? ( sys-apps/util-linux ) ) static? ( dev-libs/popt[static-libs(+)] ncurses? ( sys-libs/ncurses:=[unicode(+),static-libs(+)] ) kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) ) virtual/pkgconfig
+DESCRIPTION=GPT partition table manipulator for Linux
+EAPI=8
+HOMEPAGE=https://www.rodsbooks.com/gdisk/
+INHERIT=flag-o-matic toolchain-funcs
+IUSE=ncurses static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=!static? ( dev-libs/popt ncurses? ( sys-libs/ncurses:=[unicode(+)] ) kernel_linux? ( sys-apps/util-linux ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/gptfdisk/gptfdisk/1.0.10/gptfdisk-1.0.10.tar.gz
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=87120048c6a2f98dcf0530857d1d653e
diff --git a/metadata/md5-cache/sys-apps/lshw-02.20.2b b/metadata/md5-cache/sys-apps/lshw-02.20.2b-r1
index 3f2e937d5950..bd7b62a3e735 100644
--- a/metadata/md5-cache/sys-apps/lshw-02.20.2b
+++ b/metadata/md5-cache/sys-apps/lshw-02.20.2b-r1
@@ -10,6 +10,6 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/hwdata gtk? ( x11-libs/gtk+:3 ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=static? ( !gtk !sqlite )
 SLOT=0
-SRC_URI=https://ezix.org/src/pkg/lshw/archive/42fef565731411a784101de614a54bff79d1858e.tar.gz -> lshw-02.20.2b-B.02.20.2_.tar.gz
+SRC_URI=https://www.ezix.org/software/files/lshw-B.02.20.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6cf4e6cff044972372e388f6780b0c34
+_md5_=1fc22db75674c904537da53a2c804249
diff --git a/metadata/md5-cache/sys-apps/memtest86+-7.00 b/metadata/md5-cache/sys-apps/memtest86+-7.00
index 3fd94e3fed80..653d5d6c1c71 100644
--- a/metadata/md5-cache/sys-apps/memtest86+-7.00
+++ b/metadata/md5-cache/sys-apps/memtest86+-7.00
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://www.memtest.org/
 INHERIT=mount-boot secureboot toolchain-funcs
 IUSE=bios32 bios64 +boot uefi32 uefi64 iso32 iso64 secureboot
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v7.00.tar.gz -> memtest86+-7.00.tar.gz
 _eclasses_=mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	secureboot	4911adb593665638c76fbd4e70d451ac	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=e276eff1cacb6d18b8713012bcf65ab6
+_md5_=622f38829d5845b80dd5d8bc4e55e4a8
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.12.26 b/metadata/md5-cache/sys-apps/pkgcore-0.12.27
index ca64c62b9c7e..b5492478b537 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-0.12.26
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.12.27
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/snakeoil-0.10.7[python_targets_python3_10(-)?,python_target
 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/pkgcore/pkgcore-0.12.26.tar.gz
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pkgcore/pkgcore-0.12.27.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=66540afdc377fd1a83406c33c62857b1
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.39.3-r5 b/metadata/md5-cache/sys-apps/util-linux-2.39.3-r5
index 4c0d4ac7670c..d4903c8e4b9b 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.39.3-r5
+++ b/metadata/md5-cache/sys-apps/util-linux-2.39.3-r5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux
 INHERIT=toolchain-funcs libtool flag-o-matic bash-completion-r1 pam python-r1 multilib-minimal multiprocessing systemd verify-sig
 IUSE=audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode python_targets_python3_10 python_targets_python3_11 python_targets_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 verify-sig
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos
 LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( 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(-)?] ) pam? ( sys-libs/pam ) 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 ) ) readline? ( sys-libs/readline:0= ) rtas? ( sys-libs/librtas ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) udev? ( virtual/libudev:= ) ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill
 REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) ) su? ( pam )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/util-linux/v2.39/util-linux-2.39.3.tar.xz verify-sig? ( https://www.kernel.org/pub/linux/utils/util-linux/v2.39/util-linux-2.39.3.tar.sign )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	b56d0c9c20fc5b553f13c8ae165a10a5	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=0299ece08b14d6efa48782e1e275ac46
+_md5_=81d6afd88b04e1d10e6f95401f606aab
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index fa6be6b8383f..2b9d1186e513 100644
--- a/metadata/md5-cache/sys-boot/Manifest.gz
+++ b/metadata/md5-cache/sys-boot/Manifest.gz
diff --git a/metadata/md5-cache/sys-boot/colo-1.22-r1 b/metadata/md5-cache/sys-boot/colo-1.22-r1
new file mode 100644
index 000000000000..b22e78db437e
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/colo-1.22-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare
+DESCRIPTION=CObalt LOader - Modern bootloader for Cobalt MIPS machines
+EAPI=8
+HOMEPAGE=https://www.colonel-panic.org/cobalt-mips/
+INHERIT=toolchain-funcs
+KEYWORDS=-* ~mips
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://www.colonel-panic.org/cobalt-mips/colo/colo-1.22.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=bdac559de20ac25b2cbc174cfa1be878
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 2bbe91ba67ee..8ba87968d034 100644
--- a/metadata/md5-cache/sys-firmware/Manifest.gz
+++ b/metadata/md5-cache/sys-firmware/Manifest.gz
diff --git a/metadata/md5-cache/sys-firmware/iwl1000-ucode-39.31.5.1-r1 b/metadata/md5-cache/sys-firmware/iwl1000-ucode-39.31.5.1-r1
deleted file mode 100644
index 6750f3ef740d..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl1000-ucode-39.31.5.1-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Intel (R) Wireless WiFi Link 1000BGN ucode
-EAPI=7
-HOMEPAGE=https://wireless.wiki.kernel.org/en/users/Drivers/iwlwifi
-KEYWORDS=amd64 x86
-LICENSE=ipw3945
-SLOT=0
-SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-1000-ucode-39.31.5.1.tgz
-_md5_=7c31c0ae36e741b998928a5649895846
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p2 b/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p2
deleted file mode 100644
index 87d2be73e40e..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Wireless 3160, 7260, 7265 Bluetooth
-EAPI=8
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-INHERIT=linux-info
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
-SLOT=0
-SRC_URI=mirror://gentoo/iwl3160-7260-bt-ucode-37.8.10_p2.tgz
-_eclasses_=linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=14e409b05f15220d21efad1741828f0a
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.16.242414-r1 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.16.242414-r1
deleted file mode 100644
index 59b6f44f4200..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.16.242414-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 3160
-EAPI=8
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-INHERIT=linux-info
-IUSE=bluetooth
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
-SLOT=16
-SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-3160-ucode-16.242414.0.tgz -> iwl3160-ucode-0.16.242414.tgz
-_eclasses_=linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=8039b298b2e7d9275a5c74da9012c267
diff --git a/metadata/md5-cache/sys-firmware/iwl6005-ucode-17.168.5.3 b/metadata/md5-cache/sys-firmware/iwl6005-ucode-17.168.5.3
deleted file mode 100644
index ab71ebb2e23c..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl6005-ucode-17.168.5.3
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Intel (R) Wireless WiFi Advanced N 6005 ucode
-EAPI=7
-HOMEPAGE=http://intellinuxwireless.org/?p=iwlwifi
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-SLOT=0
-SRC_URI=http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6000g2a-ucode-17.168.5.3.tgz
-_md5_=298c7ce45577a4d3285359828203b821
diff --git a/metadata/md5-cache/sys-firmware/iwl6005-ucode-18.168.6.1 b/metadata/md5-cache/sys-firmware/iwl6005-ucode-18.168.6.1
deleted file mode 100644
index adc431c97da7..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl6005-ucode-18.168.6.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Intel (R) Wireless WiFi Advanced N 6005 ucode
-EAPI=7
-HOMEPAGE=http://intellinuxwireless.org/?p=iwlwifi
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-SLOT=1
-SRC_URI=http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6000g2a-ucode-18.168.6.1.tgz
-_md5_=70068c47b9c00ce170524f53f1a8f258
diff --git a/metadata/md5-cache/sys-firmware/iwl6030-ucode-17.168.5.2 b/metadata/md5-cache/sys-firmware/iwl6030-ucode-17.168.5.2
deleted file mode 100644
index c0a94294e43f..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl6030-ucode-17.168.5.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Intel (R) Wireless WiFi Advanced N 6030 ucode
-EAPI=7
-HOMEPAGE=http://intellinuxwireless.org/?p=iwlwifi
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-SLOT=0
-SRC_URI=http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6000g2b-ucode-17.168.5.2.tgz
-_md5_=3802536f3a3f1ff277d26aca1fc44551
diff --git a/metadata/md5-cache/sys-firmware/iwl6030-ucode-18.168.6.1 b/metadata/md5-cache/sys-firmware/iwl6030-ucode-18.168.6.1
deleted file mode 100644
index a377ee76c805..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl6030-ucode-18.168.6.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Intel (R) Wireless WiFi Advanced N 6030 ucode
-EAPI=7
-HOMEPAGE=http://intellinuxwireless.org/?p=iwlwifi
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-SLOT=1
-SRC_URI=http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6000g2b-ucode-18.168.6.1.tgz
-_md5_=1cb0150dfba7c66916c627501209ef64
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.16.242414-r1 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.16.242414-r1
deleted file mode 100644
index 7dc554e086c0..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.16.242414-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 7260
-EAPI=8
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-INHERIT=linux-info
-IUSE=bluetooth
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
-SLOT=16
-SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7260-ucode-16.242414.0.tgz -> iwl7260-ucode-0.16.242414.tgz
-_eclasses_=linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=8039b298b2e7d9275a5c74da9012c267
diff --git a/metadata/md5-cache/sys-firmware/iwl8000-ucode-16.242414.0 b/metadata/md5-cache/sys-firmware/iwl8000-ucode-16.242414.0
deleted file mode 100644
index aa7f6e46cb93..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl8000-ucode-16.242414.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Wireless 8260 and 4165
-EAPI=6
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-INHERIT=linux-info
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
-SLOT=0
-SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-8000-ucode-16.242414.0.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a148adbff178027a90f38e51621a9fec
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 82d0f188916e..ff82efea4762 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/gosuslugi-plugin-3.1.1.0 b/metadata/md5-cache/www-plugins/gosuslugi-plugin-3.1.1.0
deleted file mode 100644
index dc2a4d7dbaaf..000000000000
--- a/metadata/md5-cache/www-plugins/gosuslugi-plugin-3.1.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DEPEND=dev-libs/libxml2:2 sys-apps/pcsc-lite:0 virtual/libusb:0
-DESCRIPTION=Crypto-provider browser plugin for russian e-gov site https://gosuslugi.ru/
-EAPI=7
-HOMEPAGE=http://gosuslugi.ru/
-INHERIT=unpacker
-IUSE=multilib
-KEYWORDS=~amd64 ~x86 ~x64-macos
-LICENSE=all-rights-reserved
-RDEPEND=dev-libs/libxml2:2 sys-apps/pcsc-lite:0 virtual/libusb:0
-REQUIRED_USE=amd64? ( multilib )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=amd64? ( https://ds-plugin.gosuslugi.ru/plugin/upload/assets/distrib/IFCPlugin-x86_64.deb -> gosuslugi-plugin-3.1.1.0_amd64.deb ) x86? ( https://ds-plugin.gosuslugi.ru/plugin/upload/assets/distrib/IFCPlugin-i386.deb -> gosuslugi-plugin-3.1.1.0_x86.deb ) x64-macos? ( https://ds-plugin.gosuslugi.ru/plugin/upload/assets/distrib/IFCPlugin.pkg -> gosuslugi-plugin-3.1.1.0_mac.pkg )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09
-_md5_=577b74f60b898863bdb89105cacafef1
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 08a0ab06df38..77c27629c936 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/tomcat-8.5.100 b/metadata/md5-cache/www-servers/tomcat-8.5.100
new file mode 100644
index 000000000000..4a5b920a77f7
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.100
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-8.5.100:8.5.100 ) 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 app-admin/pwgen >=dev-java/ant-1.10.14-r3:0 >=virtual/jdk-11:* doc? ( dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 ) 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-3.1/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 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.15 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=8.5
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.100/src/apache-tomcat-8.5.100-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.100/src/apache-tomcat-8.5.100-src.tar.gz.asc )
+_eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_md5_=f08dba2fad72eb3a19a0b48b66100c9c
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index f48c3c003ca3..96e4e2e4879e 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-03-29T12:40:30Z
+TIMESTAMP 2024-03-29T18:40:30Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYGtr9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYHCx5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA6zw/+JMiFhdlScmZ3z8k/raFvUId7GXJq7YKBbUOhhqXPOfJ26iJV+RtWpH7m
-32p7K6Qaoo2TN6QECcY5IBiHZbipD1pp0RNvhpOCNNdvXXFyajWV19EUbvgnEFfV
-1qTvzrlzsxFZJlDUhYI5B1nkiajLB8vFMl2/GtKSnRCKtqF8k6NIVoRlhyaHqyxy
-38Ei+Bgc4aTmae3+4FFywco1bbYNXhd9Ib9lPBU6uj64bSNCmneABIKGHIk41hdV
-0SxBSpQ1ZTz2gJVIewX7FL1Q/jlUliiGGYXrxkao4y+i/NqZooDU7T099dxBBUHx
-SHzIypXWHWKcgltT3Q5/TUnjPU8SBm+tXBpGBeLxJoCEnUFCQs0S1SobrRBlQWKI
-JWvTZsizOUxfGIuu5/ePMr3efOzCeR59c7W0r0gRV4IdYpJQqjlTrDOrP28nX7Sv
-3To7Gz+nUZNBej4NYgl0krMFPKKHU+8QfXBuZUE2ZUKri/8WdWzXMABGVGufyhsd
-CIhbUXP4OKbMLypdOJJdVvnFuxmbnYkndILPdFWLcCwCMEzS8LwsRvoDx7eiE+zB
-MikYcZYnf5dx0sP9H6oAX2WxVdHpM6kyicgLKxnJLAXEf7BT8DFLKDzZjgUaJQ1m
-HW0QX36lka30LSIkZiEOxbIxzQpUEoAv2kGE7/fkV8OaI3GSmN0=
-=XUCs
+klA/qg/+KhuLu4WoBMWzoHrz46qIjE10bJVGW+CN1I5IE2p2p0qHdxSpMOv2YjWL
+VJ0lesgcc9j4xU1hHbEMaSThFzQekca2VxHsSxIuUn59k+TA1QF9TE14UmT1hrXh
+hZXt5xILSeE5/efiZClhoq0naeOixzW6noCZK1pv0ujrxyi53d4Q9LFs/+ur8z7R
+8IjRkk86DV7Q36gNx6ZT4YOgvSaRQwkkWtnOR0RoYaKXPWbtcWvFUfYhJipl0yLi
+q1ksOs+u5wC73KQDXklqwWqephtiPSzPjpThTqI5dL5HAecudmf1IOk+ZoYEaPB2
+NtH7xR9UysbvbquS9BdkUFTeZScyINEIaadtdV0RPi9PClgm8/BDvSSHAEJatAtS
+L0jr9p6kHVVtO6CvlzSK3rHPkVZ7sy5QuaJiYU7T071es6axPQOeYycAx7XJglHK
+DKiuiuUbLmtczoJ6Tvlk8GvBYsVmTqViOTOyPAEsiXTw4+EBKggmy8ujsZh9Z4/q
+3AyyrvqMOtDEL80ZiZ6uaLMPmVii8tczL5xmh8PWTMjF52sXZSG4Hqygy6+CfBxH
+VGhRR3zWXfKGd/4djGX+kl5y7nyNr/MkxhJXUftm62YIv2iPbnjfWZC5jwZkASYG
+GZNAAxBy0urHzoUVfYwbQIcKyhYT3q6w1vK7UxeZZ0VsaCGFDR0=
+=8DYe
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 0f235de3b275..454b00673c42 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 29 Mar 2024 12:40:26 +0000
+Fri, 29 Mar 2024 18:40:27 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index bba366844e76..873e91ec35aa 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Mar 29 12:40:25 PM UTC 2024
+Fri Mar 29 06:40:26 PM UTC 2024
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 620ff9802bb1..48c4775c2092 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 29 Mar 2024 12:45:00 +0000
+Fri, 29 Mar 2024 18:45:00 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index a5cedd6f7778..b24e548d1e4b 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-5bf8858b838e87def072cbc01927768799b7cc89 1711711884 2024-03-29T11:31:24+00:00
+1bca88987927e0aa8a8b4f7a99c912b27d971a59 1711732708 2024-03-29T17:18:28+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 04ea83c9b113..6fe65722c82b 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1711716000 Fri 29 Mar 2024 12:40:00 PM UTC
+1711737600 Fri 29 Mar 2024 06:40:00 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index fa728992059b..934f0cb0f02c 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 29 Mar 2024 12:40:25 +0000
+Fri, 29 Mar 2024 18:40:26 +0000
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index d86d47fdb394..ccd89418e5f1 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/odsclient/Manifest b/net-dns/odsclient/Manifest
deleted file mode 100644
index 18026ad92d5f..000000000000
--- a/net-dns/odsclient/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 1.03-gentoo.patch 461 BLAKE2B c022e88c4dcd4b10c6207cd25555f1bef861589ca965251b219bd2cfbfe650460305323f3058d0ed56ca8ee05ca6ccb6b0972678e2b1b6a662bb8110a1cba07b SHA512 6a567daef79997488ac328f31b3f1cb8bd299399a6bf831bd19591f2ebd9d94d94a5949baefbfa98031aa6eadf34cfa6192b1e0bcd3282bad1acb05a4e8b9e03
-DIST odsclient-1.03.tar.gz 4263 BLAKE2B b4d04133b9ab837cd3df06cf331aeb5b0987d370d27e824776374135e0340e42449fa24027eaaed2a4921b82abc9a61e4f750fdf1aba1a33b91780a4662704dd SHA512 12cc8b734314ec23432fc7ca980e099eee04be84134740460b7ab3edcff1abfb116794504653ef0af72b27fdc2b074633b96196e1894092152e1bd0e8300ab11
-EBUILD odsclient-1.03-r1.ebuild 618 BLAKE2B 204b29a2aa84d82fd9fd3c51225b842ba9aaa935d8151e74c238bbc7e31a37ba90719bb2f879704be3ac9b3b3dce5cde61979275aa1cb33545e5d991bce13db7 SHA512 60d4b1e5603b6676795c8c7f64bdf4eeecbafd5265a4ebb86e6fc0031aae7820cfe1536fee86cbf43ceca0fbc8be6bc62337f218aa913af8e4252054cccaff0e
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-dns/odsclient/files/1.03-gentoo.patch b/net-dns/odsclient/files/1.03-gentoo.patch
deleted file mode 100644
index 76f93016a010..000000000000
--- a/net-dns/odsclient/files/1.03-gentoo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/client.c
-+++ b/client.c
-@@ -40,7 +40,8 @@
- 				ret = getret(s);
- 				if(ret == 795 || ret == 796)
- 				{
--					fprintf(stderr, "Updated successfully\n");
-+					fprintf(stderr, "Updated %s to %s successfully\n",
-+					argv[3], ipaddress);
- 					mydprintf(s, "QUIT\n");				
- 					close(s);				
- 					exit(0);
-@@ -50,7 +51,7 @@
- 		
- 		}	
- 	}
--	fprintf(stderr, "Unable to update host\n");
-+	fprintf(stderr, "Unable to update %s\n", argv[3]);
- 	return 1;
- }
- 
diff --git a/net-dns/odsclient/metadata.xml b/net-dns/odsclient/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/net-dns/odsclient/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-dns/odsclient/odsclient-1.03-r1.ebuild b/net-dns/odsclient/odsclient-1.03-r1.ebuild
deleted file mode 100644
index 7437ef0ff5eb..000000000000
--- a/net-dns/odsclient/odsclient-1.03-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Client for the Open Domain Server's dynamic dns"
-HOMEPAGE="http://www.ods.org/"
-SRC_URI="http://www.ods.org/dl/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/${PV}-gentoo.patch" )
-
-src_prepare() {
-	default
-	sed -i Makefile -e 's| -o | $(LDFLAGS)&|g' || die "sed failed"
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dosbin odsclient
-	einstalldocs
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 691288a6b11d..6d08af1b7705 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index a470fabab964..b7dcf3323e88 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -13,6 +13,6 @@ DIST curl-8.7.1.tar.xz.asc 488 BLAKE2B 1c91d116aecc8e98d8ec3aad68b7c96f11151e6c2
 EBUILD curl-8.5.0-r3.ebuild 11025 BLAKE2B b10bc84ca0ac1ade0685a56f73558492d1fd6eb5e47280dd073ce2be1dc6542a9c5666a55fe2c26c0508c3f221409ce7f80f5846d7ccce0aaeb9ad8254a8f0ff SHA512 5e9d1aa24df4d424a5a5fc64e28e41a3aa86a2008d7d59db6ee1327efd7c17ae0d9cc4be881d0af4bb31847046cc059ed9355f2c46930a227073595b63ca57ca
 EBUILD curl-8.5.0.ebuild 10777 BLAKE2B 14fea8da51ac209f0fd9ef2665066a44504f0ceeaed838dfb41bc64c52951392e67f6adc23d01ca09c34610658171b9b83dda7c310ed3a62f558825718a97bba SHA512 0c7d812544f26a7f424efffbd5231f6ce958479933716f8638f99b83d097ac0cc5e09dbe7f32e75e0b6b4705d6705870cba2b64f24e982f6edc7d5ccb90844fc
 EBUILD curl-8.6.0-r1.ebuild 10835 BLAKE2B 34f910a7310c832f7864d7679eaa741088212f392b4c63bff67921790d3c2ce4de5a663672464e1626194929199da007214848120ecb70c2718c5da13e1d8950 SHA512 910f3005507c99a5118bbb2d43b841918ba2fcc23d7e8921c4a7bec18d786b3be3b04c5657c392213d3791c26dfa3139e1a333f08cd92fb01ca5f0312d4740fb
-EBUILD curl-8.7.1.ebuild 10828 BLAKE2B 9b3c7c524aec154b3029c2c1e95160c062d976063702a6597522baf697ca12fce9b44db57b64fde9d6cfde9fdb637f607848d8ae8d32b5ed6488444bb45e9063 SHA512 1148e8b5f17c7040e55d6fc8590f3d34de27e4d3faf6a52a3094d0e7623272498ecd2ea7fc5b7ee8597fc48998f5e474a8b704cece90be0d17381bdf906445a7
+EBUILD curl-8.7.1.ebuild 10827 BLAKE2B a68c2e982cd3cc68bdd51a25f71f30439b02e0b05983cacbdd43ca42088a88e04150453d82bdff66516979134072d2f929c50e750a8d2bad8af7b3a6ac5744ce SHA512 9ec1ba093544ee26b41c8735c4f57fa5c492c3bb58cdb22b7a24231f2ba10d21a16665e5f489390c281640e0b8a30f3d6982ab9ada92a67b634f8164b4021a28
 EBUILD curl-9999.ebuild 10771 BLAKE2B 48c610c3ea379320360d48a6473b9db17f7d8ffb895fde8e602e14822f5d8d56d2a9fc499f1302a4bb941581a9b8e082b1aa799222c8aa9c9faf546776ba671a SHA512 9afd073cdbb994726349e8ffd33ab994e64b0fc1f19574343bb0f22953dbb16471b332271478bf0d016c709f82acdf633075c9b55daf286dea9ffa5a927bb6de
 MISC metadata.xml 2090 BLAKE2B 54d366aadfc25650c40081ff10eb150bcb9811a29f802c418afce166c384e2bafc999ff7e69ceeb25a96e952d4875d808e8e89240b437741cd363fab46267a25 SHA512 2103a849b67f9a14a85eb769b870e7272bf8f9c78ca579b4271150be01f26787a884614bff874d50f90be99af4a6ecb136510fca2837463e0bc91611ddbeae40
diff --git a/net-misc/curl/curl-8.7.1.ebuild b/net-misc/curl/curl-8.7.1.ebuild
index e6b8c7c3b407..cdb30b15df5c 100644
--- a/net-misc/curl/curl-8.7.1.ebuild
+++ b/net-misc/curl/curl-8.7.1.ebuild
@@ -17,7 +17,7 @@ else
 		https://curl.se/download/${P}.tar.xz
 		verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )
 	"
-	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
 
 LICENSE="BSD curl ISC test? ( BSD-4 )"
diff --git a/net-misc/r8152/Manifest b/net-misc/r8152/Manifest
index 293e1b877eb3..df4c9a4481fd 100644
--- a/net-misc/r8152/Manifest
+++ b/net-misc/r8152/Manifest
@@ -2,8 +2,9 @@ AUX r8152-2.16.3-asus-c5000-support.patch 581 BLAKE2B a502be8abc3e714fd6c1d90447
 AUX r8152-2.16.3-kernel-5.19-fix.patch 1599 BLAKE2B e1300601e2dcd98729481a6d146ffcc0b55e6163c405608ed783bc56acca65654317804c1da780203d96945b49d815b6efd740a752335d4c0aa562f2ba84bbf3 SHA512 6cdb4ee02c6727d87d94fbd4058b7bbd18e3bb4542c2489d4080217ef323faddbf5b998a83dd42b8e1a1e4c1eb6f65762616382fc5fd8519db07d6dd01f83b4a
 AUX r8152-2.16.3-kernel-6.1-fix.patch 1473 BLAKE2B bebafaeaed61bff9ee058ddc64fef6299703bdf9b0c2cd086c86643b362122a8d691577963b9b64f45729bfa4e72f09fe33d6c61fc195d0675bdcd7affd63d7a SHA512 4c5115946a1086d88bc19aa556782aec45fc05f3e38fab8255bb13a863bd2744c08bca0fd6ed72da8c5171fe801436665f4b10bfc22203c500460942a0a6db2d
 AUX r8152-2.16.3-kernel-6.4.10-fix.patch 731 BLAKE2B 2d7820d7dc749bdd4dbbb165116135af2d6831f17b4721afc9c37bbd078f6915cc6c44ce9cb77941ffc52a399a6065269a578128b2c1bb0823658972f8f81dc2 SHA512 a274fc2d5f998ba0c6bfad74c0a56d50c9b146abe012fdd5eebe9719615876e63f55203f3dcf17397e4e28040cd0b253ef861e2cb9636da9c1d050fa844c226c
+AUX r8152-2.17.1-kernel-6.8-strscpy.patch 1298 BLAKE2B 057d7c31115e5903b040f53c964e62d79a3e05308d5b8b072ca6fbf4a3c08e13dc9975e0ca0b6f6342f9e70fc0c957e642ac6d9fdd9f7d915eb7ca7fb24e405a SHA512 4f19815e4f3f9bb3f7934fc13b7c912ab044270512c887b6c89f1409131b73d248d1462c7b1a464eb7e16c590e99bfe46032b36ca5b676896e995964d66d1028
 DIST r8152-2.16.3.tar.bz2 73331 BLAKE2B 9e22ee6d9d0197def782f77bfd0c88a2d8827d4f8cc0bbb1a6583ab67533cd07ba79a16cd9350272ed18c733fe809ea1ff70596627abdc65d452bdf817628bc8 SHA512 c37bf5199d3a857c9a7a12f3aa4ecfe9c04b49413aea862a053ebee24c137cd35769e5d5cc7e2bb7dd3bf9057f51ffada0b4e0c53cb3d417e05c8e3fc830705c
 DIST r8152-2.17.1.tar.bz2 75156 BLAKE2B 05b55ea17a579add9a9abee89db490685086bfe29aeea6cbfbdbb63a81dbee4d1cac151822c178e52febe4bee14a3b5deb20737f671fcdbc6dd6d01938b1d18c SHA512 e465b524ee8aaed12da8258195fb8a4c9fea0862812c1ab268e31ad6ec61444c4f4332d643124063b389fd1df7a271c6c057537d4cbe67188a1a2262b4793f42
 EBUILD r8152-2.16.3-r1.ebuild 1290 BLAKE2B 82d4ebe9fc9bca31b9a1307eae719745e7916c5d694a052e2e41c0178f2d18947d270ea19564347f8847f33dad132b9b4af1fb102e3a0b8e10ed87cfcdb0e4be SHA512 460cef4288683e56e13885a1a3bbc588b4816a9770bbffb22b81e980c50f9848b7cb15b5808ba88a204d0e5ad8372a8e741fc8617efac2e1b3cffc6309a802c3
-EBUILD r8152-2.17.1.ebuild 1192 BLAKE2B cf28c8f07c91c9df444ef70d93827511a43cd0eb8e7e1dce18cbaad31c217cc260eaf9e92c52a481d6e38bc7c06a3db21af9f099f977fa6405bcea92c0e8d70f SHA512 249e189f06f3669d0c2d97431d1a8f9f1263a749fb966f8cb7699774bb8c9d11855a5c811159c60cde751b06cc0d8bfb5c49a0aed0bb3f051b4414aff0170a00
+EBUILD r8152-2.17.1.ebuild 1245 BLAKE2B bb767448e83df2c8640591fbb0c9d9c250ffdd89f691b167105529e5cc42c3f845b148f7eabeb1d419f96f4b5943e92adb5cca9f9d2acc1100f0f1245d0ee065 SHA512 2cda05f85a4031618d0ab942d6c67a91790cfca6b4e4fc2488ce534993543ee1bb7a20e6d6c24513e314fe5fe580c892d83cfc34807b083c418392b30e07ead6
 MISC metadata.xml 660 BLAKE2B 1f7bd7d75e5fc3b88b140f88b82390b09cbffed8770b73b4584f7d9114fd1b97a84f745881d424f30c1a738c332bb04bab3d651bd9734f0170164eb8158ef098 SHA512 c0258ae24671a18801a9a499869267b2c3d2d0350e1fbbf91db6fe2358326bb27551623ef93c9c9a9bebde3c08520463eae00a05802053a0f5b7ade1b0f5ea4d
diff --git a/net-misc/r8152/files/r8152-2.17.1-kernel-6.8-strscpy.patch b/net-misc/r8152/files/r8152-2.17.1-kernel-6.8-strscpy.patch
new file mode 100644
index 000000000000..2449d2883346
--- /dev/null
+++ b/net-misc/r8152/files/r8152-2.17.1-kernel-6.8-strscpy.patch
@@ -0,0 +1,32 @@
+Bug: https://bugs.gentoo.org/926829
+Patch from Christian Bricart to remove strlcpy and replace with strscpy
+so this builds with linux kernels =>6.8.
+
+Signed-Off-By: Jay Faulkner <jay@jvf.cc>
+
+diff -Naur r8152-2.17.1/compatibility.h r8152-2.17.1.patched/compatibility.h
+--- r8152-2.17.1/compatibility.h	2024-03-12 09:43:05.150688533 +0100
++++ r8152-2.17.1.patched/compatibility.h	2024-03-12 09:46:20.913759268 +0100
+@@ -18,6 +18,10 @@
+ #include <net/gso.h>
+ #endif
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
++#define strscpy strlcpy
++#endif
++
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
+ 	#include <linux/mdio.h>
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
+diff -Naur r8152-2.17.1/r8152.c r8152-2.17.1.patched/r8152.c
+--- r8152-2.17.1/r8152.c	2024-03-12 09:43:05.130688336 +0100
++++ r8152-2.17.1.patched/r8152.c	2024-03-12 09:45:13.264694513 +0100
+@@ -19691,7 +19691,7 @@
+ 		uinfo->idVendor = __le16_to_cpu(udev->descriptor.idVendor);
+ 		uinfo->idProduct = __le16_to_cpu(udev->descriptor.idProduct);
+ 		uinfo->bcdDevice = __le16_to_cpu(udev->descriptor.bcdDevice);
+-		strlcpy(uinfo->devpath, udev->devpath, sizeof(udev->devpath));
++		strscpy(uinfo->devpath, udev->devpath, sizeof(udev->devpath));
+ 		pla_ocp_read(tp, PLA_IDR, sizeof(uinfo->dev_addr),
+ 			     uinfo->dev_addr);
+
diff --git a/net-misc/r8152/r8152-2.17.1.ebuild b/net-misc/r8152/r8152-2.17.1.ebuild
index 7d3f7b0a6e6e..992571ed39c9 100644
--- a/net-misc/r8152/r8152-2.17.1.ebuild
+++ b/net-misc/r8152/r8152-2.17.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
@@ -23,6 +23,7 @@ IUSE="+center-tap-short"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.16.3-kernel-6.4.10-fix.patch
 	"${FILESDIR}"/${PN}-2.16.3-asus-c5000-support.patch
+	"${FILESDIR}"/${PN}-2.17.1-kernel-6.8-strscpy.patch
 )
 
 src_compile() {
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index e980b3856f5d..1067cff84d29 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 2544 BLAKE2B 66a3858c02564b0c416770004510df6cfe9c20ea3fe167c556fe7ab2849fa953b4e1d8060a6898e86f5e86c163aa9f39af5ce3ffbe39b8c836299b014c9fdf7b SHA512 bc2768dfae0fe07d93e14d07aa14f46f54d481ee56fe306e3d6b6d0f05b38a4817f5f8d20ed65746ab78c0f5eb800d4c9c0131edd245633c8af406c6ff074f6a
-EBUILD remmina-1.4.35-r1.ebuild 2526 BLAKE2B f207747d1a6805bf5ec65d38c71d547d2d45be28baa87f5193141c7905741ce84c1b994133101d60cd97688bdecfa52a053ccce037b0f4ef4625a5204b362680 SHA512 34ab5514ff116fba63af293273a742a26b314fd104285eadc7eb33287853e1b3a27b946dd22c16ddaff1f6b90c98214eb46f6e412754f9d59f1025566fac3b16
+EBUILD remmina-1.4.31-r2.ebuild 2533 BLAKE2B 201fd4b935a44a984d6172f7736b8482df8024e99f360c006d6276ab61f48af7ddfca4714f89175f2b959547de58f55f2cb04791462d4993df688b44dd87ec17 SHA512 77124daa925d55d6e590987bf4b7179228cf7fc23de84e91685aa6a51240885bc5ab409f8a7aaf5d8bb66b94e2e156a167602f73dc610b22c8b3675f5020a773
+EBUILD remmina-1.4.35-r1.ebuild 2515 BLAKE2B aab99547da3a46f2e0696530c3bae767c84e468379393d22d11d56c08756e1023e4a500bd841de59d54c864c669f4f9715bf663d47bfd3d49af1a90e8bdae5ba SHA512 3448d529ae13761efff3191ae6d329fdfa60ba93bcec04efc6b148e0b69382eea9be5dd50083959582b64ea4ce4f4e5b1891fac5cb925679d83125d4af4b0158
 MISC metadata.xml 1123 BLAKE2B 658714c247c6fbec6118a88bc5493a67aca30e949249407d421592b956c15b439b6d96c682d2d6d7cc9f1eb2dfdcc902c4c463c6a208af4bb9196656723f220a SHA512 cbf00348e2da27acbe9890ac2d6b19d5731496cf1aab303d64f036700fb779587cb7fe81a95d3a25f9ec5dcb79e2e7e880e345fc1ac267acd25da89844ab6f21
diff --git a/net-misc/remmina/remmina-1.4.31-r2.ebuild b/net-misc/remmina/remmina-1.4.31-r2.ebuild
index e9fb311faaf7..d1554f95410e 100644
--- a/net-misc/remmina/remmina-1.4.31-r2.ebuild
+++ b/net-misc/remmina/remmina-1.4.31-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit cmake optfeature python-single-r1 xdg
+inherit cmake python-single-r1 xdg
 
 MY_P="${PN^}-v${PV}"
 
diff --git a/net-misc/remmina/remmina-1.4.35-r1.ebuild b/net-misc/remmina/remmina-1.4.35-r1.ebuild
index 1951abdc4d5d..5ff20d98dc90 100644
--- a/net-misc/remmina/remmina-1.4.35-r1.ebuild
+++ b/net-misc/remmina/remmina-1.4.35-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit cmake optfeature python-single-r1 xdg
+inherit cmake python-single-r1 xdg
 
 MY_P="${PN^}-v${PV}"
 
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index cfa428feffea..4d9aadb4b191 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 0f4347424d80..e71a990408a7 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -1,8 +1,8 @@
 AUX ead.initd 243 BLAKE2B dcd843a764c28064eb6bb6c0be6c64482df0ab0fa01e14831f0060719bfe0038ca75d9b0e79d78a234627a15c53da16151094c6cc6d48a049ae6ac3c9b1714a2 SHA512 1b39b25736a11870f5e740b5702b6f18b1714cc06df7e3462cd74d116cfaa82175801f336141f3fdf86be33aa97fcebf32d9c080d80419bbc548ad540ab7bd7d
 AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f30c56a7706828dd8e1544ecd61931f52fd5f52791abb0cfe07c685c297f560fe257b8769bfd6e6 SHA512 be44fb430252cf51e192b7b09a05302e1b9edfc4ebb7c5a357d912d727f25afc165b02752f9c51a9056e86471a12f3d2cfa384560b417d5303a93b5c4dff0a28
 DIST iwd-2.14.tar.xz 1082236 BLAKE2B ae50866ad0b3f0139352467f50b9babf054a91ec3c6298ac79842fa91f6df6802ea2b1e51688dce8d6487210b923a84b546a0afe996df7be9bad5eeb13129a7b SHA512 6af763d8dda4a8e99d96a6c94a72c16d298274fb224cc11912b4ec9eb8c80b599b49145b0fc979f213d14f6af100eb03477b6140272d303277d851eb8c8f9e07
-DIST iwd-2.16.tar.xz 1083684 BLAKE2B d744e85812128274984efe196678866ecdc500c6e5a2f72f01ebae83fd2afe120f789eef46cdc2383f3e67c3206723f2d40eee9073e5424c1cef86609af418da SHA512 29888542f4c92f5cad213bc8dce58fcd74f04659a50a207fc5a550f5c875d649447d7caca7ff322dec3e1e29d9ec50923b2607ac6bd726e59e5a116408e77eb5
+DIST iwd-2.17.tar.xz 1083756 BLAKE2B f930c13cafa7bcfe30b481891d2a8a7a439b316aaafb5ca9b05b2c2123cfe76ec032e8194e3bf1de34ce4330016a14c7fc316d15c03428f7832213220789f486 SHA512 06630fa1fdedbe82dc294eb0b44b542e79c11c09ffed8d8dcd4e38089ab43b8f5fbcfb2af29df494441fd54bc87d76c988fde2c639c219a890bbc45de3fff53d
 EBUILD iwd-2.14.ebuild 4133 BLAKE2B 36d9c8f41a74a3e7adfd0d87c4f1015fa3673de80ebd6d96353c17573c0511b8ee3ab22cb60616a46f0c22e70f81bd619c325676d7cf35961623d685894dad23 SHA512 63b19753390b0191f6ebc906d24ba05232a55d530527d2baa6a578bc0cabed4f4f29cbb535f3c23ea8cbb9d0a70aaf8fc07b78c0bd806cecb92f21dde2aa1c7d
-EBUILD iwd-2.16.ebuild 4139 BLAKE2B 0fe4fbf225314c3d8106e5eae2a6c468b3e27e218748ce95501c0a19d80225770237dafa375c189e0fa3cff4ffd4560080a100f685b109960c921f86f04dc36b SHA512 a723060224662cc8e5ed7ffb43b193a2693e54a18d793c78eeb3f51d8c68a3d0bf14a5d2a6772fa19176da0cac77f095d9b4c080daac1a3886c8d97249cbe307
+EBUILD iwd-2.17.ebuild 4139 BLAKE2B 8ae294364676f30c3e5d5f6a4b35a867bc310cead016c1483366a6875695244afa63ec23d15c1cb32a64e996d5f31d4ad4204bf852c0a7ebd7574162f5c40622 SHA512 35fca265a0519b1081b5a1ea5245968475a2974557009230b0ecae00cb24bdf7a157719e48a0b17021ee64679628c8f20520efab1ec2748e24f309f3f1e0e85e
 EBUILD iwd-9999.ebuild 4134 BLAKE2B fc962b5d779c059553cdb33cda2ca2824c7dcea091de99b884d2d6bc7e89cc2b2b43bc5cd4064b50386b7be21b1516cf9435c47276cde6f2ec2dcde284f18b65 SHA512 7e9ed114434f2d26b7b85a03f458ee30fcdcc12622da4501d00e685e712b4bb706939b2e0ffba358375b6025816a9b9ca9bd19d8ea7aac228662dad3dfc48baa
 MISC metadata.xml 717 BLAKE2B 4619afbff3a4275ff2307476c044c1a4f7c2a14ec4fbeec0db02cd35d8ec98a5d3febcde34dbc43a358129d02369ee6178e02d3938b7cace99946a963d235d99 SHA512 46809c9157af3809f720d38e71e900bb4ee8418f79030cda45e7c4547dca9f2f3b5932c5b481c44ae6bbfd0b48c0997106ada3be30ef5f2110cc287738f24473
diff --git a/net-wireless/iwd/iwd-2.16.ebuild b/net-wireless/iwd/iwd-2.17.ebuild
index 9fdd8eb4495d..61cdba524661 100644
--- a/net-wireless/iwd/iwd-2.16.ebuild
+++ b/net-wireless/iwd/iwd-2.17.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 inherit flag-o-matic linux-info systemd
 
 #Set this variable to the required external ell version
-ELL_REQ="0.63"
+ELL_REQ="0.64"
 
 if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index e0a1e61f0565..00f959fb5815 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 72e1245bb5ac..b50df1912e5b 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -405,10 +405,6 @@ dev-db/mariadb -jdbc
 # PGO is fixed on amd64
 >=www-client/firefox-48 -pgo
 
-# James Le Cuirot <chewi@gentoo.org> (2016-07-26)
-# Only available on some architectures.
-dev-java/icedtea -shenandoah
-
 # Mike Gilbert <floppym@gentoo.org> (2016-06-23)
 # This flag only has meaning on amd64
 sys-boot/grub:2 -grub_platforms_xen-32
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 5f51dcb020ea..d18139adf64a 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -367,8 +367,12 @@ app-admin/syslog-ng mongodb
 # Mart Raudsepp <leio@gentoo.org> (2018-04-08)
 # Tests fail for bundled luajit, USE=luajit is globally
 # masked too (no-one has tested it yet).
-app-text/texlive-core luajittex
-dev-texlive/texlive-basic luajittex
+# Florian Schmaus <flow@gentoo.org> (2024-03-29)
+# Restricted to pre texlive 2023 releases, as we have users
+# reporting that luajittex works with 2023 on arm64.
+# For example https://bugs.gentoo.org/928122#c7
+<app-text/texlive-core-2023 luajittex
+<dev-texlive/texlive-basic-2023 luajittex
 
 # Mart Raudsepp <leio@gentoo.org> (2018-03-31)
 # Boost.Context can be built on arm64
@@ -446,10 +450,6 @@ app-emulation/libvirt virtualbox
 # Need to check if this has a chance to work with in-kernel drivers
 app-crypt/heimdal afs
 
-# James Le Cuirot <chewi@gentoo.org> (2017-05-22)
-# Only available on some architectures.
-dev-java/icedtea -shenandoah
-
 # Thomas Deutschmann <whissi@gentoo.org> (2017-03-01)
 # Unkeyworded dependencies
 app-admin/rsyslog mongodb
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index ec88de6222ce..afb21417b194 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -368,10 +368,6 @@ dev-db/percona-server tokudb tokudb-backup-plugin
 # Mask jdbc as most arches don't support java
 dev-db/mariadb jdbc
 
-# James Le Cuirot <chewi@gentoo.org> (2016-07-26)
-# Only available on some architectures.
-dev-java/icedtea shenandoah
-
 # Mike Gilbert <floppym@gentoo.org> (2016-06-23)
 # This flag only has meaning on amd64
 sys-boot/grub:2 grub_platforms_xen-32
diff --git a/profiles/arch/m68k/package.use.mask b/profiles/arch/m68k/package.use.mask
index 3815aedb321e..9be2feccdf89 100644
--- a/profiles/arch/m68k/package.use.mask
+++ b/profiles/arch/m68k/package.use.mask
@@ -75,7 +75,6 @@ dev-python/distlib test
 dev-python/fonttools test
 dev-python/hatchling test
 dev-python/isort test
-dev-python/nose test
 dev-python/numpydoc test
 dev-python/objgraph test
 dev-python/pip-run test
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 3f43a0d59202..a5a54a1e9010 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -216,6 +216,7 @@ dev-libs/mongo-c-driver test
 # LuaJIT does not support riscv
 app-text/texlive-core luajittex
 dev-texlive/texlive-basic luajittex
+dev-texlive/texlive-context luajittex
 media-gfx/gimp lua
 www-servers/nginx nginx_modules_http_lua
 
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 3534f84dced9..ec8874f6d925 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -834,12 +834,6 @@ sys-devel/gcc vtv
 # invokes it wrong.
 dev-lang/moarvm asan
 
-# James Le Cuirot <chewi@gentoo.org> (2016-04-10)
-# Slower and less reliable than HotSpot and we don't support Java on
-# any non-HotSpot platforms. Don't unmask these unless you know what
-# you're doing. This has upstream's approval.
-dev-java/icedtea cacao jamvm
-
 # Rick Farina <zerochaos@gentoo.org> (2015-10-06)
 # forward porting this patch is non-trivial, mask for now
 >=net-wireless/wpa_supplicant-2.5 wimax
diff --git a/profiles/features/wd40/package.mask b/profiles/features/wd40/package.mask
index 3ce50e2ca1d2..b563d5da9088 100644
--- a/profiles/features/wd40/package.mask
+++ b/profiles/features/wd40/package.mask
@@ -91,7 +91,6 @@ dev-python/orjson
 dev-python/os-client-config
 dev-python/osc-lib
 dev-python/paramiko
-dev-python/pendulum
 dev-python/pooch
 dev-python/pydantic
 dev-python/pydantic-core
diff --git a/profiles/features/wd40/package.use.mask b/profiles/features/wd40/package.use.mask
index afa446586449..4d70f8b95974 100644
--- a/profiles/features/wd40/package.use.mask
+++ b/profiles/features/wd40/package.use.mask
@@ -119,7 +119,6 @@ net-vpn/networkmanager-vpnc gtk
 # Michał Górny <mgorny@gentoo.org> (2022-07-29)
 # More packages requiring dev-python/cryptography or its revdeps.
 app-admin/salt keyring neutron
-dev-python/boto test
 dev-python/dask test
 dev-python/docker test
 dev-python/google-api-python-client test
diff --git a/profiles/package.deprecated b/profiles/package.deprecated
index 8e619d65ae2d..db4bc1db6ddd 100644
--- a/profiles/package.deprecated
+++ b/profiles/package.deprecated
@@ -31,11 +31,6 @@ dev-python/pyside2
 dev-python/pyside2-tools
 dev-python/shiboken2
 
-# Michał Górny <mgorny@gentoo.org> (2024-01-23)
-# Unmaintained, very hacky package.  Its replacement, berkeleydb,
-# was so bad that we've lastrited it.
-dev-python/bsddb3
-
 # Michał Górny <mgorny@gentoo.org> (2023-12-10)
 # Superseded by dev-python/psycopg:0 (version 3).
 dev-python/psycopg:2
@@ -112,14 +107,6 @@ sys-apps/edac-utils
 # to packages not supporting Python 2 anymore.
 dev-python/future
 
-# Michał Górny <mgorny@gentoo.org> (2022-10-17)
-# Nosetests are no longer maintained (since 2015!), are completely
-# broken with Python 3.11, and we were already patching it to make it
-# work with prior Python versions.  If your package still needs it
-# (sic!), then either port it to use a maintained test framework (pytest
-# preferably) or last rite it.
-dev-python/nose
-
 # Matt Turner <mattst88@gentoo.org> (2022-10-02)
 # Dummy packages, now merged into app-accessibility/at-spi2-core.
 # When possible, replace dependencies on these packages with a dependency on
diff --git a/profiles/package.mask b/profiles/package.mask
index 5c87ffd1f2a2..7abcf6cc3031 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -34,7 +34,9 @@
 #--- END OF EXAMPLES ---
 
 # Sam James <sam@gentoo.org> (2024-03-28)
-# Serious bug which is being investigated. Please downgrade ASAP.
+# Backdoor discovered in release tarballs. DOWNGRADE NOW.
+# https://www.openwall.com/lists/oss-security/2024/03/29/4
+# https://bugs.gentoo.org/928134
 >=app-arch/xz-utils-5.6.0
 
 # Michał Górny <mgorny@gentoo.org> (2024-03-26)
@@ -693,61 +695,6 @@ sci-libs/mpir
 ~sys-auth/polkit-qt-0.200.0
 >=sys-libs/snapd-glib-1.64-r100
 
-# Michał Górny <mgorny@gentoo.org> (2024-02-28)
-# Nosetests have been abandoned in 2015.  Upstream (while technically
-# still around) has refused to accept any patches since, and we have
-# already had to fork it, to keep it somewhat working.  All
-# the remaining reverse dependencies were finally ported or last rited.
-# Removal on 2024-03-29.  Bug #822414.
-dev-python/nose
-
-# Michał Górny <mgorny@gentoo.org> (2024-02-28)
-# The project is not really actively maintained upstream, and it still
-# depends on dev-python/nose.  There are other tools with similar
-# functionality.
-# Removal on 2024-03-29.  Bug #878695.
-app-misc/rmlint
-
-# Michał Górny <mgorny@gentoo.org> (2024-02-27)
-# dev-python/boto is dead, with last release in 2018.  It has been
-# replaced by dev-python/boto3.  It carries a ton of patches and still
-# depends on dev-python/nose.
-#
-# Removal on 2024-03-28.  Bug #888235.
-dev-python/boto
-
-# Michał Górny <mgorny@gentoo.org> (2024-02-27)
-# Still depends on dev-python/nose.  No reverse dependencies.
-# Removal on 2024-03-28.  Bug #878721.
-sci-biology/biopandas
-
-# Michał Górny <mgorny@gentoo.org> (2024-02-27)
-# Effectively unmaintained in Gentoo.  Still depends on dev-python/nose,
-# on top of that tests are restricted, so we don't even know if it
-# works at all.  No reverse dependencies.
-# Removal on 2024-03-28.  Bug #878725.
-sci-chemistry/nmrglue
-
-# Arthur Zamarin <arthurzam@gentoo.org> (2024-02-23)
-# A library without any reverse dependencies in tree. Maintainer-needed
-# package. Has open security bug without handling. Has open bump for a
-# long time.
-# Removal: 2024-03-24.  Bugs #925342, #837518.
-dev-libs/zlog
-
-# Vadim Misbakh-Soloviov <mva@gentoo.org> (2024-02-22)
-# Masked for removal in 30 (or more) days.
-# Fetches only from specific geo-locations, hostile upstream, security issues.
-# Consider to use the version from overlay named "mva" after tree-cleaning.
-# No revdeps.  Bug #876271
-www-plugins/gosuslugi-plugin
-
-# Michał Górny <mgorny@gentoo.org> (2024-02-20)
-# Unmaintained.  The recently merged rewrite in Rust broke compilation
-# on 32-bit architecture.  No revdeps left.
-# Removal on 2024-03-21.  Bug #924881.
-dev-python/pendulum
-
 # Sam James <sam@gentoo.org> (2024-02-18)
 # Lots of changes, including a port to a new build system. Needs lots of testing.
 =sys-apps/gentoo-functions-1*
@@ -756,70 +703,6 @@ dev-python/pendulum
 # May break on some arches b/c of visibility/map changes to ffi_type_longdouble
 =dev-libs/libffi-3.4.5
 
-# Michał Górny <mgorny@gentoo.org> (2024-02-14)
-# Abandoned upstream in 2020.  Has a fork that has last been released
-# in 2021.  No revdeps.
-# Removal on 2024-03-15.  Bug #833088.
-dev-python/fb-re2
-
-# Michał Górny <mgorny@gentoo.org> (2024-02-14)
-# Unmaintained.  EAPI 6.  The service was shut down.
-# Removal on 2024-03-15.  Bug #922925.
-net-dns/odsclient
-
-# Michał Górny <mgorny@gentoo.org> (2024-02-14)
-# Data for removed sci-astronomy/casacore.  No other revdeps.
-# Removal on 2024-03-15.  Bug #923954.
-sci-astronomy/casa-data
-
-# Michał Górny <mgorny@gentoo.org> (2024-02-14)
-# media-sound/exaile is the last package to require unmaintained
-# dev-python/bsddb3 (or dev-python/berkeleydb which is equally horrible
-# and was removed in the past).
-# Removal on 2024-03-15.  Bug #922816.
-dev-python/bsddb3
-media-sound/exaile
-
-# Michał Górny <mgorny@gentoo.org> (2024-02-14)
-# All these firmwares are included in sys-kernel/linux-firmware, in some
-# cases in newer versions with security fixes.
-# Removal on 2024-03-15.  Bug #924589.
-sys-firmware/iwl1000-ucode
-sys-firmware/iwl3160-7260-bt-ucode
-sys-firmware/iwl3160-ucode
-sys-firmware/iwl6005-ucode
-sys-firmware/iwl6030-ucode
-sys-firmware/iwl7260-ucode
-sys-firmware/iwl8000-ucode
-
-# Michał Górny <mgorny@gentoo.org> (2024-02-14)
-# Does not work with >=kde-plasma/kwin-5.27 anymore.  Discontinued upstream.
-# https://github.com/Bismuth-Forge/bismuth/issues/471#issuecomment-1410969462
-# Removal on 2024-03-15.  Bug #924588.
-kde-misc/bismuth
-
-# Michał Górny <mgorny@gentoo.org> (2024-02-14)
-# A NIH build system with no revdeps.  Broken with ccache, clang
-# and possibly more.  Horrible bootstrap process.
-# Removal on 2024-03-15.  Bug #924587.
-dev-cpp/libodb
-dev-cpp/libodb-sqlite
-dev-util/build2
-
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2024-02-14)
-# "A harness to build OpenJDK using [...]" is no longer needed since
-# Gentoo can build openjdk from source.
-# Maintainer capacity missing to maintain these packages.
-# More than 30 open bugs.
-# Removal on 2024-03-15.
-dev-java/icedtea
-
-# Michał Górny <mgorny@gentoo.org> (2024-02-10)
-# Very fragile, keeps breaking.  Limited platform support.  Used only
-# as an optional dependency for dev-python/ipykernel.
-# Removal on 2024-03-11.  Bug #924221.
-dev-python/debugpy
-
 # Ulrich Müller <ulm@gentoo.org> (2024-02-08)
 # Masked for testing.
 # Test failure in watchpoints.dem, undefined function FresnelC.
@@ -831,12 +714,6 @@ dev-python/debugpy
 # Removal on 2024-03-08.  Bug #806079.
 sys-libs/libhugetlbfs
 
-# Michał Górny <mgorny@gentoo.org> (2024-02-03)
-# Doesn't work with Flask 3, and is abandoned upstream.  It can be
-# trivially replaced by a local function.  No revdeps.
-# Removal on 2024-03-04.  Bug #923701.
-dev-python/flask-gravatar
-
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2024-01-24)
 # app-misc/ddcutil-2.1.0 causes core-dump crashes in
 # kde-plasma/powerdevil[brightness-control].
diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask
index ef91c267508f..929018114296 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -7,7 +7,6 @@
 #  "_main", referenced from:
 #     implicit entry/start for main executable
 dev-python/pydevd
-dev-python/debugpy
 
 # Benda Xu <heroxbd@gentoo.org> (2023-08-18)
 # strlcpy and other BSD functions are available in the libc of macOS.
diff --git a/profiles/updates/4Q-2023 b/profiles/updates/4Q-2023
index 361fac25ddbd..173fb6a27ff4 100644
--- a/profiles/updates/4Q-2023
+++ b/profiles/updates/4Q-2023
@@ -15,7 +15,6 @@ move dev-python/swagger_spec_validator dev-python/swagger-spec-validator
 move dev-python/pslab-python dev-python/pslab
 move dev-python/python-discid dev-python/discid
 move dev-python/py-amqp dev-python/amqp
-move dev-python/pyre2 dev-python/fb-re2
 move dev-python/python-sshpubkeys dev-python/sshpubkeys
 move app-office/kalendar app-office/merkuro
 move kde-misc/wacomtablet kde-plasma/wacomtablet
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 3104911e1f54..55beffcfc98b 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1729,19 +1729,6 @@ dev-java/ant:xz - Enable XZ Ant tasks
 dev-java/commons-logging:log4j - Add optional support for log4j
 dev-java/dom4j:jaxen - Includes org.jaxen.dom4j package
 dev-java/emma:launcher - Install /usr/bin/emma. Collides with sci-biology/emboss.
-dev-java/icedtea:cacao - Use the CACAO virtual machine rather than HotSpot.
-dev-java/icedtea:cups - Link against the CUPS library at compile time, rather than using it dynamically at runtime.
-dev-java/icedtea:headless-awt - Don't install the X backend for AWT, needed by some GUIs (used to be X flag)
-dev-java/icedtea:jamvm - Use the JamVM virtual machine rather than HotSpot.
-dev-java/icedtea:jbootstrap - If possible, recompile the final IcedTea executables with itself.
-dev-java/icedtea:kerberos - Link against Kerberos in order to obtain the cache location.
-dev-java/icedtea:pax-kernel - Apply patch needed for pax enabled kernels.
-dev-java/icedtea:pch - Build using pre-compiled headers.
-dev-java/icedtea:sctp - Build the SCTP NIO channel implementation against lksctp
-dev-java/icedtea:shenandoah - Include the Shenandoah ultra-low pause time garbage collector (-XX:+UseShenandoahGC) (arm64 and x86_64 only)
-dev-java/icedtea:smartcard - Build the PCSC driver against pcsc-lite
-dev-java/icedtea:system-lcms - Build against the system LCMS installation rather than the in-tree copy.
-dev-java/icedtea:zero - Enable Zero assembler port (usually for non-HotSpot architectures)
 dev-java/icedtea-bin:headless-awt - Don't install the X backend for AWT, needed by some GUIs (used to be X flag)
 dev-java/java-config:compat - Install bin/java-config-2 symlink pointing to java-config
 dev-java/jaxen:dom4j - Includes org.jaxen.dom4j package
@@ -2830,6 +2817,7 @@ dev-tex/abntex:lyx - Install with app-office/lyx layout
 dev-tex/biblatex:biber - Install the unicode compatible backend processor
 dev-tex/pythontex:highlighting - Syntax highlighting using dev-python/pygments
 dev-texlive/texlive-basic:luajittex - Add support for LuaJitTeX: LuaTeX based on LuaJIT which is usually faster.
+dev-texlive/texlive-context:luajittex - Add support for LuaJitTeX: LuaTeX based on LuaJIT which is usually faster.
 dev-util/Tensile:client - Build and install tensile_client executable to run benchmarks and tune GPU GEMM
 dev-util/babeltrace:elfutils - Build the dev-util/lttng-ust debug information filter component class
 dev-util/babeltrace:plugins - Build support for Babeltrace 2 Python plugins
@@ -4716,7 +4704,6 @@ media-sound/ecasound:lv2 - Add support for Ladspa V2
 media-sound/ecasound:oil - Use dev-libs/liboil for inner loop optimizations
 media-sound/elisa:mpris - Enable MPRIS support
 media-sound/elisa:vlc - Use media-video/vlc for output rather than dev-qt/qtmultimedia
-media-sound/exaile:scrobbler - Enable audioscrobbler/last.fm support
 media-sound/fapg:xspf - Enable support for saving XSPF playlists.
 media-sound/fluidsynth:network - enable network support (requires BSD sockets)
 media-sound/fluidsynth:pipewire - enable media-video/pipewire support
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index e98e815faa0d..18eb9d391411 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/casa-data/Manifest b/sci-astronomy/casa-data/Manifest
deleted file mode 100644
index ed379f61e2a9..000000000000
--- a/sci-astronomy/casa-data/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST casa-data-20170703.tar.Z 12421015 BLAKE2B 324dd4174f80bdf192de0ec8c12125304a9dd85b6bf64b4386053ec65bab4aa98417bf69f38eae64e4bfacfa4a6479cc6fded13fd0c8edfcbd3eb8aec537c815 SHA512 dc0de856da4146ed356fbfcb522b427bb6a66fb08affdf0bfe803b21305ac37eff9b1790ede58acc993df2f22d620982f10b42f631457258d1620702c10d87b1
-EBUILD casa-data-20170703.ebuild 472 BLAKE2B b09fd244df7853166418d196eeb393f1c093c6c5f69c515ed6f901406619d6d1611625a9ca7abc470cec62836ab21b8fce4ca6f60d173a68f71cfaa37ba10136 SHA512 52f64922d5cb4174f21979c2790f29aee9e7de963b3ebd3b2d7deb227d9c4230576cbf220a08629425ed423020fd0e2885e3f2372deb0f6251284116623911fb
-MISC metadata.xml 525 BLAKE2B b415ff30a4761c8296972cc5526fc6580cc9316d61f66073efc49e96973d6876c64dcc40d222e280704fa3285fb56a0c170c813b4b29722bcfdb03ec8906e584 SHA512 57f49c743dccb081fe8bd0126278a5d5efee273cdd4cd283dcf767f3dcb0b59b4a03d6f660953a67ac4c95db16723e442dee041d831f840b80417b32b50ce456
diff --git a/sci-astronomy/casa-data/casa-data-20170703.ebuild b/sci-astronomy/casa-data/casa-data-20170703.ebuild
deleted file mode 100644
index b4d8eb48b3c2..000000000000
--- a/sci-astronomy/casa-data/casa-data-20170703.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYPN=WSRT_Measures
-
-DESCRIPTION="Data and tables for the CASA software"
-HOMEPAGE="https://github.com/casacore/casacore/"
-SRC_URI="ftp://ftp.astron.nl/outgoing/Measures/${MYPN}_${PV}-000001.ztar -> ${P}.tar.Z"
-S="${WORKDIR}"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-src_install() {
-	insinto /usr/share/casa/data
-	doins -r *
-}
diff --git a/sci-astronomy/casa-data/metadata.xml b/sci-astronomy/casa-data/metadata.xml
deleted file mode 100644
index 0f317f26f352..000000000000
--- a/sci-astronomy/casa-data/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci-astronomy@gentoo.org</email>
-		<name>Gentoo Astronomy Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		Observatory tables, ephemerides and other software data related to
-		the Common Astronomy Software Applications (CASA) suite.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">casacore/casacore</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index f7fec9ed238f..7cbee1615b6a 100644
--- a/sci-biology/Manifest.gz
+++ b/sci-biology/Manifest.gz
diff --git a/sci-biology/biopandas/Manifest b/sci-biology/biopandas/Manifest
deleted file mode 100644
index 9c5ea048b9e8..000000000000
--- a/sci-biology/biopandas/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST biopandas-0.4.1.gh.tar.gz 5330292 BLAKE2B 78b783ed77bbd8e6efd115a108f99c502fd71ef4c231746575599828699dac1de85125273df1af74d0bd51e092751113474ef2baf312a184e23b3057cd21222a SHA512 e08694fad927a5ac096b2cd78f641a2af262ebfc7351fc4dc37e5df39e98a6e984ccab26718109f18eed988a4a4af5b29d19c5cf3e8e2d794246b1410a9b5440
-EBUILD biopandas-0.4.1.ebuild 669 BLAKE2B c8169a146ac2a23317152e374df3a72545399c4dd162a6b9c0394c40e83eb296cf09ddc35a02237b0894bede3573247467376240ee50abe5558bf183a7e65486 SHA512 47eb4221c05e2819deff8598c6f3e67d53c6cd7de40ada5a6d1b97b206c6bdaa9240cd1f2c4f3b1ad2aab66ff62c02a9179667353f9bd4e412ac3b703074493d
-MISC metadata.xml 541 BLAKE2B 45092856329b54575afe8a96a334b0face2c980cea240f57135c5a631088f114944a3c80ffde509af7e3a14c3a17652c8df4828919474e6b9961b93b51c8abbf SHA512 aafea3a1194d6cebddcf3b3d42a7c26a510c360259ffcf49c16f2de8742f1d24097cfeccd2e33a1d8d30a3c63fb5ca0a21469bac3c30aad6a4d41136f87cc4df
diff --git a/sci-biology/biopandas/biopandas-0.4.1.ebuild b/sci-biology/biopandas/biopandas-0.4.1.ebuild
deleted file mode 100644
index 50fe601ed514..000000000000
--- a/sci-biology/biopandas/biopandas-0.4.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="Molecular Structures in Pandas DataFrames"
-HOMEPAGE="
-	https://rasbt.github.io/biopandas/
-	https://github.com/BioPandas/biopandas
-	https://pypi.org/project/biopandas/
-"
-SRC_URI="https://github.com/BioPandas/biopandas/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
diff --git a/sci-biology/biopandas/metadata.xml b/sci-biology/biopandas/metadata.xml
deleted file mode 100644
index 5133b4eff6ab..000000000000
--- a/sci-biology/biopandas/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-biology@gentoo.org</email>
-    <name>Gentoo Biology Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">biopandas</remote-id>
-    <maintainer status="unknown">
-      <email>mail@sebastianraschka.com</email>
-      <name>Sebastian Raschka</name>
-    </maintainer>
-    <remote-id type="github">BioPandas/biopandas</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index ed046d48bf96..12b9ae4fc661 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/nmrglue/Manifest b/sci-chemistry/nmrglue/Manifest
deleted file mode 100644
index 0ce336d7bb1e..000000000000
--- a/sci-chemistry/nmrglue/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST nmrglue-0.9.tar.gz 14916942 BLAKE2B febe5c25a05474242654a63617388b4e65310050d07263cf6dd173ac75579c75b8b3238d7a20fe7e535ee43fe53828fe6776f18cc781c24ac571d58a1110314c SHA512 8e20a53cf53df6fb0f0ddba1361b1ead0f03c5cdd34cc7199fb9d6727060596a1f79c5c0139dd978f6b09551216a0042e8858603ce4c9b1f4063f04e06d912e5
-EBUILD nmrglue-0.9.ebuild 806 BLAKE2B 19d15dde6807494f7cd30c6eaf242aece1b7834b68a653f5f1ccdce312df1de977655979049d337c4b11da241048117d94b84238ae006236a81e5f8b008f707a SHA512 779e0a209fc8dc4a40998bb3cb8a8375f782abbbe19d69872f7f86bc616b9608b4ecfadd771e3bcb66b92eb02720429b4143c4c4e4a0feffd94982b630b410d6
-MISC metadata.xml 1359 BLAKE2B 2af5f4f21a0e3a531df1f10709c7830fa23e54d0cadd03f08dcb4f4f44aaccb04078e4908e1503185c5ab5bbb3ad22d6a4f3dc88e7a38ca0866c62dba4b699b4 SHA512 0a139395593cc7162d852be49f3c89d109235da0d667131d0268fbf37ba39933951fe404aac5a71548b8d46cf157b63572f57ad47877bb349a7a42ac762ee4e4
diff --git a/sci-chemistry/nmrglue/metadata.xml b/sci-chemistry/nmrglue/metadata.xml
deleted file mode 100644
index 83de058dacf2..000000000000
--- a/sci-chemistry/nmrglue/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-chemistry@gentoo.org</email>
-    <name>Gentoo Chemistry Project</name>
-  </maintainer>
-  <longdescription>
-  Nmrglue has the ability to read, write and convert between a number of NMR file
-  formats including Agilent/Varian, Bruker, NMRPipe, Sparky, SIMPSON, Rowland NMR
-  Toolkit files. The files, which are represented in Python as dictionaries of
-  spectral parameters and NumPy ndarray objects, can be easily examined, modified
-  and processed as desired.
-
-  Nmrglue provides a number of functions for processing NMR data such as
-  apodization, spectral shifting, Fourier and other transformations, baseline
-  smoothing and flattening, and linear prediction modeling and extrapolation.
-  In addition new processing schemes can be implemented easily using the nmrglue
-  provided functions and the multitude of numerical routines provided by the NumPy
-  and SciPy packages.
-
-  When used in conjunction with the matplotlib (or other) python plotting library
-  nmrglue can be used to create publication quality figures of NMR spectrum or
-  examine data interactively.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">jjhelmus/nmrglue</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-chemistry/nmrglue/nmrglue-0.9.ebuild b/sci-chemistry/nmrglue/nmrglue-0.9.ebuild
deleted file mode 100644
index 9323133b7c93..000000000000
--- a/sci-chemistry/nmrglue/nmrglue-0.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A module for working with NMR data in Python"
-HOMEPAGE="https://www.nmrglue.com/"
-SRC_URI="https://github.com/jjhelmus/nmrglue/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-# Requires sci-chemistry/nmrpipe from ::sci
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( app-shells/tcsh )"
-
-distutils_enable_tests nose
-distutils_enable_sphinx doc/source dev-python/sphinx-rtd-theme dev-python/numpydoc
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 4d33d710f309..6da32e9f864c 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpxlab/Manifest b/sci-geosciences/gpxlab/Manifest
index 8546159e2a5c..393580ec1a89 100644
--- a/sci-geosciences/gpxlab/Manifest
+++ b/sci-geosciences/gpxlab/Manifest
@@ -1,4 +1,4 @@
 AUX gpxlab-0.7.0.patch 380 BLAKE2B 8d0f0eda988b7fc37cb0b5a9f9b5d06008a9eb8ec6cdeb8b427f405fee11f0b3f3c4d8e18037c5cd0dad70fd1e9ce1d8ddceb243cc2825f3c0c6f224889565bc SHA512 79d3837213b6055cc7b06e1d18cd0297b7604df1f1f1d40c9eb287b125e4c62af206c790f8d749bca9549223d6c50d17505c30f969267e56cd92dcc3f1b408e6
 DIST gpxlab-0.7.0.tar.gz 1082049 BLAKE2B e84b04ef711b9d6d24639f338a5dd1d61185aeb6917699228fdd68309f15736f52b0ead7cba234bd4538bb7012bba5b6889fcf020cbfad96d90e46d26628e086 SHA512 493eaab8d14bb7402eafe8273d6ced2bc2e0632448cfc7b510a4d8dbe180abcaa6e321f435b7a5209a322851f04af493786b88123962cac525a315ecf375f817
-EBUILD gpxlab-0.7.0.ebuild 1097 BLAKE2B 95bcad96d0eaafdc83c0dee9285d937fbee845c0993bfd86a9cd164da01e83686de517ae495bf182fd62abd5db3cd87141bee1680530642377e44c37bc1168aa SHA512 8b0d83a68720ae712e34683fb73baa1cba813f48b53803230a13e00d9a1bee1c4bfbbc5c3e5402edc48152ac6d50cd81a5bc1cb70aaec44789c43b9159b82658
+EBUILD gpxlab-0.7.0-r1.ebuild 1088 BLAKE2B 06665b499bb98708e181db284a74fb096d833fedcfc727de707a845b7d7f39739cb4af2f671765512f4ac3ab82434d69648fbcc9e03d00df7e918115248c43f4 SHA512 5d7294e9fc831c607852833353f72eea894c9b14e5357c69fe4a3da587ac6981ed1c1237fbdc20b1aa60543fcaa87459c7413638e8204318a76fff2314f4014e
 MISC metadata.xml 461 BLAKE2B aaf6b9faca293dfe501cb7acaff382f759f271897021e330ef8d6f958c3363b23b269abb135db8559413e38cbebf87b89a375a06abbe9fba9d056928725963de SHA512 e77c6f734ae46cab552a9f8ca2e62d18b7ef398ef92b6d5df6345aa2f4dce188d2ad2fb639cd1012969c0dc7ffa6380121396b6966acc4e201634b38c96f9226
diff --git a/sci-geosciences/gpxlab/gpxlab-0.7.0.ebuild b/sci-geosciences/gpxlab/gpxlab-0.7.0-r1.ebuild
index 46bc19a557dc..56fda8622ff6 100644
--- a/sci-geosciences/gpxlab/gpxlab-0.7.0.ebuild
+++ b/sci-geosciences/gpxlab/gpxlab-0.7.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PLOCALES="fi ru"
-inherit desktop plocale qmake-utils xdg
+inherit plocale qmake-utils xdg
 
 MY_PN="GPXLab"
 MY_P="${MY_PN}-${PV}"
@@ -12,10 +12,12 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="An application to display and manage GPS tracks"
 HOMEPAGE="https://github.com/BourgeoisLab/GPXLab"
 SRC_URI="https://github.com/BourgeoisLab/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+
 RDEPEND="dev-qt/qtcore:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtgui:5
@@ -24,8 +26,6 @@ RDEPEND="dev-qt/qtcore:5
 DEPEND="${RDEPEND}"
 BDEPEND="dev-qt/linguist-tools:5"
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=( "${FILESDIR}"/${PN}-0.7.0.patch )
 
 src_prepare() {
@@ -34,9 +34,8 @@ src_prepare() {
 	plocale_find_changes ${MY_PN}/locale "${PN}_" '.ts'
 
 	rm_ts() {
-		sed -e "s|locale/${PN}_${1}.ts||" -i ${MY_PN}/${MY_PN}.pro
+		sed -e "s|locale/${PN}_${1}.ts||" -i ${MY_PN}/${MY_PN}.pro || die
 	}
-
 	plocale_for_each_disabled_locale rm_ts
 }
 
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index c951286f3522..09f5c96c9ee2 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 6ee478036d49..18dafdedc217 100644
--- a/sec-keys/openpgp-keys-apache-tomcat/Manifest
+++ b/sec-keys/openpgp-keys-apache-tomcat/Manifest
@@ -1,8 +1,10 @@
 DIST openpgp-keys-apache-tomcat-10.1.19-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
 EBUILD openpgp-keys-apache-tomcat-10.1.19.ebuild 562 BLAKE2B c0f0568d4256046c00022cf9346bcaa5cf4e98d7834cf9ed8d11834773b5ec8bdbfc34d5a8a114f07d023d7331e92f0dfe5c4d5a9d5868afc4fa917f5d13d7a3 SHA512 b890e947de93fecafe4c3c7c366e62b6ec48db4fc3bed4c5bb90c95f49e43a3e7187afd662c9d67f4f1e7b4abd260e8d22dc712fde7e8dda8f27dc3d5863439a
+EBUILD openpgp-keys-apache-tomcat-8.5.100.ebuild 562 BLAKE2B 98ba7c40161f95d2e733abf0018a8f71eed3033767e166f084a258096a5f6a48a4a4f76f3894b8a508e9f0a019c1c9eb6b265077d8f4c7720fffea2142b16ba7 SHA512 a18b61ed86df6c7a8ff5613550ebce44fe37f2a973e23df9dba14eb61e5990ed224045d080f7e7a231bff67e35d4a95c36331c9ffb1e1f8fa806a4d13774dd41
 EBUILD openpgp-keys-apache-tomcat-8.5.99.ebuild 562 BLAKE2B 98ba7c40161f95d2e733abf0018a8f71eed3033767e166f084a258096a5f6a48a4a4f76f3894b8a508e9f0a019c1c9eb6b265077d8f4c7720fffea2142b16ba7 SHA512 a18b61ed86df6c7a8ff5613550ebce44fe37f2a973e23df9dba14eb61e5990ed224045d080f7e7a231bff67e35d4a95c36331c9ffb1e1f8fa806a4d13774dd41
 EBUILD openpgp-keys-apache-tomcat-9.0.86.ebuild 562 BLAKE2B c0f0568d4256046c00022cf9346bcaa5cf4e98d7834cf9ed8d11834773b5ec8bdbfc34d5a8a114f07d023d7331e92f0dfe5c4d5a9d5868afc4fa917f5d13d7a3 SHA512 b890e947de93fecafe4c3c7c366e62b6ec48db4fc3bed4c5bb90c95f49e43a3e7187afd662c9d67f4f1e7b4abd260e8d22dc712fde7e8dda8f27dc3d5863439a
 EBUILD openpgp-keys-apache-tomcat-9.0.87.ebuild 562 BLAKE2B c0f0568d4256046c00022cf9346bcaa5cf4e98d7834cf9ed8d11834773b5ec8bdbfc34d5a8a114f07d023d7331e92f0dfe5c4d5a9d5868afc4fa917f5d13d7a3 SHA512 b890e947de93fecafe4c3c7c366e62b6ec48db4fc3bed4c5bb90c95f49e43a3e7187afd662c9d67f4f1e7b4abd260e8d22dc712fde7e8dda8f27dc3d5863439a
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.100.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.100.ebuild
new file mode 100644
index 000000000000..a08965274b03
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.100.ebuild
@@ -0,0 +1,20 @@
+# 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-80.cgi"
+SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
+
+LICENSE="public-domain"
+SLOT="${PV}"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+S="${WORKDIR}"
+
+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 694d5c6b5d30..217c8cdd5be2 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 06a1a4106948..3c06d38072c3 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,6 +1,7 @@
 AUX busybox-1.26.2-bb.patch 2416 BLAKE2B 2e227c11b0fd5558bfdb91a2d8bf3fd73e348e7efff9ecc6820e9ecd92047ffe4e94fe8f2aa864db87a3f081c2e3ff599546563fff83c78fc36a44fafc559de6 SHA512 cb767a613ede504a7b1a87da3270992ffa44d3b6f76eebefceffc8a5a49119a99333c482420efab9d1e5a92a26280376c7e9ec62fcb2193d9172f4e7bc19f50e
 AUX busybox-1.34.1-skip-selinux-search.patch 724 BLAKE2B 068334c468bb9c2199311be836f38264df4c6fc12a410119f989e210a27ea9561190f554c17b8d29fca4b83fc2016e1211edc4b1ca7d127449381291720946f1 SHA512 bc6eb9e8cbc21e8e00f696505d88ad3c7be5a3e4f7414a2dc4c8fe98088e7602f44b1d5b58b13ae85675b635be23bee13db800b6ab639babf89b306669980b43
 AUX busybox-1.36.0-fortify-source-3-fixdep.patch 1120 BLAKE2B 1064e3e57dddd2a12509a96a57f0e7fe78968405f53f005ff6a466da4531d1d93045c9397e86e3abdd20e850742a4803ab309c8f7597df972f7821343c26431d SHA512 c987935d5ca1ff5567235f4d2a7ecc6a59fc0aeab8d429413165ac37e344dff243ba40459a5d99e9f02fc7476fa04b9f9ac4201b62fa321ec2e7a9a165188308
+AUX busybox-1.36.1-kernel-6.8.patch 1768 BLAKE2B 6829a3aaeb128a47cc5a24cd3825a667aaaa9b0e8da53ce75f82d43c873f12c1962f06c7a84e5256c82c9bd0ac9b0f4d40f5276747defc759dcd114bb4148e3e SHA512 c99fb248933df4d2c9aea09b7f5adaa99ef48316d67ebbd2e85909e48c6e6776ac3bd972e93b248e79a2a17b04bab82e8cae6f7eb58a673e9fe88a1c09a0fad9
 AUX crond.confd 55 BLAKE2B 23e5530472b9ea09177b8e5ea944528a0ff9ba62a8b434a547da16b2e8721c8a1500405b69af8840be3a3b3d86d2d3b7bd1fd5a27a34de874ca44caf961d5cee SHA512 10a3c88ecf7ccf0c1e0581c78433846135ee8b1092d07082e745d5371108194871c7502b4c58ad430e065c25441fea7ba0e73268c95df13cd6f8e9146ef312d7
 AUX crond.initd 253 BLAKE2B 8fc898a5127eb114417c04d8b392237f8628673138bb3ce420038f58caea28c43ceb1433f05cdd238999f9faf8b22e74d540521223de31ef31f224a5a2233f93 SHA512 312e308010434200d53baf9a362c8372f48661394a7d7643e14dbbe8c8d579f43f5e38714f55ccc4ddb084f9a06804adde0acbf2a4d2bc69c8e39b91aa716bdd
 AUX ginit.c 3097 BLAKE2B 77a9382dfa5dabc7541fab85fe211760604c757c3f2c5e49556d0ae9e82239833d21eb8954f595ebf814925d3508a5016701344985c6ef15e6f3d23ea675f646 SHA512 8bf70f13db0fbeecedf9a9f862c5391c0d8b7aa3ddd2ec85cda9b360c3117a01e32b01017b8c30197f587e521ba360ff70d1caf8d0f69d5c3a27f37ecc252e7c
@@ -19,5 +20,6 @@ AUX watchdog.confd 232 BLAKE2B 14ff3813297bc987e98bf3cabee2e7b150e23d8aa9f016303
 AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379afe9d490ad32b19a6d10d456155fdeb0468c67816f061b1cac166db7f104dbadadf0d175082efdb4 SHA512 d329fb72ce078a95a1fb77b72321dee56d19c76b45cb78a7a57a46d9fa385b982a114be49dd8696c2d4fc2b2dd90a17ee728ef2938172cc2f8b12b5a9ebd62f5
 DIST busybox-1.36.1.tar.bz2 2525473 BLAKE2B e515825cb3ab1c520e16b9c2512e9fc72947366a72a0466bff59b507fdffbc78fc9d16b44a26116175fc7a429d849ad944b1bc379d36c6d3a0eb20969997336e SHA512 8c0c754c9ae04b5e6b23596283a7d3a4ef96225fe179f92d6f6a99c69c0caa95b1aa56c267f52d7c807f6cc69e1f0b7dd29a8ac624098f601738f8c0c57980d4
 EBUILD busybox-1.36.1-r1.ebuild 10681 BLAKE2B 9e56637f6098a139e7a789bb5646b63588dad38c33f3f2eb3b493a8a20adcdaa95120a5282dcd1a4faa2dd419768f440e2e93c13e6a2e55a454e055a287a0d38 SHA512 980e5449cbcad5c74001fb3ac11c5b5d636a459cf4e9f2ae6f4f92a05cae6c8add5e7c63f09b4d6e9922aa465bff0cbaddfeaa9f70f852f6c83667f59147bacc
-EBUILD busybox-9999.ebuild 10689 BLAKE2B f3a4a3b986a946a737087b8741abeeb71c5765d641a5b35c4b14161232d7e0536f8c570b89f3a332e3fcee528cb3f21ad59df2389d712470281880241054900a SHA512 6ebf2660185eb4e6d8720e24601449ea923cc97a904b6a173899c454d19548adb4cfb67a98cb6290c445668ae8777dc0dbc12cd36ef0e428c799e0a2a454d425
+EBUILD busybox-1.36.1-r2.ebuild 10734 BLAKE2B 89dd7e6c1f513c6f6f21529336fd350b974b7c5b9efbc796fa15fdaed837844887682c5c07c5fd2307ca9c21671cb2a8d599cf9c021ffc9e50a095200cffc663 SHA512 d4dd190df22083b3aa1d2d1ce3f27f1b3ed7321170511383342771537024406563b7327bd9924bdc3c6ed0d7c609c0cc24c07bb116ce205a3028443c699c1ff1
+EBUILD busybox-9999.ebuild 10734 BLAKE2B 89dd7e6c1f513c6f6f21529336fd350b974b7c5b9efbc796fa15fdaed837844887682c5c07c5fd2307ca9c21671cb2a8d599cf9c021ffc9e50a095200cffc663 SHA512 d4dd190df22083b3aa1d2d1ce3f27f1b3ed7321170511383342771537024406563b7327bd9924bdc3c6ed0d7c609c0cc24c07bb116ce205a3028443c699c1ff1
 MISC metadata.xml 873 BLAKE2B d9c3725e1c3587d497894761d9eda08b670522d5c1a5518ea879cb5c9f222519005d28a36d6dea0b34d4bf4a2352e54aa151177f98ac730ce5b83e87ae4d35a2 SHA512 4c74f718046b41fbcf0111c797d6cdfa1f647914bfa5ff9aaedd6844ba1367722f225ed8ac17717d7b44c5ddc3b450e130da46cc0f6e21501b66cfd267a8f9ad
diff --git a/sys-apps/busybox/busybox-1.36.1-r2.ebuild b/sys-apps/busybox/busybox-1.36.1-r2.ebuild
new file mode 100644
index 000000000000..74082ac77ae5
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.36.1-r2.ebuild
@@ -0,0 +1,377 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
+
+EAPI=8
+
+inherit flag-o-matic readme.gentoo-r1 savedconfig toolchain-funcs
+
+DESCRIPTION="Utilities for rescue and embedded systems"
+HOMEPAGE="https://www.busybox.net/"
+if [[ ${PV} == "9999" ]] ; then
+	MY_P="${P}"
+	EGIT_REPO_URI="https://git.busybox.net/busybox"
+	inherit git-r3
+else
+	MY_P="${PN}-${PV/_/-}"
+	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2" # GPL-2 only
+SLOT="0"
+IUSE="debug livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd"
+REQUIRED_USE="pam? ( !static )"
+RESTRICT="test"
+
+# TODO: Could make pkgconfig conditional on selinux? bug #782829
+RDEPEND="
+	!static? (
+		virtual/libc
+		virtual/libcrypt:=
+		selinux? ( sys-libs/libselinux )
+	)
+	pam? ( sys-libs/pam )
+"
+DEPEND="${RDEPEND}
+	static? (
+		virtual/libcrypt[static-libs]
+		selinux? ( sys-libs/libselinux[static-libs(+)] )
+	)
+	sys-kernel/linux-headers"
+BDEPEND="virtual/pkgconfig"
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS='
+If you want a smaller executable, add `-Oz` to your busybox `CFLAGS`.'
+
+busybox_config_option() {
+	local flag=$1 ; shift
+	if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then
+		busybox_config_option $(usex ${flag} y n) "$@"
+		return
+	fi
+	local expr
+	while [[ $# -gt 0 ]] ; do
+		case ${flag} in
+		y) expr="s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" ;;
+		n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;;
+		*) expr="s:.*\<CONFIG_$1\>.*:CONFIG_$1=${flag}:g" ;;
+		esac
+		sed -i -e "${expr}" .config || die
+		einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find CONFIG_$1 ...")"
+		shift
+	done
+}
+
+busybox_config_enabled() {
+	local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
+	case ${val} in
+	"") return 1 ;;
+	y)  return 0 ;;
+	*)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
+	esac
+}
+
+# patches go here!
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.26.2-bb.patch
+	"${FILESDIR}"/${PN}-1.34.1-skip-selinux-search.patch
+
+	"${FILESDIR}"/${PN}-1.36.0-fortify-source-3-fixdep.patch
+	"${FILESDIR}"/${PN}-1.36.1-kernel-6.8.patch
+
+	# "${FILESDIR}"/${P}-*.patch
+)
+
+src_prepare() {
+	default
+	unset KBUILD_OUTPUT #88088
+	append-flags -fno-strict-aliasing #310413
+	use ppc64 && append-flags -mminimal-toc #130943
+
+	cp "${FILESDIR}"/ginit.c init/ || die
+
+	# flag cleanup
+	sed -i -r \
+		-e 's:[[:space:]]?-(Werror|Os|Oz|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
+		Makefile.flags || die
+	sed -i \
+		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
+		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
+		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
+		Makefile || die
+	sed -i \
+		-e 's:-static-libgcc::' \
+		Makefile.flags || die
+
+	# Print all link lines too
+	sed -i -e 's:debug=false:debug=true:' scripts/trylink || die
+}
+
+src_configure() {
+	# check for a busybox config before making one of our own.
+	# if one exist lets return and use it.
+
+	restore_config .config
+	if [ -f .config ]; then
+		yes "" | emake -j1 -s oldconfig >/dev/null
+		return 0
+	else
+		ewarn "Could not locate user configfile, so we will save a default one"
+	fi
+
+	# setting SKIP_SELINUX skips searching for selinux at this stage. We don't
+	# need to search now in case we end up not needing it after all.
+	# setup the config file
+	emake -j1 -s allyesconfig SKIP_SELINUX=$(usex selinux n y) >/dev/null #620918
+	# nommu forces a bunch of things off which we want on #387555
+	busybox_config_option n NOMMU
+	sed -i '/^#/d' .config
+	yes "" | emake -j1 -s oldconfig SKIP_SELINUX=$(usex selinux n y) >/dev/null #620918
+
+	# now turn off stuff we really don't want
+	busybox_config_option n DMALLOC
+	busybox_config_option n FEATURE_2_4_MODULES #607548
+	busybox_config_option n FEATURE_SUID_CONFIG
+	busybox_config_option n BUILD_AT_ONCE
+	busybox_config_option n BUILD_LIBBUSYBOX
+	busybox_config_option n FEATURE_CLEAN_UP
+	busybox_config_option n MONOTONIC_SYSCALL
+	busybox_config_option n USE_PORTABLE_CODE
+	busybox_config_option n WERROR
+	# CONFIG_MODPROBE_SMALL=y disables depmod.c and uses a smaller one that
+	# does not support -b. Setting this to no creates slightly larger and
+	# slightly more useful modutils
+	busybox_config_option n MODPROBE_SMALL #472464
+	# triming the BSS size may be dangerous
+	busybox_config_option n FEATURE_USE_BSS_TAIL
+
+	# These cause trouble with musl.
+	if use elibc_musl; then
+		busybox_config_option n FEATURE_UTMP
+		busybox_config_option n EXTRA_COMPAT
+		busybox_config_option n FEATURE_VI_REGEX_SEARCH
+	fi
+
+	# Disable standalone shell mode when using make-symlinks, else Busybox calls its
+	# applets by default without looking up in PATH.
+	# This also enables users to disable a builtin by deleting the corresponding symlink.
+	if use make-symlinks; then
+		busybox_config_option n FEATURE_PREFER_APPLETS
+		busybox_config_option n FEATURE_SH_STANDALONE
+	fi
+
+	# If these are not set and we are using a busybox setup
+	# all calls to system() will fail.
+	busybox_config_option y ASH
+	busybox_config_option y SH_IS_ASH
+	busybox_config_option n HUSH
+	busybox_config_option n SH_IS_HUSH
+
+	busybox_config_option '"/run"' PID_FILE_PATH
+	busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH
+
+	busybox_config_option pam PAM
+	busybox_config_option static STATIC
+	busybox_config_option syslog {K,SYS}LOGD LOGGER
+	busybox_config_option systemd FEATURE_SYSTEMD
+	busybox_config_option math FEATURE_AWK_LIBM
+
+	# all the debug options are compiler related, so punt them
+	busybox_config_option n DEBUG_SANITIZE
+	busybox_config_option n DEBUG
+	busybox_config_option y NO_DEBUG_LIB
+	busybox_config_option n DMALLOC
+	busybox_config_option n EFENCE
+	busybox_config_option $(usex debug y n) TFTP_DEBUG
+
+	busybox_config_option selinux SELINUX
+
+	# this opt only controls mounting with <linux-2.6.23
+	busybox_config_option n FEATURE_MOUNT_NFS
+
+	# glibc-2.26 and later does not ship RPC implientation
+	busybox_config_option n FEATURE_HAVE_RPC
+	busybox_config_option n FEATURE_INETD_RPC
+
+	# default a bunch of uncommon options to off
+	local opt
+	for opt in \
+		ADD_SHELL \
+		BEEP BOOTCHARTD \
+		CRONTAB \
+		DC DEVFSD DNSD DPKG{,_DEB} \
+		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
+		FEATURE_DEVFS \
+		HOSTID HUSH \
+		INETD INOTIFYD IPCALC \
+		LOCALE_SUPPORT LOGNAME LPD \
+		MAKEMIME MKFS_MINIX MSH \
+		OD \
+		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
+		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
+		TASKSET TCPSVD \
+		RPM RPM2CPIO \
+		UDPSVD UUDECODE UUENCODE
+	do
+		busybox_config_option n ${opt}
+	done
+
+	emake -j1 oldconfig > /dev/null
+}
+
+src_compile() {
+	unset KBUILD_OUTPUT #88088
+	export SKIP_STRIP=y
+
+	emake V=1 busybox
+
+	# bug #701512
+	emake V=1 doc
+}
+
+src_install() {
+	unset KBUILD_OUTPUT #88088
+	save_config .config
+
+	into /
+	dodir /bin
+	if use sep-usr ; then
+		# install /ginit to take care of mounting stuff
+		exeinto /
+		newexe busybox_unstripped ginit
+		dosym /ginit /bin/bb
+		dosym bb /bin/busybox
+	else
+		newbin busybox_unstripped busybox
+		dosym busybox /bin/bb
+	fi
+	if use mdev ; then
+		dodir /$(get_libdir)/mdev/
+		use make-symlinks || dosym /bin/bb /sbin/mdev
+		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf || die
+		if [[ ! "$(get_libdir)" == "lib" ]]; then
+			#831251 - replace lib with lib64 where appropriate
+			sed -i -e "s:/lib/:/$(get_libdir)/:g" "${ED}"/etc/mdev.conf || die
+		fi
+
+		exeinto /$(get_libdir)/mdev/
+		doexe "${FILESDIR}"/mdev/*
+
+		newinitd "${FILESDIR}"/mdev.initd mdev
+	fi
+	if use livecd ; then
+		dosym busybox /bin/vi
+	fi
+
+	# add busybox daemon's, bug #444718
+	if busybox_config_enabled FEATURE_NTPD_SERVER; then
+		newconfd "${FILESDIR}"/ntpd.confd busybox-ntpd
+		newinitd "${FILESDIR}"/ntpd.initd busybox-ntpd
+	fi
+	if busybox_config_enabled SYSLOGD; then
+		newconfd "${FILESDIR}"/syslogd.confd busybox-syslogd
+		newinitd "${FILESDIR}"/syslogd.initd busybox-syslogd
+	fi
+	if busybox_config_enabled KLOGD; then
+		newconfd "${FILESDIR}"/klogd.confd busybox-klogd
+		newinitd "${FILESDIR}"/klogd.initd busybox-klogd
+	fi
+	if busybox_config_enabled WATCHDOG; then
+		newconfd "${FILESDIR}"/watchdog.confd busybox-watchdog
+		newinitd "${FILESDIR}"/watchdog.initd busybox-watchdog
+	fi
+	if busybox_config_enabled UDHCPC; then
+		sed -i 's:$((metric++)):$metric; metric=$((metric + 1)):' examples/udhcp/simple.script || die #801535
+		local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
+		exeinto "${path%/*}"
+		newexe examples/udhcp/simple.script "${path##*/}"
+	fi
+	if busybox_config_enabled UDHCPD; then
+		insinto /etc
+		doins examples/udhcp/udhcpd.conf
+	fi
+	if busybox_config_enabled ASH && ! use make-symlinks; then
+		dosym -r /bin/busybox /bin/ash
+	fi
+	if busybox_config_enabled CROND; then
+		newconfd "${FILESDIR}"/crond.confd busybox-crond
+		newinitd "${FILESDIR}"/crond.initd busybox-crond
+	fi
+
+	# bundle up the symlink files for use later
+	emake DESTDIR="${ED}" install
+	# for compatibility, provide /usr/bin/env
+	mkdir -p _install/usr/bin || die
+	if [[ ! -e _install/usr/bin/env ]]; then
+		ln -s /bin/env _install/usr/bin/env || die
+	fi
+	rm _install/bin/busybox || die
+	tar cf busybox-links.tar -C _install . || : #;die
+	insinto /usr/share/${PN}
+	use make-symlinks && doins busybox-links.tar
+
+	dodoc AUTHORS README TODO
+
+	cd docs || die
+	doman busybox.1
+	docinto txt
+	dodoc *.txt
+	docinto pod
+	dodoc *.pod
+	docinto html
+	dodoc *.html
+
+	cd ../examples || die
+	docinto examples
+	dodoc inittab depmod.pl *.conf *.script undeb unrpm
+
+	cd ../networking || die
+	dodoc httpd_indexcgi.c httpd_post_upload.cgi
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	if use make-symlinks ; then
+		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
+	fi
+}
+
+pkg_postinst() {
+	savedconfig_pkg_postinst
+
+	if use make-symlinks ; then
+		cd "${T}" || die
+		mkdir _install
+		tar xf busybox-links.tar -C _install || die
+		# 907432: cp -n returns error if it skips any file, but that is expected here
+		# TODO: check if a new coreutils release has a replacement option
+		cp -nvpPR _install/* "${ROOT}"/
+	fi
+
+	if use sep-usr ; then
+		elog "In order to use the sep-usr support, you have to update your"
+		elog "kernel command line.  Add the option:"
+		elog "     init=/ginit"
+		elog "To launch a different init than /sbin/init, use:"
+		elog "     init=/ginit /sbin/yourinit"
+		elog "To get a rescue shell, you may boot with:"
+		elog "     init=/ginit bb"
+	fi
+
+	if [[ ${MERGE_TYPE} != binary ]] && ! is-flagq -Oz; then
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test ${v} -le 1.36.1; then
+				FORCE_PRINT_ELOG=yes
+			fi
+		done
+
+		readme.gentoo_print_elog
+	fi
+}
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index 7b6a96b8b9cd..74082ac77ae5 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -81,6 +81,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.34.1-skip-selinux-search.patch
 
 	"${FILESDIR}"/${PN}-1.36.0-fortify-source-3-fixdep.patch
+	"${FILESDIR}"/${PN}-1.36.1-kernel-6.8.patch
 
 	# "${FILESDIR}"/${P}-*.patch
 )
diff --git a/sys-apps/busybox/files/busybox-1.36.1-kernel-6.8.patch b/sys-apps/busybox/files/busybox-1.36.1-kernel-6.8.patch
new file mode 100644
index 000000000000..4f74d51bdcaf
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.36.1-kernel-6.8.patch
@@ -0,0 +1,53 @@
+http://lists.busybox.net/pipermail/busybox/2024-March/090678.html
+https://bugs.gentoo.org/926872
+
+Linux v6.8-rc1 removed the definitions related to CBQ making tc fail to
+build. Add some #ifdefs to handle this missing support.
+--- a/networking/tc.c
++++ b/networking/tc.c
+@@ -231,6 +231,13 @@ static int cbq_parse_opt(int argc, char **argv, struct nlmsghdr *n)
+ 	return 0;
+ }
+ #endif
++
++#ifndef TCA_CBQ_MAX
++/*
++ * Linux v6.8-rc1~131^2~60^2^2 removed the uapi definitions for CBQ.
++ * See <A HREF="https://git.kernel.org/linus/33241dca48626">https://git.kernel.org/linus/33241dca48626</A>
++ */
++#else
+ static int cbq_print_opt(struct rtattr *opt)
+ {
+ 	struct rtattr *tb[TCA_CBQ_MAX+1];
+@@ -322,6 +329,7 @@ static int cbq_print_opt(struct rtattr *opt)
+  done:
+ 	return 0;
+ }
++#endif
+ 
+ static FAST_FUNC int print_qdisc(
+ 		const struct sockaddr_nl *who UNUSED_PARAM,
+@@ -372,8 +380,10 @@ static FAST_FUNC int print_qdisc(
+ 		int qqq = index_in_strings(_q_, name);
+ 		if (qqq == 0) { /* pfifo_fast aka prio */
+ 			prio_print_opt(tb[TCA_OPTIONS]);
++#ifdef TCA_CBQ_MAX
+ 		} else if (qqq == 1) { /* class based queuing */
+ 			cbq_print_opt(tb[TCA_OPTIONS]);
++#endif
+ 		} else {
+ 			/* don't know how to print options for this qdisc */
+ 			printf(&quot;(options for %s)&quot;, name);
+@@ -442,9 +452,11 @@ static FAST_FUNC int print_class(
+ 		int qqq = index_in_strings(_q_, name);
+ 		if (qqq == 0) { /* pfifo_fast aka prio */
+ 			/* nothing. */ /*prio_print_opt(tb[TCA_OPTIONS]);*/
++#ifdef TCA_CBQ_MAX
+ 		} else if (qqq == 1) { /* class based queuing */
+ 			/* cbq_print_copt() is identical to cbq_print_opt(). */
+ 			cbq_print_opt(tb[TCA_OPTIONS]);
++#endif
+ 		} else {
+ 			/* don't know how to print options for this class */
+ 			printf(&quot;(options for %s)&quot;, name);
+
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index 624b1d7439c0..a3319e4f8ff6 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -2,6 +2,8 @@ AUX gptfdisk-1.0.9-build_flags.patch 286 BLAKE2B d7d59cf82165de5863f4bde47a77cc3
 AUX gptfdisk-1.0.9-libuuid.patch 899 BLAKE2B 534038452a7184945486b8435099adf7f1992c4bb8618a0ed5432c7675eb653374b25417b2b21c8fc2ec0b0860303e054fb0dc71f880941712e6230ddb029358 SHA512 590b6e7c5b16762abffe68767f255414a56f7fbd691a47837a93b288bde5210a3ab4addf93725c313134c48e6d6bc69701ad3742455f48de793412616be51df3
 AUX gptfdisk-1.0.9-musl-1.2.4.patch 819 BLAKE2B 79fde3617e158c1a43ac257e412e2c69cde0f6f7b4352a40fd82573d0f8585bbe1dadd323d6d5c717c0ea9e57abb67a71844648f34dd5586fbfc56c1179b30c9 SHA512 940f7f2647b9165404816d1c9e2d2c4d528a45645b5322b46ee3bba843b36acd088b47caad6348c46360107987cc8a3ab087cc6718e02aa46053abfb246b537e
 AUX gptfdisk-1.0.9-popt_segv.patch 671 BLAKE2B 1d46905caca1b7a403d1d200f5f0afa89953b86997f834df16002780d4371027bc34988c58b9a67e6b10a8978d4c99e93b2e711cbe00f5c49f3a868f708efc29 SHA512 b559c479dd2d62208b41a4ba3c6e68cf3e3b099d999bb8c2bbe251d77f217ccde28a44de0ca26c86004a6cecc17cf8360a120f3f1dd884ab4616c061110fde60
+DIST gptfdisk-1.0.10.tar.gz 220787 BLAKE2B 9047bf68a2c5c254bda9b2815488963dc19a9415c90fbf4a127268a37fe8a545b7d45a333e356bd9da22e37ef649d9f60896ffedfdc35b60c7642a48e4ed2e5a SHA512 76764e176cd92470648a1d7a8d2570ebc41005204e73b0f2dd5a7aff2fc1981d3bec61a3bd68b855cc3474bcb7cf49c1cb2ea25843d4e7945bef7648d548383d
 DIST gptfdisk-1.0.9.tar.gz 215065 BLAKE2B 1939ffd75972a4d7f92af2bfab90c7b0223825b5478b6b808dd35af943c687d38ba81663cd7ba5e0f9400656db4dac019c13a9f75d90b7bd716568c676c24dd2 SHA512 c2489ac7e196cb53b9fdb18d0e421571eca43c366de8922c5c7f550aadf192558e7af69b181c30747d6cf607c1670126223465eaa5e231cc589402d94a4e97a2
+EBUILD gptfdisk-1.0.10.ebuild 1309 BLAKE2B 6bf8c39be4af989580f26d796d3b372d9b1debbae9028bc21f6d02e2af96cbbc1e0e2be5185317e425d982aa0f61bdf3062ec42cb84af9be7bafffcf63354c1f SHA512 1d25033877b832c807ea33a5150319e1977c2538cb46f8f9bf06fbb76ab8613a70d9bb0a35f151380c02ae04c87b9a7cbf47e38362312f7f83caca6b0332c8a6
 EBUILD gptfdisk-1.0.9-r3.ebuild 1446 BLAKE2B cc25c869453450c8ad4e446c43dfa8619fcd14e349fae2470c87cbfa03fda1cfbfa5a6ebb83291902068ce5fc8179d4bffc736013576a31ad51dfdd383478f0b SHA512 645a82351ed321544a8dfa2ad1a456fcfe9b9f3f194d1dd67963042fd840733426d90c898878fa094a6f89416f32d1a31771f2fc8d4e2d2e684d956509e153af
 MISC metadata.xml 324 BLAKE2B 71325b739cb7e216be64dfff099ebf3a3f24d8a714ce59838780b6944a65f7d9abdb9b0afb43c617364071778768a7d90da9ef8c7eb4c3bc0cd6b5dc9e04c773 SHA512 ad7457ef87228bef7db385c72bee2c9cf1f913cf261641582a57e4b72c05e7106ad39092c55e2aae1e4d92f86a0bf6f4537dd7de9fdd6e1dc64677b36df4a273
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.10.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.10.ebuild
new file mode 100644
index 000000000000..980f14022408
--- /dev/null
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.10.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="GPT partition table manipulator for Linux"
+HOMEPAGE="https://www.rodsbooks.com/gdisk/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="ncurses static"
+
+# libuuid from util-linux is required.
+RDEPEND="!static? (
+		dev-libs/popt
+		ncurses? ( sys-libs/ncurses:=[unicode(+)] )
+		kernel_linux? ( sys-apps/util-linux )
+	)"
+DEPEND="
+	${RDEPEND}
+	static? (
+		dev-libs/popt[static-libs(+)]
+		ncurses? ( sys-libs/ncurses:=[unicode(+),static-libs(+)] )
+		kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
+	)
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.9-build_flags.patch
+)
+
+src_prepare() {
+	default
+
+	tc-export CXX PKG_CONFIG
+
+	if ! use ncurses ; then
+		sed -i \
+			-e '/^all:/s: cgdisk::' \
+			Makefile || die
+	fi
+
+	sed \
+		-e '/g++/s:=:?=:g' \
+		-e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \
+		-i Makefile || die
+
+	use static && append-ldflags -static
+}
+
+src_install() {
+	dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts
+	doman *.8
+	dodoc NEWS README
+}
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 74ddd8c876c9..25fe0ce8e658 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,6 +1,6 @@
 AUX lshw-02.19.2b-respect-LDFLAGS.patch 815 BLAKE2B 44cd1820a6ba3c854d04d9affeeaab1780ec1c0eebbea930906519363ef8cd31b831c7f6d7c22f8770d6f97cc6dc90d63f2a140e79c7bd3c93cabef1b9542567 SHA512 e3a98a0c5d5b890f18589295bf0d64db04b1d08b66353ad1a658ef84a4e1abd85f9d3d52e8ec7a54234e3573cb3c89e7ccb953544fe3af0b6a168dabb00d45e5
 DIST lshw-02.19.2b_p20220831-B.02.19.2_p20220831.tar.gz 2473654 BLAKE2B 5f3753902a49a65c2b616d94ba376d2408bf972c11c854699ed69de6a22ef6f9dbaeb2cc13ffd52a4607a8baf6f74cfe00d1206f94c9287bce99aae035b2d2e1 SHA512 ec7992aa09dc6e01bd1c7b9c7e0b7d5b041f558759a2ba6cdef574d4d6886e69e5fe5bac023b06574deec2f03bb52e306359faa0e0689ea5e65fd84359efd2b2
-DIST lshw-02.20.2b-B.02.20.2_.tar.gz 2473654 BLAKE2B 5f3753902a49a65c2b616d94ba376d2408bf972c11c854699ed69de6a22ef6f9dbaeb2cc13ffd52a4607a8baf6f74cfe00d1206f94c9287bce99aae035b2d2e1 SHA512 ec7992aa09dc6e01bd1c7b9c7e0b7d5b041f558759a2ba6cdef574d4d6886e69e5fe5bac023b06574deec2f03bb52e306359faa0e0689ea5e65fd84359efd2b2
+DIST lshw-B.02.20.tar.gz 2484139 BLAKE2B 8abdd7cee6c42b8956229a0b62ac9f96359750f26cbfeb2ed74402eae3e7cd818133bf0b747351522c6387974ce2a98cf5ab29379e56c50abc980e497bcc19d7 SHA512 afc5d57f4b7c49d8e1934a3df623657882cc1325268c8c024dc0fa25495edd3ce7fdadb9c83ac6e5d3e723bc08d6175162d4d879ced09f76ad145ff42b38d3f0
 EBUILD lshw-02.19.2b_p20220831-r1.ebuild 2528 BLAKE2B 891138c1aaa9aa7d05acacf570bbaa2c3d39fa42b9eb5f295247848ca908f45e67d7faf1237f88c4130eab116ed3df103048c3f31ac7ac327263a2eabcc872a4 SHA512 b14c2ac4f1efacad12601d2f69b776d59b53265e2e0285ac3e2f6ac40f95d18b83d5f271f9045047fdd0a780c3b8a78e6b4fad040b38d9fe8a4a534774df0045
-EBUILD lshw-02.20.2b.ebuild 2535 BLAKE2B 9d1a0385ea58f15194411efecbb1e3d106f457e7566036a60d5d623e61fba569ab7a7c1466760cb33543c2570d9e0d1462ac29a12dcd6bf88452a67a23b08d1c SHA512 5e81a344022086aa56b2a33f413fcd4eb3fe8db6fddcf71f0c1a4bb7f1d79c08032f64c977f772b27d2cf3914af15ccfee37e135cbf2bf6532bcc3073e14083f
+EBUILD lshw-02.20.2b-r1.ebuild 2455 BLAKE2B 8b6a12edc113f0fc8a1781c6e105d58c4fa7a176460b5b85e4aea6bfae2a60fb5a2ad8154a384dcc6302ca8c47324fa57428d0d54511e7c4bd4c1e8a9fcfb35b SHA512 40f0ceae820a69ce70f65ee7474a4ec410fd08d0cd9e388964ed3423cac105dea2f5c7f36e776c9844b7bc8800f9385122bdd468b311a167a5e0affb8d33042d
 MISC metadata.xml 462 BLAKE2B 0eca79307d6db1495a4799c970f6de55239b0b3b3636fb6ab833eccf824ed6569206a33272a2dbbc420d8f3d746ee8db7312fbc56f119f068634043699705e0a SHA512 948063d79d644ddfd3b559a7f113c73fa45a43d9282aad12400444d7e9431db44e0a5ef75fc0d866cfae9e0b67859df2b5996512e9eb296622546cb2bfdea9e7
diff --git a/sys-apps/lshw/lshw-02.20.2b.ebuild b/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
index ad96a414a251..9d3ac231faee 100644
--- a/sys-apps/lshw/lshw-02.20.2b.ebuild
+++ b/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
@@ -7,12 +7,12 @@ PLOCALES="ca es fr"
 
 inherit desktop flag-o-matic plocale toolchain-funcs xdg-utils
 
-MY_COMMIT=42fef565731411a784101de614a54bff79d1858e
-MY_PV=$(ver_cut 3 PV/b/B).$(ver_cut 1-3)_$(ver_cut 5-6)
+MY_PV=$(ver_cut 3 PV/b/B).$(ver_cut 1-2)
 
 DESCRIPTION="Hardware Lister"
 HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter"
-SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_PV}.tar.gz"
+SRC_URI="https://www.ezix.org/software/files/${PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -28,8 +28,6 @@ RDEPEND="sys-apps/hwdata
 BDEPEND="gtk? ( virtual/pkgconfig )
 	sqlite? ( virtual/pkgconfig )"
 
-S=${WORKDIR}/${PN}
-
 DOCS=( COPYING README.md docs/{Changelog,TODO,IODC.txt,lshw.xsd,proc_usb_info.txt} )
 
 PATCHES=( "${FILESDIR}"/lshw-02.19.2b-respect-LDFLAGS.patch )
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index ab4f19d3bbe0..3dd69e9b2f6b 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -2,5 +2,5 @@ AUX 39_memtest86+-r2 3530 BLAKE2B 6c302744000a48fbda7563b48bbac5bb5e580159d74ad5
 DIST memtest86+-6.20.tar.gz 232436 BLAKE2B 6e3bea4b18049446f27da2cb1313300c578ef7fdb774b6a20df603271b66a6c0066be64a91b0a6d4ffcc63f1e139132942290a8111f6a991cccc0a5586cac966 SHA512 b12856bd6ba82dac6308bb9f611ddb16df68c3da4d00ad9abf23bcf5d3f2e5c424fc1bccedd8c0732b4c68013c421ed20c5db56c39b619bbe77c4c1f5e8504f0
 DIST memtest86+-7.00.tar.gz 244385 BLAKE2B 608f4e31ddaee01d828cb1574086196c26f5e96c5049806ac3ab174ddf669db8cdcb8f336bec5a1ce74439d96fca505fea81311a06581bb43a8034156a4f8165 SHA512 1325ee08b280404fb47d37b62d65e51de21dd09b96bef29ece193072b09ff3c6eea8657b2e7c98801bf81ba4288c2bff580a91eb45d5a93744b0a273652266c4
 EBUILD memtest86+-6.20-r1.ebuild 2064 BLAKE2B 5eb92ff50f967ade20a9cd917dd0b43bbadc778511c8266e08b7bedb96bb04b7e2741b2c1366c11bbbd59822ccb84ee61180e493d5824ccaaa88f468cb2d66c2 SHA512 b669668889abb7be7c0663a4a30d9969f38846b43a4f97f844758ce8faebc72073791318d92994d5c4f8d2e08824905f21f31a2899149f6f858c462eb81efb5f
-EBUILD memtest86+-7.00.ebuild 2071 BLAKE2B c39a45c569e77bb9cdf921f8b7a618cea588d79689b96829146bd5a162694edb0ea609cd7de1d7980cadaf250c2b0e19d1d6938df441d7b7254da6afbdac6766 SHA512 ad74d8ae8ed2b716f0f031aae73c101127aa626c21ad140220f97e04da5e17b533f18f224b55f52c22d5a1b8c17180391bab0b8adb91ac7bc30a2a38de5ce538
+EBUILD memtest86+-7.00.ebuild 2069 BLAKE2B a17e9ee695b7a422dc6b2f95de91ac1e6bb7aa692567ba931650b55c6e4da9dd1ad0cf6af32a409b1b9ab26bee334f84652df54938fc7b8d05e098b1223d9f8b SHA512 acfa752f68f7ac28ba07198d870674fd95c0b47c0c6cb17b312a5a9842fbec24766d735551cb09c4358959e76ccc01789808f841847df7005108e9f47e5beb06
 MISC metadata.xml 819 BLAKE2B b18a5bc257f2e01f9b2dc52229a858a709c3d386798636c888caf7f52c4036eccee02a8c96a58c1b1305f7fdff5e83855e4799f4675a4ba59c43cb2e287edad3 SHA512 6b582bc657ae7047843638fda770068f322ec15607b5c6618e924942eb321b7230a98d82852814e94d4735d4bbc4531ae7b32b6596d2830105a1ab0d1afbf4ca
diff --git a/sys-apps/memtest86+/memtest86+-7.00.ebuild b/sys-apps/memtest86+/memtest86+-7.00.ebuild
index 88b05cadc68a..166f6138e149 100644
--- a/sys-apps/memtest86+/memtest86+-7.00.ebuild
+++ b/sys-apps/memtest86+/memtest86+-7.00.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bios32 bios64 +boot uefi32 uefi64 iso32 iso64"
 
 ISODEPS="
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index b7ff8af6e407..4bbeadd3bb26 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,8 +1,8 @@
 DIST pkgcore-0.12.24.tar.gz 634733 BLAKE2B 0d235f7acf81ead37ea30cd4cc2423a00cca92f0e3188b113f1171cb88a07cfa3829161f6e5c90bbdfcd96f0d579c48cf880474f07268dae885588e3fc724ce3 SHA512 956c7a4b637611e8f2bb2e7b35224c2c1adc2c26e0ee56b3d832b3a0533e46d36fdfeca0d82d835a24b604e22c7e8915e8ffdb0098a6a761e539b98b2ceab962
 DIST pkgcore-0.12.25.tar.gz 635477 BLAKE2B 3c887b6c3ec8ec13f542356ee0403dccca472b9a734054b47d30a1baaa7ed8a0248851715be1a33f0d74b66cc0812330e3103c402736653bd3de8797b067ed78 SHA512 d3854ca26926993f03a041d283240aa7bac814180a6c60b6cf3ac8179457251a960d99851d89d6a128ff491fb72a31f8acc59be83c3d2a03721c3c8b80ca7853
-DIST pkgcore-0.12.26.tar.gz 636451 BLAKE2B 32b6a45f1579cf03e91bba03a818b3f72c6cdba8b3462eb5987f62ac55833ec7fee6e687a2613264def4d51a35274a0730c623cdd091653f0c81a0b1fd086d1f SHA512 325b029d3173ab4c24831d4c27d1805e25299311c01bd8e794d53aeffa629d8b4b4e137c6e43c6fa8b2b1f86bb132d105ad0776bb97509103ecb01119a57b859
+DIST pkgcore-0.12.27.tar.gz 636436 BLAKE2B a03b795eb685b552659b6110a9a19e6915320f3bcc87a4c5343a9ae16b82ebea46b538d8606ff10fa1f1c46f85117aeec240247e98aaccc00b0c67996bd2421a SHA512 99e8e125fbb086a98f6c2f494624e63d47d2f594f952eb5e540eba355161eecaeb55ffc3f2df951cdfcd9cb5b1720411c58e2ab4f3299a63eeafa44eed6f7912
 EBUILD pkgcore-0.12.24.ebuild 1148 BLAKE2B 9029b08df9661c7bfc4e155b3c7ca0dd43caef2f5d9c281c2556af574cee66ba798ea994f4732be298cdea54b2479f7f96bda768537ac16a729f21b718afdeb5 SHA512 d59a743327d96e04f01846ff0013603f6e1eb10ce56fa870b8cf7d9abd12628d3ab8485c5fd69f7892320d937a89d6421f05616ae20031ca18d5c38d541f0fe8
 EBUILD pkgcore-0.12.25.ebuild 1156 BLAKE2B 2ee20e8ac29a48c5e8160ba2d1cf7fdec0b5b574d4036f0deb81487cd86965bedf90f6beeb2a88ee1720293e92ebc845070dcf27c0a3db571961245bd0afbe83 SHA512 b4e79e03ddfa675edd7ac26e2b5c2d14a2dbc734fa9dd56bf01a491ae5989e8c685766ae9c90c73fc13da93b991e701176459ce8db5cbceee478ec0afb83da08
-EBUILD pkgcore-0.12.26.ebuild 1156 BLAKE2B 2ee20e8ac29a48c5e8160ba2d1cf7fdec0b5b574d4036f0deb81487cd86965bedf90f6beeb2a88ee1720293e92ebc845070dcf27c0a3db571961245bd0afbe83 SHA512 b4e79e03ddfa675edd7ac26e2b5c2d14a2dbc734fa9dd56bf01a491ae5989e8c685766ae9c90c73fc13da93b991e701176459ce8db5cbceee478ec0afb83da08
+EBUILD pkgcore-0.12.27.ebuild 1156 BLAKE2B 2ee20e8ac29a48c5e8160ba2d1cf7fdec0b5b574d4036f0deb81487cd86965bedf90f6beeb2a88ee1720293e92ebc845070dcf27c0a3db571961245bd0afbe83 SHA512 b4e79e03ddfa675edd7ac26e2b5c2d14a2dbc734fa9dd56bf01a491ae5989e8c685766ae9c90c73fc13da93b991e701176459ce8db5cbceee478ec0afb83da08
 EBUILD pkgcore-9999.ebuild 1156 BLAKE2B 2ee20e8ac29a48c5e8160ba2d1cf7fdec0b5b574d4036f0deb81487cd86965bedf90f6beeb2a88ee1720293e92ebc845070dcf27c0a3db571961245bd0afbe83 SHA512 b4e79e03ddfa675edd7ac26e2b5c2d14a2dbc734fa9dd56bf01a491ae5989e8c685766ae9c90c73fc13da93b991e701176459ce8db5cbceee478ec0afb83da08
 MISC metadata.xml 392 BLAKE2B 98797b18321d3133dceaf79389bd35b26344a342c55c477b178359d731c46fa209adbdcf1d14eb009d57c8c20db8b898651dd45d5bcfc6bb3009ceffa1436650 SHA512 097710cc6c1df7455328a1d3feb223e324162ff20ef03964de4682eec7acf4e2d08fa64d3ac4946783f4c2587455d90ee5aa628f637f3a48386d9c9e6b7362e1
diff --git a/sys-apps/pkgcore/pkgcore-0.12.26.ebuild b/sys-apps/pkgcore/pkgcore-0.12.27.ebuild
index c4ca4f9df592..c4ca4f9df592 100644
--- a/sys-apps/pkgcore/pkgcore-0.12.26.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.12.27.ebuild
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 375a7d0eefc0..82fed100a91b 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -11,7 +11,7 @@ AUX util-linux-2.39.3-musl-1.2.5-basename.patch 1814 BLAKE2B 29463f6aedec98cbd7e
 DIST util-linux-2.39.3.tar.sign 833 BLAKE2B 433b9ad6e97d9e2ffbd516addf8406587d009d9c7661ac126ae89b370f22a39f1f1243e86ef383133d656833d3ad35054397d60e0e0c67bd1e9402939903570b SHA512 d9993d7a77531ca8fe3e58458d65e7d721c38aa53838547479fea169941a69b1c07fb02ac90ed5a0360025814b0999167621dbc4215348810584947a9e67756d
 DIST util-linux-2.39.3.tar.xz 8526168 BLAKE2B cd7b2b3c820e920d4a6ecd46fd807e018fc8e54439292f5e62c5f6863dd0f2505df3ec02c470d9be255a437c6ee8e4077908ac78d19a0d1273854d99eb571df0 SHA512 a2de1672f06ca5d2d431db1265a8499808770c3781019ec4a3a40170df4685826d8e3ca120841dcc5df4681ca8c935a993317bd0dc70465b21bf8e0efef65afa
 EBUILD util-linux-2.39.3-r2.ebuild 10816 BLAKE2B 675a18c3b90136b7f9dcdf80f32af95e762c34499fafb8955a4e65e8aafd275e1c1fd26ff42602c43e5448e45e657de00bf1e073d28b7a27724353fdc9384356 SHA512 549a47fb5864403951a9b4829d920e7856770d35758fb4fd00b6294dfe5926bbc538dbe70d62781f6de600650a14480f15a859c9d051c6cc74037ce360741efc
-EBUILD util-linux-2.39.3-r5.ebuild 11078 BLAKE2B 0bdbe495cc5fae03c74dcde2c095c3f5955217eb0adafc6f3abb755d55f833626e7fbb32be09090c4c2123ece9ee2654a64ea2c5b0dd26628bbaaebf28a70dbf SHA512 f24fce28b5883ccc1c1a32ce1489bda93216fb99d60de0c836847b8b1c1aad545fb9ea11f5cda6390b5d612297284a90bc48187a229823e9bf39149f638d173e
+EBUILD util-linux-2.39.3-r5.ebuild 11077 BLAKE2B 3ff11508741aa47716f028ed5518bb03075411d9e320274e152da5bfd35e100b2772ddb74ad7e642a758addcba02449c1f246917095592972fc0600e03ab4635 SHA512 a92a9865263b60de4e4e2ead1849f2683486dfa8e43c3bcb195be6cf9a559fa72cdbfef61942901e86803e273fe75f2b7099e5a3bb02ef35eccfb2d3f6e42115
 EBUILD util-linux-2.39.3-r6.ebuild 11130 BLAKE2B 0bc7dd8134172de2a660ca6bdd49ca63c8e4647c76ba19607bea18947e3e63a78d92ba4f74d8086d533bbd667f8fe80b604b20d9c5677e15d73122b973cc2220 SHA512 232c7fc42850b5143af4c822e6d94039918c5c40372de6166834418cc0546dab6468ae35fa673266633aca5b5133a3037ad352b82ace0e1c8f50ba3947878689
 EBUILD util-linux-9999.ebuild 10539 BLAKE2B cc0cf0445812fa59abfae68308c8c85052031859aa2fbb5e5da9dbd1de7886d71a784f8a6431596e27a08a87c8d0995b383f90d5ae583385e5a7ad60b70be8eb SHA512 7628e3d91ba9827138bccaebe1a9111695f24b006c535437e258e926b32e2d4722dbb09c863339d72cbc956d3fc46eaa93fbc485a606bb59e6afcd2deb11971f
 MISC metadata.xml 1553 BLAKE2B 1c4a18f6d91be4c90bf2505745cae42f6d249a1295c6a46fc1b8ea08297842b4d3a2aa232e679a167af9fef26730ed71f651b2f71b58cbfe66bd7a5cd3743c3b SHA512 e01d390c983ac47b9a6684f70b11cc796cde1355ae7d4c12406b3d6fc5b0897a9471720844e74fceee1648f4c7d685e6b12f157adc1ad951506acefb7441635c
diff --git a/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild
index 02a953d7537d..30a4c80b43a1 100644
--- a/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild
+++ b/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild
@@ -22,7 +22,7 @@ else
 	inherit verify-sig
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos"
+		KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos"
 	fi
 
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 747d328a12a7..9b241f4fe25b 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/colo/Manifest b/sys-boot/colo/Manifest
index b1e8ab0cfcac..8c35251211df 100644
--- a/sys-boot/colo/Manifest
+++ b/sys-boot/colo/Manifest
@@ -3,5 +3,6 @@ AUX default.colo 840 BLAKE2B a97a6a0d121edccf49842c0b14f3b4d48e0e12d92c7a40e3a78
 AUX menu.colo 1517 BLAKE2B 04d4ea5118ebe89229607a9beb8f6713a40f945df1d3ae0de867eed4cbf1df7be9ad30ddcc0a24a2489de1719424ea77d24a0c66ed42f6ce9da97b9bf175bd60 SHA512 a7357e176f45d5d352ea450349986ae5493900d60b363f688371348b727859d7be9b2a732e5210beba5216bfa8b8e6c861f2433573a009aabb71569eefcc5eaa
 AUX simple.colo 539 BLAKE2B fa8a255ffeac0ad14c0fc392fe65e89c9e627c022d0adbd9e1b1add70cc0535b9837f45d59ea1b43ae6919637a36c5364d38e75d4b5be7102e5dbf2c1727565d SHA512 38b3481adbad50c344f87cfd9a5346a78158cfd298194f715b40ad582d5fad9ad6e16f773004a8732e673bc8b3791dde39da10ac85c72a8e236837ca82a91d1a
 DIST colo-1.22.tar.gz 257968 BLAKE2B f7c8f97b3fed2d2071b89f84e3e78e814914999a3038c854d92e651e4c3a1aa1889e3486f2de94c561475befe4e4a4606e4873c4174ff0b24dcc290f494f5acb SHA512 c983f36991a6275d4864cbd12e00f4e73d3b722746b3d3c8442afc8fe00d5432772c93007999858afb0993e1a4917f94bc9803f017ace3e65535cad7e8fb9b1e
+EBUILD colo-1.22-r1.ebuild 3863 BLAKE2B f2beeaf8541e1f039ac21f19730c73dc71a00d292c7ac7358f43930982e51da554567aeb11398ccfd696a1cef67744438a5627cee6075f2060233a48ef67b255 SHA512 d6ee27fa5e0ebc75695264a74ceeaa070c5d3c94ca52ff5d6df229a1d4a782b2fe11b560c3dfb8a3cee0a2eca457579cf48e9a1be02b31003d2619ada5041179
 EBUILD colo-1.22.ebuild 3828 BLAKE2B b19a039f1b6561dc002a7fcc13c0d8bc0dc0480d62d1e7570c6de66a90a857dcc484e49aba4e5bd9cac007ddbeef12cc67baaa2580f125de3b21f28a91e19aac SHA512 0ffc7656eafa560b5eeb5d6e501e49c07faf211232e062ba41eb8d7b3cd07e64223448554550c9c57bc2920d2a166b757b48f6f21cb559c806c9ef4341763cbe
 MISC metadata.xml 255 BLAKE2B 38f74d4046b8cadf4d1f04a3c35a7b1dc04a47c8658533c1bc8e2d69da08458084cd52dd84757f3e9fd8368c98f47cbbbf1e4fa24a800aacb55bbed34b83f1f6 SHA512 08802a1297d8dbe5915854d495674e1d9835e664ecb645908b90490c57ab7fc2f6a1ee9b994c45716465dc450ff4dcedf51e575498ec0d6b5a31176c58de1775
diff --git a/sys-boot/colo/colo-1.22-r1.ebuild b/sys-boot/colo/colo-1.22-r1.ebuild
new file mode 100644
index 000000000000..3bd8c4f9c121
--- /dev/null
+++ b/sys-boot/colo/colo-1.22-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="CObalt LOader - Modern bootloader for Cobalt MIPS machines"
+HOMEPAGE="https://www.colonel-panic.org/cobalt-mips/"
+SRC_URI="https://www.colonel-panic.org/cobalt-mips/colo/colo-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~mips"
+
+RESTRICT="strip"
+
+src_prepare() {
+	eapply "${FILESDIR}"/colo-stage2_src_heap-fix.patch
+	sed -E -i -e "s/CFLAGS_COLO=/CFLAGS_COLO:=/g" -e "/[A-Z]+= /d" Rules.mak || die # bug 725846
+	default
+}
+
+src_compile() {
+	echo -e ""
+	einfo ">>> Building the CoLo Bootloader ..."
+
+	# Remove -Werror from CFLAGS
+	# gcc-4.3.x is more strict; We'll go back and fix later
+	cd "${S}" || die
+	local x
+	for x in $(grep -rl "Werror" "${S}"/*); do
+		sed -i -e 's/\-Werror//g' "${x}" || die
+	done
+
+	# Keep elf2rfx from automatically building via the Makefile
+	sed -i -e 's/tools\/elf2rfx //' "${S}"/Makefile || die
+
+	# Build it first with BUILD_CC in case of cross-compiles
+	cd "${S}"/tools/elf2rfx || die
+	make CC="$(tc-getBUILD_CC)" || die
+
+	# Build the rest
+	cd "${S}" || die
+	make clean || die # emake breaks the build
+	make CC="$(tc-getCC)" OBJCOPY="$(tc-getOBJCOPY)" \
+	     STRIP="$(tc-getSTRIP)" || die
+
+	# Now rebuild elf2rfx again with CC so it can be installed
+	cd "${S}"/tools/elf2rfx || die
+	make clean || die
+	make CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	# bins
+	dodir /usr/lib/colo
+	cp binaries/colo-chain.elf "${D}"/usr/lib/colo || die
+	cp binaries/colo-rom-image.bin "${D}"/usr/lib/colo || die
+
+	# docs
+	dodoc CHANGES INSTALL README README.{restore,shell,netcon} tools/README.tools TODO
+
+	# all tools except lcdtools (see below)
+	local tool
+	for tool in flash-tool colo-perm copy-rom elf2rfx; do
+
+		einfo "Installing ${tool} binary to ${D}/usr/sbin"
+		dosbin tools/${tool}/${tool}
+		if [[ -f tools/${tool}/${tool}.8 ]]; then
+			einfo "Installing ${tool} manpage to ${D}/usr/share/man"
+			doman tools/flash-tool/flash-tool.8
+		fi
+
+	done
+
+	# lcdtools
+	for tool in paneld putlcd e2fsck-lcd; do
+		einfo "Installing ${tool} binary and manpage to ${D}/usr/sbin"
+		dosbin tools/lcdtools/${tool}/${tool}
+		doman tools/lcdtools/${tool}/${tool}.8
+	done
+	dolib.a tools/lcdtools/liblcd/liblcd.a
+
+	# bootscripts
+	dodir /usr/lib/colo/scripts
+	cp "${FILESDIR}"/*.colo "${D}"/usr/lib/colo/scripts || die
+}
+
+pkg_postinst() {
+	echo -e ""
+	einfo "Install locations:"
+	einfo "   Binaries:\t/usr/lib/${PN}"
+	einfo "   Docs:\t/usr/share/doc/${PF}"
+	einfo "   Tools:\t/usr/sbin/{flash-tool,colo-perm,copy-rom,"
+	einfo "	 \tputlcd,paneld,e2fsck-lcd,elf2rfx}"
+	einfo "   Scripts:\t/usr/lib/${PN}/scripts"
+	echo -e ""
+	einfo "Please read the docs to fully understand the behavior of this bootloader, and"
+	einfo "edit the boot scripts to suit your needs."
+	echo -e ""
+	ewarn "Users installing ${PN} for the first time need to be aware that newer"
+	ewarn "versions of ${PN} disable the serial port by default.  If the serial port"
+	ewarn "is needed, select it from the boot menu.  Users using the example boot"
+	ewarn "scripts provided will have the serial port automatically enabled."
+	echo -e ""
+	ewarn "Note: It is HIGHLY recommended that you use the chain"
+	ewarn "bootloader (colo-chain.elf) first before attempting to"
+	ewarn "write the bootloader to the flash chip to verify that"
+	ewarn "it will work for you.  It is also recommended that"
+	ewarn "you read the documentation in /usr/share/doc/${PF}"
+	ewarn "as it explains how to properly use this package."
+	echo -e ""
+	eerror "Warning: Make sure that IF you plan on flashing the"
+	eerror "bootloader into the flash chip that you are using a"
+	eerror "modern 2.4 Linux kernel (i.e., >2.4.18), otherwise"
+	eerror "you run a risk of destroying the contents of the"
+	eerror "flash chip and rendering the machine unusable."
+	echo -e ""
+	echo -e ""
+}
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 8e54cc381e36..7760667e21ba 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/iwl1000-ucode/Manifest b/sys-firmware/iwl1000-ucode/Manifest
deleted file mode 100644
index 692ad423408a..000000000000
--- a/sys-firmware/iwl1000-ucode/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST iwlwifi-1000-ucode-39.31.5.1.tgz 180879 BLAKE2B c188230b9beade89d0db2d7bb52432a75aad425618348ee7e242c52bb57f8940ce302ed9dab13420a99cc29178f56d2fd7bf069e35ab5c26d3ddb34be45dcba5 SHA512 18f01b51f83e133bd6803567afb75606faba8cd96e3ed4faab8350d6f63e43c4c9397fdc17631efda1606fbef9e1a2b3065cbb58779de0f56223c95703474b06
-EBUILD iwl1000-ucode-39.31.5.1-r1.ebuild 525 BLAKE2B f904d4c98d1dd39363f9b5514da10fa4b68b83cd8b28347c92268cfc35caa22f12200f1db2dc66ecd7d49019fc561f34c60a5bcdc907db5f185886773f95290b SHA512 a898fc1fd88de2b88ee9c9e86fcbcffa8a69afc5b3f522edae2696ba749584d0cb9bfe230f1a9c38feb7441027a79aa789a907811b1fbfc5de088886fbff981f
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/sys-firmware/iwl1000-ucode/iwl1000-ucode-39.31.5.1-r1.ebuild b/sys-firmware/iwl1000-ucode/iwl1000-ucode-39.31.5.1-r1.ebuild
deleted file mode 100644
index b689c2319d6d..000000000000
--- a/sys-firmware/iwl1000-ucode/iwl1000-ucode-39.31.5.1-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="iwlwifi-1000-ucode-${PV}"
-DESCRIPTION="Intel (R) Wireless WiFi Link 1000BGN ucode"
-HOMEPAGE="https://wireless.wiki.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_P}.tgz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ipw3945"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-src_install() {
-	insinto /lib/firmware
-	doins iwlwifi-1000-5.ucode
-	dodoc README.iwlwifi-1000-ucode
-}
diff --git a/sys-firmware/iwl1000-ucode/metadata.xml b/sys-firmware/iwl1000-ucode/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/sys-firmware/iwl1000-ucode/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/sys-firmware/iwl3160-7260-bt-ucode/Manifest b/sys-firmware/iwl3160-7260-bt-ucode/Manifest
deleted file mode 100644
index e45dfef9dd74..000000000000
--- a/sys-firmware/iwl3160-7260-bt-ucode/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST iwl3160-7260-bt-ucode-37.8.10_p2.tgz 78372 BLAKE2B 5abb7abc130ebe93527b4d3d364488bfebe4c9ad005c5173e4a27db5bf880c3af97b451825b5ac972ec89bbab25f127e2e8f15501fcfd96b679868a21154f888 SHA512 73399fcfd58972b9099cad6014f686f74ed4aedc2278d1389d1e815fb08d2af43f3f6defa70d409ecc0b388fba0710dc8fe26627d3149c79db8e8792576047e5
-EBUILD iwl3160-7260-bt-ucode-37.8.10_p2.ebuild 852 BLAKE2B d3f5f5f40bc00de90abec11d83b7533f61794511ed9a0f3231bdf37f02700d1e9e8a7cb9a258b0851db59cba359202eb76085959436091c1396637ee7ab426a6 SHA512 11249b7f2fab0cd832667657b1a3b44d4b3a778740a1d7adeabc9b2268b1b59277b691f034ec3700fa41b552843d797d159704601a8df84792ea65370c684170
-MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10_p2.ebuild b/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10_p2.ebuild
deleted file mode 100644
index 7678f40b14c5..000000000000
--- a/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10_p2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info
-
-DESCRIPTION="Firmware for Intel (R) Wireless 3160, 7260, 7265 Bluetooth"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="mirror://gentoo/${P}.tgz"
-S="${WORKDIR}"
-
-LICENSE="ipw3945"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="!sys-kernel/linux-firmware[-savedconfig]"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the Intel (R) Wireless 3160, 7260, 7265 firmware"
-
-pkg_pretend() {
-	if kernel_is lt 3 10 0; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= 3.10.0."
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins -r intel
-}
diff --git a/sys-firmware/iwl3160-7260-bt-ucode/metadata.xml b/sys-firmware/iwl3160-7260-bt-ucode/metadata.xml
deleted file mode 100644
index bef24d2c2337..000000000000
--- a/sys-firmware/iwl3160-7260-bt-ucode/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/sys-firmware/iwl3160-ucode/Manifest b/sys-firmware/iwl3160-ucode/Manifest
deleted file mode 100644
index ec6b522e3cbf..000000000000
--- a/sys-firmware/iwl3160-ucode/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST iwl3160-ucode-0.16.242414.tgz 467156 BLAKE2B 47a94667cfdc5a9409073e866f750b7c3edefe42539ab1b4f7ac432e2dc74a8a5c0cf45bad5febb1ed165b74dc2af1319b088c751bde69cd5c64812ffd5f43f7 SHA512 ca0f675ebddb92c936df6bf412fdd1a41a33426636c3c40881251dfdd8b6527bc03d03b73b10dfb6fcc23676d1d51c372ac406f9554baf7f4ac36c9bd302b79d
-EBUILD iwl3160-ucode-0.16.242414-r1.ebuild 941 BLAKE2B f930ca3162d774a4a21e3f0f89fd223f174174095611fdd67e737f274c52d77c929e2b309cd53e5f1df6d00c5f16a65de724826f2282b905a21676f5be9102b4 SHA512 4e564d32e689da5612712c9b8b48d6b83368fe98fe9051a131e728c141656ff18f52a0642287c9fac8aaf6998a7021bec3ba8a6ac355b2c159389b4056b4e093
-MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.16.242414-r1.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.16.242414-r1.ebuild
deleted file mode 100644
index 7bb42e888f01..000000000000
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.16.242414-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info
-
-DEV_N="${PN:3:4}"
-MY_PV="$(ver_cut 2).$(ver_cut 3).$(ver_cut 1)"
-MY_PN="iwlwifi-${DEV_N}-ucode"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-LICENSE="ipw3945"
-SLOT="$(ver_cut 2)"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-RDEPEND="
-	bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
-	!sys-kernel/linux-firmware[-savedconfig]"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-src_install() {
-	insinto /lib/firmware
-	doins iwlwifi-${DEV_N}-$(ver_cut 2).ucode
-	dodoc README*
-}
diff --git a/sys-firmware/iwl3160-ucode/metadata.xml b/sys-firmware/iwl3160-ucode/metadata.xml
deleted file mode 100644
index bef24d2c2337..000000000000
--- a/sys-firmware/iwl3160-ucode/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/sys-firmware/iwl6005-ucode/Manifest b/sys-firmware/iwl6005-ucode/Manifest
deleted file mode 100644
index 529c66190112..000000000000
--- a/sys-firmware/iwl6005-ucode/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST iwlwifi-6000g2a-ucode-17.168.5.3.tgz 210543 BLAKE2B 9db1e81bb3330bff9e048ce4be066997fa6cda2ea5edb2a4865e4ffd233453dfa608eca73a68b45f72d4ea20dbe188abeb9d47ead442e521309056fe57d9adf2 SHA512 9fcee47c294777f30d40933942db171d45e4bfd6c6adc8f80e759f296d1df8ee91419379bddd738654c04d73974d03dc6a9a809e10a16e58b8a3f76f8df10636
-DIST iwlwifi-6000g2a-ucode-18.168.6.1.tgz 326978 BLAKE2B a1a9f8bb535c48ae51594b84bf5d3ff4121808483872f246f97cc42176a8c6f81aa1dc84725ccfad2531819ba1a360929b9d77130d9c29bcf3d62bfa6c843d51 SHA512 6e30662005e49957323addf62b73ac98f15122f451674038c8154cb544a36b1d004ad38818bf7530b1135eb40ed73d4aa4b28fd77f807ecb7a779e2067d52adb
-EBUILD iwl6005-ucode-17.168.5.3.ebuild 512 BLAKE2B 1d04c0f67c9964fe613a402999a4d70bbc25ba83f0926e9b23de80f3fc12d7d88a60768d045cd828ca9e63d8f44c6fc97b74ab569592644578ee5619b13be688 SHA512 a36836de7de5ca6c65469781f1fee856357739307ee08aa2bbc162f3551e34eaa47791172803595f3e7e40340ba85332cff527ba4bed83ab8bccad2eabe8caca
-EBUILD iwl6005-ucode-18.168.6.1.ebuild 512 BLAKE2B 3b6131a3b76fcdfeac7b30cd08f10e3959fa1dc4234df110ccd242a0c65d72ee2ab1df200d6a9aa1f03e7cc4424fe767be2be9f60ea355427d8157e13d432906 SHA512 ff270f10607cfa7c48d75ea227a42fd235e546256ed89221110dbeaacfb33fc1973ba197a97486d8f1ad6a0b63eb7e75ea3d73487dfa925863dddf819755e03d
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sys-firmware/iwl6005-ucode/iwl6005-ucode-17.168.5.3.ebuild b/sys-firmware/iwl6005-ucode/iwl6005-ucode-17.168.5.3.ebuild
deleted file mode 100644
index 981082e222fd..000000000000
--- a/sys-firmware/iwl6005-ucode/iwl6005-ucode-17.168.5.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="iwlwifi-6000g2a-ucode"
-
-DESCRIPTION="Intel (R) Wireless WiFi Advanced N 6005 ucode"
-HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi"
-SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz"
-
-LICENSE="ipw3945"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
-	insinto /lib/firmware
-	doins iwlwifi-6000g2a-5.ucode
-
-	dodoc README*
-}
diff --git a/sys-firmware/iwl6005-ucode/iwl6005-ucode-18.168.6.1.ebuild b/sys-firmware/iwl6005-ucode/iwl6005-ucode-18.168.6.1.ebuild
deleted file mode 100644
index 3cefba539e90..000000000000
--- a/sys-firmware/iwl6005-ucode/iwl6005-ucode-18.168.6.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="iwlwifi-6000g2a-ucode"
-
-DESCRIPTION="Intel (R) Wireless WiFi Advanced N 6005 ucode"
-HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi"
-SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz"
-
-LICENSE="ipw3945"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
-	insinto /lib/firmware
-	doins iwlwifi-6000g2a-6.ucode
-
-	dodoc README*
-}
diff --git a/sys-firmware/iwl6005-ucode/metadata.xml b/sys-firmware/iwl6005-ucode/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/sys-firmware/iwl6005-ucode/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/sys-firmware/iwl6030-ucode/Manifest b/sys-firmware/iwl6030-ucode/Manifest
deleted file mode 100644
index a4c4b5d847d2..000000000000
--- a/sys-firmware/iwl6030-ucode/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST iwlwifi-6000g2b-ucode-17.168.5.2.tgz 221694 BLAKE2B 7a4b5a6fe7c3c4b61d915d87da044f463b916dce59716ac874b93cd370e1dc96930734ef35104bca99b184463128c7ea456e264033a113e445eb63f9804c7afc SHA512 124c061db09de3d042e1a93c0b45b4433245a4d0ab7990f4d19ff646ef496a3a988b078efe52bc4c2aad2c0a1eaa7c25e78e78c3f9a194b8b885397cdcfdf57f
-DIST iwlwifi-6000g2b-ucode-18.168.6.1.tgz 330313 BLAKE2B adeb3566582332fa57c6d67830e4a741ad79081fb4a7f93c3c30158bd74f3b6b372a1bbbd9dc51ded0eb0d6de71f09134633ba5041d788a2f7408e3953b06c90 SHA512 6bc37e75c7286cac49b84160c33b6f5218284fa460bb3e874a9bef2f0b669ebb5998dbed1e45815cd91d6eedad681dd5a4a75358ec4066c6db629e2b3e44ba16
-EBUILD iwl6030-ucode-17.168.5.2.ebuild 512 BLAKE2B cdf370d8054e75e0d24c1447726659d00e7e03cf386f14e0ec8e411e1e88bdf9974b16fe3ee91096479bc3a531956cd0097d5ca116b3fd0182ca2c1d92686b20 SHA512 171afa955bd61763a8385cb1ec4b958f09cab9ec865ec2600effb8269ae934399d779b91b51c8b5a5b5d02e0b1150a92b812aa9c7d1d57c703af6db274786495
-EBUILD iwl6030-ucode-18.168.6.1.ebuild 512 BLAKE2B ebc2c08acd07aef04dac7ee0d50cd390d5fe4e865e50317bd7fe3f7b15127e0aaa86f5c315c25fe90d8954a3af1ff530642c8f3772157afdaec7db06b3c69e7d SHA512 aa04f7aa5378a360ee4fa79e0e3613865158c4b760e179cf028c932f10feab81c1bc45a03300f2b2d6658a19798205d70255fe37d95a1dc6b21b2c121061c45c
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sys-firmware/iwl6030-ucode/iwl6030-ucode-17.168.5.2.ebuild b/sys-firmware/iwl6030-ucode/iwl6030-ucode-17.168.5.2.ebuild
deleted file mode 100644
index 6ba7b58fb1a5..000000000000
--- a/sys-firmware/iwl6030-ucode/iwl6030-ucode-17.168.5.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="iwlwifi-6000g2b-ucode"
-
-DESCRIPTION="Intel (R) Wireless WiFi Advanced N 6030 ucode"
-HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi"
-SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz"
-
-LICENSE="ipw3945"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
-	insinto /lib/firmware
-	doins iwlwifi-6000g2b-5.ucode
-
-	dodoc README*
-}
diff --git a/sys-firmware/iwl6030-ucode/iwl6030-ucode-18.168.6.1.ebuild b/sys-firmware/iwl6030-ucode/iwl6030-ucode-18.168.6.1.ebuild
deleted file mode 100644
index 512b33074805..000000000000
--- a/sys-firmware/iwl6030-ucode/iwl6030-ucode-18.168.6.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="iwlwifi-6000g2b-ucode"
-
-DESCRIPTION="Intel (R) Wireless WiFi Advanced N 6030 ucode"
-HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi"
-SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz"
-
-LICENSE="ipw3945"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
-	insinto /lib/firmware
-	doins iwlwifi-6000g2b-6.ucode
-
-	dodoc README*
-}
diff --git a/sys-firmware/iwl6030-ucode/metadata.xml b/sys-firmware/iwl6030-ucode/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/sys-firmware/iwl6030-ucode/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/sys-firmware/iwl7260-ucode/Manifest b/sys-firmware/iwl7260-ucode/Manifest
deleted file mode 100644
index 4c01cd7a49c0..000000000000
--- a/sys-firmware/iwl7260-ucode/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST iwl7260-ucode-0.16.242414.tgz 494594 BLAKE2B b1dc80d923eca6046750d0858f19598473ac7c0d0155e98ecc0080fa61825366d17a2e4985031908548667ce17c8ee3f4b6683d10d53e532385c86c6f9dc84fc SHA512 8abfa4141a390a733ea6a43fe7d8d8874752b84a42a5be0a93ed7935f2f76241af41d48f2911393837a32aaf0230f1b1ee9984488e60f447c29794c0e60cd0bb
-EBUILD iwl7260-ucode-0.16.242414-r1.ebuild 941 BLAKE2B f930ca3162d774a4a21e3f0f89fd223f174174095611fdd67e737f274c52d77c929e2b309cd53e5f1df6d00c5f16a65de724826f2282b905a21676f5be9102b4 SHA512 4e564d32e689da5612712c9b8b48d6b83368fe98fe9051a131e728c141656ff18f52a0642287c9fac8aaf6998a7021bec3ba8a6ac355b2c159389b4056b4e093
-MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.16.242414-r1.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.16.242414-r1.ebuild
deleted file mode 100644
index 7bb42e888f01..000000000000
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.16.242414-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info
-
-DEV_N="${PN:3:4}"
-MY_PV="$(ver_cut 2).$(ver_cut 3).$(ver_cut 1)"
-MY_PN="iwlwifi-${DEV_N}-ucode"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-LICENSE="ipw3945"
-SLOT="$(ver_cut 2)"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-RDEPEND="
-	bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
-	!sys-kernel/linux-firmware[-savedconfig]"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-src_install() {
-	insinto /lib/firmware
-	doins iwlwifi-${DEV_N}-$(ver_cut 2).ucode
-	dodoc README*
-}
diff --git a/sys-firmware/iwl7260-ucode/metadata.xml b/sys-firmware/iwl7260-ucode/metadata.xml
deleted file mode 100644
index bef24d2c2337..000000000000
--- a/sys-firmware/iwl7260-ucode/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/sys-firmware/iwl8000-ucode/Manifest b/sys-firmware/iwl8000-ucode/Manifest
deleted file mode 100644
index 8c02512de806..000000000000
--- a/sys-firmware/iwl8000-ucode/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST iwlwifi-8000-ucode-16.242414.0.tgz 931690 BLAKE2B 0fc3816c400314187eb8d2e9d76debdd941614d4a4769f78ecc2e819a1f8144e0ce7eacc475b692dc0539ded9609891cec962cdd20ea1aab8f86b3ca633816b3 SHA512 2d471f57f8fcc4dabd249a80a16cb81388eafddbe13b53a78572c6f9661ce3b6399dc43599d978b0319a14a14b29d5a9e39746e8096c985ea8f3d48e8c01fa47
-EBUILD iwl8000-ucode-16.242414.0.ebuild 935 BLAKE2B 4115121f0ab9073162c0ca50c8e1983251334b5b7aa7f165dd813556592e01a4d775739fcd3da26e739004ced330278aac1f7284e3200e7dc7ba3d14371199a3 SHA512 cf9ce28601520b9c653f6e9d37eaf2e5b207650fff705943d617706ea3d051b47a4e2171b06b8064a1f10f5a4cb4016219253160e06254257631f7f8d8ee81e8
-MISC metadata.xml 318 BLAKE2B 8d4d17e76fd583ddccdfa27461bcd5cfcf3efdad7714ce0fe1e98cf4946f0caa2f163eb1d05532459edcd6de12751d8995e497dde54209f95f7f68e40c5e8fc9 SHA512 737221e301ce9aa213ee87f05da6b04f7677bc5e5a668b4274d5f2ef6f196548cc59bd47aa8c05a6f52bfc345c0cf63672588bfb1aff0e8b9bdb89cab5b117ec
diff --git a/sys-firmware/iwl8000-ucode/iwl8000-ucode-16.242414.0.ebuild b/sys-firmware/iwl8000-ucode/iwl8000-ucode-16.242414.0.ebuild
deleted file mode 100644
index 1d1c33d0803e..000000000000
--- a/sys-firmware/iwl8000-ucode/iwl8000-ucode-16.242414.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info
-
-MY_P="iwlwifi-${P#iwl}"
-
-DESCRIPTION="Firmware for Intel (R) Wireless 8260 and 4165"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-RDEPEND="
-	!sys-kernel/linux-firmware[-savedconfig]
-"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if kernel_is lt 4 3 0; then
-		eerror "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		eerror "This microcode image requires a kernel >= 4.3.0."
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins iwlwifi-8000C-16.ucode
-	dodoc README*
-}
diff --git a/sys-firmware/iwl8000-ucode/metadata.xml b/sys-firmware/iwl8000-ucode/metadata.xml
deleted file mode 100644
index cef3c32e4162..000000000000
--- a/sys-firmware/iwl8000-ucode/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>nicolasbock@gentoo.org</email>
-		<description>
-			Feel free to bump and add yourself to the maintainer list.
-		</description>
-	</maintainer>
-</pkgmetadata>
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 154494612a24..641f8cc7ee13 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/gosuslugi-plugin/Manifest b/www-plugins/gosuslugi-plugin/Manifest
deleted file mode 100644
index 65027dd482f9..000000000000
--- a/www-plugins/gosuslugi-plugin/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST gosuslugi-plugin-3.1.1.0_amd64.deb 5264616 BLAKE2B 0aadd08a26ae70e9a73611de3faccceb8bb53f8f36df34398d72f2a3d34ad5d0efa6a9bc0b05daf6b4a1fe7e2a498506df7a8bc094eae002ae7e7f532b24f98f SHA512 7152b08b22d93dee63aaed61012ed53f07a52beee113a0fbd639a435d57f251885947c2e874fb1e799f5db36340093024641f504f95d5ef788bfc30c4e9030aa
-DIST gosuslugi-plugin-3.1.1.0_mac.pkg 9712969 BLAKE2B f9234cb5283f27e680d448f6c4edf298495451c4b1af6bb6cdf5cf9e016877ce587a9dbfa9f78631d28f9d9fb1bb5d1aa505ecd947549bf0818e2662be6197c8 SHA512 e22530e72ce769fdee10fc63e140d7b294a3a9067e3ae113de1267745c16f0eb1c526f2a9f9d693263de92230c0e132362e3ed6c8653903addff47920f5632e0
-DIST gosuslugi-plugin-3.1.1.0_x86.deb 5198728 BLAKE2B 68bcd5745e14a13fe13cc0dbcf3c66c6471a405a5a6957f112b843fa935cefc27fd60effdffba86593175deed1eb66a091558c2766b3fb5a2f7b8c860e61ee09 SHA512 2a49778f94421b5827d52725a72745482eaafb825dbadb2696a1bccbcf491a775ff1b1eefebba565906c7c7bce8d7106003999a1e0dc69e69781e5a639597223
-EBUILD gosuslugi-plugin-3.1.1.0.ebuild 1318 BLAKE2B 5014dd8d765ec51d4dca5179ea643a7edfe2e011800be4866d1d664c769e7b9d6be1d062e32942cb59b5f64f65f69c3006eec45b04e9301ec72ad2eec9f2d2a8 SHA512 162a021923d896f49fe14c4583ca65e40c003de83305e91bc4f4a23e043957859119133ef20bf700b4d96c84753fd8004ace92e84030f9051dcdaba5684281e9
-MISC metadata.xml 407 BLAKE2B 63c31a648e33b85d15752700174bedc63aec4783b8f0c741cf770ccfbd755383386e900093b7da9c449aef5f31979aa2364b4b6e367b7c04adf08f9f4a0d39f9 SHA512 f4c827ba3e7498a9699aa95cff8496aec4c704694abf9636eb03aff85ea35004751da2caab6227e7cc1208bb5e41f446e3d3e16db70d14a03d6a451db047efb7
diff --git a/www-plugins/gosuslugi-plugin/gosuslugi-plugin-3.1.1.0.ebuild b/www-plugins/gosuslugi-plugin/gosuslugi-plugin-3.1.1.0.ebuild
deleted file mode 100644
index e156c7fb2b01..000000000000
--- a/www-plugins/gosuslugi-plugin/gosuslugi-plugin-3.1.1.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit unpacker
-
-DESCRIPTION="Crypto-provider browser plugin for russian e-gov site https://gosuslugi.ru/"
-
-SRC_URI="
-	amd64? ( https://ds-plugin.gosuslugi.ru/plugin/upload/assets/distrib/IFCPlugin-x86_64.deb -> ${P}_amd64.deb )
-	x86? ( https://ds-plugin.gosuslugi.ru/plugin/upload/assets/distrib/IFCPlugin-i386.deb -> ${P}_x86.deb )
-	x64-macos? ( https://ds-plugin.gosuslugi.ru/plugin/upload/assets/distrib/IFCPlugin.pkg -> ${P}_mac.pkg )
-"
-
-HOMEPAGE="http://gosuslugi.ru/"
-LICENSE="all-rights-reserved"
-RESTRICT="mirror"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
-IUSE="multilib"
-
-REQUIRED_USE="amd64? ( multilib )"
-
-# TODO: minimal useflag (I can't do it now, since
-# it seems like I brake my token and it is uninitialized now)
-RDEPEND="
-	dev-libs/libxml2:2
-	sys-apps/pcsc-lite:0
-	virtual/libusb:0
-"
-DEPEND="${RDEPEND}"
-
-QA_PREBUILT="*"
-QA_SONAME_NO_SYMLINK="usr/lib32/.* usr/lib64/.*"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack_deb ${A}
-	rm usr/lib/mozilla/plugins/lib/libcapi_engine_linux.so
-}
-
-src_install() {
-	insinto /
-	doins -r usr etc opt
-	dobin usr/bin/ifc_chrome_host
-	keepdir /var/log/ifc
-	fperms 777 /var/log/ifc
-}
-
-pkg_postinst() {
-	cd /etc/update_ccid_boundle
-	sh ./update_ccid_boundle.sh
-}
diff --git a/www-plugins/gosuslugi-plugin/metadata.xml b/www-plugins/gosuslugi-plugin/metadata.xml
deleted file mode 100644
index 19c58d849814..000000000000
--- a/www-plugins/gosuslugi-plugin/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>mva@gentoo.org</email>
-    <name>Vadim A. Misbakh-Soloviov</name>
-  </maintainer>
-  <longdescription>Browsers (Firefox/Chrome-and-forks) plugin that allow to use GOST cryptography on Russian E-Government site</longdescription>
-</pkgmetadata>
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index f8490ca94087..411f00f9d5a6 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 64be68d0423c..da5d09377052 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -9,6 +9,8 @@ AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b44
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
 DIST apache-tomcat-10.1.19-src.tar.gz 6175254 BLAKE2B 8ec0f461de2fed4642fcb20e38f637c5516d4543bebb66a7a8c9ad0d7acbd0221677d98c03021c2a766057158f9effa3dc5dda96eeed2b1cf662168f545d6223 SHA512 ee9bd20979a53f2151ac10dd8be4d4c0b82cabb60c10f33572460094a199832434b4f55aed4ab0334a2daf2795dbbfa345a55144132dbfecc7b3ab2d74999e77
 DIST apache-tomcat-10.1.19-src.tar.gz.asc 833 BLAKE2B 12b92d5f42219b0fccbc3eeb004fe38c762090790da93d51423ffec07c34f3203fbbb45c670f1cf8bf992ab061d0ed8f52f622eb51163511d29567bc241f6e26 SHA512 edbeea8873b8d1b48b8a298e57ef9715dd6b912d9edf6447bfcf85945ab79db08a21b0d134926d814676f2df823e1b78184792118926220fe4ea070919a5e71c
+DIST apache-tomcat-8.5.100-src.tar.gz 6172727 BLAKE2B c56a0c02fcac8b70186edfcf9132370bdc4d57d6997821717c8c480dbee2ebdef05d87eb2fd0d25ea2a86001aae1ddf47b2bed7d2f15bd331c6aadea298e2556 SHA512 ae03d6b99ba4d7b7718c0c9040db7cdd5db3e047efa3dc8ff145b3005733285b134462e0d47ef10730aba6d5ef9f7aa9d4fbd46f1dafe0ac622ac8fc2201aea2
+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
@@ -17,6 +19,7 @@ DIST apache-tomcat-9.0.87-src.tar.gz 6332438 BLAKE2B 8f4a89d3f5770abe6f60ba0dcac
 DIST apache-tomcat-9.0.87-src.tar.gz.asc 833 BLAKE2B 31c0266c0819a2daf6192f7feebfaf534bcdbfda72de169f8c63b017c2a686d191765ec0dd1cb1a63293d03e519747aa85281fd8041482aaf53f80f43db45875 SHA512 e765abdf4442c94422f752578d96d75b1242859bf5d19b8b08d2487f3531ef652eb4b2a4bd70eab5e5c5e83f07fb335b44dda1eec4ea9dacffbb9dfca5d145da
 DIST biz.aQute.bnd-7.0.0.jar 16567341 BLAKE2B 329b3b750e917ad513a1f767f63b96b1d0b10177a0f3c079bbf07e02aff77607e1f869bae09d09709d8cfef27cd802585e7f332e2a3e3f0ee1c31a4890e53fce SHA512 42b2e43f3e437c7b06f0d168eaf5ee499a4c517b1a01bec67fd6df92d01d037dd9088e0d5b013dfa1839f9dee35bf74903c1af7204712bf4aa72412e071ac503
 EBUILD tomcat-10.1.19-r1.ebuild 5442 BLAKE2B 0f5cbc25167222f86fe5c8af93d5a9a04986d58f29a2c054f12d95d9f731bf7fe404851967aa54eb08c2fbe0becee1831dfd0801dd2b8950f67bdaf4e565ac97 SHA512 79d4196d097315ef04cbd31d9f1152171fb7315f8c6d9a9cb4d3b20aa148a9612416cd501e517e65d9fb94625cd909149be9895d80218ed3750c20986faabe84
+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
diff --git a/www-servers/tomcat/tomcat-8.5.100.ebuild b/www-servers/tomcat/tomcat-8.5.100.ebuild
new file mode 100644
index 000000000000..8f3129ef2d1b
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.5.100.ebuild
@@ -0,0 +1,156 @@
+# 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-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz
+	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="8.5"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.15"
+
+# we don't use ~ for el and jsp because the same implementation
+# is also present in tomcat 9 and it would be impossible to install
+# both tomcat 8.5 and 9 at the same time
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}"
+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-11:*
+	doc? (
+		dev-java/jax-rpc-api:0
+		dev-java/wsdl4j:0
+	)
+	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}-8.5.86-build.xml.patch"
+	"${FILESDIR}/${PN}-8.5.95-min.java.patch"
+)
+
+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}"
+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 -Dexecute.validate=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant ant.jar)"
+	use doc && EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only jax-rpc-api):$(java-pkg_getjars --build-only wsdl4j)"
+	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."
+}