gentoo auto-resync : 22:05:2023 - 08:56:17

113 files changed, 1402 insertions, 606 deletions

diff --git a/Manifest b/Manifest
index c1f57eaff993..bf7b476b1c77 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29474 BLAKE2B 8ce95d0969c73c1f7123e1ce98556e3b1096c71e507d9661094db21d09e0aa7a752f6755213be1201a97a05d5ec2195e802ed74fd9c292de388e14c9e58addde SHA512 b95cc387c242fb0dd14787cf83d373fbd8822f0b9d483d8abd300275105be44d4c70c251429496e21abc8e425bba5bf7751a6e627b08f2acdd6f3fc8b75d6d85
-TIMESTAMP 2023-05-22T01:09:45Z
+MANIFEST Manifest.files.gz 29472 BLAKE2B e4c2fb896ca87db4359fb76cf95f1ca5a19b30c1a8c89d11fa0cc1ec3e2ce2a3cf7b771652d86fc33761e4abe639da119cdd8f38a1f64881a65a4a40e9ec7154 SHA512 e0c16a6ed18299dd30e18abb28e66dee3cf80ae36e6666a598caa8ba0038ae355decdf809292ad7b3629733cb5ec42a4ee9272a21a6e217aadfcf42c395cbacc
+TIMESTAMP 2023-05-22T07:10:05Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRqwNlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRrFU1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCgzhAAnXiDxilHRNag8IxslKhM3kCt1eTClZHNAFnjOFWrQKch47L7bhU1Y7PY
-GUOJdht3118SyubQBLWDDQHRFRvCXx8Owwwqct38fiALcY8aT78iBsA+etfcrUsu
-34KkyxqteMJ8jHDg4cp0F62RqSOrQhixxdjduKd0O/P2I0dmoloiFfhRC/x0VupD
-lnKm7RBZp6cHHlXSVHZu748MCTIluRX+43uFLwwJqe/6WtRXapZpauNSiaSNqEcq
-Ax0zt/XKYB5YrOXY75z3elTTPiwVDVyyhTN/iuA75wt9Gy+L4NnuUnYby61T9ZH6
-xbj2QGpQC/Zr6xHybBbkgH0FfAdQPod/tfIB2kF0B56fNwbc3G1SAig1iArho6v3
-37GQNXY4G2+t8BzmHDersYDf4yVq5en9JYMztvtWKxAsLsR5u5sjuaz7oMW+0zPx
-9k+WIjnlug6EGXj3aGBD6H4fKGUV02sud+N3UKEJbWp3necJB1oE7GsG1Pcbg56G
-hrowVuoqIEIfDpi85UQ2b/ifp23A8f/QhkVmtp2sCXLxVETKdAGJhUF7CH+IyhVY
-RLJgAHvjWWwB3keKQlnTNYz7aU8sct6OrJ3OHdnYu+Myw5CJ7OitMIGyGW1zViJU
-GLEWEDJpg9L2G6IQ5pOe/TC2jYddq4jCA2Vd7aeJOPpXtv7RmoI=
-=cWMP
+klC5Vw/+Ju+cZdWRxvlVszT6kRF08JuM0033BRYWZpuv0LR68EiYtVJcxcG+LAK4
+/W/xSLc7uKQavo2ofurUQM24pKAOlkbxe31MtxR7pczfK/pMxM3kxxKvWbJ3YPM4
+pOKOCO9EvPwEjFBPMwNVgfL6ZZbZWW38G6lkVXnNdug8WJtuwKaP53dVkCrl1692
+bqvn8sglcgDil5KSMv1e3/ps+2+yosnvgZGyIxUWrYI7S17ZGEree2r1BY7elAUY
+VserQuzvimx5oYBFrELuGXRINht0wx7ZuPIa7YPKuTE4fnqtuhxPOZfdcrxjbA1O
+bfSIgPeG/e1KWxg957yLv6fEabbOcX1nNFohlRZg0sE2YAzEaUuLwDevYUsR+zMF
+065nPxG4tmWNU2iKFrAtzNW61SeQ1DEikhVoqxpd9bpElUAMICYkSv/fhX7E34MR
+RbYG8lHfS1cEI8cdtnED1V32yUR5Bk/b/x+mVDPmfFoJx32KkHNi7iuNl05LuFJ/
+KV4+Hse9dY27RnS/iCfTKc6J+Drn1ETZOi6eFRE9JI/jTv/YayjDso27u6P4Mi/z
+uBRtnJqgmEhfH47jXF44gwCHOaA8+O37HJG2O3Er06UDEACiaMNwHE6o8/DTlrPR
+dhTpgWH+7Q/NNhsyAV5r+DicKF/35/gaCZQOPUk+v0R3OnNZ2OA=
+=EMHI
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 2d2dd78d485a..6754e6f6bdad 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 38fa80ceeee7..5a714ab5e026 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
index 09e0010dc4ee..ad11ba82ba01 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,6 +1,8 @@
 AUX implementations.txt 864 BLAKE2B 978de3f6b4450956966fdcfb336a7df1f27010870d73e6de8f05703f2a003d87a94ced76e76337264e4e895977d7383a22978f3359e67bdfb488e06d25595194 SHA512 121d5e6806d8f1fc12b42ab10edc1d2df938f56aba859d8435db95f5dbbcc8a3b487d792faaa49aff19ed2667638e03993852132e282230a5b26c62a25c5533d
+DIST gpyutils-0.10.gh.tar.gz 24963 BLAKE2B ef6bd54195e1bfbb0734ef8aedbd13dd27b52d2f62d95b741459ecf4f5e93b80085a4cebfbe184fb8ac7e7cf97f4fbb422c5b5e36d0bb9dbc27896a4ad72d86e SHA512 baf6d44db447774ffc976698874f87dbc858ef146aa46ccb0a7e15a1f3d4d1263f75b2f46f319e45fa5994620c71e37ccc42b42b5f05dbde8f3cbacfbd45cbee
 DIST gpyutils-0.8.4.gh.tar.gz 20477 BLAKE2B 661ec8c9ae595daa112de2171331a5791fa4a10b50f9ebf76589c4c6ff4d6b8e618657dd9f3dd6cf573871ab6e0a9d017d87e03066fa60ba8b9d4e4617f68306 SHA512 f87a087464ca8e1118232227d2e6ad66aa021caabf0307c153b442fc4467bd124eb918c16104bdd1b42866acde16fdde4b99312a8c047ecf379ed10a74d27541
 DIST gpyutils-0.9.gh.tar.gz 24680 BLAKE2B 75f2ebf3a4ed3883aa3c28773edb903ef2063ad0b6c55316578b2fbf725317ec84a1e0017637d36f28903043ff9d82c2b298bbc8424576b1e23c76f5d3107b59 SHA512 306e2e0a9abe95b6dc526b7b04ec7451a7a33e59542c6a0ac12860eadee8501f0e9ff42586dd3df2c5d43e44a43c458665456ba65c435075d3fbbde31b0314b0
+EBUILD gpyutils-0.10.ebuild 667 BLAKE2B 5614d7a43f4c9b6f771ef36a5aa478b7c47f73f821ab5a53b77e9c8b42820bc4e4f846c504263f4c93cc23001287f785ab3ca498177d8e9b71482d441e5c3e35 SHA512 e03275f1488c8d9d37d4f5e9c3f97217cef14f0306da3e29ffc1710c480a1ed8de3f9dccccf8fbf74f5d4149bbc263d2e4eac147ec63bdc76f5412cf6b92f875
 EBUILD gpyutils-0.8.4.ebuild 613 BLAKE2B fd58f9d3b037ab48da03739a772dfb8067ccde5713d4c7733cb0b6be1ae3eaf9f4937723adc486bee14a76f83b4876c10842e0c0fed114e0d2918398c7174d9b SHA512 a369a8a7389d049d0969efe949775b289b16b8fc884038384f3036c8e0cd41f30b32142188dcdddcfad4ed60d296778e71dbb79bcf531215dd46aa2dd36dda9e
 EBUILD gpyutils-0.9.ebuild 666 BLAKE2B f189925604f5702787d4424f99903f935d37e4dc97b5f372f17ca7d69248246545d325bf2bc5c19bb4af9700684d4fc2571f4fbb917a6feeb09d4e7b1b53e337 SHA512 ced7d7edb400ee68f9e29c38bc3032cd904f215a79a35b72ceb00d3667ccd486cfb9bc15c853dc857bb673ed8da93844e1678ff09034b87671248a7e3fcb3c99
 MISC metadata.xml 601 BLAKE2B 3a90fccb93c2acd9e02c847f5a9170c6a7b976561d02e76ec0f58906b4b514b352bd621fe5a64ae6c8653253417a90fcce5b10e13bda2218b9b7bc29a86b9b8d SHA512 ce7bded5842dfd2dec8f0db875d8b302726f42deec340efaacdf4c6f99cde9daf18365f3edb9367b6a77f7690442b14a0b925bb2265c58f833a0937d6325dcfa
diff --git a/app-portage/gpyutils/gpyutils-0.10.ebuild b/app-portage/gpyutils/gpyutils-0.10.ebuild
new file mode 100644
index 000000000000..44a4363e1962
--- /dev/null
+++ b/app-portage/gpyutils/gpyutils-0.10.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Utitilies for maintaining Python packages"
+HOMEPAGE="
+	https://github.com/projg2/gpyutils/
+	https://pypi.org/project/gpyutils/
+"
+SRC_URI="
+	https://github.com/projg2/gpyutils/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	>=app-portage/gentoopm-0.3.2[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index 0f6bd04bb65e..d00c34146f9e 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,7 +1,9 @@
 DIST mgorny-dev-scripts-37.tar.gz 12407 BLAKE2B 49e01dc5318c473fdf99b046c7bf8e9939aa3bcade8a481f1418878733c55777fea5a6a471bedd1b1af8009a32ec94ce3cc904f278382fd5060b69a8e276e734 SHA512 c5fc03f0e5fe0f491ada2c4eb1305f215ca33f7d0778a0423cb8e4973a5370b7da2153c0b86acfec1a7672c290acc77782f37fe95ebeb3d6b86436435eda2c95
 DIST mgorny-dev-scripts-38.tar.gz 12415 BLAKE2B 0312791a40032a7f395ee3bc77266c2fd02a77d5b071a33ef4dd28d8d29adb7f473d8775b640c9cf7891bcca4f0808c14267522e521193c32d176561763119ed SHA512 0ecd35e07100fc01a0d9b1e22fc3582f28e0c14ceafec58479fae861525a3f1d2311d64b91a6d7c3e510a161f6776e4a34f8eafb46b46fc1d906c378b86a11cb
 DIST mgorny-dev-scripts-39.tar.gz 12471 BLAKE2B 7457190873143cf902d077f43e4bf116ffd5c35d2a99343819e301cd1580ca39430bd8c68281cfe59cc2d415fb4ab7d4e89416a89baa7dd7473cae5d101d81ed SHA512 518ee649cb159059536205dad392035ba41bd68f6b0c69f40f18cee62844ec50253dcc4da759e4e4dd101f0ce022504c0db5c5a33938b19ce676504e76a3d1fe
+DIST mgorny-dev-scripts-40.tar.gz 12480 BLAKE2B 63f22ba3a97c3cec5c6f77d061dfccbf71cf6572d489c53f131b0ae593e919d9ac296ef55dfb593752cc2d288f9d0cbe4343199721e211a4480a29965c91a9cd SHA512 7e9c959844f2282de57844306e8d324ac11c398d9a9e8f039a7a5630d4c2363a6b6f28c3765a9ab07e03093d7890c2ba3d824c6c29b82d5601507e611a645c58
 EBUILD mgorny-dev-scripts-37.ebuild 676 BLAKE2B 2b3199410a620b4d21e10bda7234e3323388907506cc1a3678eadc71dbf110d17f95a923b956503ae693082e283ba1bdbe62065392abc22e3619fcc35808ba5f SHA512 c74d7fedb8fc66af0c3d43325358ab0a8a99eccd3f28347e49059c616c0a6bb081d12aff3b9afb4950e5827c15376bdfbfa4b73775210a310814ae06fd33e771
 EBUILD mgorny-dev-scripts-38.ebuild 680 BLAKE2B 150e6343070bef8b5a34e7bef1bbe8779ca04a5fbe9f97f3ab1bd32797dd92017ebe7f530c97deec0bfd1085e866f448e787017fd97833d27c6eea2c664a41aa SHA512 5d8723b9e58295b1db57c5a83dd692fd16655a69b1c6c1311ff45d4190b777e1e8c439d3d32d615eb62b45ff91ee44c1f8976388de87a419e6b02ca2d7001c2d
 EBUILD mgorny-dev-scripts-39.ebuild 680 BLAKE2B 150e6343070bef8b5a34e7bef1bbe8779ca04a5fbe9f97f3ab1bd32797dd92017ebe7f530c97deec0bfd1085e866f448e787017fd97833d27c6eea2c664a41aa SHA512 5d8723b9e58295b1db57c5a83dd692fd16655a69b1c6c1311ff45d4190b777e1e8c439d3d32d615eb62b45ff91ee44c1f8976388de87a419e6b02ca2d7001c2d
+EBUILD mgorny-dev-scripts-40.ebuild 680 BLAKE2B 150e6343070bef8b5a34e7bef1bbe8779ca04a5fbe9f97f3ab1bd32797dd92017ebe7f530c97deec0bfd1085e866f448e787017fd97833d27c6eea2c664a41aa SHA512 5d8723b9e58295b1db57c5a83dd692fd16655a69b1c6c1311ff45d4190b777e1e8c439d3d32d615eb62b45ff91ee44c1f8976388de87a419e6b02ca2d7001c2d
 MISC metadata.xml 362 BLAKE2B 9f7873c2b1dea8abe84daabea4db33438b730c92487220d28af391e411f58b15f7eaa7aedffab8849a8d0cf4c032db04e48cbf9be28f0ee7602b6a05f0e430be SHA512 d7d44e67c952a00cda52b223975c1c48ca8283d55ccc084edbed956633e8f2a04ede1553f16a3b673485ce433b9067d35c1459f0ef392ddf6d4d03ab02d339a2
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-40.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-40.ebuild
new file mode 100644
index 000000000000..c1910af26af4
--- /dev/null
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-40.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Handy scripts for ebuild development and more"
+HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts/"
+SRC_URI="
+	https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	app-portage/gentoolkit
+	app-portage/portage-utils
+	dev-perl/URI
+	dev-util/pkgcheck
+	dev-vcs/git
+	net-misc/wget
+	sys-apps/portage
+	x11-misc/xdg-utils
+"
+
+src_install() {
+	dodoc README.rst
+	rm -f COPYING README.rst || die
+	dobin *
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 6b0cb8aaa68b..a395e9961b28 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index 0083751e2be1..5c1d09d3d17c 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -5,6 +5,6 @@ DIST libevent-2.1.12-stable.tar.gz.asc 488 BLAKE2B 629109913fe57110d0d78f5a7f18f
 DIST libevent-2.2.1-alpha-dev.tar.gz 1166550 BLAKE2B 4ab460a521aab90852ade14c937c06a21f8e5649a1a1dc4114f978a99272deb77b4e05923861e979f4ee5f50e04149d7b8f8e38294279757f27779597f407d79 SHA512 3e0ef283979a30cce11065c3b9a1078f3f006dbab86e8b49f75dc3aac2384085cb74477d95e5bc4e88c0d81ee2359fcd1cf292107d4791de87191019f2fcdfa5
 DIST libevent-2.2.1-alpha-dev.tar.gz.asc 488 BLAKE2B d3e2b2782edd3bcabe42183b5b6647b6e55cd52292813901015a96c6eeec40e1ce57e9be731b2bd027c787f22b8ac5a587b7bed1dff95993bedde8b88fc1e89c SHA512 af720bce0829e806fb8bbb043eaf973fa6765ee17f059367b72344ce111a68f878b7a2fe361e4a3db61c7b4724c7dff19f960636b98e4208e7e27a2a077b8848
 EBUILD libevent-2.1.12-r1.ebuild 2043 BLAKE2B 6da7aeba1c7ceb5077fe8ebad783e70b377301eeb89d5b36401e75f13ec60de69a125bdbc2b197f459e7d67132a2e75e573a78eac963021cf5aadd3cbf9ba645 SHA512 365920c35f830fa859ed0e6a930a380a906389bcf3b2813fe81a82a5a89596a4fba9bc921d4f5d21901c1e17c57cf0e6345fe45accc8d9e5a35e5c4b0cc173c0
-EBUILD libevent-2.2.1.ebuild 1646 BLAKE2B 8f97d6c73af1eb4cef4bf7f6aecce53ff4e199b32a7581b4f6432f349f95813482cf95ce64876d8094da89df920b739f9667b0c7c5677f1bb4bc7d169a0a8ebc SHA512 7e5e4c87c7905bded4993c7802323a0eedfdda059fda0f4250fcc7a8993c2d3665739b286b2a3d4be135062cd7dd0b9ff0549c06d351323e30a7cb112ea6e87a
+EBUILD libevent-2.2.1-r1.ebuild 1761 BLAKE2B a65f600e2f01af7ce54127e9587f836fc8cac15726922e509e4e91f92ec7f771ae378aa91148fecedb92e265eba402fd5047fbb817f72b1841c6ffe1e8da6030 SHA512 aef8ffa4cadd6c0002f4fa2f5fa9b0a95f8351de9f4f44983b5f97d4261526ad1b567106347d92e8cd914a581cf7c220bbfcb3d1547d9691c0896f2854a398e5
 EBUILD libevent-9999.ebuild 1394 BLAKE2B f1c6080e3315545c7af5341498f8e8d3df9eeb71fc57e22ec7b6471be61a969a4a65e4b7a47a269cad258adbeb8fbd97fd0c6c5d67ff97bd8f4ee68c2c6cc840 SHA512 685ce4c93fefb5d08c005e4f3002749d2a6a71a3e8ad8806da16b870f609a1e0d75dcb8de9bbbeffcc393532a83713fbc21138be0a2d504c1004dc2e539ab304
 MISC metadata.xml 935 BLAKE2B 45e1677dd467a0b9f0de89bf9966cec3368da090bc330c7b31aa8528d19440e3523ef3afb67d27102cbf4b40ad8343dc03d040f5961629e2a43d55fe46d7e5a6 SHA512 a7a5ac5c59e2a767bbb511c4eefb53535d894a936d5cd0e9206c176a4f50dfc90387a46a35ece2b48740974f9352793ab56026573678ab74e3e1e5250799bdcf
diff --git a/dev-libs/libevent/libevent-2.2.1.ebuild b/dev-libs/libevent/libevent-2.2.1-r1.ebuild
index 66a742241c13..63ff06976ccb 100644
--- a/dev-libs/libevent/libevent-2.2.1.ebuild
+++ b/dev-libs/libevent/libevent-2.2.1-r1.ebuild
@@ -66,6 +66,9 @@ multilib_src_configure() {
 		--disable-samples
 	)
 	econf "${myconf[@]}"
+
+	# workaround https://github.com/libevent/libevent/issues/1459
+	sed -i -e 's:@CMAKE_DEBUG_POSTFIX@::' *.pc || die
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index e1b5436378b7..9348b10473d2 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,8 +1,11 @@
 AUX quazip-1.2-cmake.patch 2978 BLAKE2B 3125b2b84e9316f3db9afbbfc91b379933dec602e288cbfffbc58cd422ea3f26653075d9bce731671e375127c937c6fcc2ff9cf217884be67057c9ecdd43115d SHA512 033c63a46ec0b1ea82f713dc807faf30c266e4bf385b4e9c0b1e6320c12f7c2093d1388a06e65ea32cfe27374324f00eb08baca9a2648bac8d0801a783b19fa7
 AUX quazip-1.3-cmake.patch 3166 BLAKE2B 5288e1120302ac14e8d912f0fe11288f8911184abbc926019c140e9e42a5c754e4266a5861910d752e5981bebdb4cf081a34d5c776cccc81e7f3f0f28e28edcc SHA512 1aa17b746b1a88ea600650816ef75cd02736beccf0abeef51d039bb4574262f20517d7fea1721adafeac3f0a5cbd988476b1aa4d754dce85d004811e2dcddff4
+AUX quazip-1.4-cmake.patch 2780 BLAKE2B 8e7d7f40db2df74e4cce38c140ff30356e914bd7b994a161d3113f16d4d683fc1895b8718184577079747a102c04c51d08ff7d90227da3bc65b29ed6fa44087f SHA512 c574981e4effd63adf181679481b6ee91541245e23f72982cfde80e4a25af2de7c7815d4b35321d5a3f8f074c68dafbee0b78307b10a10da950bf1b59ff90cd5
 DIST quazip-1.2.tar.gz 155878 BLAKE2B cfd5505509863dfdfcc88cf9f50aeff0ee0c1391412dc8aeb34ab020debd8a29279563323a0ca13a8d3b8b026518f5d079b8fa989aca20a9bec083c6dd4e3695 SHA512 3f4b1a4194ca286163b1c17880ea471a341dcc05d758ee8f3d1e540d0f6aed7ac18200450187034c46b4fab1da39111dca534d75859701259406a6dd50205386
 DIST quazip-1.3.tar.gz 156138 BLAKE2B a9002bdfab39fc1516160b0073fd3d59a65a66eda98240b9a2936d4423b21b40dd9360122950a54dc18236bc2aaf4e1e2d761ba145f6dbd5014cf72a287fbb3b SHA512 3861a9084059576ff2690e8b911394b0286a60542ab021a4cc588537a60ea3a186ed7903c76544698001fa383dfd0de96bdfed433abaefc44158d3b30ab16fe2
+DIST quazip-1.4.tar.gz 157819 BLAKE2B bb0ec2ebd31d6ce5e2a19fc1b13570d57aa1438ff192621543ab6aec4e85f76677863d37efbe0bc59e3530ce023586440081cd47f069b4dcbac55118d12f8668 SHA512 38ce3aa77df1fd92229454e56b7290c066d1e319afa36a9f8ec8477004ae94df682e8f454f13cdaf586a1d0b0e033fe698081033a19536ecd53dd1e4b0204af9
 EBUILD quazip-1.2.ebuild 941 BLAKE2B fdfbd8cc0cb2a17409081c4de485bd573a1ff3145778c71d57e618dcf860638b8bc85923a624e3ef36b1f865b576c65183ed82229dc0cd378f159372b8c80fb6 SHA512 bde570eb2fd7d7944db9cad35fe888044c26c602ddbf31ce4782161e85620db781b46ba951d499519409a00464fdcb84e63c4e6c1e76818ad886fced3fddf46c
-EBUILD quazip-1.3-r1.ebuild 1023 BLAKE2B 6986e760270d297676a5107002e8501455576a42037bc249cf7514b07740211123a132a072b4f38d1e921096ff453def319cdcf762c8471f4dc748aada648ccd SHA512 94b53a3e7c4e867638543692b635e7061f21a33f3297173f8984c84d9efa231ee5529f0c9882764cd89d193381c2745aa5534e3eff986162c4b6f99c742079f2
 EBUILD quazip-1.3-r2.ebuild 1695 BLAKE2B af2209f84693bf4b38cc4bd89cc24ef9f80349498dda023df0b35eecceee666129c8214937c1672a7f6544b8a6791600c7fc11a580eb8e5a41d32b8e6d7b3b90 SHA512 f98cb7714bb0f50c7cfa842112c25c8786a65357af17ea66fd48ca592c1e0f0ef9a7e6c618d1a22670f7beb8e17fd99eb5abffaed1e81b5d04a675f97ddfc6ce
+EBUILD quazip-1.3-r3.ebuild 1697 BLAKE2B 40cbdbe7a36872b6e657cf6d2a4564ba3c09012c641041c5cb21986e62f38c5e489c84b38da47ff7c68b1e28f72547538f3743a7e341db349441b47bbfc1708a SHA512 efaace1454c7388f524d9c3c352d064dba27378d9769812043107699d30319501a7be462e02fb32092a0effed1000c55069e0341dc45a443c0ef4ebe894ad752
+EBUILD quazip-1.4.ebuild 1785 BLAKE2B 95806098fa03d5cc2f46af6127cf047c27e40ae8cefd8a3121900752b721b66c858db0d8b52bdbb0c1bbab32e416bbcf8420404493ce1c2274cd4288d8caa793 SHA512 cb37d5ab2e51017424cc556f242f4e43d82c47cd599689c68bab49a6f296f77f66dbb2c12c90fb105d5ec5671361335bc8675e3bbeef891e6affc5f8b9d96f4f
 MISC metadata.xml 461 BLAKE2B 24ee9745d2baa54233f3cea1e7ec426e83ddbf458e63e679f204014ba4d8dd971c0da5876db9adf2b41fbda1239ff89752eebd30fe6a8da179f34274501507cc SHA512 d6d54cd6e2a16ab151dc987dd75772d996f733f7e5212cce7a73d9ed2b75721230b9295476bf6c5680343e9ce02cfafa7d2b667afc5597d770c66c96a8474956
diff --git a/dev-libs/quazip/files/quazip-1.4-cmake.patch b/dev-libs/quazip/files/quazip-1.4-cmake.patch
new file mode 100644
index 000000000000..d796c94026c7
--- /dev/null
+++ b/dev-libs/quazip/files/quazip-1.4-cmake.patch
@@ -0,0 +1,76 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f6719c6..e0520ae 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,12 +14,10 @@ if(EMSCRIPTEN)
+   option(BUILD_SHARED_LIBS "" OFF)
+   option(QUAZIP_INSTALL "" OFF)
+   option(QUAZIP_USE_QT_ZLIB "" OFF)
+-  option(QUAZIP_ENABLE_TESTS "Build QuaZip tests" OFF)
+ else()
+   option(BUILD_SHARED_LIBS "" ON)
+   option(QUAZIP_INSTALL "" ON)
+   option(QUAZIP_USE_QT_ZLIB "" OFF)
+-  option(QUAZIP_ENABLE_TESTS "Build QuaZip tests" OFF)
+ endif()
+ 
+ # Make BZIP2 optional
+@@ -56,6 +54,8 @@ else()
+     set(CMAKE_CXX_STANDARD 14)
+ endif()
+ 
++include(CTest)
++
+ if(NOT CMAKE_BUILD_TYPE)
+ 	set(CMAKE_BUILD_TYPE RELEASE)
+ endif()
+@@ -72,23 +72,29 @@ set(QUAZIP_DIR_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION}-${QUAZIP_LIB_VERSION})
+ set(QUAZIP_PACKAGE_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION})
+ 
+ if(QUAZIP_QT_MAJOR_VERSION EQUAL 6)
+-	find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat
+-                         OPTIONAL_COMPONENTS Network Test)
++	find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat)
+ 	set(QUAZIP_LIB_LIBRARIES Qt6::Core Qt6::Core5Compat)
+-	set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test)
+ 	set(QUAZIP_PKGCONFIG_REQUIRES "zlib, Qt6Core")
++    if (BUILD_TESTING)
++		find_package(Qt6 REQUIRED COMPONENTS Network Test)
++		set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test)
++	endif()
+ elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 5)
+-	find_package(Qt5 REQUIRED COMPONENTS Core
+-                         OPTIONAL_COMPONENTS Network Test)
++	find_package(Qt5 REQUIRED COMPONENTS Core)
+ 	set(QUAZIP_LIB_LIBRARIES Qt5::Core)
+-	set(QUAZIP_TEST_QT_LIBRARIES Qt5::Core Qt5::Network Qt5::Test)
+-	set(QUAZIP_PKGCONFIG_REQUIRES "zlib, Qt5Core")
++    set(QUAZIP_PKGCONFIG_REQUIRES "zlib, Qt5Core")
++	if (BUILD_TESTING)
++		find_package(Qt5 REQUIRED COMPONENTS Network Test)
++		set(QUAZIP_TEST_QT_LIBRARIES Qt5::Core Qt5::Network Qt5::Test)
++	endif()
+ elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 4)
+-	find_package(Qt4 4.5.0 REQUIRED COMPONENTS QtCore
+-                           OPTIONAL_COMPONENTS QtNetwork QtTest)
++	find_package(Qt4 4.5.0 REQUIRED COMPONENTS QtCore)
+ 	set(QUAZIP_LIB_LIBRARIES Qt4::QtCore)
+-	set(QUAZIP_TEST_QT_LIBRARIES Qt4::QtCore Qt4::QtNetwork Qt4::QtTest)
+ 	set(QUAZIP_PKGCONFIG_REQUIRES "zlib, QtCore")
++    if (BUILD_TESTING)
++		find_package(Qt4 REQUIRED COMPONENTS Network Test)
++		set(QUAZIP_TEST_QT_LIBRARIES Qt4::QtCore Qt4::QtNetwork Qt4::QtTest)
++	endif()
+ else()
+ 	message(FATAL_ERROR "Qt version ${QUAZIP_QT_MAJOR_VERSION} is not supported")
+ endif()
+@@ -191,8 +197,7 @@ endif()
+ 
+ add_subdirectory(quazip)
+ 
+-if(QUAZIP_ENABLE_TESTS)
++if(BUILD_TESTING)
+     message(STATUS "Building QuaZip tests")
+-    enable_testing()
+     add_subdirectory(qztest)
+ endif()
diff --git a/dev-libs/quazip/quazip-1.3-r1.ebuild b/dev-libs/quazip/quazip-1.3-r1.ebuild
deleted file mode 100644
index 896e591fba00..000000000000
--- a/dev-libs/quazip/quazip-1.3-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
-HOMEPAGE="https://stachenov.github.io/quazip/"
-SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-# SONAME of libquazip1-qt5.so, check QUAZIP_LIB_SOVERSION in CMakeLists.txt
-SLOT="0/1.3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-qt/qtcore:5
-	sys-libs/zlib[minizip]
-"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		dev-qt/qtnetwork:5
-		dev-qt/qttest:5
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!=dev-libs/quazip-1.1-r0:1
-"
-
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DQUAZIP_QT_MAJOR_VERSION=5
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	use test && cmake_build qztest
-}
diff --git a/dev-libs/quazip/quazip-1.3-r3.ebuild b/dev-libs/quazip/quazip-1.3-r3.ebuild
new file mode 100644
index 000000000000..766cb60567d4
--- /dev/null
+++ b/dev-libs/quazip/quazip-1.3-r3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake multibuild
+
+DESCRIPTION="Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
+HOMEPAGE="https://stachenov.github.io/quazip/"
+SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+# SONAME of libquazip1-qt5.so, check QUAZIP_LIB_SOVERSION in CMakeLists.txt
+SLOT="0/1.3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="+qt5 qt6 test"
+REQUIRED_USE="|| ( qt5 qt6 )"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	qt5? ( dev-qt/qtcore:5 )
+	qt6? (
+		dev-qt/qtbase:6
+		dev-qt/qt5compat:6
+	)
+	sys-libs/zlib[minizip]
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		qt5? (
+			dev-qt/qtnetwork:5
+			dev-qt/qttest:5
+		)
+		qt6? (
+			dev-qt/qtbase:6[network]
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!=dev-libs/quazip-1.1-r0:1
+"
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
+}
+
+src_configure() {
+	my_src_configure() {
+		local mycmakeargs=(
+			-DBUILD_TESTING=$(usex test)
+		)
+		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
+			mycmakeargs+=(
+				-DQUAZIP_QT_MAJOR_VERSION=5
+			)
+		elif [[ ${MULTIBUILD_VARIANT} = qt6 ]]; then
+			mycmakeargs+=(
+				-DQUAZIP_QT_MAJOR_VERSION=6
+			)
+		fi
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant my_src_configure
+}
+
+src_compile() {
+	my_src_compile() {
+		cmake_src_compile
+		use test && cmake_build qztest
+	}
+
+	multibuild_foreach_variant my_src_compile
+}
+
+src_test() {
+	multibuild_foreach_variant cmake_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+}
diff --git a/dev-libs/quazip/quazip-1.4.ebuild b/dev-libs/quazip/quazip-1.4.ebuild
new file mode 100644
index 000000000000..8ad656566a6c
--- /dev/null
+++ b/dev-libs/quazip/quazip-1.4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake multibuild
+
+DESCRIPTION="Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
+HOMEPAGE="https://stachenov.github.io/quazip/"
+SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+# SONAME of libquazip1-qt5.so, check QUAZIP_LIB_SOVERSION in CMakeLists.txt
+SLOT="0/1.4"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 +qt5 qt6 test"
+REQUIRED_USE="|| ( qt5 qt6 )"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	bzip2? ( app-alternatives/bzip2 )
+	qt5? ( dev-qt/qtcore:5 )
+	qt6? (
+		dev-qt/qtbase:6
+		dev-qt/qt5compat:6
+	)
+	sys-libs/zlib[minizip]
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		qt5? (
+			dev-qt/qtnetwork:5
+			dev-qt/qttest:5
+		)
+		qt6? (
+			dev-qt/qtbase:6[network]
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}"
+
+PATCHES=(
+	# Use CTest module provided BUILD_TESTING
+	"${FILESDIR}/${P}-cmake.patch"
+)
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
+}
+
+src_configure() {
+	my_src_configure() {
+		local mycmakeargs=(
+			-DBUILD_TESTING=$(usex test)
+			-DQUAZIP_BZIP2=$(usex bzip2)
+		)
+		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
+			mycmakeargs+=(
+				-DQUAZIP_QT_MAJOR_VERSION=5
+			)
+		elif [[ ${MULTIBUILD_VARIANT} = qt6 ]]; then
+			mycmakeargs+=(
+				-DQUAZIP_QT_MAJOR_VERSION=6
+			)
+		fi
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant my_src_configure
+}
+
+src_compile() {
+	my_src_compile() {
+		cmake_src_compile
+		use test && cmake_build qztest
+	}
+
+	multibuild_foreach_variant my_src_compile
+}
+
+src_test() {
+	multibuild_foreach_variant cmake_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 06c5754a5f3f..04cf5e954eb1 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest
index 5ed575ea9e1b..72c204359c14 100644
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@@ -4,10 +4,12 @@ DIST ansible-compat-4.0.0.tar.gz 62675 BLAKE2B 9c384a25729c2c1f72e806b4df6172e18
 DIST ansible-compat-4.0.1.tar.gz 63728 BLAKE2B 51b6956059394e1e29d416113f6a924032cc6435780265c2595f1b0776477727c865c74afa25fc2527777a5d8ea74aead086293934cdc099966b875a96c5789f SHA512 a2edc46a472e6f99cd0231e453742780c5ae8713768bfda4218ae3d6979c38779ba8c5ec491813550a6b3242ef04e5de2c916c9538fcf5b018e7500fdf18bc4d
 DIST ansible-compat-4.0.2.tar.gz 63771 BLAKE2B bcf66825c52de63172f7d36b696e136cc203201743e482d1aa78033664de49120a1304c6397e28dc56205fbe1b5f382f86852bc735cd879151df1db3ebaa1c1b SHA512 6332e12dc123bea6307a5306bb44357507e8c60f5699e8a09a39f9cfe44c649cfd8150b3a4687b47bc62bd95a7bdc4801cac01e10870df451f23ac2e278414e5
 DIST ansible-compat-4.0.4.tar.gz 65116 BLAKE2B 3f96e052cb9ba0352884fe1cfeacf9a1e5a7bbee715d08c054df49112966751067eb08f32b0598a8559e200fa9c3a619b58b854699342b6185bd9579bc75cbf2 SHA512 b13bc3d7a29b2caebfddb7a2311bfb8ad94062019238ed5a8a22fe9de1c00d25426694755cdbf289094db7fdfd88248fcf3e17e9aef9601046ef33c25d6894e6
+DIST ansible-compat-4.0.5.tar.gz 65711 BLAKE2B f40e87012dba936ba8b6f204559484ff089034123da4c355f997d7cec857efc64adcd0a4ec9abe021a428f61c692b13a3e3146f78a1896689c61764286e03719 SHA512 c08bbbcbef7e49001009cbd691dc226626f1392dfc5a5be89166da0be91c8d5794a2e6a158b11787320a1dcbe24c85eedee28596b0fc27d0a3c2a499286f5efc
 EBUILD ansible-compat-3.0.1.ebuild 1527 BLAKE2B 96e2661ff15393733d6b14ec2c3a3e80a1088c6091c4c18ae890e63209c89da545c9dd6ce43a758d7657172bc99ed337b7cd9854932b1ed5f90c5b1a846e0f01 SHA512 e00b04aae139353bac04b38ca8af9831aa20cba91ca222b7f729079f620f1dcbab67d67b7a55c183ba0908ad9bf2d502cfbe2d934db4ac2075d480c6b37d770e
 EBUILD ansible-compat-3.0.2.ebuild 1528 BLAKE2B fb819f9adeec567dbbd6c0a19a0fcbf5ac8def5e27f74a7817c76b693307955dffa8ec19c77aab9cd2805446bb15ec2190f88459468c065ac19c5b2707a5146c SHA512 bc9ff6367d7808adf885ebe207a0660adbe09b9a5623fe4a9c596838fb90e78a63fb49efd8c0b8b953f6c19317a1d00cd42f41ed6019373b0f049e075eb0508c
 EBUILD ansible-compat-4.0.0.ebuild 1528 BLAKE2B fb819f9adeec567dbbd6c0a19a0fcbf5ac8def5e27f74a7817c76b693307955dffa8ec19c77aab9cd2805446bb15ec2190f88459468c065ac19c5b2707a5146c SHA512 bc9ff6367d7808adf885ebe207a0660adbe09b9a5623fe4a9c596838fb90e78a63fb49efd8c0b8b953f6c19317a1d00cd42f41ed6019373b0f049e075eb0508c
 EBUILD ansible-compat-4.0.1.ebuild 1528 BLAKE2B fb819f9adeec567dbbd6c0a19a0fcbf5ac8def5e27f74a7817c76b693307955dffa8ec19c77aab9cd2805446bb15ec2190f88459468c065ac19c5b2707a5146c SHA512 bc9ff6367d7808adf885ebe207a0660adbe09b9a5623fe4a9c596838fb90e78a63fb49efd8c0b8b953f6c19317a1d00cd42f41ed6019373b0f049e075eb0508c
-EBUILD ansible-compat-4.0.2.ebuild 1528 BLAKE2B fb819f9adeec567dbbd6c0a19a0fcbf5ac8def5e27f74a7817c76b693307955dffa8ec19c77aab9cd2805446bb15ec2190f88459468c065ac19c5b2707a5146c SHA512 bc9ff6367d7808adf885ebe207a0660adbe09b9a5623fe4a9c596838fb90e78a63fb49efd8c0b8b953f6c19317a1d00cd42f41ed6019373b0f049e075eb0508c
+EBUILD ansible-compat-4.0.2.ebuild 1527 BLAKE2B 96e2661ff15393733d6b14ec2c3a3e80a1088c6091c4c18ae890e63209c89da545c9dd6ce43a758d7657172bc99ed337b7cd9854932b1ed5f90c5b1a846e0f01 SHA512 e00b04aae139353bac04b38ca8af9831aa20cba91ca222b7f729079f620f1dcbab67d67b7a55c183ba0908ad9bf2d502cfbe2d934db4ac2075d480c6b37d770e
 EBUILD ansible-compat-4.0.4.ebuild 1528 BLAKE2B fb819f9adeec567dbbd6c0a19a0fcbf5ac8def5e27f74a7817c76b693307955dffa8ec19c77aab9cd2805446bb15ec2190f88459468c065ac19c5b2707a5146c SHA512 bc9ff6367d7808adf885ebe207a0660adbe09b9a5623fe4a9c596838fb90e78a63fb49efd8c0b8b953f6c19317a1d00cd42f41ed6019373b0f049e075eb0508c
+EBUILD ansible-compat-4.0.5.ebuild 1528 BLAKE2B fb819f9adeec567dbbd6c0a19a0fcbf5ac8def5e27f74a7817c76b693307955dffa8ec19c77aab9cd2805446bb15ec2190f88459468c065ac19c5b2707a5146c SHA512 bc9ff6367d7808adf885ebe207a0660adbe09b9a5623fe4a9c596838fb90e78a63fb49efd8c0b8b953f6c19317a1d00cd42f41ed6019373b0f049e075eb0508c
 MISC metadata.xml 510 BLAKE2B 3f47270866cb9acc5944b71547640b69003891268ffc07b5cd10e6ba8842b6f644ab4dea3b3da2d20b17f34d90e565b6f03a4dbb8ea38fa282fed283ac22fac1 SHA512 65d8604e46581bf9ecb3d8e358f3a211b18c51beea22c92a1cd3668ba86140e3bd8d91a38c221e73fe13a3e0da1cbfc2030b3f7733ee55e045530b49cd77d46d
diff --git a/dev-python/ansible-compat/ansible-compat-4.0.2.ebuild b/dev-python/ansible-compat/ansible-compat-4.0.2.ebuild
index bbea175e5664..a7845cd7c34b 100644
--- a/dev-python/ansible-compat/ansible-compat-4.0.2.ebuild
+++ b/dev-python/ansible-compat/ansible-compat-4.0.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="
 	>=app-admin/ansible-core-2.12[${PYTHON_USEDEP}]
diff --git a/dev-python/ansible-compat/ansible-compat-4.0.5.ebuild b/dev-python/ansible-compat/ansible-compat-4.0.5.ebuild
new file mode 100644
index 000000000000..bbea175e5664
--- /dev/null
+++ b/dev-python/ansible-compat/ansible-compat-4.0.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 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..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
+HOMEPAGE="
+	https://pypi.org/project/ansible-compat/
+	https://github.com/ansible/ansible-compat/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	>=app-admin/ansible-core-2.12[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.6.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/subprocess-tee-0.4.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools-scm-7.0.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-plus[${PYTHON_USEDEP}]
+	)
+"
+
+# All these tests attempt to connect to galaxy.ansible.com
+EPYTEST_DESELECT=(
+	test/test_runtime.py::test_install_collection
+	test/test_runtime.py::test_install_collection_dest
+	test/test_runtime.py::test_prepare_environment_with_collections
+	test/test_runtime.py::test_prerun_reqs_v1
+	test/test_runtime.py::test_prerun_reqs_v2
+	test/test_runtime.py::test_require_collection_no_cache_dir
+	test/test_runtime.py::test_require_collection_wrong_version
+	test/test_runtime.py::test_require_collection
+	test/test_runtime.py::test_upgrade_collection
+	test/test_runtime_example.py::test_runtime
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/antlr4-python3-runtime/Manifest b/dev-python/antlr4-python3-runtime/Manifest
index b520956bad74..0a5841699922 100644
--- a/dev-python/antlr4-python3-runtime/Manifest
+++ b/dev-python/antlr4-python3-runtime/Manifest
@@ -1,3 +1,5 @@
 DIST antlr-4.12.0.gh.tar.gz 4408352 BLAKE2B 9a7ba9149c459e5b6a7eec750d1623f10be4aa119479d93dbf7f3955176013ac3e56d3a95399460ed5170cf2bf01fff586852a84d2cb86fe04e89846211e39cd SHA512 2217509e8766ceee7b9e5fdee3a9972b1f42fb442bdf3e3c0a8027f88bc49508386adb5ea8a02c982ef2176e2b5e60669746a387ec426682d7f43bca28aa4b6f
+DIST antlr4-4.13.0.gh.tar.gz 4317288 BLAKE2B 7971b12a3d3fe50f50b9888a4de9cb7fdc28140c95a29fe00538a48da3434ec1c38643e7a1eb19457e0363b7e57747f5597081af59f653f7108f26f6515d8f35 SHA512 947ecca28712aa4dd98d7b7e0753e91881e55642f7951ca65a576b94db87440767a1b93d08e82db69ad527ee28bf89f0b2f9c0aaa604a999a7e48c163764ee12
 EBUILD antlr4-python3-runtime-4.12.0.ebuild 635 BLAKE2B 2735bfaf0c54010519543bd64717f438e7a245ea14ed5e5f13ac7d5bbc431e0ad8d7e0d86d1ff848de10fdb2660157b507ca04110064b5b940d3832d334cb825 SHA512 f0920d4ac576fcf0cb15662d7457ed5f8ab4b48e7391dbab219c2ba4f37cc6cf3889fd511a66e53427c565a33b36df7573e04bd5e3c68a133c25860b5000c2f4
+EBUILD antlr4-python3-runtime-4.13.0.ebuild 645 BLAKE2B 61e4c24861ec9b1e1acb51441baa3d02ad7e59fcd11138a3aba1787b25712979bb2622eabfc14a95ffa79a344507fa788e5200da0bcbd01671967ab083313c8f SHA512 ddeddb3cb515cc5abbb6019a3d6fb6390485e50ba388c991ced1e3db8036d7e9ae0663e508572b4c0cf7a14d279c2dcad4fc457ad4105f659012f7f6dfd61162
 MISC metadata.xml 475 BLAKE2B 12dd34c09572017544a99c3985f6a7ad6c163f999f43fbc7ef4903456fe2d7fc59a8571fa3337ebe5a49eb6efab0a657a1b82b484b55887c799af11c0e64e716 SHA512 44ddd959d9f77d7beb97f84888db46ca468ed79ca844f89bbcac57366f42e1c2a1689497e2c25a659d2a63026b3c85f8348a43ee0213573d4a85cbf77fdfb993
diff --git a/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.13.0.ebuild b/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.13.0.ebuild
new file mode 100644
index 000000000000..31dcc7c87016
--- /dev/null
+++ b/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.13.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+MY_P=antlr4-${PV}
+DESCRIPTION="Python 3 runtime for ANTLR"
+HOMEPAGE="
+	https://www.antlr.org/
+	https://github.com/antlr/antlr4/
+	https://pypi.org/project/antlr4-python3-runtime/
+"
+SRC_URI="
+	https://github.com/antlr/antlr4/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/runtime/Python3"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+python_test() {
+	"${EPYTHON}" tests/run.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/dominate/Manifest b/dev-python/dominate/Manifest
index fefa6952bff1..55f0171c5937 100644
--- a/dev-python/dominate/Manifest
+++ b/dev-python/dominate/Manifest
@@ -1,3 +1,5 @@
 DIST dominate-2.7.0.tar.gz 36351 BLAKE2B aae802626a9e7f6b6f45f39a5b2cd6a6846ca42617e9a5ac5fe8e4a871e8ecfb89124e079313838c6f098ea5107a904d230808eda29cb05293e18ef4bdaa2504 SHA512 8ecca393548bd7c39b5d1800fee94634a60e4e12db44e16df316c9e0f5f04dc6c91e11fbe242d3c6dade3a5e09bec7e3becbfd4f8eaa58f9a8fc7ee15ac3bf31
+DIST dominate-2.8.0.tar.gz 37089 BLAKE2B 651ff9ee21c4f5331ef990acfead146f816fc45309740220f68714c3accf7b98661a31400fe050c6b2119525749e9a132f8764d60b72661f7abf5246ebdb5835 SHA512 91b392af8e081dcf0df9f09aabe2cb4d8147bb07a398c5f9f06443fc2664d881afa372c8d4d0583b21e9f9bf687d1d14601e96a33a8ae6e099e1e039821f97df
 EBUILD dominate-2.7.0.ebuild 468 BLAKE2B 93cc053d7fccab994bca094f652791d5f527e6f6b3d837153ce4d9d70e158c30712659ce06198cf77012c4aaab58dc4dcffef7cdb1e013cac9af9a747e77248a SHA512 5b501c512983cf2a9b7f48ade8ab273a38853225467ae01257cb6bde04f74deb05883537f2a62d2df0d61c563c52ea6249548b1f2e42d45cf648bf82b23810c4
+EBUILD dominate-2.8.0.ebuild 471 BLAKE2B c98a5bf926eda0c840e71490cb27aa9bb4af225fd868b3a913ef8c093b3f1c3d6ecf84a5efe6d5d195ce4dbbcc2bbc3481ba3d69929407e44a135d7357f564bd SHA512 51d379155fe2a7097ddf1124a1be07473d575eff9426ed976c985fc2721cd89356060a1841141104f47d9b05fda28c7337ce7d52da686ff290931610e88e57a3
 MISC metadata.xml 796 BLAKE2B a6b8a73d12e14552aed0f4b4f2a4b5ff282829d44da6a3e283a04575bc31069d5e83a0f475d184896c586b416882507fa22ccfb346aec90692a47f28ea54646c SHA512 9a018dd4858f7a89ac7cfd8b1814df9bb24ebe9e811f0f98e2fe52f047b14bf742648de9c0e4ce55ff69434755d8b365297bd41a5909c63697eed925e1a30b03
diff --git a/dev-python/dominate/dominate-2.8.0.ebuild b/dev-python/dominate/dominate-2.8.0.ebuild
new file mode 100644
index 000000000000..939bdd20dd38
--- /dev/null
+++ b/dev-python/dominate/dominate-2.8.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Library for creating and manipulating HTML documents using an elegant DOM API"
+HOMEPAGE="
+	https://github.com/Knio/dominate/
+	https://pypi.org/project/dominate/
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 267aa194d60d..d15d2b587e34 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -4,6 +4,7 @@ DIST fakeredis-2.11.1.tar.gz 94897 BLAKE2B 18798d30eccfbedd70d13fc4a9883d2ab4b06
 DIST fakeredis-2.11.2.tar.gz 95532 BLAKE2B 5edda6d3573bd589c8144664dbf115f257b68f59f002d92766b4c9ce1a9adcefe727812835d01d4efa42676056e9c050175c423cca166f1063e4ee1a6784ee94 SHA512 a5f0428949f3527fc189ecf4744f2f2310fcb114fdeb718299608defe7dfaeee9720d84debaa1e0e0eeeff11f6426e72452b3e7e772690aa48336996ae5a8716
 DIST fakeredis-2.12.0.tar.gz 95952 BLAKE2B 87e27851e2c68c07871990e3b1e73c2c614a902a4e086753308f2abcf01cfe08532c1c04136ebb1fa5aa36ff8b36616fefe70ab3b59860d15e89be5af83d1a9d SHA512 a4c1eb27cb846a769ed5fd10966df77064d0598f7b556c36c0ea48cd298c261f222601a0071652ec279b03e04537aac211710edf1597f6d57a48ca3a53e9a7aa
 DIST fakeredis-2.12.1.tar.gz 97486 BLAKE2B 5207d9b946eb5720083b045e29b960cc2eb3ab5ed7b633f00106d0777186cfb02ecc10607d24a67d7b2eded35915e6710a4880f560e49fbca470c487ec0a2b87 SHA512 99e4e0bf7a4be9cc9dc96eecfe2fd1f106664bab2eff4f575468933809cf306c36237ebc9d86efdd9c0823e05a08d466f35a7e43359602b47c582ab16d7bb7ef
+DIST fakeredis-2.13.0.tar.gz 98084 BLAKE2B c147332f2575be7f63aef48199920480d550efbadeee9de255b17cb9c7d6791a059ee3d4bdc500ecf44dcc22de6fdd11d170daf3e19de8e910833b1de12232c6 SHA512 30335e456f7ac2498fc175f9fd154a766064a05e6eb996df9d533412525a3d4279c9359ac5e43a2b9ec9bb1d653639aa10d4e1765a4e4c1bc84f764fa1efdb42
 DIST fakeredis-py-2.10.2.gh.tar.gz 159702 BLAKE2B ec385c01af9e32705435148c1c61d74c14d7b22a60b6a3466f1831f557bfe997af6ee96429cfdba00a1328db3cabe1579d65411e7c2b9972e5421963cd66815b SHA512 2a3a87dcbe136465ff0465585562a5b8b0bc73504f491d3ec9c6e959b6cffaa3edbaa1c2e5199138f7a49dfdec3c3da6a2ae338228a8fe21c670a82c062c544a
 EBUILD fakeredis-2.10.2.ebuild 2074 BLAKE2B a7b846d0c3c1fe583b23c67be351c79294f20dc5aa5f48778f4a5e41b70ae769bda7ecda91024f242fa9e69032b394d50ec97826859adadb49593fbb3c749125 SHA512 ae431a20449fd016cfad1c67cf953d62343ba9a91ed79211cf7c6c2a9157df77f0671710825da26bff3215b011e5d68a967e4ce9b80799d91cbde35c1acab2df
 EBUILD fakeredis-2.10.3.ebuild 1903 BLAKE2B 9235ec04001d8088f7257dfe8d44a62dd14f1bcf92b7fbc7c8815f395e7eabf8db8c06c95f19530b14bfb1fc14b3080937d6b0c430bb6608fc010d176be8f470 SHA512 31c30a29c8e775fe2d7b2893a28411b752fde2ddbd145959ba7e265489cf682c89dd0c5a3d560ac98da99086d5c17d18846c26c0f5f284858647ebecb3068322
@@ -12,4 +13,5 @@ EBUILD fakeredis-2.11.1.ebuild 1903 BLAKE2B 9235ec04001d8088f7257dfe8d44a62dd14f
 EBUILD fakeredis-2.11.2.ebuild 1903 BLAKE2B 9235ec04001d8088f7257dfe8d44a62dd14f1bcf92b7fbc7c8815f395e7eabf8db8c06c95f19530b14bfb1fc14b3080937d6b0c430bb6608fc010d176be8f470 SHA512 31c30a29c8e775fe2d7b2893a28411b752fde2ddbd145959ba7e265489cf682c89dd0c5a3d560ac98da99086d5c17d18846c26c0f5f284858647ebecb3068322
 EBUILD fakeredis-2.12.0.ebuild 1903 BLAKE2B 9235ec04001d8088f7257dfe8d44a62dd14f1bcf92b7fbc7c8815f395e7eabf8db8c06c95f19530b14bfb1fc14b3080937d6b0c430bb6608fc010d176be8f470 SHA512 31c30a29c8e775fe2d7b2893a28411b752fde2ddbd145959ba7e265489cf682c89dd0c5a3d560ac98da99086d5c17d18846c26c0f5f284858647ebecb3068322
 EBUILD fakeredis-2.12.1.ebuild 1903 BLAKE2B 9235ec04001d8088f7257dfe8d44a62dd14f1bcf92b7fbc7c8815f395e7eabf8db8c06c95f19530b14bfb1fc14b3080937d6b0c430bb6608fc010d176be8f470 SHA512 31c30a29c8e775fe2d7b2893a28411b752fde2ddbd145959ba7e265489cf682c89dd0c5a3d560ac98da99086d5c17d18846c26c0f5f284858647ebecb3068322
+EBUILD fakeredis-2.13.0.ebuild 1904 BLAKE2B 1c96401debe06b65561182a33d3501253a479ff23e15c08e2926b4b4689cdf43bebababe71be70af78d62716dfe8727078428960fd96a2381659b0e325191cb4 SHA512 a257aaeb308b79dab0f94e6accdc0b3fa0644983ae2e15c80c32a7f011e6e4be48be06325eceec7d74effe3ee67ee8445f679a65b6654808601e4d9c5f970c75
 MISC metadata.xml 373 BLAKE2B 1de33db59658e6190cd0346be58208cae6c9143a52f49dc289e68aaa0d860b5bd68dfb54f2e0b005f60a67f5caa430e2ce94fc69e64bd27e1bbebb07ad29e602 SHA512 24bfcf4919363fef45c182b6de66221e580ee0e9e99ce46e91b767655dc0b6f8a9fa6c3512ba84d1040698c43a0b6a853ad8d63c1ee5fbc00a1d192defb24db5
diff --git a/dev-python/fakeredis/fakeredis-2.13.0.ebuild b/dev-python/fakeredis/fakeredis-2.13.0.ebuild
new file mode 100644
index 000000000000..145808fd6437
--- /dev/null
+++ b/dev-python/fakeredis/fakeredis-2.13.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Fake implementation of redis API for testing purposes"
+HOMEPAGE="
+	https://github.com/cunla/fakeredis-py/
+	https://pypi.org/project/fakeredis/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
+	<dev-python/sortedcontainers-3[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# also lupa
+		test/test_aioredis2.py::test_failed_script_error
+		# TODO
+		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
+		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
+		"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
+		test/test_mixins/test_set_commands.py::test_smismember_wrong_type
+	)
+	local EPYTEST_IGNORE=(
+		# these tests fail a lot...
+		test/test_hypothesis.py
+	)
+	local args=(
+		# tests requiring lupa (lua support)
+		-k 'not test_eval and not test_lua and not test_script'
+	)
+	epytest "${args[@]}"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/fastjsonschema/Manifest b/dev-python/fastjsonschema/Manifest
index 4f4ae3b2d1dd..81fd4f6f635c 100644
--- a/dev-python/fastjsonschema/Manifest
+++ b/dev-python/fastjsonschema/Manifest
@@ -1,3 +1,5 @@
+DIST fastjsonschema-2.17.0.tar.gz 370871 BLAKE2B 9d5f16dba7c8519d5bb4853188ba982e06b39a2c1689963ef3aec39e2d48cccbba7ba9ab93cf1b54a06f4e8107917acdb31b076f44b7baf9e9a432256a2f2844 SHA512 ee19945c489b9d4fd23a0a348ec13f321705e93e1367c04003c41b86abd92da2ac73ca6dcd46a9eba0b8b72e8ba899a00939d8a56059fd04eac4300e20589551
 DIST python-fastjsonschema-2.16.3.gh.tar.gz 392011 BLAKE2B 04990592a2bf6e1309bf725361ef7c2e253c4765c5b9d60805c5e6189f14885a3b0bae98945c2fe228adc335ca8c8c0a243b283b24fa447238d6415d439288e2 SHA512 2e26f31f9c6966e77f70b8ca584e672d554219b6bbb4811e3ac8dff1c693b2638ef08b8b9011e0db6f739be02e2f41a35d15bcfc42a9cb06ddb4521e51f37d8a
 EBUILD fastjsonschema-2.16.3.ebuild 735 BLAKE2B 94bcee2f1a4811ab16315197b74e60bcc5232848006a58e442f4105441c1e1552a8d4b8904b605762e32e22717cdb0620b53ea5ab3d1cc13734324dbd8de0d55 SHA512 1eb0f21c326f933c4a61fa576036e81b0ee8b37c2a81eaaba59b282bf3aada26f11e1b16a814bcd195631ad65117b780404e249c4698359e039a54a0298b912f
+EBUILD fastjsonschema-2.17.0.ebuild 731 BLAKE2B dac3bc41fefaf9810d9dca3aeea2e2fbbccd919bb58abc7a7e4dbd1f1544ce5fa1d3f4e74fe2e66adb00a8fdfd5943e8e3333264abe0cf23e0a77a5e3d70fff1 SHA512 33bb631f534909bc482e4c7f4fbdda6be0405cc6c93dc843f0e212e09efb8d2660fbb920fde0910265f1c08c98609d3b2b2ee01557371a2202d4f2515d1de0f5
 MISC metadata.xml 390 BLAKE2B d29071ddcb0aea8db343c2924de51e8fdbf9295898c687ca0f474e007007407c9a402cd2fa74f0f2142dfb2f14a2cfd0c51c05f5fad6891734328a003283821f SHA512 db3339aaba0218ebea0ea4cd5b950dbf74572b18341f595fbbbe1f67c0c9c23413f4a98aeec5b49b036533cfea46e8f2a74f5f999c3b4c472a66297346139b05
diff --git a/dev-python/fastjsonschema/fastjsonschema-2.17.0.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.17.0.ebuild
new file mode 100644
index 000000000000..9a16ce7b1b94
--- /dev/null
+++ b/dev-python/fastjsonschema/fastjsonschema-2.17.0.ebuild
@@ -0,0 +1,32 @@
+# 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_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Fast JSON schema validator for Python"
+HOMEPAGE="
+	https://github.com/horejsek/python-fastjsonschema/
+	https://pypi.org/project/fastjsonschema/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	tests/benchmarks
+)
+
+src_prepare() {
+	distutils-r1_src_prepare
+	# stray directory?
+	# https://github.com/horejsek/python-fastjsonschema/issues/173
+	rm -r tests/examples/lengths || die
+}
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 9c4926e3fdb3..bbbc1d72400e 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,7 +1,9 @@
+DIST moto-4.1.10.tar.gz 3553976 BLAKE2B 1b6eb1a8defe5cf8cab0bb2419c469dd2251dbbd76597103cd8185ac0488210ec2d4b18268f72bfec4139f82f7f1b10936de7c2f8f9e766f5bb98b6b26164160 SHA512 c45955ead56746f42613defe683c05f787c20222914b0f44503b538c5937d32e3ffe21b25271e5ef614a628e51451451d04806de2167c83c6503bde2a2d9cbee
 DIST moto-4.1.6.tar.gz 3470215 BLAKE2B 78f9c54128ba71fc5e3ba622be0596490bc82df0a17fa80d9f11bf135bdc91d9698cc29445b5765e6057e80f221c016ca8999186201b83b5f929f5831c417f60 SHA512 fb2dc73a66326216a4c5338660dab844de9a46e6626e0ef68bccb3573a3eba693b30b89961b019a4b7a51207ab11335e73cbdf523c75d91a5a9625a1bc409e61
 DIST moto-4.1.7.tar.gz 3506753 BLAKE2B 76e38629f1a772816bfa647b90e89e3c4533cd36fa5a8a26e026229dd1dd8bf1cea404f99c85784a6eefa9173aecff7b88ba1ca7b3f890407c2ad7ef29106fac SHA512 3b20d2a535654cee22c909e19eb492e3b4b8fd382d26367c12cee00128dc4d1ea5228ccc97d40a01c5c2707ff3ca1039644268c47c525c79a9b68fc7ee78541c
 DIST moto-4.1.8.tar.gz 3520127 BLAKE2B 623d97dbec357227ea401ac98f694eaaa129fcb47f6b160a22bf95f8d52facf9bb3917e00409990a7e447e70de5a94df9f234c3ed615081573169f3976169f3d SHA512 9c3e9825d1e8d09e278f8bbeb11719c4bee756f9e95b2edbe82b4ffbd3acb93008f6ffdc582eb46619104d0b839428b5e8078ef0e341a3b73f0bc61a7ebf806f
 DIST moto-4.1.9.tar.gz 3537033 BLAKE2B fda091585fd331ff68127290426bb1f5418b118b9d60711ca54bcf57b1ff4375320bb3f3ae79321d105e815d856183b7f3c012f20c07f357831fb8260dcbd9f1 SHA512 1ce3aa3549b6320a8493f7018ccdc630f94cd324791e91c2ce28a994dff8da37058c47c84f480dfcad870ef63a0e1d35712348b120c112696b8d9cbce66186a9
+EBUILD moto-4.1.10.ebuild 5250 BLAKE2B 9ab89402932854460dc87ec02146c387994cdd636e32b2afeacc4a97259fa329a4d09b8747ec0408b56d72bcd4672280eb907e09165f9ee10e945a1d1ac585b2 SHA512 412e31907bf1bb60aacf30f6ca933624dbffe26387f5a09bd374edaf38ec83cbe330ae42f98517bc81f0fe60c62a8de51e1d0839e8c1ac5343a9bde718f33cbc
 EBUILD moto-4.1.6.ebuild 4659 BLAKE2B 411cefa61ab88bce085a2a8ede1e1b316fb9ac27d65e264b76c7f167a54fcce5189a69e3861450376af9835188194abd827e9612e800bb1d1d3410c99aefca1c SHA512 d9e7ff6a9b1869c51598f433b96941776f6ea13bf8bd74704763aa6f61b309ad19beb9b2755cb72f0a5c51acd1feee90678297ff3239efb4c04042bf8d834dab
 EBUILD moto-4.1.7.ebuild 4661 BLAKE2B 9454c9ea666e3bbe95d622058669fb581b48cfaf2da1e4cc562443a6ff43ee9d50f4872099c4f5753da68de68bc940354ec12574ee8e9063b85c55004ba565d0 SHA512 9119cad8356a93c6ec5595ba39f920882bba240a1333ff8f0a255a14519c40baaf03cc0f7bc97befa3d60c7475c5b0234a787f129fcee457d4a80bbdf151162a
 EBUILD moto-4.1.8.ebuild 4760 BLAKE2B a5c7e663ce55d837e892b20fa1b194d070bf36d0910512b04d06a35ad3cab86cba33cadbd1831b498390fafe6ca04e079b90ae34da2ee08f6fb1f98dd92a162d SHA512 960328a8e397fa9285135322814bb6d952e8244636afe942868ecde18e129b7b8c1e071d24a025d683bebf6bf96d17e0f483515547011233e60bec2eebf7c4c5
diff --git a/dev-python/moto/moto-4.1.10.ebuild b/dev-python/moto/moto-4.1.10.ebuild
new file mode 100644
index 000000000000..517b7e9209de
--- /dev/null
+++ b/dev-python/moto/moto-4.1.10.ebuild
@@ -0,0 +1,113 @@
+# 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..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="
+	https://github.com/getmoto/moto/
+	https://pypi.org/project/moto/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-0.93[${PYTHON_USEDEP}]
+	>=dev-python/cfn-lint-0.40.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	dev-python/boto3[${PYTHON_USEDEP}]
+	dev-python/botocore[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-3.0.7[${PYTHON_USEDEP}]
+	>=dev-python/openapi-spec-validator-0.2.8[${PYTHON_USEDEP}]
+	dev-python/pyaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
+		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
+		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
+		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
+		# broken code (local variable used referenced before definition)
+		tests/test_appsync/test_appsync_schema.py
+		tests/test_appsync/test_server.py::test_appsync_list_tags_for_resource
+		# Needs network (or docker?) but not marked as such, bug #807031
+		# TODO: report upstream
+		tests/test_batch/test_batch_jobs.py::test_terminate_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
+		tests/test_batch/test_batch_jobs.py::test_dependencies
+		tests/test_batch/test_batch_jobs.py::test_container_overrides
+		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
+
+		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
+		tests/test_core/test_docker.py::test_docker_is_running_and_available
+		tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda
+		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
+		tests/test_s3/test_server.py::test_s3_server_post_to_bucket_redirect
+		tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
+		# TODO
+		tests/test_batch/test_batch_jobs.py::test_failed_dependencies
+		tests/test_batch/test_batch_jobs.py::test_failed_job
+		tests/test_batch_simple/test_batch_jobs.py::test_submit_job_by_name
+		tests/test_core/test_environ_patching.py::test_aws_keys_can_be_none
+		tests/test_core/test_mock_all.py::test_context_manager
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_queue
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_fifo_queue
+		# require py_partiql_parser
+		tests/test_s3/test_s3_select.py
+		tests/test_dynamodb/test_dynamodb_statements.py
+		# broken by new urllib3
+		tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_s3_upload_data
+		tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_s3_upload_file_using_requests
+		tests/test_s3/test_s3.py::test_upload_from_file_to_presigned_url
+		tests/test_s3/test_s3.py::test_put_chunked_with_v4_signature_in_body
+		tests/test_s3/test_s3.py::test_presigned_put_url_with_approved_headers
+		tests/test_s3/test_s3.py::test_presigned_put_url_with_custom_headers
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# note: pytest-xdist causes random test failures
+	epytest -m 'not network'
+}
diff --git a/dev-python/pypdf/Manifest b/dev-python/pypdf/Manifest
index 5a446832823d..807ed88f60eb 100644
--- a/dev-python/pypdf/Manifest
+++ b/dev-python/pypdf/Manifest
@@ -1,10 +1,12 @@
 DIST pypdf-3.7.1.gh.tar.gz 7508532 BLAKE2B 917eb7a825781f966d6b268cf3471935b9d245de5465acd428f87cc387a01bf1739d1cddb504498e4e7505a098508a1e12d686ad21ef73960f11bcddd4acca57 SHA512 5834a5738860c341e231a0ba79d9ffbc14d1f683bc781793d962fb8303aac5e6ec825492cd2e470d47fdd166576c5c4be64bbb7a03f7f79b160d456667ce8f15
 DIST pypdf-3.8.0.gh.tar.gz 7509837 BLAKE2B 2acf12b5c43799252641f2c7d0ebd24c1f1eb02b655b0c458eef1049b660452967ff613e17b2eb70330d67677860b58b0f8f99d3af2c2794c4aacb30646b3244 SHA512 a4f33c8f940303958221a48ffbf088c363d7cf9360d5c9d27829b5703735216c32af63262313a25598c3479c4584999a23ac6bf77daa701042ef65314194dab3
 DIST pypdf-3.8.1.gh.tar.gz 7516880 BLAKE2B 87d8cd66c7efcf9624205da904290fe82f51eeb9b521903ec564467755cc9a824ab0660a41d0cbd4a1ada2e20b4b35e16ce3a73a9933aea9fc5e0f315e613709 SHA512 8b78ccc210b8f34b9556cf69cac8f2af207de9a42840a0b4c822c0ab2c0b2d468c5c20a14704d3f54c6b57bcc451c3f0b7ff54b8149616b539cb07be57482e58
+DIST pypdf-3.9.0.gh.tar.gz 7516907 BLAKE2B 12c0a13ee1ca897966bcd2f6a93b50ef1ead8d471ac9543544988a9c03c26a135a91c07b443d3a7b89fd38c302f5c2323994407fdadc23638832ca07eb7571fb SHA512 da9489bfd7c91c497852ce71050548d99fbca8118575c5eec85d55611fdafbe471c1cf7c4c8ef0e46165a89771e557c868f133af325d4672ba897fffffd43c02
 DIST pypdf-sample-files-0c3b1d3879c5cd7d913b3d931fa33b37529d7346.gh.tar.gz 9028862 BLAKE2B 7c72b76724e7b0fb4069c3151c13342d66cc451f398f6826b09dfb5b57e2d2b625118de1f431b5759466c4e6afb5d0c8682c4c28ec2f3b700a6cc39787ec6ecd SHA512 342562a711673030eb729135f27c241f5f37305b0d6f30f555667881e921089b801a3376330d840b16d4a3683d0b6f07824d05e4d208d32a3771ca83a0b7f22d
 DIST pypdf-sample-files-69b31cff6b183a42f9081709ef9bee4047976f56.gh.tar.gz 9044391 BLAKE2B 9a9bcfbacabf3c80073a440f54736728cba4ea92d1a817ce98bcaf9375340d95e453f45207f53ac878ef5c13bc4ca7d0d4488b79f205f396e960ed042680ca01 SHA512 32b4572d60a0aadba02485f11c84712c1f5f0a75f7acd6fb27f1df00cb2a8ae338a1001e6519f66c248efbd129aba1a2ad568e930ce90bd542c8dc58f383386a
 DIST pypdf-sample-files-d3d250321b01ca1194e16a814d24508897862fe8.gh.tar.gz 9030851 BLAKE2B 63e5778763315aff0753e5a0f06cd55432a494efea921c73e765567aee63223af3f3d81436e22d089008bc38c917e10eb5da7988abd458fd3f3488e8faeed70e SHA512 a8e77982ad78aeb58db7a5a722c9e072d7c55bca7290f448ba388b70256137fc6b9919c8079d8b548407c88b8befe7caeeb65217eb52b6d9bbadfaf652d89e0a
 EBUILD pypdf-3.7.1.ebuild 1244 BLAKE2B 8c2819e81ae84367249159d59d5e84b195cfe6b56231ed951013587ab590955eba32c9cd617102b4512c563aa2aff98ad5079a882f0732a7f90aa5db94273cea SHA512 37da32e5960bd2dddbd48f57a16a61aef53d2203249150a3cc16346eac5da407cb8b5ef5427e21863f18ceb820d9cac707d92e5984232e1594706c5676b4e61a
 EBUILD pypdf-3.8.0.ebuild 1246 BLAKE2B e4b19bf9823f78ddfb327f833029544b4a7caca2d2e57f345d7f3505d69069849c26f0de4d746bd2f66bbacfd435df513459d56a75e138d246d30c833d5814c2 SHA512 5250526439080843fafd200cc17539517c93912ec572d715bc5814bb228ef54710886d9b9755a297199008954ff6c8cb3b79752bd9a9dda344bc46930965da6c
 EBUILD pypdf-3.8.1.ebuild 1246 BLAKE2B eae2042e379ef70d2f89be49be667604f37acd66778b01c9bc616bbafd82ed9b72077b0fee0f90f85df386a7c78d228932e85e7fbec5c3698407e25f53c11bcb SHA512 c7388c89acae984f7e44161686b7ba9e220ecd30d8ccca70b727ca9f056e8bc7cf51e2e2b46060cad045fbb5781223e980473a49221768eeb8e011f7ce9277ec
+EBUILD pypdf-3.9.0.ebuild 1124 BLAKE2B fccd0718b71a7f371e4396b4810c837825da6f52990eebb0064e1681f69ed7cbb69f175e0722c68cc9362097078ca00cf250079044b36d6e939dbfff8606d607 SHA512 a72655620654cc51059c3fd15ba390b963fb835fb5d3fd46a0453e28e0223a5955006edfa9251c135af17bcb9f93aab9e5bb3072b053b21c0d3e9c8fe1bf85d1
 MISC metadata.xml 373 BLAKE2B a829b7048eb3a95caeb1be83b6172603df6a031d40995294f2687bf3c3cb70e66fafb9ba8339d9979fc85f5936b9552963a8fcd072a20661fa78f3aa3c4b89c0 SHA512 775ac2de487f11fba1ea8d283b42b9ef56e42cd95ea11f50a06b099420e69c0567f65c506b14891ac641da90ea05ca70da4f8a3e4a028cf41bdbc823021dccfe
diff --git a/dev-python/pypdf/pypdf-3.9.0.ebuild b/dev-python/pypdf/pypdf-3.9.0.ebuild
new file mode 100644
index 000000000000..c3e628bb375b
--- /dev/null
+++ b/dev-python/pypdf/pypdf-3.9.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+SAMPLE_COMMIT=69b31cff6b183a42f9081709ef9bee4047976f56
+DESCRIPTION="Python library to work with PDF files"
+HOMEPAGE="
+	https://pypi.org/project/pypdf/
+	https://github.com/py-pdf/pypdf/
+"
+SRC_URI="
+	https://github.com/py-pdf/pypdf/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
+			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
+	)
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+BDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# rely on -Werror
+	tests/test_utils.py::test_deprecate_no_replacement
+	tests/test_workflows.py::test_orientations
+)
+
+src_unpack() {
+	default
+	if use test; then
+		mv "sample-files-${SAMPLE_COMMIT}"/* "${S}"/sample-files/ || die
+	fi
+}
+
+python_test() {
+	epytest -o addopts= -m "not enable_socket"
+}
diff --git a/dev-python/pytest-testinfra/Manifest b/dev-python/pytest-testinfra/Manifest
index 3f4439bd7abb..984d15a1ddbc 100644
--- a/dev-python/pytest-testinfra/Manifest
+++ b/dev-python/pytest-testinfra/Manifest
@@ -1,5 +1,7 @@
 DIST pytest-testinfra-7.0.0.tar.gz 79296 BLAKE2B b0870cbf466627daff0ed6a3063c15c9b725fab4009fc24c3779b56765901e6b8d3a42fce429f1e42151b78d61f52c38955772e562c74d78c717a61a5fe74f04 SHA512 507d7a434c2eb159e2c36b1be3d447e386d3a4e614f2717ed8add456358f644c18f801db6774a4854e4ec7936643febd332aa4096ab26ae0080aceeff420c78e
 DIST pytest-testinfra-8.0.0.tar.gz 83448 BLAKE2B e1dcd7f685183ad0d1c79f3fe7542797f2c91839faf79e2b368c0e330aec22a420621859d419f7816b72df4aad9ac9d5ecc99d257804311d6b8b77c20b5b833b SHA512 ee8e8df7ba0422ea60d55149495a682b88a62646b6b601dd95a135a5d3a131d5cc57cb0f0cc0ff7166d004758619283480e52b8507cc2eedbc25c46a16da60b5
+DIST pytest-testinfra-8.1.0.tar.gz 84156 BLAKE2B 169ccd6afc4260f3dd42c8eff8112395adc7216cfd3e5f7abeb9b9d3db0cd766465dd94a5ca500d610db469f0e51298b6fc26f3c0ffd27f2fc215d859c99e52d SHA512 2f98cc15952c5607ecc1db76bae90aa9d299951cd1f4c5f8ba6085a7f4e6babac7f4ef4e44e089829f7382139164259007125f505c18129cc7135b840d709931
 EBUILD pytest-testinfra-7.0.0.ebuild 1454 BLAKE2B 99d367bbee7868a9b20bc690ad8398ddce1c03c6ccf4ab78a53e95a704f1d2a7054fc7f123d7fbd66db0d668b30fb4bb25c8bdf1c829287ced0cdc34071210f8 SHA512 4a3d9f22069599696f8c594057a793e4cc87b9640a96a2290baba54fd11aa435efd0edd4e7146d9bb76f62e6c282158ce45466525fb02a3729a3c0222ce6bec1
 EBUILD pytest-testinfra-8.0.0.ebuild 1261 BLAKE2B d936c56d8662461d2d05629cfe95557fb3cc87ebd9ae6c03ea29ebdc88da0f8fc10708ff1bc72f80d5c3ff14dc94467ad25384c629ee311f570dacc21989dd61 SHA512 dd0530b7e16b2aeb569d676c80caa9988064ee8763f7cc7b98e489d85e64ba3d95ac7e752a1286e5929dd9b72d2152e12a2d3cd8f141fb16131e1f36fe4385fa
+EBUILD pytest-testinfra-8.1.0.ebuild 1261 BLAKE2B d936c56d8662461d2d05629cfe95557fb3cc87ebd9ae6c03ea29ebdc88da0f8fc10708ff1bc72f80d5c3ff14dc94467ad25384c629ee311f570dacc21989dd61 SHA512 dd0530b7e16b2aeb569d676c80caa9988064ee8763f7cc7b98e489d85e64ba3d95ac7e752a1286e5929dd9b72d2152e12a2d3cd8f141fb16131e1f36fe4385fa
 MISC metadata.xml 781 BLAKE2B e38dd6fa967258affb201d6474524e22124a1b8848cff08f3da88e97ff3e13597770c494ee040481967028ee4d82112fb3d38f1034cb7982288d859efe540a21 SHA512 b6c868e77d1202622086340ae284071eaf1b95948c84a8a00f06e819e72325346d7aa226931d1bb5a3f782f23656c1e65f4b21a74ee0cb70deabfd602f774e99
diff --git a/dev-python/pytest-testinfra/pytest-testinfra-8.1.0.ebuild b/dev-python/pytest-testinfra/pytest-testinfra-8.1.0.ebuild
new file mode 100644
index 000000000000..ac3689c80baf
--- /dev/null
+++ b/dev-python/pytest-testinfra/pytest-testinfra-8.1.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 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..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Write unit tests in Python to test actual state of your servers"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-testinfra/
+	https://pypi.org/project/pytest-testinfra/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+"
+# Ansible is called via its CLI
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		app-admin/ansible
+		$(python_gen_cond_dep '
+			app-admin/salt[${PYTHON_USEDEP}]
+		' python3_10)
+		dev-python/paramiko[${PYTHON_USEDEP}]
+		dev-python/pywinrm[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x EPYTEST_DESELECT=()
+
+	# This is the only test which actually fails if salt cannot be imported
+	if [[ ${EPYTHON} == python3.11 ]]; then
+		EPYTEST_DESELECT+=(
+			test/test_backends.py::test_backend_importables
+		)
+	fi
+
+	epytest
+}
+
+pkg_postinst() {
+	elog "For the list of available connection back-ends and their dependencies,"
+	elog "please consult https://testinfra.readthedocs.io/en/latest/backends.html"
+}
diff --git a/dev-python/python-lsp-black/Manifest b/dev-python/python-lsp-black/Manifest
index 3eceb6e9708e..da6d2dac00dc 100644
--- a/dev-python/python-lsp-black/Manifest
+++ b/dev-python/python-lsp-black/Manifest
@@ -1,4 +1,6 @@
 AUX python-lsp-black-1.2.1-tomli.patch 2955 BLAKE2B 9627be0dcae6a723242e22831384caa772082842a1ae4758534ad40e99402a2f9adc8677b547a2ba899e5763e0d9785c51afced6aafc620d0e0927f6bf719997 SHA512 3fcea10adfd6f25abcf5dda95c4d2ed4e86666d06522baa014fe805dbc6c06a825af1491a931610eabdd5e907f4d34b94513aa3caa4ba43cc584859ae5a76035
 DIST python-lsp-black-1.2.1.gh.tar.gz 9355 BLAKE2B f9c70ff07d9dfa31e3af919143deb8a49f43269469e8c64525f514624f4db67636da8254dae5274685ba2d883c8ddfd6dd9cb99981a337d7837d4007f15af11c SHA512 289b8f3642ed806409671d25e32997fb473720d0abd642c58c07d8c894831fa00f56dbc39e7d0fc8d98cad7de9f95ebdb6a0f637b8b4bbcc2a0716690feb647e
+DIST python-lsp-black-1.3.0.gh.tar.gz 9781 BLAKE2B d079d7a95dff682b86df23825796d2fa6e89d1aa3e66da1452e576fd1e96a4c298da181f53840fe5fcdcbbc8a0ca55aa53cbc4885a0178b6402365ef41a239be SHA512 9e3d081ac022854626c120128949ab5e58c44f9e76ddd566e3b80a697fbc02a96f62994f43195b02f899e770768d55d223984267133eedd6f642b70560d46c09
 EBUILD python-lsp-black-1.2.1-r1.ebuild 798 BLAKE2B af637a16edf52a16c791db28c3eeb853f9e4848dd13dbcb925d51ab92bfe707da00e0797f09a5cb9a96984e88236195c62e18f336b58085acddf3402c8f7bcb4 SHA512 f62b8f0963533539ca964d5bd823c094131d6c544bd12a703e58e3f3fb8de870c2574f773f0b6cfa2578be7687fe0e72d658b8c4909b007c7f431622aa25b844
+EBUILD python-lsp-black-1.3.0.ebuild 751 BLAKE2B e937e4c903f46a036b4ee337df2a1ae1f25cddec19dc3d0152d08971581435457bc928aee9a775b8c55c64316c7b4aa06ee9829e79410929568600b76e0d315b SHA512 82dfca6b7a88c65aa1a9ff2852dcee104ebb422cf41af0d7699265f8a4548a4809a6d4726724818ee3ba0586fa83f139c89716c2cecb87b51eb9d23e181dc1ea
 MISC metadata.xml 530 BLAKE2B 385bef4e8337f4a4fbcdbd32f52dec0b0758dd0eba50c9492465caee46dbbc96402b744d5835043f50f6c89147576c96305d8fcc4cedd42254ca2a19caf9234b SHA512 121b726a498e17b6244ecad14edd8fa3fcf23297516280f10b6b4fd5c1cb784f3a6caf902764977f8abd3cd3967db6d8fbac594c773969711dd572a487cae717
diff --git a/dev-python/python-lsp-black/python-lsp-black-1.3.0.ebuild b/dev-python/python-lsp-black/python-lsp-black-1.3.0.ebuild
new file mode 100644
index 000000000000..9274bf63b458
--- /dev/null
+++ b/dev-python/python-lsp-black/python-lsp-black-1.3.0.ebuild
@@ -0,0 +1,38 @@
+# 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..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Black plugin for the Python LSP Server"
+HOMEPAGE="
+	https://github.com/python-lsp/python-lsp-black/
+	https://pypi.org/project/python-lsp-black/
+"
+SRC_URI="
+	https://github.com/python-lsp/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-lsp-server-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/black-22.3.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/tomli[${PYTHON_USEDEP}]
+		' 3.10)
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index 876e906f9eb2..8756d8788210 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,3 +1,5 @@
 DIST websocket-client-1.5.1.tar.gz 49942 BLAKE2B 7996798a5ff8c2eb1322fc7a9fa61d5cff99c71413293ce5b05f9af3581cff472350e79813ce3b393ce4fa4b7d19de956f0ad9ff6232c426be3c8adb8c91fb40 SHA512 9fce0c8de64e051b151c40a295a7f722ed7f95d19bd92ffd5cd9c64962821024e79b70d18ca7e30ca8b8707ba86be041134f13d7e2cf7bc4a4539eb22ba60895
+DIST websocket-client-1.5.2.tar.gz 50761 BLAKE2B 5b97ce1125a8ae2f95ea103a2436d8c3471bd88c9b6f631ed9cbc1e55bff3eb13e93f662f6892c65b0f035dca66f2b2a43230f228b4f174c56c0203f5e044b07 SHA512 0837dae6ea1096421482dc1882e522d9e9041d9777ef31517116592f7b537735d1d8e319e910481be4abaceda8f79855397e4dfce2c9e622d7e7b6e6577e404e
 EBUILD websocket-client-1.5.1.ebuild 788 BLAKE2B 4448d1da394ee13ad1bf3f813e7263adb80ebc2d8be577b92ef455290c1cae2acc0886d346a4cad9587d7c8b9023c41d88ef5350b8a205af2c690fa1c9fa7fab SHA512 dd1cf6120c5a47fdf6a4513bc880da474c2a7d8132acfabcca6834e0cc8897301e4e12eeff9f48b1cd415ab4622031de1a0b5e1d5671a074dd00b33f4e36da78
+EBUILD websocket-client-1.5.2.ebuild 797 BLAKE2B b55dc93960c4181e6ace231b1227a7ca9e59bd1d0c085b503295c8a811597f9b70115aa4f37b2fed7123930a31da94e82200cddb8c31ab689ac6937fcf35bbbd SHA512 bcb3dd3febe28a9956cf2e06942f6c16aa7ee2a4132ea9c0a76f68da38ceaf65bc6f4708b8cc00a24431c2a35d4267162c0af6f0a5af04887d59ec0619815dd4
 MISC metadata.xml 498 BLAKE2B de7c287e513c7e64b4bec29693e6eb9104ff963e0d4d942ed37402bf341739fb17b2ebdb1bf0aaa0081934bae34e16f025d0549f94c1a863be95d64a338eede4 SHA512 13dd8cf0f3e363a3fbf2b246bcc1ccd78a898d5ca830e30fb1606947ce129d99f2d8065c3668dc2c7749bbd4e24e39e5a7c483065737a580246a89dd4d41eaa7
diff --git a/dev-python/websocket-client/websocket-client-1.5.2.ebuild b/dev-python/websocket-client/websocket-client-1.5.2.ebuild
new file mode 100644
index 000000000000..1842330b9108
--- /dev/null
+++ b/dev-python/websocket-client/websocket-client-1.5.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( pypy3 python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="WebSocket client for python with hybi13 support"
+HOMEPAGE="
+	https://github.com/websocket-client/websocket-client/
+	https://pypi.org/project/websocket-client/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="examples"
+
+BDEPEND="
+	test? (
+		dev-python/python-socks[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index eb2fa05af1f4..71a9bceef142 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,3 +1,5 @@
 DIST XlsxWriter-RELEASE_3.1.0.gh.tar.gz 36681465 BLAKE2B 13a9a03f49714136556c24b2e20bdac6366179a242fe4190abeec95859f572e47928f50543b8b8639662d8053f49d2fcc818ed3a74106d1773ff75c363024e13 SHA512 97ecc110bb5fd8b72ed66e9415ea6488a0d52505d93722b268258ecd299c21e872b4db2228dc6581da3e8b4ae93ca5252bff448c290de4232d4e5792aa8e43c4
+DIST XlsxWriter-RELEASE_3.1.1.gh.tar.gz 36691990 BLAKE2B 5341a2699fec7015003a602fca08483cff68cfa6f782c41d49f1801b4aab1a332048cb9ddb02fba0bb69a227cdcb22279e9fccf9b6808220724066e26886c0bc SHA512 c827bdaefd962864e09673b891ec267da89306f65ea29ccab1807af8ed89f22721d6ca296b7b83d4099bdeadf4508f576e6e618828ffc8abed1d38b3c84c6076
 EBUILD xlsxwriter-3.1.0.ebuild 685 BLAKE2B 5ddcc459a9806a68cbff7d23a326f7ee65a3489bee5adb169ece7c57055b02be7eb67e94b43922f9c26941a2eff97678533bff22d7626e77c752c07454dd0b74 SHA512 26e7957e0d66363b3c374e0e068c64bd6dce7ba01d599f33218d7e0d5733ade25b4a1caf96dc81ad1e0c3a9ebbeb0d38a92f0b216b0a2cd6ab25fa42c0dadca0
+EBUILD xlsxwriter-3.1.1.ebuild 692 BLAKE2B 7f9b0f52f78f33779786237a3545ed4e5aeeee39c7dac130ef35a3712e836335ccbbaa4ed4026c2193f0113576d90abc2b5f39bf5dc214020af90ae379d4f9a6 SHA512 435f5cc3459a2d86fddbc1f5cd47e9309e8d4b7775ae3fe12670a22b45f013b2da8cb0be038397a50846c4ac5c13276add71498d8a0a6368566acdf406769c79
 MISC metadata.xml 411 BLAKE2B e41e1e6dddecef73fff1c0bd74d51b023694ea6eb162022679a2939819f5c3339b1e76d00e25f761c46f66d323a5ad7085ed86fb13fbe3f53526c75004a68e93 SHA512 63242ff274e1dde596e50f9360e1247084b7bae05cd42d60605700c49e33b53849529578cf532415b899bd2ccd04066f99e97c6e80d53c13f71522a041579976
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.1.1.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.1.1.ebuild
new file mode 100644
index 000000000000..de882ad03167
--- /dev/null
+++ b/dev-python/xlsxwriter/xlsxwriter-3.1.1.ebuild
@@ -0,0 +1,28 @@
+# 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..11} pypy3 )
+
+inherit distutils-r1
+
+TAG=RELEASE_${PV}
+MY_P=XlsxWriter-${TAG}
+DESCRIPTION="Python module for creating Excel XLSX files"
+HOMEPAGE="
+	https://github.com/jmcnamara/XlsxWriter/
+	https://pypi.org/project/XlsxWriter/
+"
+SRC_URI="
+	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 899f977cbdc7..7005da192ba7 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/fibers/Manifest b/dev-scheme/fibers/Manifest
index d0f8f5f403df..aca52264247f 100644
--- a/dev-scheme/fibers/Manifest
+++ b/dev-scheme/fibers/Manifest
@@ -1,3 +1,5 @@
 DIST fibers-1.2.0.tar.gz 104975 BLAKE2B d43175eeb03bf8ed1100e948423e0e7abb5ae1d859f3d4dd82f775b7b0ff477d99d1d2fffd9ccf0a1c19ab398f33eb1d7cefad30ba1991a63a63755ae38e6f07 SHA512 3113e287ab2b09c54c14a5c4d2b0330fcfc96281ec6f234655acadfb5a3c0a2872b602089e4fa025f42ba52749e71121062057029097f0957d71e97c0e4e9c71
-EBUILD fibers-1.2.0.ebuild 976 BLAKE2B b8a046ad9759a236faa4e1d06bd510c1e04656a942b77aa00cbf63517ea51e6dfd157790743abecc2628f35e43342f7f7a4b840126cb30c240c6a7fb8c5c2f9b SHA512 5541bdd5856d9091ee0ab6834a4ad734dc3685dc8b47ce74d1a5b3d56107db8b1d53c3b7f4f6a5cf6245612bc7522912d6a99bef717953b47090e2fc7588eec2
+DIST fibers-1.2.0_p20230522.tar.gz 108368 BLAKE2B 4d7b773d29b235c94a86b55e17d8cbf1544024e803a00681f46221483f9112da954befb612ba2ceaa185ec6992b049a9fb144f32331ab7699436d8e107de8b10 SHA512 1ea2a6a56bbae88244a3f606cef24087949b18aa931af4d98ee1212665a93cb107cc9f8a1d250b45954f76979002656eac002105e6b3b82c0422ddb9006602d9
+EBUILD fibers-1.2.0.ebuild 1021 BLAKE2B 1e6b8afd22717d990f7f26200372a0b35d4e1616912753644610b8b55519dffa97958768b389dfc035e19e248af69861c962fb4a9dcf49d7e3b5a8630a3761f1 SHA512 920d7bfd6320a0a4039e25afa7c79d1b1b8cbfab7d784506a5b47bacdd475d348dab4ae5e8a9f647a9cf8ce1fa196fd19d95cb4d9bad0e9b753025fb0c08ddc2
+EBUILD fibers-1.2.0_p20230522.ebuild 1134 BLAKE2B a58820dabfcee5df553810b63193001e6c875fd89faf19eeefa28e4e32ac844b854bfda8e739f100f00b326756a085ec61409468084c05e749e996d81d093232 SHA512 3c6d2d4d10c1d2d227e7569ac4e841cf0fe951288c256e3ab946cd4dfffe7d8ad24b3fa9d673d3e50b244c5383065578b63f50877139d1394bfe0e719d7dae3c
 MISC metadata.xml 950 BLAKE2B 578ddec2f10f45b04a8609cc57136cee18f0dbec065051ee5bf61c1cb974a2848b4aaadadbc03b23da00a882811e8a144e2e5e09c6bfdc862794b46302be59ad SHA512 4ab507e57c54514eeb75d3fffe4c82130739b09b2bfde841204a022275709eb5cd32e5e7453c356ef436930daf135beddcf4b4efd62f0df34ececc11fcbd22d9
diff --git a/dev-scheme/fibers/fibers-1.2.0.ebuild b/dev-scheme/fibers/fibers-1.2.0.ebuild
index 55c24d617cea..5bedc28e5196 100644
--- a/dev-scheme/fibers/fibers-1.2.0.ebuild
+++ b/dev-scheme/fibers/fibers-1.2.0.ebuild
@@ -31,6 +31,10 @@ src_prepare() {
 	eautoreconf
 }
 
+src_configure() {
+	econf --disable-Werror
+}
+
 src_install() {
 	default
 
diff --git a/dev-scheme/fibers/fibers-1.2.0_p20230522.ebuild b/dev-scheme/fibers/fibers-1.2.0_p20230522.ebuild
new file mode 100644
index 000000000000..419260f126f5
--- /dev/null
+++ b/dev-scheme/fibers/fibers-1.2.0_p20230522.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+[[ ${PV} == *_p20230522 ]] && COMMIT=83712f630a976e3084329c9917c40bde19fcc7e5
+
+inherit autotools
+
+DESCRIPTION="Lightweight concurrency facility for Guile Scheme"
+HOMEPAGE="https://github.com/wingo/fibers/
+	https://github.com/wingo/fibers/wiki/Manual/"
+SRC_URI="https://github.com/wingo/${PN}/archive/${COMMIT}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-scheme/guile-2.1.7:="
+DEPEND="${RDEPEND}"
+
+# guile generates ELF files without use of C or machine code
+# It's a portage's false positive. bug #677600
+QA_PREBUILT='*[.]go'
+
+src_prepare() {
+	default
+
+	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
+	find "${S}" -name "*.scm" -exec touch {} + || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-Werror
+}
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	# Workaround llvm-strip problem of mangling guile ELF debug
+	# sections: https://bugs.gentoo.org/905898
+	dostrip -x "/usr/$(get_libdir)/guile"
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 335b832cf38c..48ac5a6eeb24 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/qmidiarp/Manifest b/media-sound/qmidiarp/Manifest
index 30d399703776..40dcc53e5106 100644
--- a/media-sound/qmidiarp/Manifest
+++ b/media-sound/qmidiarp/Manifest
@@ -1,3 +1,5 @@
 DIST qmidiarp-0.6.7.tar.bz2 579039 BLAKE2B 18cfc92a2fa5f2e183549caab3dbe4d95f3086f515614ccb4c9ef511d635526605fd4d3c97da2479288776cce0a1cbf4c545f21a1f4d6c3744dec239bd9425ca SHA512 db495223dc27ca46a009e662543ba189dbe56370e276272ea7cba6177471a2e46c5ce7960b2cc7f6be97ade059714f352373d06aa3382fe31ed208575323586c
+DIST qmidiarp-0.7.0.tar.bz2 718430 BLAKE2B 43b558d8185f2e798dc17dc58c966daf244f35b11abf5c96220f81210b39dc619daa260ff384a16da35c74584c90e86330597ec6e170bb071cebf977374c5efa SHA512 f1dcb9c817bfc9c39a9b120f5716518c3ef825652258d5852f9e228cbc3018202427a19d4b47858c16d43e5d8bbf3712cced68d95f300cc6b98ad76c608b68fd
 EBUILD qmidiarp-0.6.7.ebuild 796 BLAKE2B e965d6f7a530e7d83c1c2c7173898e93ac9cdf641596a827141505086d04ef8da2bedb779c4f869b67e982aa909864b35feffaa8c04e0a181f6360408934f88b SHA512 b147ef996ea4f3dee589cbba2a75a5567ba8e6e5f12bd824ebfeb059d392b63839569e3bc6709edcebdaa9bfb983f5dbcde0d7662d37492e291f06f177944872
+EBUILD qmidiarp-0.7.0.ebuild 797 BLAKE2B aca2d84522a1f43ade4fbd292dc309e914fc1dd31495b070d61649229df99416a6a0fd22b6c2ebe4843ca6f902f674a32d776cf0fedf2209b0fc9bf41bba9e7e SHA512 0ab24e02905547680c5a3ba823847de9370fdcfa886bf297a674e78d786fe5ab4f6f18d4e541782d0e6307e1ddd868cbbc6df49c9bb754dce8d5e37a5ee3b401
 MISC metadata.xml 400 BLAKE2B 97788da0d85fcb9aefeded864bb45387d641d30ae070f72d9257f0625191a58fcde3753bc9a0aac64c72111755d1f0595be0c32224e3986f1e54e0a8c3fafbb2 SHA512 cc204d2ac82bace84865fdaab94d8e7c40ec98bb833cf12ac1da3af56c4fa6277c4456e7bd6cb180b21972b4236b55983b707574d310b910c0a986cb2360265c
diff --git a/media-sound/qmidiarp/qmidiarp-0.7.0.ebuild b/media-sound/qmidiarp/qmidiarp-0.7.0.ebuild
new file mode 100644
index 000000000000..6591ea357739
--- /dev/null
+++ b/media-sound/qmidiarp/qmidiarp-0.7.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils xdg
+
+DESCRIPTION="Arpeggiator, sequencer and MIDI LFO for ALSA"
+HOMEPAGE="http://qmidiarp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="lv2 nls osc"
+
+BDEPEND="
+	nls? ( dev-qt/linguist-tools:5 )
+	virtual/pkgconfig"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	virtual/jack
+	lv2? ( media-libs/lv2 )
+	osc? ( media-libs/liblo )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	export PATH="$(qt5_get_bindir):${PATH}"
+
+	local myeconfargs=(
+		$(use_enable lv2 lv2plugins)
+		$(use_enable nls translations)
+		$(use_enable osc nsm)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 9915cf967610..58a791e9efd6 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index ae6cb2e0b6b7..fd4740e935ba 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 22 May 2023 01:09:41 +0000
+Mon, 22 May 2023 07:10:01 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index ab810007351f..22d1f2d0808f 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 544682 BLAKE2B 2d0195da8b9f8632be280cc22c673ff7fff3535caf55f11ce63010364ef05ef7046249f9222279107c9617f265297192eb396cd21903e1dcb3e6ce4f77059f40 SHA512 7482d2b9d4ad2b3bc6be2d636ba5864a63efe64768afe0aa8677c75c00552d068f221e24a390f8603d699f8934e71923805ce16fb9e6169e56e7803c3a048e5f
-TIMESTAMP 2023-05-22T01:09:45Z
+TIMESTAMP 2023-05-22T07:10:04Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRqwNlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRrFUxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDjZA//f5oyspgs66+lIYbwiAHsP561e9SkDQrKwRZGOmh3YOn45gw6xETDVJGT
-FOB+Wdq8FXduR0meDVYUTgwVa9QMlOxxgOlKfq1PqxO7tL7oSYuQvDqjNWdmRI2/
-jbf0tf/j0kYdicB50lD+wBBaU64Z2aX4QjrNXKsDUgR9blc0Bo2MP+zAf5o8HnCL
-UseTZCVamfENlmVG5GtG8NaUMvsPTH3vFKD4YlQQclTm1zGW/3oJW7+qa7S6UiCF
-O+6BBXNCF+DVpxpzDOhts0uKTDBV+gUhAa8OJG0iiNAU2M7TiiJGuKt0Y3yqio/c
-Tsm2d6QbcE9GUEnekNShZwam8VJB9LTfUPB+pyeKtf43HlxektCWITurWK+nsMVl
-J6v1GEPLx+eUHUaGZeHXVu0vYHRZIqevkRsM5l49aD4tBhfOrOEfQizHJZldcswX
-iEpntU3YoYnfvLbXD0DZNeG7dleHun3/mq4SzO9fWYBpZXpTL1e5Pa67XehBmcUh
-0csxxFBONsDDUXCMqnBTeqxZg4klAFd9CDKUSOwdz7Uh9tH9Np01T88Uxirq9gN6
-Cf/Y7mOatyrLOX4xNtLme0aS1KI8R59jklZjTjm6FTmrFaT8WGqtryufU7mvS6+G
-sYzxd6hHwUlN5LtOPC11+cEfkyykH8vcbGLaAbredpcdHPt2FW8=
-=ReuQ
+klDUqQ/9HBRONU9pr4U930PQ3846TzhFrPQjBTtgAwQmI87VM5NN8G9/P3OEtmFG
+3CI3N4lY6oCldxEaIiTjthabo80hFRMr92QAWDglq6Sm0IL4spdKifPVRgvUR0gd
+Lb0iSMlLTCHGTWbqYmpkLjzkjnBpcx45UsVInavUY0/VWDl+iMWBYTS/pnugDPXb
+Hi8IOy7+21KcM5Z6PWoi5HS1xMAB4h9/MS7UgZJ3hFjLFu0NN0fk6qde6WGOUrFT
+6Ya6PAeLlEo3Xowh11tMlel+gppeYtKwj9oCm8fBzGffNt1eKhrv8Qqmt+Z66gdP
+IqexmDigMv+HoK8esnF8v6/Y21ahQg4GXFg+CMxKbnh5uDMdmcuIE9e9+7XwX5/6
+KHBkuWBTahd3TXDRJFEXqQM52QJ9x/8DDg7OzTP7wyUE67+kfck/G7BEjjkrvrw3
+GVUItSa1ZkPkKh9UpFYTfU+1ADdgospX1zNlBGiwVpbG5xk11Xt7N1oaWaXbkLDT
+4nu+XW6qLb2HoVWtYitqgMC/Ib1uyF5frdmDKhpz3hgnYKCehiSmMywb8vG0MFtU
+ehj/cHuMUtzeyNHBo1ICha9aSuEz/7ksg5w2f0wj1Z7X/ykluC4mPY7nuNUEtSh8
+fGo/Y2RciDkGsCjdWXzrd7rObFhaZWUVYIbyZYCmnSLAlg0EZWA=
+=8L4Y
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index ae6cb2e0b6b7..80528da7e90c 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 22 May 2023 01:09:41 +0000
+Mon, 22 May 2023 07:10:02 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 63fb4aa6fd5a..853e8af1b7e7 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 171191edd505..bc8acabfbc31 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/gpyutils-0.10 b/metadata/md5-cache/app-portage/gpyutils-0.10
new file mode 100644
index 000000000000..28a20357083f
--- /dev/null
+++ b/metadata/md5-cache/app-portage/gpyutils-0.10
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=app-portage/gentoopm-0.3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit-core-3.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Utitilies for maintaining Python packages
+EAPI=8
+HOMEPAGE=https://github.com/projg2/gpyutils/ https://pypi.org/project/gpyutils/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=app-portage/gentoopm-0.3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/projg2/gpyutils/archive/v0.10.tar.gz -> gpyutils-0.10.gh.tar.gz
+_eclasses_=distutils-r1	a5ad17697c0eaba230f975a18abbac52	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=725509db46814123e37b18a065027f56
diff --git a/metadata/md5-cache/app-portage/mgorny-dev-scripts-40 b/metadata/md5-cache/app-portage/mgorny-dev-scripts-40
new file mode 100644
index 000000000000..cd661d076ac7
--- /dev/null
+++ b/metadata/md5-cache/app-portage/mgorny-dev-scripts-40
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Handy scripts for ebuild development and more
+EAPI=8
+HOMEPAGE=https://github.com/projg2/mgorny-dev-scripts/
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=BSD-2
+RDEPEND=app-portage/gentoolkit app-portage/portage-utils dev-perl/URI dev-util/pkgcheck dev-vcs/git net-misc/wget sys-apps/portage x11-misc/xdg-utils
+SLOT=0
+SRC_URI=https://github.com/projg2/mgorny-dev-scripts/archive/v40.tar.gz -> mgorny-dev-scripts-40.tar.gz
+_md5_=b629f9355f58e115c31af9795edbaf43
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index ed09996150f8..88a5a6b810e6 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/libevent-2.2.1 b/metadata/md5-cache/dev-libs/libevent-2.2.1-r1
index a76df08c95f2..1b2678889d5c 100644
--- a/metadata/md5-cache/dev-libs/libevent-2.2.1
+++ b/metadata/md5-cache/dev-libs/libevent-2.2.1-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/2.2
 SRC_URI=https://github.com/libevent/libevent/releases/download/release-2.2.1-alpha/libevent-2.2.1-alpha-dev.tar.gz verify-sig? ( https://github.com/libevent/libevent/releases/download/release-2.2.1-alpha/libevent-2.2.1-alpha-dev.tar.gz.asc )
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=02c70974a438356417235476686d7245
+_md5_=7804c0c26f1df7cff4de1aeace4c8981
diff --git a/metadata/md5-cache/dev-libs/quazip-1.3-r1 b/metadata/md5-cache/dev-libs/quazip-1.3-r1
deleted file mode 100644
index 95884ae05bca..000000000000
--- a/metadata/md5-cache/dev-libs/quazip-1.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 sys-libs/zlib[minizip] test? ( dev-qt/qtnetwork:5 dev-qt/qttest:5 )
-DESCRIPTION=Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package
-EAPI=8
-HOMEPAGE=https://stachenov.github.io/quazip/
-INHERIT=cmake
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-qt/qtcore:5 sys-libs/zlib[minizip] !=dev-libs/quazip-1.1-r0:1
-RESTRICT=!test? ( test )
-SLOT=0/1.3
-SRC_URI=https://github.com/stachenov/quazip/archive/v1.3.tar.gz -> quazip-1.3.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=608b98ecac7e8c2818286837f58a1125
diff --git a/metadata/md5-cache/dev-libs/quazip-1.3-r3 b/metadata/md5-cache/dev-libs/quazip-1.3-r3
new file mode 100644
index 000000000000..184670504ec9
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/quazip-1.3-r3
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=qt5? ( dev-qt/qtcore:5 ) qt6? ( dev-qt/qtbase:6 dev-qt/qt5compat:6 ) sys-libs/zlib[minizip] test? ( qt5? ( dev-qt/qtnetwork:5 dev-qt/qttest:5 ) qt6? ( dev-qt/qtbase:6[network] ) )
+DESCRIPTION=Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package
+EAPI=8
+HOMEPAGE=https://stachenov.github.io/quazip/
+INHERIT=cmake multibuild
+IUSE=+qt5 qt6 test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=qt5? ( dev-qt/qtcore:5 ) qt6? ( dev-qt/qtbase:6 dev-qt/qt5compat:6 ) sys-libs/zlib[minizip] !=dev-libs/quazip-1.1-r0:1
+REQUIRED_USE=|| ( qt5 qt6 )
+RESTRICT=!test? ( test )
+SLOT=0/1.3
+SRC_URI=https://github.com/stachenov/quazip/archive/v1.3.tar.gz -> quazip-1.3.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=8db4a755cfac9ed131cd591b338df13e
diff --git a/metadata/md5-cache/dev-libs/quazip-1.4 b/metadata/md5-cache/dev-libs/quazip-1.4
new file mode 100644
index 000000000000..ac99c0c6b7d8
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/quazip-1.4
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=bzip2? ( app-alternatives/bzip2 ) qt5? ( dev-qt/qtcore:5 ) qt6? ( dev-qt/qtbase:6 dev-qt/qt5compat:6 ) sys-libs/zlib[minizip] test? ( qt5? ( dev-qt/qtnetwork:5 dev-qt/qttest:5 ) qt6? ( dev-qt/qtbase:6[network] ) )
+DESCRIPTION=Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package
+EAPI=8
+HOMEPAGE=https://stachenov.github.io/quazip/
+INHERIT=cmake multibuild
+IUSE=bzip2 +qt5 qt6 test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=bzip2? ( app-alternatives/bzip2 ) qt5? ( dev-qt/qtcore:5 ) qt6? ( dev-qt/qtbase:6 dev-qt/qt5compat:6 ) sys-libs/zlib[minizip]
+REQUIRED_USE=|| ( qt5 qt6 )
+RESTRICT=!test? ( test )
+SLOT=0/1.4
+SRC_URI=https://github.com/stachenov/quazip/archive/v1.4.tar.gz -> quazip-1.4.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=758f36ae8d545fd20cd4cfa80d1151e5
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 9af9dba3289e..1c7141ce330d 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/ansible-compat-4.0.2 b/metadata/md5-cache/dev-python/ansible-compat-4.0.2
index 10c41095aafa..06e1147c4d0b 100644
--- a/metadata/md5-cache/dev-python/ansible-compat-4.0.2
+++ b/metadata/md5-cache/dev-python/ansible-compat-4.0.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/ansible-compat/ https://github.com/ansible/ansible-compat/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv
+KEYWORDS=amd64 ~riscv
 LICENSE=MIT
 RDEPEND=>=app-admin/ansible-core-2.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subprocess-tee-0.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/a/ansible-compat/ansible-compat-4.0.2.tar.gz
 _eclasses_=distutils-r1	a5ad17697c0eaba230f975a18abbac52	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f5570c71ac172acca82049837a1a9e7e
+_md5_=5e8f834ada37cf78731dc457527eb62e
diff --git a/metadata/md5-cache/dev-python/ansible-compat-4.0.5 b/metadata/md5-cache/dev-python/ansible-compat-4.0.5
new file mode 100644
index 000000000000..e0fdac5c85e0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ansible-compat-4.0.5
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/setuptools-scm-7.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/flaky[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-plus[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=app-admin/ansible-core-2.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subprocess-tee-0.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Contains functions that facilitate working with various versions of Ansible
+EAPI=8
+HOMEPAGE=https://pypi.org/project/ansible-compat/ https://github.com/ansible/ansible-compat/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=>=app-admin/ansible-core-2.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subprocess-tee-0.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1: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/a/ansible-compat/ansible-compat-4.0.5.tar.gz
+_eclasses_=distutils-r1	a5ad17697c0eaba230f975a18abbac52	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=f5570c71ac172acca82049837a1a9e7e
diff --git a/metadata/md5-cache/dev-python/antlr4-python3-runtime-4.13.0 b/metadata/md5-cache/dev-python/antlr4-python3-runtime-4.13.0
new file mode 100644
index 000000000000..5eb0111b723b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/antlr4-python3-runtime-4.13.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python 3 runtime for ANTLR
+EAPI=8
+HOMEPAGE=https://www.antlr.org/ https://github.com/antlr/antlr4/ https://pypi.org/project/antlr4-python3-runtime/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/antlr/antlr4/archive/4.13.0.tar.gz -> antlr4-4.13.0.gh.tar.gz
+_eclasses_=distutils-r1	a5ad17697c0eaba230f975a18abbac52	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=584c7035cc10b2251c733f2ca3858094
diff --git a/metadata/md5-cache/dev-python/dominate-2.8.0 b/metadata/md5-cache/dev-python/dominate-2.8.0
new file mode 100644
index 000000000000..90866302aa93
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dominate-2.8.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Library for creating and manipulating HTML documents using an elegant DOM API
+EAPI=8
+HOMEPAGE=https://github.com/Knio/dominate/ https://pypi.org/project/dominate/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/d/dominate/dominate-2.8.0.tar.gz
+_eclasses_=distutils-r1	a5ad17697c0eaba230f975a18abbac52	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=f9a9e5ad95344547cacf43b414c5ad63
diff --git a/metadata/md5-cache/dev-python/fakeredis-2.13.0 b/metadata/md5-cache/dev-python/fakeredis-2.13.0
new file mode 100644
index 000000000000..a9f7040649e7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fakeredis-2.13.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-db/redis dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/redis-4.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/sortedcontainers-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Fake implementation of redis API for testing purposes
+EAPI=8
+HOMEPAGE=https://github.com/cunla/fakeredis-py/ https://pypi.org/project/fakeredis/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/redis-4.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/sortedcontainers-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/f/fakeredis/fakeredis-2.13.0.tar.gz
+_eclasses_=distutils-r1	a5ad17697c0eaba230f975a18abbac52	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=08ec8912ee15a8c6c49328491bba5c79
diff --git a/metadata/md5-cache/dev-python/fastjsonschema-2.17.0 b/metadata/md5-cache/dev-python/fastjsonschema-2.17.0
new file mode 100644
index 000000000000..a7b3fdc6a7a8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fastjsonschema-2.17.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Fast JSON schema validator for Python
+EAPI=8
+HOMEPAGE=https://github.com/horejsek/python-fastjsonschema/ https://pypi.org/project/fastjsonschema/
+INHERIT=distutils-r1 pypi
+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=BSD
+RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1: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/f/fastjsonschema/fastjsonschema-2.17.0.tar.gz
+_eclasses_=distutils-r1	a5ad17697c0eaba230f975a18abbac52	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=1e1c0396bb4a7b66034328447bf7f3e7
diff --git a/metadata/md5-cache/dev-python/moto-4.1.10 b/metadata/md5-cache/dev-python/moto-4.1.10
new file mode 100644
index 000000000000..e8d7128bcfaf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/moto-4.1.10
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/responses[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sure-1.4.11[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/aws-xray-sdk-0.93[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cfn-lint-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cookies[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/docker-py-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/idna-2.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/boto3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/botocore[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask-cors[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-3.0.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-spec-validator-0.2.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-jose[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-sshpubkeys[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/responses-0.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xmltodict[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zipp[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Mock library for boto
+EAPI=8
+HOMEPAGE=https://github.com/getmoto/moto/ https://pypi.org/project/moto/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/aws-xray-sdk-0.93[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cfn-lint-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cookies[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/docker-py-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/idna-2.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/boto3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/botocore[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask-cors[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-3.0.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-spec-validator-0.2.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-jose[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-sshpubkeys[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/responses-0.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xmltodict[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zipp[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1: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/m/moto/moto-4.1.10.tar.gz
+_eclasses_=distutils-r1	a5ad17697c0eaba230f975a18abbac52	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=f42f643da76150433e23826382143b49
diff --git a/metadata/md5-cache/dev-python/pypdf-3.9.0 b/metadata/md5-cache/dev-python/pypdf-3.9.0
new file mode 100644
index 000000000000..6aa197fc38f1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypdf-3.9.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pycryptodome[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit-core-3.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Python library to work with PDF files
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pypdf/ https://github.com/py-pdf/pypdf/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/py-pdf/pypdf/archive/3.9.0.tar.gz -> pypdf-3.9.0.gh.tar.gz test? ( https://github.com/py-pdf/sample-files/archive/69b31cff6b183a42f9081709ef9bee4047976f56.tar.gz -> pypdf-sample-files-69b31cff6b183a42f9081709ef9bee4047976f56.gh.tar.gz )
+_eclasses_=distutils-r1	a5ad17697c0eaba230f975a18abbac52	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=ae8cf0d6b3f34246304de4ae5b44c857
diff --git a/metadata/md5-cache/dev-python/pytest-testinfra-8.1.0 b/metadata/md5-cache/dev-python/pytest-testinfra-8.1.0
new file mode 100644
index 000000000000..9da35300653a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-testinfra-8.1.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools-scm[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( app-admin/ansible python_targets_python3_10? ( app-admin/salt[python_targets_python3_10(-)?] ) dev-python/paramiko[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pywinrm[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/pytest[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Write unit tests in Python to test actual state of your servers
+EAPI=8
+HOMEPAGE=https://github.com/pytest-dev/pytest-testinfra/ https://pypi.org/project/pytest-testinfra/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv
+LICENSE=Apache-2.0
+RDEPEND=dev-python/pytest[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1: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/p/pytest-testinfra/pytest-testinfra-8.1.0.tar.gz
+_eclasses_=distutils-r1	a5ad17697c0eaba230f975a18abbac52	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=954b668a96200dfa127dedb3f93c6f25
diff --git a/metadata/md5-cache/dev-python/python-lsp-black-1.3.0 b/metadata/md5-cache/dev-python/python-lsp-black-1.3.0
new file mode 100644
index 000000000000..456b7f0d47bc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-lsp-black-1.3.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) ) test? ( >=dev-python/python-lsp-server-1.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/black-22.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Black plugin for the Python LSP Server
+EAPI=8
+HOMEPAGE=https://github.com/python-lsp/python-lsp-black/ https://pypi.org/project/python-lsp-black/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/python-lsp-server-1.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/black-22.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/python-lsp/python-lsp-black/archive/v1.3.0.tar.gz -> python-lsp-black-1.3.0.gh.tar.gz
+_eclasses_=distutils-r1	a5ad17697c0eaba230f975a18abbac52	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=a1bdba91ebf11bfecedf6b28ac261ca6
diff --git a/metadata/md5-cache/dev-python/websocket-client-1.5.2 b/metadata/md5-cache/dev-python/websocket-client-1.5.2
new file mode 100644
index 000000000000..16c4e5d7db33
--- /dev/null
+++ b/metadata/md5-cache/dev-python/websocket-client-1.5.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/python-socks[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=WebSocket client for python with hybi13 support
+EAPI=8
+HOMEPAGE=https://github.com/websocket-client/websocket-client/ https://pypi.org/project/websocket-client/
+INHERIT=distutils-r1 pypi
+IUSE=examples test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/w/websocket-client/websocket-client-1.5.2.tar.gz
+_eclasses_=distutils-r1	a5ad17697c0eaba230f975a18abbac52	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=26e16b89d64f0c1637f71169dc5c3639
diff --git a/metadata/md5-cache/dev-python/xlsxwriter-3.1.1 b/metadata/md5-cache/dev-python/xlsxwriter-3.1.1
new file mode 100644
index 000000000000..03d7ffb324e8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xlsxwriter-3.1.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python module for creating Excel XLSX files
+EAPI=8
+HOMEPAGE=https://github.com/jmcnamara/XlsxWriter/ https://pypi.org/project/XlsxWriter/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_3.1.1.tar.gz -> XlsxWriter-RELEASE_3.1.1.gh.tar.gz
+_eclasses_=distutils-r1	a5ad17697c0eaba230f975a18abbac52	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=d28778ad2225b8364eaea463deccab82
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index 4ce9e0da0939..5834b542dcf1 100644
--- a/metadata/md5-cache/dev-scheme/Manifest.gz
+++ b/metadata/md5-cache/dev-scheme/Manifest.gz
diff --git a/metadata/md5-cache/dev-scheme/fibers-1.2.0 b/metadata/md5-cache/dev-scheme/fibers-1.2.0
index b4e93a32fcd6..485c5bddbabd 100644
--- a/metadata/md5-cache/dev-scheme/fibers-1.2.0
+++ b/metadata/md5-cache/dev-scheme/fibers-1.2.0
@@ -1,5 +1,5 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=configure install prepare
 DEPEND=>=dev-scheme/guile-2.1.7:=
 DESCRIPTION=Lightweight concurrency facility for Guile Scheme
 EAPI=8
@@ -11,4 +11,4 @@ RDEPEND=>=dev-scheme/guile-2.1.7:=
 SLOT=0
 SRC_URI=https://github.com/wingo/fibers/archive/v1.2.0.tar.gz -> fibers-1.2.0.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=2394223f4eebf9e7b95029ec2cfe0460
+_md5_=d83f856682d3b1505b4e35ec65bc0e34
diff --git a/metadata/md5-cache/dev-scheme/fibers-1.2.0_p20230522 b/metadata/md5-cache/dev-scheme/fibers-1.2.0_p20230522
new file mode 100644
index 000000000000..3d3002c00ce7
--- /dev/null
+++ b/metadata/md5-cache/dev-scheme/fibers-1.2.0_p20230522
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-scheme/guile-2.1.7:=
+DESCRIPTION=Lightweight concurrency facility for Guile Scheme
+EAPI=8
+HOMEPAGE=https://github.com/wingo/fibers/ https://github.com/wingo/fibers/wiki/Manual/
+INHERIT=autotools
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3+
+RDEPEND=>=dev-scheme/guile-2.1.7:=
+SLOT=0
+SRC_URI=https://github.com/wingo/fibers/archive/83712f630a976e3084329c9917c40bde19fcc7e5.tar.gz -> fibers-1.2.0_p20230522.tar.gz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=f1c7fe53b4db9efe7962f5ca55c36e4d
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index ea83feda12e9..04cb2e53c9b3 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/qmidiarp-0.7.0 b/metadata/md5-cache/media-sound/qmidiarp-0.7.0
new file mode 100644
index 000000000000..92ee82d3a569
--- /dev/null
+++ b/metadata/md5-cache/media-sound/qmidiarp-0.7.0
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( dev-qt/linguist-tools:5 ) virtual/pkgconfig
+DEFINED_PHASES=configure postinst postrm preinst
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/alsa-lib virtual/jack lv2? ( media-libs/lv2 ) osc? ( media-libs/liblo )
+DESCRIPTION=Arpeggiator, sequencer and MIDI LFO for ALSA
+EAPI=8
+HOMEPAGE=http://qmidiarp.sourceforge.net/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=qmake-utils xdg
+IUSE=lv2 nls osc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/alsa-lib virtual/jack lv2? ( media-libs/lv2 ) osc? ( media-libs/liblo )
+SLOT=0
+SRC_URI=mirror://sourceforge/qmidiarp/qmidiarp-0.7.0.tar.bz2
+_eclasses_=multilib	104e1332efb829e2f7cbf89307a474f1	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=1bd0992e031ee68e8a2dc24f1ea7da61
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 6ef1c5e775f0..2e7cdd9a24c3 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/i2p-2.1.0-r1 b/metadata/md5-cache/net-vpn/i2p-2.1.0-r2
index 25bb463d0b76..d891f064337b 100644
--- a/metadata/md5-cache/net-vpn/i2p-2.1.0-r1
+++ b/metadata/md5-cache/net-vpn/i2p-2.1.0-r2
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=dev-java/bcprov:0 dev-java/hashcash:1 dev-java/httpcomponents-client:4 dev-java/identicon:1 dev-java/java-getopt:1 dev-java/java-service-wrapper:0 dev-java/jbcrypt:0 dev-java/json-simple:2.3 dev-java/json-smart:1 dev-java/jsonrpc2-base:1 dev-java/jsonrpc2-server:1 dev-java/jstl:0 dev-java/jstl-api:0 dev-java/minidns-core:1 dev-java/zxing-core:3 dev-java/zxing-javase:3 >=net-libs/nativebiginteger-2.1.0:0 sys-devel/gettext:0[java] >=www-servers/tomcat-9.0.73:9 >=virtual/jdk-1.8:* test? ( dev-java/ant-junit4:0 dev-java/hamcrest:0 dev-java/hamcrest-core:1.3 dev-java/junit:4 dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=dev-java/bcprov:0 dev-java/hashcash:1 dev-java/httpcomponents-client:4 dev-java/identicon:1 dev-java/java-getopt:1 dev-java/java-service-wrapper:0 dev-java/jbcrypt:0 dev-java/json-simple:2.3 dev-java/json-smart:1 dev-java/jsonrpc2-base:1 dev-java/jsonrpc2-server:1 dev-java/jstl:0 dev-java/jstl-api:0 dev-java/minidns-core:1 dev-java/zxing-core:3 dev-java/zxing-javase:3 >=net-libs/nativebiginteger-2.1.0:0 sys-devel/gettext:0[java] >=www-servers/tomcat-9.0.73:9 >=virtual/jdk-1.8:* test? ( dev-java/ant-junit4:0 dev-java/hamcrest:0 dev-java/junit:4 dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
 DESCRIPTION=A privacy-centric, anonymous network
 EAPI=8
 HOMEPAGE=https://geti2p.net
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.i2p-projekt.de/2.1.0/i2psource_2.1.0.tar.bz2
 _eclasses_=java-ant-2	5a1b508f2544b7cac8ec27c170676de0	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	104e1332efb829e2f7cbf89307a474f1	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ed35277388642f31f03687aceb81c8a2
+_md5_=8d3c002ba3815a020118d4939004fad2
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 012536f1a378..1287ae0447fb 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/normaliz-3.10.0 b/metadata/md5-cache/sci-mathematics/normaliz-3.10.0
new file mode 100644
index 000000000000..1d479094ca50
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/normaliz-3.10.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare pretend setup
+DEPEND=dev-libs/gmp:=[cxx(+)] nauty? ( sci-mathematics/nauty ) dev-libs/boost
+DESCRIPTION=Tool for computations in affine monoids and more
+EAPI=8
+HOMEPAGE=https://www.normaliz.uni-osnabrueck.de/
+INHERIT=autotools toolchain-funcs
+IUSE=doc extras nauty openmp
+KEYWORDS=~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=dev-libs/gmp:=[cxx(+)] nauty? ( sci-mathematics/nauty )
+SLOT=0/3
+SRC_URI=https://github.com/Normaliz/Normaliz/releases/download/3.10.0/normaliz-3.10.0.tar.gz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=e5752088e60be16c6efc17382bb6ceb1
diff --git a/metadata/md5-cache/sci-mathematics/polymake-4.8 b/metadata/md5-cache/sci-mathematics/polymake-4.9
index 368e48f61319..a8e94de29b06 100644
--- a/metadata/md5-cache/sci-mathematics/polymake-4.8
+++ b/metadata/md5-cache/sci-mathematics/polymake-4.9
@@ -12,6 +12,6 @@ RDEPEND=libpolymake? ( dev-lang/perl ) dev-libs/boost:= dev-libs/gmp:= dev-libs/
 REQUIRED_USE=^^ ( bliss nauty )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://polymake.org/lib/exe/fetch.php/download/polymake-4.8-minimal.tar.bz2
+SRC_URI=https://polymake.org/lib/exe/fetch.php/download/polymake-4.9-minimal.tar.bz2
 _eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=86ec4682f6b06c8aad5e914cb24c6a34
+_md5_=b3332699acfcbb4855be6188949f24da
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index 3e85dabc6f91..a6d581cb448a 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-10.1.7 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.7
deleted file mode 100644
index 1b165d4178ce..000000000000
--- a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.7
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=OpenPGP keys used by tomcat.apache.org
-EAPI=8
-HOMEPAGE=https://tomcat.apache.org/download-90.cgi
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=public-domain
-SLOT=10.1.7
-SRC_URI=https://downloads.apache.org/tomcat/tomcat-10/v10.1.7/KEYS -> openpgp-keys-apache-tomcat-10.1.7-KEYS.asc
-_md5_=5659f38b8facd7a3fd4b97428d033703
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.87 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.87
deleted file mode 100644
index e750c111ef0c..000000000000
--- a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.87
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=OpenPGP keys used by tomcat.apache.org
-EAPI=8
-HOMEPAGE=https://tomcat.apache.org/download-80.cgi
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=public-domain
-SLOT=8.5.87
-SRC_URI=https://downloads.apache.org/tomcat/tomcat-8/v8.5.87/KEYS -> openpgp-keys-apache-tomcat-8.5.87-KEYS.asc
-_md5_=b711da39319582bfa9895d14c40940f0
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.73 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.73
deleted file mode 100644
index 5e6057b0ee4c..000000000000
--- a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.73
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=OpenPGP keys used by tomcat.apache.org
-EAPI=8
-HOMEPAGE=https://tomcat.apache.org/download-90.cgi
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=public-domain
-SLOT=9.0.73
-SRC_URI=https://downloads.apache.org/tomcat/tomcat-9/v9.0.73/KEYS -> openpgp-keys-apache-tomcat-9.0.73-KEYS.asc
-_md5_=5659f38b8facd7a3fd4b97428d033703
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 777223755c35..5c1834972e4d 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-10.1.7 b/metadata/md5-cache/www-servers/tomcat-10.1.7
deleted file mode 100644
index 7b6003c3e63a..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-10.1.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-10.1.7:10.1.7 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.5:0 dev-java/wsdl4j:0 app-admin/pwgen dev-java/ant-core >=virtual/jdk-11:* test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 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 ~amd64-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.5:0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=10.1
-SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.7/src/apache-tomcat-10.1.7-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.4.0/biz.aQute.bnd-6.4.0.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.4.0/biz.aQute.bndlib-6.4.0.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.7/src/apache-tomcat-10.1.7-src.tar.gz.asc )
-_eclasses_=java-ant-2	5a1b508f2544b7cac8ec27c170676de0	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	104e1332efb829e2f7cbf89307a474f1	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=4652e7149724d1ec9aac8a452455f966
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.87 b/metadata/md5-cache/www-servers/tomcat-8.5.87
deleted file mode 100644
index 303be214f4a1..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-8.5.87
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-8.5.87:8.5.87 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=dev-java/eclipse-ecj:4.15 app-admin/pwgen dev-java/ant-core >=virtual/jdk-1.8:* doc? ( dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 ) test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2: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 ~x86-solaris
-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.87/src/apache-tomcat-8.5.87-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.87/src/apache-tomcat-8.5.87-src.tar.gz.asc )
-_eclasses_=java-ant-2	5a1b508f2544b7cac8ec27c170676de0	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	104e1332efb829e2f7cbf89307a474f1	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=ae7f4df2b4f9856e7e5b4176402d43a4
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index daff0667525e..e83321a58bef 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-05-22T01:09:45Z
+TIMESTAMP 2023-05-22T07:10:04Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRqwNlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRrFUxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAWKRAAhPCiPiSF726Uk919ZfoHEK5yz6dkoIEJvKjvURP6GkIRGb7NRlG5sxHf
-ixc5HLWGlr87u7MPApbMMtEH3m3NZBeSvrO1yf4L3xTxTf6j4Q7OJj4MTcVbhXMu
-6xyx7XH0q+2qGSQAl0KmsvjIuvnjlzalb2I4ySPuWqrl/UCjtrSlwBJlqK5RhkUr
-aiRJ2mNXxyJqrloodnkKmllzH/1i5md4X/1my+aMQVe8HWTPBUmjYGcFjsbj8WVc
-Z9909VK9JdDxXqD8ZmADCE+7ZgwZ9/VkvKRrK2v0h5dqERRCBr1h/5kLmMGdjaIO
-bjMW/3v0H/bRCtxQwG3vMTum8KfiH+wqlRnV14w5YvtYHm/ndX6Bn5GgBiCj39PF
-tFT5LNppjRnD/eRnHBOrp8QdiiQhEvKWsrKovw3BrDUskgbD/YK8UnDNikBFZt+v
-3XfY4dAU+vvJPsWrzauT727NFreID/71It8fl09t5fJ0KoScpfwo5XFr1CSMGn76
-QC74vuGnUBa07kYaMbSvC6ZotvVvIYl1TAqKhAVBuQcwgQmt6717LetDcAzo22rQ
-683nT1JMy0T9T1aKqsdL2Sil9ZPkbLTrvmpmS8MbrbSEj1YrRSi5FdPQKl5O+T85
-sLhXFUhEUAFms+FvIa2RJZNYXnQ/rKT2o2IPO/coJxxpg92MHtA=
-=Esws
+klAZww/9EhLYjNCx1NkjzcAHNsY11UeKWbGr+9rgbxOZLizdlBbFpEyUVtYZWbLu
+Lg4J/7FoL7PvxHLy/5SUbRw3BCVvF0UvXW6dHoxwzo7QpvXfphrg4dmrMGCdhaKk
+OuNG24k+NnWdS0d+d2X8Pt48ozIYT/sAh837MKV6ZpQHrmTrUb7EKZAY+5g7kFh8
+0gkTybBCQJTGQag447KUOnfuoQP5KVL2MD5ByovxRUJ/+qswon6OuLTKiwA+fUH+
+V91Bo45z0EDW1xeYeEvmHxU2WbQ9Oeo4Sr7iCCzEUwQfeJfmGtuK2QHqaR3tlPAq
+LjHAWl3nyJtRUbTG94u9/tjX+xMv0MZUPw5hLr4dhmUc6PBp1xqrI988HV4ihoKR
+N1NeSqc14dJgm+zeYgix4ZCNGUW6Q1/3UiOsDuRRQnZMkcYQC4t5uFfUYScJx5av
+2OsuBtvD8hSyJnv+a7+yyNUDLigafQNPjn4NBOi3+XNlsZVGKQyqWj9+QIL+htqU
+w/zXIwZx1L9eyMPnooq0UXjfyWrAp3WRFeeVIN3lMTSoGErPLtCbkO4jnRHeeTZd
+DB3Hwds7rTyK87rk9cpmF8d+hHqO0sAmVY70+Qc02XIQsiCxr1xijZZnfa5xMuOm
+fEUUCnXxswoJndYqAwGIThpqmwwe6IN+mu+uGTcn4pNj8FQlxGE=
+=BpL6
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index ae6cb2e0b6b7..80528da7e90c 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 22 May 2023 01:09:41 +0000
+Mon, 22 May 2023 07:10:02 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 231300030a32..890e865da518 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon May 22 01:09:41 AM UTC 2023
+Mon May 22 07:10:01 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 922a3e2e217b..3625aa3af0c5 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 22 May 2023 01:15:02 +0000
+Mon, 22 May 2023 07:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index ef543586ddde..ecd7c4994d38 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-e5228a3a605a9f22d27375382bf7976d8b2d3ec1 1684710475 2023-05-21T23:07:55+00:00
+89f27fe6c532660666a694ce93758e20bced0bbe 1684738659 2023-05-22T06:57:39+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f8c90b46bb54..1da743d23e13 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1684717801 Mon 22 May 2023 01:10:01 AM UTC
+1684739401 Mon 22 May 2023 07:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index ae6cb2e0b6b7..fd4740e935ba 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 22 May 2023 01:09:41 +0000
+Mon, 22 May 2023 07:10:01 +0000
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index c06198f2aedf..b1d22e7abb38 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index f400b32ba804..b3ba62afd9fc 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -6,5 +6,5 @@ AUX i2p.service 172 BLAKE2B 8523af82e33d7a8f5b37138f8d28c7adb4c08607b84813f35b42
 DIST i2psource_1.7.0.tar.bz2 33300522 BLAKE2B dcb83477f6d066b707632f8db44bc811558b0bc52368ce992aaf14d0d21acc1fb9bce1dfa8171fca8cf3819765f0b7993ae4a2566a6f65786cca84c02ea4336a SHA512 a27c448246538f152355ecfdf781e39bf9e57b5d0f7ea139ce06d800ce3eed7fa4e375210e6545da2a75245b45282bc8d8e7453d96729f940c34daa75bdc588f
 DIST i2psource_2.1.0.tar.bz2 32817295 BLAKE2B d37463522143c02e04c96d58578312b536ab5e2842e5647dbe5ba3d5c139329c447f16de7e326ef48ef4c6b3c11631e23300b5327cc31d9da5288240f86c926f SHA512 e8639c2b2869d3c7856b598d4cd3505458ed5cab5dce3570cafdaec3ccd77dbaec35787cccc6782acc75adb423b7baaab724ac3c98e5b91b41cf4c76f3614355
 EBUILD i2p-1.7.0-r1.ebuild 4212 BLAKE2B 7cf5f94c8d1a9814f69cce175ce49b6f63575b9e90e6c404bec07be1f4476713db635561b355aab314a71cfe7e02ae1615902f6ad22984d238037c234146644f SHA512 a3c609a3c37e6430daed918d215536d1ec9ddd4c12f1191a26184503fee3b8dd88b2db700be6870414a4d775dc548d0c8bc0d579a595a9b079e57f1142dd712a
-EBUILD i2p-2.1.0-r1.ebuild 7167 BLAKE2B f2a5bcdb1b0e52fa258aae083525cec795a5d64c17fc203cdc5a2305529fc8e3dcb3eae5a208a4fc97d6d91a0c0119958e61b9188bf504a7b898c14bce1b856b SHA512 5fb4b5f20ab5079f4a8825c54a9d63bbd3f1e68b9b8e06221fed102cbfdd97743ab8dbebf75b9b7eb381ddb225d84f372fb5e23cdde0e3a09742fd26f517c0a0
+EBUILD i2p-2.1.0-r2.ebuild 7138 BLAKE2B 90153ea24b8ee7aea9c1c8242fc4fff477f2c9bddd287c0af39a9f1c04a614a545b8d91794180764286274fb0516206ae81f4e76a712151181116799879b373a SHA512 40baca6878e714d28740abc489647e70a6b2912a80169e1c549847c72bf6cc86a4bf4a0ba917eee079eff04bd658483d003939d8c70dd61617c8f01f0bd17cde
 MISC metadata.xml 832 BLAKE2B ecda42c25627405f84f1df24fecf9b117c2dd15c44166eaea65df6924dce67e562a0ba7af83508fe7512d5ee75b23620e59ab7376701178f0cef6c47d42b751f SHA512 effe4661ecc390b6b76984192fcd4124cb29302e5ff4c545447b08ca5fc07ae63efa57d3082487940c64ade864d9c76a55f1bd1a05217808fb733a3a18cb553d
diff --git a/net-vpn/i2p/i2p-2.1.0-r1.ebuild b/net-vpn/i2p/i2p-2.1.0-r2.ebuild
index f927c3080df1..2883493999e5 100644
--- a/net-vpn/i2p/i2p-2.1.0-r1.ebuild
+++ b/net-vpn/i2p/i2p-2.1.0-r2.ebuild
@@ -48,7 +48,6 @@ DEPEND="
 	test? (
 		dev-java/ant-junit4:0
 		dev-java/hamcrest:0
-		dev-java/hamcrest-core:1.3
 		dev-java/junit:4
 		dev-java/mockito:4
 	)
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 35e6ef833661..c00c168fe61c 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/normaliz/Manifest b/sci-mathematics/normaliz/Manifest
index ce8313e03fc6..4c86935b9e03 100644
--- a/sci-mathematics/normaliz/Manifest
+++ b/sci-mathematics/normaliz/Manifest
@@ -1,3 +1,5 @@
+DIST normaliz-3.10.0.tar.gz 5177794 BLAKE2B ef2ed089da0bf7b286f477837d8793466c1b030ea0f321cd74e910461a6bd28705f971d1b987ef59aa783311dc247e2838d5acf850cb1948e429c98e1ca440f0 SHA512 febc43f846607dcfca8bcf462e8ccf655e2e6e10dcb2741412c08489fc9b2e99410306dc4b078084bfe73e41113849b201e6f7f5a8e2ae07508ebf1c043f95a3
 DIST normaliz-3.9.3.tar.gz 4946498 BLAKE2B 3faff64fda86216ee11b0f55ba1341d70988472f65eedafe5b52bf6b05abd817add2dbab45144de0a43d02c501caf3c4a89d66c2b2d621b81188a2a5100d158f SHA512 5d6866cc35835c196d22d6b4b0d5f0e3e2e00f772553115fbbabd8415b20388cf367cf9a282904a72c03c2ef482b804f7009d67e3334add4fc37f3bab675da6c
+EBUILD normaliz-3.10.0.ebuild 1681 BLAKE2B cb3d172f736136d5706ee0e3b9b8ff162c4e3ec4ad3dede67b2d275dd340ba0d361c47bb4bdda66d7fbfac01372fd4f6e79a029435d75e41a27f52e925216c61 SHA512 91ef2964ace54fdcf9fa9da2c63b11669cf3403dc08678b44ba64f75852fee6186ae95cd3682c8019e6a2b525398a20737140feeb7ebff7a189a0e3915a53ad2
 EBUILD normaliz-3.9.3.ebuild 1599 BLAKE2B 7b87b54a8dc78b220f1bd46945d46165a2f37269d73c7f3ebea5bd43b0f5e74674eb532dd766e678bb3292c98422a47266198fc76fdef4320cb22f8b0ca5cfe8 SHA512 17dae30d1e232055b0e20dca7563978905a9560c978abe9e8a52f1c4498b17a6c5e180c2ca81128a74761b3277afd78744de173a494d62e621fadfbd03cdd88c
 MISC metadata.xml 823 BLAKE2B e6ac647e395713b5589b2dd6655bdde020fdb4113067f83d503497e0e5ec916b04d2742227ea16f1dda4551c1275b2d0e684e3dab4cb331fc4d42597ea2bc004 SHA512 3f242ea780a29900dfda6b7a0372a87d38ebd11184e1eed976653bc3712e54c2cf5897f07c7f2d0aa50a1af6364fb797c2c4e78cb9c3fa4344370cab4dbe4abb
diff --git a/sci-mathematics/normaliz/normaliz-3.10.0.ebuild b/sci-mathematics/normaliz/normaliz-3.10.0.ebuild
new file mode 100644
index 000000000000..055e1f8973ca
--- /dev/null
+++ b/sci-mathematics/normaliz/normaliz-3.10.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Tool for computations in affine monoids and more"
+HOMEPAGE="https://www.normaliz.uni-osnabrueck.de/"
+SRC_URI="https://github.com/Normaliz/Normaliz/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc extras nauty openmp"
+
+RDEPEND="
+	dev-libs/gmp:=[cxx(+)]
+	nauty? ( sci-mathematics/nauty )
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost
+"
+# Only a boost header is needed -> not RDEPEND
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	# Fix C standard compliance.
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# flint (and arb, which doesn't make an appearance in ./configure --help)
+	# is somehow connected to e-antic, which we do not yet package. Likewise
+	# we have no packages for cocoalib or hashlibrary.
+	econf \
+		$(use_enable openmp) \
+		$(use_with nauty) \
+		--without-cocoalib \
+		--without-hashlibrary \
+		--without-flint \
+		--without-e-antic \
+		--disable-static
+}
+
+src_compile() {
+	# Clobber the default "AM_LDFLAGS = -Wl,-s" to avoid QA warnings
+	# about pre-stripped binaries.
+	emake AM_LDFLAGS=""
+}
+
+src_install() {
+	default
+
+	use doc && dodoc doc/Normaliz.pdf doc/NmzShortRef.pdf
+	if use extras; then
+		newdoc Singular/normaliz.pdf singular-normaliz.pdf
+		insinto /usr/share/${PN}
+		doins Singular/normaliz.lib
+		doins Macaulay2/Normaliz.m2
+	fi
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sci-mathematics/polymake/Manifest b/sci-mathematics/polymake/Manifest
index e6eeac049db6..ad05be938ae9 100644
--- a/sci-mathematics/polymake/Manifest
+++ b/sci-mathematics/polymake/Manifest
@@ -1,6 +1,6 @@
 AUX polymake-4.6-perl-5.36.patch 659 BLAKE2B 4013b45b4edc79654fcfe77ffa17530ddaca8513eaf76fc338dae7fbcd1cf83f07f7b5ccaf2117051ae3f9fc951caa676b36fa06413988c271e0a5f01da28233 SHA512 0bf9f512c6b7439bf1660560d25a502f1fa16b7f0136f04f1c1c8812c1b1c5ab0ab5133e149777243985ca37e159d8a3de355b443441126328565063faa2ba8e
 DIST polymake-4.6-minimal.tar.bz2 5634651 BLAKE2B 6ee24fa6e70fdf746ea298d78e21e17fe38c5837ae2d3153e53656b4b003555b06897f463220b59474eed1111135dfa61c080d08d6363391afca51011f331122 SHA512 90f04c67bf297fb1b9f5a51d1654ff12385860b1fc80278a8b47f65970f11a1e0f33ede8a839b54a12422e772c8b76302ff78cc467712a2486f6e76ce0d5ab20
-DIST polymake-4.8-minimal.tar.bz2 7283871 BLAKE2B 0f54282e0b07e357a6e746cb4c4b579c65a6eb6b942c541047a0213529191404a36666ac38279351ffef944fddb2cd299fcbe7ac6d9873368fb00ec221bc81e5 SHA512 d3ce7426fa78194254271274849aadb1b7f1afe176c16f79da7e5569ec30004e20a46d3c3a09d45ecb3210d73c850427920ca8a36f93c7f7d9420827fe2a3a00
+DIST polymake-4.9-minimal.tar.bz2 7287220 BLAKE2B 4a40c3177bc146c16ae7924c2911bd96a26e7eec82963dba1293db272e60a6efea59bd27575951ecbe343862c1c28ecf1f2eb5c2bd1b9b09ef475a7ef44a6b95 SHA512 5c762a59b135dbb1bbcff9a0133a17c20529dc14a5af19efc2afbc1ae773ea3834ccc6b97db130ec91d9cd7a3a20988360b1d844f70272724794ac81ab42658f
 EBUILD polymake-4.6-r1.ebuild 4117 BLAKE2B 082513548c437c62044209bb1f75bce4131cd4202e7c49aec776e35d8cbd83fba477c43958d96baecf7d3d2b8a94e2cf1b45ba9aa08e0250153a4ba932c80fbd SHA512 b4639b6d3fbf9d265956dbc3c62cf3262c64502945ef25fd1a8d85402d279182498970909c1a770eccd1e2bf1e71d17151ba521c720f3fae8452b27744858c36
-EBUILD polymake-4.8.ebuild 4071 BLAKE2B 733089ff39cb4b1504b8e8f6beb9c1af4942352dd60aa552921cc1563c6107f9f19b6bcca08b8145bdbbb23de35fa1092cfbad22b929e59b4572b61553668bff SHA512 feab36a0305e639b1ca4e35baf908bdfc38143f36f7b0aeec4b119711d31a1f6a6fc1171232a346dee3d7e212954272f09523c15fb93bb7af799bec9f1e0baad
+EBUILD polymake-4.9.ebuild 4071 BLAKE2B b57f3b18e7d6172fc6c76d7ee08f51d7792008fc1b81b9b50fae1fb3d8447cf370ea1d3042faa2380b57e4b51da5192027d2db3d4692729bd0d7afe114273c5b SHA512 277a3d25b0219cce02ccb15ca22607a5be432d8596bd76fe410ca4985d88f3e22bacc5fa3c6294e8a03058b1bd46fa9ea49ff752455cb503c032fd952e7ae173
 MISC metadata.xml 1762 BLAKE2B 249af503c9e7e99118c87e4cd71c151cc962502972e80c4ba4f66ae3805c9f6c47601ecadef5e6e1b5c67a7e7779155f2524bace8d6f2f4fb260f2f4dce1b257 SHA512 fc887d14710c9529a9738a14ae8f6a41adae80c273354aa5bcd0a14ad695de09ff562e775a5d40582b23e3b6b1fd4e34a277fa9a6ff7131f19ad4f5cc98d6374
diff --git a/sci-mathematics/polymake/polymake-4.8.ebuild b/sci-mathematics/polymake/polymake-4.9.ebuild
index 66795c00f8c7..3217de2e4b3d 100644
--- a/sci-mathematics/polymake/polymake-4.8.ebuild
+++ b/sci-mathematics/polymake/polymake-4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 9998bebc5697..0c839ccedb8a 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 a76290d232e6..b4cc71c5df76 100644
--- a/sec-keys/openpgp-keys-apache-tomcat/Manifest
+++ b/sec-keys/openpgp-keys-apache-tomcat/Manifest
@@ -1,19 +1,13 @@
-DIST openpgp-keys-apache-tomcat-10.1.7-KEYS.asc 35947 BLAKE2B 034e64f5db48a3b6536e330d539c8254b6eaf13ea9b4cf0b7c29ac14b7a49d221e93cd6971606c10520194452f3a34ed71ee919bc0f6b0f3a143776106ae8d0f SHA512 46f193aaead52c1807ac719977e5583daa0fd2a96db4f0041b72f1150deaa456d3c72a2856218ffba31ec9ffd0804a2b97f7646f0d67aa1404819ebe79555c3d
 DIST openpgp-keys-apache-tomcat-10.1.8-KEYS.asc 35947 BLAKE2B 034e64f5db48a3b6536e330d539c8254b6eaf13ea9b4cf0b7c29ac14b7a49d221e93cd6971606c10520194452f3a34ed71ee919bc0f6b0f3a143776106ae8d0f SHA512 46f193aaead52c1807ac719977e5583daa0fd2a96db4f0041b72f1150deaa456d3c72a2856218ffba31ec9ffd0804a2b97f7646f0d67aa1404819ebe79555c3d
 DIST openpgp-keys-apache-tomcat-10.1.9-KEYS.asc 35947 BLAKE2B 034e64f5db48a3b6536e330d539c8254b6eaf13ea9b4cf0b7c29ac14b7a49d221e93cd6971606c10520194452f3a34ed71ee919bc0f6b0f3a143776106ae8d0f SHA512 46f193aaead52c1807ac719977e5583daa0fd2a96db4f0041b72f1150deaa456d3c72a2856218ffba31ec9ffd0804a2b97f7646f0d67aa1404819ebe79555c3d
-DIST openpgp-keys-apache-tomcat-8.5.87-KEYS.asc 45686 BLAKE2B 77604cd61e33efa2df702a992bc27cdb2060da1714c00bc75ee0438e1374d7b63a9a02c7aaa917fa982c0c8112bf29974b03a46e78146c9d51c360bc6343b898 SHA512 44f3063f5ada8d7e4be644b6d9cafc79b9c4e03d58f6843da20782ea945832d3d70ed02e4ad26594f97b30d2b77bf2339fbe11e671a0772ca3bfbef7db533210
 DIST openpgp-keys-apache-tomcat-8.5.88-KEYS.asc 45686 BLAKE2B 77604cd61e33efa2df702a992bc27cdb2060da1714c00bc75ee0438e1374d7b63a9a02c7aaa917fa982c0c8112bf29974b03a46e78146c9d51c360bc6343b898 SHA512 44f3063f5ada8d7e4be644b6d9cafc79b9c4e03d58f6843da20782ea945832d3d70ed02e4ad26594f97b30d2b77bf2339fbe11e671a0772ca3bfbef7db533210
 DIST openpgp-keys-apache-tomcat-8.5.89-KEYS.asc 45686 BLAKE2B 77604cd61e33efa2df702a992bc27cdb2060da1714c00bc75ee0438e1374d7b63a9a02c7aaa917fa982c0c8112bf29974b03a46e78146c9d51c360bc6343b898 SHA512 44f3063f5ada8d7e4be644b6d9cafc79b9c4e03d58f6843da20782ea945832d3d70ed02e4ad26594f97b30d2b77bf2339fbe11e671a0772ca3bfbef7db533210
-DIST openpgp-keys-apache-tomcat-9.0.73-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
 DIST openpgp-keys-apache-tomcat-9.0.74-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
 DIST openpgp-keys-apache-tomcat-9.0.75-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
-EBUILD openpgp-keys-apache-tomcat-10.1.7.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
 EBUILD openpgp-keys-apache-tomcat-10.1.8.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
 EBUILD openpgp-keys-apache-tomcat-10.1.9.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
-EBUILD openpgp-keys-apache-tomcat-8.5.87.ebuild 562 BLAKE2B 1fc6086cfa3bea924ab3684009e458d3f6eb177e01758a103ea6d1b907d085ac21844395996fef395d15da44c5c5936c3f85485c2fb73d7823b892ccf19e9634 SHA512 b4124756d967edea63bad9bde86c85feb1a10f37b5cff7d7c4290968bd2b77bfc608901b5b69b8365af1a18a274e2e3f05596709838f2fe063e6a39c08020215
 EBUILD openpgp-keys-apache-tomcat-8.5.88.ebuild 562 BLAKE2B 1fc6086cfa3bea924ab3684009e458d3f6eb177e01758a103ea6d1b907d085ac21844395996fef395d15da44c5c5936c3f85485c2fb73d7823b892ccf19e9634 SHA512 b4124756d967edea63bad9bde86c85feb1a10f37b5cff7d7c4290968bd2b77bfc608901b5b69b8365af1a18a274e2e3f05596709838f2fe063e6a39c08020215
 EBUILD openpgp-keys-apache-tomcat-8.5.89.ebuild 562 BLAKE2B 1fc6086cfa3bea924ab3684009e458d3f6eb177e01758a103ea6d1b907d085ac21844395996fef395d15da44c5c5936c3f85485c2fb73d7823b892ccf19e9634 SHA512 b4124756d967edea63bad9bde86c85feb1a10f37b5cff7d7c4290968bd2b77bfc608901b5b69b8365af1a18a274e2e3f05596709838f2fe063e6a39c08020215
-EBUILD openpgp-keys-apache-tomcat-9.0.73.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
 EBUILD openpgp-keys-apache-tomcat-9.0.74.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
 EBUILD openpgp-keys-apache-tomcat-9.0.75.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.7.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.7.ebuild
deleted file mode 100644
index 81b3505e76ec..000000000000
--- a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
-HOMEPAGE="https://tomcat.apache.org/download-90.cgi"
-SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
-
-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/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.87.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.87.ebuild
deleted file mode 100644
index f17ae55806f2..000000000000
--- a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.87.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2023 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/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.73.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.73.ebuild
deleted file mode 100644
index 81b3505e76ec..000000000000
--- a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.73.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
-HOMEPAGE="https://tomcat.apache.org/download-90.cgi"
-SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
-
-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/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 44283e4af78d..aa20d559143b 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 805ef6a2c96c..509db5f5368a 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -6,14 +6,10 @@ AUX tomcat-9.0.72-build.xml.patch 3794 BLAKE2B 886bf69f4c78f385249e02e1f91ed9106
 AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed
 AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
-DIST apache-tomcat-10.1.7-src.tar.gz 6075723 BLAKE2B ef00c3c43a6cd6c68b09930fd7dc8f822b49f5cec3a0c2b3dad1cb20e5f37ff17f35dfd48c5a8537dedbb9c3887620b6e0ec29272a002df46aa8fa0e5ccbaaa7 SHA512 3daeb5cb3650382224ba4b5cf830c7288531b7f565fdde4a8acca1ee66bebbbfafb4790a6ce50b965e176e9669203e90342e61d42d1656fd12f656d9394c3283
-DIST apache-tomcat-10.1.7-src.tar.gz.asc 849 BLAKE2B 79d5d6885dd3304999a3ec1e16ffeca95df0b0b135ad6733b932b745e248bfd84be06f7eb70588167e7a8b74c4fa1db93cfba99dee10b8ebc00b7ce46226e128 SHA512 ae5c9238ea33743ed40dc74e47e6441f52437322376df94b770dd00e354dc67851cedeb2b4b1148262bdb12b15f7ded49d0f5ee050d451006fa81c5c86b20768
 DIST apache-tomcat-10.1.8-src.tar.gz 6086270 BLAKE2B 080ffacfb3b010605fa901319f3f059524f532306af5a5d05a0e4eaf108be06ed139977ef39e8b9fa0423fef0ad073305b57793bcbb4e897bbb0239cee183017 SHA512 14ac35a22d24284b770182996388bdc004defc5e56e65d2420e096a1e1c5c45887e4a55c0174884294acb7c99e6412f98159bb9be92de337e1a1cacc48d39ea4
 DIST apache-tomcat-10.1.8-src.tar.gz.asc 849 BLAKE2B 2a62d64e349739397fc786b92e75a14b74d3e8f9243a4f90ca17a070d85bb31707417da01d9d34217a23ab10157dbff46857efd65629a66aa41be861fe036ca5 SHA512 e818e040be1e1c29c989228cf72586ac8a602a93373ac33760db22578fbf79a5202f038b4cf36a0ec3549112bcdd5f5629a6859119aa0b129fef923c073c3055
 DIST apache-tomcat-10.1.9-src.tar.gz 6098538 BLAKE2B b2699765e48168cfb75dfbb3168cfd96caf53a76b492d6dfe94be9311d0cdc470c549329bb8a647e7a5d8ce0784d3491dd03d8dd8d9463b0492b581b97d48373 SHA512 25e0e268697ff83ebd6c06f8e03eca0463cb41bb99827b60334fe9772670c3ac8bd18853817ee481db68a2ac7b0389e86274c6fe5c6c9efa97a2866754f07e5b
 DIST apache-tomcat-10.1.9-src.tar.gz.asc 849 BLAKE2B a961fa216154458472745e1de16f0b3530c9e038d604ef39cee341a36bb9e17062dae68fe72c7d019ec79e668e3207044612fe159387339c9d1d331ed70ca480 SHA512 c9cc5c535e51cf2a6186506692409f3ae098059c2188c1baf48e67f4c5c6d890130535c78d9d109bb9dda1de5d5b87ae477c1ede6aeea3e7ff9217ad4858430a
-DIST apache-tomcat-8.5.87-src.tar.gz 6041463 BLAKE2B 2b41e324be028b9bf4db3fcd32a45ad6a84644535c20c5a46c7850c8b0ee054130a7fa5091009928b71c8ece2f24f49530845727cc3f1b6d5907de07d7ad3703 SHA512 cd15fc27c781a0835ec5c35726832f51abfc8bba9b647e690b3dadb7141b5c96b5014f0d6ebf46277d43cf10e2839ef0229dccf87c0449f2004ae90041ef10b6
-DIST apache-tomcat-8.5.87-src.tar.gz.asc 849 BLAKE2B 05a5911b344b5ffdcb392189b64dc4c4d31d000a8b653338780e74ab569a3b024a13b491ba4946bbf68b5955af65df05bfe7b4795a120977f1b26a2bcff0c96d SHA512 fb56af00d3f9302251e65a08d852992192137eeed0eecf100bcfafb778e01dfb92fc024f47ef41ca71f01eebb3622fcaa53fcb776403939313502039080a2b4c
 DIST apache-tomcat-8.5.88-src.tar.gz 6051684 BLAKE2B bae4785765d2c373a5507bf1f422a9d4d0c0157f7b642bb2c34edeefc341af6661fc55077b03d8f5fc77744bf903792f0fdfd7265efebdafbeca35fb04a3a20f SHA512 f3db0daf451ab6ef34163e2adf6388cd4d4502c7b28915f3ae954b79ea3fe5ed17c900294bac0b192268431a62d501b3b8d35f6d9e0bcb3ae1f9962ac3b8a084
 DIST apache-tomcat-8.5.88-src.tar.gz.asc 849 BLAKE2B e82e714721272c7ca6e6837a4be369c9ef3ad6c654f56ba15028f7f8d8f54ab62d7c1da32a2f4914c417889b3b65ef9f5ba6dea7d8ed4125de871ee4f91339df SHA512 f5ad2bd77287e763d7a09b5be17601b318ed6492d5c476903eadd54304b19afbbedd90ee5232b5dbc30ee597ed3c4fe5fc371c3d9809b94ca1614fcde1bec4d1
 DIST apache-tomcat-8.5.89-src.tar.gz 6064408 BLAKE2B b8f1a4ae044c1609c37bad9b51e2afbb84b111e9d68bbaa6f0a5499c85f5f36394bb5871a2b3ab4ee7895d13ccf4538bde89d64ee0c5e01d8932d18dc3b0e103 SHA512 610855dfcca593d20e813dbd1a2410c9b6767f2efe79b24b2ba69304047b835b212f86758c020867e46bd3971ce98e88a56b99a4ab651e228ae5b4eac08c4ff1
@@ -24,10 +20,8 @@ DIST apache-tomcat-9.0.75-src.tar.gz 6241477 BLAKE2B f48f47f99fa3eecc4d450674ebb
 DIST apache-tomcat-9.0.75-src.tar.gz.asc 833 BLAKE2B bc590f3d5697da75a095be4e677be311cb7e558ec4f81d1503e1c2318daecaac4bed6c6ae7fc067ea784e8b2a9b14ba59d4f546d677925a3d527c604cf26235b SHA512 d154420e27d0ca6a4c04c6b79585e60591decdfed1728c5ce2e80aba827eddc8a706b9fe6df9e790684fc158bad0320cc81eaf294e97ce7f4c8cf613bb8404f1
 DIST biz.aQute.bnd-6.4.0.jar 16303123 BLAKE2B 73cdeb9e63c04b41db26f91efc3b01fdfd7c8796d6b1f556c77f90bcdbe048f374b5164b885689f3e62ca45b8ca8b97fce70e1fa13d807d2f76869155c8ba7f5 SHA512 b113177f97894b0ed5cfbc38f96c995d6425e981ec8c7b27d99044793ff77dd2450367ad9ee977f443fba349fe1d68fc26f3aaa737eba0a402abcf29716b2e85
 DIST biz.aQute.bndlib-6.4.0.jar 3200265 BLAKE2B c8b8c1d0ff398e2a701edc4431cd8d65671a5e5daa0ef04be6b02eabb570768e0202640c15ce1290a5ae21bb31700a89f2822826851d7dc026267cb31da9f1ef SHA512 15a20751d879291c31b6530cb0d51652bf5bb33bf944ed703369eada439df6464190c01e2872ea6e7535209abd0b4692ea8980499d4b43edfffcc5729633c85d
-EBUILD tomcat-10.1.7.ebuild 5786 BLAKE2B 0dde89723c9e9ea059f846e184bfe502014a828e921a8b2d2df2204939aa53b9be4602c2b757cfc93fb36dc8e9ba18612a38a49bb527758bfb92737661ea182d SHA512 a5327a33f611f68e5582a22026452f8a89eff27abcf267e75c928aea078737ac5b44f179bf5dc6ef0436243f16b5226431d0ef03c6b8a157f835d5afc8f08503
 EBUILD tomcat-10.1.8.ebuild 5786 BLAKE2B 0dde89723c9e9ea059f846e184bfe502014a828e921a8b2d2df2204939aa53b9be4602c2b757cfc93fb36dc8e9ba18612a38a49bb527758bfb92737661ea182d SHA512 a5327a33f611f68e5582a22026452f8a89eff27abcf267e75c928aea078737ac5b44f179bf5dc6ef0436243f16b5226431d0ef03c6b8a157f835d5afc8f08503
 EBUILD tomcat-10.1.9.ebuild 5787 BLAKE2B c75a963504b636477be460f2fb1938b5ebd2aa757c563a2dab47c075b86ce9dbae54ac17f01fb88c4b53daf3a6b04b15567e6c6e3f06bc2dee5657683bf94f1c SHA512 1d3f73161a73c3a5513bc78b391eec20a4a332529fc9f2370581015a83404edd7e01f767c3126b4cd25392985d0b84a05f1825c70ed431af4c5056ee9734e92f
-EBUILD tomcat-8.5.87.ebuild 4649 BLAKE2B 1e4b40f696dff7f9e3f8eceba242cf13059f90904a16fca5334e7705b5905f2ce14175eba2f9a8c4e6c88aec0668a96a90057ade846ce3bfa0d5c671efdf3169 SHA512 e531dd28399421d9cc78237cd36c70bcb21aa0d760d3e9375f5b2a20a08a640dba2854af9a67eff2501efc8f917fce7ef9b13d9f553902af7b47d81f675349aa
 EBUILD tomcat-8.5.88.ebuild 4649 BLAKE2B 1e4b40f696dff7f9e3f8eceba242cf13059f90904a16fca5334e7705b5905f2ce14175eba2f9a8c4e6c88aec0668a96a90057ade846ce3bfa0d5c671efdf3169 SHA512 e531dd28399421d9cc78237cd36c70bcb21aa0d760d3e9375f5b2a20a08a640dba2854af9a67eff2501efc8f917fce7ef9b13d9f553902af7b47d81f675349aa
 EBUILD tomcat-8.5.89.ebuild 4650 BLAKE2B c16f87d43ded61e661d3ac4031e2372cbcdf6fca64afb0f7a76d1ab71bcf2fd73096b8afe5239b6efb103c2763b52805d52571ff3f9f133e6a8ffc1dc2e011e5 SHA512 7e213a31359181a6f2cae5e6c9836b0825fd2fd51a130daf83cd44b74f48374fea451bc48822da85128173e336438b6f0b1145aec9fd0606f6d03b0ea6515f0e
 EBUILD tomcat-9.0.74.ebuild 5648 BLAKE2B a2fec52af2982e3db8311388d8d46691aafa6c98da71683f4ab97d174bca7dd0c546975b8b02b02f1890020b75d92c231aa90539d7bf81e7e6a44a38dc1328b8 SHA512 6f7ad632749477699cea962d7672433209aaaa9bc6503de50aba362e1b5fe554e4478f9a6538712ecce035431d3edf5f3ddd9f927362abc3bec6cfe093bfd88b
diff --git a/www-servers/tomcat/tomcat-10.1.7.ebuild b/www-servers/tomcat/tomcat-10.1.7.ebuild
deleted file mode 100644
index 0441c95309f2..000000000000
--- a/www-servers/tomcat/tomcat-10.1.7.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix verify-sig
-
-MY_P="apache-${PN}-${PV}-src"
-
-# Currently we bundle binary versions of bnd.jar and bndlib.jar
-# See bugs #203080 and #676116
-BND_VERSION="6.4.0"
-BND="biz.aQute.bnd-${BND_VERSION}.jar"
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
-
-DESCRIPTION="Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}
-	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="10.1"
-KEYWORDS="amd64 ~amd64-linux"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.26"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/jax-rpc-api:0
-	>=dev-java/jakartaee-migration-1.0.5:0
-	dev-java/wsdl4j:0"
-RDEPEND="${COMMON_DEP}
-	acct-group/tomcat
-	acct-user/tomcat
-	>=virtual/jre-11:*"
-DEPEND="${COMMON_DEP}
-	app-admin/pwgen
-	dev-java/ant-core
-	>=virtual/jdk-11:*
-	test? (
-		dev-java/ant-junit:0
-		dev-java/easymock:3.2
-	)"
-
-BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
-
-PATCHES=( "${FILESDIR}/${PN}-10.1.6-build.xml.patch" )
-
-S=${WORKDIR}/${MY_P}
-
-BND_HOME="${S}/tomcat-build-libs/bnd"
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
-BND_JAR="${BND_HOME}/${BND}"
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
-	fi
-
-	unpack ${MY_P}.tar.gz
-
-	mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
-	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
-	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
-}
-
-src_prepare() {
-	default
-
-	find -name '*.jar' -type f -delete -print || die
-
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-
-	# 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},jakartaee-migration,wsdl4j"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_configure() {
-	java-ant-2_src_configure
-
-	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
-}
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only jax-rpc-api)"
-	LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	# add missing docBase
-	local apps="host-manager manager"
-	for app in ${apps}; do
-		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
-			output/build/webapps/${app}/META-INF/context.xml || die
-	done
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw="$(pwgen -s -B 15 1)"
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:"
-	einfo "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "Please note that since version 10 the primary package for all implemented APIs"
-	ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
-	ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
-
-	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
-	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.5.87.ebuild b/www-servers/tomcat/tomcat-8.5.87.ebuild
deleted file mode 100644
index dc4d5cb47d2a..000000000000
--- a/www-servers/tomcat/tomcat-8.5.87.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2023 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 )"
-
-LICENSE="Apache-2.0"
-SLOT="8.5"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-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-core
-	>=virtual/jdk-1.8:*
-	doc? (
-		dev-java/jax-rpc-api:0
-		dev-java/wsdl4j:0
-	)
-	test? (
-		>=dev-java/ant-junit-1.9:0
-		dev-java/easymock:3.2
-	)"
-
-BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
-
-PATCHES=( "${FILESDIR}/${PN}-8.5.86-build.xml.patch" )
-
-S=${WORKDIR}/${MY_P}
-
-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-core 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."
-}