gentoo auto-resync : 27:02:2023 - 10:00:13

author: V3n3RiX <venerix@koprulu.sector> 2023-02-27 10:00:13 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-02-27 10:00:13 +0000
commit: 73ef00f9e2b100c7d0fedede11300940cc26670a (patch)
tree: 19d1f10cdd98aec4743c36942242eac9f318641d
parent: 063e5b486db858a2b1ecec798af89f5484d475bd (diff)
560 files changed, 3131 insertions, 4842 deletions
diff --git a/Manifest b/Manifest
index 5ac819a01cfb..dcc4e7d03862 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29424 BLAKE2B 1eb8925675f018e81239c150908c25e89493469f69945c90b0ee5bcf8f911d65cd0b4ecf077284ac4c3fc3807cf45a95d0389c801e34f8ce616a74d3d46e332a SHA512 739160a40fb1a4b265f662c339538c8ed3b784840a36ae6b0b096c8b43ae74e0af4edbec59409956cf8f4639e58efd15c7584424c829a10fe5e3c1779db144ef
-TIMESTAMP 2023-02-27T03:10:02Z
+MANIFEST Manifest.files.gz 29439 BLAKE2B 8dba3efd1f4168509689a16ba5648e808375e6a6304cb46f343b9958c41791a6c27e4dcc590a9b5f75c4b3289322b5330f34681ebef26c1c2f9b36c28d6ffbda SHA512 e1b9cf03cfa04ad5529463fe8f175a9b4392156e5fd990c718f8c9ae2c06306d26057b2029cacef032025a52af1b4ae6d31e9a73c52a69436d59765696da5b8d
+TIMESTAMP 2023-02-27T09:10:04Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP8HwpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP8c2xfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDKRxAAjt/h9sn/fAM6uoHIFI/+wSrdDhE1SCSpvywkFJ0hPp3OoxDVQQdg07xx
-nUus73II6UrrO345TOrFqHlsrFzE1fLJOJ40gDyWgmVFkKzNsLiPJlpsZslb1PT0
-r/sk0YsJN0f3ra4CZ7tcSzYofiknsO48/ppcQkZ2+YlNwA44WBW0/nMFi/SX5kEJ
-61eTu/a+M2j7fwgtZ+pH2uykxxXjp+ijXYn9m38zZHAAWTG3NXsyGdBfuq0qS4vC
-XpQIV9Dyfe0yMKrK3/TMZOEVumS+QEV2RYzmK6WX9+86l1qcDoVbB1FtJJik2J1s
-bKmnJS8ixdkSemYcGYWLVnzIILpkTjkE4DZmLV5WFsbtXBvmSLnbixjjUVzGh/Yh
-VPe8Tv/2XKILMTfx2UXXzQrml9/pvQq9Ruw2u85yKs72zS6QU8v0URHmpHuF9Vmg
-p/RSo79VJ7/1i4JnW0GZfKn6nzlrX1D5/mMDvBxKKIqNjJ2NhR0At/N6W8EjT69E
-+rSoO1qEO0wVEkROulDmrsuTdTS+qZJ13unq3nLtuItAkBhqtMnXnMiUw7RgkulI
-mbHB+wAt7Wj3mjxN3T6otlCjhRzwtbirvuBnnk8D+Vt2IfqlLrE0tqTVpqyb65H+
-D+F8LDX1It8YtbY81h9HETWTIMhOdJ2PBcmbizqTqH9xDtvjcVE=
-=OhPU
+klC66Q/+LdXElunDhton2gF8QzLk2Qc68ndLZe2pklaY5TsRX9YdjfVmClRfSxDu
+eqseQJat+IWQpqMgjQGQD785JO5IRLIJITbhPFHlJeR99/gehVc/SZR9e0kqZPhk
+pHYRwraaLBauxCVPfDhR6Lo2vQw5qmH3I4Cp7xqU4W2oB351IprLOYyLQiiJK6om
+h2P7czyjgK+lI7p1pNUlt1XKd+PyxLvqSiJlrIQ0FYI/X8WHteybE6nukF4x3r03
+8a3NzvYXbExRG+yTdBdP/NT+zUZOW2qwxYoUWSu9BFwrMgX98RXpNVgTeM2P4j8Q
+ECNyyRNsJ3aqo/5Mtrmlcw10kiKr/KhpaTyXEIVIaQqCzrbP4AUB2xB4is7E6osD
+VBFLV1n68FDAe/9lCNlfC1GE1m4/wbHjEhKQ/xwB4YvRXnhIT91oW4+dM2tHxg4P
+Tl3kvuuRsS0OLqIN2F8JFk5RWqQcpkvPcdnCUmkM+yrobFkt/24O6imaDEBsYxML
+2XfSld/SfCF1IbYL2H05ftaBUInB18PHoP3IP1V1HRYF2s58XJwJNglXkAlyl3qY
+EX2A5SX3X14Y+UeD5AL9tBz2AAx8fv5ONMd4f1RC9Cs2yfs9gbwiXrUaBAZaVDZW
+jQ5kpcQ069cLVKEPZpzQ/6rdF9wYLec5AjRAVVyJV2ILquIfy5A=
+=s7fr
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index e741b969026f..fffd89004bc6 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 79fab3db6521..e60df7cede11 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-pinyin/Manifest b/app-i18n/ibus-pinyin/Manifest
index aa6a6cbbae60..ba8863d75055 100644
--- a/app-i18n/ibus-pinyin/Manifest
+++ b/app-i18n/ibus-pinyin/Manifest
@@ -1,6 +1,7 @@
 AUX ibus-pinyin-1.5.0-content-type-method.patch 5534 BLAKE2B 658a4d099b02b344f38a9ef2fc2df0d2274dcd3b8071fac0aef0accbf7c21f0d4e98b9587d665b13195d7efc04bbf58218de84069a2c63eaa79156363061dd86 SHA512 3399052f0d12eb55554d5cc98637125e6648a56f3dc87eb2fadc63af3fb82bba915e820c51596d9106637f6a063100f217ad001422a61f8925db5c5b2024c976
 AUX ibus-pinyin-1.5.0-python3.patch 2983 BLAKE2B 35f8b1d0649a3614fcecec78b3246dcecd8b40f68d71165b2c40d802bb42bff1d8f3f4c2c1baf25fc6ca97e190f7eb2004054f4d9857b605129b45c41b273f52 SHA512 c9eda6fb227358c8214ba717f6d800f3c47f9110e99e16601966651bd698cd703daedcec82a2933b76701bc05870ff88715a6d639333b5e5959c1f5e86e2dcff
+AUX ibus-pinyin-1.5.0-sqlite-3.41.0.patch 764 BLAKE2B fe9989fb0b5935a7baa429ef389f8e874d0c59fb849e771e810f8581fe9ed928ae41bf868954a440adb484bb9ea502f005bcc084f7cb15d1070e386ee439d783 SHA512 b9165594d6c97dd511eca6b5c61486b4f1a9be2acda0a35d6013371fb08e13d244ee046f7cf30f568d32367a96f9d19402361ffd8e2b69877e0909d110ec7d09
 AUX ibus-pinyin-boost.patch 409 BLAKE2B 5fececc7f4ed6941d374799ccdb1d9d7deeeb7078bedc8d0085e12f8310c42d752c14168a7d07a88e9412fa9cbff5c5bdf4274202d2ed6b6e7f337a96c65c3f0 SHA512 8e4efe9b5d12d35672dd8891a49599bef6611aeb723e8fbc08197896e417cca1d55cf31a0bb1f3ec572db489b01aa36349eaf9238d1a693483d6e21bc10eab2e
 DIST ibus-pinyin-1.5.0.tar.gz 692516 BLAKE2B ae53eb79ea4e5336347d689814d8ef033551a9b432268e643927b28911da3d03701acb3f337d7781168461c1c53537f2271fc8f253d1e99a269f61ae5eb83b05 SHA512 b0cd849ee3154543747dde8994eec9aed01d67e0d9be308a2f0230cf22f0281cd8fcabd9763b24238547a37e54400bcd8e541937767b93f005d04302f0c00241
-EBUILD ibus-pinyin-1.5.0-r5.ebuild 1307 BLAKE2B 4f81a2955574925ddc2592125f01888d580eecdc8ec5f0e85849fe8cc41ac104090cac5fcb3b6a36f08676c6b1f7e344e84a91af631d113b13961c312a8cc9d6 SHA512 b4b722f844e1364dea4b35a06091daf0be400f9ed97297d45de6aa52653daa49135a7e3677e89d7e10697ece463b6345dadeea3e09f71b2c1cfb257a8c0b0017
+EBUILD ibus-pinyin-1.5.0-r5.ebuild 1347 BLAKE2B eb00cbb1bb3d6281112a7bb70fb5405e0f1dc3769f1c33000b34a9c46af2fef5c95140066f9cd1987697a2e1c2dbfbb6d49f088300e3d0b469039836b780743b SHA512 3045384031a24255946759d9b0be08c9b6149486527346405933bcc0e71240bc1e9ee8f8e11bf0e0e860119e1aaacfb301f5dcb0d66977b8f959442877276b44
 MISC metadata.xml 525 BLAKE2B 54c6aef9209148f57e663ae762242e0d3d0ef4ecb1eed537c8509083c8094842074f072668d595bc55d28698a1433997632ce0daede144cbaff1b35a32ff0447 SHA512 7dd6aa126f71457e8e86a2b02998944144399b73815f5afa789a320f531d74e41b5d7a21b2639ec673216bae09fc0b1e09659d8e975926a7c03934e5beddc2f2
diff --git a/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-sqlite-3.41.0.patch b/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-sqlite-3.41.0.patch
new file mode 100644
index 000000000000..0faa622e3230
--- /dev/null
+++ b/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-sqlite-3.41.0.patch
@@ -0,0 +1,23 @@
+UPSTREAM: https://github.com/ibus/ibus-pinyin/pull/12
+BUG: https://bugs.gentoo.org/896366
+AUTHOR: jinqiang zhang <peeweep@0x0.ee>
+
+As sqlite 3.41.0 release note say:
+
+ The double-quoted string misfeature is now disabled by default for CLI
+ builds. Legacy use cases can reenable the misfeature at run-time using
+ the ".dbconfig dqs_dml on" and ".dbconfig dqs_ddl on" commands.
+
+We should change this double quote to single quote
+
+--- a/data/db/english/english.awk
++++ b/data/db/english/english.awk
+@@ -16,7 +16,7 @@ BEGIN {
+ }
+ 
+     # Insert data into english table
+-    {   printf "INSERT INTO english (word, freq) VALUES (\"%s\", \"%f\");\n", $1, $2}
++    {   printf "INSERT INTO english (word, freq) VALUES (\'%s\', %f);\n", $1, $2}
+ 
+     #quit sqlite3
+ END {
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r5.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r5.ebuild
index 3524ba6ebedb..2df80c6b265c 100644
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r5.ebuild
+++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r5.ebuild
@@ -39,6 +39,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-boost.patch
 	"${FILESDIR}"/${P}-content-type-method.patch
 	"${FILESDIR}"/${P}-python3.patch
+	"${FILESDIR}"/${P}-sqlite-3.41.0.patch
 )
 
 pkg_setup() {
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index dc9b1c0fc0dd..5800fa155f06 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/openrgb-plugin-effects/Manifest b/app-misc/openrgb-plugin-effects/Manifest
index f71c412f450e..db399e5cfa5b 100644
--- a/app-misc/openrgb-plugin-effects/Manifest
+++ b/app-misc/openrgb-plugin-effects/Manifest
@@ -1,10 +1,8 @@
 AUX openrgb-plugin-effects-0.8-dep.patch 730 BLAKE2B 546d4ded2b5207d168e21f3057ca3c83bc3d01c0486bbe699e50401120227115ac0d4652de154832464d6f41f382d3f1d312d8fa6d86bb68aed8b9a91fe5cd68 SHA512 8ed26dfd686b40ac54a6920725e25a80af11a4c4707d3f071e70039ba4ce7f67f8ed19d819fdae3543aa0d1117d228e43d2e51ca5c171019e81301d782a74aad
 AUX openrgb-plugin-effects-0.8-qrc.patch 285 BLAKE2B 48a9a0090927599723bee4d131f7394dd9a5d2d139e1fbce933bd39e91ec48693f595b3b75cdc1a4fd1ea3527ce679ef1f9dc4f188986c7ad2d805868c4e76b3 SHA512 e0a9b194dcd790c3e9e1b02a813611d3e338e30d49dbf315da2a0019c8ab947407befdabc29dd79f9573fa5c3b7f3e6e7961039d03d70dec1c9b9fb2d14287f0
 AUX openrgb-plugin-effects-0_p20220110-dep.patch 926 BLAKE2B fb1fc3fe50bcd2bd7acc07adcf371ae388185bbd735da695b43ed734b6939c9af7cc982250d6de3441d0cc9d78e7e0556e05076b0cc744a80fa428d41926dc6d SHA512 e458254ced95844dfe5f04e5e82c2f9a02acb6fc1c5302237b32629c12319c8272a89d9d530b8fa98bca702308fb3beda3a83258272d97a6dd1b669ba6d4c731
-DIST OpenRGBEffectsPlugin-a7222bdbcd3c52e13d96993a33c5648f1306aeba.tar.bz2 255129 BLAKE2B 8fc7ee994d80bd9fe8d8a76e26710ed0fec429aa8df835f6a46a64d4034a4fc2352d722c9aed26032bff33781b1f024a893d685f6883e1816872d91cd937c1d0 SHA512 386879a7a1f05cfcbcca792add1b18f2680b4fa7b139f8532e6f32d09a5194c381357d3cbb3883352c2a03280c9b0b0f1e9faef7e140c7535144c0d645832d3e
 DIST OpenRGBEffectsPlugin-release_0.8.tar.bz2 232858 BLAKE2B 71851eaa40719d8b04a91577756e76b248d261c344e461a00f2c60d26fe37b2a1a2d563a67f620a4c6887d21d4505cb715850f6f0eb4f133894833a72f22e8e4 SHA512 c1ad3f460a9cb4788e9eae3f6df1f0b60a838205a0655c1a639f1bcd04c00f99d55d9a51161267e543bbd961883d4ae0751babe7c98d9be395f104ac9d40e8e3
 DIST QCodeEditor-2021-08-17.tar.gz 95099 BLAKE2B d9eab343c956288b098c9fad4b523615beb7c1a860a00b8c84a2a71f40398fd2e82c335c5d82bb5bc2d15d35bad698a780ff4d1d3202f7555a93120e8a2d906a SHA512 4f8af3a45d3b16d06bc6e4b795f005cf917a80add8f738454751a47d40747df1215ba9b4e05a0f654251bc006521151f8a256c2e41be05c72abae4e55f383b54
 DIST SimplexNoise-2019-12-03.tar.gz 781353 BLAKE2B ce05f78b58439d57e369b8b3944b8d392bec80d579767cb1683befe5c56b90dcf40d405ff75d4541e6c17659f6e1abc83f5d3444fbe641724d21ed509e439854 SHA512 b1e27d6630a902006636ec31c3b1cead1857b255edc8ae8db74cdfee25300337200be48264c6adc0e2c0e39a3693e361d448e61ae62d2f0b700374b264d5e5cd
 EBUILD openrgb-plugin-effects-0.8.ebuild 1941 BLAKE2B 0d0d1e0691c8ecfc64f67468a1f777e20f35d62b4c1d201eef19f8e31fb0871f26eee5c5c4f779de34137a9f4b0700a90e7b67c38addf44dc69763c9d1d51fe5 SHA512 501728fa832e97c8dea52eda05bfb6609e610603fbe3f530fc671bc4a1447671cc3882c321b8324d574705ad6892838362623ab56f5d165c813cfd8eb3311bbf
-EBUILD openrgb-plugin-effects-0_p20220110.ebuild 1159 BLAKE2B 0cbccd6bdb5bcde75f53fff8bd6ee451687f125c9feb888c2bc9ebf3f90dddc4d35d64e5b8913aee79043188ebae096a5ef724865c9c3ada80eff80c6763e63e SHA512 14d56e6584a835c5b7b5544c0a25ff401ff4130632420389a3f682183017f02b8259ee4590256b865c34b62c41431ee5782175f66011dc1bcdd599cb90e5b11f
 MISC metadata.xml 484 BLAKE2B fd1a7614f29a1040964e8f43b99240608d34b41b1f3904e3a2b8f33c8cae130cc46dc87e9eb51aea1be82c48dd3ba377150a3b39f2a6399c27e422521ab38e18 SHA512 5b43156294061c4ff508d206e7621e31c493b403aacd648120e240c164203fc1508410f732c24b1e9df489d07d28eb21469df6c01111da413f076530838cf778
diff --git a/app-misc/openrgb-plugin-effects/openrgb-plugin-effects-0_p20220110.ebuild b/app-misc/openrgb-plugin-effects/openrgb-plugin-effects-0_p20220110.ebuild
deleted file mode 100644
index 3df6ba0bd54b..000000000000
--- a/app-misc/openrgb-plugin-effects/openrgb-plugin-effects-0_p20220110.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils
-
-MY_GIT_COMMIT="a7222bdbcd3c52e13d96993a33c5648f1306aeba"
-SRC_URI="https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin/-/archive/${MY_GIT_COMMIT}/OpenRGBEffectsPlugin-${MY_GIT_COMMIT}.tar.bz2"
-S="${WORKDIR}/OpenRGBEffectsPlugin-${MY_GIT_COMMIT}"
-KEYWORDS="amd64"
-
-DESCRIPTION="Plugin for OpenRGB with various Effects that can be synced across devices"
-HOMEPAGE="https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	>=app-misc/openrgb-0.7:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2-only]
-	dev-qt/qtwidgets:5[-gles2-only]
-	media-libs/openal
-"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/nlohmann_json
-"
-
-PATCHES=(
-	"${FILESDIR}/openrgb-plugin-effects-0_p20220110-dep.patch"
-)
-
-src_prepare() {
-	default
-	rm -r OpenRGB || die
-	ln -s "${ESYSROOT}/usr/include/OpenRGB" . || die
-	sed -e '/^GIT_/d' -i *.pro || die
-}
-
-src_configure() {
-	eqmake5 \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann"
-}
-
-src_install() {
-	exeinto /usr/$(get_libdir)/OpenRGB/plugins
-	doexe libOpenRGBEffectsPlugin.so.1.0
-}
diff --git a/app-misc/openrgb-plugin-skin/Manifest b/app-misc/openrgb-plugin-skin/Manifest
index 9a848622b1d9..530a892feffb 100644
--- a/app-misc/openrgb-plugin-skin/Manifest
+++ b/app-misc/openrgb-plugin-skin/Manifest
@@ -1,5 +1,3 @@
 DIST OpenRGBSkinPlugin-release_0.8.tar.bz2 22711 BLAKE2B 25325c6be5cf619940e79e4f431871478e3026188d7aba4b8220a99afda8f75d18ffeafa0f905110d4ce44f5d7e28208f3d7b358cfadfcd4719a22f1ef5cf70d SHA512 89b9a4bcda4600ea7dbd05972bba7c5f8d917606b3def4971e6ccff84d8510ca420747dd85d3395bfea29e62adc775b592f9cbe20a6966776a46e15593f2cf59
-DIST openrgbskinplugin-ebb80f7bd0e1efaa995f60454f3c049a4607bc3b.tar.bz2 22843 BLAKE2B 30c88b143b3df829c543744b20424df24bde9dda10f770fb78d653609111801a4d1d3fe16ed3e3c15ad953f41113db5d4da40bc66f7ec57418b2e934cd9a2e32 SHA512 a70c0157072b6b638a5a4f3f48f41c73f422d0ac356174479901cd3d088faf6fe96e594b2a39b15de305e0355fd0d252dafc4a30b9216d57058ad2cde7f5a3e3
 EBUILD openrgb-plugin-skin-0.8.ebuild 965 BLAKE2B 57a4038d23980e19ceec3e172a2371137495a31405e915c958dc1778aaccc63a8d53b7c920fc9c6d2ef5811129f4af15d1bd388a84b49cb60bc4794e38fb9c5b SHA512 99d661faf19a3fb1f40a01349e45986f9b5fe5eb0327ea927099f28b4011dba9370d37198830e7ffd42d477c84de9791f28819385301f884983addac3b02ed3f
-EBUILD openrgb-plugin-skin-0_p20211230.ebuild 1031 BLAKE2B 159cfc98558763303f0709bfa2b86fafe1571edb6aac806c37a76e711220e8b3111a51caea1e76bded0dc6bf97401cf63f8edc14fde78fd50e60f63027383514 SHA512 089258850a1b9b4d6d595358060350a76fc15e7dc8473a587190b1a432d38bb6dc071f28784f9ac7eb5c54ba55f347d76b6e6a11c57368718206080dc8aca124
 MISC metadata.xml 481 BLAKE2B f05f1f16d6180b976f0daa79964c7abe5f9f1caee3aa25c1b328916d810438b7e76fd54297412f02c6fd172d6ca754872cd7d28349c328c8ef9cc8af7069a4be SHA512 9a6815da58c1b372a4af82f96484625334c2977a416e902b824d2be17bc7624cf9d1d69f0bc25ce85b833133b81c10e9257f30c825fdeeb230c7ce8772cf4bfd
diff --git a/app-misc/openrgb-plugin-skin/openrgb-plugin-skin-0_p20211230.ebuild b/app-misc/openrgb-plugin-skin/openrgb-plugin-skin-0_p20211230.ebuild
deleted file mode 100644
index 3e8d07f3bf37..000000000000
--- a/app-misc/openrgb-plugin-skin/openrgb-plugin-skin-0_p20211230.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils
-
-MY_GIT_COMMIT="ebb80f7bd0e1efaa995f60454f3c049a4607bc3b"
-SRC_URI="https://gitlab.com/OpenRGBDevelopers/openrgbskinplugin/-/archive/${MY_GIT_COMMIT}/openrgbskinplugin-${MY_GIT_COMMIT}.tar.bz2"
-S="${WORKDIR}/OpenRGBSkinPlugin-${MY_GIT_COMMIT}"
-KEYWORDS="amd64"
-
-DESCRIPTION="Plugin for OpenRGB that allows you to customize the look and feel of OpenRGB"
-HOMEPAGE="https://gitlab.com/OpenRGBDevelopers/OpenRGBSkinPlugin"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	>=app-misc/openrgb-0.7:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/nlohmann_json
-"
-
-src_prepare() {
-	default
-	rm -r OpenRGB || die
-	ln -s "${ESYSROOT}/usr/include/OpenRGB" . || die
-	sed -e '/^GIT_/d' -i *.pro || die
-}
-
-src_configure() {
-	eqmake5 \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann"
-}
-
-src_install() {
-	exeinto /usr/$(get_libdir)/OpenRGB/plugins
-	doexe libOpenRGBSkinPlugin.so.1.0.0
-}
diff --git a/app-misc/openrgb-plugin-visualmap/Manifest b/app-misc/openrgb-plugin-visualmap/Manifest
index 92131a294b07..1da63625aac1 100644
--- a/app-misc/openrgb-plugin-visualmap/Manifest
+++ b/app-misc/openrgb-plugin-visualmap/Manifest
@@ -1,6 +1,4 @@
 AUX openrgb-plugin-visualmap-0.8-dep.patch 1318 BLAKE2B 88cc045e917dbc1224bbb7cf105890750e4161ad60acc2466ae2c575e1515a4a836d2b63b6baac9770cbd32e59af9d9ea73f0351778f1091c06e1e5e7dbefd07 SHA512 47f2dab3a0c706eeb5411e762016a19d01e04fd870902fe5fd13fc8cd6000bb5bbe723475ad71555daeb76f62b67ed42389beb2602efba5ea8824c31d90d6bf1
-DIST OpenRGBVisualMapPlugin-223c5ec67d256c5fa3bf7f3d572213114d93db6e.tar.bz2 54289 BLAKE2B b42b59fdc31f48d3e7be28051ccb02a2ba1befa1b1ed180a9313c8cbc50bad1c358ab5b4d8f249b488d5f32c801426078ef6c0c3c46dbec9695cb7b7cbf21d40 SHA512 eff52debcd027176a761fba71fb33d4a04802dd8f2441a86a825f3afecb268d2768edb8b03ec35ff2d17b5dc6f95dd0642e7d524fa7fcf93f0d215d712e75f3e
 DIST OpenRGBVisualMapPlugin-release_0.8.tar.bz2 51680 BLAKE2B c3423779f7a2082c8f682b519be2e1128b30dafbc4400414bd664f98de5c58701fbdbe9287a44951e8cf6ac4ee7c940a841f499ee1afce107e17537ad9df076b SHA512 7bf0393bc00bb69545ed02f6505f366aa90bb87350de6319977d02ba0afd38ccb895aa14edf02a42242b0a12f76ea2b135d8de5b3df10469c760b6f3d9dd2b61
 EBUILD openrgb-plugin-visualmap-0.8.ebuild 1027 BLAKE2B 03f53bb942f3934c516d8aa6a516fc92203b679497495979192238a3f51e6462a3dfc0e833326990e85d87afc13f984aa113945c20209b6b07e0544f01191912 SHA512 0d7892d31c14eedac3f41af54ad19b0004eefeba1238f500cb4928188f33d91d04a7533c81333e9594fe5e9693e06566e910bf14e96a249339937cbe0367cf63
-EBUILD openrgb-plugin-visualmap-0_p20211230.ebuild 1118 BLAKE2B 8f54089c739a6fb147b306cc3e420604104c5978b3e49e5e4779beadfd46ff0ec681687076cd0252d6f041736f27068d91e9b2f18b0b245a0dae41e92312d701 SHA512 32e7c6e85bb1eed5bb93ae7e68052318f6995627ee648de9f188e0f1455e01d44e3dc7aec2912d7952faa76aa87915f7c764bab9d01901faeef278458f5aa780
 MISC metadata.xml 486 BLAKE2B 01cbd7cbe4d88068db283a3eb33d0a23dc100e6effa5d8eea9970c96d75073053ecc161953c0d1ae08b4400c497fc8668004c217b3dde0a3d066f24f9a8f6e7e SHA512 41e51c4089d9e9648656339df9a4ccf52b8907b22da654331b1bd804fb150e0148c1c325e1e15a1f8e2d282f9568f91a31243e9cc9e4aa688d2dfdb75259c5f8
diff --git a/app-misc/openrgb-plugin-visualmap/openrgb-plugin-visualmap-0_p20211230.ebuild b/app-misc/openrgb-plugin-visualmap/openrgb-plugin-visualmap-0_p20211230.ebuild
deleted file mode 100644
index 510983023278..000000000000
--- a/app-misc/openrgb-plugin-visualmap/openrgb-plugin-visualmap-0_p20211230.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils
-
-MY_GIT_COMMIT="223c5ec67d256c5fa3bf7f3d572213114d93db6e"
-SRC_URI="https://gitlab.com/OpenRGBDevelopers/OpenRGBVisualMapPlugin/-/archive/${MY_GIT_COMMIT}/OpenRGBVisualMapPlugin-${MY_GIT_COMMIT}.tar.bz2"
-S="${WORKDIR}/OpenRGBVisualMapPlugin-${MY_GIT_COMMIT}"
-KEYWORDS="amd64"
-
-DESCRIPTION="Plugin for OpenRGB to create virtual devices out of multiple real ones"
-HOMEPAGE="https://gitlab.com/OpenRGBDevelopers/OpenRGBVisualMapPlugin"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	>=app-misc/openrgb-0.7:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/nlohmann_json
-"
-
-src_prepare() {
-	default
-	rm -r OpenRGB || die
-	ln -s "${ESYSROOT}/usr/include/OpenRGB" . || die
-	sed -e '/^GIT_/d' -i *.pro || die
-	sed -i -e '/RGBController.cpp/d' OpenRGBVisualMapPlugin.pro || die
-}
-
-src_configure() {
-	eqmake5 \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann"
-}
-
-src_install() {
-	exeinto /usr/$(get_libdir)/OpenRGB/plugins
-	doexe libOpenRGBVisualMapPlugin.so.1.0.0
-}
diff --git a/app-misc/openrgb/Manifest b/app-misc/openrgb/Manifest
index d7ea36ddd2a1..810677cb7b29 100644
--- a/app-misc/openrgb/Manifest
+++ b/app-misc/openrgb/Manifest
@@ -4,10 +4,7 @@ AUX OpenRGB-0.7-plugins.patch 1035 BLAKE2B 46025eea33f9cbef73994ea25284e05a7dc18
 AUX OpenRGB-0.7-r1-udev.patch 410 BLAKE2B 10e4ba5cc32abed1c5c6bf15426033b03c36929d0d54d247235793193d8e0df26dbd10e1a63edb626a88fbbc5b532f00fac997589afb8885205dad2f53022378 SHA512 0714dc6432fa0d75a8867079d6056f6dc35b98dd62da512643df8649cb2e6bf8de85408485e2b47b2707efef8727789549a216c8adf72447fd084320b1a8e931
 AUX OpenRGB-0.7-udev.patch 515 BLAKE2B c535efa9d6fbc5b0f56eb9914ca9c23d3d431f2d98b7d3bdee60bbb0abdb67eb5e21b75be9ec9226e8de1def3136d89175f0500e83ec97b3a23ad1ec1e5929ca SHA512 11c09942811077134c78fd916ab842c39361214888d13187071a2bbf8112f995915b491fd8e8574a5cb59b02d70477ac0ecf42592d433ec24feffe194f7a0534
 AUX OpenRGB-0.8-includes.patch 769 BLAKE2B b996f9d9e8e68416814a763451f6b706eeed8a884e5672ab26c926811dcd4b340afbbf8dd093a56501696a5c95a250f4f7317f5d5658c3b1d60073735fa1fd58 SHA512 710058f60a916404b1850e82a4fdbe9689cee6af8ed783a4a74297dfad46165227d88bda39816ccddcbdff3ef939a930a2977206d746f455e788af504ab91405
-DIST OpenRGB-release_0.7.tar.bz2 28053114 BLAKE2B dfab42fca654478ab359e6e46133fc20a4bf32aca35d1b2f475d3e4e5e218f35c7e1f03be15381b0e8d874ea24254b88b8fe21548a4183b29b4c66647aeef516 SHA512 6ee605bfc91da14d34bc89fe75790f99548253e2d6aa088e20d1996577629bf15fe0fae09e65d983aa829f54cfcbd33e13f2c7d493a2776fd1723f8725b62186
 DIST OpenRGB-release_0.8.tar.bz2 28631365 BLAKE2B 3b328e38f1c52646da02b0b2b2c22b1285f3b31b0a2bc684e99d491d04bd14a91b49bc196b3b81b537320cd872e5568aaa8aec34744f4f15392d9424a81ac6f0 SHA512 d69686da7cab33099b13cfb5ab876fc2db047f79aa01bf8150507ec41321b4c6c092f81623823b89916c70a1a24c4a102f77b1001c5caa721ff4c0c52e0630d2
-EBUILD openrgb-0.7-r1.ebuild 2005 BLAKE2B 23ae3605e3c24fa13cf51e6b7fe85ecfbf147879c4c73e4ebcb7841e883c9d79c4f08e48f42874143103dbf2eadf278cd9c5f182608bca569630ef381383323b SHA512 18310177457dc76583811c24d54fb9e12e34ba07ddcba0f5ad4672beab58374aaad2cd0922239bce69477735913575c6729e9ce3226db66fc60a517def50db59
-EBUILD openrgb-0.7.ebuild 1902 BLAKE2B 9c8a21faeb59e409f2957a05aaa5d86d79caaf32d80ee15720789cc445e6ad87c8d1c4c2d3dca7be2e714e9d69bee6cd0edc7372e1b8f7ab4266fbdc13a2b190 SHA512 adba8992c77da14cdcd8739b4f0d97eb8581edc6756611091c27decab37182aaa64d4d6c265b32aee942a3dcb8a7972857a7b85b6bf3896731f198a0628f8004
 EBUILD openrgb-0.8-r1.ebuild 2248 BLAKE2B f72fce033c5bdf5b58d51220483f0eebf46779838b7e3af3c2500cebf9e521e40eefa931d9c148df808248d9d1b123bba3e8205a3b70a6e4eef93439e6804eb9 SHA512 0b6bb2ab3bb8dc15183a922a6e367f74435aacf5b5bf148a73c84e9596a5e2d731a5e2091961864f20d5e08480cd8d6d6007e6c61e8bd3149452b54ba79e373a
 EBUILD openrgb-9999.ebuild 2207 BLAKE2B a80ad9c6ba5d042101e80941184afd24039cca544c920cfe01919dae874ac99af76fb23dc36c6f5b759c05b577a161823e771dee093d73a252d7c6d280e2e830 SHA512 36dd00491eed7e4fc069c971a44b1e5bf6526da72434ccfba88c092720a9f8d050a09762c6ab464f1ea5a810c5dea50fda3fa95819d8b7e04330a3c1f41d3918
 MISC metadata.xml 1228 BLAKE2B b3844d9c8b09d9d976ee41d874675b179a8e38b1eaaaa06e3052d6bac824dfc8c67102de54d9f62a3f24e4cf0157825608c060a56de2cc21bb71f8c7831148ad SHA512 5067cb355010ada60bfe789a511d02bf3d3a26083544104d782b9c08b0c70457f998c91c71f8d99e48f2d73fef07ea029fcc8c7848bdc5d625f5c1a8c9ca9ca3
diff --git a/app-misc/openrgb/openrgb-0.7-r1.ebuild b/app-misc/openrgb/openrgb-0.7-r1.ebuild
deleted file mode 100644
index fc7b38dbf97b..000000000000
--- a/app-misc/openrgb/openrgb-0.7-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic qmake-utils udev
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://gitlab.com/CalcProgrammer1/OpenRGB"}
-else
-	SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/OpenRGB-release_${PV}.tar.bz2"
-	S="${WORKDIR}/OpenRGB-release_${PV}"
-	KEYWORDS="amd64 ~x86"
-	PATCHES=(
-		"${FILESDIR}"/OpenRGB-0.5-build-system.patch
-	)
-fi
-
-DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software"
-HOMEPAGE="https://openrgb.org https://gitlab.com/CalcProgrammer1/OpenRGB/"
-LICENSE="GPL-2"
-# subslot is OPENRGB_PLUGIN_API_VERSION from https://gitlab.com/CalcProgrammer1/OpenRGB/-/blob/master/OpenRGBPluginInterface.h
-SLOT="0/2"
-
-RDEPEND="
-	dev-libs/hidapi
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	net-libs/mbedtls:=
-	virtual/libusb:1
-"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/nlohmann_json
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES+=(
-	"${FILESDIR}"/OpenRGB-0.7-plugins.patch
-	"${FILESDIR}"/OpenRGB-0.7-r1-udev.patch
-	"${FILESDIR}"/OpenRGB-0.7-json.patch
-)
-
-src_prepare() {
-	default
-	rm -r dependencies/{hidapi,libusb,json,mbedtls}* || die
-}
-
-src_configure() {
-	# Some plugins require symbols defined in the main binary.
-	# The official build system bundles OpenRGB as a submodule instead, and
-	# compiles the .cpp file again.
-	append-ldflags -Wl,--export-dynamic
-
-	eqmake5 \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
-		DEFINES+="GENTOO_PLUGINS_DIR=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\""
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}" install
-
-	dodoc README.md OpenRGB.patch
-	udev_dorules 60-openrgb.rules
-
-	# This is for plugins. Upstream doesn't install any headers at all.
-	insinto /usr/include/OpenRGB
-	find . -name '*.h' -exec cp --parents '{}' "${ED}/usr/include/OpenRGB/" ';' || die
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-misc/openrgb/openrgb-0.7.ebuild b/app-misc/openrgb/openrgb-0.7.ebuild
deleted file mode 100644
index a8ef5e62540f..000000000000
--- a/app-misc/openrgb/openrgb-0.7.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic qmake-utils
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://gitlab.com/CalcProgrammer1/OpenRGB"}
-else
-	SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/OpenRGB-release_${PV}.tar.bz2"
-	S="${WORKDIR}/OpenRGB-release_${PV}"
-	KEYWORDS="amd64 ~x86"
-	PATCHES=(
-		"${FILESDIR}"/OpenRGB-0.5-build-system.patch
-	)
-fi
-
-DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software"
-HOMEPAGE="https://openrgb.org https://gitlab.com/CalcProgrammer1/OpenRGB/"
-LICENSE="GPL-2"
-# subslot is OPENRGB_PLUGIN_API_VERSION from https://gitlab.com/CalcProgrammer1/OpenRGB/-/blob/master/OpenRGBPluginInterface.h
-SLOT="0/2"
-
-RDEPEND="
-	dev-libs/hidapi
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	net-libs/mbedtls:=
-	virtual/libusb:1
-"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/nlohmann_json
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES+=(
-	"${FILESDIR}"/OpenRGB-0.7-plugins.patch
-	"${FILESDIR}"/OpenRGB-0.7-udev.patch
-	"${FILESDIR}"/OpenRGB-0.7-json.patch
-)
-
-src_prepare() {
-	default
-	rm -r dependencies/{hidapi,libusb,json,mbedtls}* || die
-}
-
-src_configure() {
-	# Some plugins require symbols defined in the main binary.
-	# The official build system bundles OpenRGB as a submodule instead, and
-	# compiles the .cpp file again.
-	append-ldflags -Wl,--export-dynamic
-
-	eqmake5 \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
-		DEFINES+="GENTOO_PLUGINS_DIR=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\""
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}" install
-
-	dodoc README.md OpenRGB.patch
-
-	# This is for plugins. Upstream doesn't install any headers at all.
-	insinto /usr/include/OpenRGB
-	find . -name '*.h' -exec cp --parents '{}' "${ED}/usr/include/OpenRGB/" ';' || die
-}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 55fd401adf00..a567a9d112bb 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index 113e28d3fa7e..4ef9895ea28f 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -1,7 +1,5 @@
 DIST asio-1.10.8.tar.bz2 1270332 BLAKE2B 97e4a6a7c8b4562f10af1d122e9b08c12d567fd0447d1951a907f47f77832dcd42df4cb9b5b392feaaa2ea7c79d8bedfcf12e3052957ec012d8bb6b4d1347eb5 SHA512 d870686d2b19bec9925c311f2f0fd370e9797bbad252176a80a998f9c322ecd502b5081826105712e7caf87c03c3e6b70a0e219019e5bff46077d6e8c3c6db09
-DIST asio-1.22.2.tar.bz2 3077065 BLAKE2B b3660cf3c72d2d7ae122f89e8afb967cb89cc1de3f4859d481bbb8250cad6f03f187a4deb9e500a6231abdc5c9e727ef910c59d7c8b75bc6ba0f12ef94f05252 SHA512 93ea423cec8d13e525bf654291b6edd685f079c2af2da5a6f44dfe0b913e0f3df0a4770f1240ff760bae7842eee8ee3a13bed621c2ee1499abc76b100ebe3885
 DIST asio-1.24.0.tar.bz2 3150924 BLAKE2B 4c9b913452fd4288684020ca58b48e22745a39c6a0d682ba84ff561b94c695dc6f5203ed06817f4dd0b9098ea3012578f7c6b2f251b3857e660b0c222dbc003e SHA512 c877968229bc5c4c21156b2bbb9775c7b11c3878cd62e8df3afaa70b2f221c59c6e4fa425cfb028cd170f9453ac1c32c5229f89437b13ac39142e4b52304c820
 EBUILD asio-1.10.8.ebuild 920 BLAKE2B 57c2107a8b11c2f9532c7afcb7a98ea0a61a71180242e834a9090f4b25c69de0ae1a29398fbaa63fbf90036dbb949a9e76968102b4fd3a414c3679b4930ecb14 SHA512 0153b702cab5a6e8678c393c1644276915c69a522fa790e54a9fb932fea5f2fa37ce12ee7f9ba09b7020e14f1cb3263d89884e7d96e29238e5b01fa285f95f83
-EBUILD asio-1.22.2.ebuild 1134 BLAKE2B 5ad4b43a6fab034f4a8f91110df41ef7d32be8849e5ddad55a0936d8e274ca10e5cbd7ce9c23c9974831ccec97ae5c56470577b549eda1f0ae592a7c3e5b967b SHA512 c0230739a7f649d77d58fe8b00bae65231a9027c4c6af7a68bc37a0951875b6423c65a21ef38d96aff3074c6efb9664107d254ee887d6ffd37ce965dfcbc4237
 EBUILD asio-1.24.0.ebuild 1251 BLAKE2B 90792c9116e9d7833904e9038eb808bf1d8cda71740cacea4a628434fd518ed5959acdc7b46a739c13789b2ce87edc4b8c141a8f3d300c95dd6e60bde7557034 SHA512 c718366902f530001d13d4cf7c7c8b5ba98a26bdd351ea90ea0de54a357a48db9ba725c16907632aa4e5aef060cef8f9605a9e0f971c6261ee7ef6a5260dd13e
 MISC metadata.xml 487 BLAKE2B 57785b73f498590d36241612367eda9036cc4ce85baa6c59e45a4c4f0b696f24f7bbe012eef33dd2e29a9c82fad82f75639e55f9c7a6e2e001b7ab48b65787cc SHA512 4a4f9713ea7274f730707dda0f2de0e0c19e50166466c0b8c3e5053e44fa5df02866235cfd97ebeaff15271cce662f1ae19383c0023813d429eded937d9b9cfb
diff --git a/dev-cpp/asio/asio-1.22.2.ebuild b/dev-cpp/asio/asio-1.22.2.ebuild
deleted file mode 100644
index 198901e907cf..000000000000
--- a/dev-cpp/asio/asio-1.22.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Asynchronous Network Library"
-HOMEPAGE="https://think-async.com https://github.com/chriskohlhoff/asio"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/boost
-		dev-libs/openssl
-	)
-"
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	if ! use test; then
-		# Don't build nor install any examples or unittests
-		# since we don't have a script to run them
-		cat > src/Makefile.in <<-EOF || die
-			all:
-
-			install:
-
-			clean:
-		EOF
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/. )
-	default
-
-	if use examples; then
-		# Get rid of the object files
-		emake clean
-		dodoc -r src/examples
-		docompress -x /usr/share/doc/${PF}/examples
-
-		# Make links to the example .cpp files work
-		# https://bugs.gentoo.org/828648
-		if use doc; then
-			dosym ../examples /usr/share/doc/${PF}/src/examples
-		fi
-	fi
-}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index f27be9a619a6..9e926b662698 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest
index 3d71472de586..05c31cd6d46a 100644
--- a/dev-java/bsh/Manifest
+++ b/dev-java/bsh/Manifest
@@ -1,3 +1,5 @@
 DIST bsh-2.0b6.tar.gz 1720334 BLAKE2B 7ade7d35ac66dad8c79dd2cb541c8851b321601bc6239f4d82e6b37269fdefc5cfa5efd1198f58030bb9dcc4712b42c1ca07071f0b042a59ebdbc4168e472fb0 SHA512 3d4458153f5e2a3b30d9afd79f0fe28862effa8e490fd1649d435c03bf90b060c255949a49780afee95069da4e8e8d2e4e2c5d979908370a525b3ca9a396458c
+DIST bsh-2.1.1.tar.gz 1922883 BLAKE2B d60ebfab96f81a17120733887468571dd991dce663d725d9bee2dc44146e320d36600be70a3b7f76516645030d40fcda17db70989d54e98ffdc69c91738bcaf1 SHA512 585fcb9fdc8c36063a7d4dfe9a909e68b61d611f023731c955b7ced3f894cb6c48b0d463735e6825cb6f0181ba97902279212d285e325267aa533490e0bbfe00
 EBUILD bsh-2.0_beta6-r1.ebuild 1363 BLAKE2B cc838347fd0951d3e5fc26e473d6fb1febea04080bb85f30aee9bb33bc48f4e1784d55f73e81e47dc726ae4b200ef4c997765c96e9c062b9835effec40d0b310 SHA512 6ec85dc3b5cfe11e32821ed5f62cf63f06a9adf88978140c21846b5659d89bb3767e0e5e47d8cafd26d448a69f3865fc8548dff49740a3049bc72820b8d50695
+EBUILD bsh-2.1.1.ebuild 3293 BLAKE2B 1a81df14ecf67d0a3611b116173faef1de442fdc2186ef3333a46605a61b1e60c44f586f4d008ea53cd76de46dd8a8f888f4eacfe83812fd9a871d8f363ec9c5 SHA512 95c5b16fd630970a35dab87a049f7421e1f73bcaa275eba31ec447e3649c1ab47f4096193162a3aecb0b59f07be67375ffed7504d15e1a6271c03bfb5b537359
 MISC metadata.xml 331 BLAKE2B faccf5565dc11dfae5b8874e970f2d055f49319264c1c2d11a685659cd5c0dacbd2f915c8e45d376e8b210dac6221e172909f62be63030e4e257157feface3bb SHA512 bce4790cca3f4c4c883c1befc7d2dcabb1456dd88fef57cd2ffb25f45f9505f921a428c830d17c0ca92f876d921d56684bf7bce3bbe277c33ddd19fb03118381
diff --git a/dev-java/bsh/bsh-2.1.1.ebuild b/dev-java/bsh/bsh-2.1.1.ebuild
new file mode 100644
index 000000000000..f593111f6a84
--- /dev/null
+++ b/dev-java/bsh/bsh-2.1.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache-extras.beanshell:bsh:2.1.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A small embeddable Java source interpreter"
+HOMEPAGE="https://github.com/beanshell/beanshell"
+SRC_URI="https://github.com/beanshell/beanshell/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/beanshell-${PV}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+# There was 1 failure:
+# 1) do_not_access_non_open_methods(bsh.Java_9_Test)
+# bsh.TargetError: Sourced file: inline evaluation of: ``import java.net.URL;
+PROPERTIES="test_network"
+RESTRICT="test"
+
+CP_DEPEND="
+	dev-java/bsf:2.3
+	dev-java/jakarta-servlet-api:4"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="${CP_DEPEND}
+	virtual/jdk:1.8"
+
+DOCS=(
+	CHANGES.md
+	NOTICE
+	README.md
+)
+
+JAVA_LAUNCHER_FILENAME="bsh-console"
+JAVA_MAIN_CLASS="bsh.Console"
+JAVA_RESOURCE_DIRS="resources/src"
+JAVA_SRC_DIR=( src bsf/src engine/src )
+JAVA_TEST_EXCLUDES=(
+	bsh.TestUtil	# invalid test class
+	bsh.TestFilter	# invalid test class
+	bsh.Class3_Test
+	bsh.Class13Test
+	bsh.Issue_7_Test
+	bsh.Issue_8_Test
+	bsh.OldScriptsTest # ?? As the name says Old...
+)
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="tests/junitTests/src"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	java-pkg_clean
+
+	# These classes are not in upstream jar file
+	rm engine/src/bsh/TestBshScriptEngine.java || die
+	rm src/bsh/JThis.java || die
+
+	# java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS
+	mkdir resources || die
+	find src -type f \
+		! -name '*.java' \
+		! -name 'bsh.jj*' \
+		! -name '*.scripted' \
+		! -name '*.txt' \
+		! -name '*.xml' \
+		! -name '.errLog' \
+		! -name 'index.html' \
+		! -name 'Changes.html' \
+		! -name 'CodeMap.html' \
+		! -name 'Manifest.*' \
+		| xargs cp --parent -t resources || die
+
+	# Some but not all tests in these test classes fail
+	sed \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-e '/diamond_operator()/i @Ignore' \
+		-e '/try_with_resource()/i @Ignore' \
+		-e '/integer_literal_enhancements()/i @Ignore' \
+		-i tests/junitTests/src/bsh/Project_Coin_Test.java || die
+
+	sed \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-e '/parsing_very_large_hex_literal()/i @Ignore' \
+		-e '/integer_literal_enhancements_binary()/i @Ignore' \
+		-e '/parsing_large_hex_literal()/i @Ignore' \
+		-i tests/junitTests/src/bsh/NumberLiteralTest.java || die
+
+	sed \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-e '/define_interface_with_constants()/i @Ignore' \
+		-i tests/junitTests/src/bsh/ClassGeneratorTest.java || die
+}
+
+src_test() {
+	# tests/junitTests/src/bsh/Issue_55_Test.java:47: error: cannot find symbol
+	#                 final Object scriptEngineResult = new BshScriptEngineFactory().getScriptEngine().eval(script);
+	#                                                       ^
+	#   symbol:   class BshScriptEngineFactory
+	#   location: class Issue_55_Test
+	rm tests/junitTests/src/bsh/Issue_55_Test.java || die
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher "${PN}-interpreter" --main bsh.Interpreter
+}
diff --git a/dev-java/javax-el-api/Manifest b/dev-java/javax-el-api/Manifest
new file mode 100644
index 000000000000..dde3af7c0422
--- /dev/null
+++ b/dev-java/javax-el-api/Manifest
@@ -0,0 +1,3 @@
+DIST el-api-2.2-sources.jar 77708 BLAKE2B 4d31cf6ee76954fb4b16128e6cf162bcc5abe446500713a33010850bc9d416c754a1c61544dabfb1423cb3aed1f7fe06fbd367000679c04ab0f88beaf082dd4a SHA512 83db61c50735f33e6895a0ebb1f0198e4dad7868a35997180e86c68e4f833a202882120fda2f9657b3698faff852bba40affa29daa818e0dcd00a4caa6fc1c65
+EBUILD javax-el-api-2.2.ebuild 712 BLAKE2B 7c74a262d5f963da91d5ae692a09b1a68af5d17b63f9423077423904bccba598de9cfb01737cf5772be4010c45910a332204cf82235b452d5142da936710d3f5 SHA512 c07bf79346cdda684f793ef2f3e08df4a3ee57329478d88f3168c18dd09962989d6845d0068292ab58fc8963e5dd2e647007a59b0e361a2c7389f51f97958a6c
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/javax-el-api/javax-el-api-2.2.ebuild b/dev-java/javax-el-api/javax-el-api-2.2.ebuild
new file mode 100644
index 000000000000..cc9f288b08ee
--- /dev/null
+++ b/dev-java/javax-el-api/javax-el-api-2.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="javax.el:el-api:2.2"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Expression Language API"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="https://repo1.maven.org/maven2/javax/el/el-api/${PV}/el-api-${PV}-sources.jar"
+
+# https://repo1.maven.org/maven2/javax/el/el-api/2.2/el-api-2.2.pom
+LICENSE="CDDL GPL-2"
+SLOT="2.2"
+KEYWORDS="~amd64"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+JAVA_RESOURCE_DIRS="resources"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	mkdir resources || die
+	cp --parents javax/el/*.properties resources || die
+}
diff --git a/games-rpg/adonthell/metadata.xml b/dev-java/javax-el-api/metadata.xml
index 1c3ba213c494..75321cfb5598 100644
--- a/games-rpg/adonthell/metadata.xml
+++ b/dev-java/javax-el-api/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/javax-jsp-api/Manifest b/dev-java/javax-jsp-api/Manifest
new file mode 100644
index 000000000000..91172436d51c
--- /dev/null
+++ b/dev-java/javax-jsp-api/Manifest
@@ -0,0 +1,3 @@
+DIST jsp-api-2.2-sources.jar 163137 BLAKE2B 8bac5428393518cb3edb8488eaaab772d37db51dfbc5b466eabcb5b8ccd90cfa4869ebe65d861c64a6c588c8ede3ab1f5ab0c2e9080dde16c0585a7f774abb05 SHA512 ff79c34904372b722501b4479cbf88796017839d636a31b9343ef9104d93e3554154b3124f366295d05a41dc8320ff8bc83e9f8ee971df35c791220065b70647
+EBUILD javax-jsp-api-2.2.ebuild 641 BLAKE2B f85fa7890b610bdb578d4ad99b8bff69ad63eae3478e958fd6491dd727d8a5a6283b6779c73d193378c51d0ec7d69f05b74590405f908922af1c605b721d8ebb SHA512 91d8958829398f951618e5d45d560badcc4458a65e596d3b1ea52700e15936cf27be9dc90efb6dda02944a40dc8e362c15b81ba111a26d2a25577279f1b9dcee
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/javax-jsp-api/javax-jsp-api-2.2.ebuild b/dev-java/javax-jsp-api/javax-jsp-api-2.2.ebuild
new file mode 100644
index 000000000000..49afcbddfab8
--- /dev/null
+++ b/dev-java/javax-jsp-api/javax-jsp-api-2.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="javax.servlet.jsp:jsp-api:2.2"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JavaServer Pages(TM) API"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="https://repo1.maven.org/maven2/javax/servlet/jsp/jsp-api/${PV}/jsp-api-${PV}-sources.jar"
+
+LICENSE="CDDL GPL-2-with-classpath-exception"
+SLOT="2.2"
+KEYWORDS="~amd64"
+
+CP_DEPEND="
+	dev-java/javax-el-api:2.2
+	dev-java/javax-servlet-api:2.5
+"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CP_DEPEND}"
+DEPEND=">=virtual/jdk-1.8:*
+	${CP_DEPEND}"
diff --git a/games-rpg/wastesedge/metadata.xml b/dev-java/javax-jsp-api/metadata.xml
index 1c3ba213c494..75321cfb5598 100644
--- a/games-rpg/wastesedge/metadata.xml
+++ b/dev-java/javax-jsp-api/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/javax-servlet-api/Manifest b/dev-java/javax-servlet-api/Manifest
new file mode 100644
index 000000000000..bd7f93606464
--- /dev/null
+++ b/dev-java/javax-servlet-api/Manifest
@@ -0,0 +1,3 @@
+DIST servlet-api-2.5-sources.jar 158114 BLAKE2B 84997b9cc2122f49a850ac32089eb484bc4f68c4e73c7541cf70f453f0a0eaa0c037d6f2b8c8270d4122502f224a6943011f6a964da406093d0ad4bb173dc71e SHA512 6590adea214ba7f59e033b8f450ca8fd3a0764ac6aaf2789d5824ddeecc4c520d004242e42e3a058517d5f556a41a970f782dfde35b2cf184874a77063dc0fef
+EBUILD javax-servlet-api-2.5.ebuild 827 BLAKE2B b8dfafdf2bc1537acfb941d323b7cf93dfb5987c90161ce1ca0283258b7d400e740ff80daacb271ecb5d23840b954a8c4e9e91d4abc4d67b90f2fa614e3a5ced SHA512 f48c0780a2d792890e1ba48c586c67af2da055771a2519f814dd91b6f1d486318a5adaf554da483c3607e2b90d900dfc3c95a96e6ffe386089ee2ccb697c922c
+MISC metadata.xml 542 BLAKE2B 4c8e24b40b90209b41b13761347e663404e8bd858f600bbed4f64e949deb305c0f4b2c3cd7d765f3a9004a69773b716c0d6ad4354521ab34c0c728d4e06f1ec0 SHA512 f28157173cc061684f1df3a1543c7154ae77d2b87dfc5814268c868c7c5973f3ee513167ae9f786a765a6e10be4a3840061452d8ef9295c5aa4e256633ea278a
diff --git a/dev-java/javax-servlet-api/javax-servlet-api-2.5.ebuild b/dev-java/javax-servlet-api/javax-servlet-api-2.5.ebuild
new file mode 100644
index 000000000000..4964c46c94c5
--- /dev/null
+++ b/dev-java/javax-servlet-api/javax-servlet-api-2.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="javax.servlet:servlet-api:2.5"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JavaServlet(TM) Specification"
+HOMEPAGE="https://javaee.github.io/servlet-spec/"
+SRC_URI="https://repo1.maven.org/maven2/javax/servlet/servlet-api/${PV}/servlet-api-${PV}-sources.jar"
+
+LICENSE="CDDL GPL-2"
+SLOT="2.5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+JAVA_RESOURCE_DIRS="resources"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	mkdir -p "${JAVA_RESOURCE_DIRS}/javax/servlet/resources" || die
+	mv dtd/* "${JAVA_RESOURCE_DIRS}/javax/servlet/resources" || die
+	find . -type f -name '*.properties' | xargs cp --parent -t resources || die
+}
diff --git a/dev-java/javax-servlet-api/metadata.xml b/dev-java/javax-servlet-api/metadata.xml
new file mode 100644
index 000000000000..8295711f93e1
--- /dev/null
+++ b/dev-java/javax-servlet-api/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Java Servlet is the foundation web specification in the Java Enterprise Platform. Developers can build web applications using the Servlet API to interact with the request/response workflow.
+	</longdescription>
+	<upstream>
+		<doc>https://jcp.org/aboutJava/communityprocess/mrel/jsr154/</doc>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 93c7259fc9e1..a1fa4e1e8a15 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -1,4 +1,6 @@
 AUX jffi-1.3.8-GNUmakefile.patch 805 BLAKE2B 9c9c1f8daeca9527dd364c303311554004ed6f0b7964bfa68f004bfd6f3aa39fb817d88afc82c4710226c25d752c55c2e43002fe7557d6c7c705a60bf4903543 SHA512 f1ff970c7dd8630a8fcadb1689034a28dd407f3c7efc4df4b6dad2c458da55e71f8b646bed4e11dab089c28c7af0e6eacc067ab68c0ddd856a1102b235cd02b7
+DIST jffi-1.3.10.tar.gz 3304571 BLAKE2B a2ce4901d05b31cffcbe750e9a9294413057ae26426ae381f08ab07a085507afe38d447a60d4698d0878760ba1fe18bfdc31ce9b737676a70c93689d2e4533a7 SHA512 9e7d9aa1c16d7fa2486c75b71fd23465a3069ea3f314bc1b536115c982333d7cffa93f75a06ec86b740b83f4fca3be0c32cf99222d90bf1e6b45a9744ead1268
 DIST jffi-1.3.9.tar.gz 3193992 BLAKE2B bcd2dba3f9528c293aebb13a8fbd0b2fd7afcbae0cc5fa231f7e8ab190b834adc9e3f40bfc1211d0019a34a9edbaf8810f44b88f3c44b1e3b8065b2b80ccc6dc SHA512 21bf6997c64c0764c1fe86c9ab9b854037241489789f443a3337253ecc95100c94723a57165c85eed7a6c3837b8c04751af4a1fb5873a9c9fcd9a4535b68fc10
+EBUILD jffi-1.3.10.ebuild 3115 BLAKE2B 07fa2806bb6368a44dfd634306b4d5ab8957c0c9e09213f4c51d0df9c2bdbb6c0d723e09245407816192c4075e48549d924b144748f92d89360c3ae4a0f599e0 SHA512 2c62a1f075b31eefc1b753c604e7568931cc84156df5dd28092f0eaa5a1c1b9f0c0e28b5f1c5dd9bd31600135a02224503a1bec44a210a72c38f854c1a6b8d70
 EBUILD jffi-1.3.9-r1.ebuild 3285 BLAKE2B df02b9374bbc00966b973dc761d28f6f635a92d0c619c2777559e299c2bc30cec58ff2813d92cce13c950685dd05bee3de9be8b0058363b3ebf65b3c1cf1c948 SHA512 d02a840a1182cb3de7a0a82a9dd804d6f7237e61fa50f4cd2055aaf43aa945dcce74a2e9e7a315a5c2e51ff85b6cabe0ad7236665865fef0880235fd64c70e37
 MISC metadata.xml 320 BLAKE2B 4b1ac90322eb9faf01b397b7b4eea9167648abf3a89693a3bb28b27f5015b03c20c3b1b7843509686c8a827be8d4ea37f40fdf6ddaae418eec2dfa3b1797ffae SHA512 0daa4f9c85c906fdbd2fb652257c4d8ff52d88738e8e37e6bed49fdee6bb8aecefcd06e39fbe1262a3a0af73d2e1f4cfc8d0fc56b109bc686975ed41e54a68c9
diff --git a/dev-java/jffi/jffi-1.3.10.ebuild b/dev-java/jffi/jffi-1.3.10.ebuild
new file mode 100644
index 000000000000..38a54daf093d
--- /dev/null
+++ b/dev-java/jffi/jffi-1.3.10.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.github.jnr:jffi:1.3.10"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java Foreign Function Interface"
+HOMEPAGE="https://github.com/jnr/jffi"
+SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="1.3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*
+	>=dev-libs/libffi-3.4.2-r2:="
+RDEPEND=">=virtual/jre-1.8:*
+	>=dev-libs/libffi-3.4.2-r2:="
+
+PATCHES=( "${FILESDIR}"/jffi-1.3.8-GNUmakefile.patch )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.jnrproject.jffi"
+JAVA_SRC_DIR="src/main/java"
+
+# https://github.com/jnr/jffi/blob/b6ad5c066a6346072ea04f8ffa8177204aadcb13/build.xml#L26
+JAVA_TEST_EXTRA_ARGS="-Djffi.library.path=${S}/build/jni -Djffi.boot.library.path=${S}/build/jni"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	default
+	cat > src/main/java/com/kenai/jffi/Version.java <<-EOF
+		package com.kenai.jffi;
+		import java.lang.annotation.Native;
+		public final class Version {
+			private Version() {}
+			@Native
+			public static final int MAJOR = $(ver_cut 1);
+			@Native
+			public static final int MINOR = $(ver_cut 2);
+			@Native
+			public static final int MICRO = $(ver_cut 3);
+		}
+	EOF
+
+	# https://bugs.gentoo.org/829820
+	if use arm; then
+		sed \
+			-e '/import org.junit.Test/a import org.junit.Ignore;' \
+			-e '/invokeHeapDO()/i @Ignore' \
+			-e '/invokeHeapNO()/i @Ignore' \
+			-e '/invokeHeapOD()/i @Ignore' \
+			-e '/invokeHeapON()/i @Ignore' \
+			-e '/invokeHeapOO()/i @Ignore' \
+			-e '/invokeHeapO()/i @Ignore' \
+			-e '/invokeNativeDO()/i @Ignore' \
+			-e '/invokeNativeNO()/i @Ignore' \
+			-e '/invokeNativeOD()/i @Ignore' \
+			-e '/invokeNativeON()/i @Ignore' \
+			-e '/invokeNativeOO()/i @Ignore' \
+			-e '/invokeNativeO()/i @Ignore' \
+			-i src/test/java/com/kenai/jffi/InvokerTest.java || die
+		sed \
+			-e '/import org.junit.Test/a import org.junit.Ignore;' \
+			-e '/returnDefaultF128HighPrecision/i @Ignore' \
+			-i src/test/java/com/kenai/jffi/NumberTest.java || die
+	fi
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	# generate headers
+	mkdir -p build/jni
+	javac -h build/jni -classpath target/classes \
+		${JAVA_SRC_DIR}/com/kenai/jffi/{Foreign,ObjectBuffer,Version}.java \
+		|| die
+
+	#build native library.
+	local args=(
+		SRC_DIR=jni
+		JNI_DIR=jni
+		BUILD_DIR=build/jni
+		VERSION=$(ver_cut 1-2)
+		USE_SYSTEM_LIBFFI=1
+		CCACHE=
+		-f jni/GNUmakefile
+	)
+	emake "${args[@]}"
+}
+
+src_test() {
+	# build native test library
+	emake BUILD_DIR=build -f libtest/GNUmakefile
+
+	# https://github.com/jnr/jffi/issues/60
+	LC_ALL=C java-pkg-simple_src_test
+}
+
+src_install() {
+	local libname=".so"
+	java-pkg_doso build/jni/lib${PN}-$(ver_cut 1-2)${libname}
+
+	# must be after _doso to have JAVA_PKG_LIBDEST set
+	cat > boot.properties <<-EOF
+		jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
+	EOF
+	jar -uf ${PN}.jar boot.properties || die
+
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jnr-constants/Manifest b/dev-java/jnr-constants/Manifest
index 53abda980a91..46ab44fcaeab 100644
--- a/dev-java/jnr-constants/Manifest
+++ b/dev-java/jnr-constants/Manifest
@@ -1,3 +1,5 @@
 DIST jnr-constants-0.10.3-sources.tar.gz 261921 BLAKE2B f8137455c067e774dd30d64fe457dd859692315f43415bdfbffa4870b981db26de23d73fa7682bbd924523ac17dec56caa7078580cf817d8df3eae4d87c61343 SHA512 f7cd6a3778670c9835f8dce87c8470c8b8cfeda6f30d68051c09dae40c4f7dd7db88bed016450c33ab5c8da9a802b4bd050adf358680d5ec6735467e398404dc
+DIST jnr-constants-0.10.4.tar.gz 261915 BLAKE2B 61ed310837a27cd5a03627db6d9a2c46874f9140d046ac653c6deb6409411ab69b6103c52aab64fff99a311fc9d9e85bf97bd361291e13685d836cdf7253993c SHA512 4ab82699e58523a5f3dbc5cfba333569a605e9d3fafe828fed726aa8fe08de0aba32af431d53565ed19b67f08a63b7a28d533617aa424f95b552e3d6ec3994cb
 EBUILD jnr-constants-0.10.3.ebuild 986 BLAKE2B 1addcfa23240cea6fed31e32d2fd90eb7208a94dedc612b77eaac5c61e627f87525c57cc188bebde84303f1a92e1d836ebe3044b8af64911679e825ca088893a SHA512 0fc5493a6d907348db6ee86d8e1f03e9cb528dcc013f97ebed07029ec38751a5e20ee71d9147d1edc0775b94e92d229c07f3338d6e0464210ac4f8ca8c2fafde
+EBUILD jnr-constants-0.10.4.ebuild 748 BLAKE2B fdec20de3950fbad446f4f47512c72befc876e053eccb66e86c1c3f30e9814e35eb8a212cc5915c203f433a1c5c7a07655751dc68bf62fb9b4be41559cdf354d SHA512 b5df32cfa9639040d32d349710d5c993bfd9b7e532db8e428aa639af70b2c62bd3d726a34d4c9994580200bf54224a7fd5301aca943827ac16a90662ca25db4e
 MISC metadata.xml 329 BLAKE2B 6ab95abb16b9a4503c12cf6e06ae18a6ecbf217390f9ca6ba52516bedbe0c69c074aa3a01906974cca84efc02751afc2328d51245fce52d86996d64358f1fd08 SHA512 2e04327f332a4a421dcec67655242822cdd5f5ea5a8d2fdd37f24e68069320014a3bda438041f189831ef85087d53b4015c506fae40ec3a7494ef1f1efe41970
diff --git a/dev-java/jnr-constants/jnr-constants-0.10.4.ebuild b/dev-java/jnr-constants/jnr-constants-0.10.4.ebuild
new file mode 100644
index 000000000000..45ccaeef10fa
--- /dev/null
+++ b/dev-java/jnr-constants/jnr-constants-0.10.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.github.jnr:jnr-constants:0.10.4"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A set of platform constants (e.g. errno values)"
+HOMEPAGE="https://github.com/jnr/jnr-constants"
+SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.jnrproject.constants"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/jnr-posix/Manifest b/dev-java/jnr-posix/Manifest
index 0446d695fbec..48cb9e1e01ed 100644
--- a/dev-java/jnr-posix/Manifest
+++ b/dev-java/jnr-posix/Manifest
@@ -1,4 +1,6 @@
 AUX jnr-posix-3.1.15-FileTest.patch 1195 BLAKE2B 57a88e8ce120954c7287dc063cc0ba5ebbb38eea404964c69f8f78a6b496b99bcffe2888e4b7ea895e5aa3cde95f52c11289f97f81201124d9234fb51fa546ff SHA512 0c180434266c1fe47d21d9412d8d13982fea6ea23b930b2c412200b9d2ce31bb15fc8e7785a3757f61be9841301e05aa7f84741f2cde70285ee039b91c35a5c8
 DIST jnr-posix-3.1.15.tar.gz 120573 BLAKE2B 8035308440e444876d8d955ec3dd0b9d41f770436b53f964795a183ed7bd676dda8787c37425c488af2aa0accc948b86d1773e7e97ee5bcdaf209383dfda24a6 SHA512 6c8cd6d43c509ef7c16901d02983b823464b3437019233021398b2a9dfc85923db87c585e2f8248f080447a990e308feff25bbbf2a7261019dcae66c22e14a91
+DIST jnr-posix-3.1.16.tar.gz 120553 BLAKE2B b430d4699b84e9c4139291c34c328ade600adade68081167d3b47ce52caa6f96a818702dcb26652d186d7de825b32b00f2f1329b79f9c459cbbb6f6a4260d9f3 SHA512 988221a9a499db64c2bc3fe4e798fb77ce1bce44a31b51ace4f1e52b9a76a3af9a1521477a64413b44f36da9ab5446feb1b2ffd4e7dc50be055f6092d9e1f977
 EBUILD jnr-posix-3.1.15.ebuild 3188 BLAKE2B 19e9153ec95e8dfe2566b6b0016f4fd5507f8b1992f704fe7ae50aa1ea00047b385053f8e0980915595e5412ffd0ff851708a76a1078b31d86111929a494736e SHA512 3e5382da3536dd6b5ba0484d07cdc2b44cd8fe23a27ab6e6ed06384e9b82efb37602c6466cc3382a5b5949e5497032c23fb56f9ec1eb8f6223d64c6ee0da655a
+EBUILD jnr-posix-3.1.16.ebuild 2866 BLAKE2B b24a524379ded4a42691378a404db8f0af35eef2ab6cc05ad72540b7e0f24458900a44584e329316021e2be1e2d9827b31fed49732fe9e0b53b29c5becd1c76e SHA512 173b320a3da2cebf7ea2a094338b7391820cca5d3393eae61db71b78871a941909b5149533a932d28799f9feccdf9cf7d456b09f105c51096e6a03afd7bebd3d
 MISC metadata.xml 325 BLAKE2B f40ca825a92205c1ef0e0be2e72c859b680593c0f852aec73c3d84356a9927f5f536ffcec7b7a365353ac56489677d7881f9f27431abc56cdf9cc24550493097 SHA512 ff2bae0526d5ae082ad290411e7d3cd95a197918e4d834a531cab016ff9a718197a27fb2c7a4f7426bb44a5b295e164a72dd36f5fac800bc20388fde0f52e0a4
diff --git a/dev-java/jnr-posix/jnr-posix-3.1.16.ebuild b/dev-java/jnr-posix/jnr-posix-3.1.16.ebuild
new file mode 100644
index 000000000000..8a1490e9b7d9
--- /dev/null
+++ b/dev-java/jnr-posix/jnr-posix-3.1.16.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.github.jnr:jnr-posix:3.1.16"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Common cross-project/cross-platform POSIX APIs"
+HOMEPAGE="https://github.com/jnr/jnr-posix"
+SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="EPL-2.0 GPL-2 LGPL-2.1"
+SLOT="3.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	>=dev-java/jnr-ffi-2.2.12:2
+	dev-java/jnr-constants:0
+"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-11:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.jnrproject.posix"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+	sed \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-i src/test/java/jnr/posix/FileTest.java || die
+
+	if use ppc64; then
+		# Ignore testMessageHdrMultipleControl
+		# https://bugs.gentoo.org/866199
+		# https://github.com/jnr/jnr-posix/issues/178
+		sed \
+			-e '/testMessageHdrMultipleControl/i @Ignore' \
+			-e '/import org.junit.Test/a import org.junit.Ignore;' \
+			-i src/test/java/jnr/posix/LinuxPOSIXTest.java || die
+	fi
+
+	if use arm; then
+		# https://bugs.gentoo.org/866692
+		sed \
+			-e '/utimensatRelativePath()/i @Ignore' \
+			-e '/utimesDefaultValuesTest()/i @Ignore' \
+			-e '/futimeTest()/i @Ignore' \
+			-e '/utimesTest()/i @Ignore' \
+			-e '/utimesPointerTest()/i @Ignore' \
+			-e '/utimensatAbsolutePath()/i @Ignore' \
+			-e '/futimens()/i @Ignore' \
+			-i src/test/java/jnr/posix/FileTest.java || die
+		sed \
+			-e '/import org.junit.Test/a import org.junit.Ignore;' \
+			-e '/ioprioThreadedTest()/i @Ignore' \
+			-e '/testPosixFadvise()/i @Ignore' \
+			-i src/test/java/jnr/posix/LinuxPOSIXTest.java || die
+		sed \
+			-e '/import org.junit.Test/a import org.junit.Ignore;' \
+			-e '/testSetRlimitPointerLinux()/i @Ignore' \
+			-e '/testGetRLimitPointer()/i @Ignore' \
+			-i src/test/java/jnr/posix/ProcessTest.java || die
+	fi
+
+	JAVA_TEST_EXCLUDES=(
+		# https://github.com/jnr/jnr-posix/blob/jnr-posix-3.1.16/pom.xml#L185
+		# <exclude>**/windows/*Test.java</exclude>
+		"jnr.posix.windows.WindowsFileTest"
+		"jnr.posix.windows.WindowsHelpersTest"
+	)
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if [[ "${vm_version}" -ge "17" ]] ; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.util=ALL-UNNAMED )
+		# Some tests in jnr.posix.FileTest fail with jdk-17
+		sed \
+			-e '/flockTest()/i @Ignore' \
+			-e '/dupTest()/i @Ignore' \
+			-e '/closeTest()/i @Ignore' \
+			-e '/fcntlDupfdWithArgTest()/i @Ignore' \
+			-i src/test/java/jnr/posix/FileTest.java || die
+	fi
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/jstl-api/Manifest b/dev-java/jstl-api/Manifest
new file mode 100644
index 000000000000..ff7e42bc8466
--- /dev/null
+++ b/dev-java/jstl-api/Manifest
@@ -0,0 +1,3 @@
+DIST jstl-1.2.7.tar.gz 291252 BLAKE2B 37383f519615f41e4247b1e2207cf1cc57df3a3d01f939bb41cc400dbdb49b331fc0bc3e5ee26c3d9d1e361bd4ec11efd5b6e6a9cc6cafee2b196c1d9491d07f SHA512 2b52869fe5f6d586b8505a2a417790ffad7112db17af667cd52fb567fb6c7ee4a3b3906a072d0d4e7ef463b56a1e5cf9a955b9fbaab97c91a1a286e05add23c3
+EBUILD jstl-api-1.2.7.ebuild 834 BLAKE2B 2f12cecf41f97205535382feac2081d169219153df8179571b36aa4d21cc14924967e3c1f6f40cb8ebfe59e178cfcb2183ee56d333f6f9ce6065a1b4d7ad1352 SHA512 654adadf0228dabc826d57e62d30051d2e6ebca95a1428a244139a256d586f90d97faa89f20a5fcda7e488071bfeb3f911801111c8f49a67538a530c6f288b3c
+MISC metadata.xml 296 BLAKE2B c4f4176e9ee4c9e6c8e09729b24e84d4319a71d7059b6939c6ad8f4bac9fa0e7ede0b4e73e31068a5c3fea631beba2e6c362a6bfa4f28a6289e14a4197797cc1 SHA512 f07cf674ac741524af3baed5535a3e1dc7f8668a42783fb81ec22f823d91e58ae944992e9d65603a967bda36afcebe1bf91a6a97878cb2c82b2f1b4087c598ba
diff --git a/dev-java/jstl-api/jstl-api-1.2.7.ebuild b/dev-java/jstl-api/jstl-api-1.2.7.ebuild
new file mode 100644
index 000000000000..fb458de3e31c
--- /dev/null
+++ b/dev-java/jstl-api/jstl-api-1.2.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:1.2.7"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Standard Tag Library API"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j.jstl"
+SRC_URI="https://github.com/jakartaee/tags/archive/${PV}-RELEASE.tar.gz -> jstl-${PV}.tar.gz"
+S="${WORKDIR}/tags-${PV}-RELEASE"
+
+LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CP_DEPEND="
+	dev-java/javax-el-api:2.2
+	dev-java/javax-jsp-api:2.2
+	dev-java/javax-servlet-api:2.5
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+"
+
+DOCS=(
+	CONTRIBUTING.md
+	NOTICE.md
+	README.md
+)
+
+JAVA_SRC_DIR="api/src/main/java"
diff --git a/dev-java/jstl-api/metadata.xml b/dev-java/jstl-api/metadata.xml
new file mode 100644
index 000000000000..6f95d33b7ee3
--- /dev/null
+++ b/dev-java/jstl-api/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jakartaee/tags</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jstl/Manifest b/dev-java/jstl/Manifest
new file mode 100644
index 000000000000..846e35b1680f
--- /dev/null
+++ b/dev-java/jstl/Manifest
@@ -0,0 +1,3 @@
+DIST jstl-1.2.7.tar.gz 291252 BLAKE2B 37383f519615f41e4247b1e2207cf1cc57df3a3d01f939bb41cc400dbdb49b331fc0bc3e5ee26c3d9d1e361bd4ec11efd5b6e6a9cc6cafee2b196c1d9491d07f SHA512 2b52869fe5f6d586b8505a2a417790ffad7112db17af667cd52fb567fb6c7ee4a3b3906a072d0d4e7ef463b56a1e5cf9a955b9fbaab97c91a1a286e05add23c3
+EBUILD jstl-1.2.7.ebuild 1290 BLAKE2B 1ea4e49ba58f661b35ce5a7cf367ffba2732197d6de6f811523424c33685596ccbb29e64508fa113cc12f05f45dfecc46e53a3ac001a1fe16f15e2cf82991546 SHA512 ec954a22f520df17d871404111454642d574da5a0c00e387ca66d758812b46c593a47f8752ce932a92b4678af525b53004c9f24482cd2ad4f7dc8112a5ab8e4c
+MISC metadata.xml 296 BLAKE2B c4f4176e9ee4c9e6c8e09729b24e84d4319a71d7059b6939c6ad8f4bac9fa0e7ede0b4e73e31068a5c3fea631beba2e6c362a6bfa4f28a6289e14a4197797cc1 SHA512 f07cf674ac741524af3baed5535a3e1dc7f8668a42783fb81ec22f823d91e58ae944992e9d65603a967bda36afcebe1bf91a6a97878cb2c82b2f1b4087c598ba
diff --git a/dev-java/jstl/jstl-1.2.7.ebuild b/dev-java/jstl/jstl-1.2.7.ebuild
new file mode 100644
index 000000000000..caa221ede616
--- /dev/null
+++ b/dev-java/jstl/jstl-1.2.7.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.glassfish.web:javax.servlet.jsp.jstl:1.2.7"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Standard Tag Library API"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j.jstl"
+SRC_URI="https://github.com/jakartaee/tags/archive/${PV}-RELEASE.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/tags-${PV}-RELEASE"
+
+LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CP_DEPEND="
+	dev-java/javax-el-api:2.2
+	dev-java/javax-jsp-api:2.2
+	dev-java/javax-servlet-api:2.5
+	dev-java/jstl-api:0
+	dev-java/xalan:0
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+"
+
+DOCS=(
+	CONTRIBUTING.md
+	NOTICE.md
+	README.md
+)
+
+JAVA_JAR_FILENAME="jstl-impl.jar"
+JAVA_RESOURCE_DIRS="impl/src/main/resources"
+JAVA_SRC_DIR="impl/src/main/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	# java-pkg-simple expects resource files in JAVA_RESOURCE_DIRS
+	cp -r impl/src/main/java/* impl/src/main/resources || die
+	find impl/src/main/resources -type f \
+		\( -name '*.java' \
+		-o -name '*.txt' \
+		-o -name '*Parser.jj' \
+		-o -name 'spath.tld' \
+		\) -exec rm -rf {} + || die "deleting classes failed"
+}
diff --git a/dev-java/jstl/metadata.xml b/dev-java/jstl/metadata.xml
new file mode 100644
index 000000000000..6f95d33b7ee3
--- /dev/null
+++ b/dev-java/jstl/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jakartaee/tags</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/osgi-enterprise-api/Manifest b/dev-java/osgi-enterprise-api/Manifest
index cfeb82a149e7..cc0e364463cd 100644
--- a/dev-java/osgi-enterprise-api/Manifest
+++ b/dev-java/osgi-enterprise-api/Manifest
@@ -1,3 +1,4 @@
 DIST osgi.enterprise-5.0.0.jar 479506 BLAKE2B 2bd53b50e469388d132a6d3ebd78d4040093f8c1d79299fd87412853d959f7559f04287567eeea47635fe287a3e9d3812ac9303a5d39ec35135ab3c58bd0b010 SHA512 0404c05afd8cb3ef8b826b0f08deeb03b0027ca99e091953d39ef69674809c5b899e0f2c8efb685df5fce070c2aafcf813e470fbb538d4ec3b480a8060351144
 EBUILD osgi-enterprise-api-5.0.0-r2.ebuild 731 BLAKE2B 94046964b7c1366dd905ea998ed7ffd2bb41b73dbe20817bc2a66565e7c5b79c9ea18eae9c5b98030e40fe67c19ca4691b2f48ff320974e21e73ee7ec31df200 SHA512 dc97f6aeafbd54deb4939b80a94d1e8a1d4335f0fc0abfee2ae858fd0707504159e1b37095dd7e3502fe57adae4d05d9dd94c76eddd9e28274aa905b1dc21b08
+EBUILD osgi-enterprise-api-5.0.0-r3.ebuild 734 BLAKE2B a35a86cdba8a7e91adb45e0873f49e826d755511830ae7070896043b9ab6a5b9b3c3cc43129a32d0bf47f9a0dac18e63dbfd2f776c141ff7c0c57af9b63f8242 SHA512 4dd4a5cc62e48fbd028a64bf624ac76c30986965707f799885ece9058df6a6291aee44f6e2fd06edd5c008db493b381b68ed16a42183fadae87c69dbaa5be91e
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r3.ebuild b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r3.ebuild
new file mode 100644
index 000000000000..f9ae58282ad4
--- /dev/null
+++ b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="OSGi Enterprise Release 5 Companion Code"
+HOMEPAGE="http://www.osgi.org/Main/HomePage"
+SRC_URI="https://docs.osgi.org/download/r5/osgi.enterprise-${PV}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RESTRICT="bindist"
+
+CP_DEPEND="dev-java/glassfish-persistence:0
+	dev-java/osgi-core-api:0
+	dev-java/javax-servlet-api:2.5"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+JAVA_SRC_DIR="OSGI-OPT/src"
+
+src_prepare() {
+	default
+	rm -r org || die
+}
diff --git a/dev-java/reflections/Manifest b/dev-java/reflections/Manifest
index 9f9b865f30ce..28fec1b7f1bb 100644
--- a/dev-java/reflections/Manifest
+++ b/dev-java/reflections/Manifest
@@ -1,3 +1,4 @@
 DIST reflections-0.9.12.tar.gz 48235 BLAKE2B c82bd69f4433d8db738fcd32dd7fbf643984917622853b1886e15b906a91579de0193daf0fc1a9642c12d13de8236acf3e1f1409a18713b37c6e705a3cae34bd SHA512 8f8c7603ab73b599c6e2160f42b61c4e0eedef9981c06124bba0437d6636e7bf8a916784e266754562dc17f4d3ccf8df6c9ba707d1a7c38d97dc5eea9138064f
 EBUILD reflections-0.9.12-r4.ebuild 3795 BLAKE2B a601a07600dc3a69158f7614e53ecdd1af1213042031fcf747320f5673e769f0d93ee8f1eb8f3c9cb00245e776a948bf3e9f8acaa1b614c58c888124f9965647 SHA512 f2c52934f7abff3dbdef4f22afec72dbcf2397e8b97817e8c9ceab0a6a3280da767d737add076ff74cd21c66bed18cb0493281e4e8dc1da533adb007012a8796
+EBUILD reflections-0.9.12-r5.ebuild 3797 BLAKE2B 8228c7a9acf209ab6b85097272e9e58f31eaa983f1677e7484ff5a2c41a61db40171c5cbabcabc471ee95d1ca5ed7cb34b0622e81ce5b8fa25242de02d543a1c SHA512 e31659ed34fd3b7b795d9c05b3374271165ec4810af27ebaf0ad54cfdbf9c3b9effaee01493ff29d1b82c2d994bf859f8320b9d85c53a2f2cd6962f3ef429415
 MISC metadata.xml 527 BLAKE2B 92b0ca46422b8b0107bef220664c0079db47a3c8f306f59d5b681b653e5bcb835a192c8018d719447ebc864ead58f3844340bf3f84ff5bbef0ab126b7d314efe SHA512 a7ad6c598f83a911b20f5b31573127433d2bd756ac15d4a29de907ce102a5fb77de2426035a8255125446128b8ef13ed1f9fa002bff285cddbaf9043bd71dddc
diff --git a/dev-java/reflections/reflections-0.9.12-r5.ebuild b/dev-java/reflections/reflections-0.9.12-r5.ebuild
new file mode 100644
index 000000000000..3ca2b5f13dd3
--- /dev/null
+++ b/dev-java/reflections/reflections-0.9.12-r5.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/ronmamo/reflections/archive/0.9.12.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild reflections-0.9.12.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.reflections:reflections:0.9.12"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Reflections - a Java runtime metadata analysis"
+HOMEPAGE="https://github.com/ronmamo/reflections"
+SRC_URI="https://github.com/ronmamo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="WTFPL-2 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# com.google.code.gson:gson:2.8.6 -> >=dev-java/gson-2.8.8:2.6
+# org.dom4j:dom4j:2.1.1 -> >=dev-java/dom4j-2.1.3:1
+# org.javassist:javassist:3.26.0-GA -> !!!suitable-mavenVersion-not-found!!!
+# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
+# org.slf4j:slf4j-simple:1.7.24 -> >=dev-java/slf4j-simple-1.7.30:0
+
+CP_DEPEND="
+	dev-java/dom4j:1
+	dev-java/gson:2.6
+	dev-java/javassist:3
+	dev-java/slf4j-api:0
+	dev-java/slf4j-simple:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# javax.servlet:servlet-api:2.5 -> java-virtuals/servlet-api:2.5
+# POM: pom.xml
+# test? junit:junit:4.13 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="
+	dev-java/javax-servlet-api:2.5
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_CLASSPATH_EXTRA="javax-servlet-api-2.5"
+JAVA_SRC_DIR=( "src/main/java" )
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR=( "src/test/java" )
+JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" )
+JAVA_TEST_EXCLUDES=(
+	# Upstream does not run this test
+	"org.reflections.TestModel"
+	# 1) testMethodParameterNames(org.reflections.ReflectionsCollectTest)
+	# org.reflections.ReflectionsException: Scanner MethodParameterNamesScanner was not configured
+	#         at org.reflections.Store.get(Store.java:39)
+	#         at org.reflections.Store.get(Store.java:61)
+	#         at org.reflections.Store.get(Store.java:46)
+	#         at org.reflections.Reflections.getMethodParamNames(Reflections.java:579)
+	#         at org.reflections.ReflectionsTest.testMethodParameterNames(ReflectionsTest.java:239)
+	org.reflections.ReflectionsCollectTest
+	# 2) testMethodParameterNames(org.reflections.ReflectionsParallelTest)
+	# org.reflections.ReflectionsException: Scanner MethodParameterNamesScanner was not configured
+	#         at org.reflections.Store.get(Store.java:39)
+	#         at org.reflections.Store.get(Store.java:61)
+	#         at org.reflections.Store.get(Store.java:46)
+	#         at org.reflections.Reflections.getMethodParamNames(Reflections.java:579)
+	#         at org.reflections.ReflectionsTest.testMethodParameterNames(ReflectionsTest.java:239)
+	org.reflections.ReflectionsParallelTest
+	# 3) testMethodParameterNames(org.reflections.ReflectionsTest)
+	# org.reflections.ReflectionsException: Scanner MethodParameterNamesScanner was not configured
+	#         at org.reflections.Store.get(Store.java:39)
+	#         at org.reflections.Store.get(Store.java:61)
+	#         at org.reflections.Store.get(Store.java:46)
+	#         at org.reflections.Reflections.getMethodParamNames(Reflections.java:579)
+	#         at org.reflections.ReflectionsTest.testMethodParameterNames(ReflectionsTest.java:239)
+	org.reflections.ReflectionsTest
+	#
+	# https://github.com/ronmamo/reflections/issues/277#issuecomment-927152981
+	# scanner was not configured exception - this is a known issue in 0.9.12, a simple workaround is to
+	# check if the getStore() contains index for the scanner before querying. next version 0.10 fixes this.
+)
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 5824ee82b5c2..68f4f154c935 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/qxlsx/Manifest b/dev-libs/qxlsx/Manifest
index 6b7a4aea2242..c6fac5160632 100644
--- a/dev-libs/qxlsx/Manifest
+++ b/dev-libs/qxlsx/Manifest
@@ -1,9 +1,3 @@
-AUX qxlsx-1.4.4-libdir.patch 968 BLAKE2B db6cdaf278bb910e674f7a1ec7c09276f64b5f961fb3086c842983a527c7e48cd3d8b37a721a07d85b10ab2bb3afedfc9352c5fe9ee415d7909e783b340075f5 SHA512 206feaff02df1b21339b685450f679372b4db7dde19b049958fa99a5c7b7fb0623e95897ae98e7891dbc860c3a8465621d9453dce69aa60334a73b4a3dd1c63f
-AUX qxlsx-1.4.4-qtdefs.patch 737 BLAKE2B c104e0f129beaca20726ce939c881e79af7606f5f34869dccae4a24cb03848551d91e463f754af16bdec866ece0c540593507c5d67c4d50dd48c874f318a3334 SHA512 4bb08a1ad0e1b0dadf1047d27de814ebc32fa14284fb8411dcd0a3a0485a767962d66598faa3829d2af7b4cd9f79d65b73ca587a8773811c53c58991f5e5a359
-AUX qxlsx-1.4.4-qtversion.patch 3193 BLAKE2B 1e9534bf4361ff0927ed77ba58c38e0ffa219245dc2cd8b314da1ff8c6331a80190df2c97fc67babae112f40e74d4f9d4369ac21c474c0c9df596d5788f312d7 SHA512 c8d46be8a08bf1134403ccea329b021b4cb5e2e6394ff11230b02b1316396490ccc4cab17a7970df7be6fb4329afd7d4184acadb9b2adab938274a3fe5c58f34
-AUX qxlsx-1.4.4-soversion.patch 682 BLAKE2B defb2375ec4ff00e6f042cdf20b52d7983d77806a335b301a1c799679d2da887b88458ed3e024bc085c26d6f6a9f8450868076d969eed8f608b80f30dfe8f14c SHA512 5434a4da6f58fd2aad1ade38b00ce8f48df73e519ef375b9bc7b014cfeb4601912bdc81e9b13529147b97800d6b0ff97fc8669a774f0dcb7814d5189fe90c6d1
-DIST qxlsx-1.4.4.tar.gz 4703732 BLAKE2B 0acf5e708f4dc981723a34b524c820a53a66cb13bf1ce5a1086106230e45dcac2ea6587b3c4ca039de491565ac886a2e5bd1225ee39437ee89a2ff7560da6fd7 SHA512 e6c3dd8822f2a8ab8bcd1a7434db7b202291e3d8de407e4629bdfc1afef507b57da4bc4a715d57b8d75915ce4b623189269083824c35d8e02d49d3e8909cceee
 DIST qxlsx-1.4.5.tar.gz 4705008 BLAKE2B dd853a20109c9d9dcd5757bbb436e620191eb1fb95c441b1ce3a119bd99397f6206da37b6d770c84e8717c75ce9ad1da4b82397030da02c49a092d958ebef261 SHA512 5ec63c210b12c037acd9f3cc4d351b9bd488add65872a27cca536117349ac2c2501649cb7c2f35e1ee95289e98bf9e9fea6554aef1379deafb50c5016ed21fe5
-EBUILD qxlsx-1.4.4.ebuild 1142 BLAKE2B ec378e89ea22a43a4ffce7ea1de313ff461a94afd439da4b549ca31c42e44cff7f2c8226b1adda0b1c107fd8b583f8f83ff748035a1f276e68e958b0d6a08d0e SHA512 9c8efcf4a10228df58429455d3482dc8fde3224ecd68aaa1cf09cad9f20356110ada64feed0ad0d66e9f09057fb2460e6dca1aee2f31d5fb9aabc5a174ba10fe
-EBUILD qxlsx-1.4.5.ebuild 993 BLAKE2B 5ab60f216accf7570c69c9dae82d5c516634d9c60a6ec6a7016418dbd05752a0c70ba1e8d4c47abc8d9da4a8ccaca013dac970269f79af574ad19da8812c1811 SHA512 62ac4929ba00c4e762693b2980c65d0e4f86cf2b2cc75a53e4378d5aa0a720b13319fab2bbae7a21590e5f247f777d8674522e97c0b75ca4f173e99abe92c8b6
+EBUILD qxlsx-1.4.5.ebuild 992 BLAKE2B 9b23e45633f01c049c4d1004cb31fa403748207952656623055c1d295d5eed8241be82fee55f4f62aef51851e57330cb5376bb40e4b6b873a4eb41f61b50371a SHA512 2533f93190e61443d71df20ccf0fd844e9c5a0fe8997639eb625e8dff03a9c9e5bf617d2226408e69fde69fa3150dbae50737c036a5b554ac3d8aa3e0999ce1a
 MISC metadata.xml 451 BLAKE2B 72b39f0c97bb2d329e87abf678364a963a0e1cceda24106ed304f50258418595349f2b88ad5d34b82677dda655d20b05176d7bd8b2e2ca2215bcf1264b5412cc SHA512 5e9172c378f82bd9fbe16f8acbc877934ebac97d5603ad471f5ad0e4c729f69fb7942125ad7cd70047a28b78b63f3fc670023018cee113061ed2a668c5fd2897
diff --git a/dev-libs/qxlsx/files/qxlsx-1.4.4-libdir.patch b/dev-libs/qxlsx/files/qxlsx-1.4.4-libdir.patch
deleted file mode 100644
index ffdf8483f41a..000000000000
--- a/dev-libs/qxlsx/files/qxlsx-1.4.4-libdir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5d1059941f85365019ed08254e79abdb4ba80ee5 Mon Sep 17 00:00:00 2001
-From: Alexey Sokolov <sokolov@google.com>
-Date: Sun, 4 Sep 2022 01:22:30 +0100
-Subject: [PATCH] Install library to the correct lib dir
-
----
- QXlsx/CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/QXlsx/CMakeLists.txt b/QXlsx/CMakeLists.txt
-index a6b1944..fc32918 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -181,9 +181,9 @@ set_target_properties(QXlsx PROPERTIES
- 
- install(TARGETS QXlsx
-     EXPORT QXlsxTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}
--    RUNTIME DESTINATION bin COMPONENT runtime
--    ARCHIVE DESTINATION lib COMPONENT devel
--    PUBLIC_HEADER DESTINATION include/QXlsx COMPONENT devel
-+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel
-+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/QXlsx COMPONENT devel
- )
- 
- install(EXPORT QXlsxTargets
diff --git a/dev-libs/qxlsx/files/qxlsx-1.4.4-qtdefs.patch b/dev-libs/qxlsx/files/qxlsx-1.4.4-qtdefs.patch
deleted file mode 100644
index 15795c645d47..000000000000
--- a/dev-libs/qxlsx/files/qxlsx-1.4.4-qtdefs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 8e83402db866ae7a67582da28aa68c83545f13c8 Mon Sep 17 00:00:00 2001
-From: Alexey Sokolov <sokolov@google.com>
-Date: Fri, 26 Aug 2022 01:36:53 +0100
-Subject: [PATCH] Don't force Qt definitions onto users
-
-It breaks users who use "signals" keyword and convert const char* to
-QString.
----
- QXlsx/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/QXlsx/CMakeLists.txt b/QXlsx/CMakeLists.txt
-index aa774b1..a6b1944 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -140,7 +140,7 @@ add_library(QXlsx
- 
- add_library(QXlsx::QXlsx ALIAS QXlsx)
- 
--target_compile_definitions(QXlsx PUBLIC
-+target_compile_definitions(QXlsx PRIVATE
-     -DQT_NO_KEYWORDS
-     -DQT_NO_CAST_TO_ASCII
-     -DQT_NO_CAST_FROM_ASCII
diff --git a/dev-libs/qxlsx/files/qxlsx-1.4.4-qtversion.patch b/dev-libs/qxlsx/files/qxlsx-1.4.4-qtversion.patch
deleted file mode 100644
index f94aa6e46414..000000000000
--- a/dev-libs/qxlsx/files/qxlsx-1.4.4-qtversion.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-commit e3565f2b3999ead739066b33fa0fd346eb072d87
-Author: Alexey Sokolov <sokolov@google.com>
-Date:   Sun Oct 2 22:46:03 2022 +0100
-
-    Support installing qt5 and qt6 versions in parallel
-
-diff --git a/QXlsx/CMakeLists.txt b/QXlsx/CMakeLists.txt
-index 5640d8a..8d34020 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -15,8 +15,8 @@ include(GNUInstallDirs)
- 
--find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Gui REQUIRED)
- find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui REQUIRED)
-+set(EXPORT_NAME QXlsxQt${QT_VERSION_MAJOR})
- 
--if (QT_MAJOR_VERSION EQUAL 6)
-+if (QT_VERSION_MAJOR EQUAL 6)
-     set(CMAKE_CXX_STANDARD 17 CACHE STRING "")
- else()
-     set(CMAKE_CXX_STANDARD 11 CACHE STRING "")
-@@ -166,7 +167,7 @@ if (BUILD_SHARED_LIBS)
-     target_compile_definitions(QXlsx PUBLIC QXlsx_SHAREDLIB)
- endif()
- 
--target_link_libraries(${PROJECT_NAME}
-+target_link_libraries(QXlsx
-    Qt${QT_VERSION_MAJOR}::Core
-    Qt${QT_VERSION_MAJOR}::GuiPrivate
- )
-@@ -180,39 +181,38 @@ PUBLIC
- )
- 
- set_target_properties(QXlsx PROPERTIES
--    EXPORT_NAME QXlsx
-+    OUTPUT_NAME ${EXPORT_NAME}
-     VERSION ${PROJECT_VERSION}
-     SOVERSION 0.${PROJECT_VERSION}
-     PUBLIC_HEADER "${QXLSX_PUBLIC_HEADERS}"
- )
- 
- install(TARGETS QXlsx
--    EXPORT QXlsxTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    EXPORT ${EXPORT_NAME}Targets DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
-     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel
-     PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/QXlsx COMPONENT devel
- )
- 
--install(EXPORT QXlsxTargets
--    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/QXlsx/
--    FILE QXlsxTargets.cmake
-+install(EXPORT ${EXPORT_NAME}Targets
-+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${EXPORT_NAME}/
-+    FILE ${EXPORT_NAME}Targets.cmake
-     NAMESPACE QXlsx::
-     COMPONENT devel
- )
- 
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/qxlsx-config.cmake.in
--    ${CMAKE_CURRENT_BINARY_DIR}/QXlsxConfig.cmake
-+    ${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_NAME}Config.cmake
-     @ONLY
- )
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/qxlsx-config-version.cmake.in
--    ${CMAKE_CURRENT_BINARY_DIR}/QXlsxConfigVersion.cmake
-+    ${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_NAME}ConfigVersion.cmake
-     @ONLY
- )
- install(
-     FILES
--        ${CMAKE_CURRENT_BINARY_DIR}/QXlsxConfig.cmake
--        ${CMAKE_CURRENT_BINARY_DIR}/QXlsxConfigVersion.cmake
--    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/QXlsx/
-+        ${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_NAME}Config.cmake
-+        ${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_NAME}ConfigVersion.cmake
-+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${EXPORT_NAME}/
- )
--
- include(CPackConfig)
-diff --git a/QXlsx/cmake/modules/qxlsx-config.cmake.in b/QXlsx/cmake/modules/qxlsx-config.cmake.in
-index 1aab813..d72276b 100644
---- a/cmake/modules/qxlsx-config.cmake.in
-+++ b/cmake/modules/qxlsx-config.cmake.in
-@@ -10,5 +10,5 @@
- SET(prefix "@CMAKE_INSTALL_PREFIX@")
- SET(exec_prefix "@CMAKE_INSTALL_PREFIX@")
- SET(QXlsx_FOUND "TRUE")
--    
--include("${CMAKE_CURRENT_LIST_DIR}/QXlsxTargets.cmake")
-+
-+include("${CMAKE_CURRENT_LIST_DIR}/@EXPORT_NAME@Targets.cmake")
diff --git a/dev-libs/qxlsx/files/qxlsx-1.4.4-soversion.patch b/dev-libs/qxlsx/files/qxlsx-1.4.4-soversion.patch
deleted file mode 100644
index eff465497930..000000000000
--- a/dev-libs/qxlsx/files/qxlsx-1.4.4-soversion.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 647acc3c4d431278f3d2867a41a06d57f1978e63 Mon Sep 17 00:00:00 2001
-From: Alexey Sokolov <sokolov@google.com>
-Date: Sat, 8 Oct 2022 23:47:23 +0100
-Subject: [PATCH] Set soversion to version
-
-Since there's no ABI guarantees, as mentioned in #243
----
- QXlsx/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/QXlsx/CMakeLists.txt b/QXlsx/CMakeLists.txt
-index 8ddfd20..5640d8a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -182,7 +182,7 @@ PUBLIC
- set_target_properties(QXlsx PROPERTIES
-     EXPORT_NAME QXlsx
-     VERSION ${PROJECT_VERSION}
--    SOVERSION 0
-+    SOVERSION 0.${PROJECT_VERSION}
-     PUBLIC_HEADER "${QXLSX_PUBLIC_HEADERS}"
- )
- 
diff --git a/dev-libs/qxlsx/qxlsx-1.4.4.ebuild b/dev-libs/qxlsx/qxlsx-1.4.4.ebuild
deleted file mode 100644
index b68ab4c3e582..000000000000
--- a/dev-libs/qxlsx/qxlsx-1.4.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multibuild cmake
-
-DESCRIPTION="Excel file(*.xlsx) reader/writer library using Qt"
-
-HOMEPAGE="https://github.com/QtExcel/QXlsx"
-SRC_URI="https://github.com/QtExcel/QXlsx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-# soversion
-SLOT="0/0.${PV}"
-KEYWORDS="amd64 ppc ppc64 ~riscv x86"
-
-IUSE="qt5 qt6"
-REQUIRED_USE="|| ( qt5 qt6 )"
-
-RDEPEND="
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5=
-	)
-	qt6? (
-		dev-qt/qtbase:6=[gui]
-	)
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/QXlsx-${PV}/QXlsx"
-PATCHES=(
-	"${FILESDIR}/${P}-libdir.patch"
-	"${FILESDIR}/${P}-qtdefs.patch"
-	"${FILESDIR}/${P}-soversion.patch"
-	"${FILESDIR}/${P}-qtversion.patch"
-)
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
-}
-
-src_configure() {
-	my_src_configure() {
-		local mycmakeargs=(
-			-DQT_VERSION_MAJOR="${MULTIBUILD_VARIANT/qt/}"
-		)
-
-		cmake_src_configure
-	}
-
-	multibuild_foreach_variant my_src_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake_src_compile
-}
-
-src_install() {
-	multibuild_foreach_variant cmake_src_install
-}
diff --git a/dev-libs/qxlsx/qxlsx-1.4.5.ebuild b/dev-libs/qxlsx/qxlsx-1.4.5.ebuild
index 1b080f8e9732..c2013cfde008 100644
--- a/dev-libs/qxlsx/qxlsx-1.4.5.ebuild
+++ b/dev-libs/qxlsx/qxlsx-1.4.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/QtExcel/QXlsx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 # soversion
 SLOT="0/0.1.4.4"
-KEYWORDS="amd64 ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 
 IUSE="qt5 qt6"
 REQUIRED_USE="|| ( qt5 qt6 )"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 63020dca8436..2718dfc2c826 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/caldav/Manifest b/dev-python/caldav/Manifest
index 3c95fc9796e3..432ac70d3fc8 100644
--- a/dev-python/caldav/Manifest
+++ b/dev-python/caldav/Manifest
@@ -1,7 +1,9 @@
 DIST caldav-1.0.1.gh.tar.gz 133071 BLAKE2B d7b9eb8015782bed5d32b7c34508cfcc1334d33cdfed99003cf45893b0a894d5a3187a2c98f886f97ffe8a64140a5a3826e1b3f57b58228a61d1ad4f9bf9f72a SHA512 ac816afd74f6fe34d82345a8b3a934fbe2c37af6a75cc8ef91cd87c8b8d147962ff05e701cd91480c1963d57967898129f923655d366820b689959b00f55659f
 DIST caldav-1.1.1.gh.tar.gz 136513 BLAKE2B a825b19023cadfd2b59e747c5d1b00065530d6773435a9f363d54cea7621f56eb6207b7a2888994fe5c42b873d6b82ba285abbc2ee5d18f72aafd90271cc5e87 SHA512 a1d991d468f093e6d54262f657e6e43ea9bf9e55dbe1f2fcb7189fb1e6a742805faee2a99807838f5db3406c1a9cd72a14054a30efe13e8d5ad7f113aaa88e2a
 DIST caldav-1.1.3.gh.tar.gz 136529 BLAKE2B 275c56d74a5118697672deae9611054ef08638ebd476d0108286cb116dc1b102ed5ae36dcb85ebcc21eb36d02aeb02d47e5acdda510c568f8dd9ae85895518c8 SHA512 ec281ac41d14938a5c10a08ef8134a16987e14218e2a1b092a6c10d09b619fc8372d3be3c1fb139bdb2c1f183af0832d486f70554e4007a0dc145173fc4564fb
+DIST caldav-1.2.0.gh.tar.gz 122290 BLAKE2B 62e60695737298dae299aed6e73ed3570c51f5fd05d15f25fb34852e2ca97d6a3e700148f69b5a67f1fad0db8233426d0908f58d513602e8be171ebbb5fef1bb SHA512 56b329d1fcc9ef750e30721485825e067706280b48131816357df023b53e6631b6749e154d0db4815328588359cc98e996c35a0e93395f1cd58d4c36615f96e6
 EBUILD caldav-1.0.1-r1.ebuild 931 BLAKE2B f7f02b317d5b974bc8ba76a81c632b63330153896584b8cdc808afa1e64c8dd6eeda28cbd1e18a36673e9f782598142cb21bd30c857d43929edce129ae2a5abb SHA512 00eee795b1d36608edf903527200ac3d691f8aa468642d9acc90d2e0b318af121ea8c09b1fcdcbd98db5a6407254867f0fe96fcf89a7cdf64ae1ddd35921685c
 EBUILD caldav-1.1.1.ebuild 931 BLAKE2B f7f02b317d5b974bc8ba76a81c632b63330153896584b8cdc808afa1e64c8dd6eeda28cbd1e18a36673e9f782598142cb21bd30c857d43929edce129ae2a5abb SHA512 00eee795b1d36608edf903527200ac3d691f8aa468642d9acc90d2e0b318af121ea8c09b1fcdcbd98db5a6407254867f0fe96fcf89a7cdf64ae1ddd35921685c
 EBUILD caldav-1.1.3.ebuild 931 BLAKE2B f7f02b317d5b974bc8ba76a81c632b63330153896584b8cdc808afa1e64c8dd6eeda28cbd1e18a36673e9f782598142cb21bd30c857d43929edce129ae2a5abb SHA512 00eee795b1d36608edf903527200ac3d691f8aa468642d9acc90d2e0b318af121ea8c09b1fcdcbd98db5a6407254867f0fe96fcf89a7cdf64ae1ddd35921685c
+EBUILD caldav-1.2.0.ebuild 897 BLAKE2B c6cdc1418d29e4c5db6a748ac08f01a5a297163a4abbff64b10bb5bf2081e5ef4abae5a7ca5292f9f4c0d4acf64ea317ee111e699a23aeec88534eca92be9de4 SHA512 a115dfb70549228d7a9478c0e44a67314a44b2f93d16a21106d3487d71228945aea6e80de9bd27cee2c1f85f797b1b6a56f3565ffdad5ee447c266cc15c10b94
 MISC metadata.xml 394 BLAKE2B f0b9c600418cbbc4c935d53b63f4e6c1235500984ed388ceb26c6e02fdb7200eec1464d8c4af17e6afdf3688479f0a0763e6e710f916c1c71dab2ca84df9509f SHA512 4f94039805c6cbfb97a667d555af39bcce7f10db8a7c61f3b8b48a903fcd52d3e30467c91c9ec13195be6dc3c4ccbfa088aeac390d5e1c64e9267527a8b77b6b
diff --git a/dev-python/caldav/caldav-1.2.0.ebuild b/dev-python/caldav/caldav-1.2.0.ebuild
new file mode 100644
index 000000000000..1a6a3ab32f5f
--- /dev/null
+++ b/dev-python/caldav/caldav-1.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="CalDAV (RFC4791) client library for Python"
+HOMEPAGE="
+	https://github.com/python-caldav/caldav/
+	https://pypi.org/project/caldav/
+"
+SRC_URI="
+	https://github.com/python-caldav/caldav/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="|| ( GPL-3 Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/vobject[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/icalendar[${PYTHON_USEDEP}]
+		dev-python/recurring-ical-events[${PYTHON_USEDEP}]
+		dev-python/tzlocal[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		www-apps/radicale[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index bf42591f4118..db7392e29a31 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,7 +1,9 @@
 DIST coverage-7.0.5.tar.gz 796171 BLAKE2B 87ecffd87c2465607bf1fd330296e84e174953d7696ee0ef3046f6555f54634cfc643ada2a03971685021a5cf59191d75a0bddbc83f736e11a2516c684b0f0d9 SHA512 d199d710cdfac5c6cde79224b4a27d6b88a0e0c504eff7ad5700e9fb1f5cc8e1e9359dcc12f6c447a7ee6cd680feeb89f70ad68574a739c55a6d09b22017df06
 DIST coverage-7.1.0.tar.gz 809785 BLAKE2B 3720aee79ecfdd6aa652b5198bad4d6b5827a85f1d58986eec51bab1e72800dac28eb0ebbeb15d547ef03694ca1397bec47c37a9233dc34b2d3d2a6a22a48274 SHA512 80920b337391e47f1e631ba8a892792b6d2c72e753ddf403222c6ad527637699889f29cfee40721949e5eeb6e7977f319635c44d79f58e7e19676d1165dfdde2
 DIST coverage-7.2.0.tar.gz 812120 BLAKE2B 17851996635a1621643e64025ba43f11d7e844fb8757c5bfd6794dbff85cf2c218dc61119c8604f19f951c83264eb13f9c8f0cf7f070f6b213603b25b756a59c SHA512 a913c257702a77b115b6519c0feaf9336973330c9264cb376453555c30f305db2b924d5dd8ff7b58bb89d9f1765b069512929d1ccc9c1c234bdd08d6fc82213b
+DIST coverage-7.2.1.tar.gz 812219 BLAKE2B bb6b482990b0620d7e264244a9e31ee44b37fe83436c1d7d016d20e36d9ecbea85a614a4142683757bb1284bfbe2a157fc4748b01c76b5495c5eca5834e9a848 SHA512 40a7f1d25c7100b8f2f4ba1f877c241f65e1f560cdad861dab05254a4e177de37615888441d47a6c2ebc525ad2b52b476da7111efe5583708f094dd3a1b39984
 EBUILD coverage-7.0.5.ebuild 1879 BLAKE2B b23b76f71ed197fada5e15ea5987f5e352f016ef1744e664b76acf52b9424721d0ef30291ded16faf1bb41b19011edd3649210ff383579eae9baeeaa263fbdb8 SHA512 0c80cc5065ed1b2d1881a522bfc9690ecf86b3c2121cb5bd0307a78341b7974fdd737d576f2aac98488ae7c67641a255c3017f5ed655867101be28a07e78c6e8
 EBUILD coverage-7.1.0.ebuild 1880 BLAKE2B 625b4106e56dfdd41ecdf7d90c7a95dee9b41cc81a428a5fd54b1df3c7ad87ea9a9267e999f831cd0708f6a15f008905aebb27bbcf56e75c0dd25d38bc6e70b5 SHA512 a45c4292c142aa9bc59d8e4684246a10156e4b0348edb3a4faaf86d4ea700c68f672338f0483584181c84a516d7cb21d1b1ed3c1619ac159666c8c3a0deac1e2
 EBUILD coverage-7.2.0.ebuild 1840 BLAKE2B f07c3f549bed3742ea7e32db73a74937a58721a70602d437089b523134e4174cb65d52f3e6261aa531d55271da979422933e358b96208ef36786773998ed4966 SHA512 f6656da1a9bf31d979174c8e69afdea17fe1eb545809829943037b778999f82dc5a2bac23f81977b230e3430111c79aec2324577bdd494f788388b0330670157
+EBUILD coverage-7.2.1.ebuild 1840 BLAKE2B f07c3f549bed3742ea7e32db73a74937a58721a70602d437089b523134e4174cb65d52f3e6261aa531d55271da979422933e358b96208ef36786773998ed4966 SHA512 f6656da1a9bf31d979174c8e69afdea17fe1eb545809829943037b778999f82dc5a2bac23f81977b230e3430111c79aec2324577bdd494f788388b0330670157
 MISC metadata.xml 771 BLAKE2B 38e9680d0851f70050aad987714a9dd2f95178b0bc3d794dc08726c0618d1ea98be32a413ac397f4b222e8a5d8fdc747b7f1677bcfe842bac4080537e85a03a9 SHA512 8c44c40348fe5d416d8b4016fe22cc9ae0b94fbaf181deb79aa737f87271992521b710c1208d0eeb7ef92d96fc8a7daac1ec6feb1ae081a80f13327b5b094064
diff --git a/dev-python/coverage/coverage-7.2.1.ebuild b/dev-python/coverage/coverage-7.2.1.ebuild
new file mode 100644
index 000000000000..b83e4bdd6609
--- /dev/null
+++ b/dev-python/coverage/coverage-7.2.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="
+	https://coverage.readthedocs.io/en/latest/
+	https://github.com/nedbat/coveragepy/
+	https://pypi.org/project/coverage/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.{8..10})
+"
+BDEPEND="
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/^addopts/s:-q -n auto::' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+test_tracer() {
+	local -x COVERAGE_TEST_TRACER=${1}
+	einfo "  Testing with the ${COVERAGE_TEST_TRACER} tracer ..."
+	epytest tests
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# pip these days insists on fetching build deps from Internet
+		tests/test_venv.py
+	)
+
+	"${EPYTHON}" igor.py zip_mods || die
+
+	local -x COVERAGE_TESTING=True
+	# TODO: figure out why they can't be imported inside test env
+	local -x COVERAGE_NO_CONTRACTS=1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=_hypothesis_pytestplugin,flaky.flaky_pytest_plugin,xdist.plugin
+
+	local prev_opt=$(shopt -p nullglob)
+	shopt -s nullglob
+	local c_ext=( "${BUILD_DIR}/install$(python_get_sitedir)"/coverage/*.so )
+	${prev_opt}
+
+	if [[ -n ${c_ext} ]]; then
+		cp "${c_ext}" \
+			coverage/ || die
+		test_tracer c
+		rm coverage/*.so || die
+	else
+		test_tracer py
+	fi
+}
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index c84d489b5a12..278b20839cc7 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,8 +1,10 @@
 AUX imageio-2.22.0-block-download.patch 1211 BLAKE2B c01e3fd7db7463bc11bf331384a21becfc3160d4880a2fd09e47bf0927d97e46787097f50a489b83c2626078b60a0cf8a0d896040981e78c107f1783c8e84c26 SHA512 170261b9fb07ccb7f7a7e058335326df1f72c8d098076bf6ca048a7ca6bac95ddb512b9e41740c385430bc25613249455203addd59931af4e70298e772303964
 DIST imageio-2.25.0.gh.tar.gz 401690 BLAKE2B 3c7faa7aae06b098a171ad168cd28d14abbc32d519a373ab77c4bec30913faa7baafc2f0b4721a80ee72a6e7b479c12fe27e707c4a90bcaaf2ebceb2b4b39577 SHA512 e887d8572f4698b6cd6fad832054cbce2550a4165e65704c2f990b500234cc938c68b9840bc8961a7258cf4cfa91c3ac909c7965de689b00b04195ab1120850c
 DIST imageio-2.25.1.gh.tar.gz 402105 BLAKE2B 8d7f5881fecf2b5bd5fa0534f4f979db252a1541fce518a4c5acdf7592c8e752dc49e0025d7319fc27588cb457c4f5b05e9a91f510039b95371ac31bee9fd241 SHA512 0473eb10c00e4ceff858394d3bde3b7c42fc7f2c6692ab3f7a1e20c67ab84fed3129948eff5aef0c43bf750906c3b3b8acca75fcbba855b6b9f725258df4241f
+DIST imageio-2.26.0.gh.tar.gz 403652 BLAKE2B 2f1948b1cee03ef4fdd71489923a1ea5b0c364fb5f000d79e1d309042184a6bb267a323bd19fce85bf47857245eb4be5283f0b3df65857d7cac57c24930ea409 SHA512 6ad8ce0395033571c0d918dbe03ffeab0e43b29d402bc91a229d3ffd689eae3d01aa09dec386d03fe028f6138887883cfda4e0a769f523ba9f6c3e3041a0cb7f
 DIST imageio-chelsea.png 221294 BLAKE2B 58537d7a1678fa5be4cc899e5bacd925bfc180eb4ae691330a53749a49ff544e979609b529ed27e5c1fc9efe4bc050ca1ce49b777f4016fb1d66affd926ef9d3 SHA512 48470cdb843eed4dfa6673811c09c5aac9869ee23dd36be0c6b653d9f108d61d21b148c2a4435aaa6604887ba030e5bbc5e35d378da876366445dfc2d0ba4e27
 DIST imageio-cockatoo.mp4 728751 BLAKE2B 45b22cd517c1cb7c0cd12f8865facaca6a847047aea716e49633cf2b1dc13826f94787c8a8f9dd5f48c6a896f5d37794c0058da1bde9e1469f196916476dbfa2 SHA512 e9cb7c25de8019c59ba4090cf10ab29f2b5d62ada37a877081ca07d2ecfe010036222ae843b41bbcc843130d97fa5e14421de252639e9481df1d1c27b19add49
 EBUILD imageio-2.25.0.ebuild 2071 BLAKE2B 10ff98b2b56ca3e3ecc2b34a0196efb3512e7e17b7b79e3abdda530552fc790e32ac033b07d9875acf85578a35eb22f67de6c5304db850fdf1eb549312b75d6f SHA512 a381707af28eb925fb71c51bd88233039cd9abd7fd347bec4ecd64542a4c4ddb8628d1a5aec89aaf3f4f01ef12f0b77229a1f0bc9e0a4de35a646fddc77379e7
 EBUILD imageio-2.25.1.ebuild 2071 BLAKE2B 10ff98b2b56ca3e3ecc2b34a0196efb3512e7e17b7b79e3abdda530552fc790e32ac033b07d9875acf85578a35eb22f67de6c5304db850fdf1eb549312b75d6f SHA512 a381707af28eb925fb71c51bd88233039cd9abd7fd347bec4ecd64542a4c4ddb8628d1a5aec89aaf3f4f01ef12f0b77229a1f0bc9e0a4de35a646fddc77379e7
+EBUILD imageio-2.26.0.ebuild 2071 BLAKE2B 10ff98b2b56ca3e3ecc2b34a0196efb3512e7e17b7b79e3abdda530552fc790e32ac033b07d9875acf85578a35eb22f67de6c5304db850fdf1eb549312b75d6f SHA512 a381707af28eb925fb71c51bd88233039cd9abd7fd347bec4ecd64542a4c4ddb8628d1a5aec89aaf3f4f01ef12f0b77229a1f0bc9e0a4de35a646fddc77379e7
 MISC metadata.xml 702 BLAKE2B 646c6a83e6d8e345fddb9cbc42a83c1193b9590937cd652e293d03e6e9d4b240a69e6e86399f5edc9ef05f96d1d4c3713dfa65f8b13984f4483b2ce76a239429 SHA512 5e1e4db52fed55ab837c70ddb9ec81a7ce0b062064e2d33cb5771cd81d50a1a2164e446531c32a405bb9319acd736141765dcd00e36d6db770434a656ad925e1
diff --git a/dev-python/imageio/imageio-2.26.0.ebuild b/dev-python/imageio/imageio-2.26.0.ebuild
new file mode 100644
index 000000000000..30875e33909b
--- /dev/null
+++ b/dev-python/imageio/imageio-2.26.0.ebuild
@@ -0,0 +1,82 @@
+# 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
+
+BIN_COMMIT=224074bca448815e421a59266864c23041531a42
+DESCRIPTION="Python library for reading and writing image data"
+HOMEPAGE="
+	https://imageio.readthedocs.io/en/stable/
+	https://github.com/imageio/imageio/
+	https://pypi.org/project/imageio/
+"
+SRC_URI="
+	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/chelsea.png
+			-> ${PN}-chelsea.png
+		https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/cockatoo.mp4
+			-> ${PN}-cockatoo.mp4
+	)
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# over 50% of tests rely on Internet
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
+	media-libs/freeimage
+"
+# requests for fsspec[github]
+BDEPEND="
+	test? (
+		dev-python/fsspec[${PYTHON_USEDEP}]
+		dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/tifffile[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	local PATCHES=(
+		# block silently downloading vulnerable libraries from the Internet
+		"${FILESDIR}"/imageio-2.22.0-block-download.patch
+	)
+
+	if use test; then
+		mkdir -p "${HOME}"/.imageio/images || die
+		local i
+		for i in chelsea.png cockatoo.mp4; do
+			cp "${DISTDIR}/${PN}-${i}" "${HOME}/.imageio/images/${i}" || die
+		done
+	fi
+
+	distutils-r1_src_prepare
+}
+
+EPYTEST_DESELECT=(
+	# Fails because of system installed freeimage
+	tests/test_core.py::test_findlib2
+	# Tries to download ffmpeg binary ?!
+	tests/test_ffmpeg.py::test_get_exe_installed
+	# blocked by our patch
+	tests/test_core.py::test_fetching
+	tests/test_core.py::test_request
+	# known broken
+	# https://github.com/imageio/imageio/issues/890
+	tests/test_freeimage.py::test_exr_write
+)
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 7ffcdf408ab1..a6d0b6d9d475 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -3,8 +3,10 @@ DIST mkdocs-material-9.0.10.gh.tar.gz 10933071 BLAKE2B 702db94a8c91a856ffcf30402
 DIST mkdocs-material-9.0.12.gh.tar.gz 10929135 BLAKE2B 2b8468790c38e40a35b7fd4ff324cde485c1a7f7bc5c748b52b21b34deaca62f397ec056717107dc50024315b9740dc0b9dcce9921fd84c0cda5f9de55068553 SHA512 fd52632e2eb2225d32ac13a48eb0bab8f694644e8369a90ee85902549405b13b2308102ffe6bcb631d4847c7f1b345637d5b86470454eea52487a7b92dd14ab1
 DIST mkdocs-material-9.0.13.gh.tar.gz 10930459 BLAKE2B d3d4b25e2e2b524caa70a47c2cd51cd2c06921beccecb8f76c67f177a72568698056151fb20ee5141df0d6cdeee75192d7a7fc4dc85511501f4d2c8dfe5a3e1c SHA512 cc2abaab0727376ff3b3f3d3099c57f601243520c644dcc48b0c6d671ae543a8b65e8161fa8e4d1199671652a54e14969a7c2470985b0570e63763cf88d63704
 DIST mkdocs-material-9.0.14.gh.tar.gz 10932657 BLAKE2B a43fe024bd4c285801c10a3a45b0e601bc5c338fde51408db8c23cdf84455b606461fffda86d8bcb53374102a32a5efe315467305842a5e9fc5859db26b06b0e SHA512 9821fc1ce6e1b74b920b7c928c9ceb00d8f7489939c58d12c9a7c238ca75b619a23bffe0eccb7653d5303eaf6281e2fbd81392b19ff8f4c1431754544a432297
+DIST mkdocs-material-9.0.15.gh.tar.gz 10923424 BLAKE2B d2980f058001f0246be4ad34496a066b962e9fed8239415dd54dff0287211d97a640a2aca808aea1daec2f445b548153f6efd229bba515c968d50bd609936b4d SHA512 39b4a6d5d50ea27c7cdd2d23cf2d41a79d6dc0e1949346bd8d7c0e9a0792f7a9a9ae15594ff83017211d858d94240a09b0314a6294f268cf43e7337868ba5e69
 EBUILD mkdocs-material-9.0.10.ebuild 1271 BLAKE2B c8860ec31923f275d1ddeeba10aed7d651ebdb4a6131d701dbf43aea3dc99064e48e0c0ddbd38b75eedd5257964da0428b5736e919c70d44ee8228791810876e SHA512 74efdd9f73927fc38bb2ba3181fd8bbd595129292a03c3fc4e8b75694c92d7c46e8ca99f715d8a9a9445cf0815bcf1e2fdf88f317480acf27b3eb61f617089a8
 EBUILD mkdocs-material-9.0.12.ebuild 1273 BLAKE2B 00962df71a81ba3e3d705e3757e7789e782f78dbbd1b9d7f8ca0a365926970106672cfdb98c8e56d96fc9cb9beca599b5ed80685a76b738540f7e7661cc9c206 SHA512 90faf451432bf546477e0d0a25e2c31f47d78a5bf3e76e8b954fa4169f5bd3097448b086222ba5086204dd6177e091b402837f953f7c989f868a733fe07a0e04
 EBUILD mkdocs-material-9.0.13.ebuild 1273 BLAKE2B 00962df71a81ba3e3d705e3757e7789e782f78dbbd1b9d7f8ca0a365926970106672cfdb98c8e56d96fc9cb9beca599b5ed80685a76b738540f7e7661cc9c206 SHA512 90faf451432bf546477e0d0a25e2c31f47d78a5bf3e76e8b954fa4169f5bd3097448b086222ba5086204dd6177e091b402837f953f7c989f868a733fe07a0e04
 EBUILD mkdocs-material-9.0.14.ebuild 1278 BLAKE2B 306edbe42d3b1ad120007bdd9bf7f78fb18d3f755e93f33069be39537a1a124d7e5b29663b953e4cebae9698a325cce9d056cb2239576e373c597ee58d981cea SHA512 38389c354fb22a066a8e15ee6f9ed96612d7e28934a77ed33dd22ed7e809b465a3f41be0fd1446a8ed151982f6e088a3a4f32f0e81f8246606656cecd012ef36
+EBUILD mkdocs-material-9.0.15.ebuild 1278 BLAKE2B 306edbe42d3b1ad120007bdd9bf7f78fb18d3f755e93f33069be39537a1a124d7e5b29663b953e4cebae9698a325cce9d056cb2239576e373c597ee58d981cea SHA512 38389c354fb22a066a8e15ee6f9ed96612d7e28934a77ed33dd22ed7e809b465a3f41be0fd1446a8ed151982f6e088a3a4f32f0e81f8246606656cecd012ef36
 MISC metadata.xml 1037 BLAKE2B 6997d0f85e31152c58092081b697d8934c54f933e188082eb55e5e9f252f57274f673e1d8e5b657907da2d1658f969cd67bdb32bdc05324746f211b718f3a4b2 SHA512 ccd4f4aa6e6e780d0aff5894b260eedb602d29cc25427c202561525d27de4a31d1e13f59267d8d732d0e12f3ca0485996bca6ef2a114e96b030259899e8ad47c
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.0.15.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.0.15.ebuild
new file mode 100644
index 000000000000..eedc60f73616
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-9.0.15.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9..11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material-extensions
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material/
+	https://pypi.org/project/mkdocs-material/
+"
+SRC_URI="
+	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.14[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.9.1[${PYTHON_USEDEP}]
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND="
+	>=dev-python/mkdocs-material-extensions-1.1.0[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	# simplify pyproject to remove extra deps for metadata
+	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
+)
+
+src_prepare() {
+	echo "__version__ = '${PV}'" > gentoo_version.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index f5c0e178ddb8..3bba8da93d5e 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,6 +1,3 @@
-AUX 7.44-fix-tests.patch 1679 BLAKE2B ca0126a6dc12203ba8409c70ffa5142288bc94fd07ccc4404ee6f19a8515a46cc4e257dd26a12266aa3263e359e9167daa3ef36bde9867d2a4346ce38fcaac1b SHA512 743fbc3335daccb4e1d21b4c0e659d87582120b21d1cacecf0725fed9fe1eb6251761fdb50814c04e79ac3b13408335b34072e94bc704d3c333b96eaa9d52f76
-DIST pycurl-7.45.1.tar.gz 233879 BLAKE2B 8a6fe72f00cfd172b4f5e257f4526c4115047aa911d7fb3802d3bf105ac70dc866b27fa4878aae9f92229a5dd5108a2b5e1c9acfe93e1a94dac60d9405c5d5e6 SHA512 05639d484aac6d6688677589e391975158c5ef778456a47df575ad13fb8bd0db67ff8f5a39bdd99d82a67926aca421c01e687eec9d4fd87f32822b492b429635
 DIST pycurl-7.45.2.tar.gz 234245 BLAKE2B 16257a967d2867de08d83478f602d00b54316d37b6a544804e606a814f61507530fb7e1ef3247be824dfa22b9487a69bbfc9b1038b2b776ebc556b18ed2d93ca SHA512 8a82346395acfc0bd37a8c4d8d2b17e5ab4602710308ed50f9ed88c223c73f15f5b1c95fc6191708e3bd9d647e4bc5ec91f740de433dd87e2ae0796ac79879ac
-EBUILD pycurl-7.45.1.ebuild 2568 BLAKE2B fb2282cc2d5ae1acad393b4d3bf91ac0b4559f0b1a49c7c5b5227865ccdf3a776b954bed3f55ed92711b99d6fd6cf0d0a499d74e24a89049cc98e29c0eef98e3 SHA512 f6b0d9b3c1a06f98c172da93eb373f63d8e138e77a36b6d52d1ceb2e0c20db7dea48a52765f0b74dd27dbb6a12750d92e86d3c031712c698659bdb7e1e1ec7bb
-EBUILD pycurl-7.45.2.ebuild 2519 BLAKE2B 06b7c7818fd90a6a98336f2a8b924cf4aa3b12b12504782c2bcb8464ad42eff18db6d9235896c6357805ab80c4c071f3f8f5e2e20c92ae6df7a9c403696aaba3 SHA512 76dc327123918c24242e0c4418ab44f3c8541d95b35ba238e08d0519fa105ceccea0931c3dea2d492bc29e1b272a94f33a86a216393f19b3ad40f7a5765c6e72
+EBUILD pycurl-7.45.2.ebuild 2472 BLAKE2B 604001f0bc58d0431d70fb2c18bbe0aa4e24473ac452159a8837862fd41fa5901263f7319753b1bdc1bc59d7fc5ba53fcb738673823fd6746d6985dfdeaa0275 SHA512 d45856a11ea1f65122e2e454722957a1f73a2fd87f6eb4470adac2c377f56396eb1e1a3c70b6889cd67fc32505427514f2deac06e81c30d35fb359da6022f739
 MISC metadata.xml 1100 BLAKE2B dfc7fe054c7cc34c61bf58fef0378df304a539c28cbc0dff4ffff65ccc8892c38aaf1e275885fc54d2854d9acc6b382947038041f815b5941859be7cfe75523f SHA512 f1de0dccd625ae0b02ff9a55cbc1bbf7944faa24dba28ffd711c728001f180afa598a255132aea860ad616637325cdc653577af531b1a954a3994e8902c774aa
diff --git a/dev-python/pycurl/files/7.44-fix-tests.patch b/dev-python/pycurl/files/7.44-fix-tests.patch
deleted file mode 100644
index d5d900100086..000000000000
--- a/dev-python/pycurl/files/7.44-fix-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://github.com/pycurl/pycurl/commit/d47c68b1364f8a1a45ab8c584c291d44b762f7b1
-From: Samuel Henrique <samueloph@debian.org>
-Date: Sat, 30 Apr 2022 23:02:34 +0100
-Subject: [PATCH] tests: fix error message on error_test (for curl >= 7.83)
-
-curl 7.83.0 removed exclamation marks from a few error messages, curl commit:
-https://github.com/curl/curl/commit/6968fb9d54dc3a1aaa1b16088f038eaf5dd8b2d7
-
-This commit adds support for the new curl release while also supporting the previous ones.
---- a/tests/error_test.py
-+++ b/tests/error_test.py
-@@ -29,7 +29,8 @@ def test_pycurl_error_libcurl(self):
-             err, msg = exc.args
-             self.assertEqual(pycurl.E_URL_MALFORMAT, err)
-             # possibly fragile
--            self.assertEqual('No URL set!', msg)
-+            # curl < 7.83.0 has an exclamation mark in this error message
-+            self.assertIn(msg, ['No URL set!', 'No URL set'])
-         else:
-             self.fail('Expected pycurl.error to be raised')
-     
-@@ -43,9 +44,10 @@ def test_pycurl_errstr_type(self):
-             self.curl.perform()
-         except pycurl.error:
-             # might be fragile
--            self.assertEqual('No URL set!', self.curl.errstr())
-+            # curl < 7.83.0 has an exclamation mark in this error message
-+            self.assertIn(self.curl.errstr(), ['No URL set!', 'No URL set'])
-             # repeated checks do not clear value
--            self.assertEqual('No URL set!', self.curl.errstr())
-+            self.assertIn(self.curl.errstr(), ['No URL set!', 'No URL set'])
-             # check the type - on all python versions
-             self.assertEqual(str, type(self.curl.errstr()))
-         else:
diff --git a/dev-python/pycurl/pycurl-7.45.1.ebuild b/dev-python/pycurl/pycurl-7.45.1.ebuild
deleted file mode 100644
index d8fd41fb47b5..000000000000
--- a/dev-python/pycurl/pycurl-7.45.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Python bindings for curl/libcurl"
-HOMEPAGE="
-	http://pycurl.io/
-	https://github.com/pycurl/pycurl/
-	https://pypi.org/project/pycurl/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl"
-
-# Depend on a curl with curl_ssl_* USE flags.
-# libcurl must not be using an ssl backend we do not support.
-# If the libcurl ssl backend changes pycurl should be recompiled.
-# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
-# does not need to initialize gcrypt threading and we do not need to
-# explicitly link to libgcrypt.
-DEPEND="
-	>=net-misc/curl-7.25.0-r1:=[ssl=]
-	ssl? (
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
-		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= )
-		curl_ssl_openssl? ( dev-libs/openssl:= )
-	)
-"
-
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	test? (
-		>=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/7.44-fix-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# docs installed into the wrong directory
-	sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
-	# TODO
-	sed -e 's:test_socks5_gssapi_nec_setopt:_&:' \
-		-i tests/option_constants_test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	# Override faulty detection in setup.py, bug #510974.
-	export PYCURL_SSL_LIBRARY=${CURL_SSL}
-}
-
-src_test() {
-	emake -C tests/fake-curl/libcurl CC="$(tc-getCC)"
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local EPYTEST_DESELECT=(
-		# refcounting tests are unreliable
-		tests/memory_mgmt_test.py::MemoryMgmtTest::test_readdata_refcounting
-		tests/memory_mgmt_test.py::MemoryMgmtTest::test_writedata_refcounting
-		tests/memory_mgmt_test.py::MemoryMgmtTest::test_writeheader_refcounting
-	)
-
-	epytest -p flaky tests
-}
-
-python_install_all() {
-	local HTML_DOCS=( doc/. )
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycurl/pycurl-7.45.2.ebuild b/dev-python/pycurl/pycurl-7.45.2.ebuild
index 4dd8c987afbd..b0b1d57414d6 100644
--- a/dev-python/pycurl/pycurl-7.45.2.ebuild
+++ b/dev-python/pycurl/pycurl-7.45.2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1 toolchain-funcs
+inherit distutils-r1 pypi toolchain-funcs
 
 DESCRIPTION="Python bindings for curl/libcurl"
 HOMEPAGE="
@@ -14,7 +14,6 @@ HOMEPAGE="
 	https://github.com/pycurl/pycurl/
 	https://pypi.org/project/pycurl/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-python/pypdf/Manifest b/dev-python/pypdf/Manifest
index f0b927a38b3c..3240018bf4d2 100644
--- a/dev-python/pypdf/Manifest
+++ b/dev-python/pypdf/Manifest
@@ -1,8 +1,10 @@
 DIST pypdf-3.3.0.gh.tar.gz 6803536 BLAKE2B ff70995882581c816fbf7410232c68e9649632161b4927543924a11b1a0a816f1178be399079e32078fe8d89a2aa9cd0eb1562409dc8e7bd388cad3afde37198 SHA512 5db25d6c4b41a1d19b45fa907f53e0106e01c93eb4152079dc4ffbd7bf28fbf8915bf0e3bf1af4a371e805657884fe2c42de4856944085ca7bc07a477f3ba588
 DIST pypdf-3.4.0.gh.tar.gz 6931831 BLAKE2B 037ac998cc1e3d078281b64183197678a80345731f6d4691b00f9e546eb61eaa34c4d7f4b704191c887975517da73359983f1b7405776e99257f79b1604dafc0 SHA512 9bee70a039c42533b600f1e95e28a4889d7df212bae18deca7d88501008d3a3e2b4d7fe36134e947cb14b0acc650126688c358ce2b662917a4c6df46241db1ab
 DIST pypdf-3.4.1.gh.tar.gz 6930245 BLAKE2B 9e8a5a1ebe95b64c9274ce6b0ea252d65f41d4b6791d6c6acf87f810794892337aed13ddc9b77f05a404fe94b3d9c2444f2a06c4feea9661204e71684bbbbfd5 SHA512 e2e3fa74bc6e96afc5999429e7603dd3ab8e6443b6259e456bc6d90cb2d7a15a484b226e218478c1e92cfd7fe23c93247f212568c6fcd51d80afde32b83460ba
+DIST pypdf-3.5.0.gh.tar.gz 7181507 BLAKE2B 8f5c129613ed12a9eaa90cf0e6fa189b0fc5bf109f26b8cc35ff1550e916b0635715359b2ece9c3c0243095c2e802474e99fe4c59d16b0f75b4375fb2ce07e5d SHA512 a8a0fad3fd08d88738088a06df4f1cbf419571e9e817c6097ce8bdcf7b1dd32f478ac712879cabceb7034f4e9a421f887ff117a1812782eadb670c8043aff86c
 DIST pypdf-sample-files-0fe84b30ed33ff3daa9293e44349b8618f135699.gh.tar.gz 9027166 BLAKE2B 912bb9fbd632bd0ad2cc2e865a1e6870ad7064aa2cf4d6f96217f63ac685e9a511f0bb20c22d48ae970a2eb171b27a0fa680fa42892425531f69735840cf741b SHA512 07a71a3566dabcea5dc8a549949d0f0c0f9483d5d9f85851d6e4e702dd374b348469a80e5300d18983e560ee9a44d0639b55eb338023b9ebbdb26c6f8c455e07
 EBUILD pypdf-3.3.0.ebuild 1369 BLAKE2B 6cb454e1d1c8c46c3f5ab952f09819b41a3564306fcbfb9d2f43f15a464021cea5d72422d76625b14334e8c1368116969ff1d3a91a1135ffd833012349d0b72a SHA512 a6bce2001c1aefe1c49a73459e4289b5f9682338a11e1c50e3b00a0e64a964db408b0392f3297c5566f372ad6f196024bb95e1e0dac71045158ff1f5ba533d5f
 EBUILD pypdf-3.4.0.ebuild 1369 BLAKE2B 6cb454e1d1c8c46c3f5ab952f09819b41a3564306fcbfb9d2f43f15a464021cea5d72422d76625b14334e8c1368116969ff1d3a91a1135ffd833012349d0b72a SHA512 a6bce2001c1aefe1c49a73459e4289b5f9682338a11e1c50e3b00a0e64a964db408b0392f3297c5566f372ad6f196024bb95e1e0dac71045158ff1f5ba533d5f
 EBUILD pypdf-3.4.1.ebuild 1276 BLAKE2B 4ba64bc15030ca8099cbbae6e4c070268e7e29e26612ccfada878686afe42b91cf47e9ff198d49d0d17f84c1d878b921dfb62960eedb74bfa3316f73b0af3a34 SHA512 f9bcf246b1179f1a1094e84d239da335166560dd120735cc2d2171987c9dbf6fc4d0d74146cfc4307069d1e250a09f2acfd9d2f1ad4feeabd9e750c8077151d2
+EBUILD pypdf-3.5.0.ebuild 1276 BLAKE2B 4ba64bc15030ca8099cbbae6e4c070268e7e29e26612ccfada878686afe42b91cf47e9ff198d49d0d17f84c1d878b921dfb62960eedb74bfa3316f73b0af3a34 SHA512 f9bcf246b1179f1a1094e84d239da335166560dd120735cc2d2171987c9dbf6fc4d0d74146cfc4307069d1e250a09f2acfd9d2f1ad4feeabd9e750c8077151d2
 MISC metadata.xml 373 BLAKE2B a829b7048eb3a95caeb1be83b6172603df6a031d40995294f2687bf3c3cb70e66fafb9ba8339d9979fc85f5936b9552963a8fcd072a20661fa78f3aa3c4b89c0 SHA512 775ac2de487f11fba1ea8d283b42b9ef56e42cd95ea11f50a06b099420e69c0567f65c506b14891ac641da90ea05ca70da4f8a3e4a028cf41bdbc823021dccfe
diff --git a/dev-python/pypdf/pypdf-3.5.0.ebuild b/dev-python/pypdf/pypdf-3.5.0.ebuild
new file mode 100644
index 000000000000..e9581fbc5b9a
--- /dev/null
+++ b/dev-python/pypdf/pypdf-3.5.0.ebuild
@@ -0,0 +1,59 @@
+# 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_{9..11} )
+
+inherit distutils-r1
+
+SAMPLE_COMMIT=0fe84b30ed33ff3daa9293e44349b8618f135699
+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
+	)
+"
+S=${WORKDIR}/pypdf-${PV}
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+RESTRICT="test"
+# 150+ tests require network, too many to deselect
+PROPERTIES="test_network"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+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
+}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index fa0b6a315bc1..591c0cec6700 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,6 +1,4 @@
-DIST pypy3.9-gentoo-patches-7.3.11.tar.xz 6444 BLAKE2B adcc1ae4c3ae2c5317a05d6de51785945625d8bcc7cb35bd6608fa80f09b37c483c95663eacb0353013a5abec308d25b12666699c65512f5f3a6d7345f2b5b18 SHA512 f2064ecffa09ba23f5f8c281ca4c8c0740cb6b57185d66c02eec2bcb77cfb566b1a2db4f52c472bcaf0d5fb759ee8003b27761af37785d12465c2010fd73c49d
 DIST pypy3.9-gentoo-patches-7.3.11_p1.tar.xz 7480 BLAKE2B ffb478402e82244af25dd67bb9e21abb4bb186d98495899f8ca8f323bdf27a77356e40efd33217a5238ef86f6156fc7d85c681a747ea5a35bd73bab659972986 SHA512 6c3ee21b51145907c2434f740e9849ac02ad83203fdcb2802b97ba199f37d08297d8016f659069bea3f0854ace30aefb947af4f057cbc91332106d9fc1389cf4
 DIST pypy3.9-v7.3.11-src.tar.bz2 23460769 BLAKE2B fa8a827c28813243926c8689addb008c0a43acdc3f81a18749a8f2c1926b6294f2c0c95a4c315e3b77ce84b4f337af7a0bce5daf8dcb60ead965532d4af183cb SHA512 33c978ffbeeb39453028d1d1646ccfdace062ce48a5d939245bea41643038dd3687e80e34f88fa0622bcb175d7dd78f75cbe36b24229c8052f09d2d17dcdfd8c
-EBUILD pypy3-7.3.11-r1.ebuild 5860 BLAKE2B 1dc807f5275e756aa18726045ed5770c821c4dc8361c27270d2c2057eca84a49aa7a1557406a01d0b395e5eded2805764532916c81feaf43bebd7bf09362a9b4 SHA512 776b342d4c51e5d42229912afab4deb0ff16e84db5bc7a696e8dcff6e476ad7931bf5b13cd5f8e3b1edc08b51b8f5f4f47cf0637139a9a3af011ed8a98511983
 EBUILD pypy3-7.3.11_p1.ebuild 5860 BLAKE2B 1dc807f5275e756aa18726045ed5770c821c4dc8361c27270d2c2057eca84a49aa7a1557406a01d0b395e5eded2805764532916c81feaf43bebd7bf09362a9b4 SHA512 776b342d4c51e5d42229912afab4deb0ff16e84db5bc7a696e8dcff6e476ad7931bf5b13cd5f8e3b1edc08b51b8f5f4f47cf0637139a9a3af011ed8a98511983
 MISC metadata.xml 531 BLAKE2B 0f727c7ced9fb24ba0dc0b41d51c177b3711de33b838bf46cfdde5d8b751de9694873c13fe8153747f2cb533c078c54f004ee84b1c3c57b6f8d62128ffb9dba2 SHA512 331b66647a58047ded4bcf1529e3ca16b21cbb37afa82d8be0a4b6ad605e17bf3f1478fad1ea3b9c970bdf5162cb41e6adcb029a261fcbf894e807998b9219f6
diff --git a/dev-python/pypy3/pypy3-7.3.11-r1.ebuild b/dev-python/pypy3/pypy3-7.3.11-r1.ebuild
deleted file mode 100644
index e64e9730f17b..000000000000
--- a/dev-python/pypy3/pypy3-7.3.11-r1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pax-utils python-utils-r1 toolchain-funcs
-
-PYPY_PV=${PV%_p*}
-MY_P=pypy3.9-v${PYPY_PV/_rc/rc}
-PATCHSET="pypy3.9-gentoo-patches-${PV/_rc/rc}"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.9) language"
-HOMEPAGE="
-	https://www.pypy.org/
-	https://foss.heptapod.net/pypy/pypy/
-"
-SRC_URI="
-	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
-SLOT="0/pypy39-pp73-336"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+ensurepip gdbm +jit ncurses sqlite tk"
-# many tests are failing upstream
-# see https://buildbot.pypy.org/summary?branch=py3.9
-RESTRICT="test"
-
-RDEPEND="
-	|| (
-		>=dev-python/pypy3-exe-${PYPY_PV}:3.9-${PYPY_PV}[bzip2(+),ncurses?]
-		>=dev-python/pypy3-exe-bin-${PYPY_PV}:3.9-${PYPY_PV}
-	)
-	dev-lang/python-exec[python_targets_pypy3(-)]
-	dev-libs/openssl:0=
-	dev-python/gentoo-common
-	ensurepip? ( dev-python/ensurepip-wheels )
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-	default
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_compile() {
-	mkdir bin || die
-	# switch to the layout expected for cffi module builds
-	mkdir include/pypy3.9 || die
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/bin/pypy3.9-c-${PYPY_PV} pypy3.9-c || die
-	cp -p "${BROOT}"/usr/include/pypy3.9/${PYPY_PV}/* include/pypy3.9/ || die
-	# (not installed by pypy-exe)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/pypy3.9/ || die
-	mv pypy/module/cpyext/parse/*.h include/pypy3.9/ || die
-	pax-mark m pypy3.9-c
-
-	# verify the subslot
-	local soabi=$(
-		./pypy3.9-c - <<-EOF
-			import importlib.util
-			import sysconfig
-			soabi = sysconfig.get_config_var("SOABI")
-			magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff
-			print(f"{soabi}-{magic}")
-		EOF
-	)
-	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
-
-	# Add epython.py to the distribution
-	echo 'EPYTHON="pypy3"' > lib-python/3/epython.py || die
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate sysconfig data
-	local host_gnu_type=$(sh pypy/tool/release/config.guess)
-	local overrides=(
-		HOST_GNU_TYPE "${host_gnu_type:-unknown}"
-		INCLUDEPY "${EPREFIX}/usr/include/pypy3.9"
-		LIBDIR "${EPREFIX}/usr/$(get_libdir)"
-		TZPATH "${EPREFIX}/usr/share/zoneinfo"
-		WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip"
-	)
-	./pypy3.9-c -m sysconfig --generate-posix-vars "${overrides[@]}" || die
-	local outdir
-	outdir=$(<pybuilddir.txt) || die
-	cp "${outdir}"/_sysconfigdata__*.py lib-python/3/ || die
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3.9-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
-		import lib2to3.pygram
-		import lib2to3.patcomp
-		lib2to3.patcomp.PatternCompiler()
-	EOF
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-	# (NB: we build CFFI modules first to avoid error log when importing
-	# build_cffi_imports).
-	cffi_targets=( pypy_util blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma posixshmem )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3.9-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Verify that CFFI module list is up-to-date
-	local expected_cksum=63d4659f
-	local local_cksum=$(
-		../pypy3.9-c - <<-EOF
-			import binascii
-			import json
-			from pypy_tools.build_cffi_imports import cffi_build_scripts as x
-			print("%08x" % (binascii.crc32(json.dumps(x).encode()),))
-		EOF
-	)
-	if [[ ${local_cksum} != ${expected_cksum} ]]; then
-		die "Please verify cffi_targets and update checksum to ${local_cksum}"
-	fi
-
-	# Cleanup temporary objects
-	find -name "*_cffi.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_install() {
-	einfo "Installing PyPy ..."
-	dodir /usr/bin
-	dosym pypy3.9-c-${PYPY_PV} /usr/bin/pypy3.9
-	dosym pypy3.9 /usr/bin/pypy3
-	insinto /usr/lib/pypy3.9
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r lib-python/3/. lib_pypy/.
-	insinto /usr/include
-	doins -r include/pypy3.9
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/include/pypy3.9/${PYPY_PV}/*; do
-		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy3.9/${x##*/}"
-	done
-
-	dodoc README.rst
-
-	local dest=/usr/lib/pypy3.9
-	rm -r "${ED}${dest}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${ED}${dest}"/ensurepip || die
-	fi
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/sqlite3 \
-			"${ED}${dest}"/_sqlite3* \
-			"${ED}${dest}"/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/{idlelib,tkinter} \
-			"${ED}${dest}"/_tkinter \
-			"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
-	fi
-	dosym ../python/EXTERNALLY-MANAGED "${dest}/EXTERNALLY-MANAGED"
-
-	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}/usr/bin/pypy3.9-c-${PYPY_PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}/usr/bin/pypy3.9-c-${PYPY_PV}" "${PYTHON}" || die
-
-	einfo "Byte-compiling Python standard library..."
-	python_optimize "${ED}${dest}"
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pyrate-limiter/Manifest b/dev-python/pyrate-limiter/Manifest
index bd6df17c8196..04dfc6073833 100644
--- a/dev-python/pyrate-limiter/Manifest
+++ b/dev-python/pyrate-limiter/Manifest
@@ -1,5 +1,7 @@
+DIST pyrate-limiter-2.10.0.gh.tar.gz 71838 BLAKE2B 3b8fd16684268870991c3a731c5497802c6f7be51e57bc983a14a7484fad2d0983613304fa061fdb70a3e6645d17fe37fbd68e9ddeca57bc7bd97fef4a5d8585 SHA512 b0090b2d80d40ba2f86ac7b5c5612a35fa885b52a87d783aa9726782275e79ca8d54a9a44b1f0dd43c98bf2355f4c17e1686d7c7f806934ea492b67f66b06ffe
 DIST pyrate-limiter-2.8.2.gh.tar.gz 51233 BLAKE2B a9a8bbf123596c7c64f60ae2c9d4e23a394dae6d18a8d09c0ec0b289bbbfce9dacee523726b906a30cf17fd7243b3fa1d1f2dc60af1bec67dc242d944535a5fd SHA512 3ff703347a86f6a91cf6b9c8edce3017cf88f2373961ba235c2f521d0112b0116951be7314b95d737ef0bec5cb6bae9908874fafe4060eb773cf0577e2ddbdb3
 DIST pyrate-limiter-2.9.1.gh.tar.gz 71544 BLAKE2B 2f87f998abdb891673931f91a9980f5876f58a2225ca41af6ec390e59bd326e8614162549946552b22fea093f89f5c2a219eaa9223719dd4db9023944f040da2 SHA512 461b1627574ce09817b434ce0d47e3bbcb549fcd8176623b87640089c1dd9bb45030ae1c944ffd7906b04f9b1ba2977c841c1da9483619bc092570b86a49bcd6
+EBUILD pyrate-limiter-2.10.0.ebuild 1610 BLAKE2B 513df54bd30e8ebd64b58ca7d997a05a122606535f4b6d188a21d2b5e30380cccac7c435b017a0211eb9fc97af17d822d0e1cc1d66a20244ac9d666fbf5ada8f SHA512 ef0281396688a2985620780e736ddd2056db16b7d6be6eb11e32c381a7440dd992f639d6ea3e31479b3a1850c486e1d984e89bdf880919fb14fd9262c4d2a43d
 EBUILD pyrate-limiter-2.8.2.ebuild 1610 BLAKE2B 513df54bd30e8ebd64b58ca7d997a05a122606535f4b6d188a21d2b5e30380cccac7c435b017a0211eb9fc97af17d822d0e1cc1d66a20244ac9d666fbf5ada8f SHA512 ef0281396688a2985620780e736ddd2056db16b7d6be6eb11e32c381a7440dd992f639d6ea3e31479b3a1850c486e1d984e89bdf880919fb14fd9262c4d2a43d
 EBUILD pyrate-limiter-2.9.1.ebuild 1610 BLAKE2B 513df54bd30e8ebd64b58ca7d997a05a122606535f4b6d188a21d2b5e30380cccac7c435b017a0211eb9fc97af17d822d0e1cc1d66a20244ac9d666fbf5ada8f SHA512 ef0281396688a2985620780e736ddd2056db16b7d6be6eb11e32c381a7440dd992f639d6ea3e31479b3a1850c486e1d984e89bdf880919fb14fd9262c4d2a43d
 MISC metadata.xml 525 BLAKE2B 8daa0c59b247c8ec215a3868315f383614b24bf36a80950f3a94968856a27ee2eb90cedba36784355926c509a26b530f3de44be729beeee0f22595cc0b9467b5 SHA512 429e23f33cd2889a7e989333a03ee374cbec2e264d354bf1c299263f2c9167059eb17f1c975b67cd4af7011843c3478d5296033666566bca97749ca85dfcab44
diff --git a/dev-python/pyrate-limiter/pyrate-limiter-2.10.0.ebuild b/dev-python/pyrate-limiter/pyrate-limiter-2.10.0.ebuild
new file mode 100644
index 000000000000..b8c9c6a33c68
--- /dev/null
+++ b/dev-python/pyrate-limiter/pyrate-limiter-2.10.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Rate-Limiter using Leaky-Bucket Algorimth Family"
+HOMEPAGE="
+	https://github.com/vutran1710/PyrateLimiter/
+	https://pypi.org/project/pyrate-limiter/
+"
+SRC_URI="
+	https://github.com/vutran1710/PyrateLimiter/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/PyrateLimiter-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/redis[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/django-redis[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# Optional dependency redis-py-cluster not packaged
+	"tests/test_02.py::test_redis_cluster"
+	# Python 3.11 is slightly faster, leading to a non-critical failure here
+	"tests/test_concurrency.py::test_concurrency[ProcessPoolExecutor-SQLiteBucket]"
+)
+
+# TODO: package sphinx-copybutton
+# distutils_enable_sphinx docs \
+# 	dev-python/sphinx-autodoc-typehints \
+# 	dev-python/furo \
+# 	dev-python/myst_parser \
+# 	dev-python/sphinxcontrib-apidoc
+distutils_enable_tests pytest
+
+src_prepare() {
+	# workaround installing LICENSE into site-packages
+	sed -i -e 's:^include:exclude:' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index 27716de0ddb3..3417636552c4 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,5 +1,3 @@
-DIST pyrsistent-0.19.2.tar.gz 102438 BLAKE2B aa231a7c300d2f1501abdf2fc74dfa9672ad8000d87e3fa9beaa51aff4816dad4f142e9a2e609dee402352cf5a0477b6d4dc31460a71e7d98a592604fcaa97d6 SHA512 fdaadb65e72db4f90ecb1526fd68eb2b60b278071978d4b5a1b1379be83c60d30fd653dd7e6527c217d4e50f05c7d641290172aa5d5e4741dfe5e08f0b0c282b
 DIST pyrsistent-0.19.3.tar.gz 102640 BLAKE2B 60c5ef9d3f26c4529d05804df13453c75b6ff70e12fbbbbe22312686da929766fc903b18ca77d626192e1f3fc9fbdfdbbbd4eef102f1504b38feeeedf00450d5 SHA512 6bb70b6fd65b5cd9f961a3199c2d90725aaa66fb869e4eba2143735e2f3a7e4ecdc782b3498acc2d92e263c3bed14cec8cc77324f4ebd08c300ba6735db5ecf7
-EBUILD pyrsistent-0.19.2.ebuild 653 BLAKE2B 7e69362d03de573f1b4deb47e4a48f6b65caf023f7621e69c51e51414d2c0fb2927f842d57c1f63da19b5ff1be0fd803e5c2d58721a0f7f02cffd5473fdaf9fe SHA512 887ab3119e97643ec51b16242a2e0e6fb51670e8d4d4406f58a792c0259aae6af9f0c53645421ba18607982ace96ab6a88773cf4f5ad90d55a864384e77a5cc3
-EBUILD pyrsistent-0.19.3.ebuild 653 BLAKE2B 7e69362d03de573f1b4deb47e4a48f6b65caf023f7621e69c51e51414d2c0fb2927f842d57c1f63da19b5ff1be0fd803e5c2d58721a0f7f02cffd5473fdaf9fe SHA512 887ab3119e97643ec51b16242a2e0e6fb51670e8d4d4406f58a792c0259aae6af9f0c53645421ba18607982ace96ab6a88773cf4f5ad90d55a864384e77a5cc3
+EBUILD pyrsistent-0.19.3.ebuild 607 BLAKE2B 5c8d02cbc58e3594755300f6384ee64f61375bc0e1767f6910036ce841c3942c6f3a287083c32dcf0384a40b8309ed10ead1d7f4e10d637b4534138396c61bc2 SHA512 b901e4ce2ec568efe6a98e6945888f76e3f6cbb8d6737b455e7f4ef1f68ce8400514c28e118d0cdc48ded01498cbe1ed31c16370bb145fcf930564db28ff3278
 MISC metadata.xml 522 BLAKE2B fbf571fd4d833fea0dc9942620655c45bb91b07ca02e2e0fccb23980de26303b9e9c3963453cae3775f7db33dfd485a4a55782a1b1b2b635af0d62e331596b99 SHA512 fe358befc92e29769bc2f84a516da1a26026e4ab84e812326da72ee02b18c79c3d6acdfb71cb6027d2d0f1e559cc00cf39406e335fb8f38d4479353a7dbb4ff2
diff --git a/dev-python/pyrsistent/pyrsistent-0.19.2.ebuild b/dev-python/pyrsistent/pyrsistent-0.19.2.ebuild
deleted file mode 100644
index ed5e8a0b7204..000000000000
--- a/dev-python/pyrsistent/pyrsistent-0.19.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Persistent/Functional/Immutable data structures"
-HOMEPAGE="
-	https://github.com/tobgu/pyrsistent/
-	https://pypi.org/project/pyrsistent/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild b/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild
index ed5e8a0b7204..0122efd36c2b 100644
--- a/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild
@@ -6,14 +6,13 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Persistent/Functional/Immutable data structures"
 HOMEPAGE="
 	https://github.com/tobgu/pyrsistent/
 	https://pypi.org/project/pyrsistent/
 "
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/python-mpv/Manifest b/dev-python/python-mpv/Manifest
index 0f3838bcdc5b..64965d749b6d 100644
--- a/dev-python/python-mpv/Manifest
+++ b/dev-python/python-mpv/Manifest
@@ -1,3 +1,5 @@
 DIST python-mpv-1.0.1.tar.gz 210008 BLAKE2B 3ba95ac4d3219615c80ea475c1f6dc3acd608a8ded919eea55efac8bb44a8946c959a2b39473e6c9e80fa1a4e52f525d6ef9871e3eb4b2664aeb1460208bc677 SHA512 16a6e93b63f30e535c1e3bd77702d7c703dd9c0a6a689f09e689663cac04e587bdc2135612062d791ffb38c709bc289d0297ebf9f1ddaf9b1771f25eae225f1b
+DIST python-mpv-1.0.2.gh.tar.gz 210975 BLAKE2B 1a364761405e430ed91f597e15aae7f6c221980c2ed9ce0152109486d1fb79ebb7b6257c79bfef34d72468bcf335e8e514324bdd10982096a64f8949b4bca261 SHA512 62a1c682de8d0308a80b66d6f435fba8563abc84b16670c3ef55cc3d9295fd3ead7c68d99e64c06734c5be9017549a53bd760ca201146427abcfbf7aca610b7a
 EBUILD python-mpv-1.0.1.ebuild 1045 BLAKE2B a417e236b8b175f80471a2a4c336fa8f3f0c0eeef35934715ead1089e33b5627280879da4447a78e3e095ff753c17793282f2ed0d056e6431668b43d8bbdffad SHA512 e1618ede7e7b164664c70fcaa7f4317746ef0a8f874f38ff0c71cde89a1e796ba5340ce9e97d1fe7bccec33018eba1ea63ba8df400dd10e727deb652c5752522
+EBUILD python-mpv-1.0.2.ebuild 1048 BLAKE2B 040ec679210af427ad2203e8973f8f5e59d693d4465692197887816a41b7a056f9975acdf1e9a4a74b6141b24897b78e62137c5176577442c485de2ba5f01bb4 SHA512 6163020bf9905d632dc688982bfedea29f5efaa440ff1420b47b53d62677f957cf87c6e8306c7789e025c151af10cb6d3203f04c1d677b572b24a814cf659714
 MISC metadata.xml 413 BLAKE2B 3e6ced6a506525bd576741fbcb1b0ce6069492dd1e90295a46b029340b833d981b351ac717e3896f4b13f3e8635065e974317298711922ab131925d98d0447a3 SHA512 9426ddc828c6b8f420c3d0241f827dd7746ca797c45182b0324b8278a24e4038a856494b420de2de572ee2643082ae271a5c21030098432736255ff2f6798db3
diff --git a/dev-python/python-mpv/python-mpv-1.0.2.ebuild b/dev-python/python-mpv/python-mpv-1.0.2.ebuild
new file mode 100644
index 000000000000..194d0f3edd53
--- /dev/null
+++ b/dev-python/python-mpv/python-mpv-1.0.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Python interface to the mpv media player"
+HOMEPAGE="https://github.com/jaseg/python-mpv"
+SRC_URI="https://github.com/jaseg/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	media-video/mpv[libmpv]
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? ( dev-python/xvfbwrapper[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# https://github.com/jaseg/python-mpv/issues/209
+	EPYTEST_DESELECT=(
+		tests/test_mpv.py::TestLifecycle::test_wait_for_property_negative
+		tests/test_mpv.py::TestLifecycle::test_wait_for_property_positive
+		tests/test_mpv.py::TestLifecycle::test_wait_for_property_shutdown
+		tests/test_mpv.py::TestLifecycle::test_wait_for_prooperty_event_overflow
+		tests/test_mpv.py::TestLifecycle::test_event_callback
+	)
+	virtx epytest
+}
diff --git a/dev-python/python-systemd/Manifest b/dev-python/python-systemd/Manifest
index b177b2b2a497..21600ede79bc 100644
--- a/dev-python/python-systemd/Manifest
+++ b/dev-python/python-systemd/Manifest
@@ -1,3 +1,3 @@
 DIST python-systemd-235.gh.tar.gz 59858 BLAKE2B 8dbf112773dce4dfe9fb2b0e660a349481fa29c9532c5aa2d125e5bfc255b2408f63b5bd873b6fee9ebbad775ecfaf32497593b17052189797403fa31b05fd6f SHA512 f1286a477200cc7b4d2c44b43452da576e8e660925711466659795775bcee44796688e1ede6cc22e61cb5b03e631c396d22f9a133327ae1147506bce09bab47f
-EBUILD python-systemd-235.ebuild 824 BLAKE2B 0c1ea64f9d5fa8e6930b362790a2d1a8853ba2ea8334216fea62444e9728a7a2a5036bbcc4a22b71bd822526ce4af3ec03b303ff3d2fe447e00e11068145538a SHA512 f07e6c2f334cb360c1cbb4dec5afef8f2efca7a94598c489c0c91127e9bdf6f200c3a3f5f350150e422202ed10d27deca15501f0d0b19bc27324e2b406f72aa3
+EBUILD python-systemd-235.ebuild 831 BLAKE2B 630245de4da2dd7c6d0938de2c739ebe495a146326e9f6e28a39dff0a9c22d6f5dabce5988ac8d4d7667b22bcd8d5c33330baf606904ea50853bf12fb677e1f6 SHA512 2cd0dd9d1fc59515b15371ea6c2cff77a6231c3fc90131e0a2f28296021e240bf519e6e053bb92ee046d903a85e812df11b95820f058dcaaedf1219d9a55e3a4
 MISC metadata.xml 359 BLAKE2B 458599dbb5364bdf58f0cabf3fe07f03f79a4cdfb3f707ef6db328c453e606b587e13fa3349e0e0c899a7b1655e558ccae00e6a9ea22146b9e68099e0ac1a981 SHA512 73e524d826bb08d80fbe3e643be5f08e39620ddb343006752729ea41e594ad13eb6241c30da78a58f67e6e5e3c51f567a9e761af498f882f1e23ce0308bfd690
diff --git a/dev-python/python-systemd/python-systemd-235.ebuild b/dev-python/python-systemd/python-systemd-235.ebuild
index e02e710d8ca7..c687ded790d1 100644
--- a/dev-python/python-systemd/python-systemd-235.ebuild
+++ b/dev-python/python-systemd/python-systemd-235.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/systemd/python-systemd/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 DEPEND="sys-apps/systemd:="
 RDEPEND="${DEPEND}
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 58808dc7e1e0..017708423e34 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1,5 +1,3 @@
-DIST werkzeug-2.2.2.gh.tar.gz 844463 BLAKE2B 84da3dd89375d6925e7e7018701339ddfd2b608acf6b3f126bd56c2020056511de6ab157de9024069d1342f9bce4b481ba91a06089fff1a3b31f4a851af7f935 SHA512 cded6c7e0b00871366b70a41de45e31323c0fc09300413d0efca98f5a2f8207026fd77c7e5670fde727da377fd02b9b636f390a2524d2b5778e9e3bdbdfe3e3a
 DIST werkzeug-2.2.3.gh.tar.gz 847768 BLAKE2B 7d0b891a2b15e4fc469c3d331cfb2565f452ae77f772f7ab8e6254aedd172f9115cd3ebd9c82e951ea7505c0e58d6b6f07fb643a8e87af505e04686cccf56cd4 SHA512 3968e663f67e41da5148a4aa1d8e047ffd88416fa8df665e359bbe87992e4e723e1c915eed59ae86b53dd18817e41cdcef059483bce7aa8ed7b388dd4add1482
-EBUILD werkzeug-2.2.2.ebuild 1662 BLAKE2B 59159583aef75b5a349dfe04b8c688279109b672ec773f0507b065c8564e2e50ab04ef0b17c6597625fc8c23ae111cd0a93182b7249e75f36c8762d4a1e139fa SHA512 c6aa7b6b5c0c9eeb5fdab5917b7c30d969d4cbd5ffb47351687cb9df9110f269ca694e54d746d8eb2822dc3ec536b80d577f60ed8794036c8c00072216768555
 EBUILD werkzeug-2.2.3.ebuild 1662 BLAKE2B 59159583aef75b5a349dfe04b8c688279109b672ec773f0507b065c8564e2e50ab04ef0b17c6597625fc8c23ae111cd0a93182b7249e75f36c8762d4a1e139fa SHA512 c6aa7b6b5c0c9eeb5fdab5917b7c30d969d4cbd5ffb47351687cb9df9110f269ca694e54d746d8eb2822dc3ec536b80d577f60ed8794036c8c00072216768555
 MISC metadata.xml 368 BLAKE2B 81932229098620395623f9149ac974f19fae9b65ad09943ee5c5d8d03c1e37e76061291c959fe5f004f531a244b3bb335c2a43dd66949c0be43493e45674d0e3 SHA512 67e5b5fea8052c0723820125271ea031ad984e0fe2af21d2423fc559bdc51dfe1d40f2fa5fe11e6d2b8b32216e716900080b859aad146c079ad2b390dd9844cf
diff --git a/dev-python/werkzeug/werkzeug-2.2.2.ebuild b/dev-python/werkzeug/werkzeug-2.2.2.ebuild
deleted file mode 100644
index 7e2db22b86dc..000000000000
--- a/dev-python/werkzeug/werkzeug-2.2.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of various utilities for WSGI applications"
-HOMEPAGE="
-	https://palletsprojects.com/p/werkzeug/
-	https://pypi.org/project/Werkzeug/
-	https://github.com/pallets/werkzeug/
-"
-SRC_URI="
-	https://github.com/pallets/werkzeug/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
-"
-# NOTE: remove the loong mask after greenlet gains support for loong
-# see https://github.com/python-greenlet/greenlet/pull/257
-BDEPEND="
-	test? (
-		dev-python/ephemeral-port-reserve[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-		dev-python/watchdog[${PYTHON_USEDEP}]
-		test-rust? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-		)
-		!hppa? ( !ia64? ( !loong? (
-			$(python_gen_cond_dep '
-				dev-python/greenlet[${PYTHON_USEDEP}]
-			' python3_{8..10})
-		) ) )
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			"tests/test_serving.py::test_server[https]"
-			tests/test_serving.py::test_ssl_dev_cert
-			tests/test_serving.py::test_ssl_object
-		)
-	fi
-
-	# the default portage tempdir is too long for AF_UNIX sockets
-	local -x TMPDIR=/tmp
-	epytest -p no:django -p no:httpbin tests
-}
diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest
index 4159ecca7d17..6b1827795158 100644
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@@ -1,3 +1,5 @@
 DIST wrapt-1.14.1.gh.tar.gz 133767 BLAKE2B 407a9531f581b034be7fe4392dcbf94803aa9c3a82d7c392750dfef62a5cbb84582e292819bf749356fad2b6e98cc89777df0f3b0f4ca70422e75b72ad256711 SHA512 c67e99eb29afeefb2512fb545cd180b8e96f69235d6281edebe62ea5e411188a904a7e683afdda2d6a86cf8b7fd74f79a3c3bec04e19a7c5ef347729bb43f94c
+DIST wrapt-1.15.0.gh.tar.gz 137402 BLAKE2B 8c4764251a89f7795fef71dd71d9c36611d896d2e2791a5e7ce4f665f7b477e683f21aa05251a6ceb96644221a7ff9b01dfe98a7f4d278987dedc17ead39b343 SHA512 6be3fc6380e6bb11a26e35fb093ca54d2e851ab384682f6b1201599980c0429c1e2f23089540b66dd80985baaaf3fb93ce29034758e062e2cfb2f52e3b362779
 EBUILD wrapt-1.14.1.ebuild 793 BLAKE2B c58f6d1970cd527dd32d594e188fdc344ce7329c1948ee816e1798ef45407b72cc0c86c66b1201b4a9783be6e97da4a380f4d6f48ff6c40cad79daeead239b11 SHA512 908d17dc9bbb12bbc50241a03d282cddb2d2e5db893ac929cbbd6ad38851fb30f179746c3f8e48be9977d218088b296593fdd1cc248f4114bd36e311a53eb67b
+EBUILD wrapt-1.15.0.ebuild 872 BLAKE2B bec55b13ce4ff253196032151f431d85b3eeac91262ace1dacd5c8b452e86966950ca3b5e1b2be6aedab6d70420ae7261a191019db3d615f82ee288561d6df89 SHA512 586217a4f41c765731ec6a3359bfe4926021e3218d277a59b63d6b330fa02dc7a48c0bb91f8f7a6395080ff595714cc3a8aa1b4d2afedd232b50a597900633a5
 MISC metadata.xml 370 BLAKE2B 251d8c90cd2a0a1b9fbc714b624c7113e9791f268130211160655f4e4e32aadaddaf98a95bb6d9fff5a5df128da9d551b1281a28e4bd7fa6e3c9db7d35b10829 SHA512 31b369317f4a44d593d9fb72bcb9fcb792809323862866da7c3464ca2282e29a65cd353909c05782b85b162cff363b0ad8ea4750d89c942d442034b9a6eb7dba
diff --git a/dev-python/wrapt/wrapt-1.15.0.ebuild b/dev-python/wrapt/wrapt-1.15.0.ebuild
new file mode 100644
index 000000000000..1b7cfe7b88b0
--- /dev/null
+++ b/dev-python/wrapt/wrapt-1.15.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Module for decorators, wrappers and monkey patching"
+HOMEPAGE="
+	https://github.com/GrahamDumpleton/wrapt/
+	https://pypi.org/project/wrapt/
+"
+SRC_URI="
+	https://github.com/GrahamDumpleton/wrapt/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
+
+python_compile() {
+	local -x WRAPT_INSTALL_EXTENSIONS=true
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index b8ed85f6a1a8..45226d789204 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index f63fa2b23b6f..980b44324e13 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -4,10 +4,12 @@ DIST strace-5.18.tar.xz 2307412 BLAKE2B 658d17d2137344550ea3c2ece54708387c3b7802
 DIST strace-5.19.tar.xz 2353276 BLAKE2B 44b9a87f36e66481d8ac2107efbc389fa64c47b2ae7b1cc728241baa1c7d2d5d4d9410622763eb1247b415cad9afdd9f61552d2545388cadf5a33b568ed09af2 SHA512 1ea1c6e12d05bf145bc3c74f8d06b08dfc3eae3a5a21bfe8ab080053dc4c2da8a95be5956652ea62bb083462015a55f9bc1d1023919dcf2929a05211b7dde963
 DIST strace-6.0.tar.xz 2367144 BLAKE2B ab9cb1f81b01068de5af5125ec2901b57a2f2b24fc01f4f68a284d74eb9fc0f4d583510a353554327845e7c157ea71ca4042ce3c27b3d2b0469d65a13aabfab1 SHA512 2f5aa18949b9f64769eee4e7720e41bf4a61e3b552acad693ff7baed2e662407a7b5e8bfba94ac49bb71639d21cd54084de902fb4337904f48480b25b8e72b54
 DIST strace-6.1.tar.xz 2351272 BLAKE2B f11bdddcc23d9bbe7196a102165ac40d3f39e0dec8b9c727e226d99ae0b6f22865bd0582d4e9c15fdce87dd405e0e9c68b60041bd2b90bc8480557f82ca6dcb8 SHA512 3f0678d74c5c3e6b30c4dc4ed7ee4cb0829d3b7142dc014fcd887db3a68133bf7fedc623bae381dfe4305bd6cd15d4ca6776c6491009c2a053bb8c6ca1ae8e12
+DIST strace-6.2.tar.xz 2364280 BLAKE2B 8e51cb3e426e9b99d598b4fcece21ba7873e81468cddae04c2f0b1a48dc40643c626acadd226389c33dbef5350b502817d3459d445fc17cce149f7e501c15ae2 SHA512 56708faa3f73c0673c98a5b8b8fe35289ecf2870f4f775bcb7a6be59451ef84685564c0129aca15b576d851f8efa1ff760e27658b914d1f31adf4de3b1ad721f
 EBUILD strace-5.17.ebuild 2448 BLAKE2B 99b2514d006878e750d31ea9711581fb5d1980f3091c7ded5d3ac129054f3793bc22ec00657d95ea4f7ac00bf2f6df76f79ba8bbbfc1ce0dd3fb741fe5d9e104 SHA512 496610adfb263912392935a7fea69f79ac98f0339a91719221b615a4ba1e330b6fe9159663f7e9bdc8e3bb58031a62a5c472bf934630cddc851bed65c5e57633
 EBUILD strace-5.18.ebuild 2344 BLAKE2B 2c55a36cfa70076014cbf0ae1c80768193367c71d3e8c123570707f7adbda59dec9fac4699e3c706c1b6a0ba993605434321b032b938c135b0030da5e64fb80d SHA512 dfdac81e07edb2e8ad236a92348fb68feb67a5fa644f7ea0f08aa0345eda737847d67249982595774c44b5934d00d86413630edf9371a604bb461f7bd4ef786f
 EBUILD strace-5.19.ebuild 2447 BLAKE2B 88535b5906a24d4b2ccf26777e4a9fddc382187721598b44a6092e6ca7087601e2895575ba0046bd78c1caeeeface1dc52883b7fb30e266129b40bb5ea19b8df SHA512 c29e74848ff20d686ff02acbec5e08a9ad55d5f1970bc30779fde8e609ba88688fee69d6a63e6607c1da32b53676995f29adea9e81498e3feeaeaa0bb7fe6b16
 EBUILD strace-6.0.ebuild 2442 BLAKE2B 6cb1e240ee130494e165598f3ab853c0f2541365533ec5ee2b2e17bdc4e7b235ab32e2095699a69f461c2818c653975085604304d875134f1b9958ad11b44e49 SHA512 9a94e1bdeb02a857cba180f2ee23bd0b7c8031f5a533ce496396ed7011e85ae7ac6c96dd6919dab4e8ae70a8cf6c37ec5e07ad142e6f60d86899db7c6fe4a0a3
 EBUILD strace-6.1.ebuild 2435 BLAKE2B 0aa0979fcea8061d71c8de8d230e1b9b598033138b6a70e02f065002e95954017e3955e09766290ca89a649e6eb234448bcd856285a70795294c02b1d71eb020 SHA512 f69acf072d37c6475192694bc4d5f60e25bbf997c2166a55850d71b4cc7fc64e6ea6c490bab40e7c845768d7278bfecfe6361543e3d1b071a5efb3c457e0dcc9
+EBUILD strace-6.2.ebuild 2442 BLAKE2B a83bce1936924f68b7d5edc81440b7cb2101016f0902cc0c02c3e235c2a9a74069c4e8616821a0597638bfa1e24ec0e859870af1886a5f5314196918d73bcfee SHA512 9b9d1b2a23c9ef98d706c4862b189b28647348b9987d111102223d237b70b42cdd40a803cdbff00cc8103e8c221418ef0e2bc40f3a214b7c08b78f93cb246f13
 EBUILD strace-9999.ebuild 2442 BLAKE2B 6cb1e240ee130494e165598f3ab853c0f2541365533ec5ee2b2e17bdc4e7b235ab32e2095699a69f461c2818c653975085604304d875134f1b9958ad11b44e49 SHA512 9a94e1bdeb02a857cba180f2ee23bd0b7c8031f5a533ce496396ed7011e85ae7ac6c96dd6919dab4e8ae70a8cf6c37ec5e07ad142e6f60d86899db7c6fe4a0a3
 MISC metadata.xml 779 BLAKE2B 89b4360e876fbb34a7a766a57ba9ca088a5e03e9ef66fdbe0a2b15df4cfb625daba11dc76920dec405b97cb87df49fd3c9edc0e184e73262b14b616af36fa4dd SHA512 88b2d94fd6efebaa617c8344bff3997f31c6262b9376cbce014bf7f6225f02bd8ee7bcaf98df4477435319bbb92addcdb6756e5d37a137a863f0bef1ecc5fced
diff --git a/dev-util/strace/strace-6.2.ebuild b/dev-util/strace/strace-6.2.ebuild
new file mode 100644
index 000000000000..24526a0eb263
--- /dev/null
+++ b/dev-util/strace/strace-6.2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools edo flag-o-matic toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/strace/strace.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="https://strace.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="aio perl selinux static unwind elfutils"
+REQUIRED_USE="?? ( unwind elfutils )"
+
+BDEPEND="virtual/pkgconfig"
+LIB_DEPEND="
+	unwind? ( sys-libs/libunwind[static-libs(+)] )
+	elfutils? ( dev-libs/elfutils[static-libs(+)] )
+	selinux? ( sys-libs/libselinux[static-libs(+)] )
+"
+# strace only uses the header from libaio to decode structs
+DEPEND="
+	static? ( ${LIB_DEPEND} )
+	aio? ( >=dev-libs/libaio-0.3.106 )
+	sys-kernel/linux-headers
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	perl? ( dev-lang/perl )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.11-static.patch"
+)
+
+src_prepare() {
+	default
+
+	if [[ ! -e configure ]] ; then
+		# git generation
+		sed /autoreconf/d -i bootstrap || die
+		edo ./bootstrap
+		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
+	fi
+
+	eautoreconf
+
+	# Stub out the -k test since it's known to be flaky. bug #545812
+	sed -i '1iexit 77' tests*/strace-k.test || die
+}
+
+src_configure() {
+	# Set up the default build settings, and then use the names strace expects.
+	tc-export_build_env BUILD_{CC,CPP}
+	local v bv
+	for v in CC CPP {C,CPP,LD}FLAGS ; do
+		bv="BUILD_${v}"
+		export "${v}_FOR_BUILD=${!bv}"
+	done
+
+	filter-lfs-flags # configure handles this sanely
+
+	export ac_cv_header_libaio_h=$(usex aio)
+	use elibc_musl && export ac_cv_header_stdc=no
+
+	local myeconfargs=(
+		--disable-gcc-Werror
+
+		# Don't require mpers support on non-multilib systems. #649560
+		--enable-mpers=check
+
+		$(use_enable static)
+		$(use_with unwind libunwind)
+		$(use_with elfutils libdw)
+		$(use_with selinux libselinux)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} ; then
+		# bug #643044
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..."
+		return 0
+	fi
+
+	default
+}
+
+src_install() {
+	default
+
+	if use perl ; then
+		exeinto /usr/bin
+		doexe src/strace-graph
+	fi
+
+	dodoc CREDITS
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index c1e1b6fd9023..6276408644cf 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass
index abac18ca03f8..a1589b025617 100644
--- a/eclass/java-pkg-simple.eclass
+++ b/eclass/java-pkg-simple.eclass
@@ -1,4 +1,4 @@
-# Copyright 2004-2022 Gentoo Authors
+# Copyright 2004-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: java-pkg-simple.eclass
@@ -417,6 +417,7 @@ java-pkg-simple_src_compile() {
 	# package
 	local jar_args
 	if [[ -e ${classes}/META-INF/MANIFEST.MF ]]; then
+		sed '/Created-By: /Id' -i ${classes}/META-INF/MANIFEST.MF
 		jar_args="cfm ${JAVA_JAR_FILENAME} ${classes}/META-INF/MANIFEST.MF"
 	else
 		jar_args="cf ${JAVA_JAR_FILENAME}"
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 51623597a097..0df0ef18e56e 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/adonthell/Manifest b/games-rpg/adonthell/Manifest
deleted file mode 100644
index 97ec74dd321c..000000000000
--- a/games-rpg/adonthell/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX adonthell-0.3.8-ar.patch 236 BLAKE2B 5ff259fd847ead6b1f70de02f94c8bb43ed984cab240a73f6933b0b86e65fa9e35dff4abed748cb535e772a0f79d5aa306088f650ee39ec41d2dab751ca5fc58 SHA512 af019fb6a32dc630dd00f9101967a7344b9e7172fcc46400b156247c54d59512533012ca6e715ea47f561e3a5b5b3467ee1c3381541d8bca9345792604564aa0
-AUX adonthell-0.3.8-python3.10.patch 195 BLAKE2B 681668dd75a7ff5586694eb240ebbf47523fc3f0e5787f9e03780c65c2bdf4fd2430a0ded1b2e8a2d75d22ecbbd3ff1a942bfbb76b0a8ec00265c0df0884388c SHA512 4bdd62e70801ee90525d36faff4a28a7a2620cc19396e2edef5ad9c7daa71ca73f88a8b1d9c29fe8c1d4201e26ffc88eefc50a2f7c540014f120fde257060c78
-DIST adonthell-src-0.3.8.tar.gz 889244 BLAKE2B 43b685feaa9ae616fea0eaa7687c72455ef916c9eeaf0dd07724fbaae5e33fb36130252c3c493cff34889cbc6146d76cc9ba2a1ec4e4f20b3b16c188c837d51a SHA512 7a047ec4d01d677c616dcc1f8efff2fecc95c1636172fd6709736de79f485711f169057af5797db85243592b5622f25f69e3393469321d7989c054bb41e17cf3
-EBUILD adonthell-0.3.8.ebuild 1186 BLAKE2B 3a0aa0af2bfc4668057b04c2cafd6f5f7b035d7e3e1af70e475586588b0f4ca752d16e0f1ace8d84aaf53e943f0e148e7b8ee0ad9aab6da60ec1bbf6eb17b782 SHA512 5b13e553a62c12b54737533c68cc9d96dc38a88b13e50cae3ce621e425c3a63bb8122d3824597c851ac3a827c5d8e781f86ee66dd2512bec3a17c9edeacf7bcc
-MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-rpg/adonthell/adonthell-0.3.8.ebuild b/games-rpg/adonthell/adonthell-0.3.8.ebuild
deleted file mode 100644
index 908c5468e7d9..000000000000
--- a/games-rpg/adonthell/adonthell-0.3.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit autotools python-single-r1
-
-DESCRIPTION="Roleplaying game engine"
-HOMEPAGE="http://adonthell.nongnu.org/"
-SRC_URI="https://savannah.nongnu.org/download/${PN}/${PN}-src-${PV}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	media-libs/freetype
-	media-libs/libogg
-	media-libs/libsdl2[X,video,sound]
-	media-libs/libvorbis
-	media-libs/sdl2-mixer[vorbis]
-	media-libs/sdl2-ttf
-	sys-libs/zlib
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-lang/swig"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS NEWBIE NEWS README )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ar.patch
-	"${FILESDIR}"/${P}-python3.10.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	econf \
-		--program-transform-name="s:${PN}-$(ver_cut 1-2):${PN}:" \
-		--disable-py-debug \
-		--with-python=${EPYTHON} \
-		$(use_enable nls) \
-		$(use_enable doc)
-}
diff --git a/games-rpg/adonthell/files/adonthell-0.3.8-ar.patch b/games-rpg/adonthell/files/adonthell-0.3.8-ar.patch
deleted file mode 100644
index 2b2e34d62c7d..000000000000
--- a/games-rpg/adonthell/files/adonthell-0.3.8-ar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -r b3fec744fc29 configure.ac
---- a/configure.ac	Sat Oct 17 22:39:45 2020 +0000
-+++ b/configure.ac	Sat Oct 17 22:40:17 2020 +0000
-@@ -26,6 +26,7 @@
- AC_PROG_CXXCPP
- AC_PROG_MAKE_SET
- AC_PROG_RANLIB
-+AM_PROG_AR
- 
- dnl ****
- dnl i18n
diff --git a/games-rpg/adonthell/files/adonthell-0.3.8-python3.10.patch b/games-rpg/adonthell/files/adonthell-0.3.8-python3.10.patch
deleted file mode 100644
index 21bba839a271..000000000000
--- a/games-rpg/adonthell/files/adonthell-0.3.8-python3.10.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-node.h was removed in python3.10 but this does not actually use it
---- a/src/python_class.h
-+++ b/src/python_class.h
-@@ -38,3 +38,2 @@
- #include "eval.h"
--#include "node.h"
- #include "fileops.h"
diff --git a/games-rpg/wastesedge/Manifest b/games-rpg/wastesedge/Manifest
deleted file mode 100644
index 5ef67b08c61a..000000000000
--- a/games-rpg/wastesedge/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX wastesedge-0.3.8_version-handling.patch 1136 BLAKE2B f3278c8d1fb37b662d5b8d4fd0235968642c003af868029bb3b62c7c399505301860f9b2ad17642f547de9fecb73a81cbd6df7ea804c0647d2622c2ca2c5569b SHA512 5df47cfb2a91a848a244fa0cea7c6ca58afde75737d974bdfd452cf02541d766385885be5d7b3889667a481894758361bc66cd778794224b09035e83ac3e011a
-DIST wastesedge-src-0.3.8.tar.gz 20779629 BLAKE2B 40a63298ea9b704407fcac244f22a3e26190fec37cb0dae0e18e55478d866a215a6be6e1bd08ef2d303894aca2edd09e7b299ae9c2da21d999f47c6d799fde83 SHA512 410e01d803b6ff72c4c0d8f035c5e3228c2311bc200359ecb748be63474ae0afb8609cc9daed940670d02190fa3c047ea2a2cd116b7680398cdcc7523a64c386
-EBUILD wastesedge-0.3.8.ebuild 854 BLAKE2B 4e073b1cb8267970f10f50d77d275ed3226ae7bd029f35ddcedd31fc6b4f092a2219a280a1ecc7b6f9343939faacaa558f15e90004cd1ce4b00c7b86a53bb153 SHA512 bbc29dc1b08d28bc110d9bfaddb7dcc7f3035a8a1dadf4fab22b8fe51197731f0195f8b2ba06efde608cc47dc82df4079a8cdca7d4a51a057d2ade690ec84510
-MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-rpg/wastesedge/files/wastesedge-0.3.8_version-handling.patch b/games-rpg/wastesedge/files/wastesedge-0.3.8_version-handling.patch
deleted file mode 100644
index 33f3eedad1e5..000000000000
--- a/games-rpg/wastesedge/files/wastesedge-0.3.8_version-handling.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b3987b74cc6ff89187b95c692a4aacc13db98564 Mon Sep 17 00:00:00 2001
-From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
-Date: Wed, 9 Sep 2020 20:01:41 +0300
-Subject: [PATCH] Rework adonthell version handling
-
----
- configure.ac | 11 +++--------
- 1 file changed, 3 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 76d87bd..fff8268 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -46,15 +46,10 @@ fi
- 
- dnl Checking for the proper version
- AC_MSG_CHECKING(for Adonthell's version)
--$adonthell_binary -v &> adonthell.ver
- 
--changequote(<<, >>)
--adonthell_major_ver=`sed 's/\([0-9]*\)\.[0-9]*\.[0-9]*/\1/p; d' adonthell.ver`
--adonthell_minor_ver=`sed 's/[0-9]*\.\([0-9]*\)\.[0-9]*/\1/p; d' adonthell.ver`
--adonthell_micro_ver=`sed 's/[0-9]*\.[0-9]*\.\([0-9]*\)/\1/p; d' adonthell.ver` 
--changequote([, ])
--
--rm -f adonthell.ver
-+adonthell_major_ver=$($adonthell_binary -v | cut -d'.' -f1)
-+adonthell_minor_ver=$($adonthell_binary -v | cut -d'.' -f2)
-+adonthell_micro_ver=$($adonthell_binary -v | cut -d'.' -f3)
- 
- adonthellver="$adonthell_major_ver.$adonthell_minor_ver.$adonthell_micro_ver"
- 
--- 
-2.26.2
-
diff --git a/games-rpg/wastesedge/wastesedge-0.3.8.ebuild b/games-rpg/wastesedge/wastesedge-0.3.8.ebuild
deleted file mode 100644
index fea05fee7eb2..000000000000
--- a/games-rpg/wastesedge/wastesedge-0.3.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit autotools python-single-r1 xdg
-
-DESCRIPTION="Role playing game to showcase the adonthell engine"
-HOMEPAGE="http://adonthell.nongnu.org/download/"
-SRC_URI="https://savannah.nongnu.org/download/adonthell/${PN}-src-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=games-rpg/adonthell-0.3.8[${PYTHON_SINGLE_USEDEP}]
-	nls? ( virtual/libintl )"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}/${P}_version-handling.patch" )
-DOCS=( AUTHORS ChangeLog NEWS PLAYING README )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--with-adonthell-binary=adonthell
-}
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 5492936b9792..48de46073b14 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 997c1537f49b..05dd46e03178 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -10,5 +10,5 @@ EBUILD claws-mail-3.19.0-r1.ebuild 5624 BLAKE2B 6954f91b60edbeea184b9b913a21a374
 EBUILD claws-mail-3.19.0-r2.ebuild 5671 BLAKE2B 5f508a5842abb4a8888bdbe7c0231a53135fcb569f03bb4d19fae7007fe4f2e255c148bb5b6f2cb164da649d0da41e514c25a48f31fbdd35982422900c600442 SHA512 f329414919bca9b94205aee917c55b9879184aec70b1aff67501e12b0fcf6895974ab4060a1b9f098037e3f79fe075c550a77cc85c43656e26465fedc8d90a30
 EBUILD claws-mail-4.1.0-r1.ebuild 5797 BLAKE2B 71ee869074c952f08dae67c031fd303befca46cfdfd9ed3ddb5ab41d5c195d91c7a0c6e3acea034c676831813f20df2cdafe69c7b3970725828fcc19460c344c SHA512 978ee5c6121bbb009cbbb28bda8fabffb662ef1f428ca239f243a944cbf17484d2e7526b611f3f4de3f2dfe5382d42c0a16b53096df964f36d1a5b190825835f
 EBUILD claws-mail-4.1.1-r1.ebuild 5702 BLAKE2B 5391aa30f88eb39f1829f094a9f77eca5fbab25bc35c4d3fbb74f10575ca6db96f71b68aff071453feee4fc07564a9e80a53eff600a9a197297105b894f690c1 SHA512 0160665cb487bf297b6468abef0d02be817c4073b4c91fd977df810ca89f3bff2b953eb5d54b73fbe9f1c2916bb6b424df614a5511e012178563703ce9f77c97
-EBUILD claws-mail-9999.ebuild 5745 BLAKE2B d1ed79ccfa73a87fda195dabeddb4e8853bf4cb7cbdb369496f4400bce739c2e77bf7e860ae5f38d3cffec359f2fec6ef1e6d3e0fc7a66c37b4c0e70c03ada88 SHA512 3150eb268c02478ac5dd12101699c2b38330485d8c9625929fb0a164050cd68497b13b1c9169cd87789c8b1d74053dbb46f3b79a748c86380ae7f7250f18a0bd
+EBUILD claws-mail-9999.ebuild 5673 BLAKE2B 5fd4919bae694c738231ce857b3d833f7cb05d8fd7486b89eff842651c8089a2fec071f7560a68293dc8af409f931218af8564aef3db6b0f1afd9f055890dcb8 SHA512 95b46c13d7264246e37a1496c293e3046c594b7b04d36665bb43891d87d33d4c92e51cdde9983be4adf3027cc79f158855d435d5e33630f57b75287edd1d644f
 MISC metadata.xml 1445 BLAKE2B 2c20d83b5af1f03c791c733c9cdaa970ea070fe9ee63cfe4d8f4b2c5284bb791579fa0629f1b70c336440b8a8dae7c70d460b906fc34e7e314b074b67ae00523 SHA512 a956df8043597fb5be434fec8747c49088fdd82ea8c7d2a32d8b9a3d88d058cf4bf8cb3a8cc77463ebb8484729f155c258f58dd581b96eb0703de1464ead73b9
diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild
index efb9d020ba31..b80a3e3d3d7a 100644
--- a/mail-client/claws-mail/claws-mail-9999.ebuild
+++ b/mail-client/claws-mail/claws-mail-9999.ebuild
@@ -117,9 +117,6 @@ src_prepare() {
 }
 
 src_configure() {
-	# Don't use libsoup-gnome (bug #565924)
-	export HAVE_LIBSOUP_GNOME=no
-
 	local myeconfargs=(
 		--disable-bsfilter-plugin
 		--disable-generic-umpc
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 46eec622a5d5..9de249822c12 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index f4beffcd7b27..2334b563750f 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -1,4 +1,7 @@
 DIST libass-0.16.0.tar.xz 396304 BLAKE2B d5d1a2492faaff671182b1ebdbdbab230529897575a485113a1025e73b3bdee1d5136f1dde9f5ded2bed3ad27fab78601d8f586499b5c7c3160f5d94a6357bea SHA512 ada605f5887da06aa1d072a52f8baaba64b62008ccb377560d71d5a030c1f5434d6c60fe39a156e063f553b8a07b4dfe954e4d035036888a629c6e663ce60ba9
 DIST libass-0.16.0.tar.xz.asc 228 BLAKE2B 78596aa961939f16ab0de76a040038bb299591be329808ad662bb3bf91fe59b2b78557ec6837a99bd232d986fd06953fc40b03a110122627af33a8877dc51d6a SHA512 2696214e9d3f3d5ace7946dc37b8103fe5cfb6d0b86b19620e7bd2aaff5a701b244edae892c7a673d8ba6e93ff324dfde9c7ba75ef19a9710dcdef42fffafa6b
+DIST libass-0.17.1.tar.xz 403160 BLAKE2B b191e8910ddb3e41fb9df79b27517a127c0da2ad74c0a81920bc2cf8843ab18b02a60738024fa8d3594b91bd26ec6ea7f87e17ca5e07825a6017dd29d2b72b32 SHA512 437b4b60db2626e48f438b5138ab4dbf2c2ab4c8f0b587a6e554510c6719544ef2235c601ff1e482d020410f9bab95ad1a9b176d19a3bd54880499a576b41f23
+DIST libass-0.17.1.tar.xz.asc 228 BLAKE2B 0e70c104438be4409239f435d7872737fde1aba4485816ad0e35f0de743ee303662e66334425d0d511af4974e03443ba6d33ac44f941de9b0da17a56f204edea SHA512 a28c8271b4c5b5756620be9baf81b0262eb71c4f20d1aadb24238d1d0ccba44fdb3b25d788a3f7c9039945431a3d31842a7855660cc28a0a8acc36ff8f0c0298
 EBUILD libass-0.16.0.ebuild 1406 BLAKE2B 92357824f79e7968911f544d0ddcd14242c2f799843a690c7c8fa87dbebf14efec14ee29723e026083d0d617dc6bb471820626a48385be0f6d4d3705410b00ef SHA512 c56a7894b77ebcd6870d77a655e4fdf1f629be779d6d99a15b349ba855174c4cf84df7588bba549aa47171ca75b2ceff6c4f6670282965148827c1e083e85fa8
+EBUILD libass-0.17.1.ebuild 1523 BLAKE2B e66093ea47f717160f9cdce139cb239dd502877dd97346a3915de953366dae293cf1677fdb493beb86f297a81da42a00dbe4315dea68b1711638588f9f81da28 SHA512 7507ecc8c5c505565bf41a9e76817a56a025ee73049e312b2b96a36cf33c67f0c52ca9a2e0df6dd5eade9d3ce54c8a8a6a7808f54f95eefe76031bd2b8f0d36f
 MISC metadata.xml 310 BLAKE2B 32f2b0eb7f05223e3d092b3d75b7b1095afdac6dc322bd21fc8d32b6089cfccdc46300801e9d7566269fc0fb54780b6c1efff6e41be8de0aa31b26bdc52a44fd SHA512 97c76a4e387bbf43b14bf7799fe889c27e74e8e0b18c2027fc0c365e25ec5186ead530afe6d8e4d6b95440f0cb781d7ebc46e1eae1cc7b2161a199d38bd2a186
diff --git a/media-libs/libass/libass-0.17.1.ebuild b/media-libs/libass/libass-0.17.1.ebuild
new file mode 100644
index 000000000000..05e4b30b8395
--- /dev/null
+++ b/media-libs/libass/libass-0.17.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libass.asc
+inherit multilib-minimal verify-sig
+
+DESCRIPTION="Library for SSA/ASS subtitles rendering"
+HOMEPAGE="https://github.com/libass/libass"
+SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz.asc )"
+
+LICENSE="ISC"
+SLOT="0/9" # subslot = libass soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="+fontconfig test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/fribidi-0.19.5-r1[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-1.2.3:=[truetype,${MULTILIB_USEDEP}]
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	amd64? ( dev-lang/nasm )
+	x86? ( dev-lang/nasm )
+	test? ( media-libs/libpng[${MULTILIB_USEDEP}] )
+	verify-sig? ( sec-keys/openpgp-keys-libass )
+"
+
+DOCS=( Changelog )
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable fontconfig) \
+		$(use_enable test) \
+		--disable-require-system-font-provider
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index b6ba029477da..633486c60eaa 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/zam-plugins/Manifest b/media-plugins/zam-plugins/Manifest
index f669db4f6d6c..6f5ecc1dc46a 100644
--- a/media-plugins/zam-plugins/Manifest
+++ b/media-plugins/zam-plugins/Manifest
@@ -1,8 +1,5 @@
 DIST DPF-88180608a206b529fcb660d406ddf6f934002806.tar.gz 3473209 BLAKE2B 74d237a222d2f59e437f98da456a4fb8eb29ef4337054752ac28067cf054de971e600fc141eb2d9ede1d123cbcc94665c4abe005281f427b76c27c0846e91a41 SHA512 7ea26d27bfb17fe67d2c4c4077d203b447407986594b833ee545319221c9c08fb434c1ca11ad425a8d9369df41b331c1286ddd85aabdd7a8570ab7a25b88b0e7
-DIST DPF-9243625aacb9fb8dd9fe4bd479b227149eb37959.tar.gz 2114589 BLAKE2B c8f2cd92b47aa55a467ce14ef2adc8f776c6ce966df680b10c3efbd35ec45fd05ad3a7dee68788701a36a032d563ce2767236397daa0757095b653ecfefcb0fa SHA512 0eab116c5b57d44dc340400340d8fc8456045bdc7e8dbeaccb80f87c7c2e1784f2b24edb8e01e3b6e23807dec86f18caf7227db2c2fd491135b283e795701fb1
 DIST pugl-844528e197c51603f6cef3238b4a48d23bf60eb7.tar.gz 214521 BLAKE2B 2f96fd3f97f3e1c56c06e6c1c08f7d585267b1006428925eeafe5250a9f6da489d4870bd4136ab6d3951f2984d631b5495816610774cad74e07ac8ba2622c2f9 SHA512 ad2eb02099d8539dfcffdda093cf4a8dcb1c959d8c4f860bba2a9777f0bfe3d4f2471ae56d5f7be779a8402c5b446e44c2c7aa66ff07bb87787cf0bd8add6772
-DIST zam-plugins-3.14.tar.gz 23924833 BLAKE2B cdaa13d728cd7a9f7fa2ed53b04b76988bc88d0aa719c57913fd73be778186821d316add5eeea692dabfe1ca222c2f9aaf564abc1128f69da33b8aa592255eec SHA512 30c168ee855011b2f17fcc5e440039628399ab40b69bed9af284713df6155360b38d8249b3de1616e9a2f39885cff43c9e2505868aae891fd22bc92297c1962c
 DIST zam-plugins-4.1.tar.gz 23926863 BLAKE2B 6f503221801a5a40bc7f4e76f6ff5eceb15bac5a5bce3b8c48233143971b9af13d6420b6ba4c1ed679136f952166fc323de7a77a7c6d30761a91e6e1d2d2b04d SHA512 53ffd7f4cebbb65fcdaae53b7d0ad922dd2b1e76479da7caa2c4100d04b5258e0aec4bbfb3b8632b4198375e6677659139abb907bfe9fc11ded772c4e14d5e14
-EBUILD zam-plugins-3.14-r1.ebuild 1800 BLAKE2B 8721c0a3e6e513fb70cba8b8d0085b644827862f38d554e73e09425187a13001b12d53e2c3426903c5a23662ee29a54a623ce8ab023c06b39580f5a0614ceff5 SHA512 8e9ee98a3a48c376d3a878099ab4f49b33ede014f6edce62c7cb5441d1f2661b96c280b7c7ac4512a375bd39dd8efb5587257b5afc4a14ec83bd432476191b50
 EBUILD zam-plugins-4.1.ebuild 1828 BLAKE2B a9925d38c3b3a60ae268aaaefa0f801d67d9da772fce5182ab4aeb8c5cb27f64acc608ecfaaf535ffed67dd429e6ca69f1851e84317b07ec3ec075e2f5d95cc3 SHA512 5ce6ea3b2559b8b56c0c88c9f785228e223792bf7a4f62c8fd3c13370f380d17b72881ab56f2861d374550d61d5728ed08638ce80558f22f4acbd6c63dbb4b80
 MISC metadata.xml 451 BLAKE2B 36e3813924e91d179d11969255444afd108216e96009f8e3037c3e26897c008189cc19b3840d8a6de2c907689636e0ba559a8f28277bc4a62f8315c39d973b7e SHA512 221ede2fadeaf0a08e199cc6cf3c3ac9a6bc885765f560ac4015db3bd622b204bafca10b6f4a434de2ca6792defc7148ad882bc85e59d4ad2ac5ebdab62f70a1
diff --git a/media-plugins/zam-plugins/zam-plugins-3.14-r1.ebuild b/media-plugins/zam-plugins/zam-plugins-3.14-r1.ebuild
deleted file mode 100644
index 39faf73105b8..000000000000
--- a/media-plugins/zam-plugins/zam-plugins-3.14-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DPF_COMMIT="9243625aacb9fb8dd9fe4bd479b227149eb37959"
-DPF_P="DPF-${DPF_COMMIT}"
-
-DESCRIPTION="Collection of LV2/LADSPA/VST/JACK audio plugins for high quality processing"
-HOMEPAGE="https://www.zamaudio.com/ https://github.com/zamaudio/zam-plugins"
-SRC_URI="https://github.com/zamaudio/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/DISTRHO/DPF/archive/${DPF_COMMIT}.tar.gz -> ${DPF_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="jack opengl"
-
-DEPEND="media-libs/ladspa-sdk
-	media-libs/liblo
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	media-libs/lv2
-	media-libs/zita-convolver
-	sci-libs/fftw:3.0
-	x11-libs/libX11
-	jack? ( virtual/jack )
-	opengl? (
-		media-libs/libglvnd[X]
-		x11-libs/cairo[X]
-	)"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	rm -rf dpf
-	ln -s ../${DPF_P} dpf || die "Failed to create DPF symlink"
-
-	# To make absolutely sure we do not even accidentally use bundled libs
-	rm -rf lib
-}
-
-src_compile() {
-	emake PREFIX=/usr LIBDIR=$(get_libdir) VERBOSE=true \
-		BASE_OPTS="" SKIP_STRIPPING=true \
-		HAVE_ZITA_CONVOLVER=true \
-		HAVE_CAIRO=$(usex opengl true false) \
-		HAVE_DGL=$(usex opengl true false) \
-		HAVE_OPENGL=$(usex opengl true false) \
-		UI_TYPE=$(usex opengl "opengl" "none") \
-		HAVE_JACK=$(usex jack true false)
-}
-
-src_install() {
-	emake PREFIX=/usr LIBDIR=$(get_libdir) VERBOSE=true \
-		BASE_OPTS="" SKIP_STRIPPING=true \
-		HAVE_ZITA_CONVOLVER=true \
-		HAVE_CAIRO=$(usex opengl true false) \
-		HAVE_DGL=$(usex opengl true false) \
-		HAVE_OPENGL=$(usex opengl true false) \
-		UI_TYPE=$(usex opengl "opengl" "none") \
-		HAVE_JACK=$(usex jack true false) \
-		DESTDIR="${ED}" install
-}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 5eda823a6864..545d3ee66240 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index b02acac5c36a..3c9506abe1b7 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -6,6 +6,6 @@ DIST Ardour-7.3.0.tar.bz2 12897398 BLAKE2B 518de10fd43220e843c775c9374347cf82756
 EBUILD ardour-6.9-r2.ebuild 4827 BLAKE2B 9cff3b9c3c7a9b7d3623ea87f446344400d6d3f767bd89c8f3a75ec3c1782d3a02088ee4049a8f7997ec01a295dcfaa5a53f92be9647a6dda8947d5954bd4b19 SHA512 007568f6878fb7ab1c8e07071145536cb207d5aaa7a70762ab23be9bf8b6d0b34b6f34b10cfee181adf90af4026f404bf6447d1a4a7145bb243ca03b1486209f
 EBUILD ardour-7.1.ebuild 4992 BLAKE2B a2284ab21c83f89ede3c785d451db5f290e38e67031aa565d3182e4d28fff0b6285ad7f116663487a7ac8e667b96230b02081feba0714b50dfc2a59f2b7b1080 SHA512 da55dd455ec3ec985ecd845ad236968bd91c3a0e0e9f83e29288aa16e51a001e6f97036574ba77566cd63d6b8ca414d7ce157cfff49d377fdf175e0962ae66e0
 EBUILD ardour-7.2.ebuild 4992 BLAKE2B a2284ab21c83f89ede3c785d451db5f290e38e67031aa565d3182e4d28fff0b6285ad7f116663487a7ac8e667b96230b02081feba0714b50dfc2a59f2b7b1080 SHA512 da55dd455ec3ec985ecd845ad236968bd91c3a0e0e9f83e29288aa16e51a001e6f97036574ba77566cd63d6b8ca414d7ce157cfff49d377fdf175e0962ae66e0
-EBUILD ardour-7.3.ebuild 4984 BLAKE2B 404ce69d34defd688368027838f97df5ac69cb5608a275ee6d05b7254b3109c7c5c8b33ffcdfc8d59670c6b05f666dd5dc987bec61ed94ad5f62685eded5dd3a SHA512 4ae07b7ade9c09da92aa8c04a3aa48b8d12233dda699fdadb3a1487cd71c18ef78401c2e351bbdef0451017dfdcacb4256691fb6491a75ab6c68bfeda2219765
-EBUILD ardour-9999.ebuild 4984 BLAKE2B 404ce69d34defd688368027838f97df5ac69cb5608a275ee6d05b7254b3109c7c5c8b33ffcdfc8d59670c6b05f666dd5dc987bec61ed94ad5f62685eded5dd3a SHA512 4ae07b7ade9c09da92aa8c04a3aa48b8d12233dda699fdadb3a1487cd71c18ef78401c2e351bbdef0451017dfdcacb4256691fb6491a75ab6c68bfeda2219765
+EBUILD ardour-7.3.ebuild 4990 BLAKE2B f40af21e8b357b9f51fb6f43dd05aa3843a4df83359c12bdc5684e3673953ea7533f98835064e1f399bc0c8bea7a965625d7e0bc52a85383dc50d2b155520fca SHA512 5b4dcd3a9be68ab0b78bc0d1b39860bf935ef13f8a30a20f37690810e3bc7a44dd418c36b8801ee5b51799d552288b67541e8e3e84a3000b6caf2791932a8995
+EBUILD ardour-9999.ebuild 4990 BLAKE2B f40af21e8b357b9f51fb6f43dd05aa3843a4df83359c12bdc5684e3673953ea7533f98835064e1f399bc0c8bea7a965625d7e0bc52a85383dc50d2b155520fca SHA512 5b4dcd3a9be68ab0b78bc0d1b39860bf935ef13f8a30a20f37690810e3bc7a44dd418c36b8801ee5b51799d552288b67541e8e3e84a3000b6caf2791932a8995
 MISC metadata.xml 451 BLAKE2B 0ed571ca79f0d4b92239239982f04abf725365df169290e4a02f6d8f580cf801f70d8bc93414b4549c8172ff43864d5c49fa987caeec58e1b2331ffe01a69ae6 SHA512 504bd817356c7ee57c64193584b3fc5b3bc70f5224d5a531ac5ecf8fb974728639e75b77bb9e7c5ad77cf6099123361b9ec6211b855edb4761acd95b8cb7abcb
diff --git a/media-sound/ardour/ardour-7.3.ebuild b/media-sound/ardour/ardour-7.3.ebuild
index 4c32a9d5eadb..534c435d20b3 100644
--- a/media-sound/ardour/ardour-7.3.ebuild
+++ b/media-sound/ardour/ardour-7.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE='threads(+)'
-PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
+PLOCALES="ca cs de el en_GB es eu fr it ja ko nn pl pt pt_PT ru sv zh"
 inherit toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg
 
 DESCRIPTION="Digital Audio Workstation"
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 4c32a9d5eadb..534c435d20b3 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE='threads(+)'
-PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
+PLOCALES="ca cs de el en_GB es eu fr it ja ko nn pl pt pt_PT ru sv zh"
 inherit toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg
 
 DESCRIPTION="Digital Audio Workstation"
diff --git a/media-sound/lingot/Manifest b/media-sound/lingot/Manifest
index 701d22dbeeab..73cd96876ea0 100644
--- a/media-sound/lingot/Manifest
+++ b/media-sound/lingot/Manifest
@@ -1,7 +1,4 @@
-AUX lingot-1.0.1-configure.patch 6864 BLAKE2B 8673086b4bc2d5f9eab73886685746dfe8488aba86fe8472aebc04ff2883ce641896914cae523f440605d072a2e43313291734be8988056deca0d0459908a159 SHA512 cf8df1ad198c4011153b6c337f35882f1c1ab3b4cff26a3cf6f348b23cce05bbe4cd739489f7bf9080d2557f9a30455ffb2aa70927fa46dc34ca584cb6e10e52
 AUX lingot-1.1.1-desktop-icon.patch 346 BLAKE2B 90b6ad3fe7e0208a40f372d81d598ae546043c94e291448d290ee061d81665601ab8ee32c2bad53e3c7c119899f226c81f6271684582a5ca47e268d761aafbde SHA512 72530b0193533f464a14e016be66cf68b14d8a5eecd04ee4b3ab0f81976264ad5134cb794e026f4484c87ecb14630388fa0b19fd09807a98731688c44b4415ed
-DIST lingot-1.0.1.tar.gz 510112 BLAKE2B a04ef52cc70dba8af54746419190eedc2f2512120e3c1e8576dab0d6dd20c3470a6f857fd751ed4bcf8e291a993ff1f8fa7b0264a24957dcfab0efd9684ef3ba SHA512 98182721ef68411485b3f2faccbf315f340e549dd7cce0fdfaacab7c34fb708c98eda9b96da00701f1987becefced3a7587ffaaad77d6ef86046fb8c9f5f1cb5
 DIST lingot-1.1.1.tar.gz 727028 BLAKE2B c681fcd72f67ae20e49f0229aa9791eace1f65cb596c60e52cff7805bc70d6d418cd87c96629306163756db81236ad31b6c8fe78b7ee401d155f8f81dda4f334 SHA512 71ee6b992a8f9cfe4a90d7cd8ba0098512857d65d773d3d5ec26aeeaa104ee812051b9d6b86c5e6462d1032bf03d7e6120aecd60ca8758fdf96c37f2d7ceacc7
-EBUILD lingot-1.0.1.ebuild 1059 BLAKE2B 5973aecd0c12e3c53a9e0262befc01c1a804a09ce4267e2b8e2260fb5c271ae8a8ec629667ae975bee93b7493e35b88b45761beda033c31f171d94dcae97e6fe SHA512 1c86b5c81724daa34a9a977d33daa6f6230f941452fcd9419aa0714eada328bf6624fe238dc0c3e9ab1c913ed27966aa1a6b0559049379262b8ff9fd737958fa
 EBUILD lingot-1.1.1.ebuild 1148 BLAKE2B 2eb98698b5a5b0693104ed7cbd83e5e50227fdecffd4b0fb3195b26ff4007136988b67ac5e0cfe9e938f833daadd3fdf873030262e8bc50c7aabf037e1dba33d SHA512 b392a4a79406dccee9361ab720b89a3c836cde4564496d6d994ec8ba98b5175b1aacdded96e311fd17b820405a694f8c041ad75bba521fa4169ccfe7e1981bd4
 MISC metadata.xml 598 BLAKE2B 46177c3e07ae1b29aa59a83b60efb8809efb965b0b9d14a31c1506a5b3782681048fdb0807a34b4b23944150b26e8c40c7c4e59b59a7e16da37791289a8f2601 SHA512 3765fdd317921009b3f94909348e77fcb3a5efbf7d81c922e27ce951052db17f7f7e5e8d97d7b1798bbb09ea001b6b59079e00dab6c861f93a4baa0d01517f60
diff --git a/media-sound/lingot/files/lingot-1.0.1-configure.patch b/media-sound/lingot/files/lingot-1.0.1-configure.patch
deleted file mode 100644
index f39dc3d9ad55..000000000000
--- a/media-sound/lingot/files/lingot-1.0.1-configure.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-From 916ed65b3901731fff02eceadcbc5b18f4c27d6f Mon Sep 17 00:00:00 2001
-From: Nicolas Boulenguez <nicolas.boulenguez@free.fr>
-Date: Sat, 14 Jul 2018 09:40:37 +0200
-Subject: [PATCH] Remove unused variables from configure.ac.
-
-Also replace
-  configure.ac: NO_PREFIX_PACKAGE_FOO_DIR = "share/foo"
-  configure.ac: AC_SUBST(NO_PREFIX_PACKAGE_FOO_DIR)
-and
-  Makefile.am : .. = $(prefix)/@NO_PREFIX_PACKAGE_FOO_DIR@
-with
-  Makefile.am : .. = $(datadir)/foo
-for simplicity and conformity with the usual meaning of datadir.
-
-These changes may require regeneration by Anjuta.
----
- Makefile.am       |  2 +-
- configure.ac      | 85 -----------------------------------------------
- icons/Makefile.am |  2 +-
- 3 files changed, 2 insertions(+), 87 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index db5ec16..d61162f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -27,7 +27,7 @@ DISTCLEANFILES = \
- 	m4/* \
- 	po/Makefile.in.in
- 
--gnomemenudir = $(prefix)/@NO_PREFIX_PACKAGE_MENU_DIR@
-+gnomemenudir = $(datadir)/applications
- gnomemenu_DATA = org.nongnu.lingot.desktop
- appdatadir = $(datadir)/metainfo
- appdata_DATA = org.nongnu.lingot.appdata.xml
-diff --git a/configure.ac b/configure.ac
-index 08f208f..cfb1259 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -162,90 +162,6 @@ if test "x$uselibfftw" = "xyes"; then
-  fi
- fi
- 
--
--dnl PKG_CHECK_MODULES([GLADE], [libglade-2.0])
--dnl AC_SUBST(GLADE_CFLAGS)
--dnl AC_SUBST(GLADE_LIBS)
--
--dnl Set PACKAGE_LOCALE_DIR in config.h.
--if test "x${prefix}" = "xNONE"; then
--  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${ac_default_prefix}/${DATADIRNAME}/locale", [Package local directory])
--else
--  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale", [Package local directory])
--fi
--
--dnl Set PACKAGE SOURCE DIR in config.h.
--packagesrcdir=`cd $srcdir && pwd`
--
--dnl Set PACKAGE PREFIX
--if test "x${prefix}" = "xNONE"; then
--  packageprefix=${ac_default_prefix}
--else
--  packageprefix=${prefix}
--fi
--
--dnl Set PACKAGE DATA & DOC DIR
--packagedatadir=share
--packagedocdir=doc/${PACKAGE}
--
--dnl Set PACKAGE DIRs in config.h.
--packagepixmapsdir=share/pixmaps/${PACKAGE}
--packageicondir=share/icons/hicolor/scalable/apps/
--packagehelpdir=share/gnome/help/${PACKAGE}
--packagemenudir=share/applications
--
--dnl Subst PACKAGE_DATA_DIR.
--NO_PREFIX_PACKAGE_DATA_DIR="${packagedatadir}"
--AC_SUBST(NO_PREFIX_PACKAGE_DATA_DIR)
--PACKAGE_DATA_DIR="${packageprefix}/${packagedatadir}"
--AC_SUBST(PACKAGE_DATA_DIR)
--
--dnl Subst PACKAGE_DOC_DIR.
--NO_PREFIX_PACKAGE_DOC_DIR="${packagedocdir}"
--AC_SUBST(NO_PREFIX_PACKAGE_DOC_DIR)
--PACKAGE_DOC_DIR="${packageprefix}/${packagedocdir}"
--AC_SUBST(PACKAGE_DOC_DIR)
--
--dnl Subst PACKAGE_PIXMAPS_DIR.
--NO_PREFIX_PACKAGE_PIXMAPS_DIR="${packagepixmapsdir}"
--AC_SUBST(NO_PREFIX_PACKAGE_PIXMAPS_DIR)
--PACKAGE_PIXMAPS_DIR="${packageprefix}/${packagepixmapsdir}"
--AC_SUBST(PACKAGE_PIXMAPS_DIR)
--
--dnl Subst PACKAGE_ICON_DIR.
--NO_PREFIX_PACKAGE_ICON_DIR="${packageicondir}"
--AC_SUBST(NO_PREFIX_PACKAGE_ICON_DIR)
--PACKAGE_ICON_DIR="${packageprefix}/${packageicondir}"
--AC_SUBST(PACKAGE_ICON_DIR)
--
--dnl Subst PACKAGE_HELP_DIR.
--NO_PREFIX_PACKAGE_HELP_DIR="${packagehelpdir}"
--AC_SUBST(NO_PREFIX_PACKAGE_HELP_DIR)
--PACKAGE_HELP_DIR="${packageprefix}/${packagehelpdir}"
--AC_SUBST(PACKAGE_HELP_DIR)
--
--dnl Subst PACKAGE_MENU_DIR.
--NO_PREFIX_PACKAGE_MENU_DIR="${packagemenudir}"
--AC_SUBST(NO_PREFIX_PACKAGE_MENU_DIR)
--PACKAGE_MENU_DIR="${packageprefix}/${packagemenudir}"
--AC_SUBST(PACKAGE_MENU_DIR)
--
--dnl AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${packageprefix}/${packagedatadir}")
--dnl AC_DEFINE_UNQUOTED(PACKAGE_DOC_DIR, "${packageprefix}/${packagedocdir}")
--dnl AC_DEFINE_UNQUOTED(PACKAGE_PIXMAPS_DIR, "${packageprefix}/${packagepixmapsdir}")
--dnl AC_DEFINE_UNQUOTED(PACKAGE_HELP_DIR, "${packageprefix}/${packagehelpdir}")
--dnl AC_DEFINE_UNQUOTED(PACKAGE_MENU_DIR, "${packageprefix}/${packagemenudir}")
--dnl AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")
--
--
--AC_DEFINE([PACKAGE_DATA_DIR], [share], [Package data dir])
--AC_DEFINE([PACKAGE_DOC_DIR], [doc], [Package doc dir])
--AC_DEFINE([PACKAGE_HELP_DIR], [doc], [Help])
--AC_DEFINE([PACKAGE_MENU_DIR], [], [Menu])
--AC_DEFINE([PACKAGE_ICON_DIR], [icons], [Icons])
--AC_DEFINE([PACKAGE_SRC_DIR], [src], [Source])
--
--
- AC_CONFIG_FILES([
- Makefile
- po/Makefile.in
-@@ -254,4 +170,3 @@ icons/Makefile
- test/Makefile
- ])
- AC_OUTPUT
--
-diff --git a/icons/Makefile.am b/icons/Makefile.am
-index 9588562..0b17692 100644
---- a/icons/Makefile.am
-+++ b/icons/Makefile.am
-@@ -4,7 +4,7 @@
- ## If you don't want it to overwrite it,
- ## 	Please disable it in the Anjuta project configuration
- 
--lingot_iconsdir = $(prefix)/@NO_PREFIX_PACKAGE_ICON_DIR@
-+lingot_iconsdir = $(datadir)/icons/hicolor/scalable/apps
- 
- lingot_icons_DATA = \
- 	org.nongnu.lingot.svg
-From 0d65c3c71000a1f234288af4d703af888d569fd1 Mon Sep 17 00:00:00 2001
-From: Nicolas Boulenguez <nicolas.boulenguez@free.fr>
-Date: Sat, 14 Jul 2018 09:07:52 +0200
-Subject: [PATCH] Stop generating the desktop file.
-
-Drop the absolute path, and allow the icon to be found dynamically.
-This makes adding bitmaps additionally to the SVG easier later as well.
----
- configure.ac                                              | 1 -
- org.nongnu.lingot.desktop.in => org.nongnu.lingot.desktop | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
- rename org.nongnu.lingot.desktop.in => org.nongnu.lingot.desktop (86%)
-
-diff --git a/configure.ac b/configure.ac
-index 5f1ea03..08f208f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -252,7 +252,6 @@ po/Makefile.in
- src/Makefile
- icons/Makefile
- test/Makefile
--org.nongnu.lingot.desktop
- ])
- AC_OUTPUT
- 
-diff --git a/org.nongnu.lingot.desktop.in b/org.nongnu.lingot.desktop
-similarity index 86%
-rename from org.nongnu.lingot.desktop.in
-rename to org.nongnu.lingot.desktop
-index 76842ce..8b3524f 100644
---- a/org.nongnu.lingot.desktop.in
-+++ b/org.nongnu.lingot.desktop
-@@ -6,7 +6,7 @@ Comment=LINGOT Is Not a Guitar-Only Tuner
- Comment[cs]=(Nejen kytarová) ladička
- Comment[fr]=Un accordeur de guitare, mais pas que
- Exec=lingot
--Icon=@PACKAGE_ICON_DIR@/org.nongnu.lingot.svg
-+Icon=org.nongnu.lingot.svg
- Terminal=false
- Type=Application
- Categories=GNOME;GTK;AudioVideo;
-From 29691022bae3180cc021ad7b97023dd483be19de Mon Sep 17 00:00:00 2001
-From: Iban Cereijo <ibancg@users.noreply.github.com>
-Date: Wed, 18 Jul 2018 13:59:25 +0200
-Subject: [PATCH] Putting the desktop file in the distributed files.
-
----
- Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index d61162f..d359df3 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -10,7 +10,6 @@
- lingotdocdir = ${docdir}
- lingotdoc_DATA = \
- 	README \
--	COPYING \
- 	AUTHORS \
- 	ChangeLog \
- 	NEWS \
-@@ -37,6 +37,7 @@ dist_man_MANS = lingot.1
- 
- EXTRA_DIST = \
- 	$(lingotdoc_DATA) \
-+	$(gnomemenu_DATA) \
- 	$(appdata_DATA) \
- 	build-aux/gitlog-to-changelog \
- 	bootstrap
diff --git a/media-sound/lingot/lingot-1.0.1.ebuild b/media-sound/lingot/lingot-1.0.1.ebuild
deleted file mode 100644
index 523ec2ba532c..000000000000
--- a/media-sound/lingot/lingot-1.0.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Accurate, easy to use, and highly configurable musical instrument tuner"
-HOMEPAGE="https://www.nongnu.org/lingot/"
-SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa +fftw jack pulseaudio"
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	alsa? ( media-libs/alsa-lib )
-	fftw? ( sci-libs/fftw:3.0= )
-	jack? ( virtual/jack )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${P}-configure.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myemakeargs=(
-		$(use_enable alsa)
-		$(use_enable fftw libfftw)
-		$(use_enable jack)
-		$(use_enable pulseaudio)
-	)
-
-	econf "${myemakeargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" lingotdocdir="/usr/share/doc/${PF}" install
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index cfef7a3b2efc..c3ff3cb301ed 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index f9dff407f6d0..cdc1c9395a55 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 27 Feb 2023 03:09:57 +0000
+Mon, 27 Feb 2023 09:09:59 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 169a10058f44..89afb8ce9e84 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-02-27T03:10:01Z
+TIMESTAMP 2023-02-27T09:10:04Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP8HwlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP8c2xfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDNpg//SZlxeaaUXk1QZmbyqV4DdlCkAFUzDM9V5aQ/fyOXs4Q2lMw5005x5A0V
-O3V+h1nXr/0MiTJ0YIc4c1nT+URPj2YFeoAKQdVVPQWISBm7HB9I9UJL+PnI7dk7
-vlfWYPxYLUhBa6SuVkYjH9GDd8Hpxu9MSSIt1qWOUBppPhU9jcaWSy9usPNnv/nI
-aL3G4Gol/BNnf1Jas2PSXYRGF8tYegltYiDFf233dK5heiK2oqhRdgIsqJSHLZR4
-Fib+wA9FP1X26YT1+ueaZKYiwtHxPbTxDuYNdwDGzh9tDuObGAfpT92VaM9Cyee2
-Fjcp9+zYztmkezgsaQMsfdcWdmGGmz2BJ7oBM6KqKs1TRiwjPgqPnll4WHbjBi5R
-ZLd3xZRUwS0UDQ6tLLlKeryZrIMlQoCWY7nJ1gC6CkrGIQe9PmvcAgWOWUbID+5O
-hlsWGYc5J/2unydhexqINqa+nbolEAsS+d88w3mrfKctr1V5/Gh0oLn34tSYnib5
-3CeU9tMfmpJGmFOISJtrajPzCEb6CWXL/me+CzXl97Y4/o0+Lv+6K3HNSiFsYLHR
-gD5tmeU2OXpv/oUiXY3Gx8uCMr/RPF5Yfp+B6Wv1GqyvZKplfKi3T6QE1Yd0rMe9
-9MsFK8WNtaSQ2A2TT4LiCUrIPu2n8ILiYrj/hDGOo5BgQkg8i0g=
-=xL6L
+klB99w//Sgkif+51U2XTbXHklIFOkr9gl7PBkCVJcvZrIzDHVFs0n2iZdi2o/Ij2
+RCFsEg80KgEvPJA/nUoWu8o7d6/g/okv7Qc80rrfbqHFdbr+2wT7/rispmFSAcub
+uAJLhYwWkO8Ct57P4M9d11RutNesmHSzlDKrvD7Xxz4nqwwYidOutbbXyfrSAigN
+qF3cRtKaKN5fUxd19Fxj36KkInDoR1NsDdH9y7xDkSSEBohVgvjiS4dpEhHjLKXq
+29fbuMdoxrQpqddo4TQGSC7Enyvzo93rrzngdIfgrqr3F76bxcG//HgQUEqt+UpI
+BHosL8LRDw+V+occsmUEJGY4qIJCVLmjoaLFP5DbjxtKITChHtp7upt3UXoh439m
+C3jfeQfCpIMZB3ZEAhtuBdsaWwj6bmQd/PUvV64nSpkBdWCYkP2VvI26LsrIc79+
+XrAjPIWxMt7K+E9QteQJfoRJkiKUJbp3xamAgn9mLKSYA2fLjkNgJMDHQFw/Dpl+
+8KF7jnupOlTHuV/SYzEgbMQ1j8OMhKWF2JBu54ndQ/9Yn/EqmylQAEXnrRkh/DeL
+RbtzGwaLVn0pEFpGmJbZ2iRP9uov/jwVPIyVTMPwJFvP7WpbPW99poUFZWJRdo3t
+FxZFTf3eMQLsUTOJ8h/8Tp9b4VxRTd/0L9DS2DIcd+GcxQq3W5w=
+=o2jM
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 9968683cf0c0..cdc1c9395a55 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 27 Feb 2023 03:09:58 +0000
+Mon, 27 Feb 2023 09:09:59 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 0b9f52710d31..d1cde046b0f0 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index c39dfa5ed1aa..b3fb589c4e50 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/jacksum-3.4.0-r1 b/metadata/md5-cache/app-crypt/jacksum-3.4.0-r1
index b6407159e035..4996d1fd0765 100644
--- a/metadata/md5-cache/app-crypt/jacksum-3.4.0-r1
+++ b/metadata/md5-cache/app-crypt/jacksum-3.4.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/jonelo/jacksum/archive/v3.4.0.tar.gz -> jacksum-3.4.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=e019ae46076724dc6101a41bd8218343
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 64cc779bc898..53135b28dacf 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r5 b/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r5
index da2045241863..ccd0825f9073 100644
--- a/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r5
+++ b/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r5
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 SLOT=0
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/ibus-pinyin-1.5.0.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b326625f1a3b02abbd86a9aba340c600
+_md5_=744ce14d4a624fe3871ee485881ec68c
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 019ba21a74fc..6e5f6a20dffd 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/openrgb-0.7 b/metadata/md5-cache/app-misc/openrgb-0.7
deleted file mode 100644
index 2dc620cdf467..000000000000
--- a/metadata/md5-cache/app-misc/openrgb-0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/hidapi dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-libs/mbedtls:= virtual/libusb:1 dev-cpp/nlohmann_json
-DESCRIPTION=Open source RGB lighting control that doesn't depend on manufacturer software
-EAPI=8
-HOMEPAGE=https://openrgb.org https://gitlab.com/CalcProgrammer1/OpenRGB/
-INHERIT=flag-o-matic qmake-utils
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/hidapi dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-libs/mbedtls:= virtual/libusb:1
-SLOT=0/2
-SRC_URI=https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_0.7/OpenRGB-release_0.7.tar.bz2
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=e76d5a8bc366a50f60e3a2886ad3f855
diff --git a/metadata/md5-cache/app-misc/openrgb-0.7-r1 b/metadata/md5-cache/app-misc/openrgb-0.7-r1
deleted file mode 100644
index 5456ad6db6ec..000000000000
--- a/metadata/md5-cache/app-misc/openrgb-0.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=dev-libs/hidapi dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-libs/mbedtls:= virtual/libusb:1 dev-cpp/nlohmann_json
-DESCRIPTION=Open source RGB lighting control that doesn't depend on manufacturer software
-EAPI=8
-HOMEPAGE=https://openrgb.org https://gitlab.com/CalcProgrammer1/OpenRGB/
-INHERIT=flag-o-matic qmake-utils udev
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/hidapi dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-libs/mbedtls:= virtual/libusb:1
-SLOT=0/2
-SRC_URI=https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_0.7/OpenRGB-release_0.7.tar.bz2
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=9d807b196a4716e70c120f6c35c0f910
diff --git a/metadata/md5-cache/app-misc/openrgb-plugin-effects-0_p20220110 b/metadata/md5-cache/app-misc/openrgb-plugin-effects-0_p20220110
deleted file mode 100644
index f19020ac7801..000000000000
--- a/metadata/md5-cache/app-misc/openrgb-plugin-effects-0_p20220110
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-misc/openrgb-0.7:= dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] media-libs/openal dev-cpp/nlohmann_json
-DESCRIPTION=Plugin for OpenRGB with various Effects that can be synced across devices
-EAPI=8
-HOMEPAGE=https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin
-INHERIT=qmake-utils
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=>=app-misc/openrgb-0.7:= dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] media-libs/openal
-SLOT=0
-SRC_URI=https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin/-/archive/a7222bdbcd3c52e13d96993a33c5648f1306aeba/OpenRGBEffectsPlugin-a7222bdbcd3c52e13d96993a33c5648f1306aeba.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=df0af1b339c68fa3e2fb5309b5c52b30
diff --git a/metadata/md5-cache/app-misc/openrgb-plugin-skin-0_p20211230 b/metadata/md5-cache/app-misc/openrgb-plugin-skin-0_p20211230
deleted file mode 100644
index a565606a5f2f..000000000000
--- a/metadata/md5-cache/app-misc/openrgb-plugin-skin-0_p20211230
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-misc/openrgb-0.7:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-cpp/nlohmann_json
-DESCRIPTION=Plugin for OpenRGB that allows you to customize the look and feel of OpenRGB
-EAPI=8
-HOMEPAGE=https://gitlab.com/OpenRGBDevelopers/OpenRGBSkinPlugin
-INHERIT=qmake-utils
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=>=app-misc/openrgb-0.7:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://gitlab.com/OpenRGBDevelopers/openrgbskinplugin/-/archive/ebb80f7bd0e1efaa995f60454f3c049a4607bc3b/openrgbskinplugin-ebb80f7bd0e1efaa995f60454f3c049a4607bc3b.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d07767d15cbd4d52d424480cddb3a8c3
diff --git a/metadata/md5-cache/app-misc/openrgb-plugin-visualmap-0_p20211230 b/metadata/md5-cache/app-misc/openrgb-plugin-visualmap-0_p20211230
deleted file mode 100644
index 992b56da9b8a..000000000000
--- a/metadata/md5-cache/app-misc/openrgb-plugin-visualmap-0_p20211230
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-misc/openrgb-0.7:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-cpp/nlohmann_json
-DESCRIPTION=Plugin for OpenRGB to create virtual devices out of multiple real ones
-EAPI=8
-HOMEPAGE=https://gitlab.com/OpenRGBDevelopers/OpenRGBVisualMapPlugin
-INHERIT=qmake-utils
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=>=app-misc/openrgb-0.7:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://gitlab.com/OpenRGBDevelopers/OpenRGBVisualMapPlugin/-/archive/223c5ec67d256c5fa3bf7f3d572213114d93db6e/OpenRGBVisualMapPlugin-223c5ec67d256c5fa3bf7f3d572213114d93db6e.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=717bd3a7e410fd441ea5d9d48ca34b44
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 3cf81be204fb..f894fa9b3b15 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/java-ebuilder-0.5.1-r1 b/metadata/md5-cache/app-portage/java-ebuilder-0.5.1-r1
index 8826ddb5971f..84e4f43095bd 100644
--- a/metadata/md5-cache/app-portage/java-ebuilder-0.5.1-r1
+++ b/metadata/md5-cache/app-portage/java-ebuilder-0.5.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* sys-process/parallel >=dev-java/maven-bin-3 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/java-ebuilder.git/snapshot/java-ebuilder-0.5.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=236bc1b36bdbe638ac48bded5871d084
diff --git a/metadata/md5-cache/app-portage/java-ebuilder-9999 b/metadata/md5-cache/app-portage/java-ebuilder-9999
index 57f84783861d..932556210a0b 100644
--- a/metadata/md5-cache/app-portage/java-ebuilder-9999
+++ b/metadata/md5-cache/app-portage/java-ebuilder-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=virtual/jre-1.8:* sys-process/parallel >=dev-java/maven-bin-3 >=dev-java/java-config-2.2.0-r3
 SLOT=0
-_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=236bc1b36bdbe638ac48bded5871d084
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 112233cfe0e5..e42d718b1969 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/pdftk-3.3.3 b/metadata/md5-cache/app-text/pdftk-3.3.3
index effc72af4f27..1d932ee9e3ca 100644
--- a/metadata/md5-cache/app-text/pdftk-3.3.3
+++ b/metadata/md5-cache/app-text/pdftk-3.3.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/bcprov:0 dev-java/commons-lang:3.6 >=dev-ja
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/pdftk-java/pdftk/-/archive/v3.3.3/pdftk-v3.3.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=aa638e153893b294cea8435323cd32db
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 5553d49544f0..283beb5d72ca 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/asio-1.22.2 b/metadata/md5-cache/dev-cpp/asio-1.22.2
deleted file mode 100644
index 0fd69b5393e8..000000000000
--- a/metadata/md5-cache/dev-cpp/asio-1.22.2
+++ /dev/null
@@ -1,15 +0,0 @@
-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
-DEPEND=test? ( dev-libs/boost dev-libs/openssl )
-DESCRIPTION=Asynchronous Network Library
-EAPI=8
-HOMEPAGE=https://think-async.com https://github.com/chriskohlhoff/asio
-INHERIT=autotools
-IUSE=doc examples test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
-LICENSE=Boost-1.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/asio/asio/asio-1.22.2.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5f2881493bfb8d378cffb296a22740a0
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index d92255eac49c..bb8bccf0e989 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/apgdiff-2.7.0 b/metadata/md5-cache/dev-db/apgdiff-2.7.0
index 10b56811e4e2..1c9b76e148d8 100644
--- a/metadata/md5-cache/dev-db/apgdiff-2.7.0
+++ b/metadata/md5-cache/dev-db/apgdiff-2.7.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fordfrog/apgdiff/archive/refs/tags/release_2.7.0.tar.gz -> apgdiff-2.7.0-sources.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=276826446ef42e379bd1ed91fc028fb2
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index ffacb83d829c..d381d6a05edc 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/angus-activation-1.0.0-r1 b/metadata/md5-cache/dev-java/angus-activation-1.0.0-r1
index 61843daa0a58..275de4c59a0a 100644
--- a/metadata/md5-cache/dev-java/angus-activation-1.0.0-r1
+++ b/metadata/md5-cache/dev-java/angus-activation-1.0.0-r1
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/angus-activation/archive/1.0.0.tar.gz -> angus-activation-1.0.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=b16ce2302a00a68ea3ee76320ecdd221
diff --git a/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1 b/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1
index 87381d947609..cd3e2b6cb234 100644
--- a/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1
+++ b/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/mojohaus/animal-sniffer/archive/animal-sniffer-parent-1.15.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=5365b105212193b14dbba1b0a2109750
diff --git a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r1 b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r1
index f4de0490c4c3..46ab8d1d3930 100644
--- a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r1
+++ b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/ant-core:0 dev-java/ant-ivy:2 dev-java/bcel:0 dev-java/commons-
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cniweb/ant-contrib/archive/0228412be2ef648cfabc1d74416d3188755aff9b.tar.gz -> ant-contrib-1.0_beta6_pre20201123.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=fa7c24e7af94c93a09a703c266c268bc
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15-r1 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15-r1
index 50f7f4562012..389cb175b514 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15-r1
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15-r1
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
 RDEPEND=~dev-java/eclipse-ecj-4.15:4.15 dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.15
 SRC_URI=https://archive.eclipse.org/eclipse/downloads/drops4/R-4.15-202003050155/ecjsrc-4.15.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=1b628cead7c3a75ec3360a1af96cd2b8
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.22-r2 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.22-r2
index 5ee29643023a..9b7e29b2e653 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.22-r2
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.22-r2
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
 RDEPEND=~dev-java/eclipse-ecj-4.22:4.22 dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.22
 SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/ecjsrc-4.22.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=696c056c9fbd673259233ad9bded3eb9
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.25 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.25
index c7e8d2ad388a..8bc9ae1ed7da 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.25
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.25
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
 RDEPEND=~dev-java/eclipse-ecj-4.25:4.25 dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.25
 SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.25-202208311800/ecjsrc-4.25.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=847811be022429fa6e3990b1a7e8325e
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.26 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.26
index 85e8d9bd5038..f03fc28415a1 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.26
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.26
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
 RDEPEND=~dev-java/eclipse-ecj-4.26:4.26 dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.26
 SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.26-202211231800/ecjsrc-4.26.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=c3026e0fb107624661a73bbf1e2adf8f
diff --git a/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r1 b/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r1
index 7639f22f4686..310f9aabd2a1 100644
--- a/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r1
+++ b/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-java/ant-core:0 dev-java/bcpg:0 dev-java/bcprov:0 dev-java/httpcompo
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/ant/ivy/2.5.0/apache-ivy-2.5.0-src.tar.gz
-_eclasses_=java-osgi	c82db640aeccac34f009e90c7bb10a81	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-osgi	c82db640aeccac34f009e90c7bb10a81	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=b8ffa063f56d10f6081980a097bcb278
diff --git a/metadata/md5-cache/dev-java/antlr-2.7.7-r9 b/metadata/md5-cache/dev-java/antlr-2.7.7-r9
index 32264a8c64f7..602f2ab758d5 100644
--- a/metadata/md5-cache/dev-java/antlr-2.7.7-r9
+++ b/metadata/md5-cache/dev-java/antlr-2.7.7-r9
@@ -10,5 +10,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://www.antlr2.org/download/antlr-2.7.7.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=7cea84226e935ddb81d4f1d650e012d1
diff --git a/metadata/md5-cache/dev-java/antlr-3.2-r1 b/metadata/md5-cache/dev-java/antlr-3.2-r1
index aed22a63eb3a..c32588436339 100644
--- a/metadata/md5-cache/dev-java/antlr-3.2-r1
+++ b/metadata/md5-cache/dev-java/antlr-3.2-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/antlr-2.7.7-r7:0 dev-java/stringtemplate:0 >=virtual/jre-1.8:
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://www.antlr3.org/download/antlr-3.2.tar.gz https://www.antlr3.org/download/antlr-3.2.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=030dfc1ef28d4465566f94832b3197fb
diff --git a/metadata/md5-cache/dev-java/antlr-runtime-3.5.3 b/metadata/md5-cache/dev-java/antlr-runtime-3.5.3
index cc0138256b70..9fa40a55bb6b 100644
--- a/metadata/md5-cache/dev-java/antlr-runtime-3.5.3
+++ b/metadata/md5-cache/dev-java/antlr-runtime-3.5.3
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=>=dev-java/stringtemplate-3.2.1:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.5
 SRC_URI=https://repo1.maven.org/maven2/org/antlr/antlr-runtime/3.5.3/antlr-runtime-3.5.3-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=fb3a34e1933a20bfb2882d4c7a9470ec
diff --git a/metadata/md5-cache/dev-java/antlr-runtime-4.9.3 b/metadata/md5-cache/dev-java/antlr-runtime-4.9.3
index c698bb64a88e..13dee6749612 100644
--- a/metadata/md5-cache/dev-java/antlr-runtime-4.9.3
+++ b/metadata/md5-cache/dev-java/antlr-runtime-4.9.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/antlr/antlr4/archive/4.9.3.tar.gz -> antlr-4.9.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=24940d00dbb98aa66e931290836ae633
diff --git a/metadata/md5-cache/dev-java/antlr-tool-3.5.3 b/metadata/md5-cache/dev-java/antlr-tool-3.5.3
index 2a88e6ec4549..64dba67cce2a 100644
--- a/metadata/md5-cache/dev-java/antlr-tool-3.5.3
+++ b/metadata/md5-cache/dev-java/antlr-tool-3.5.3
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/antlr-runtime-3.5.3:3.5 dev-java/stringtem
 RESTRICT=!test? ( test )
 SLOT=3.5
 SRC_URI=https://repo1.maven.org/maven2/org/antlr/antlr/3.5.3/antlr-3.5.3-sources.jar -> antlr-tool-3.5.3-sources.jar https://github.com/antlr/antlr3/archive/3.5.3.tar.gz -> antlr-3.5.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=fdace0a03a36bbde4e83973477982685
diff --git a/metadata/md5-cache/dev-java/antlr-tool-4.9.3 b/metadata/md5-cache/dev-java/antlr-tool-4.9.3
index 9e18eee8886b..939004abfa64 100644
--- a/metadata/md5-cache/dev-java/antlr-tool-4.9.3
+++ b/metadata/md5-cache/dev-java/antlr-tool-4.9.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/antlr-runtime-4.9.3:4 dev-java/antlr-runti
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/antlr/antlr4/archive/4.9.3.tar.gz -> antlr-4.9.3.tar.gz https://repo1.maven.org/maven2/org/antlr/antlr4/4.9.3/antlr4-4.9.3-sources.jar -> antlr-tool-4.9.3-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=ffc0a7a373c6934a5c70e4561bad36f7
diff --git a/metadata/md5-cache/dev-java/aopalliance-1.0-r3 b/metadata/md5-cache/dev-java/aopalliance-1.0-r3
index b1869c993ce3..85a2878f1e11 100644
--- a/metadata/md5-cache/dev-java/aopalliance-1.0-r3
+++ b/metadata/md5-cache/dev-java/aopalliance-1.0-r3
@@ -10,5 +10,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gentoo/aopalliance-1.0-gentoo.tar.bz2
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=0bcbc7cba4df84544947602428a6dd59
diff --git a/metadata/md5-cache/dev-java/apache-rat-core-0.13 b/metadata/md5-cache/dev-java/apache-rat-core-0.13
index 99d9783b627a..dedd564e3584 100644
--- a/metadata/md5-cache/dev-java/apache-rat-core-0.13
+++ b/metadata/md5-cache/dev-java/apache-rat-core-0.13
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-cli-1.3.1:1 >=dev-java/commons-co
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache//creadur/apache-rat-0.13/apache-rat-0.13-src.tar.bz2
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=d22bad28e451f95f75c485378fececf2
diff --git a/metadata/md5-cache/dev-java/apache-rat-tasks-0.13 b/metadata/md5-cache/dev-java/apache-rat-tasks-0.13
index 14203008ee13..a096da876c48 100644
--- a/metadata/md5-cache/dev-java/apache-rat-tasks-0.13
+++ b/metadata/md5-cache/dev-java/apache-rat-tasks-0.13
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 ~dev-java/apache-rat-core-0.13:0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache//creadur/apache-rat-0.13/apache-rat-0.13-src.tar.bz2
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=7c5b860615c9f5b27aa0563531da9afa
diff --git a/metadata/md5-cache/dev-java/apiguardian-api-1.1.2-r1 b/metadata/md5-cache/dev-java/apiguardian-api-1.1.2-r1
index 656ef0e89915..30cf6097b6e5 100644
--- a/metadata/md5-cache/dev-java/apiguardian-api-1.1.2-r1
+++ b/metadata/md5-cache/dev-java/apiguardian-api-1.1.2-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/apiguardian-team/apiguardian/archive/r1.1.2.tar.gz -> apiguardian-api-1.1.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=5f020dc4845edbebc486fb168740816f
diff --git a/metadata/md5-cache/dev-java/aqute-bnd-annotation-6.3.1 b/metadata/md5-cache/dev-java/aqute-bnd-annotation-6.3.1
index 740de3e94278..e5fc0fe6e862 100644
--- a/metadata/md5-cache/dev-java/aqute-bnd-annotation-6.3.1
+++ b/metadata/md5-cache/dev-java/aqute-bnd-annotation-6.3.1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0 EPL-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/osgi-annotation:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/6.3.1/biz.aQute.bnd.annotation-6.3.1-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=9b6924a56bbe5d84137a134d5a652054
diff --git a/metadata/md5-cache/dev-java/asm-9.4 b/metadata/md5-cache/dev-java/asm-9.4
index 98929327f3e7..f92b763a5cc5 100644
--- a/metadata/md5-cache/dev-java/asm-9.4
+++ b/metadata/md5-cache/dev-java/asm-9.4
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=9
 SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_9_4/asm-ASM_9_4.tar.bz2
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=ccff5e12a3cc549d89f6c731d27e2e5d
diff --git a/metadata/md5-cache/dev-java/aspectj-1.9.7 b/metadata/md5-cache/dev-java/aspectj-1.9.7
index 09c3e9dce55c..7e2e5bd99996 100644
--- a/metadata/md5-cache/dev-java/aspectj-1.9.7
+++ b/metadata/md5-cache/dev-java/aspectj-1.9.7
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
 RDEPEND=dev-java/asm:9 dev-java/commons-logging:0 dev-java/ant-apache-regexp:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse/org.aspectj/archive/refs/tags/V1_9_7.tar.gz -> aspectj-1.9.7.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=72e4c000f4d64ad768a7fcfd8c05933c
diff --git a/metadata/md5-cache/dev-java/assertj-core-2.3.0-r1 b/metadata/md5-cache/dev-java/assertj-core-2.3.0-r1
index 32fed53251f8..d354f8e2ef0a 100644
--- a/metadata/md5-cache/dev-java/assertj-core-2.3.0-r1
+++ b/metadata/md5-cache/dev-java/assertj-core-2.3.0-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/cglib:3 dev-java/junit:4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/assertj/assertj-core/archive/assertj-core-2.3.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=74c0f187f05a2b4e485e2e4d881f1e45
diff --git a/metadata/md5-cache/dev-java/assertj-core-3.10.0 b/metadata/md5-cache/dev-java/assertj-core-3.10.0
index 838b9400f436..1bb9c3295539 100644
--- a/metadata/md5-cache/dev-java/assertj-core-3.10.0
+++ b/metadata/md5-cache/dev-java/assertj-core-3.10.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/byte-buddy-1.12.12:0 >=dev-java/java-conf
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/assertj/assertj-core/archive/assertj-core-3.10.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=2d7798708bdc2edb66c9421153a5a1ba
diff --git a/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r4 b/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r4
index 29cc58ff97f6..ad4368340825 100644
--- a/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r4
+++ b/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r4
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/avalon-logkit:2.0 dev-java/log4j-12-api:2 >
 RESTRICT=!test? ( test )
 SLOT=4.2
 SRC_URI=mirror://apache/avalon/avalon-framework/source/avalon-framework-4.2.0-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=a24a1c659a325216db06ccb8934a21df
diff --git a/metadata/md5-cache/dev-java/batik-1.14-r1 b/metadata/md5-cache/dev-java/batik-1.14-r1
index e1375585030d..7872dc7c1d51 100644
--- a/metadata/md5-cache/dev-java/batik-1.14-r1
+++ b/metadata/md5-cache/dev-java/batik-1.14-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jacl:0 dev-java/jython:2.7 dev-java/rhino:1.6 dev-java/xalan:0
 RESTRICT=!test? ( test )
 SLOT=1.14
 SRC_URI=mirror://apache/xmlgraphics/batik/source/batik-src-1.14.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=44313ea3fef478caa985c1bb56c99e8e
diff --git a/metadata/md5-cache/dev-java/bcel-6.6.0 b/metadata/md5-cache/dev-java/bcel-6.6.0
index 8873785af7d4..2a0bf364e106 100644
--- a/metadata/md5-cache/dev-java/bcel-6.6.0
+++ b/metadata/md5-cache/dev-java/bcel-6.6.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/commons-lang:3.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/commons/bcel/source/bcel-6.6.0-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/bcel/source/bcel-6.6.0-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=334382a5b12c2be82f23086eb5e33fc0
diff --git a/metadata/md5-cache/dev-java/bcmail-1.72 b/metadata/md5-cache/dev-java/bcmail-1.72
index 0c7d07b19404..fdb5121da852 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.72
+++ b/metadata/md5-cache/dev-java/bcmail-1.72
@@ -11,5 +11,5 @@ RDEPEND=~dev-java/bcpkix-1.72:0 ~dev-java/bcprov-1.72:0 ~dev-java/bcutil-1.72:0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv72.tar.gz -> bc-java-r1rv72.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=392e33e4210b7288b9ffd1d8de00aa0c
diff --git a/metadata/md5-cache/dev-java/bcpg-1.72 b/metadata/md5-cache/dev-java/bcpg-1.72
index 6ff357999772..a010c8ec664a 100644
--- a/metadata/md5-cache/dev-java/bcpg-1.72
+++ b/metadata/md5-cache/dev-java/bcpg-1.72
@@ -11,5 +11,5 @@ RDEPEND=~dev-java/bcprov-1.72:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv72.tar.gz -> bc-java-r1rv72.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=31e7099838e87b12597cdc2c2f59290f
diff --git a/metadata/md5-cache/dev-java/bcpkix-1.72 b/metadata/md5-cache/dev-java/bcpkix-1.72
index 167556fe0531..1ce28eb0c644 100644
--- a/metadata/md5-cache/dev-java/bcpkix-1.72
+++ b/metadata/md5-cache/dev-java/bcpkix-1.72
@@ -12,5 +12,5 @@ RDEPEND=~dev-java/bcprov-1.72:0 ~dev-java/bcutil-1.72:0 >=virtual/jre-1.8:* >=de
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv72.tar.gz -> bc-java-r1rv72.tar.gz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=04597e54bfdaeb887510228c3081eca4
diff --git a/metadata/md5-cache/dev-java/bcprov-1.72 b/metadata/md5-cache/dev-java/bcprov-1.72
index 69469433e87d..a84be5249302 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.72
+++ b/metadata/md5-cache/dev-java/bcprov-1.72
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv72.tar.gz -> bc-java-r1rv72.tar.gz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=d9513ba3face8d44d2e6e0a249976f61
diff --git a/metadata/md5-cache/dev-java/bcutil-1.72 b/metadata/md5-cache/dev-java/bcutil-1.72
index 2fa55e16bbc0..a5f85e531cd7 100644
--- a/metadata/md5-cache/dev-java/bcutil-1.72
+++ b/metadata/md5-cache/dev-java/bcutil-1.72
@@ -11,5 +11,5 @@ RDEPEND=~dev-java/bcprov-1.72:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv72.tar.gz -> bc-java-r1rv72.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=15e19954de3e22bcffcf3fcb7903ef8c
diff --git a/metadata/md5-cache/dev-java/brotli-dec-0.1.2 b/metadata/md5-cache/dev-java/brotli-dec-0.1.2
index 2c6690e8511d..d77f9f184f84 100644
--- a/metadata/md5-cache/dev-java/brotli-dec-0.1.2
+++ b/metadata/md5-cache/dev-java/brotli-dec-0.1.2
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/brotli/dec/0.1.2/dec-0.1.2-sources.jar -> brotli-dec-0.1.2-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=5798bdfffc623c3300d063ff927ff233
diff --git a/metadata/md5-cache/dev-java/browserlauncher2-1.3-r3 b/metadata/md5-cache/dev-java/browserlauncher2-1.3-r3
index b6f1b38430bf..6b40eca02f1e 100644
--- a/metadata/md5-cache/dev-java/browserlauncher2-1.3-r3
+++ b/metadata/md5-cache/dev-java/browserlauncher2-1.3-r3
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://downloads.sourceforge.net/project/browserlaunch2/browserlauncher2/1.3/BrowserLauncher2-all-1_3.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=6980f4df76aae52005da887f43702c95
diff --git a/metadata/md5-cache/dev-java/bsh-2.1.1 b/metadata/md5-cache/dev-java/bsh-2.1.1
new file mode 100644
index 000000000000..9ddc313813d9
--- /dev/null
+++ b/metadata/md5-cache/dev-java/bsh-2.1.1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/bsf:2.3 dev-java/jakarta-servlet-api:4 virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=A small embeddable Java source interpreter
+EAPI=8
+HOMEPAGE=https://github.com/beanshell/beanshell
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+PROPERTIES=test_network
+RDEPEND=dev-java/bsf:2.3 dev-java/jakarta-servlet-api:4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/beanshell/beanshell/archive/2.1.1.tar.gz -> bsh-2.1.1.tar.gz
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=bca35b1591d5b1509b43514309ca9a53
diff --git a/metadata/md5-cache/dev-java/byte-buddy-1.12.21 b/metadata/md5-cache/dev-java/byte-buddy-1.12.21
index 41a0a164fd6b..dc4380199783 100644
--- a/metadata/md5-cache/dev-java/byte-buddy-1.12.21
+++ b/metadata/md5-cache/dev-java/byte-buddy-1.12.21
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/raphw/byte-buddy/archive/byte-buddy-1.12.21.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=bc02af28c1e265a09ca0d9ab2ddd86ba
diff --git a/metadata/md5-cache/dev-java/cal10n-0.8.1 b/metadata/md5-cache/dev-java/cal10n-0.8.1
index 06907fd5c318..8346aeeda97e 100644
--- a/metadata/md5-cache/dev-java/cal10n-0.8.1
+++ b/metadata/md5-cache/dev-java/cal10n-0.8.1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/cal10n/archive/v_0.8.1.tar.gz -> cal10n-0.8.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=0660b455429dbdf902b31d8f1befb67c
diff --git a/metadata/md5-cache/dev-java/cdi-api-4.0.1-r2 b/metadata/md5-cache/dev-java/cdi-api-4.0.1-r2
index c36857e6f5ed..425a7be3d439 100644
--- a/metadata/md5-cache/dev-java/cdi-api-4.0.1-r2
+++ b/metadata/md5-cache/dev-java/cdi-api-4.0.1-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/cdi/archive/4.0.1.tar.gz -> cdi-api-4.0.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=19b90d3f7f970c0b52c793432bcfac4a
diff --git a/metadata/md5-cache/dev-java/cglib-3.3.0-r1 b/metadata/md5-cache/dev-java/cglib-3.3.0-r1
index f75fe18a4cb2..2b4253f57c19 100644
--- a/metadata/md5-cache/dev-java/cglib-3.3.0-r1
+++ b/metadata/md5-cache/dev-java/cglib-3.3.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 dev-java/asm:9 >=dev-java/java-c
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/cglib/cglib/archive//RELEASE_3_3_0.tar.gz -> cglib-RELEASE_3_3_0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=ce17e92c57e18188a5d7ac54ab915579
diff --git a/metadata/md5-cache/dev-java/checker-framework-qual-3.14.0 b/metadata/md5-cache/dev-java/checker-framework-qual-3.14.0
index 4b0d317b60ea..0f2b6e9a5f07 100644
--- a/metadata/md5-cache/dev-java/checker-framework-qual-3.14.0
+++ b/metadata/md5-cache/dev-java/checker-framework-qual-3.14.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://codeload.github.com/typetools/checker-framework/tar.gz/refs/tags/checker-framework-3.14.0 -> checker-framework-3.14.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=7ee370ee2561a156f144a8211a56d9c5
diff --git a/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r1 b/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r1
index f85a4c7efc19..7e2e0d2cce18 100644
--- a/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r1
+++ b/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/commons-collections:0 dev-java/commons-logging:0 >=virtual/jre-
 RESTRICT=!test? ( test )
 SLOT=1.7
 SRC_URI=mirror://apache/commons/beanutils/source/commons-beanutils-1.9.4-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=b818ee63d0978430ab19080ede8dc626
diff --git a/metadata/md5-cache/dev-java/commons-cli-1.5.0 b/metadata/md5-cache/dev-java/commons-cli-1.5.0
index 4911ba65584e..7c207871a028 100644
--- a/metadata/md5-cache/dev-java/commons-cli-1.5.0
+++ b/metadata/md5-cache/dev-java/commons-cli-1.5.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=mirror://apache/commons/cli/source/commons-cli-1.5.0-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=bbc0e4f273d7d83ad71d8f24d2de6bed
diff --git a/metadata/md5-cache/dev-java/commons-codec-1.15-r1 b/metadata/md5-cache/dev-java/commons-codec-1.15-r1
index 363414df3d84..b0616ef0dd18 100644
--- a/metadata/md5-cache/dev-java/commons-codec-1.15-r1
+++ b/metadata/md5-cache/dev-java/commons-codec-1.15-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/codec/source/commons-codec-1.15-src.tar.gz -> commons-codec-1.15.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=9786abaa80d21cbee5f20605f2cb2029
diff --git a/metadata/md5-cache/dev-java/commons-collections-4.4-r1 b/metadata/md5-cache/dev-java/commons-collections-4.4-r1
index 36da9751cdc3..e98056a8e402 100644
--- a/metadata/md5-cache/dev-java/commons-collections-4.4-r1
+++ b/metadata/md5-cache/dev-java/commons-collections-4.4-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://apache/commons/collections/source/commons-collections4-4.4-src.tar.gz -> commons-collections-4.4-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=49a17da70c32257347df61e3627074af
diff --git a/metadata/md5-cache/dev-java/commons-compress-1.21-r1 b/metadata/md5-cache/dev-java/commons-compress-1.21-r1
index c6a851a30d29..6bead51b2ca0 100644
--- a/metadata/md5-cache/dev-java/commons-compress-1.21-r1
+++ b/metadata/md5-cache/dev-java/commons-compress-1.21-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/asm:9 dev-java/brotli-dec:0 dev-java/xz-jav
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/compress/source/commons-compress-1.21-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8b5aadb2b4ca8069e0e557c0cddf51f3
diff --git a/metadata/md5-cache/dev-java/commons-csv-1.9.0 b/metadata/md5-cache/dev-java/commons-csv-1.9.0
index 9114bb23d8da..3dafdcbc3f7d 100644
--- a/metadata/md5-cache/dev-java/commons-csv-1.9.0
+++ b/metadata/md5-cache/dev-java/commons-csv-1.9.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/csv/source/commons-csv-1.9.0-src.tar.gz -> commons-csv-1.9.0-sources.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=ee03a72c337c9e519e3ed23d324e9281
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.3.3 b/metadata/md5-cache/dev-java/commons-daemon-1.3.3
index e980065c34f6..804cd2e6f313 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.3.3
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.3.3
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.3.3-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/daemon/source/commons-daemon-1.3.3-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=7902829c493349f239b87ed827604b4a
diff --git a/metadata/md5-cache/dev-java/commons-digester-2.1-r2 b/metadata/md5-cache/dev-java/commons-digester-2.1-r2
index f47ec1e49b61..4d6b3aab52f4 100644
--- a/metadata/md5-cache/dev-java/commons-digester-2.1-r2
+++ b/metadata/md5-cache/dev-java/commons-digester-2.1-r2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/commons-beanutils-1.9.4:1.7 >=dev-java/commons-logging-1.2:0
 RESTRICT=!test? ( test )
 SLOT=2.1
 SRC_URI=mirror://apache/commons/digester/source/commons-digester-2.1-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=d9a856c9a26947e6aff0cc6a26b497a4
diff --git a/metadata/md5-cache/dev-java/commons-digester-3.2-r3 b/metadata/md5-cache/dev-java/commons-digester-3.2-r3
index 332b1b488565..a8f41ade0346 100644
--- a/metadata/md5-cache/dev-java/commons-digester-3.2-r3
+++ b/metadata/md5-cache/dev-java/commons-digester-3.2-r3
@@ -12,5 +12,5 @@ RDEPEND=>=dev-java/cglib-3.3.0:3 >=dev-java/commons-beanutils-1.9.4:1.7 >=dev-ja
 RESTRICT=test !test? ( test )
 SLOT=3.2
 SRC_URI=mirror://apache/commons/digester/source/commons-digester3-3.2-src.tar.gz -> commons-digester-3.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=32cba32ff0bd4c3adba31f8ed800b86a
diff --git a/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha3 b/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha3
index b3d736c84565..92bdb97ed3a3 100644
--- a/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha3
+++ b/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/imaging/source/commons-imaging-1.0-alpha3-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=f45b2c70456dad769a00122939de99c6
diff --git a/metadata/md5-cache/dev-java/commons-io-2.11.0-r1 b/metadata/md5-cache/dev-java/commons-io-2.11.0-r1
index ec15360a607e..32936ada383e 100644
--- a/metadata/md5-cache/dev-java/commons-io-2.11.0-r1
+++ b/metadata/md5-cache/dev-java/commons-io-2.11.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://apache/commons/io/source/commons-io-2.11.0-src.tar.gz -> commons-io-2.11.0-sources.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=e5a106d98aa839ebd22eb6bb55e57911
diff --git a/metadata/md5-cache/dev-java/commons-junit4-1.2.17 b/metadata/md5-cache/dev-java/commons-junit4-1.2.17
index 9fe47a3b5e20..352d239e76ff 100644
--- a/metadata/md5-cache/dev-java/commons-junit4-1.2.17
+++ b/metadata/md5-cache/dev-java/commons-junit4-1.2.17
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/commons-nullanalysis-1.2.17:0 dev-java/jun
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aunkrig/commons/archive/V1.2.17.tar.gz -> unkrig-commons1.2.17.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=f6b48236edef7d1d31fadc2b19014938
diff --git a/metadata/md5-cache/dev-java/commons-lang-3.12.0 b/metadata/md5-cache/dev-java/commons-lang-3.12.0
index e0b156264dee..869896c91298 100644
--- a/metadata/md5-cache/dev-java/commons-lang-3.12.0
+++ b/metadata/md5-cache/dev-java/commons-lang-3.12.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.6
 SRC_URI=mirror://apache/commons/lang/source/commons-lang3-3.12.0-src.tar.gz -> commons-lang-3.12.0-sources.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8c91cc1d0458203f6d62f3d899d2c212
diff --git a/metadata/md5-cache/dev-java/commons-math-3.6.1-r2 b/metadata/md5-cache/dev-java/commons-math-3.6.1-r2
index aa27ab315f4e..3ff7bb27edb3 100644
--- a/metadata/md5-cache/dev-java/commons-math-3.6.1-r2
+++ b/metadata/md5-cache/dev-java/commons-math-3.6.1-r2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=https://repo1.maven.org/maven2/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=1fd4d625058082bf003538d4bdbbc790
diff --git a/metadata/md5-cache/dev-java/commons-net-3.9.0 b/metadata/md5-cache/dev-java/commons-net-3.9.0
index eb4bc3d1fe9a..4bb0269ce0c4 100644
--- a/metadata/md5-cache/dev-java/commons-net-3.9.0
+++ b/metadata/md5-cache/dev-java/commons-net-3.9.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/net/source/commons-net-3.9.0-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/net/source/commons-net-3.9.0-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=dcce41fb3acf31b61d97c118010bc1a3
diff --git a/metadata/md5-cache/dev-java/commons-nullanalysis-1.2.17 b/metadata/md5-cache/dev-java/commons-nullanalysis-1.2.17
index 33f027259270..be2fffb33dc8 100644
--- a/metadata/md5-cache/dev-java/commons-nullanalysis-1.2.17
+++ b/metadata/md5-cache/dev-java/commons-nullanalysis-1.2.17
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/aunkrig/commons/archive/V1.2.17.tar.gz -> unkrig-commons1.2.17.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=b83918bf0874a5e01d61969486095419
diff --git a/metadata/md5-cache/dev-java/commons-text-1.10.0 b/metadata/md5-cache/dev-java/commons-text-1.10.0
index 2269b185f09c..2016c3da82fe 100644
--- a/metadata/md5-cache/dev-java/commons-text-1.10.0
+++ b/metadata/md5-cache/dev-java/commons-text-1.10.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/commons-lang:3.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache//commons/text/source/commons-text-1.10.0-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=172fcf75d090f02f6c1633d2d3ab5e05
diff --git a/metadata/md5-cache/dev-java/commons-validator-1.7 b/metadata/md5-cache/dev-java/commons-validator-1.7
index ceb94cf4ed72..145aec21d696 100644
--- a/metadata/md5-cache/dev-java/commons-validator-1.7
+++ b/metadata/md5-cache/dev-java/commons-validator-1.7
@@ -11,5 +11,5 @@ RDEPEND=dev-java/commons-beanutils:1.7 dev-java/commons-digester:2.1 dev-java/co
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/validator/source/commons-validator-1.7-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=77e3c85c5463e21f4a84ecf440783bc6
diff --git a/metadata/md5-cache/dev-java/conversant-disruptor-1.2.20 b/metadata/md5-cache/dev-java/conversant-disruptor-1.2.20
index 6fe172710c1a..d38b9374000c 100644
--- a/metadata/md5-cache/dev-java/conversant-disruptor-1.2.20
+++ b/metadata/md5-cache/dev-java/conversant-disruptor-1.2.20
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/conversant/disruptor/archive/1.2.20.tar.gz -> conversant-disruptor-1.2.20.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=7dfbbc14f3b4d030fa22ed4419b26518
diff --git a/metadata/md5-cache/dev-java/dom4j-2.1.3 b/metadata/md5-cache/dev-java/dom4j-2.1.3
index f524f24e80ae..4166acf44327 100644
--- a/metadata/md5-cache/dev-java/dom4j-2.1.3
+++ b/metadata/md5-cache/dev-java/dom4j-2.1.3
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jaxb-api:2 dev-java/xpp2:0 dev-java/xpp3:0 dev-java/xsdlib:0 ja
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/dom4j/dom4j/archive/refs/tags/version-2.1.3.tar.gz -> dom4j-2.1.3.tar.gz https://repo1.maven.org/maven2/jaxen/jaxen/1.2.0/jaxen-1.2.0.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=6b7b54ce52fe6dc61ec15e131c7cb961
diff --git a/metadata/md5-cache/dev-java/easymock-2.5.2 b/metadata/md5-cache/dev-java/easymock-2.5.2
index 3f58ace7d2cb..e83bdad24600 100644
--- a/metadata/md5-cache/dev-java/easymock-2.5.2
+++ b/metadata/md5-cache/dev-java/easymock-2.5.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=2.5
 SRC_URI=https://github.com/easymock/easymock/archive/easymock-2.5.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=6596ee8a8359d0683a88aa56a853df16
diff --git a/metadata/md5-cache/dev-java/easymock-3.3.1-r1 b/metadata/md5-cache/dev-java/easymock-3.3.1-r1
index c3f54a54c9f0..02130b0f8fab 100644
--- a/metadata/md5-cache/dev-java/easymock-3.3.1-r1
+++ b/metadata/md5-cache/dev-java/easymock-3.3.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/cglib:3 dev-java/junit:4 dev-java/objenesis
 RESTRICT=!test? ( test )
 SLOT=3.2
 SRC_URI=https://github.com/easymock/easymock/archive/refs/tags/easymock-3.3.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8756a40188a88794646f84faaea90d85
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.15 b/metadata/md5-cache/dev-java/eclipse-ecj-4.15
index 8eba2f32dbf9..21b36931ba6f 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.15
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.15
@@ -11,5 +11,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.15 )
 RDEPEND=app-eselect/eselect-java dev-java/ant-core:0 virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.15
 SRC_URI=https://archive.eclipse.org/eclipse/downloads/drops4/R-4.15-202003050155/ecjsrc-4.15.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=05f6212f9979277996675e568acca2f3
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.22-r1 b/metadata/md5-cache/dev-java/eclipse-ecj-4.22-r1
index 9dc6dbe1b177..a04f9d5a645c 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.22-r1
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.22-r1
@@ -11,5 +11,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.22 )
 RDEPEND=app-eselect/eselect-java dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.22
 SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/ecjsrc-4.22.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=631d5cd55d963525b62dcecdd68515dd
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.25 b/metadata/md5-cache/dev-java/eclipse-ecj-4.25
index 920ed4c790a2..0d08fd84db9e 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.25
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.25
@@ -11,5 +11,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.25 )
 RDEPEND=app-eselect/eselect-java dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.25
 SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.25-202208311800/ecjsrc-4.25.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=231a2375b5786afdeacde104787676b9
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.26 b/metadata/md5-cache/dev-java/eclipse-ecj-4.26
index 1af72093155f..015edcb647f7 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.26
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.26
@@ -11,5 +11,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.26 )
 RDEPEND=app-eselect/eselect-java dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.26
 SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.26-202211231800/ecjsrc-4.26.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=eca1dd14ee8157fad7e6d509c0935fff
diff --git a/metadata/md5-cache/dev-java/error-prone-annotations-2.16 b/metadata/md5-cache/dev-java/error-prone-annotations-2.16
index b2f920084bb4..4737c27fbd21 100644
--- a/metadata/md5-cache/dev-java/error-prone-annotations-2.16
+++ b/metadata/md5-cache/dev-java/error-prone-annotations-2.16
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/google/error-prone/archive/v2.16.tar.gz -> error-prone-2.16.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=55bb72f733ad3d4d757502160948de14
diff --git a/metadata/md5-cache/dev-java/failureaccess-30.1.1 b/metadata/md5-cache/dev-java/failureaccess-30.1.1
index 9d393164863c..fc944c0acd4d 100644
--- a/metadata/md5-cache/dev-java/failureaccess-30.1.1
+++ b/metadata/md5-cache/dev-java/failureaccess-30.1.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://codeload.github.com/google/guava/tar.gz/refs/tags/v30.1.1 -> guava-30.1.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=d6db1f05beb39924e4e2962ca8ff6226
diff --git a/metadata/md5-cache/dev-java/fastinfoset-2.1.0-r1 b/metadata/md5-cache/dev-java/fastinfoset-2.1.0-r1
index 52f74735b9cd..9be1ce540bb9 100644
--- a/metadata/md5-cache/dev-java/fastinfoset-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/fastinfoset-2.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-fi/archive/2.1.0.tar.gz -> fastinfoset-2.1.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=b93a01473a3b85d97ac919e1f953a169
diff --git a/metadata/md5-cache/dev-java/felix-framework-7.0.5-r1 b/metadata/md5-cache/dev-java/felix-framework-7.0.5-r1
index d58780100486..832cd98a8cb0 100644
--- a/metadata/md5-cache/dev-java/felix-framework-7.0.5-r1
+++ b/metadata/md5-cache/dev-java/felix-framework-7.0.5-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/animal-sniffer-annotations:0 >=dev-java/jav
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.framework-7.0.5-source-release.tar.gz -> felix-framework-7.0.5.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=49595e311a7193698e526e1948b54bb9
diff --git a/metadata/md5-cache/dev-java/felix-main-7.0.5-r1 b/metadata/md5-cache/dev-java/felix-main-7.0.5-r1
index ba122bd29f0d..7617fb8c2f01 100644
--- a/metadata/md5-cache/dev-java/felix-main-7.0.5-r1
+++ b/metadata/md5-cache/dev-java/felix-main-7.0.5-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/felix-framework-7.0.5:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.main-7.0.5-source-release.tar.gz -> felix-main-7.0.5.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=9f95cadccc5e4d0542f6a660c1f5f031
diff --git a/metadata/md5-cache/dev-java/felix-resolver-2.0.4 b/metadata/md5-cache/dev-java/felix-resolver-2.0.4
index 9c4ce887a20f..ed7e0cda7a9f 100644
--- a/metadata/md5-cache/dev-java/felix-resolver-2.0.4
+++ b/metadata/md5-cache/dev-java/felix-resolver-2.0.4
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/osgi-annotation:0 dev-java/osgi-core:0 >=de
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.resolver-2.0.4-source-release.tar.gz -> felix-resolver-2.0.4.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=9a1fcc33ad98ef2cbf72ca5d7bd563de
diff --git a/metadata/md5-cache/dev-java/felix-utils-1.11.8 b/metadata/md5-cache/dev-java/felix-utils-1.11.8
index 89285c9bf2e9..64874389a031 100644
--- a/metadata/md5-cache/dev-java/felix-utils-1.11.8
+++ b/metadata/md5-cache/dev-java/felix-utils-1.11.8
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.utils-1.11.8-source-release.tar.gz -> felix-utils-1.11.8.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=1a8a5146cec6987efa2cac823f952c23
diff --git a/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1 b/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1
index 3153414a46c0..af5d318e8f02 100644
--- a/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1
+++ b/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1
@@ -11,5 +11,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/jsr305-3.0.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/google/code/findbugs/findbugs-annotations/3.0.1/findbugs-annotations-3.0.1-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=6c535dd2eb7bf22f692a9291758ff87b
diff --git a/metadata/md5-cache/dev-java/fishbowl-1.4.1 b/metadata/md5-cache/dev-java/fishbowl-1.4.1
index 1682103d0637..2eaba011e4f4 100644
--- a/metadata/md5-cache/dev-java/fishbowl-1.4.1
+++ b/metadata/md5-cache/dev-java/fishbowl-1.4.1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/stefanbirkner/fishbowl/archive/fishbowl-1.4.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=7926431a9c1ad7f82f68dfb45fabc973
diff --git a/metadata/md5-cache/dev-java/fontbox-2.0.27 b/metadata/md5-cache/dev-java/fontbox-2.0.27
index 5ddb44fd4e57..90ca15d150dc 100644
--- a/metadata/md5-cache/dev-java/fontbox-2.0.27
+++ b/metadata/md5-cache/dev-java/fontbox-2.0.27
@@ -12,5 +12,5 @@ RDEPEND=dev-java/commons-logging:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/pdfbox/2.0.27/pdfbox-2.0.27-src.zip test? ( https://issues.apache.org/jira/secure/attachment/12684264/SourceSansProBold.otf https://issues.apache.org/jira/secure/attachment/12896461/NotoEmoji-Regular.ttf https://issues.apache.org/jira/secure/attachment/12809395/DejaVuSansMono.ttf https://issues.apache.org/jira/secure/attachment/13036376/NotoSansSC-Regular.otf https://mirrors.ctan.org/fonts/opensans/type1/OpenSans-Regular.pfb )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=beabd835debe0df66cdc641ad9f639b3
diff --git a/metadata/md5-cache/dev-java/fop-2.7 b/metadata/md5-cache/dev-java/fop-2.7
index ecedfb611925..2e2e6ddaf4cc 100644
--- a/metadata/md5-cache/dev-java/fop-2.7
+++ b/metadata/md5-cache/dev-java/fop-2.7
@@ -11,5 +11,5 @@ RDEPEND=dev-java/batik:1.14 dev-java/commons-io:1 dev-java/fontbox:0 dev-java/qd
 RESTRICT=!test? ( test )
 SLOT=2.7
 SRC_URI=mirror://apache/xmlgraphics/fop/source/fop-2.7-src.tar.gz https://dev.gentoo.org/~flow/distfiles/fop/fop-2.7-jars.tar.xz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=36f2a45a101f85662f10d4281493ee8e
diff --git a/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r4 b/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r4
index e49b71b4bd61..d5746718e2af 100644
--- a/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r4
+++ b/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r4
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/java-getopt:1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gentoo/gnu-regexp-1.1.4.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=3e2b517468bb0aaf8aa31524c2242598
diff --git a/metadata/md5-cache/dev-java/greenmail-2.0.0_alpha2 b/metadata/md5-cache/dev-java/greenmail-2.0.0_alpha2
index fb6368787db4..d2c45668cf3f 100644
--- a/metadata/md5-cache/dev-java/greenmail-2.0.0_alpha2
+++ b/metadata/md5-cache/dev-java/greenmail-2.0.0_alpha2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-activation-api:2 dev-java/jakarta-mail:0 dev-java/junit:4 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/greenmail-mail-test/greenmail/archive/release-2.0.0-alpha-2.tar.gz -> greenmail-2.0.0_alpha2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=b9df8132f54d1cc77e67c59f605680b2
diff --git a/metadata/md5-cache/dev-java/gson-2.9.1 b/metadata/md5-cache/dev-java/gson-2.9.1
index 1f0e083b1d18..49fad5c400ee 100644
--- a/metadata/md5-cache/dev-java/gson-2.9.1
+++ b/metadata/md5-cache/dev-java/gson-2.9.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=2.6
 SRC_URI=https://github.com/google/gson/archive/gson-parent-2.9.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=1c98b14925b26986c54e071aff180697
diff --git a/metadata/md5-cache/dev-java/guava-31.1 b/metadata/md5-cache/dev-java/guava-31.1
index 02c0a871ce8b..58f2a7e8ccfa 100644
--- a/metadata/md5-cache/dev-java/guava-31.1
+++ b/metadata/md5-cache/dev-java/guava-31.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/checker-framework-qual-3.14.0:0 >=dev-java/error-prone-annotations-2.16:0 >=dev-java/failureaccess-30.1.1:0 >=dev-java/j2objc-annotations-2.8:0 >=dev-java/jsr305-3.0.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/google/guava/archive/v31.1.tar.gz -> guava-31.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=3c4311d3d6638d5cdbfff7183ba23482
diff --git a/metadata/md5-cache/dev-java/guava-testlib-31.1 b/metadata/md5-cache/dev-java/guava-testlib-31.1
index a0f9aa170e12..9f07ada70dfe 100644
--- a/metadata/md5-cache/dev-java/guava-testlib-31.1
+++ b/metadata/md5-cache/dev-java/guava-testlib-31.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/checker-framework-qual:0 dev-java/error-prone-annotations:0 ~dev-java/guava-31.1:0 dev-java/j2objc-annotations:0 dev-java/jsr305:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/google/guava/archive/v31.1.tar.gz -> guava-31.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=4c6a995db14bd05a7bb35a4b0a251461
diff --git a/metadata/md5-cache/dev-java/guice-5.1.0 b/metadata/md5-cache/dev-java/guice-5.1.0
index 21a6766b6754..c3bbc1077349 100644
--- a/metadata/md5-cache/dev-java/guice-5.1.0
+++ b/metadata/md5-cache/dev-java/guice-5.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/aopalliance:1 dev-java/asm:9 dev-java/guava
 RESTRICT=test !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/google/guice/archive/5.1.0.tar.gz -> guice-5.1.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=685cafffd922ef9f81fe437e0f590464
diff --git a/metadata/md5-cache/dev-java/hamcrest-2.2 b/metadata/md5-cache/dev-java/hamcrest-2.2
index fd1eb4b5ec3c..1e06da143e51 100644
--- a/metadata/md5-cache/dev-java/hamcrest-2.2
+++ b/metadata/md5-cache/dev-java/hamcrest-2.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hamcrest/JavaHamcrest/archive/v2.2.tar.gz -> hamcrest-2.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=47d0acb6210acbce27298ff1935d1ac8
diff --git a/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4 b/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4
index aff4b83bc840..69b3f448fdf3 100644
--- a/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4
+++ b/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-1.1.tar.gz -> hamcrest-core-1.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=256f3602ef99cd08a39d6f66f124e7aa
diff --git a/metadata/md5-cache/dev-java/hamcrest-core-1.3-r3 b/metadata/md5-cache/dev-java/hamcrest-core-1.3-r3
index 435a0a41b771..5428ac4f3a4b 100644
--- a/metadata/md5-cache/dev-java/hamcrest-core-1.3-r3
+++ b/metadata/md5-cache/dev-java/hamcrest-core-1.3-r3
@@ -11,5 +11,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-1.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=5f6f53542f0b38b80d70c6316ae7ce8f
diff --git a/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r4 b/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r4
index 7bedd3d6a55e..a04d5dc36214 100644
--- a/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r4
+++ b/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r4
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* dev-java/qdox:1.12 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-1.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=82c4192babddf478374f5cab7cca984d
diff --git a/metadata/md5-cache/dev-java/hamcrest-library-1.3-r3 b/metadata/md5-cache/dev-java/hamcrest-library-1.3-r3
index 9b7558412f2c..d164d7457c03 100644
--- a/metadata/md5-cache/dev-java/hamcrest-library-1.3-r3
+++ b/metadata/md5-cache/dev-java/hamcrest-library-1.3-r3
@@ -11,5 +11,5 @@ LICENSE=BSD-2
 RDEPEND=dev-java/hamcrest-core:1.3 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-1.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=5cc69385ac64a49c82035e357d933a72
diff --git a/metadata/md5-cache/dev-java/hawtjni-runtime-1.18 b/metadata/md5-cache/dev-java/hawtjni-runtime-1.18
index 214dd1192166..650a02fa8b3d 100644
--- a/metadata/md5-cache/dev-java/hawtjni-runtime-1.18
+++ b/metadata/md5-cache/dev-java/hawtjni-runtime-1.18
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/fusesource/hawtjni/archive/hawtjni-project-1.18.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=4124437359740c8d9cb9da5c6f7fb6ec
diff --git a/metadata/md5-cache/dev-java/htmlcleaner-2.26 b/metadata/md5-cache/dev-java/htmlcleaner-2.26
index c448aca21507..482bced1f411 100644
--- a/metadata/md5-cache/dev-java/htmlcleaner-2.26
+++ b/metadata/md5-cache/dev-java/htmlcleaner-2.26
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jdom:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 sour
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/htmlcleaner/htmlcleaner/htmlcleaner%20v2.26/htmlcleaner-2.26-src.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8e7fc31f99f05f7c15a65a1edc87ad8d
diff --git a/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r1 b/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r1
index 8317530dfd4a..73abdf4dd301 100644
--- a/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r1
+++ b/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/commons-codec:0 dev-java/commons-logging:0 dev-java/httpcore:0
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-4.5.13-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=bb83a3c6a052302645f9eefbde882a6d
diff --git a/metadata/md5-cache/dev-java/httpcore-4.4.14 b/metadata/md5-cache/dev-java/httpcore-4.4.14
index 05ebc97288e7..78b8e4311375 100644
--- a/metadata/md5-cache/dev-java/httpcore-4.4.14
+++ b/metadata/md5-cache/dev-java/httpcore-4.4.14
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-4.4.14-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=98ecdd55b66865a821b1bdfbd1cd4777
diff --git a/metadata/md5-cache/dev-java/icu4j-72.1 b/metadata/md5-cache/dev-java/icu4j-72.1
index 561bc2fc16dd..2009b82c39e7 100644
--- a/metadata/md5-cache/dev-java/icu4j-72.1
+++ b/metadata/md5-cache/dev-java/icu4j-72.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=70
 SRC_URI=https://github.com/unicode-org/icu/archive/refs/tags/release-72-1.tar.gz -> icu-72.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=e21ef841ad89e488a1b640105f7feaa5
diff --git a/metadata/md5-cache/dev-java/injection-api-2.0.1 b/metadata/md5-cache/dev-java/injection-api-2.0.1
index 7b756a1e2a00..edb2c817c31f 100644
--- a/metadata/md5-cache/dev-java/injection-api-2.0.1
+++ b/metadata/md5-cache/dev-java/injection-api-2.0.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/injection-api/archive/2.0.1.tar.gz -> injection-api-2.0.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=70ee83e00158f1bb21c72545d2f43857
diff --git a/metadata/md5-cache/dev-java/iso-relax-20050331-r5 b/metadata/md5-cache/dev-java/iso-relax-20050331-r5
index e01c5f758a08..5a78570da17e 100644
--- a/metadata/md5-cache/dev-java/iso-relax-20050331-r5
+++ b/metadata/md5-cache/dev-java/iso-relax-20050331-r5
@@ -11,5 +11,5 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/iso-relax-20050331.tar.bz2
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=a84f38d6a933e9fd22f734b3820885cc
diff --git a/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1 b/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1
index e9f6ce8dc2c7..f7d8d2f26625 100644
--- a/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1
+++ b/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-istack-commons/archive/4.1.1.tar.gz -> jaxb-istack-commons-istack-commons-runtime-4.1.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=c4d9deeb2ade4e71cae767046f3da2a1
diff --git a/metadata/md5-cache/dev-java/j2objc-annotations-2.8 b/metadata/md5-cache/dev-java/j2objc-annotations-2.8
index e068e8aa2f1c..8462c4cd496c 100644
--- a/metadata/md5-cache/dev-java/j2objc-annotations-2.8
+++ b/metadata/md5-cache/dev-java/j2objc-annotations-2.8
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/google/j2objc/archive/2.8.tar.gz -> j2objc-2.8.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=f9c8f7f050feb6ce0924b131ebee4d5e
diff --git a/metadata/md5-cache/dev-java/jackcess-4.0.0 b/metadata/md5-cache/dev-java/jackcess-4.0.0
index 4b676a7c7bbd..14f36d6cb9d9 100644
--- a/metadata/md5-cache/dev-java/jackcess-4.0.0
+++ b/metadata/md5-cache/dev-java/jackcess-4.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-lang-3.11:3.6 >=dev-java/commons-
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/jahlborn/jackcess/archive/refs/tags/jackcess-4.0.0.tar.gz -> jackcess-4.0.0-sources.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=fd99cefd0c2a4a69979b4f073dad2243
diff --git a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r3 b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r3
index 4df40ba9c465..81f7ae40a5f8 100644
--- a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r3
+++ b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r3
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/bndlib:0 dev-java/slf4j-api:0 dev-java/slf4
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/jackrabbit/2.10.1/jackrabbit-2.10.1-src.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8d15c4e0f6ad1bf14b3e7aa0cff332c8
diff --git a/metadata/md5-cache/dev-java/jackson-annotations-2.13.4 b/metadata/md5-cache/dev-java/jackson-annotations-2.13.4
index a335d27a0da4..267cf75213f5 100644
--- a/metadata/md5-cache/dev-java/jackson-annotations-2.13.4
+++ b/metadata/md5-cache/dev-java/jackson-annotations-2.13.4
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-annotations/archive/jackson-annotations-2.13.4.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=01744e32eb429a6bdb099cdd01148416
diff --git a/metadata/md5-cache/dev-java/jackson-core-2.13.4 b/metadata/md5-cache/dev-java/jackson-core-2.13.4
index 9aed3f30ec40..128a60e085c9 100644
--- a/metadata/md5-cache/dev-java/jackson-core-2.13.4
+++ b/metadata/md5-cache/dev-java/jackson-core-2.13.4
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-core/archive/jackson-core-2.13.4.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=27d6ce84bbecfa62c456d0dff55d15ac
diff --git a/metadata/md5-cache/dev-java/jackson-databind-2.13.4.1 b/metadata/md5-cache/dev-java/jackson-databind-2.13.4.1
index 190bf878a984..2e6c7314910d 100644
--- a/metadata/md5-cache/dev-java/jackson-databind-2.13.4.1
+++ b/metadata/md5-cache/dev-java/jackson-databind-2.13.4.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.4:2 ~dev-java/jackson-core-2.13.4:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-databind/archive/jackson-databind-2.13.4.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=1beae1ec3e358073c387e888ab7c5c79
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.4-r1 b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.4-r1
index 204788817932..ceb2fb72eb67 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.4-r1
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.4-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.4:2 ~dev-java/jac
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.13.4.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=a556215f64a068c6ff8526cdaf42f060
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.4-r1 b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.4-r1
index fd67bd036c7b..431278451e6b 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.4-r1
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.4-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-2.13.4.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=23becb40922325710ba33cc37a83046e
diff --git a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.4-r1 b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.4-r1
index 0b18425aeb80..164668920d8a 100644
--- a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.4-r1
+++ b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.4-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.4:2 ~dev-java/jac
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-2.13.4.tar.gz -> jackson-module-jakarta-xmlbind-2.13.4.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=c7e07827ca3d7f9ab81ce2586209c9a7
diff --git a/metadata/md5-cache/dev-java/jacl-1.4.1-r2 b/metadata/md5-cache/dev-java/jacl-1.4.1-r2
index ebb92e2e1c05..e2b870dddf1b 100644
--- a/metadata/md5-cache/dev-java/jacl-1.4.1-r2
+++ b/metadata/md5-cache/dev-java/jacl-1.4.1-r2
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/tcl-8.4.5:* >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/tcljava/jacl/1.4.1/jacl1.4.1.tar.gz -> jacl-1.4.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=2b2f769227fc69a612651c02ccdd38b5
diff --git a/metadata/md5-cache/dev-java/jai-imageio-core-1.4.0 b/metadata/md5-cache/dev-java/jai-imageio-core-1.4.0
index a871bffa7bb8..ba216eb4d149 100644
--- a/metadata/md5-cache/dev-java/jai-imageio-core-1.4.0
+++ b/metadata/md5-cache/dev-java/jai-imageio-core-1.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jai-imageio/jai-imageio-core/archive/refs/tags/jai-imageio-core-1.4.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=e5cd2fcf459b16f769f8d218ff456f1e
diff --git a/metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.0 b/metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.0
index 96e504a56414..10e5f2607ae6 100644
--- a/metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.0
+++ b/metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.0
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jai-imageio-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jai-imageio/jai-imageio-jpeg2000/archive/refs/tags/jai-imageio-jpeg2000-1.4.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=29d1ba28d03d99db56ce402c2535dff7
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r1 b/metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r1
index 2aaa78522a20..5e9a37dbc5e8 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r1
+++ b/metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r1
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
 RDEPEND=dev-java/jakarta-activation-api:1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://github.com/eclipse-ee4j/jaf/archive/1.2.2.tar.gz -> jakarta-activation-1.2.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=b99f05dd12cac00e435ee47ecf965e4d
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-2.0.1-r1 b/metadata/md5-cache/dev-java/jakarta-activation-2.0.1-r1
index 96e973ae9cba..5ee1245b4e47 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-2.0.1-r1
+++ b/metadata/md5-cache/dev-java/jakarta-activation-2.0.1-r1
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/eclipse-ee4j/jaf/archive/2.0.1.tar.gz -> jakarta-activation-2.0.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=93e0c276aeccbc963839590ab4f681d9
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r1 b/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r1
index 65e46902502a..488195bb71c6 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r1
+++ b/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r1
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://github.com/eclipse-ee4j/jaf/archive/1.2.2.tar.gz -> jakarta-activation-api-1.2.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=c34af806732c7e489f11860f6501ea3a
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0-r1 b/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0-r1
index 7967bf74eec2..5cc82d54a44b 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0-r1
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/eclipse-ee4j/jaf/archive/2.1.0.tar.gz -> jakarta-activation-2.1.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=1ab8555b3a957d389e447120417be772
diff --git a/metadata/md5-cache/dev-java/jakarta-annotations-api-2.1.1 b/metadata/md5-cache/dev-java/jakarta-annotations-api-2.1.1
index a8ae80950bc9..edcf8980fdfa 100644
--- a/metadata/md5-cache/dev-java/jakarta-annotations-api-2.1.1
+++ b/metadata/md5-cache/dev-java/jakarta-annotations-api-2.1.1
@@ -10,5 +10,5 @@ LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/common-annotations-api/archive/2.1.1.tar.gz -> jakarta-annotations-api-2.1.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=ad8892a8f51d782522e4f2249619a388
diff --git a/metadata/md5-cache/dev-java/jakarta-el-api-5.0.1-r1 b/metadata/md5-cache/dev-java/jakarta-el-api-5.0.1-r1
index d59bb3d077ad..a0b8193b4304 100644
--- a/metadata/md5-cache/dev-java/jakarta-el-api-5.0.1-r1
+++ b/metadata/md5-cache/dev-java/jakarta-el-api-5.0.1-r1
@@ -10,5 +10,5 @@ LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=5.0
 SRC_URI=https://github.com/jakartaee/expression-language/archive/5.0.1-RELEASE-api.tar.gz -> jakarta-el-api-5.0.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=07fa9f90f0e0056d7914119cd29e1324
diff --git a/metadata/md5-cache/dev-java/jakarta-interceptors-2.1.0 b/metadata/md5-cache/dev-java/jakarta-interceptors-2.1.0
index 3f0d8d0eb208..6c0f5800869a 100644
--- a/metadata/md5-cache/dev-java/jakarta-interceptors-2.1.0
+++ b/metadata/md5-cache/dev-java/jakarta-interceptors-2.1.0
@@ -10,5 +10,5 @@ LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/interceptors/archive/2.1.0-RELEASE.tar.gz -> jakarta-interceptors-2.1.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=52a655ead01220649dc1647d958d5827
diff --git a/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6-r1 b/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6-r1
index ae3352f4a7b3..3685347958e0 100644
--- a/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6-r1
+++ b/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6-r1
@@ -10,5 +10,5 @@ LICENSE=|| ( EPL-2.0 GPL-2-with-classpath-exception )
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://github.com/eclipse-ee4j/jsonp/archive/1.1-1.1.6-RELEASE.tar.gz -> jakarta-json-api-1.1.6.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=16e7a8330d20712e4a37c8dfb8291e1f
diff --git a/metadata/md5-cache/dev-java/jakarta-mail-2.0.1 b/metadata/md5-cache/dev-java/jakarta-mail-2.0.1
index c3a8e5a05a33..09bbfd3e4ed7 100644
--- a/metadata/md5-cache/dev-java/jakarta-mail-2.0.1
+++ b/metadata/md5-cache/dev-java/jakarta-mail-2.0.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-activation:2 >=dev-java/java-config
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/mail-api/archive/2.0.1.tar.gz -> jakarta-mail-2.0.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8cdd8992109772f04714d6e851383ff6
diff --git a/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.0-r1 b/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.0-r1
index 558123b21167..3baa04942027 100644
--- a/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/mail/archive/2.1.0.tar.gz -> jakarta-mail-api-2.1.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=0810dff242e2f1357599c43528311fad
diff --git a/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r5 b/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r5
index 522da0988e3a..bde3d3e828f7 100644
--- a/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r5
+++ b/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r5
@@ -10,5 +10,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.0
 SRC_URI=https://archive.apache.org/dist/jakarta/oro/jakarta-oro-2.0.8.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=3ae2e6df0f95075b5e750e7dae925af4
diff --git a/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3 b/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3
index d58da9c777e2..35ee20ebd185 100644
--- a/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3
+++ b/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3
@@ -10,5 +10,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.4
 SRC_URI=mirror://apache/jakarta/regexp/source/jakarta-regexp-1.4.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=4715ec34bfa34c1bcc3f2b1d512e12e1
diff --git a/metadata/md5-cache/dev-java/jakarta-servlet-api-4.0.4 b/metadata/md5-cache/dev-java/jakarta-servlet-api-4.0.4
index dd42a47ceae5..5a1f3986d4ac 100644
--- a/metadata/md5-cache/dev-java/jakarta-servlet-api-4.0.4
+++ b/metadata/md5-cache/dev-java/jakarta-servlet-api-4.0.4
@@ -10,5 +10,5 @@ LICENSE=|| ( GPL-2 GPL-2-with-classpath-exception )
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=https://github.com/jakartaee/servlet/archive/4.0.4-RELEASE.tar.gz -> jakarta-servlet-api-4.0.4-RELEASE.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=f896dde4a1aa06afdf3cc58cb1ec6b6c
diff --git a/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0 b/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0
index af910f8c1e07..6f5a90ff38a9 100644
--- a/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0
+++ b/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0
@@ -10,5 +10,5 @@ LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=6
 SRC_URI=https://github.com/jakartaee/servlet/archive/6.0.0-RELEASE.tar.gz -> jakarta-servlet-api-6.0.0-RELEASE.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=a2e13785d9e40e2220de63b1b386fda0
diff --git a/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r1 b/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r1
index 9320e6337b9b..dcbf171bb504 100644
--- a/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r1
+++ b/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/jakarta-activation-api-1.2.2-r1:1 >=dev-j
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/jakartaee/saaj-api/archive/1.4.2.tar.gz -> jakarta-xml-soap-api-1.4.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8212132e29f76e010a845b20bd15d1a2
diff --git a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.6 b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.6
index 44a4a502dbf5..57bc40e6b183 100644
--- a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.6
+++ b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.6
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 >=dev-java/bcel-6.6.0:0 >=dev-ja
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/tomcat/jakartaee-migration/v1.0.6/source/jakartaee-migration-1.0.6-src.tar.gz -> jakartaee-migration-1.0.6-sources.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=2a62c65d2ff167ad3b5d52dffc45b386
diff --git a/metadata/md5-cache/dev-java/jal-20031117-r6 b/metadata/md5-cache/dev-java/jal-20031117-r6
index 35d3fd022d16..ab44354028b8 100644
--- a/metadata/md5-cache/dev-java/jal-20031117-r6
+++ b/metadata/md5-cache/dev-java/jal-20031117-r6
@@ -10,5 +10,5 @@ LICENSE=HPND
 RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/jal-20031117.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=c8457e8bbe91555b895391aab6235604
diff --git a/metadata/md5-cache/dev-java/janino-3.1.7 b/metadata/md5-cache/dev-java/janino-3.1.7
index 8156f0dbc757..5cd16bb4f2f8 100644
--- a/metadata/md5-cache/dev-java/janino-3.1.7
+++ b/metadata/md5-cache/dev-java/janino-3.1.7
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/janino-compiler/janino/archive/v3.1.7.tar.gz -> janino-3.1.7.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=7a96833bceb5c0e26b9ef0a7c97261f2
diff --git a/metadata/md5-cache/dev-java/janino-3.1.8 b/metadata/md5-cache/dev-java/janino-3.1.8
index 8a7eb8b49f54..db03f8b5751e 100644
--- a/metadata/md5-cache/dev-java/janino-3.1.8
+++ b/metadata/md5-cache/dev-java/janino-3.1.8
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/janino-compiler/janino/archive/v3.1.8.tar.gz -> janino-3.1.8.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=54c33442dc1cc8f3f47cf711f67a3316
diff --git a/metadata/md5-cache/dev-java/jansi-1.13 b/metadata/md5-cache/dev-java/jansi-1.13
index 7c6d8330072d..db2de709d79f 100644
--- a/metadata/md5-cache/dev-java/jansi-1.13
+++ b/metadata/md5-cache/dev-java/jansi-1.13
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jansi-native:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fusesource/jansi/archive/jansi-project-1.13.tar.gz -> jansi-1.13.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=ee1233c04a41ea2639d3127438b6cc82
diff --git a/metadata/md5-cache/dev-java/jansi-2.4.0-r1 b/metadata/md5-cache/dev-java/jansi-2.4.0-r1
index 8aaefca7a5ac..f574f5e6039f 100644
--- a/metadata/md5-cache/dev-java/jansi-2.4.0-r1
+++ b/metadata/md5-cache/dev-java/jansi-2.4.0-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/fusesource/jansi/archive/refs/tags/jansi-2.4.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7c3b952cdf55a9fb767e8b28506fb677
diff --git a/metadata/md5-cache/dev-java/jansi-native-1.8 b/metadata/md5-cache/dev-java/jansi-native-1.8
index d9384df5cbb5..8a150cb50b81 100644
--- a/metadata/md5-cache/dev-java/jansi-native-1.8
+++ b/metadata/md5-cache/dev-java/jansi-native-1.8
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/hawtjni-runtime:0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/fusesource/jansi-native/archive/jansi-native-1.8.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
 _md5_=758fbbc82194cc75be177b62685c36a1
diff --git a/metadata/md5-cache/dev-java/java-dep-check-0.5 b/metadata/md5-cache/dev-java/java-dep-check-0.5
index 2d8c63986eea..f3b0246b6fcb 100644
--- a/metadata/md5-cache/dev-java/java-dep-check-0.5
+++ b/metadata/md5-cache/dev-java/java-dep-check-0.5
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* dev-java/commons-cli:1 dev-java/asm:4 >=dev-java/java-config-2.2.0-r3
 SLOT=0
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=f1e7c2d211ebef2a07d44c9226e5a9e8
diff --git a/metadata/md5-cache/dev-java/java-dep-check-0.5-r1 b/metadata/md5-cache/dev-java/java-dep-check-0.5-r1
index ee2fbc4ec0d0..2025223e0394 100644
--- a/metadata/md5-cache/dev-java/java-dep-check-0.5-r1
+++ b/metadata/md5-cache/dev-java/java-dep-check-0.5-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* dev-java/commons-cli:1 dev-java/asm:9 >=dev-java/java-config-2.2.0-r3
 SLOT=0
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8f0145075fda168338e0666f71030b4f
diff --git a/metadata/md5-cache/dev-java/java-diff-utils-1.3.0 b/metadata/md5-cache/dev-java/java-diff-utils-1.3.0
index 5e8f8c29e80d..941f495a820d 100644
--- a/metadata/md5-cache/dev-java/java-diff-utils-1.3.0
+++ b/metadata/md5-cache/dev-java/java-diff-utils-1.3.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/googlecode/java-diff-utils/diffutils/1.3.0/diffutils-1.3.0-sources.jar -> java-diff-utils-1.3.0-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8a28218570abaa15bfa2f5a82611068b
diff --git a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50 b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50
index ef35f419757a..e49ba4d7e1a0 100644
--- a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50
+++ b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://download.tanukisoftware.com/wrapper/3.5.50/wrapper_3.5.50_src.tar.gz
-_eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2b94cb592f55e6627bbaede31c2872b6
diff --git a/metadata/md5-cache/dev-java/javassist-3.29.2 b/metadata/md5-cache/dev-java/javassist-3.29.2
index eb2e7b84ce37..e23e2a60719f 100644
--- a/metadata/md5-cache/dev-java/javassist-3.29.2
+++ b/metadata/md5-cache/dev-java/javassist-3.29.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/jboss-javassist/javassist/archive/rel_3_29_2_ga.tar.gz -> javassist-3.29.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8aece1c5cd2cf76569b48bab5d6df69e
diff --git a/metadata/md5-cache/dev-java/javax-el-api-2.2 b/metadata/md5-cache/dev-java/javax-el-api-2.2
new file mode 100644
index 000000000000..54d50211af23
--- /dev/null
+++ b/metadata/md5-cache/dev-java/javax-el-api-2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Expression Language API
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64
+LICENSE=CDDL GPL-2
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=2.2
+SRC_URI=https://repo1.maven.org/maven2/javax/el/el-api/2.2/el-api-2.2-sources.jar
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=6f83171823812e64c9860647e79f3e39
diff --git a/metadata/md5-cache/dev-java/javax-inject-1-r4 b/metadata/md5-cache/dev-java/javax-inject-1-r4
index e314ee95c615..4f7d2f1bc78e 100644
--- a/metadata/md5-cache/dev-java/javax-inject-1-r4
+++ b/metadata/md5-cache/dev-java/javax-inject-1-r4
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://central.maven.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar -> javax-inject-1.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=d3143b886eb166ae748f79f144ce16dd
diff --git a/metadata/md5-cache/dev-java/javax-jms-api-2.0.3 b/metadata/md5-cache/dev-java/javax-jms-api-2.0.3
index 09b8eb73b7c2..2be39906480a 100644
--- a/metadata/md5-cache/dev-java/javax-jms-api-2.0.3
+++ b/metadata/md5-cache/dev-java/javax-jms-api-2.0.3
@@ -10,5 +10,5 @@ LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/messaging/archive/2.0.3-RELEASE.tar.gz -> javax-jms-api-2.0.3-RELEASE.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=1ced834445483cce34ed735111921f4d
diff --git a/metadata/md5-cache/dev-java/javax-jsp-api-2.2 b/metadata/md5-cache/dev-java/javax-jsp-api-2.2
new file mode 100644
index 000000000000..2de90aee1d38
--- /dev/null
+++ b/metadata/md5-cache/dev-java/javax-jsp-api-2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/javax-el-api:2.2 dev-java/javax-servlet-api:2.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=JavaServer Pages(TM) API
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64
+LICENSE=CDDL GPL-2-with-classpath-exception
+RDEPEND=>=virtual/jre-1.8:* dev-java/javax-el-api:2.2 dev-java/javax-servlet-api:2.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=2.2
+SRC_URI=https://repo1.maven.org/maven2/javax/servlet/jsp/jsp-api/2.2/jsp-api-2.2-sources.jar
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=0d9f8ccc08e7b569b5632c5f17b5a21f
diff --git a/metadata/md5-cache/dev-java/javax-mail-1.6.7-r1 b/metadata/md5-cache/dev-java/javax-mail-1.6.7-r1
index 252bb9d57ab4..86e6ba2a59a4 100644
--- a/metadata/md5-cache/dev-java/javax-mail-1.6.7-r1
+++ b/metadata/md5-cache/dev-java/javax-mail-1.6.7-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/jakarta-activation-1.2.2:1 >=dev-java/jav
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/mail/archive/refs/tags/1.6.7.tar.gz -> javax-mail-1.6.7.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=4f2134451cece532730774e7a4819886
diff --git a/metadata/md5-cache/dev-java/javax-servlet-api-2.5 b/metadata/md5-cache/dev-java/javax-servlet-api-2.5
new file mode 100644
index 000000000000..81c4e3e25d47
--- /dev/null
+++ b/metadata/md5-cache/dev-java/javax-servlet-api-2.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=JavaServlet(TM) Specification
+EAPI=8
+HOMEPAGE=https://javaee.github.io/servlet-spec/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=CDDL GPL-2
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=2.5
+SRC_URI=https://repo1.maven.org/maven2/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=5b31379ed2103461f60945e3a677d88e
diff --git a/metadata/md5-cache/dev-java/jax-rpc-api-1.1.4 b/metadata/md5-cache/dev-java/jax-rpc-api-1.1.4
index 85528cf72f96..5f79a7de9387 100644
--- a/metadata/md5-cache/dev-java/jax-rpc-api-1.1.4
+++ b/metadata/md5-cache/dev-java/jax-rpc-api-1.1.4
@@ -10,5 +10,5 @@ LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-servlet-api:4 dev-java/jakarta-xml-soap-api:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/jax-rpc-api/archive/1.1.4.tar.gz -> jax-rpc-api-1.1.4.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=93115b51d085b42fa985f8bdd47e9f96
diff --git a/metadata/md5-cache/dev-java/jaxb-api-2.3.3-r1 b/metadata/md5-cache/dev-java/jaxb-api-2.3.3-r1
index eab929c70391..ac615bd5ab86 100644
--- a/metadata/md5-cache/dev-java/jaxb-api-2.3.3-r1
+++ b/metadata/md5-cache/dev-java/jaxb-api-2.3.3-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jakarta-activation-api:1 >=virtual/jre-1.8:* >=dev-java/java-co
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-api/archive/2.3.3.tar.gz -> jaxb-api-2.3.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=eaad392d1fe1f2dd6238ab66a6d755c8
diff --git a/metadata/md5-cache/dev-java/jaxb-api-3.0.1-r1 b/metadata/md5-cache/dev-java/jaxb-api-3.0.1-r1
index 48b036ca328c..ee42a402d25f 100644
--- a/metadata/md5-cache/dev-java/jaxb-api-3.0.1-r1
+++ b/metadata/md5-cache/dev-java/jaxb-api-3.0.1-r1
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0
 RDEPEND=dev-java/jakarta-activation:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-api/archive/3.0.1.tar.gz -> jaxb-api-3.0.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=189e24d7f81c9503e4d29c01dd6706b9
diff --git a/metadata/md5-cache/dev-java/jaxb-api-4.0.0 b/metadata/md5-cache/dev-java/jaxb-api-4.0.0
index b67d8a843b0f..b0f7aca90ffa 100644
--- a/metadata/md5-cache/dev-java/jaxb-api-4.0.0
+++ b/metadata/md5-cache/dev-java/jaxb-api-4.0.0
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jakarta-activation:2 >=virtual/jre-1.8:* >=dev-java/java-config
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-api/archive/4.0.0.tar.gz -> jaxb-api-4.0.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=6c076d76bd637bb68d4877add518a21f
diff --git a/metadata/md5-cache/dev-java/jaxb-runtime-4.0.0-r1 b/metadata/md5-cache/dev-java/jaxb-runtime-4.0.0-r1
index f74e63dcd3ac..6d3b35f13b7f 100644
--- a/metadata/md5-cache/dev-java/jaxb-runtime-4.0.0-r1
+++ b/metadata/md5-cache/dev-java/jaxb-runtime-4.0.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-ri/archive/4.0.0-RI.tar.gz -> jaxb-ri-4.0.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=be0384ebec034698b0cc7fadfac21251
diff --git a/metadata/md5-cache/dev-java/jaxb-stax-ex-2.1.0-r1 b/metadata/md5-cache/dev-java/jaxb-stax-ex-2.1.0-r1
index 35a4e7eb3c0f..16ff78983189 100644
--- a/metadata/md5-cache/dev-java/jaxb-stax-ex-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/jaxb-stax-ex-2.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-stax-ex/archive/2.1.0.tar.gz -> jaxb-stax-ex-2.1.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8ce9422c25c8484b4dd45329151adf98
diff --git a/metadata/md5-cache/dev-java/jaxen-1.2.0-r1 b/metadata/md5-cache/dev-java/jaxen-1.2.0-r1
index a9bd5d93f405..ab2bd5b0d37d 100644
--- a/metadata/md5-cache/dev-java/jaxen-1.2.0-r1
+++ b/metadata/md5-cache/dev-java/jaxen-1.2.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( dom4j jdom xom )
 RESTRICT=!test? ( test )
 SLOT=1.2
 SRC_URI=https://github.com/jaxen-xpath/jaxen/archive/refs/tags/v1.2.0.tar.gz -> jaxen-1.2.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=40233440ad9fc6c27b7884eb9f32577c
diff --git a/metadata/md5-cache/dev-java/jaxrs-api-2.1.6 b/metadata/md5-cache/dev-java/jaxrs-api-2.1.6
index bb643d4554dd..e3edfead9ec4 100644
--- a/metadata/md5-cache/dev-java/jaxrs-api-2.1.6
+++ b/metadata/md5-cache/dev-java/jaxrs-api-2.1.6
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/rest/archive/2.1.6.tar.gz -> jaxrs-api-2.1.6.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=19bdf442bae5c4fca38343ac70ee1005
diff --git a/metadata/md5-cache/dev-java/jaxws-api-2.3.3 b/metadata/md5-cache/dev-java/jaxws-api-2.3.3
index 3b77a830eba7..db9584bd679c 100644
--- a/metadata/md5-cache/dev-java/jaxws-api-2.3.3
+++ b/metadata/md5-cache/dev-java/jaxws-api-2.3.3
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/jax-ws-api/archive/2.3.3.tar.gz -> jaxws-api-2.3.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=520b92f115908b456c7f99746eb67b1f
diff --git a/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3 b/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3
index 5981bb5fa1c7..e065b06bac10 100644
--- a/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3
+++ b/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.apache.org/pdfbox/jbig2-imageio/3.0.3/jbig2-imageio-3.0.3-src.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=3ed85986046b86bfe4923b43b92aa74a
diff --git a/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r1 b/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r1
index ac391b407a1f..14b35bb16eb1 100644
--- a/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r1
+++ b/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r1
@@ -11,5 +11,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/bitcollider/jBitcollider%20%28Java%29/0.8/jBitcollider-0.8.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=650aabbae482fd484ab5cfeeff14885c
diff --git a/metadata/md5-cache/dev-java/jboss-jms-api-1.0.1 b/metadata/md5-cache/dev-java/jboss-jms-api-1.0.1
index 823ba1b25a95..f2eec15c2cda 100644
--- a/metadata/md5-cache/dev-java/jboss-jms-api-1.0.1
+++ b/metadata/md5-cache/dev-java/jboss-jms-api-1.0.1
@@ -10,5 +10,5 @@ LICENSE=CDDL GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=https://github.com/jboss/jboss-jms-api_spec/archive/jboss-jms-api_1.1_spec-1.0.1.Final.tar.gz -> jboss-jms-api-1.0.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=5d60f8328a4acde2dd87178749caf147
diff --git a/metadata/md5-cache/dev-java/jboss-modules-1.3.3-r1 b/metadata/md5-cache/dev-java/jboss-modules-1.3.3-r1
index 0806ef8e69ad..33678f3fb2b8 100644
--- a/metadata/md5-cache/dev-java/jboss-modules-1.3.3-r1
+++ b/metadata/md5-cache/dev-java/jboss-modules-1.3.3-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jboss-modules/jboss-modules/archive/1.3.3.Final.tar.gz -> jboss-modules-1.3.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=464b16ed641d1a1dc99e77febba64fd3
diff --git a/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1 b/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1
index 3d4282188233..bcdebf53346c 100644
--- a/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1
+++ b/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=virtual/jre-1.8:* dev-java/jide-oss:0 dev-java/xmlgraphics-commons:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/jchart2d/jchart2d/sources/jchart2d-eclipse-project-3.2.2.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8ee1afeba3f37c7129584659dbe505fb
diff --git a/metadata/md5-cache/dev-java/jcifs-1.3.19-r1 b/metadata/md5-cache/dev-java/jcifs-1.3.19-r1
index 314279a76d67..df60b6244d9b 100644
--- a/metadata/md5-cache/dev-java/jcifs-1.3.19-r1
+++ b/metadata/md5-cache/dev-java/jcifs-1.3.19-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=java-virtuals/servlet-api:3.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=https://jcifs.samba.org/src/jcifs-1.3.19.tgz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=f0e312c2ab9d25d016eacd88a6b13b99
diff --git a/metadata/md5-cache/dev-java/jcifs-1.3.19-r2 b/metadata/md5-cache/dev-java/jcifs-1.3.19-r2
index 127c47b1bca5..fe67becebec1 100644
--- a/metadata/md5-cache/dev-java/jcifs-1.3.19-r2
+++ b/metadata/md5-cache/dev-java/jcifs-1.3.19-r2
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/jakarta-servlet-api:4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=https://jcifs.samba.org/src/jcifs-1.3.19.tgz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=f35d1dc80b7b4303d72959c9c2d49538
diff --git a/metadata/md5-cache/dev-java/jcip-annotations-1.0.1-r1 b/metadata/md5-cache/dev-java/jcip-annotations-1.0.1-r1
index 74238700c731..86cce4933320 100644
--- a/metadata/md5-cache/dev-java/jcip-annotations-1.0.1-r1
+++ b/metadata/md5-cache/dev-java/jcip-annotations-1.0.1-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/stephenc/jcip-annotations/archive/jcip-annotations-1.0-1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=2102558eeb9f6633f492229e3b75c6f1
diff --git a/metadata/md5-cache/dev-java/jcommander-1.82 b/metadata/md5-cache/dev-java/jcommander-1.82
index f52b51229598..b7a16e931efd 100644
--- a/metadata/md5-cache/dev-java/jcommander-1.82
+++ b/metadata/md5-cache/dev-java/jcommander-1.82
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cbeust/jcommander/archive/1.82.tar.gz -> jcommander-1.82.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=78b36510eb443bcc396ec20166e65ae3
diff --git a/metadata/md5-cache/dev-java/jctools-core-4.0.1 b/metadata/md5-cache/dev-java/jctools-core-4.0.1
index 094271a6f28e..fe653a1cbe5d 100644
--- a/metadata/md5-cache/dev-java/jctools-core-4.0.1
+++ b/metadata/md5-cache/dev-java/jctools-core-4.0.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/JCTools/JCTools/archive/v4.0.1.tar.gz -> jctools-4.0.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=fa033cd4ecfca3a23491c0ced6fcaa16
diff --git a/metadata/md5-cache/dev-java/jdbc-mysql-8.0.26 b/metadata/md5-cache/dev-java/jdbc-mysql-8.0.26
index 4166980b686a..639686987d08 100644
--- a/metadata/md5-cache/dev-java/jdbc-mysql-8.0.26
+++ b/metadata/md5-cache/dev-java/jdbc-mysql-8.0.26
@@ -11,5 +11,5 @@ LICENSE=GPL-2-with-MySQL-FLOSS-exception
 RDEPEND=dev-java/c3p0:0 dev-java/protobuf-java:0 dev-java/slf4j-api:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.26/mysql-connector-java-8.0.26-sources.jar -> jdbc-mysql-8.0.26-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=e77b7ef9974dc977efe71afc9322d6fb
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-42.5.0 b/metadata/md5-cache/dev-java/jdbc-postgresql-42.5.0
index 4029db55ad69..30332e5b974b 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-42.5.0
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-42.5.0
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* dev-java/scram:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://jdbc.postgresql.org/download/postgresql-jdbc-42.5.0.src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=bc72f77cd59bbdfb833dd5d32812876d
diff --git a/metadata/md5-cache/dev-java/jdisasm-1.0.6 b/metadata/md5-cache/dev-java/jdisasm-1.0.6
index ae6354d677c4..51f6eeece8d2 100644
--- a/metadata/md5-cache/dev-java/jdisasm-1.0.6
+++ b/metadata/md5-cache/dev-java/jdisasm-1.0.6
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/commons-nullanalysis:0 >=dev-java/java-conf
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aunkrig/jdisasm/archive/5e354d659e4320d154b3f1fbff24c89c1ba48987.tar.gz -> jdisasm-1.0.6.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=3d5f950cf0c07cab5cc6d7ceab608f73
diff --git a/metadata/md5-cache/dev-java/jdom-2.0.6.1 b/metadata/md5-cache/dev-java/jdom-2.0.6.1
index d6c025c67cd9..5221f2ba928d 100644
--- a/metadata/md5-cache/dev-java/jdom-2.0.6.1
+++ b/metadata/md5-cache/dev-java/jdom-2.0.6.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/iso-relax:0 dev-java/jaxen:1.2 dev-java/xal
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/hunterhacker/jdom/archive/JDOM-2.0.6.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=1151c4b0c84ce6383754007044d0e5f7
diff --git a/metadata/md5-cache/dev-java/jeromq-0.5.2 b/metadata/md5-cache/dev-java/jeromq-0.5.2
index 7ae760af2357..fa4157b0a38b 100644
--- a/metadata/md5-cache/dev-java/jeromq-0.5.2
+++ b/metadata/md5-cache/dev-java/jeromq-0.5.2
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jnacl:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 sou
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zeromq/jeromq/archive/v0.5.2.tar.gz -> jeromq-0.5.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=cbdf1b7c47907d1fd626e6f811fc62be
diff --git a/metadata/md5-cache/dev-java/jffi-1.3.10 b/metadata/md5-cache/dev-java/jffi-1.3.10
new file mode 100644
index 000000000000..d00aa3a35649
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jffi-1.3.10
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-libs/libffi-3.4.2-r2:= >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Java Foreign Function Interface
+EAPI=8
+HOMEPAGE=https://github.com/jnr/jffi
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-libs/libffi-3.4.2-r2:= >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=1.3
+SRC_URI=https://github.com/jnr/jffi/archive/jffi-1.3.10.tar.gz
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=91b70ea99e6f59259f10c448703d4c17
diff --git a/metadata/md5-cache/dev-java/jffi-1.3.9-r1 b/metadata/md5-cache/dev-java/jffi-1.3.9-r1
index 0a860ede6ac9..2c0446ca78ac 100644
--- a/metadata/md5-cache/dev-java/jffi-1.3.9-r1
+++ b/metadata/md5-cache/dev-java/jffi-1.3.9-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-libs/libffi-3.4.2-r2:= >=dev-java/java-config-
 RESTRICT=!test? ( test )
 SLOT=1.3
 SRC_URI=https://github.com/jnr/jffi/archive/refs/tags/jffi-1.3.9.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=b629ec12c379285a30c13dec37c157ba
diff --git a/metadata/md5-cache/dev-java/jflex-1.6.1-r1 b/metadata/md5-cache/dev-java/jflex-1.6.1-r1
index fe09814615e7..225cc5ad602a 100644
--- a/metadata/md5-cache/dev-java/jflex-1.6.1-r1
+++ b/metadata/md5-cache/dev-java/jflex-1.6.1-r1
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* vim-syntax? ( || ( app-editors/vim app-editors/gvim
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://jflex.de/jflex-1.6.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=479edb30c65ebe69783faaf5f7ffa02e
diff --git a/metadata/md5-cache/dev-java/jformatstring-2.0.3-r1 b/metadata/md5-cache/dev-java/jformatstring-2.0.3-r1
index 70530629b75c..5aa50c7dbf13 100644
--- a/metadata/md5-cache/dev-java/jformatstring-2.0.3-r1
+++ b/metadata/md5-cache/dev-java/jformatstring-2.0.3-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/findbugs/findbugs-3.0.1-source.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=b8ac9859bde44b536280eca8b7171498
diff --git a/metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r1 b/metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r1
index 4e3a66f775ae..35ac65012d47 100644
--- a/metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test
 SLOT=1.8
 SRC_URI=http://www.jgoodies.com/download/libraries/common/jgoodies-common-1_8_0.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=d52a14c07ec78008e65c2d3c455d6c4a
diff --git a/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0-r1 b/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0-r1
index 46ef066318a6..afd30fbfd18a 100644
--- a/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0-r1
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=dev-java/jgoodies-common:1.8 virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.6
 SRC_URI=http://www.jgoodies.com/download/libraries/looks/jgoodies-looks-2_6_0.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=10aea06f77390c986abddf2e4041a2ee
diff --git a/metadata/md5-cache/dev-java/jide-oss-3.7.12 b/metadata/md5-cache/dev-java/jide-oss-3.7.12
index 63aed018e869..7279f8aa28ce 100644
--- a/metadata/md5-cache/dev-java/jide-oss-3.7.12
+++ b/metadata/md5-cache/dev-java/jide-oss-3.7.12
@@ -11,5 +11,5 @@ RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jidesoft/jide-oss/archive/19083238ce00ecbd7370f856cb64ea69dae669a5.tar.gz -> jide-oss-3.7.12.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=c56dd1b825e9b9b216e38d167a33cb19
diff --git a/metadata/md5-cache/dev-java/jline-2.14.6 b/metadata/md5-cache/dev-java/jline-2.14.6
index fb31c327d8c7..65baa4503b26 100644
--- a/metadata/md5-cache/dev-java/jline-2.14.6
+++ b/metadata/md5-cache/dev-java/jline-2.14.6
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jansi:0 dev-java/jansi-native:0 >=virtual/jre-1.8:* >=dev-java/
 RESTRICT=!test? ( test ) test
 SLOT=2
 SRC_URI=https://github.com/jline/jline2/archive/jline-2.14.6.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=5e27aa77287fd305780286a6ca2c1ae1
diff --git a/metadata/md5-cache/dev-java/jmh-core-1.35 b/metadata/md5-cache/dev-java/jmh-core-1.35
index 67373baabc44..48d0e43cca36 100644
--- a/metadata/md5-cache/dev-java/jmh-core-1.35
+++ b/metadata/md5-cache/dev-java/jmh-core-1.35
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/commons-math:3 dev-java/jopt-simple:0 >=dev
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/openjdk/jmh/archive/1.35.tar.gz -> jmh-core-1.35.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=e9ebc246564e61aa07ef11575c206054
diff --git a/metadata/md5-cache/dev-java/jmock-1.2.0-r2 b/metadata/md5-cache/dev-java/jmock-1.2.0-r2
index c2f1bb184078..205bb6dfaf0f 100644
--- a/metadata/md5-cache/dev-java/jmock-1.2.0-r2
+++ b/metadata/md5-cache/dev-java/jmock-1.2.0-r2
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=http://jmock.org/downloads/jmock-1.2.0-jars.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=aff79e108dae2fe4b9e30b2acf617385
diff --git a/metadata/md5-cache/dev-java/jmock-2.12.0 b/metadata/md5-cache/dev-java/jmock-2.12.0
index 4d98fececfea..39d3616c5bee 100644
--- a/metadata/md5-cache/dev-java/jmock-2.12.0
+++ b/metadata/md5-cache/dev-java/jmock-2.12.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jmock-developers/jmock-library/archive/2.12.0.tar.gz -> jmock-2.12.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=1521abaefb5ec042b7d304daf626e49e
diff --git a/metadata/md5-cache/dev-java/jnacl-1.0 b/metadata/md5-cache/dev-java/jnacl-1.0
index 236d1b577c74..0a4bd9ea6984 100644
--- a/metadata/md5-cache/dev-java/jnacl-1.0
+++ b/metadata/md5-cache/dev-java/jnacl-1.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/neilalexander/jnacl/archive/v1.0.tar.gz -> jnacl-1.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=5e705f6ce84403d0bef9d073976f8796
diff --git a/metadata/md5-cache/dev-java/jnr-a64asm-1.0.0 b/metadata/md5-cache/dev-java/jnr-a64asm-1.0.0
index db31e750510c..7679229da65d 100644
--- a/metadata/md5-cache/dev-java/jnr-a64asm-1.0.0
+++ b/metadata/md5-cache/dev-java/jnr-a64asm-1.0.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/jnr/jnr-a64asm/archive/refs/tags/jnr-a64asm-1.0.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=5989a8289a9d4ccdc925dbb833bf93fa
diff --git a/metadata/md5-cache/dev-java/jnr-constants-0.10.3 b/metadata/md5-cache/dev-java/jnr-constants-0.10.3
index 0a362eb58f21..ec13b89b4cb3 100644
--- a/metadata/md5-cache/dev-java/jnr-constants-0.10.3
+++ b/metadata/md5-cache/dev-java/jnr-constants-0.10.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jnr/jnr-constants/archive/refs/tags/jnr-constants-0.10.3.tar.gz -> jnr-constants-0.10.3-sources.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=6bc0cca0013ff6c3cddddfb28b1557ea
diff --git a/metadata/md5-cache/dev-java/jnr-constants-0.10.4 b/metadata/md5-cache/dev-java/jnr-constants-0.10.4
new file mode 100644
index 000000000000..51e046a2279a
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jnr-constants-0.10.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=A set of platform constants (e.g. errno values)
+EAPI=8
+HOMEPAGE=https://github.com/jnr/jnr-constants
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jnr/jnr-constants/archive/jnr-constants-0.10.4.tar.gz
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=dc4948acc29d88e782801b8b9193dea6
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-2.2.12 b/metadata/md5-cache/dev-java/jnr-ffi-2.2.12
index 8629d39ff34f..ccaa844e7fe1 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-2.2.12
+++ b/metadata/md5-cache/dev-java/jnr-ffi-2.2.12
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/asm:9 >=dev-java/jffi-1.3.8:1.3 dev-java/jnr-a64asm:2 dev-java/jnr-x86asm:1.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/jnr/jnr-ffi/archive/jnr-ffi-2.2.12.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=1e272bab07b149a97a96c8484e5ce448
diff --git a/metadata/md5-cache/dev-java/jnr-netdb-1.2.0 b/metadata/md5-cache/dev-java/jnr-netdb-1.2.0
index 1906bb0be512..021a3efdae65 100644
--- a/metadata/md5-cache/dev-java/jnr-netdb-1.2.0
+++ b/metadata/md5-cache/dev-java/jnr-netdb-1.2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jnr-ffi:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 s
 RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/jnr/jnr-netdb/archive/jnr-netdb-1.2.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=df5501fd7e0f29e0b38f9702b8b75f67
diff --git a/metadata/md5-cache/dev-java/jnr-posix-3.1.15 b/metadata/md5-cache/dev-java/jnr-posix-3.1.15
index 928adcda8297..b18ca4fd07b0 100644
--- a/metadata/md5-cache/dev-java/jnr-posix-3.1.15
+++ b/metadata/md5-cache/dev-java/jnr-posix-3.1.15
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/jnr-ffi-2.2.12:2 dev-java/jnr-constants:0 >=virtual/jre-1.8:*
 RESTRICT=!test? ( test )
 SLOT=3.0
 SRC_URI=https://github.com/jnr/jnr-posix/archive/jnr-posix-3.1.15.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=0e7abf65610f6fd786846a3d990a5679
diff --git a/metadata/md5-cache/dev-java/jnr-posix-3.1.16 b/metadata/md5-cache/dev-java/jnr-posix-3.1.16
new file mode 100644
index 000000000000..dc7dcd7b6a9b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jnr-posix-3.1.16
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=dev-java/jnr-ffi-2.2.12:2 dev-java/jnr-constants:0 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Common cross-project/cross-platform POSIX APIs
+EAPI=8
+HOMEPAGE=https://github.com/jnr/jnr-posix
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=EPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-java/jnr-ffi-2.2.12:2 dev-java/jnr-constants:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=3.0
+SRC_URI=https://github.com/jnr/jnr-posix/archive/jnr-posix-3.1.16.tar.gz
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=259b90296ca349f3611c1e75ae18f3fe
diff --git a/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2 b/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2
index efa811e4355a..a64d95c2c4cc 100644
--- a/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2
+++ b/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://github.com/jnr/jnr-x86asm/archive/refs/tags/1.0.2.tar.gz -> jnr-x86asm-1.0.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=39e0820ac165bd3223bf2966ddddad04
diff --git a/metadata/md5-cache/dev-java/joda-convert-2.2.2-r2 b/metadata/md5-cache/dev-java/joda-convert-2.2.2-r2
index dcde92d1216e..ee7256f2f3a9 100644
--- a/metadata/md5-cache/dev-java/joda-convert-2.2.2-r2
+++ b/metadata/md5-cache/dev-java/joda-convert-2.2.2-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JodaOrg/joda-convert/archive/v2.2.2.tar.gz -> joda-convert-2.2.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=ad7d4d09859c742a3e23f31d33dbd0d7
diff --git a/metadata/md5-cache/dev-java/joda-time-2.11.2 b/metadata/md5-cache/dev-java/joda-time-2.11.2
index 87468e1ff778..ef3caf048382 100644
--- a/metadata/md5-cache/dev-java/joda-time-2.11.2
+++ b/metadata/md5-cache/dev-java/joda-time-2.11.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/joda-convert:0 >=dev-java/java-config-2.2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JodaOrg/joda-time/archive/v2.11.2.tar.gz -> joda-time-2.11.2.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=620aaeb4f8dc25286f126dd781672f71
diff --git a/metadata/md5-cache/dev-java/jol-core-0.16-r1 b/metadata/md5-cache/dev-java/jol-core-0.16-r1
index 842e8d1fedc2..7647ef4f7f2d 100644
--- a/metadata/md5-cache/dev-java/jol-core-0.16-r1
+++ b/metadata/md5-cache/dev-java/jol-core-0.16-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/openjdk/jol/archive/0.16.tar.gz -> jol-0.16.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=44c3b43f7d481c5f616d3b26b4ea5dba
diff --git a/metadata/md5-cache/dev-java/jopt-simple-5.0.4 b/metadata/md5-cache/dev-java/jopt-simple-5.0.4
index d97c4155f030..9c257b6aa584 100644
--- a/metadata/md5-cache/dev-java/jopt-simple-5.0.4
+++ b/metadata/md5-cache/dev-java/jopt-simple-5.0.4
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jopt-simple/jopt-simple/archive/jopt-simple-5.0.4.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=bce8e250c8a37943c395146ee848e74c
diff --git a/metadata/md5-cache/dev-java/jrobin-1.6.0-r2 b/metadata/md5-cache/dev-java/jrobin-1.6.0-r2
index 56f313fe5379..a185ae34b494 100644
--- a/metadata/md5-cache/dev-java/jrobin-1.6.0-r2
+++ b/metadata/md5-cache/dev-java/jrobin-1.6.0-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenNMS/jrobin/archive/jrobin-1.6.0-1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=c518f3b0782e0d8a81457374013abe21
diff --git a/metadata/md5-cache/dev-java/jsch-0.1.55 b/metadata/md5-cache/dev-java/jsch-0.1.55
index 8fc3e6cda4dd..3d51cc54886e 100644
--- a/metadata/md5-cache/dev-java/jsch-0.1.55
+++ b/metadata/md5-cache/dev-java/jsch-0.1.55
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=>=dev-java/jzlib-1.1.3:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jsch/jsch-0.1.55.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=3c67018e37f64ad1b88f0747698b03d1
diff --git a/metadata/md5-cache/dev-java/jsch-agent-proxy-0.0.9 b/metadata/md5-cache/dev-java/jsch-agent-proxy-0.0.9
index abe9f89ff736..631eb650d69f 100644
--- a/metadata/md5-cache/dev-java/jsch-agent-proxy-0.0.9
+++ b/metadata/md5-cache/dev-java/jsch-agent-proxy-0.0.9
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=dev-java/jna:4 dev-java/jsch:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/ymnk/jsch-agent-proxy/archive/12c3d64fc2b0a4fd37659369edfdee26e48954e2.tar.gz -> jsch-agent-proxy-0.0.9.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=f0145b7f42bda4b62567a4fe7ed159e0
diff --git a/metadata/md5-cache/dev-java/json-20220320 b/metadata/md5-cache/dev-java/json-20220320
index de3b186dc98d..958debc4287e 100644
--- a/metadata/md5-cache/dev-java/json-20220320
+++ b/metadata/md5-cache/dev-java/json-20220320
@@ -10,5 +10,5 @@ LICENSE=JSON
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://codeload.github.com/stleary/JSON-java/tar.gz/20220320 -> json-20220320.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=0c4b904e5a8e6d956a21cdf4f4e42532
diff --git a/metadata/md5-cache/dev-java/json-simple-1.1-r2 b/metadata/md5-cache/dev-java/json-simple-1.1-r2
index b7f85dd13ed9..2b7b19d42633 100644
--- a/metadata/md5-cache/dev-java/json-simple-1.1-r2
+++ b/metadata/md5-cache/dev-java/json-simple-1.1-r2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/fangyidong/json-simple/archive/tag_release_1_1_1.tar.gz -> json-simple-1.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=582d7ea68716f01a3bafa1082f0145c6
diff --git a/metadata/md5-cache/dev-java/jsr305-3.0.2-r1 b/metadata/md5-cache/dev-java/jsr305-3.0.2-r1
index 41b6aa59288c..8204bc2d08c5 100644
--- a/metadata/md5-cache/dev-java/jsr305-3.0.2-r1
+++ b/metadata/md5-cache/dev-java/jsr305-3.0.2-r1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=f010bcb7603d30304cccc69595761b8d
diff --git a/metadata/md5-cache/dev-java/jstl-1.2.7 b/metadata/md5-cache/dev-java/jstl-1.2.7
new file mode 100644
index 000000000000..5f495be00a23
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jstl-1.2.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/javax-el-api:2.2 dev-java/javax-jsp-api:2.2 dev-java/javax-servlet-api:2.5 dev-java/jstl-api:0 dev-java/xalan:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Jakarta Standard Tag Library API
+EAPI=8
+HOMEPAGE=https://projects.eclipse.org/projects/ee4j.jstl
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64
+LICENSE=EPL-2.0 GPL-2-with-classpath-exception
+RDEPEND=dev-java/javax-el-api:2.2 dev-java/javax-jsp-api:2.2 dev-java/javax-servlet-api:2.5 dev-java/jstl-api:0 dev-java/xalan:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/jakartaee/tags/archive/1.2.7-RELEASE.tar.gz -> jstl-1.2.7.tar.gz
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=c043333caf3252b6d7a1fdc3d4a8ceca
diff --git a/metadata/md5-cache/dev-java/jstl-api-1.2.7 b/metadata/md5-cache/dev-java/jstl-api-1.2.7
new file mode 100644
index 000000000000..7a2d55cbd019
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jstl-api-1.2.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/javax-el-api:2.2 dev-java/javax-jsp-api:2.2 dev-java/javax-servlet-api:2.5 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Jakarta Standard Tag Library API
+EAPI=8
+HOMEPAGE=https://projects.eclipse.org/projects/ee4j.jstl
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64
+LICENSE=EPL-2.0 GPL-2-with-classpath-exception
+RDEPEND=dev-java/javax-el-api:2.2 dev-java/javax-jsp-api:2.2 dev-java/javax-servlet-api:2.5 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/jakartaee/tags/archive/1.2.7-RELEASE.tar.gz -> jstl-1.2.7.tar.gz
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=5d12492dae50fc9176935079cb40ed0d
diff --git a/metadata/md5-cache/dev-java/jtds-1.3.1-r1 b/metadata/md5-cache/dev-java/jtds-1.3.1-r1
index fb32c3382787..b9e9de8af78a 100644
--- a/metadata/md5-cache/dev-java/jtds-1.3.1-r1
+++ b/metadata/md5-cache/dev-java/jtds-1.3.1-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jcifs:1.1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 s
 RESTRICT=test
 SLOT=1.3
 SRC_URI=mirror://sourceforge/project/jtds/jtds/1.3.1/jtds-1.3.1-src.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=730dfb2314979eb49a33d1e6e2b55e02
diff --git a/metadata/md5-cache/dev-java/jul-to-slf4j-2.0.3 b/metadata/md5-cache/dev-java/jul-to-slf4j-2.0.3
index 955d1cb78d25..52f0a14f2dff 100644
--- a/metadata/md5-cache/dev-java/jul-to-slf4j-2.0.3
+++ b/metadata/md5-cache/dev-java/jul-to-slf4j-2.0.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/slf4j-api-2.0.3:0 >=dev-java/java-config-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=599b9d6b63bfc64b83d60d99fae2808f
diff --git a/metadata/md5-cache/dev-java/junit-3.8.2-r2 b/metadata/md5-cache/dev-java/junit-3.8.2-r2
index 54e948589a11..c663fcefd441 100644
--- a/metadata/md5-cache/dev-java/junit-3.8.2-r2
+++ b/metadata/md5-cache/dev-java/junit-3.8.2-r2
@@ -10,5 +10,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/junit/junit3.8.2.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=2cb66bdc1fddf90655369bf84c447628
diff --git a/metadata/md5-cache/dev-java/junit-4.13.2 b/metadata/md5-cache/dev-java/junit-4.13.2
index 51d66dd50e1b..73b7cb4382d6 100644
--- a/metadata/md5-cache/dev-java/junit-4.13.2
+++ b/metadata/md5-cache/dev-java/junit-4.13.2
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/hamcrest-core:1.3 >=dev-java/java-config-2.
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/junit-team/junit4/archive/refs/tags/r4.13.2.tar.gz -> junit-4.13.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=367ad502a59941823b7c663f9f0086d3
diff --git a/metadata/md5-cache/dev-java/junit-clptr-1.2.2 b/metadata/md5-cache/dev-java/junit-clptr-1.2.2
index 3342234290af..4eacf9a9247d 100644
--- a/metadata/md5-cache/dev-java/junit-clptr-1.2.2
+++ b/metadata/md5-cache/dev-java/junit-clptr-1.2.2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/bitstrings/junit-clptr/archive/refs/tags/1.2.2.tar.gz -> junit-clptr-1.2.2-sources.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=cf422be6a5523815b02e67c5e3ea8ca8
diff --git a/metadata/md5-cache/dev-java/junit-dataprovider-2.9 b/metadata/md5-cache/dev-java/junit-dataprovider-2.9
index c0ac9475470f..fd94933b976c 100644
--- a/metadata/md5-cache/dev-java/junit-dataprovider-2.9
+++ b/metadata/md5-cache/dev-java/junit-dataprovider-2.9
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/findbugs-annotations:0 >=dev-java/java-conf
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/TNG/junit-dataprovider/archive/v2.9.tar.gz -> junit-dataprovider-2.9.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=c09c87b5499b157c615b736a11a00218
diff --git a/metadata/md5-cache/dev-java/junitparams-1.1.1-r1 b/metadata/md5-cache/dev-java/junitparams-1.1.1-r1
index 2aed0d5df8c9..de7d46cbd977 100644
--- a/metadata/md5-cache/dev-java/junitparams-1.1.1-r1
+++ b/metadata/md5-cache/dev-java/junitparams-1.1.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 sou
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Pragmatists/JUnitParams/archive/refs/tags/JUnitParams-1.1.1.tar.gz -> junitparams-1.1.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=65bbce8fa50be869136354dd1522ad59
diff --git a/metadata/md5-cache/dev-java/jzlib-1.1.3-r2 b/metadata/md5-cache/dev-java/jzlib-1.1.3-r2
index 4cf98325b714..f54d23f7f4ce 100644
--- a/metadata/md5-cache/dev-java/jzlib-1.1.3-r2
+++ b/metadata/md5-cache/dev-java/jzlib-1.1.3-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ymnk/jzlib/archive/1.1.3.tar.gz -> jzlib-1.1.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=c7f98be39fac6bb494bcd0bf1b9d1786
diff --git a/metadata/md5-cache/dev-java/kafka-clients-1.1.1 b/metadata/md5-cache/dev-java/kafka-clients-1.1.1
index 0ff716719e92..bd7e0414b973 100644
--- a/metadata/md5-cache/dev-java/kafka-clients-1.1.1
+++ b/metadata/md5-cache/dev-java/kafka-clients-1.1.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/lz4-java-1.4.1:0 >=dev-java/slf4j-api-1.7.25:0 >=dev-java/snappy-1.1.7.1:1.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/kafka/1.1.1/kafka-1.1.1-src.tgz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=e349412855f51dda74f62c8f9d543bb9
diff --git a/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4 b/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4
index 16d216f02a83..d79141492f01 100644
--- a/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4
+++ b/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/LMAX-Exchange/disruptor/archive/3.4.4.tar.gz -> lmax-disruptor-3.4.4.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=b146537d280a8b896c6cc08bc4f64ed5
diff --git a/metadata/md5-cache/dev-java/log4j-12-api-2.19.0 b/metadata/md5-cache/dev-java/log4j-12-api-2.19.0
index 45b1f5288239..d6f10fbff9e0 100644
--- a/metadata/md5-cache/dev-java/log4j-12-api-2.19.0
+++ b/metadata/md5-cache/dev-java/log4j-12-api-2.19.0
@@ -11,5 +11,5 @@ RDEPEND=~dev-java/log4j-api-2.19.0:2 ~dev-java/log4j-core-2.19.0:2 >=virtual/jre
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/logging/log4j/2.19.0/apache-log4j-2.19.0-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=1f9446a990e19064b14a6d76721a9620
diff --git a/metadata/md5-cache/dev-java/log4j-api-2.19.0 b/metadata/md5-cache/dev-java/log4j-api-2.19.0
index 696ca65022e1..045fe7d92e32 100644
--- a/metadata/md5-cache/dev-java/log4j-api-2.19.0
+++ b/metadata/md5-cache/dev-java/log4j-api-2.19.0
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/logging/log4j/2.19.0/apache-log4j-2.19.0-src.tar.gz verify-sig? ( https://www.apache.org/dist/logging/log4j/2.19.0/apache-log4j-2.19.0-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=27aa05fa1790c2623c6d60c4cd05d99b
diff --git a/metadata/md5-cache/dev-java/log4j-core-2.19.0 b/metadata/md5-cache/dev-java/log4j-core-2.19.0
index 7b7f661e00e1..61958850a681 100644
--- a/metadata/md5-cache/dev-java/log4j-core-2.19.0
+++ b/metadata/md5-cache/dev-java/log4j-core-2.19.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/commons-compress:0 dev-java/commons-csv:0 d
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/logging/log4j/2.19.0/apache-log4j-2.19.0-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=9d8ca8868613ba66dd901fcdb5c11444
diff --git a/metadata/md5-cache/dev-java/log4j-over-slf4j-2.0.3 b/metadata/md5-cache/dev-java/log4j-over-slf4j-2.0.3
index 218f234ce02d..44cb8926bf99 100644
--- a/metadata/md5-cache/dev-java/log4j-over-slf4j-2.0.3
+++ b/metadata/md5-cache/dev-java/log4j-over-slf4j-2.0.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/slf4j-api-2.0.3:0 >=dev-java/java-config-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=b901993a7a54d46a3a5ee0cb962d78df
diff --git a/metadata/md5-cache/dev-java/logback-classic-1.4.1 b/metadata/md5-cache/dev-java/logback-classic-1.4.1
index 04a5383666cf..e0e7cdf22991 100644
--- a/metadata/md5-cache/dev-java/logback-classic-1.4.1
+++ b/metadata/md5-cache/dev-java/logback-classic-1.4.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/janino-3.1.7:0 dev-java/jakarta-mail-api:0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/logback/archive/v_1.4.1.tar.gz -> logback-1.4.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=14741cc4abd85227aabf0ccf826d15d6
diff --git a/metadata/md5-cache/dev-java/logback-core-1.4.1 b/metadata/md5-cache/dev-java/logback-core-1.4.1
index 201bc4f03467..89d8362da7ef 100644
--- a/metadata/md5-cache/dev-java/logback-core-1.4.1
+++ b/metadata/md5-cache/dev-java/logback-core-1.4.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-mail:0 dev-java/jakarta-mail-api:0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/logback/archive/v_1.4.1.tar.gz -> logback-1.4.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=62648581b88455f373c665dfa72cfa1f
diff --git a/metadata/md5-cache/dev-java/lzma-22.01 b/metadata/md5-cache/dev-java/lzma-22.01
index 24cb079d34ac..2dec34301f40 100644
--- a/metadata/md5-cache/dev-java/lzma-22.01
+++ b/metadata/md5-cache/dev-java/lzma-22.01
@@ -11,5 +11,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://7-zip.org/a/lzma2201.7z -> lzma-22.01.7z
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba
 _md5_=c1691f5689ab4c5928981f3e5e407225
diff --git a/metadata/md5-cache/dev-java/lzmajio-0.95-r3 b/metadata/md5-cache/dev-java/lzmajio-0.95-r3
index f6aa0141fe83..5001dd649207 100644
--- a/metadata/md5-cache/dev-java/lzmajio-0.95-r3
+++ b/metadata/md5-cache/dev-java/lzmajio-0.95-r3
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/lzma:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/league/lzmajio-0.95/archive/0.95.tar.gz -> lzmajio-0.95.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=a7faba087b41216fdacdba3c45dc711c
diff --git a/metadata/md5-cache/dev-java/mchange-commons-0.2.20 b/metadata/md5-cache/dev-java/mchange-commons-0.2.20
index 78f87567be53..12ae22d86c24 100644
--- a/metadata/md5-cache/dev-java/mchange-commons-0.2.20
+++ b/metadata/md5-cache/dev-java/mchange-commons-0.2.20
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0 LGPL-2.1
 RDEPEND=dev-java/log4j-api:2 dev-java/log4j-12-api:2 dev-java/log4j-core:2 dev-java/slf4j-api:0 dev-java/typesafe-config:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/swaldman/mchange-commons-java/archive/refs/tags/v0.2.20.tar.gz -> mchange-commons-0.2.20.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8ebed4da60f3daa69ceb2c883b13c2b6
diff --git a/metadata/md5-cache/dev-java/memoryfilesystem-2.3.0 b/metadata/md5-cache/dev-java/memoryfilesystem-2.3.0
index 679e1a0813e8..90fc6f9b7367 100644
--- a/metadata/md5-cache/dev-java/memoryfilesystem-2.3.0
+++ b/metadata/md5-cache/dev-java/memoryfilesystem-2.3.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-annotations-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/marschall/memoryfilesystem/archive/2.3.0.tar.gz -> memoryfilesystem-2.3.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=0a08875c58dcd668ede850fa6a6be13d
diff --git a/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2 b/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2
index 4c19f357bf18..5ee93dfdea57 100644
--- a/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2
+++ b/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/mersennetwister-0_pre23765.tar.bz2
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=86bf981925d944a72a08255619983dd7
diff --git a/metadata/md5-cache/dev-java/metainf-services-1.9 b/metadata/md5-cache/dev-java/metainf-services-1.9
index e448aa8cc89f..17e5effca201 100644
--- a/metadata/md5-cache/dev-java/metainf-services-1.9
+++ b/metadata/md5-cache/dev-java/metainf-services-1.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/kohsuke/metainf-services/archive/metainf-services-1.9.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=a863b6624348b4e4434b9b84a7a7c4cf
diff --git a/metadata/md5-cache/dev-java/mockito-1.9.5-r3 b/metadata/md5-cache/dev-java/mockito-1.9.5-r3
index d458323f200b..0fbe7772a372 100644
--- a/metadata/md5-cache/dev-java/mockito-1.9.5-r3
+++ b/metadata/md5-cache/dev-java/mockito-1.9.5-r3
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 dev-java/hamcrest-core:0 dev-java/junit:4 dev-java/objenesis:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/mockito/mockito-core/1.9.5/mockito-core-1.9.5-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=10c25dacd87e87de7303cf8301c1d000
diff --git a/metadata/md5-cache/dev-java/mockito-4.11.0 b/metadata/md5-cache/dev-java/mockito-4.11.0
index 92acbe28dc52..62e1ca75c43e 100644
--- a/metadata/md5-cache/dev-java/mockito-4.11.0
+++ b/metadata/md5-cache/dev-java/mockito-4.11.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* dev-java/asm:9 dev-java/byte-buddy:0 dev-java/objenesis:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=https://github.com/mockito/mockito/archive/v4.11.0.tar.gz -> mockito-4.11.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=229e6f420f458da610051287c9fce3c6
diff --git a/metadata/md5-cache/dev-java/msv-2022.7 b/metadata/md5-cache/dev-java/msv-2022.7
index 34dd59b7b043..af12689673b8 100644
--- a/metadata/md5-cache/dev-java/msv-2022.7
+++ b/metadata/md5-cache/dev-java/msv-2022.7
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/iso-relax:0 dev-java/relaxng-datatype:0 dev
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xmlark/msv/archive/msv-2022.7.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=52e706ca10a7d66f6ba1ca038a131112
diff --git a/metadata/md5-cache/dev-java/mvel-2.3.2-r1 b/metadata/md5-cache/dev-java/mvel-2.3.2-r1
index 4f11e939f657..5996ecbe3e52 100644
--- a/metadata/md5-cache/dev-java/mvel-2.3.2-r1
+++ b/metadata/md5-cache/dev-java/mvel-2.3.2-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=2.3
 SRC_URI=https://github.com/mvel/mvel/archive/refs/tags/mvel2-2.3.2.Final.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=36977dbfaeea9af5404e6b16fb157e42
diff --git a/metadata/md5-cache/dev-java/netty-4.1.35-r1 b/metadata/md5-cache/dev-java/netty-4.1.35-r1
index 022c170ce9f5..ddb484f543b8 100644
--- a/metadata/md5-cache/dev-java/netty-4.1.35-r1
+++ b/metadata/md5-cache/dev-java/netty-4.1.35-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/commons-logging:0 dev-java/jctools-core:3 d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/refs/tags/netty-4.1.35.Final.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=a07515be97ed0a7aa5a7cf04f6552d8c
diff --git a/metadata/md5-cache/dev-java/objenesis-3.3 b/metadata/md5-cache/dev-java/objenesis-3.3
index 2980c3b29c7d..1d1347490c16 100644
--- a/metadata/md5-cache/dev-java/objenesis-3.3
+++ b/metadata/md5-cache/dev-java/objenesis-3.3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/easymock/objenesis/archive/3.3.tar.gz -> objenesis-3.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=51c4f7dbd5eb1ef479c46a2865917463
diff --git a/metadata/md5-cache/dev-java/openjfx-8.1000 b/metadata/md5-cache/dev-java/openjfx-8.1000
index 7a044e6edc72..17bf77bd9c9e 100644
--- a/metadata/md5-cache/dev-java/openjfx-8.1000
+++ b/metadata/md5-cache/dev-java/openjfx-8.1000
@@ -12,5 +12,5 @@ REQUIRED_USE=amd64? ( cpu_flags_x86_sse2 )
 RESTRICT=test
 SLOT=8
 SRC_URI=https://hg.openjdk.java.net/openjfx/8u-dev/rt/archive/9f49e3b6147f.tar.bz2 -> openjfx-8.1000.tar.bz2 https://dev.gentoo.org/~gyakovlev/distfiles/openjfx-8.1000-backports.tar.bz2 https://services.gradle.org/distributions/gradle-4.10.3-bin.zip
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=498092692a9d4a8c0dbccc4a78cef95a
diff --git a/metadata/md5-cache/dev-java/opentest4j-1.2.0-r1 b/metadata/md5-cache/dev-java/opentest4j-1.2.0-r1
index 9ff2c7a7522c..dc4659fa4013 100644
--- a/metadata/md5-cache/dev-java/opentest4j-1.2.0-r1
+++ b/metadata/md5-cache/dev-java/opentest4j-1.2.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ota4j-team/opentest4j/archive/r1.2.0.tar.gz -> opentest4j-1.2.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=c67c7829cc4f727e0e6a8ef230e7f448
diff --git a/metadata/md5-cache/dev-java/osgi-annotation-8.1.0 b/metadata/md5-cache/dev-java/osgi-annotation-8.1.0
index 44a4fa200139..2f87885ad36d 100644
--- a/metadata/md5-cache/dev-java/osgi-annotation-8.1.0
+++ b/metadata/md5-cache/dev-java/osgi-annotation-8.1.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://docs.osgi.org/download/r8/osgi.annotation-8.1.0.jar -> osgi-annotation-8.1.0.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=a03a56d045b6a08896036b2c3878277c
diff --git a/metadata/md5-cache/dev-java/osgi-annotation-versioning-1.1.1 b/metadata/md5-cache/dev-java/osgi-annotation-versioning-1.1.1
index 7a7ca6024c5f..a51853939dae 100644
--- a/metadata/md5-cache/dev-java/osgi-annotation-versioning-1.1.1
+++ b/metadata/md5-cache/dev-java/osgi-annotation-versioning-1.1.1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/osgi/org.osgi.annotation.versioning/1.1.1/org.osgi.annotation.versioning-1.1.1-sources.jar -> osgi-annotation-versioning-1.1.1-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=a9d6c762ca136920c7f039fc17bcc66c
diff --git a/metadata/md5-cache/dev-java/osgi-cmpn-8.0.0 b/metadata/md5-cache/dev-java/osgi-cmpn-8.0.0
index a888d075b758..60eaaff1e9b7 100644
--- a/metadata/md5-cache/dev-java/osgi-cmpn-8.0.0
+++ b/metadata/md5-cache/dev-java/osgi-cmpn-8.0.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0 OSGi-Specification-2.0
 RDEPEND=dev-java/cdi-api:0 dev-java/glassfish-persistence:0 dev-java/jakarta-servlet-api:4 dev-java/javax-inject:0 dev-java/jaxrs-api:0 dev-java/osgi-annotation:0 dev-java/osgi-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=8
 SRC_URI=https://docs.osgi.org/download/r8/osgi.cmpn-8.0.0.jar -> osgi-cmpn-8.0.0.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=bfbcd2c44da033d978257c1dd34ae17e
diff --git a/metadata/md5-cache/dev-java/osgi-compendium-4.3.1-r4 b/metadata/md5-cache/dev-java/osgi-compendium-4.3.1-r4
index 6662fb555d0a..8ef832102b41 100644
--- a/metadata/md5-cache/dev-java/osgi-compendium-4.3.1-r4
+++ b/metadata/md5-cache/dev-java/osgi-compendium-4.3.1-r4
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 dev-java/osgi-foundation:0 dev-java/jakarta-servlet-api:4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://docs.osgi.org/download/r4v43/osgi.cmpn-4.3.1.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=31e1c2ea69990e4a833b309fe114c209
diff --git a/metadata/md5-cache/dev-java/osgi-core-8.0.0 b/metadata/md5-cache/dev-java/osgi-core-8.0.0
index 61627d6b4798..05dc06aa9502 100644
--- a/metadata/md5-cache/dev-java/osgi-core-8.0.0
+++ b/metadata/md5-cache/dev-java/osgi-core-8.0.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://docs.osgi.org/download/r8/osgi.core-8.0.0.jar -> osgi-core-8.0.0.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=37cb8ebdfc7a261503a25c2be40c1e56
diff --git a/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r2 b/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r2
index 36d163a46d29..22b404743717 100644
--- a/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r2
+++ b/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.osgi.org/download/r5/osgi.core-5.0.0.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=5af090f872a5bf2c3cff9ab2c3e5a826
diff --git a/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r2 b/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r2
index 44ea2e367cff..f9c0daa36d2e 100644
--- a/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r2
+++ b/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r2
@@ -12,5 +12,5 @@ RDEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 dev-java/tomca
 RESTRICT=bindist
 SLOT=0
 SRC_URI=https://docs.osgi.org/download/r5/osgi.enterprise-5.0.0.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=73a08ca162cb397a8ba5dd880f377f29
diff --git a/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r3 b/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r3
new file mode 100644
index 000000000000..324b7bd50549
--- /dev/null
+++ b/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r3
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 dev-java/javax-servlet-api:2.5 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=OSGi Enterprise Release 5 Companion Code
+EAPI=8
+HOMEPAGE=http://www.osgi.org/Main/HomePage
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 dev-java/javax-servlet-api:2.5 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=bindist
+SLOT=0
+SRC_URI=https://docs.osgi.org/download/r5/osgi.enterprise-5.0.0.jar
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=38ddbfe10015659edb474e7788a0c025
diff --git a/metadata/md5-cache/dev-java/pdf-renderer-1.0.5-r1 b/metadata/md5-cache/dev-java/pdf-renderer-1.0.5-r1
index cd3ca8f7da3c..8c1676ac4440 100644
--- a/metadata/md5-cache/dev-java/pdf-renderer-1.0.5-r1
+++ b/metadata/md5-cache/dev-java/pdf-renderer-1.0.5-r1
@@ -11,5 +11,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/swinglabs/pdf-renderer/1.0.5/pdf-renderer-1.0.5-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=2c78499f210b111fd94d81bd4618a5cc
diff --git a/metadata/md5-cache/dev-java/pdfbox-2.0.27 b/metadata/md5-cache/dev-java/pdfbox-2.0.27
index b3fc793e9739..9f1e4c1c884f 100644
--- a/metadata/md5-cache/dev-java/pdfbox-2.0.27
+++ b/metadata/md5-cache/dev-java/pdfbox-2.0.27
@@ -13,5 +13,5 @@ RDEPEND=dev-java/bcmail:0 dev-java/bcprov:0 dev-java/commons-logging:0 ~dev-java
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/pdfbox/2.0.27/pdfbox-2.0.27-src.zip test? ( https://issues.apache.org/jira/secure/attachment/12481683/1.pdf -> PDFBOX-1031-1.pdf https://issues.apache.org/jira/secure/attachment/12481684/2.pdf -> PDFBOX-1031-2.pdf https://issues.apache.org/jira/secure/attachment/12486525/1_testfile1.pdf -> PDFBOX-1065-1.pdf https://issues.apache.org/jira/secure/attachment/12486526/2_testfile1.pdf -> PDFBOX-1065-2.pdf https://issues.apache.org/jira/secure/attachment/12490774/a.pdf -> PDFBOX-1100-1.pdf https://issues.apache.org/jira/secure/attachment/12490775/b.pdf -> PDFBOX-1100-2.pdf https://issues.apache.org/jira/secure/attachment/12848122/SF1199AEG%20%28Complete%29.pdf -> PDFBOX-3656.pdf https://issues.apache.org/jira/secure/attachment/12852207/test.pdf -> PDFBOX-3682.pdf https://issues.apache.org/jira/secure/attachment/12888957/079977.pdf -> PDFBOX-3940-079977.pdf https://issues.apache.org/jira/secure/attachment/12867113/202097.pdf -> PDFBOX-3785-202097.pdf https://issues.apache.org/jira/secure/attachment/12890031/670064.pdf -> PDFBOX-3947-670064.pdf https://issues.apache.org/jira/secure/attachment/12890034/EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf -> PDFBOX-3948-EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf https://issues.apache.org/jira/secure/attachment/12890037/MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf -> PDFBOX-3949-MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf https://issues.apache.org/jira/secure/attachment/12890042/23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf -> PDFBOX-3950-23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf https://issues.apache.org/jira/secure/attachment/12890047/FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf -> PDFBOX-3951-FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf https://issues.apache.org/jira/secure/attachment/12892097/c687766d68ac766be3f02aaec5e0d713_2.pdf -> PDFBOX-3964-c687766d68ac766be3f02aaec5e0d713_2.pdf https://issues.apache.org/jira/secure/attachment/12893582/63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf -> PDFBOX-3977-63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf https://issues.apache.org/jira/secure/attachment/12896905/GeneralForbearance.pdf -> PDFBOX-3999-GeneralForbearance.pdf https://issues.apache.org/jira/secure/attachment/12919726/sample.pdf -> PDFBOX-4197.pdf https://issues.apache.org/jira/secure/attachment/12938094/Quelldatei.pdf -> PDFBOX-4308.pdf https://issues.apache.org/jira/secure/attachment/12952086/form.pdf -> PDFBOX-4408.pdf https://issues.apache.org/jira/secure/attachment/12953423/000314.pdf -> PDFBOX-4418-000314.pdf https://issues.apache.org/jira/secure/attachment/12953421/000671.pdf -> PDFBOX-4418-000671.pdf https://issues.apache.org/jira/secure/attachment/12953866/000746.pdf -> PDFBOX-4423-000746.pdf https://issues.apache.org/jira/secure/attachment/12966453/cryptfilter.pdf -> PDFBOX-4517-cryptfilter.pdf https://issues.apache.org/jira/secure/attachment/12991833/PDFBOX-4750-test.pdf -> PDFBOX-4750.pdf https://issues.apache.org/jira/secure/attachment/12914331/WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf -> PDFBOX-4153-WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf https://issues.apache.org/jira/secure/attachment/12962991/NeS1078.pdf -> PDFBOX-4490.pdf https://issues.apache.org/jira/secure/attachment/12784025/PDFBOX-3208-L33MUTT2SVCWGCS6UIYL5TH3PNPXHIS6.pdf https://issues.apache.org/jira/secure/attachment/12867102/PDFBOX-3783-72GLBIGUC6LB46ELZFBARRJTLN4RBSQM.pdf https://issues.apache.org/jira/secure/attachment/12929821/16bit.png -> PDFBOX-4184-16bit.png https://issues.apache.org/jira/secure/attachment/12943502/ArrayIndexOutOfBoundsException%20COSParser -> PDFBOX-4338.pdf https://issues.apache.org/jira/secure/attachment/12943503/NullPointerException%20COSParser -> PDFBOX-4339.pdf https://issues.apache.org/jira/secure/attachment/12867433/genko_oc_shiryo1.pdf https://moji.or.jp/wp-content/ipafont/IPAfont/ipag00303.zip https://moji.or.jp/wp-content/ipafont/IPAfont/ipagp00303.zip https://issues.apache.org/jira/secure/attachment/12911053/n019003l.pfb https://issues.apache.org/jira/secure/attachment/12949710/032163.jpg -> PDFBOX-4184-032163.jpg https://issues.apache.org/jira/secure/attachment/13025718/lotus.jpg -> PDFBOX-5196-lotus.jpg https://issues.apache.org/jira/secure/attachment/13002695/13._Korona_szallo_vegzes_13.09.26.eredeti.pdf -> PDFBOX-4831.pdf )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=24274850be687a530ffdbff6cb6971a6
diff --git a/metadata/md5-cache/dev-java/picocli-4.6.3-r1 b/metadata/md5-cache/dev-java/picocli-4.6.3-r1
index 9874bd0a7062..882641c62886 100644
--- a/metadata/md5-cache/dev-java/picocli-4.6.3-r1
+++ b/metadata/md5-cache/dev-java/picocli-4.6.3-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/remkop/picocli/archive/v4.6.3.tar.gz -> picocli-4.6.3-sources.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=db5e2ea1ef3c5fff4dd8d4e5c43dbe0a
diff --git a/metadata/md5-cache/dev-java/plexus-classworlds-2.6.0 b/metadata/md5-cache/dev-java/plexus-classworlds-2.6.0
index 8a3bdcc153cc..cadb7026826b 100644
--- a/metadata/md5-cache/dev-java/plexus-classworlds-2.6.0
+++ b/metadata/md5-cache/dev-java/plexus-classworlds-2.6.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/codehaus-plexus/plexus-classworlds/archive/plexus-classworlds-2.6.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=6ee76b6ffed94c3ca241032f10d11f7a
diff --git a/metadata/md5-cache/dev-java/poi-5.2.3 b/metadata/md5-cache/dev-java/poi-5.2.3
index 975de5017646..4614a378aa4b 100644
--- a/metadata/md5-cache/dev-java/poi-5.2.3
+++ b/metadata/md5-cache/dev-java/poi-5.2.3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/poi/release/src/poi-src-5.2.3-20220909.tgz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=1f34718ed49e41427652b9b5e773b2d1
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.21.12 b/metadata/md5-cache/dev-java/protobuf-java-3.21.12
index faf3ef87c5a9..0e287a0745e8 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.21.12
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.21.12
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v21.12.tar.gz -> protobuf-21.12.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=435d8c2f1c047d369dcc3a466b7b2e15
diff --git a/metadata/md5-cache/dev-java/qdox-2.0.1 b/metadata/md5-cache/dev-java/qdox-2.0.1
index 775a9f01498c..213cc48a818b 100644
--- a/metadata/md5-cache/dev-java/qdox-2.0.1
+++ b/metadata/md5-cache/dev-java/qdox-2.0.1
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/paul-hammant/qdox/archive/qdox-2.0.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=13e8dbdb52a315b4ee9b2842be5f9441
diff --git a/metadata/md5-cache/dev-java/randomized-runner-2.8.0 b/metadata/md5-cache/dev-java/randomized-runner-2.8.0
index 4fd1bcd38ab7..5e853fe668bf 100644
--- a/metadata/md5-cache/dev-java/randomized-runner-2.8.0
+++ b/metadata/md5-cache/dev-java/randomized-runner-2.8.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 sou
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/randomizedtesting/randomizedtesting/archive/release/2.8.0.tar.gz -> randomized-runner-2.8.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=ffa4a8dedf4d659af3f555a344b67949
diff --git a/metadata/md5-cache/dev-java/reflections-0.9.12-r4 b/metadata/md5-cache/dev-java/reflections-0.9.12-r4
index e055a58de7b4..032bfcd9ee85 100644
--- a/metadata/md5-cache/dev-java/reflections-0.9.12-r4
+++ b/metadata/md5-cache/dev-java/reflections-0.9.12-r4
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/dom4j:1 dev-java/gson:2.6 dev-java/javassis
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ronmamo/reflections/archive/0.9.12.tar.gz -> reflections-0.9.12.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=85285738ca805c1f64eef5581645f7f5
diff --git a/metadata/md5-cache/dev-java/reflections-0.9.12-r5 b/metadata/md5-cache/dev-java/reflections-0.9.12-r5
new file mode 100644
index 000000000000..e93bdbd5d2ef
--- /dev/null
+++ b/metadata/md5-cache/dev-java/reflections-0.9.12-r5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/javax-servlet-api:2.5 >=virtual/jdk-1.8:* dev-java/dom4j:1 dev-java/gson:2.6 dev-java/javassist:3 dev-java/slf4j-api:0 dev-java/slf4j-simple:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Reflections - a Java runtime metadata analysis
+EAPI=8
+HOMEPAGE=https://github.com/ronmamo/reflections
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=WTFPL-2 BSD-2
+RDEPEND=>=virtual/jre-1.8:* dev-java/dom4j:1 dev-java/gson:2.6 dev-java/javassist:3 dev-java/slf4j-api:0 dev-java/slf4j-simple:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ronmamo/reflections/archive/0.9.12.tar.gz -> reflections-0.9.12.tar.gz
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=2494bd189d9b308ebb5f128355bfb030
diff --git a/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r3 b/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r3
index 559146c23f1a..c7c6dcf0e84b 100644
--- a/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r3
+++ b/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r3
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/relaxng/relaxngDatatype-1.0.zip -> relaxng-datatype-1.0.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=6b41635752749efe6c795a098b293ad6
diff --git a/metadata/md5-cache/dev-java/relaxng-datatype-20020414 b/metadata/md5-cache/dev-java/relaxng-datatype-20020414
index ace4e7b6185c..d888db22f23c 100644
--- a/metadata/md5-cache/dev-java/relaxng-datatype-20020414
+++ b/metadata/md5-cache/dev-java/relaxng-datatype-20020414
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/relaxngDatatype/relaxngDatatype/20020414/relaxngDatatype-20020414-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=6848b08a00e005ea214e14d903654d1f
diff --git a/metadata/md5-cache/dev-java/reload4j-1.2.22 b/metadata/md5-cache/dev-java/reload4j-1.2.22
index b5d30370a8c3..68a84c2817b2 100644
--- a/metadata/md5-cache/dev-java/reload4j-1.2.22
+++ b/metadata/md5-cache/dev-java/reload4j-1.2.22
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/javax-mail:0 dev-java/jboss-jms-api:1.1 >=d
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/reload4j/archive/v_1.2.22.tar.gz -> reload4j-1.2.22.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=b3ff7d60da0064d7d74c7fca86bf26ed
diff --git a/metadata/md5-cache/dev-java/rhino-1.7.14 b/metadata/md5-cache/dev-java/rhino-1.7.14
index d42c60be6083..0bffa5721b46 100644
--- a/metadata/md5-cache/dev-java/rhino-1.7.14
+++ b/metadata/md5-cache/dev-java/rhino-1.7.14
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=1.6
 SRC_URI=https://github.com/mozilla/rhino/archive/Rhino1_7_14_Release.tar.gz -> rhino-1.7.14.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=e22c22e09284defb9a49b15e471af42c
diff --git a/metadata/md5-cache/dev-java/rome-0.9-r4 b/metadata/md5-cache/dev-java/rome-0.9-r4
index 30b023b68429..43f9c9d9fa91 100644
--- a/metadata/md5-cache/dev-java/rome-0.9-r4
+++ b/metadata/md5-cache/dev-java/rome-0.9-r4
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jdom:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 sour
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gentoo/rome-0.9.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=213f0e66eb276ced3a6c501f727e5592
diff --git a/metadata/md5-cache/dev-java/sac-1.3-r4 b/metadata/md5-cache/dev-java/sac-1.3-r4
index 6838426e901b..3a4a63943af4 100644
--- a/metadata/md5-cache/dev-java/sac-1.3-r4
+++ b/metadata/md5-cache/dev-java/sac-1.3-r4
@@ -11,5 +11,5 @@ LICENSE=W3C
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://www.w3.org/2002/06/sacjava-1.3.zip -> sac-1.3.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=1b00e55158cbaeeb6aeb966bb8d0e47e
diff --git a/metadata/md5-cache/dev-java/saslprep-1.1-r1 b/metadata/md5-cache/dev-java/saslprep-1.1-r1
index 558600eaeae7..972dc04fdc70 100644
--- a/metadata/md5-cache/dev-java/saslprep-1.1-r1
+++ b/metadata/md5-cache/dev-java/saslprep-1.1-r1
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* dev-java/stringprep:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/ongres/stringprep/saslprep/1.1/saslprep-1.1-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8479af41ff6c2a238ee56ac3abafdaa4
diff --git a/metadata/md5-cache/dev-java/sax-2.2.1-r5 b/metadata/md5-cache/dev-java/sax-2.2.1-r5
index 4a2d4ec03d3d..616f0a95742c 100644
--- a/metadata/md5-cache/dev-java/sax-2.2.1-r5
+++ b/metadata/md5-cache/dev-java/sax-2.2.1-r5
@@ -11,5 +11,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/sax/sax2r3.zip -> sax-2.2.1.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=7a2c78e8c769fc141720a601e6ffdfdf
diff --git a/metadata/md5-cache/dev-java/saxon-6.5.5-r3 b/metadata/md5-cache/dev-java/saxon-6.5.5-r3
index f25cd0e37394..ebc7bfeb489c 100644
--- a/metadata/md5-cache/dev-java/saxon-6.5.5-r3
+++ b/metadata/md5-cache/dev-java/saxon-6.5.5-r3
@@ -11,5 +11,5 @@ LICENSE=MPL-1.1
 RDEPEND=dev-java/jdom:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=6.5
 SRC_URI=mirror://sourceforge/project/saxon/saxon6/6.5.5/saxon6-5-5.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=58ccce8abcdbad8e38d4e11952e2031c
diff --git a/metadata/md5-cache/dev-java/scram-2.1 b/metadata/md5-cache/dev-java/scram-2.1
index 1944b0001ed9..a85cbbcb1fe1 100644
--- a/metadata/md5-cache/dev-java/scram-2.1
+++ b/metadata/md5-cache/dev-java/scram-2.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/saslprep:0 >=dev-java/java-config-2.2.0-r3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/ongresinc/scram/-/archive/2.1/scram-2.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=f03d39f288f35be24e795d74483b0153
diff --git a/metadata/md5-cache/dev-java/sjsxp-1.0.2 b/metadata/md5-cache/dev-java/sjsxp-1.0.2
index 69abe6333552..8e75e0016f8e 100644
--- a/metadata/md5-cache/dev-java/sjsxp-1.0.2
+++ b/metadata/md5-cache/dev-java/sjsxp-1.0.2
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/xpp3:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/sun/xml/stream/sjsxp/1.0.2/sjsxp-1.0.2-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=308d0100ae4ba811f4261b0944400eaf
diff --git a/metadata/md5-cache/dev-java/slf4j-api-2.0.3 b/metadata/md5-cache/dev-java/slf4j-api-2.0.3
index acc6aad904e3..b72130d18d12 100644
--- a/metadata/md5-cache/dev-java/slf4j-api-2.0.3
+++ b/metadata/md5-cache/dev-java/slf4j-api-2.0.3
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8d3e2c14d46b04c10587b5e30cd66c85
diff --git a/metadata/md5-cache/dev-java/slf4j-ext-2.0.3 b/metadata/md5-cache/dev-java/slf4j-ext-2.0.3
index 3bae734c0e82..af3bea21ba9f 100644
--- a/metadata/md5-cache/dev-java/slf4j-ext-2.0.3
+++ b/metadata/md5-cache/dev-java/slf4j-ext-2.0.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/cal10n:0 dev-java/javassist:3 ~dev-java/slf
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=296eeb74c0907f93c5473a9e8ed14a52
diff --git a/metadata/md5-cache/dev-java/slf4j-nop-2.0.3 b/metadata/md5-cache/dev-java/slf4j-nop-2.0.3
index c5dc780532b0..094ed372e493 100644
--- a/metadata/md5-cache/dev-java/slf4j-nop-2.0.3
+++ b/metadata/md5-cache/dev-java/slf4j-nop-2.0.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/slf4j-api-2.0.3:0 >=dev-java/java-config-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=f6498be8910a028b01ef1c4a659fb4e6
diff --git a/metadata/md5-cache/dev-java/slf4j-reload4j-2.0.3 b/metadata/md5-cache/dev-java/slf4j-reload4j-2.0.3
index a03a1dfa5ca0..6545ce296084 100644
--- a/metadata/md5-cache/dev-java/slf4j-reload4j-2.0.3
+++ b/metadata/md5-cache/dev-java/slf4j-reload4j-2.0.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/reload4j:0 ~dev-java/slf4j-api-2.0.3:0 >=de
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=c0d8ae144a3cd2102f5ec172801b0cce
diff --git a/metadata/md5-cache/dev-java/slf4j-simple-2.0.3 b/metadata/md5-cache/dev-java/slf4j-simple-2.0.3
index 14f0260c02e4..c3ec66018e80 100644
--- a/metadata/md5-cache/dev-java/slf4j-simple-2.0.3
+++ b/metadata/md5-cache/dev-java/slf4j-simple-2.0.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/slf4j-api-2.0.3:0 >=dev-java/java-config-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=778d0b8809400ec08a6ea785cec13279
diff --git a/metadata/md5-cache/dev-java/snakeyaml-1.33 b/metadata/md5-cache/dev-java/snakeyaml-1.33
index 89a8fc62ef54..2fa91c720548 100644
--- a/metadata/md5-cache/dev-java/snakeyaml-1.33
+++ b/metadata/md5-cache/dev-java/snakeyaml-1.33
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/snakeyaml/snakeyaml/get/snakeyaml-1.33.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8f519c2540dfaf4f22e4c33e3b90e8f2
diff --git a/metadata/md5-cache/dev-java/sparsebitset-1.2 b/metadata/md5-cache/dev-java/sparsebitset-1.2
index 3c5a6b0b4f9c..8b0c420487bc 100644
--- a/metadata/md5-cache/dev-java/sparsebitset-1.2
+++ b/metadata/md5-cache/dev-java/sparsebitset-1.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/brettwooldridge/SparseBitSet/archive/refs/tags/SparseBitSet-1.2.tar.gz -> sparsebitset-1.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=5f69a03feebea29a78b517f77e5b9cf8
diff --git a/metadata/md5-cache/dev-java/stax2-api-4.2.1-r1 b/metadata/md5-cache/dev-java/stax2-api-4.2.1-r1
index 01a1b1ebf040..6d64e01eecf8 100644
--- a/metadata/md5-cache/dev-java/stax2-api-4.2.1-r1
+++ b/metadata/md5-cache/dev-java/stax2-api-4.2.1-r1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/stax2-api/archive/refs/tags/stax2-api-4.2.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=950511a8e1083c5f4ad34a160222c06e
diff --git a/metadata/md5-cache/dev-java/stringprep-1.1 b/metadata/md5-cache/dev-java/stringprep-1.1
index 5f1b0b5eda9c..50eb8190a50c 100644
--- a/metadata/md5-cache/dev-java/stringprep-1.1
+++ b/metadata/md5-cache/dev-java/stringprep-1.1
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/ongres/stringprep/stringprep/1.1/stringprep-1.1-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=60be8cc441cc9801b4844c531d85b0ca
diff --git a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r2 b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r2
index 3f17413fc237..359aeee0cd39 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r2
+++ b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/antlr:0 >=dev-java/java-config-2.2.0-r3 sou
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/antlr/stringtemplate3/archive/68f2a42e8038f8e716e9666909ea485ee8aff45a.tar.gz -> stringtemplate-3.2.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=ce2be796703b4a85cc2dc9fa30c706f7
diff --git a/metadata/md5-cache/dev-java/stringtemplate-4.3.2 b/metadata/md5-cache/dev-java/stringtemplate-4.3.2
index cb958295db40..b6c86f4c6962 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-4.3.2
+++ b/metadata/md5-cache/dev-java/stringtemplate-4.3.2
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/antlr-runtime:3.5 >=dev-java/java-config-2.
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://repo1.maven.org/maven2/org/antlr/ST4/4.3.2/ST4-4.3.2-sources.jar https://github.com/antlr/stringtemplate4/archive/4.3.2.tar.gz -> stringtemplate-4.3.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=7a97a65cb993f6578b85ff5c07499110
diff --git a/metadata/md5-cache/dev-java/swing-layout-1.0.4-r2 b/metadata/md5-cache/dev-java/swing-layout-1.0.4-r2
index 859d3c6c209d..2519674668e4 100644
--- a/metadata/md5-cache/dev-java/swing-layout-1.0.4-r2
+++ b/metadata/md5-cache/dev-java/swing-layout-1.0.4-r2
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gentoo/swing-layout-1.0.4-src.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=2676b345338fb20e84e5cddcba153511
diff --git a/metadata/md5-cache/dev-java/swingx-1.6.4-r1 b/metadata/md5-cache/dev-java/swingx-1.6.4-r1
index 42e674d7d254..21db5d9fde98 100644
--- a/metadata/md5-cache/dev-java/swingx-1.6.4-r1
+++ b/metadata/md5-cache/dev-java/swingx-1.6.4-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/jre:1.8 dev-java/metainf-services:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.6
 SRC_URI=https://maven.java.net/service/local/repositories/releases/content/org/swinglabs/swingx/swingx-all/1.6.4/swingx-all-1.6.4-sources.jar https://java.net/projects/swingx/downloads/download/releases/swingx-mavensupport-1.6.4-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8b75665f7ccbc2320259e96eef6cebf2
diff --git a/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4-r1 b/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4-r1
index e2bdaba8d168..eb7524548f60 100644
--- a/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4-r1
+++ b/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4-r1
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.8:* dev-java/swingx:1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://java.net/downloads/swingx/releases/swingx-beaninfo-1.6.4-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=f12e43df4ba1e563f1b2e5f55c8df20c
diff --git a/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r2 b/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r2
index 4c97c6aa3e64..8d1891f97a54 100644
--- a/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r2
+++ b/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r2
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/jakarta-xml-soap-api:1 dev-java/jdom:0 dev-java/json:0 dev-java/rome:0 dev-java/jtidy:0 dev-java/xerces:2 dev-java/swingx:1.6 dev-java/swing-layout:1 dev-java/swingx-beaninfo:0 dev-java/commons-httpclient:3 dev-java/xml-commons-external:1.4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=bt747
 SRC_URI=mirror://sourceforge/bt747/Development/swingx-ws-2011_05_15-src.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=48ea44ce683e8616b1bf5804c5571b74
diff --git a/metadata/md5-cache/dev-java/system-rules-1.19.0 b/metadata/md5-cache/dev-java/system-rules-1.19.0
index 120ee1bf493a..10da4e81d3ff 100644
--- a/metadata/md5-cache/dev-java/system-rules-1.19.0
+++ b/metadata/md5-cache/dev-java/system-rules-1.19.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 sou
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/stefanbirkner/system-rules/archive/system-rules-1.19.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=99c09d7bec18b6cb525588968c5568bf
diff --git a/metadata/md5-cache/dev-java/testng-6.9.10-r1 b/metadata/md5-cache/dev-java/testng-6.9.10-r1
index 5dcf01429649..5510225ff6ed 100644
--- a/metadata/md5-cache/dev-java/testng-6.9.10-r1
+++ b/metadata/md5-cache/dev-java/testng-6.9.10-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/bsh:0 dev-java/guice:4 dev-java/junit:4 dev-java/ant-core:0 dev
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cbeust/testng/archive/6.9.10.tar.gz -> testng-6.9.10.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=5de2015633ade6be261ed58d4f3809b1
diff --git a/metadata/md5-cache/dev-java/tomcat-el-api-10.1.5 b/metadata/md5-cache/dev-java/tomcat-el-api-10.1.5
index 1efd2a5d06b2..c2607d76a752 100644
--- a/metadata/md5-cache/dev-java/tomcat-el-api-10.1.5
+++ b/metadata/md5-cache/dev-java/tomcat-el-api-10.1.5
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=5.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=cf50e26184f54a76c3a9c592977851f3
diff --git a/metadata/md5-cache/dev-java/tomcat-el-api-8.5.85 b/metadata/md5-cache/dev-java/tomcat-el-api-8.5.85
index 45cc59a4b3af..2d2d91254176 100644
--- a/metadata/md5-cache/dev-java/tomcat-el-api-8.5.85
+++ b/metadata/md5-cache/dev-java/tomcat-el-api-8.5.85
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=f6fe1875197197849063a7fc4dcb037f
diff --git a/metadata/md5-cache/dev-java/tomcat-el-api-9.0.71 b/metadata/md5-cache/dev-java/tomcat-el-api-9.0.71
index 8f644a86b504..ece0dc1ea5aa 100644
--- a/metadata/md5-cache/dev-java/tomcat-el-api-9.0.71
+++ b/metadata/md5-cache/dev-java/tomcat-el-api-9.0.71
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=df8f695d1d7bbad39f5267e98f1b3de6
diff --git a/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.5 b/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.5
index a60d829af48a..4a23ee3bf1eb 100644
--- a/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.5
+++ b/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.5
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-11:* ~dev-java/tomcat-el-api-10.1.5:5.0 ~dev-java/tomcat-servlet-api-10.1.5:6.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=0bb551a7c7bfe9714ad793d2fe88e3b1
diff --git a/metadata/md5-cache/dev-java/tomcat-jsp-api-8.5.85 b/metadata/md5-cache/dev-java/tomcat-jsp-api-8.5.85
index d696d677d07d..ca02147fbc35 100644
--- a/metadata/md5-cache/dev-java/tomcat-jsp-api-8.5.85
+++ b/metadata/md5-cache/dev-java/tomcat-jsp-api-8.5.85
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/tomcat-el-api-8.5.85:3.0 ~dev-java/tomcat-servlet-api-8.5.85:3.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=6625c15023b978c345ecbbf41e4d2c87
diff --git a/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.71 b/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.71
index 3ced3f33ce87..2e2423c9dcec 100644
--- a/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.71
+++ b/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.71
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/tomcat-el-api-9.0.71:3.0 ~dev-java/tomcat-servlet-api-9.0.71:4.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=aa21f88ea41778645f03b852172c58a7
diff --git a/metadata/md5-cache/dev-java/tomcat-native-2.0.3-r1 b/metadata/md5-cache/dev-java/tomcat-native-2.0.3-r1
index 809aebf66388..90fe1c528e8b 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-2.0.3-r1
+++ b/metadata/md5-cache/dev-java/tomcat-native-2.0.3-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/apr:1= dev-libs/openssl:0/3 >=virtual/jre-1.8:* >=dev-java/java
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/2.0.3/source/tomcat-native-2.0.3-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/native/2.0.3/source/tomcat-native-2.0.3-src.tar.gz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=a1c9a6ba8179f9c6668bafe36b75ab9d
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.5 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.5
index a93b834f1639..d9868995f3c0 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.5
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.5
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-11:* ~dev-java/tomcat-el-api-10.1.5:5.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=6.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=2374a7418f92bcc4545343cb34a0b633
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.109 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.109
index cb4416452f05..3d55cc2b0cde 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.109
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.109
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.109/src/apache-tomcat-7.0.109-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8b2861f02a5c0fc5d82edcfef67e2583
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.85 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.85
index a2a8af5bda06..3e623dfdefa9 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.85
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.85
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/tomcat-el-api-8.5.85:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=3ded8a4c54cf3ab99d25dee9cf6dad3c
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.71 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.71
index 32a475dbc257..278f387243f0 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.71
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.71
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/tomcat-el-api-9.0.71:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=62647a5fa80f845bd380fba7c962a9fb
diff --git a/metadata/md5-cache/dev-java/treelayout-1.0.3-r1 b/metadata/md5-cache/dev-java/treelayout-1.0.3-r1
index 43aa36168eec..0123a017a7c0 100644
--- a/metadata/md5-cache/dev-java/treelayout-1.0.3-r1
+++ b/metadata/md5-cache/dev-java/treelayout-1.0.3-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/abego/treelayout/archive/v1.0.3.tar.gz -> treelayout-1.0.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8887a0352989a252aa1bba63953ac9bb
diff --git a/metadata/md5-cache/dev-java/typesafe-config-1.4.2 b/metadata/md5-cache/dev-java/typesafe-config-1.4.2
index 8907e61f213e..43494a44a7b2 100644
--- a/metadata/md5-cache/dev-java/typesafe-config-1.4.2
+++ b/metadata/md5-cache/dev-java/typesafe-config-1.4.2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/lightbend/config/archive/v1.4.2.tar.gz -> typesafe-config-1.4.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=908813cab4fcc930cc4aecdd557ee93d
diff --git a/metadata/md5-cache/dev-java/unbescape-1.1.6 b/metadata/md5-cache/dev-java/unbescape-1.1.6
index d55eb85a125c..3a9fe376f016 100644
--- a/metadata/md5-cache/dev-java/unbescape-1.1.6
+++ b/metadata/md5-cache/dev-java/unbescape-1.1.6
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/unbescape/unbescape/archive/unbescape-1.1.6.RELEASE.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=c1e16e907ccc62ebf561f004e95db972
diff --git a/metadata/md5-cache/dev-java/univocity-parsers-2.9.1 b/metadata/md5-cache/dev-java/univocity-parsers-2.9.1
index 9eb1f8c21049..669f0c4891e7 100644
--- a/metadata/md5-cache/dev-java/univocity-parsers-2.9.1
+++ b/metadata/md5-cache/dev-java/univocity-parsers-2.9.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/uniVocity/univocity-parsers/archive/refs/tags/v2.9.1.tar.gz -> univocity-parsers-2.9.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=19253877fdd33c094d6d50c427f7f224
diff --git a/metadata/md5-cache/dev-java/validation-api-1.0.0-r1 b/metadata/md5-cache/dev-java/validation-api-1.0.0-r1
index 1b5c6257fabc..3d3a57888072 100644
--- a/metadata/md5-cache/dev-java/validation-api-1.0.0-r1
+++ b/metadata/md5-cache/dev-java/validation-api-1.0.0-r1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://repository.jboss.org/nexus/service/local/repo_groups/public/content/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=a0a24c2ae72b3e51abe0c0d08b649679
diff --git a/metadata/md5-cache/dev-java/validation-api-1.1.0-r1 b/metadata/md5-cache/dev-java/validation-api-1.1.0-r1
index a54777552b66..538463ffd7c4 100644
--- a/metadata/md5-cache/dev-java/validation-api-1.1.0-r1
+++ b/metadata/md5-cache/dev-java/validation-api-1.1.0-r1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://repo1.maven.org/maven2/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-sources.jar -> validation-api-1.1.0.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=5e3cfb69d85910d60d651cc0a669454d
diff --git a/metadata/md5-cache/dev-java/velocity-2.3 b/metadata/md5-cache/dev-java/velocity-2.3
index e81d9c579f3f..f1ec028bd1ad 100644
--- a/metadata/md5-cache/dev-java/velocity-2.3
+++ b/metadata/md5-cache/dev-java/velocity-2.3
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-io-2.8.0:1 >=dev-java/commons-lan
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/apache/velocity-engine/archive/refs/tags/2.3.tar.gz -> velocity-2.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=196e2c49434cac18d569e94ce794c2cf
diff --git a/metadata/md5-cache/dev-java/woodstox-core-6.4.0 b/metadata/md5-cache/dev-java/woodstox-core-6.4.0
index 16ef0ee50300..8c8749cff60e 100644
--- a/metadata/md5-cache/dev-java/woodstox-core-6.4.0
+++ b/metadata/md5-cache/dev-java/woodstox-core-6.4.0
@@ -11,5 +11,5 @@ RDEPEND=dev-java/msv:0 dev-java/relaxng-datatype:0 dev-java/stax2-api:0 dev-java
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/woodstox/archive/woodstox-core-6.4.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=950d670ebe48986ff8af948e4eb973ea
diff --git a/metadata/md5-cache/dev-java/wsdl4j-1.6.3 b/metadata/md5-cache/dev-java/wsdl4j-1.6.3
index d0dc6421d746..d69ef6ad7a4b 100644
--- a/metadata/md5-cache/dev-java/wsdl4j-1.6.3
+++ b/metadata/md5-cache/dev-java/wsdl4j-1.6.3
@@ -11,5 +11,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/wsdl4j/WSDL4J/1.6.3/wsdl4j-src-1.6.3.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=25305cc789027193056fb86672482904
diff --git a/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1 b/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1
index 12ff417980f1..6f26fae2832e 100644
--- a/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1
+++ b/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/xalan/xalan-j/source/xalan-j_2_7_2-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=cd902d6eff7e78d19623f8568ba74796
diff --git a/metadata/md5-cache/dev-java/xerces-2.12.2 b/metadata/md5-cache/dev-java/xerces-2.12.2
index ef9ad559d01f..c0a71151016d 100644
--- a/metadata/md5-cache/dev-java/xerces-2.12.2
+++ b/metadata/md5-cache/dev-java/xerces-2.12.2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/xml-commons-external:1.4 dev-java/xml-commons-resolver:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/xerces/j/source/Xerces-J-src.2.12.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=7fa4e7df315d179713b3fd20c507a16c
diff --git a/metadata/md5-cache/dev-java/xerial-core-2.1 b/metadata/md5-cache/dev-java/xerial-core-2.1
index a233f2017de0..e42678259a51 100644
--- a/metadata/md5-cache/dev-java/xerial-core-2.1
+++ b/metadata/md5-cache/dev-java/xerial-core-2.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xerial/xerial-java/archive/2.1.tar.gz -> xerial-core-2.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=79739ea4111dfa331b7d9653f0054d92
diff --git a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r2 b/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r2
index 92d32f355d6a..f984c0dfd961 100644
--- a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r2
+++ b/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r2
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.4
 SRC_URI=https://repo1.maven.org/maven2/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-sources.jar -> xml-commons-external-1.4.01.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=11df5eb34ec712c6d6bd68a8a8901ed0
diff --git a/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r3 b/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r3
index ac959a9e8596..d99a355f63d7 100644
--- a/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r3
+++ b/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/xerces/xml-commons/xml-commons-resolver-1.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=62cf7cdb0ea6134a378cdae8184a8d35
diff --git a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.8 b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.8
index ea13cc0cf3b8..dcb63819e9e4 100644
--- a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.8
+++ b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.8
@@ -12,5 +12,5 @@ RDEPEND=dev-java/commons-io:1 dev-java/commons-logging:0 >=virtual/jre-1.8:* >=d
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-2.8-src.tar.gz verify-sig? ( https://downloads.apache.org/xmlgraphics/commons/source/xmlgraphics-commons-2.8-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=96f14e668236d46c2c26e991cfd6703c
diff --git a/metadata/md5-cache/dev-java/xmpbox-2.0.27 b/metadata/md5-cache/dev-java/xmpbox-2.0.27
index c4b67fdfb761..8db6b2ec8439 100644
--- a/metadata/md5-cache/dev-java/xmpbox-2.0.27
+++ b/metadata/md5-cache/dev-java/xmpbox-2.0.27
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jaxb-api:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/pdfbox/2.0.27/pdfbox-2.0.27-src.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=62031f511db190b6effb65117fcb0f55
diff --git a/metadata/md5-cache/dev-java/xom-1.3.7 b/metadata/md5-cache/dev-java/xom-1.3.7
index 144a376fd538..5f96d926c404 100644
--- a/metadata/md5-cache/dev-java/xom-1.3.7
+++ b/metadata/md5-cache/dev-java/xom-1.3.7
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jaxen:1.2 dev-java/xerces:2 >=virtual/jre-1.8:* >=dev-java/java
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/elharo/xom/releases/download/v1.3.7/xom-1.3.7-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=9c30cff4e1a02cc0ffcbe68aa5a5c148
diff --git a/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6 b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6
index 4919028e9425..ff12b206d16c 100644
--- a/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6
+++ b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6
@@ -10,5 +10,5 @@ LICENSE=Apache-1.1 IBM JDOM LGPL-2.1+
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/xpp3/xpp3/1.1.4c/xpp3-1.1.4c-sources.jar -> xpp3-1.1.4c.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=805b3964c2455242a09dcf8a33a87ccd
diff --git a/metadata/md5-cache/dev-java/xsdlib-2022.7 b/metadata/md5-cache/dev-java/xsdlib-2022.7
index d6fd160f2fef..e16e3aaeac98 100644
--- a/metadata/md5-cache/dev-java/xsdlib-2022.7
+++ b/metadata/md5-cache/dev-java/xsdlib-2022.7
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/relaxng-datatype:0 dev-java/xerces:2 >=dev-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xmlark/msv/archive/msv-2022.7.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=4cc194c182c5d9ca153f772172cb40d1
diff --git a/metadata/md5-cache/dev-java/xz-java-1.9 b/metadata/md5-cache/dev-java/xz-java-1.9
index 5a321ceb9eb8..f3360e25c975 100644
--- a/metadata/md5-cache/dev-java/xz-java-1.9
+++ b/metadata/md5-cache/dev-java/xz-java-1.9
@@ -10,5 +10,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://tukaani.org/xz/xz-java-1.9.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=4c9fa9f91e413a04f4e7bf627a55dad3
diff --git a/metadata/md5-cache/dev-java/zstd-jni-1.5.2.5 b/metadata/md5-cache/dev-java/zstd-jni-1.5.2.5
index 7d391ba63034..88ef0ebb8a26 100644
--- a/metadata/md5-cache/dev-java/zstd-jni-1.5.2.5
+++ b/metadata/md5-cache/dev-java/zstd-jni-1.5.2.5
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/luben/zstd-jni/archive/c1.5.2-5.tar.gz -> zstd-jni-1.5.2.5.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=9b364aea5da8cf709ebb9db674de07ce
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 7e59f7897244..bf2901f11d5b 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/qxlsx-1.4.4 b/metadata/md5-cache/dev-libs/qxlsx-1.4.4
deleted file mode 100644
index cd185fb99999..000000000000
--- a/metadata/md5-cache/dev-libs/qxlsx-1.4.4
+++ /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 setup test
-DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5= ) qt6? ( dev-qt/qtbase:6=[gui] )
-DESCRIPTION=Excel file(*.xlsx) reader/writer library using Qt
-EAPI=8
-HOMEPAGE=https://github.com/QtExcel/QXlsx
-INHERIT=multibuild cmake
-IUSE=qt5 qt6
-KEYWORDS=amd64 ppc ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5= ) qt6? ( dev-qt/qtbase:6=[gui] )
-REQUIRED_USE=|| ( qt5 qt6 )
-SLOT=0/0.1.4.4
-SRC_URI=https://github.com/QtExcel/QXlsx/archive/v1.4.4.tar.gz -> qxlsx-1.4.4.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8522f3f3e6a85a62a2c7c983d237e234
diff --git a/metadata/md5-cache/dev-libs/qxlsx-1.4.5 b/metadata/md5-cache/dev-libs/qxlsx-1.4.5
index 7410009bd0b8..9b1cbcbd42a7 100644
--- a/metadata/md5-cache/dev-libs/qxlsx-1.4.5
+++ b/metadata/md5-cache/dev-libs/qxlsx-1.4.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/QtExcel/QXlsx
 INHERIT=multibuild cmake
 IUSE=qt5 qt6
-KEYWORDS=amd64 ppc ppc64 ~riscv ~x86
+KEYWORDS=amd64 ppc ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5= ) qt6? ( dev-qt/qtbase:6=[gui] )
 REQUIRED_USE=|| ( qt5 qt6 )
 SLOT=0/0.1.4.4
 SRC_URI=https://github.com/QtExcel/QXlsx/archive/v1.4.5.tar.gz -> qxlsx-1.4.5.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b66846b28ca2bb4e18636eadf4917367
+_md5_=f3f8d7f4461044020e51a70015b69bf9
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 76b4c728dc71..9deff5f8bb31 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/caldav-1.2.0 b/metadata/md5-cache/dev-python/caldav-1.2.0
new file mode 100644
index 000000000000..7b58d680a24a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/caldav-1.2.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/icalendar[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/recurring-ical-events[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tzlocal[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] www-apps/radicale[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/vobject[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) 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_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=CalDAV (RFC4791) client library for Python
+EAPI=8
+HOMEPAGE=https://github.com/python-caldav/caldav/ https://pypi.org/project/caldav/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-3 Apache-2.0 )
+RDEPEND=dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/vobject[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) 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_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/python-caldav/caldav/archive/v1.2.0.tar.gz -> caldav-1.2.0.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=8e1ee6dc5619090b10c9ce35a23faef3
diff --git a/metadata/md5-cache/dev-python/coverage-7.2.1 b/metadata/md5-cache/dev-python/coverage-7.2.1
new file mode 100644
index 000000000000..5b885436adcd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/coverage-7.2.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/unittest-mixins-1.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Code coverage measurement for Python
+EAPI=8
+HOMEPAGE=https://coverage.readthedocs.io/en/latest/ https://github.com/nedbat/coveragepy/ https://pypi.org/project/coverage/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/c/coverage/coverage-7.2.1.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=1d6ace912253858246fed04b242259a2
diff --git a/metadata/md5-cache/dev-python/imageio-2.26.0 b/metadata/md5-cache/dev-python/imageio-2.26.0
new file mode 100644
index 000000000000..dbb6fa18f033
--- /dev/null
+++ b/metadata/md5-cache/dev-python/imageio-2.26.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/fsspec[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/imageio-ffmpeg[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tifffile[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/numpy-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-8.3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/freeimage >=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/setuptools-65.7.1[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 library for reading and writing image data
+EAPI=8
+HOMEPAGE=https://imageio.readthedocs.io/en/stable/ https://github.com/imageio/imageio/ https://pypi.org/project/imageio/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+PROPERTIES=test_network
+RDEPEND=>=dev-python/numpy-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-8.3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/freeimage 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? ( test )
+SLOT=0
+SRC_URI=https://github.com/imageio/imageio/archive/v2.26.0.tar.gz -> imageio-2.26.0.gh.tar.gz test? ( https://github.com/imageio/imageio-binaries/raw/224074bca448815e421a59266864c23041531a42/images/chelsea.png -> imageio-chelsea.png https://github.com/imageio/imageio-binaries/raw/224074bca448815e421a59266864c23041531a42/images/cockatoo.mp4 -> imageio-cockatoo.mp4 )
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=7eb39bfb3c57aa58cef2245de2a393f4
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-9.0.15 b/metadata/md5-cache/dev-python/mkdocs-material-9.0.15
new file mode 100644
index 000000000000..7e30d244eef8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mkdocs-material-9.0.15
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) 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_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/mkdocs[python_targets_python3_11(-)] dev-python/mkdocs-material-extensions[python_targets_python3_11(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_11(-)] dev-python/mkdocs-redirects[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material-extensions[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/mkdocs-redirects[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-material-extensions[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/mkdocs-redirects[python_targets_python3_9(-)] ) ) )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Material Design theme for MkDocs
+EAPI=8
+HOMEPAGE=https://github.com/squidfunk/mkdocs-material/ https://pypi.org/project/mkdocs-material/
+INHERIT=distutils-r1 docs
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 doc
+KEYWORDS=~amd64 ~arm ~ppc ~riscv ~x86
+LICENSE=MIT
+PDEPEND=>=dev-python/mkdocs-material-extensions-1.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+RDEPEND=>=dev-python/jinja-3.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-1.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pymdown-extensions-9.9.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) 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_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/squidfunk/mkdocs-material/archive/9.0.15.tar.gz -> mkdocs-material-9.0.15.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	docs	314e509c51630fb75f120d62a77d008c	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=15cf58e9868e9720b6733da8a0dbc6f2
diff --git a/metadata/md5-cache/dev-python/pycurl-7.45.1 b/metadata/md5-cache/dev-python/pycurl-7.45.1
deleted file mode 100644
index 876a44ba7670..000000000000
--- a/metadata/md5-cache/dev-python/pycurl-7.45.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-python/bottle-0.12.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flaky[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2] ) test? ( >=net-misc/curl-7.25.0-r1:=[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= ) curl_ssl_openssl? ( dev-libs/openssl:= ) ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) 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_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-misc/curl-7.25.0-r1:=[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= ) curl_ssl_openssl? ( dev-libs/openssl:= ) )
-DESCRIPTION=Python bindings for curl/libcurl
-EAPI=8
-HOMEPAGE=http://pycurl.io/ https://github.com/pycurl/pycurl/ https://pypi.org/project/pycurl/
-INHERIT=distutils-r1 toolchain-funcs
-IUSE=curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=LGPL-2.1
-RDEPEND=>=net-misc/curl-7.25.0-r1:=[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= ) curl_ssl_openssl? ( dev-libs/openssl:= ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) 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_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pycurl/pycurl-7.45.1.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b75c7db4244f2da9e7a3bb55cc39234b
diff --git a/metadata/md5-cache/dev-python/pycurl-7.45.2 b/metadata/md5-cache/dev-python/pycurl-7.45.2
index aeb48d83f45b..84436554efa0 100644
--- a/metadata/md5-cache/dev-python/pycurl-7.45.2
+++ b/metadata/md5-cache/dev-python/pycurl-7.45.2
@@ -4,7 +4,7 @@ DEPEND=>=net-misc/curl-7.25.0-r1:=[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls(-)
 DESCRIPTION=Python bindings for curl/libcurl
 EAPI=8
 HOMEPAGE=http://pycurl.io/ https://github.com/pycurl/pycurl/ https://pypi.org/project/pycurl/
-INHERIT=distutils-r1 toolchain-funcs
+INHERIT=distutils-r1 pypi toolchain-funcs
 IUSE=curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=LGPL-2.1
@@ -12,6 +12,6 @@ RDEPEND=>=net-misc/curl-7.25.0-r1:=[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls(-
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pycurl/pycurl-7.45.2.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a86b9ddedaed727a702cdcbeda6ead35
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pycurl/pycurl-7.45.2.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=b3f454cc99d1c1feef77f0749437479b
diff --git a/metadata/md5-cache/dev-python/pypdf-3.5.0 b/metadata/md5-cache/dev-python/pypdf-3.5.0
new file mode 100644
index 000000000000..307ec8a94850
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypdf-3.5.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pycryptodome[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_9(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) 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_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_python3_9(-)?,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_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=BSD-2
+PROPERTIES=test_network
+RDEPEND=python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) 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_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/py-pdf/pypdf/archive/3.5.0.tar.gz -> pypdf-3.5.0.gh.tar.gz test? ( https://github.com/py-pdf/sample-files/archive/0fe84b30ed33ff3daa9293e44349b8618f135699.tar.gz -> pypdf-sample-files-0fe84b30ed33ff3daa9293e44349b8618f135699.gh.tar.gz )
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=ae2f20813d5dc53248bf201c6dbd5cfc
diff --git a/metadata/md5-cache/dev-python/pypy3-7.3.11-r1 b/metadata/md5-cache/dev-python/pypy3-7.3.11-r1
deleted file mode 100644
index a888f08a8e9c..000000000000
--- a/metadata/md5-cache/dev-python/pypy3-7.3.11-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=|| ( >=dev-python/pypy3-exe-7.3.11:3.9-7.3.11[bzip2(+),ncurses?] >=dev-python/pypy3-exe-bin-7.3.11:3.9-7.3.11 ) dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= dev-python/gentoo-common ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= )
-DESCRIPTION=A fast, compliant alternative implementation of the Python (3.9) language
-EAPI=8
-HOMEPAGE=https://www.pypy.org/ https://foss.heptapod.net/pypy/pypy/
-INHERIT=pax-utils python-utils-r1 toolchain-funcs
-IUSE=+ensurepip gdbm +jit ncurses sqlite tk
-KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=|| ( >=dev-python/pypy3-exe-7.3.11:3.9-7.3.11[bzip2(+),ncurses?] >=dev-python/pypy3-exe-bin-7.3.11:3.9-7.3.11 ) dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= dev-python/gentoo-common ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= )
-RESTRICT=test
-SLOT=0/pypy39-pp73-336
-SRC_URI=https://buildbot.pypy.org/pypy/pypy3.9-v7.3.11-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.9-gentoo-patches-7.3.11.tar.xz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=4612cd7485fb79f1c044057a4daaeeb9
diff --git a/metadata/md5-cache/dev-python/pyrate-limiter-2.10.0 b/metadata/md5-cache/dev-python/pyrate-limiter-2.10.0
new file mode 100644
index 000000000000..d7d1ccb52cd3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyrate-limiter-2.10.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/django[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/django-redis[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/fakeredis[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/filelock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/redis[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) 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_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python Rate-Limiter using Leaky-Bucket Algorimth Family
+EAPI=8
+HOMEPAGE=https://github.com/vutran1710/PyrateLimiter/ https://pypi.org/project/pyrate-limiter/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/filelock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/redis[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) 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_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/vutran1710/PyrateLimiter/archive/refs/tags/v2.10.0.tar.gz -> pyrate-limiter-2.10.0.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=353ea2627a4ad223d6dadbc660e5823b
diff --git a/metadata/md5-cache/dev-python/pyrsistent-0.19.2 b/metadata/md5-cache/dev-python/pyrsistent-0.19.2
deleted file mode 100644
index edd09b088096..000000000000
--- a/metadata/md5-cache/dev-python/pyrsistent-0.19.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) 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_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Persistent/Functional/Immutable data structures
-EAPI=8
-HOMEPAGE=https://github.com/tobgu/pyrsistent/ https://pypi.org/project/pyrsistent/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) 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_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyrsistent/pyrsistent-0.19.2.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=bdae9e8ce20214ff6007f3bae5cadd4a
diff --git a/metadata/md5-cache/dev-python/pyrsistent-0.19.3 b/metadata/md5-cache/dev-python/pyrsistent-0.19.3
index dc07706b161d..2eb31186cc6e 100644
--- a/metadata/md5-cache/dev-python/pyrsistent-0.19.3
+++ b/metadata/md5-cache/dev-python/pyrsistent-0.19.3
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Persistent/Functional/Immutable data structures
 EAPI=8
 HOMEPAGE=https://github.com/tobgu/pyrsistent/ https://pypi.org/project/pyrsistent/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pyrsistent/pyrsistent-0.19.3.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=bdae9e8ce20214ff6007f3bae5cadd4a
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pyrsistent/pyrsistent-0.19.3.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=89bedb589e054a6174e0cca5dec89c22
diff --git a/metadata/md5-cache/dev-python/python-mpv-1.0.2 b/metadata/md5-cache/dev-python/python-mpv-1.0.2
new file mode 100644
index 000000000000..2dd063e96a72
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-mpv-1.0.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/xvfbwrapper[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( media-video/mpv[libmpv] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) 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_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python interface to the mpv media player
+EAPI=8
+HOMEPAGE=https://github.com/jaseg/python-mpv
+INHERIT=distutils-r1 virtualx
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
+KEYWORDS=~amd64
+LICENSE=AGPL-3
+RDEPEND=media-video/mpv[libmpv] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) 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_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jaseg/python-mpv/archive/v1.0.2.tar.gz -> python-mpv-1.0.2.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=411e7782ebfc1fea14263dd3df096a24
diff --git a/metadata/md5-cache/dev-python/python-systemd-235 b/metadata/md5-cache/dev-python/python-systemd-235
index 7d096cb725a2..5ebf08c964ef 100644
--- a/metadata/md5-cache/dev-python/python-systemd-235
+++ b/metadata/md5-cache/dev-python/python-systemd-235
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/systemd/python-systemd
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-apps/systemd:= !sys-apps/systemd[python(-)] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) 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_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/python-systemd/archive/v235.tar.gz -> python-systemd-235.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b10194751f81b136a883a46f3ef1f9db
+_md5_=032696a726a853d09c156e69d68042d4
diff --git a/metadata/md5-cache/dev-python/werkzeug-2.2.2 b/metadata/md5-cache/dev-python/werkzeug-2.2.2
deleted file mode 100644
index f5a281f74d41..000000000000
--- a/metadata/md5-cache/dev-python/werkzeug-2.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/ephemeral-port-reserve[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xprocess[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/watchdog[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test-rust? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) !hppa? ( !ia64? ( !loong? ( python_targets_python3_9? ( dev-python/greenlet[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/greenlet[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) ) test? ( >=dev-python/markupsafe-2.1.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) 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_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of various utilities for WSGI applications
-EAPI=8
-HOMEPAGE=https://palletsprojects.com/p/werkzeug/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug/
-INHERIT=distutils-r1
-IUSE=test-rust test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-python/markupsafe-2.1.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) 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_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pallets/werkzeug/archive/2.2.2.tar.gz -> werkzeug-2.2.2.gh.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6d04524e4f1286831d66ed27d0732a20
diff --git a/metadata/md5-cache/dev-python/wrapt-1.15.0 b/metadata/md5-cache/dev-python/wrapt-1.15.0
new file mode 100644
index 000000000000..ebc98d946222
--- /dev/null
+++ b/metadata/md5-cache/dev-python/wrapt-1.15.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ( >=dev-python/pypy3-7.3.11-r1:0 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] dev-python/sphinx-rtd-theme[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) 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_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Module for decorators, wrappers and monkey patching
+EAPI=8
+HOMEPAGE=https://github.com/GrahamDumpleton/wrapt/ https://pypi.org/project/wrapt/
+INHERIT=distutils-r1
+IUSE=test doc python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) 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_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/GrahamDumpleton/wrapt/archive/1.15.0.tar.gz -> wrapt-1.15.0.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=e7cb81c9b6f7625dd36af79a72e2a8be
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 7ed9e2a5bd6e..148d2673372d 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/strace-6.2 b/metadata/md5-cache/dev-util/strace-6.2
new file mode 100644
index 000000000000..1e21ca327b56
--- /dev/null
+++ b/metadata/md5-cache/dev-util/strace-6.2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig 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 test
+DEPEND=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) elfutils? ( dev-libs/elfutils[static-libs(+)] ) selinux? ( sys-libs/libselinux[static-libs(+)] ) ) aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers
+DESCRIPTION=A useful diagnostic, instructional, and debugging tool
+EAPI=8
+HOMEPAGE=https://strace.io/
+INHERIT=autotools edo flag-o-matic toolchain-funcs
+IUSE=aio perl selinux static unwind elfutils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) selinux? ( sys-libs/libselinux ) ) perl? ( dev-lang/perl )
+REQUIRED_USE=?? ( unwind elfutils )
+SLOT=0
+SRC_URI=https://github.com/strace/strace/releases/download/v6.2/strace-6.2.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=bf90332189df65c8c934f665fe30ef3b
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index 30efe12f43ce..b10c1e837dfa 100644
--- a/metadata/md5-cache/games-rpg/Manifest.gz
+++ b/metadata/md5-cache/games-rpg/Manifest.gz
diff --git a/metadata/md5-cache/games-rpg/adonthell-0.3.8 b/metadata/md5-cache/games-rpg/adonthell-0.3.8
deleted file mode 100644
index becb6a0f948f..000000000000
--- a/metadata/md5-cache/games-rpg/adonthell-0.3.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( sys-devel/gettext ) 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 prepare setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) media-libs/freetype media-libs/libogg media-libs/libsdl2[X,video,sound] media-libs/libvorbis media-libs/sdl2-mixer[vorbis] media-libs/sdl2-ttf sys-libs/zlib nls? ( virtual/libintl ) dev-lang/swig
-DESCRIPTION=Roleplaying game engine
-EAPI=7
-HOMEPAGE=http://adonthell.nongnu.org/
-INHERIT=autotools python-single-r1
-IUSE=doc nls python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) media-libs/freetype media-libs/libogg media-libs/libsdl2[X,video,sound] media-libs/libvorbis media-libs/sdl2-mixer[vorbis] media-libs/sdl2-ttf sys-libs/zlib nls? ( virtual/libintl )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/adonthell/adonthell-src-0.3.8.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6f5ffaa413c0ad2325a9eef6635e6f36
diff --git a/metadata/md5-cache/games-rpg/wastesedge-0.3.8 b/metadata/md5-cache/games-rpg/wastesedge-0.3.8
deleted file mode 100644
index 3ded57c74497..000000000000
--- a/metadata/md5-cache/games-rpg/wastesedge-0.3.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) 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 postinst postrm preinst prepare setup
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Role playing game to showcase the adonthell engine
-EAPI=7
-HOMEPAGE=http://adonthell.nongnu.org/download/
-INHERIT=autotools python-single-r1 xdg
-IUSE=nls python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=games-rpg/adonthell-0.3.8[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] nls? ( virtual/libintl )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/adonthell/wastesedge-src-0.3.8.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f36f991a5e85089038acb7b63981f8a1
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 0d384f093fb6..778f09796068 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/claws-mail-9999 b/metadata/md5-cache/mail-client/claws-mail-9999
index 7048f132928d..b8cb835e4561 100644
--- a/metadata/md5-cache/mail-client/claws-mail-9999
+++ b/metadata/md5-cache/mail-client/claws-mail-9999
@@ -13,4 +13,4 @@ RDEPEND=>=dev-libs/glib-2.50:2 dev-libs/nettle:= net-mail/ytnef sys-libs/zlib:=
 REQUIRED_USE=libcanberra? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) oauth? ( gnutls ) smime? ( pgp )
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	desktop	021728fdc1b03b36357dbc89489e0f0d	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=bf560d4312d060ab03dca847e69f52b0
+_md5_=304655376a153b4d5b0cf07c309b29a8
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index a0bfc0e66564..f48cb6c1b33f 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/libass-0.17.1 b/metadata/md5-cache/media-libs/libass-0.17.1
new file mode 100644
index 000000000000..f4362e2af7f0
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libass-0.17.1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig amd64? ( dev-lang/nasm ) x86? ( dev-lang/nasm ) test? ( media-libs/libpng[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) verify-sig? ( sec-keys/openpgp-keys-libass ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=>=dev-libs/fribidi-0.19.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-1.2.3:=[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Library for SSA/ASS subtitles rendering
+EAPI=8
+HOMEPAGE=https://github.com/libass/libass
+INHERIT=multilib-minimal verify-sig
+IUSE=+fontconfig test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=ISC
+RDEPEND=>=dev-libs/fribidi-0.19.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-1.2.3:=[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/9
+SRC_URI=https://github.com/libass/libass/releases/download/0.17.1/libass-0.17.1.tar.xz verify-sig? ( https://github.com/libass/libass/releases/download/0.17.1/libass-0.17.1.tar.xz.asc )
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_md5_=51f9ce0d2ee4add874392f5c2c49d938
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index aa4f1d011b95..1981033d0f50 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/zam-plugins-3.14-r1 b/metadata/md5-cache/media-plugins/zam-plugins-3.14-r1
deleted file mode 100644
index eb4d439fdc29..000000000000
--- a/metadata/md5-cache/media-plugins/zam-plugins-3.14-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install prepare
-DEPEND=media-libs/ladspa-sdk media-libs/liblo media-libs/libsamplerate media-libs/libsndfile media-libs/lv2 media-libs/zita-convolver sci-libs/fftw:3.0 x11-libs/libX11 jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[X] x11-libs/cairo[X] )
-DESCRIPTION=Collection of LV2/LADSPA/VST/JACK audio plugins for high quality processing
-EAPI=8
-HOMEPAGE=https://www.zamaudio.com/ https://github.com/zamaudio/zam-plugins
-IUSE=jack opengl
-KEYWORDS=amd64
-LICENSE=GPL-2+
-RDEPEND=media-libs/ladspa-sdk media-libs/liblo media-libs/libsamplerate media-libs/libsndfile media-libs/lv2 media-libs/zita-convolver sci-libs/fftw:3.0 x11-libs/libX11 jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[X] x11-libs/cairo[X] )
-SLOT=0
-SRC_URI=https://github.com/zamaudio/zam-plugins/archive/refs/tags/3.14.tar.gz -> zam-plugins-3.14.tar.gz https://github.com/DISTRHO/DPF/archive/9243625aacb9fb8dd9fe4bd479b227149eb37959.tar.gz -> DPF-9243625aacb9fb8dd9fe4bd479b227149eb37959.tar.gz
-_md5_=95d35472db39dfde4d801817c7a38dd4
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index f12c81154bda..1d69d520bf6f 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/ardour-7.3 b/metadata/md5-cache/media-sound/ardour-7.3
index 830742b190fc..6d149e719351 100644
--- a/metadata/md5-cache/media-sound/ardour-7.3
+++ b/metadata/md5-cache/media-sound/ardour-7.3
@@ -12,4 +12,4 @@ RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/boost:= dev-libs/glib:2 dev-
 SLOT=7
 SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/Ardour-7.3.0.tar.bz2
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	plocale	950fbaec7deeba41b5bcc0572cca99b9	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5bc3c1d4d14cecfac07d9c5b9bd20527
+_md5_=695aa7d28979061406e245f763dc072e
diff --git a/metadata/md5-cache/media-sound/ardour-9999 b/metadata/md5-cache/media-sound/ardour-9999
index 529a5c0d2084..de16c854abc1 100644
--- a/metadata/md5-cache/media-sound/ardour-9999
+++ b/metadata/md5-cache/media-sound/ardour-9999
@@ -12,4 +12,4 @@ PROPERTIES=live
 RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/boost:= dev-libs/glib:2 dev-libs/libsigc++:2 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac:= media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo media-libs/liblrdf media-libs/libsamplerate media-libs/libsndfile media-libs/libsoundtouch media-libs/raptor:2 media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) media-libs/lilv media-libs/sratom dev-libs/sord media-libs/suil[gtk2] media-libs/lv2
 SLOT=7
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	plocale	950fbaec7deeba41b5bcc0572cca99b9	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5bc3c1d4d14cecfac07d9c5b9bd20527
+_md5_=695aa7d28979061406e245f763dc072e
diff --git a/metadata/md5-cache/media-sound/lingot-1.0.1 b/metadata/md5-cache/media-sound/lingot-1.0.1
deleted file mode 100644
index 28e523dd2fa0..000000000000
--- a/metadata/md5-cache/media-sound/lingot-1.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig 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-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio )
-DESCRIPTION=Accurate, easy to use, and highly configurable musical instrument tuner
-EAPI=7
-HOMEPAGE=https://www.nongnu.org/lingot/
-INHERIT=autotools
-IUSE=alsa +fftw jack pulseaudio
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio )
-SLOT=0
-SRC_URI=https://download.savannah.gnu.org/releases/lingot/lingot-1.0.1.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=691c2baa4e80a43b0e2ec37abf60bf04
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 6f4e40f8d07a..fcbd8222a3d4 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-1.0.2-r1 b/metadata/md5-cache/net-analyzer/fail2ban-1.0.2-r1
index c488c8cbd914..c13e6ed06666 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-1.0.2-r1
+++ b/metadata/md5-cache/net-analyzer/fail2ban-1.0.2-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.fail2ban.org/
 INHERIT=bash-completion-r1 distutils-r1 systemd tmpfiles
 IUSE=selinux systemd python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) systemd? ( python_single_target_python3_9? ( || ( dev-python/python-systemd[python_targets_python3_9(-)] sys-apps/systemd[python(-),python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( || ( dev-python/python-systemd[python_targets_python3_10(-)] sys-apps/systemd[python(-),python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( || ( dev-python/python-systemd[python_targets_python3_11(-)] sys-apps/systemd[python(-),python_targets_python3_11(-)] ) ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) virtual/tmpfiles
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/fail2ban/fail2ban/archive/1.0.2.tar.gz -> fail2ban-1.0.2.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=492da03b872cf85964c99fc2fe810228
+_md5_=fe96c7e8c6d62b06a76140b91ad4d210
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-9999 b/metadata/md5-cache/net-analyzer/fail2ban-9999
index bef1e997e83b..1b6d930619a7 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-9999
+++ b/metadata/md5-cache/net-analyzer/fail2ban-9999
@@ -11,4 +11,4 @@ RDEPEND=virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) syst
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	b69cca67d4bf504984c07366f8d3cac4	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=988774b110565bcdd0c191521fc760ea
+_md5_=66b18d0e038f9554a5ea4a2e9454c0b8
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.29 b/metadata/md5-cache/net-analyzer/zabbix-5.0.29
deleted file mode 100644
index 7ff5df24934f..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.29
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=8
-HOMEPAGE=https://www.zabbix.com/
-INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-IUSE=+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static java
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
-RESTRICT=test strip
-SLOT=0/5.0
-SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.29.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-5.0.29-go-deps.tar.xz )
-_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=956ef8bb3ec53a40bc7b1f67973718cb
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.10 b/metadata/md5-cache/net-analyzer/zabbix-6.0.10
deleted file mode 100644
index 48f5b0a35e6c..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.10
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=8
-HOMEPAGE=https://www.zabbix.com/
-INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh static java
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( !pcre2? ( dev-libs/libpcre ) pcre2? ( dev-libs/libpcre2:= ) net-analyzer/fping[suid] ) server? ( app-admin/webapp-config !pcre2? ( dev-libs/libpcre ) pcre2? ( dev-libs/libpcre2:= ) net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
-RESTRICT=test strip
-SLOT=0/6.0
-SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.10.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.10-go-deps.tar.xz )
-_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=cb48f916e3859b09c67240213b520a16
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.11 b/metadata/md5-cache/net-analyzer/zabbix-6.0.11
deleted file mode 100644
index a38c0149beca..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.11
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=8
-HOMEPAGE=https://www.zabbix.com/
-INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
-RESTRICT=test strip
-SLOT=0/6.0
-SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.11.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.11-go-deps.tar.xz )
-_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=545121c5cefa9980aa4c7c857affb421
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.2.4 b/metadata/md5-cache/net-analyzer/zabbix-6.2.4
deleted file mode 100644
index bc31c78bb45c..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-6.2.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=8
-HOMEPAGE=https://www.zabbix.com/
-INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh static java
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( !pcre2? ( dev-libs/libpcre ) pcre2? ( dev-libs/libpcre2:= ) net-analyzer/fping[suid] ) server? ( app-admin/webapp-config !pcre2? ( dev-libs/libpcre ) pcre2? ( dev-libs/libpcre2:= ) net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
-RESTRICT=test strip
-SLOT=0/6.2
-SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.2/zabbix-6.2.4.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.2.4-go-deps.tar.xz )
-_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=cb48f916e3859b09c67240213b520a16
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.2.5 b/metadata/md5-cache/net-analyzer/zabbix-6.2.5
deleted file mode 100644
index 846feb2f287a..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-6.2.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=8
-HOMEPAGE=https://www.zabbix.com/
-INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
-RESTRICT=test strip
-SLOT=0/6.2
-SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.2/zabbix-6.2.5.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.2.5-go-deps.tar.xz )
-_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=545121c5cefa9980aa4c7c857affb421
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 2e6f9e2b7e25..c8f755326a26 100644
--- a/metadata/md5-cache/net-dialup/Manifest.gz
+++ b/metadata/md5-cache/net-dialup/Manifest.gz
diff --git a/metadata/md5-cache/net-dialup/freeradius-3.0.26 b/metadata/md5-cache/net-dialup/freeradius-3.0.26
new file mode 100644
index 000000000000..125801b09f81
--- /dev/null
+++ b/metadata/md5-cache/net-dialup/freeradius-3.0.26
@@ -0,0 +1,17 @@
+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 virtual/pkgconfig
+DEFINED_PHASES=compile config configure install preinst prepare setup
+DEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) readline? ( sys-libs/readline:0= ) redis? ( dev-libs/hiredis:= ) rest? ( dev-libs/json-c:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0=[-bindist(-)] ) systemd? ( sys-apps/systemd )
+DESCRIPTION=Highly configurable free RADIUS server
+EAPI=7
+HOMEPAGE=https://freeradius.org/
+INHERIT=autotools pam python-single-r1 systemd
+IUSE=debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam pcap postgres python readline redis rest samba sqlite ssl systemd python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) readline? ( sys-libs/readline:0= ) redis? ( dev-libs/hiredis:= ) rest? ( dev-libs/json-c:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0=[-bindist(-)] ) systemd? ( sys-apps/systemd )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
+RESTRICT=test firebird? ( bindist )
+SLOT=0
+SRC_URI=https://github.com/FreeRADIUS/freeradius-server/archive/release_3_0_26.tar.gz -> freeradius-3.0.26.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=abb76326388851961671fc23753b7cff
diff --git a/metadata/md5-cache/net-dialup/freeradius-3.2.1 b/metadata/md5-cache/net-dialup/freeradius-3.2.1
new file mode 100644
index 000000000000..0c86be64f1ea
--- /dev/null
+++ b/metadata/md5-cache/net-dialup/freeradius-3.2.1
@@ -0,0 +1,17 @@
+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 virtual/pkgconfig
+DEFINED_PHASES=compile config configure install preinst prepare setup
+DEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-libs/libltdl dev-libs/libpcre dev-libs/json-c:= dev-lang/perl:= net-libs/libpcap sys-libs/gdbm:= sys-libs/libcap sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) readline? ( sys-libs/readline:= ) redis? ( dev-libs/hiredis:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] ) systemd? ( sys-apps/systemd:= )
+DESCRIPTION=Highly configurable free RADIUS server
+EAPI=8
+HOMEPAGE=https://freeradius.org/
+INHERIT=autotools pam python-single-r1 systemd
+IUSE=debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam postgres python readline redis samba sqlite ssl systemd python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-libs/libltdl dev-libs/libpcre dev-libs/json-c:= dev-lang/perl:= net-libs/libpcap sys-libs/gdbm:= sys-libs/libcap sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) readline? ( sys-libs/readline:= ) redis? ( dev-libs/hiredis:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] ) systemd? ( sys-apps/systemd:= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+RESTRICT=firebird? ( bindist )
+SLOT=0
+SRC_URI=https://github.com/FreeRADIUS/freeradius-server/releases/download/release_3_2_1/freeradius-server-3.2.1.tar.bz2
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=870293cc160b353f7ac95c1f2c0c3e0e
diff --git a/metadata/md5-cache/net-dialup/freeradius-3.2.2 b/metadata/md5-cache/net-dialup/freeradius-3.2.2
new file mode 100644
index 000000000000..c5f0b1094ca5
--- /dev/null
+++ b/metadata/md5-cache/net-dialup/freeradius-3.2.2
@@ -0,0 +1,17 @@
+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 virtual/pkgconfig
+DEFINED_PHASES=compile config configure install preinst prepare setup
+DEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-libs/libltdl dev-libs/libpcre dev-libs/json-c:= dev-lang/perl:= net-libs/libpcap net-misc/curl sys-libs/gdbm:= sys-libs/libcap sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) readline? ( sys-libs/readline:= ) redis? ( dev-libs/hiredis:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] ) systemd? ( sys-apps/systemd:= )
+DESCRIPTION=Highly configurable free RADIUS server
+EAPI=8
+HOMEPAGE=https://freeradius.org/
+INHERIT=autotools pam python-single-r1 systemd
+IUSE=debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam postgres python readline redis samba sqlite ssl systemd python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-libs/libltdl dev-libs/libpcre dev-libs/json-c:= dev-lang/perl:= net-libs/libpcap net-misc/curl sys-libs/gdbm:= sys-libs/libcap sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) readline? ( sys-libs/readline:= ) redis? ( dev-libs/hiredis:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] ) systemd? ( sys-apps/systemd:= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+RESTRICT=firebird? ( bindist )
+SLOT=0
+SRC_URI=https://github.com/FreeRADIUS/freeradius-server/releases/download/release_3_2_2/freeradius-server-3.2.2.tar.bz2
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=99ee5ea902957e6b1bc351ab64ddfe83
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 7888a17de861..33c705c9dd77 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/mailutils-3.14-r1 b/metadata/md5-cache/net-mail/mailutils-3.14-r1
deleted file mode 100644
index 3cd371a307ad..000000000000
--- a/metadata/md5-cache/net-mail/mailutils-3.14-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig 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 setup
-DEPEND=!mail-filter/libsieve !mail-client/mailx sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/libcrypt:= virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) emacs? ( >=app-editors/emacs-23.1:* ) gdbm? ( sys-libs/gdbm:= ) guile? ( dev-scheme/guile:12/2.2-1 ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap:= ) mysql? ( dev-db/mysql-connector-c:= ) nls? ( sys-devel/gettext ) pam? ( sys-libs/pam:= ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) sasl? ( virtual/gsasl ) servers? ( virtual/libiconv dev-libs/libunistring:= ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
-DESCRIPTION=A useful collection of mail servers, clients, and filters
-EAPI=8
-HOMEPAGE=https://mailutils.org/
-INHERIT=autotools elisp-common flag-o-matic python-single-r1 toolchain-funcs
-IUSE=berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd tokyocabinet python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos
-LICENSE=GPL-3+ LGPL-3+
-RDEPEND=!mail-filter/libsieve !mail-client/mailx sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/libcrypt:= virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) emacs? ( >=app-editors/emacs-23.1:* ) gdbm? ( sys-libs/gdbm:= ) guile? ( dev-scheme/guile:12/2.2-1 ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap:= ) mysql? ( dev-db/mysql-connector-c:= ) nls? ( sys-devel/gettext ) pam? ( sys-libs/pam:= ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) sasl? ( virtual/gsasl ) servers? ( virtual/libiconv dev-libs/libunistring:= ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) ) servers? ( tcpd ldap )
-SLOT=0
-SRC_URI=mirror://gnu/mailutils/mailutils-3.14.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=385b4c74006b07972fc1456bfbbfb4ac
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index bc5f11c88d61..84a7ac8dc3cf 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/axel-2.17.11 b/metadata/md5-cache/net-misc/axel-2.17.11
index d6c633505d2b..e030836e7c7b 100644
--- a/metadata/md5-cache/net-misc/axel-2.17.11
+++ b/metadata/md5-cache/net-misc/axel-2.17.11
@@ -4,9 +4,9 @@ DESCRIPTION=Light Unix download accelerator
 EAPI=7
 HOMEPAGE=https://github.com/axel-download-accelerator/axel
 IUSE=debug nls ssl
-KEYWORDS=amd64 ~hppa ~mips ppc ppc64 ~riscv sparc x86
+KEYWORDS=amd64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl:0= ) nls? ( virtual/libintl virtual/libiconv )
 SLOT=0
 SRC_URI=https://github.com/axel-download-accelerator/axel/releases/download/v2.17.11/axel-2.17.11.tar.xz
-_md5_=9af391f570b2819e691021c10c0bacb3
+_md5_=ce9eca36076c2cabdbf3132740546fb7
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 7f837b1d9243..06469b83b024 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/biglybt-3.2.0.0-r2 b/metadata/md5-cache/net-p2p/biglybt-3.2.0.0-r2
index 8dbb7ed4e45d..b83d94831c67 100644
--- a/metadata/md5-cache/net-p2p/biglybt-3.2.0.0-r2
+++ b/metadata/md5-cache/net-p2p/biglybt-3.2.0.0-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* dev-java/commons-cli:1 dev-java/swt:4.10 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/BiglySoftware/BiglyBT/archive/v3.2.0.0.tar.gz -> biglybt-3.2.0.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=815b473528ee126c7afb8385b68c1680
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 3e93b5989aa2..4e5c58bec8f5 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/caffe2-1.13.1-r1 b/metadata/md5-cache/sci-libs/caffe2-1.13.1-r1
index 40e43c6d9bc2..39c19feaa401 100644
--- a/metadata/md5-cache/sci-libs/caffe2-1.13.1-r1
+++ b/metadata/md5-cache/sci-libs/caffe2-1.13.1-r1
@@ -4,7 +4,7 @@ DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) pytho
 DESCRIPTION=A deep learning framework
 EAPI=8
 HOMEPAGE=https://pytorch.org/
-INHERIT=python-single-r1 cmake flag-o-matic
+INHERIT=python-single-r1 cmake cuda flag-o-matic
 IUSE=cuda ffmpeg nnpack +numpy opencl opencv openmp qnnpack xnnpack python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64
 LICENSE=BSD
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pytorch/pytorch/archive/refs/tags/v1.13.1.tar.gz -> pytorch-1.13.1.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=573a854fb3f598df85a1c1365108577c
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=11639cb98145a177333bf3d9d54731d9
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 3562b2bd5510..4f5f18ce50fc 100644
--- a/metadata/md5-cache/sci-visualization/Manifest.gz
+++ b/metadata/md5-cache/sci-visualization/Manifest.gz
diff --git a/metadata/md5-cache/sci-visualization/gcalc-3.1_rc1-r2 b/metadata/md5-cache/sci-visualization/gcalc-3.1_rc1-r2
index 48d63467274d..dcdb1d45b8a7 100644
--- a/metadata/md5-cache/sci-visualization/gcalc-3.1_rc1-r2
+++ b/metadata/md5-cache/sci-visualization/gcalc-3.1_rc1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://gcalc.net/files/GCalc-3.1-rc1.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=c7e5cc39217c49f76afad5deb4f69733
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 45c6e5605dc8..072121b6e451 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.45 b/metadata/md5-cache/sys-apps/portage-3.0.45.1
index 2959624c4ea5..0289c4867466 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.45
+++ b/metadata/md5-cache/sys-apps/portage-3.0.45.1
@@ -13,6 +13,6 @@ RDEPEND=acct-user/portage app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/portage.git/snapshot/portage-3.0.45.tar.bz2
+SRC_URI=https://gitweb.gentoo.org/proj/portage.git/snapshot/portage-3.0.45.1.tar.bz2
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0600cb22430e127335b04f2d94b78b62
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 68d7ce080a33..03457e43828e 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.2.1 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.2.1
index a37eb6e80bdc..0518ac7efef9 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-6.2.1
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-6.2.1
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=6.2.1
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.2-2.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.2-2.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.2-2.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.2-2.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.2-2.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.2-2.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7721a816fc6b948132f5a617c6baeca3
+_md5_=9a392485c5e2c3c6f61207f487e78a08
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 47e6bf345491..c537ebba4261 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/fcron-3.2.1-r8 b/metadata/md5-cache/sys-process/fcron-3.2.1-r8
deleted file mode 100644
index eda7f187f10e..000000000000
--- a/metadata/md5-cache/sys-process/fcron-3.2.1-r8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst prepare setup
-DEPEND=acct-group/fcron acct-user/fcron virtual/libcrypt:= audit? ( sys-process/audit ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:= ) selinux? ( sys-libs/libselinux )
-DESCRIPTION=A command scheduler with extended capabilities over cron and anacron
-EAPI=7
-HOMEPAGE=http://fcron.free.fr/
-INHERIT=autotools cron flag-o-matic pam systemd user-info
-IUSE=audit debug pam selinux l10n_fr +mta +system-crontab readline
-KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=GPL-2
-RDEPEND=acct-group/fcron acct-user/fcron virtual/libcrypt:= audit? ( sys-process/audit ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:= ) selinux? ( sys-libs/libselinux ) app-misc/editor-wrapper mta? ( virtual/mta ) pam? ( sys-auth/pambase ) >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/cronie !sys-process/dcron
-SLOT=0
-SRC_URI=http://fcron.free.fr/archives/fcron-3.2.1.src.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	cron	b3117529d23cf99d6166b59608ed94e4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	01b77091d5b6560b0aeafa7fbb1bd818	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	user-info	83547b4df3e1ba5a6bf91a0837eaa664	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9764387848e039a013c4e80439b7b29b
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 6d55d60fcc2a..6897a10ecfff 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/qt5ct-1.6 b/metadata/md5-cache/x11-misc/qt5ct-1.6
new file mode 100644
index 000000000000..72d530205b68
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/qt5ct-1.6
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-qt/qtpaths:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5=[dbus] dev-qt/qtwidgets:5
+DESCRIPTION=Qt5 configuration tool, similar to qtconfig for Qt4
+EAPI=8
+HOMEPAGE=https://sourceforge.net/projects/qt5ct/
+INHERIT=cmake
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5=[dbus] dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=https://download.sourceforge.net/qt5ct/qt5ct-1.6.tar.bz2
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=43f2686ac231078f8f4e3d445a1467ea
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index cc0772a373e3..9661f9334933 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/terminator-2.1.1-r1 b/metadata/md5-cache/x11-terms/terminator-2.1.1-r1
deleted file mode 100644
index 7d511fdd9553..000000000000
--- a/metadata/md5-cache/x11-terms/terminator-2.1.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext test? ( dev-python/dbus-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/libnotify[introspection] ) verify-sig? ( sec-keys/openpgp-keys-terminator ) test? ( dev-libs/glib:2 dev-python/configobj[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycairo[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] gnome-base/gsettings-desktop-schemas[introspection] x11-libs/gtk+:3 x11-libs/vte:2.91[introspection] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DESCRIPTION=Multiple GNOME terminals in one window
-EAPI=8
-HOMEPAGE=https://github.com/gnome-terminator/terminator
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=distutils-r1 optfeature verify-sig virtualx xdg
-IUSE=test test python_targets_python3_9 python_targets_python3_10 verify-sig test
-KEYWORDS=amd64 ~ppc ~riscv x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-python/configobj[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycairo[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] gnome-base/gsettings-desktop-schemas[introspection] x11-libs/gtk+:3 x11-libs/vte:2.91[introspection] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/gnome-terminator/terminator/releases/download/v2.1.1/terminator-2.1.1.tar.gz verify-sig? ( https://github.com/gnome-terminator/terminator/releases/download/v2.1.1/terminator-2.1.1.tar.gz.asc )
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0712cdd0c9536b86c502b31fd8cfff28
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 08d5188547df..985cb72a57d0 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15153 BLAKE2B d9489813ffb032a3f6f6eacb6df9ad7819bf186e8ead6915d583a0259dd4ccdda908f27867444b45375911e6c60c83e1069b4a71a2a06470f795f6a9fac5b8e9 SHA512 14e11af3bb1e448bd105f6b59bfdeff65b818fc1e4fad2e98891985fef279f09bf5e599162f137b666332a787df599358edcef202bf7d6ad3e111d3c5ab90cd5
-TIMESTAMP 2023-02-27T03:10:01Z
+TIMESTAMP 2023-02-27T09:10:04Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP8HwlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP8c2xfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCOcg/8CICKaN7L1YO8DVnvrX+31blHstKCvywujMNoGPfnSs0HRyTWizpsHZA+
-jZDfWMSzR27/dLkD2+gVwg9YAEE2YRZJ00XfceyReczvh4b4pFGn83Gd1haey8Qw
-ATrr+mmQYlC084iI6xoRhmKJF5LTahyWrtBRGjN4Wn+jPSytHouvz2tdZTeqwFgx
-8sYrw52fiKEgagPdE8WPObXAJXPxGBcPNbK1S3nT93noP9gOCIH8Hv3+YYYRxp+w
-Ru23pFOC2V5tHsd2/TB67cg3wQVtoyPkJvPTsAWRTL6HPiumxK8KdJcjPtV5pjzC
-HCTER4iiJzKA8xFI6mX8urNWgBtYxt55RswOImLgcWslTGMIGEs93tRu0tZeQYM4
-dim2I4qSBjWXKVlWJP7WNJX3Q1e3WeOeJbh99yWaU47yjj/VeQukfnN/3/jyosow
-vsHrjS/cbNpQTqPJr4qtBJ6td8mdlaVdPiDpfqVQpAbMkn7YWs7uWSbcEMU/LO+l
-T8cPa9/jMV2ytcQWvPoaLduxCOnhfXtnersny8BBrXpjr/TkuDMit8CuFmsIdnal
-ULKa5qBCGV4AId5940CqvcKti2m8wQRjRxnl1ZZ1ltgb9aUekJjWQUPFC8wWYH8Y
-RR91im50fbL5YUEsjKpdflQ19+5lLWg6kClrx9CSta0W/Nz4GNQ=
-=QpLb
+klAGLxAAhfqAHJdIIoQ/MfVoQpkzzLrgPeMuaSVoZtnxq/8/EE5GrpDqNuCzekFC
+qDDHl8OTIukD2Qk2F96Igen42/tkPQXKcvCmiJj2UjaFTx/PNr23ussIlT9mXvTg
+Ln7k13H1EgtveQhv49D1U3asdBtLXxQv5znL734/PCA2n2i6P2UaxsXbTFe8SpDP
+0bWGbgL6QZbTryBb8u79DuRDdu2Q6mPX9WtQrzYVr9A+9DQCKSCrsSveBa0fM7xu
+IWZGJrum9tlWJFjEEnAxI+6NCJJcHNZssui+svqMb5Pf18dE+oOUpgaPXQPjJ0Mx
+h319mZ9V7XKVCaRzwZBHTQNRA/VFizx75axsMojBSgNnIRjnJnvFKCBesl+NX0H9
+rzlxJuCHcgBneFYkOBXKn2TRmV0i3T1JIDS2ledMMwNjbTRV8jVMVY9mIYmBW25l
+Obg3/DgOADADiKZOfLiq1os5vDW+iG2YEHBKq5dN1bqzPQzpUdSiPaPkfSkco4v3
+doi5QpPBTtXfGUHE0zbDGnM+n4H0orC2DVQMhKoD3ssgBl71his2eAsH0ZJRASzj
+IfhFV+w9xVuC6+Y7AAisiSCGS0VDg3uHeXSaQZnsKJMtnz8QtQ/0hvwFSIXKEWY/
+9IOC7gtuxAYlT3q7Fd3WhsqRT1bN6UC/BQqwZF3smReL4xLpS+U=
+=SQn5
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 9968683cf0c0..cdc1c9395a55 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 27 Feb 2023 03:09:58 +0000
+Mon, 27 Feb 2023 09:09:59 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 627944d16a80..eb65de01e8fc 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Feb 27 03:09:57 AM UTC 2023
+Mon Feb 27 09:09:59 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a95a0662a385..6c7f3a03202d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 27 Feb 2023 03:15:01 +0000
+Mon, 27 Feb 2023 09:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index b926d53733f0..a54c8e87e84f 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-3cd076a8371c27028c166cc841bde5b8df663496 1677464307 2023-02-27T02:18:27+00:00
+0c93c3b8eee4b209e5fcf479f4aebfa6e04efcc7 1677488648 2023-02-27T09:04:08+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 824a94f0eb62..3fda3e1460cb 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1677467401 Mon 27 Feb 2023 03:10:01 AM UTC
+1677489001 Mon 27 Feb 2023 09:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index f9dff407f6d0..cdc1c9395a55 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 27 Feb 2023 03:09:57 +0000
+Mon, 27 Feb 2023 09:09:59 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index efcd8a551009..ee8bc1f4652f 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index b70d73a05460..e42bfa0bffae 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,7 +1,7 @@
 AUX fail2ban-0.11.2-adjust-apache-logs-paths.patch 893 BLAKE2B 5b80b81488a5245d9d9d15a1b0205a1d86f132e3faa5ea3e5cf91d55082b2d264e558dca4b7fbe62f643601b3315ac31cae387c433c2d90b670965abfa744f87 SHA512 dddff4858431170f5a24daab2d3cedcdcd7a1194b8ecbbcd794dfe00dcaee4af410afef102d3a25f86f541267d7be63e3e1d239c879e95d20cef9f0dacdcdc4c
 AUX fail2ban-1.0.2-configreader-warning.patch 844 BLAKE2B 3dca580b50c7fa425765ee28fd07d033e738e81ac08f1b66a9b328c7fdf24227c0dca81927e61933c3c3d0c7b6895aed797642f15b449bb6485c8bef6c2315a7 SHA512 119f6b06c099f1dd147859408714fdfe3c73e254ad0d4bf04e535a1f6cbaf08ba368f3e616df792579528e5b6e26bd1be5408258a807d7e2ba36020b211d8e9e
 DIST fail2ban-1.0.2.tar.gz 583295 BLAKE2B 84eb5e3487c4db734f4f0a36af142d520e1cc53c2960893ee2f05ff4e78133860be59ed9580fa0d972509a03c17e5d9458b8e3f6b470a4c3154f10911f94691e SHA512 688a84361b5794e1658f53d2d200ce752fe1e3320ddb1742c32c4b4b82a79ace16ae464e7ea3eeb94a0e862bcac73c2d3a0e61dd7b28e179a4c857f950d74dbb
-EBUILD fail2ban-1.0.2-r1.ebuild 3722 BLAKE2B 6d710dc39668db0cb99abd1423ee224cf35b0013243323658c1d53eeab7a10a4304528c471095df0ed4fae35c47ee6ea93d1113af9d95df79664c5c666f33465 SHA512 be60308bee4911b71e0d4392fb9cefc734e432b956ea540d827247621b24b82195b8fbb7e50a053f7aa246182b16232edc396e192eb396b9a9c010981c60e1fa
+EBUILD fail2ban-1.0.2-r1.ebuild 3729 BLAKE2B 86faa02f93ac76995f32932024c8c882d2b749e3f1b31b46ff5b85b4a11799dfdf13fc4dba7d2bfbb80fb4e5d7ef8110d3017651dda1911794e85be10f7137f8 SHA512 60485899cecfa5abf25d00cb0a8b9bf391f954c9337334fba4a792d73b09649842a71820c838cdedd12233e5d815ea692ffc6ee3a9bc94a34f68405d845485d1
 EBUILD fail2ban-1.0.2.ebuild 3660 BLAKE2B 4afdb26014e00f40bb809b31037307f603008ccd0e7d646a82fa749bc9e324a22cf2d11fc831c45c607c3ce3ca899662340cbb04d279ade738cfbf44a03f2303 SHA512 5505d02a844797e68c2576fa4393ab357af611fe0a1dbf401b4dd3b91c680eb185b7e7d927ef85a4dd00e59ee2dd687bcb0fa31e0df7c61ced7dea6cb1134532
-EBUILD fail2ban-9999.ebuild 3668 BLAKE2B daf3a2a9347825bc15d6f85ee3739635af3aa29cdbf62bb3de21c76708726d502855204dba964b19312e835d35730b1b1b7435f70a08c5fc709d860412c4d984 SHA512 58c3dfe231ecfd4005938d54ce11cb079483fa5a5d28e4aaa28f956fa7c7f9e8fbe3f21a07b4125ed960dabc4bee801f40efa6e69cb2fbfb8479b4a0ea03ff88
+EBUILD fail2ban-9999.ebuild 3682 BLAKE2B ef42c66e102750ccfe920c23d2922b2b0de0b9ab9978fbaabdaf84a9f4632a329aa4ae81cc483ce75bd1aa9171b89312dbde9ed931c1fd134b7ba0224375ec25 SHA512 aed88a4f56effb9c1c26470f1c5b46057ae7b442718f7aca9305746eaaeb75142b258cb08fdf93b93408912966f77462f1a4053460435e7f1d9a7ac54173c7a4
 MISC metadata.xml 357 BLAKE2B a5dee8c760b80bbfad6bca9a7adae797eda34b9db80716db8842c6813b4ed25ed4707290756dc869a7db4163de1ff6114c1995fcc2c485df1bcc6cad9c9a8f14 SHA512 9877a507bd3617c33351036317c5dc7855a1024d8f04f76a57edb93bd80e62b2b7c4f35784f447e94497305eab33246ae5913ba36ea001aa9068d1f91aeee9f0
diff --git a/net-analyzer/fail2ban/fail2ban-1.0.2-r1.ebuild b/net-analyzer/fail2ban/fail2ban-1.0.2-r1.ebuild
index 2cdb64c1521b..5814f14e5026 100644
--- a/net-analyzer/fail2ban/fail2ban-1.0.2-r1.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-1.0.2-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fail2ban/fail2ban/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/fail2ban/fail2ban-9999.ebuild b/net-analyzer/fail2ban/fail2ban-9999.ebuild
index 779449fafb84..ed94d18e70a8 100644
--- a/net-analyzer/fail2ban/fail2ban-9999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fail2ban/fail2ban/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index dad662828369..0ba51c7a3018 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -17,38 +17,23 @@ AUX zabbix-server-r1.init 598 BLAKE2B 53026be133378595e83de14f939eda655d871f8caa
 AUX zabbix-server.service 429 BLAKE2B 1727ad52441b8e1ef31ee0f7faaa9d9964ee4ca5e2ef61de4715c25b0e0c97a627e6735a67c4114484950f0334fffa344d94f9192ada63887a21b617122eaf0d SHA512 d20fa4aa3a545d2f36388d7cac78c70c5610f5e7529348447e6fa6bacc33f42dd6e1c37c50b1c2711900a3f29bbbbb0ebc7c54f04d3de717aadad48e18c46e28
 AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df
 DIST zabbix-4.0.44.tar.gz 17713321 BLAKE2B 1f75f99430846cfc029d5e541ede7ef8c019a42af0ab6d70be3170052b723877ca54f6554cd9a29f7f436fb6e9d5ffd02913a1b12ad45a2a8ed00432738e5660 SHA512 223d6fdd352e5731487797d839c1741209eae79af78a058d3ba29e5a9eaab5cbf91072ad827bdd676696d3ea518c638d7fd515bff2a257aef3a7ad38f41b3cb6
-DIST zabbix-5.0.29-go-deps.tar.xz 34421032 BLAKE2B 35809df9e2d9186813ec079d31206bccd8e4bf6da0376e1e87a65ccb17345bc3f8e81820cbad7700ab2596ede4fe604867337b89d74ac3254eeccacc128a4708 SHA512 6553612cc1b7a01cd6b43378f7a5e15fd99245ecc23d1345a0a780ba506073ac2b8b68e96599f56ea7a01052d74b14f6e2f29ca9a97d71748fe285583531f82d
-DIST zabbix-5.0.29.tar.gz 21471836 BLAKE2B e38f3b7c38900d80ca0497326f9979e793d04fd34d716673e76ea65723e0019caa7e1e92e581ac6423f77a2fff7554250c728721c125596b1c9a17b0c860346b SHA512 60e707d79ee9f92b69aecabc97e92ad04d0d66839ceed250788f111db4128a66197b9c528bde8cb4f4f92e6a5502ff31c6d838e3c1d3b81ce6b7910879915b61
 DIST zabbix-5.0.30-go-deps.tar.xz 34398308 BLAKE2B f987ec0518a070d9480be7a57a8101f6c65f89ff0cdf513cb19b5d79e88c410782df87e732c7d838e6db6dd933cc855c027fc8351855121a57e0a2912ed0bda2 SHA512 eb1ad8c3983e475229887a2561f6e55ed3a4c1be270221fc12c0d0fcba7f2ad661f984f16f5f5d9684496c35c6daebd93dd13f5e898244af90d9ad9bffb911c6
 DIST zabbix-5.0.30.tar.gz 21505195 BLAKE2B e6876b896e61feccdcfa05a9bc2ae57345957e8e4dc2e2c3d635e917cc525c9cf4dad5e45821e6677f766654bd702b8baac8b65a4fc286af816fbf2b2e076a0c SHA512 2f744fc1ba42ea0602cc90c91342f531c55cb1f76eda47c6e928e74dc595f7bd885f69abb52c6eb1b20e65bd6c3c46c299d6cfee2c3442db137561060386a31e
 DIST zabbix-5.0.31-go-deps.tar.xz 34443128 BLAKE2B 38bf33002e6dbae95b39579383f8bb6998b0408434f140b1bb31e7cadf07a0363ac6234a820ec306cc12f764fc43d250a45ffd159a315dc494d0871ae6167660 SHA512 4d54ff09ccb356b3080240065598cc93d11a11c8faef0c6a22ec923face789cf2bee95ddaf62d0ecd74bd0807060fb4fcbcfa71b1ffcb8723096b1164d7c25ae
 DIST zabbix-5.0.31.tar.gz 21567566 BLAKE2B 076090e07856df0dc2603d75fb7cc9862e40b9e6bda89094cf687aa00719a0df7cf7fd93bc973cb38cbbb31b6b723efd3dc5aa6dde00b4f4a5b118331795bfeb SHA512 7409e23313a6c5f6f4f1e1c0ba0ccfec88aa2687caa25673709bf05b9e287a535ea417551dee0f9d2fbd571adfe843a700ee45ee3dc72752cdeab12ec4c54644
-DIST zabbix-6.0.10-go-deps.tar.xz 27482516 BLAKE2B 64b9f2d093aaa8b7b1b39d4736f9b087fdcc518b1a5eced7a46bfe5a1ea2c1bc2d3641ab8e61d4fca8f036a8a96d8c8b56fe9dab17b356b8c5e507f77f10b864 SHA512 15b4799d8934155112469f4a571b8f015a0779b7c946a49cebb4b513ff7553989cd71704e403ae3fdf18646235fc40daf14bb9481d493ad8e6b53146fd7f3f27
-DIST zabbix-6.0.10.tar.gz 39516402 BLAKE2B 00e81dcea63433cb93ef9bd77094bef89f7d604d8c07b9da5959c79d54f026b1256f486395229e0232aa96271b72fd9f3c67e08dfb96321be398b8b4fa832f6f SHA512 4fc70d89f61f50e5a6b9bbd1a25d9cac6d734872d3558df83b01abe04832773cdbab6e0f214045c117b6e2fcd7ae3fba08701be942cf18344e6b5a78151665d6
-DIST zabbix-6.0.11-go-deps.tar.xz 27480580 BLAKE2B 443ecbd9fd0d66cacc75f53d5f56ae996bce52e04827de97948ffc6a3e02888b4b5122eba2425465624e34bc628992f7a520bc8e0281444baed0aa1631f3bec1 SHA512 0936626b658f1811e8aebdd59ca506b33f1a95696018b088cfe04479386ecbcfe4c6c7fac6d26487e28d36cb6283028312c3bc2d27bde8cf54698236d3bc6ba4
-DIST zabbix-6.0.11.tar.gz 40388383 BLAKE2B e6ded007285aac58bb4c29075ac8d34f6ab0db1a74702269b63dc8772ebdf8b2986737fa91d39c9e8bacee5e1e12d7d7bb9580221f9b4917cbc829784639201d SHA512 decb9fcf5de8f0d81cd0b16b6a5e341742c97baed0faf2d5f22bba98fd9fad4e154360724b5aedc378d5b5e2c64eda36f308e3eb6e6f8e80a5cf082ea95ebef6
 DIST zabbix-6.0.12-go-deps.tar.xz 27481268 BLAKE2B cfeca38b63a6271b4ff6819143e0214d3b468e3f7b681cc0bde443192e84ec4b66eb9b8ce38be01fa74a186f8904dfe73af04ad98007880e9ad6aab5c4b978b3 SHA512 c021efe15b61eeebad855ee9d8081f06796d126f3215bac4cb8a36384185aa2a67c0af580b5fcd830e6da832eb1057c02621c71569e30735fb0bef172f26d3b4
 DIST zabbix-6.0.12.tar.gz 40419443 BLAKE2B 18e328a3361947292b3c78fc75dbcfc464f3419fb35bd0895049c90d26d362edbe0a727d1ab955f428ec812d6f38f68717f3c635216aff0468f188321b476495 SHA512 7cd254282523002d2e4d86295258ea0f56921b54c88d604300104f32ea5807c0b39b5550a9dd98e03ad41adf4dd8e93a7b1deb200d513283dca51d49d46bda4d
 DIST zabbix-6.0.13-go-deps.tar.xz 17974536 BLAKE2B 296ae034ccf0f6cd1d83379c46ad87d80faf3d897d807d948312989e044dc4d159aabab27999730ed255be3c7d5aa6b70927bcfb888f9969b36994c68246c14b SHA512 279aeed128e00dab8f1824ed7186ddc914615f7756a96c049bff0321997c9e412007c56701a036a1a25029aa7c4f878ad4566e95abbf766ee353666a6a588370
 DIST zabbix-6.0.13.tar.gz 41075557 BLAKE2B 41db999c52d3ca596861d8850d594e639159b8c7090b47dd824be5b2695a6f1ebc0399643de8fb25af4081ab294c6fefe7ec9c0025ba4e4d17d44aa16d8b233a SHA512 188622c0c04029eac376ebf60c96ed9d67923bc1f40eff75666a241bb534cb744aca8c51ff4b79d508dfadb9e758f80d9dc46016217bcb5a67e8ede7e645788e
-DIST zabbix-6.2.4-go-deps.tar.xz 27489292 BLAKE2B 174c822aa1488fd2dfb726ed2cd5d2e86147404793ae97c6d45554de7cdf36073aa28a988e967798afb6681d1c054252433fcbae68816ccca79401383d4cc4e5 SHA512 6c1fa17663aaf91e234c34f7019b6f5b3720ab6c4300ece1ac5404f9f8499b74b6a2f5ab54e2eb0ac221d0df5e5e271762ff2f2f776e782bff0a3c85fe8f6407
-DIST zabbix-6.2.4.tar.gz 40299367 BLAKE2B ee74829acbac90a37bc3bcf3c95a92a7df1f83099cda7c9ba9ed225d3bdfa0e49667c5aa1522dbdac1ca2da8b621f94d384c857af8c66db87353f044f6ec0420 SHA512 16249f78f09e6c07a993972a7e72ef85083e08adfdcd6383b51a60ad172a48bdb4510a09dc82e8a36c5d748d3db155d3e4ca14909e2f2b4104bde200f151a596
-DIST zabbix-6.2.5-go-deps.tar.xz 27499244 BLAKE2B c8c7e59e0c2d61224bbfd11690a54b411a981e4ab3a39e217a03be83bdae04914898ab7b38c00d3a48900b769eabf51901410247a204915e0e901182c69266f3 SHA512 0c13f15b2ed62a6eb418244560cd40e277d333f17e65ceb9125335408fd632870d260f986b5c76328bc91e6b0b619816836c543f5d87ef5d957904aad722f613
-DIST zabbix-6.2.5.tar.gz 41020695 BLAKE2B 5e21867358cc6c4374695b7da6d74b8c3642bf4e1f41ebcdb2a158c01e5a4b6ffd679728a35badeb3cbefe0968d97577e9141340b32287cb01d89e0f227b964a SHA512 3cf5745942f69eee348c37ddb1bb68937c628ee97d050b0bfed37be66e4a30a6448829cbfa000f9388761e6611af9ae7046fdc63b608f3bcce1575bfa476dd5b
 DIST zabbix-6.2.6-go-deps.tar.xz 27486336 BLAKE2B e17aa599bc6be82e211f48642c03a73594965dd51a83b7e7e9ccbe949865034348a33cb413824d3d1aabd6aba56751132ef95dc333f75657bce3cc3fa4f1ef01 SHA512 eb18c6a78b0523543b7273c489d2dda94adb983df802b03020374b4bda51a44bf01e92bafe556242710f942474a9547a8366f724187f9a429e28bb94c0fa9c57
 DIST zabbix-6.2.6.tar.gz 41038757 BLAKE2B bc2dd394085d2bb32a052f682d7271b14967ca4100ada34a1145e0b137c32036202346a7ee7bed06f62ddf6a6c9b1033b9b1534aef50850a6d49446b40e6aa21 SHA512 03f2396fea0794f0a66a00880e7a46d0295a562fab2cfdd0890b2f9369bb1bfe6ee19398ab062bcdcdd9ef1415a6fa599a1f5e8135fb54ef6855e9f435619097
 DIST zabbix-6.2.7-go-deps.tar.xz 17973952 BLAKE2B f7e155040a60ac48236084b404d469bc5c34ab0dd986d3d647960bb6313f8080298f359680d6be23d2cb4c5f7d30bbab773c7fe81e4bde3873215f5e4072bed7 SHA512 e83dcd5cd6a07febf9c6380d311c84a319e3c45314266217837f6b35e540a6c9d4c980ceb7bb995ca8366247ea67d7d3c1b10beab677e4c24c69d83ba9977862
 DIST zabbix-6.2.7.tar.gz 41462274 BLAKE2B 52d82c1eb00f003f53758840af4621b15dcc0c4dbb09f051fa323a53fada303dc5123d3fc99238688e73eb9506a54ec88890d48bd7f21ecfccd5f8b0dd02e102 SHA512 5cafae600d7a83729ac2d28c1cace2a6fb0ac1bdca06ac89e7fd272f1227d2d19e3aa3ccfaefb00229a61f55c608c4d97a5595724c600d8a46950a92c6e20fd0
 EBUILD zabbix-4.0.44.ebuild 9425 BLAKE2B 99915e322601540a008f2672090b0b9aaa56514afc03ea29c23495c84d493109da12faf142b9bbde2330995e2b2299b0ebd29af78c59330a6184df570072a148 SHA512 e72962f9d932ebd4114d3a6277a9a73523589deb2d68926193e9e1a85df89f4c7aa28367794300f609975133e68f756a31ab4388edbfe3ccc1e9138e3dfc0d56
-EBUILD zabbix-5.0.29.ebuild 10142 BLAKE2B a71d8c7d65a4fdf930662b476416c416f519aaedd1489ede7da5b442d5aa2788625385bc8f0af28202f1261d10ebaa0b6dab3d449a7391df036b09a8646791cd SHA512 8053a8a2445a8aee9f029fb5ef61478b4e6beb4dbd0181c3054f34a59d8c6ef7f07c094588ede931371e02faf672c8d89f6e2f2baa1e5fee0e9866f34ed426a4
 EBUILD zabbix-5.0.30.ebuild 10142 BLAKE2B ffd5ab5a402b325ba940def36626cb3c8e6484ae8648010dde643921a793a07850b29c57c5f0b73f74d0fdd0c68c758327906696e4813f5c032cbbc761843bbc SHA512 50a9cfeb2756b2ec52f072566cc906a1bf15b0b9c96c0842dfd8d56e0e1ec26dcc0c170c0d304b8113e086545041aaa6e7acd83d2bba172e280d75f59933c619
 EBUILD zabbix-5.0.31.ebuild 10144 BLAKE2B 408ca81f3217efbed52c461cf7a17b228dde32b1f9d15625341202f01fbdb79c48d265f85cda2bbb366d5cf926c1a55b040f6a3670475bbda81b1e806d743ab7 SHA512 2d8d472f1e529384e0bd7ec5de6e774628f20e78a6db94ad449f5e22c2f55a1558777523bb20d00a30c31926b9ec3709000bbbe287522184bfab117587409d42
-EBUILD zabbix-6.0.10.ebuild 10737 BLAKE2B e249cd00548e05fa986df84d4d53c5277195b60a6aa433c8f6cc0d6824e950efc00b644b7f6b7af638431d57f26149b0848139fdaaa295d282497b8aa56cdfe0 SHA512 a94a896619edb99e9ab841c63516a4a6fd673ea21a1b6276d65a9dff5e55f93825b88396defdb164c59f550e3537c18e5a59698aa98e6c50919dc9f1bc3f75fc
-EBUILD zabbix-6.0.11.ebuild 10209 BLAKE2B d90d115f137fd778b5051728e6cb5def545b506c7887e634be9f7d503043d53cd24f5b99c0e4905f2ed17fb2a62739a8c79d3cdd8a754396d9fef0e28e88b4f6 SHA512 05e026492443e19c068fb786cc6976afb192b2104035f1c9a38d7c72251541f596b03973aaad16c85e11bfb31dcbd2acdb4e920413c1a1b633f2382edffb5a2d
 EBUILD zabbix-6.0.12.ebuild 10207 BLAKE2B 083d2f1350ad83bd6011a28dba9229a1403f2fa5b2f92559a8bdeb32a7c6b7cc167ad8d64dfae717dee251cd9de696607dd5adc21626409e019e28c7d307dcc2 SHA512 76e6db0eb214a0fb87326f2b96093bab7f70de7b1f6b66c25d559da1db704f08653d31e2dfa3671bab180eb54d088edf8512992e4a9f20d75752d0562e6d21bc
 EBUILD zabbix-6.0.13.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
-EBUILD zabbix-6.2.4.ebuild 10737 BLAKE2B e249cd00548e05fa986df84d4d53c5277195b60a6aa433c8f6cc0d6824e950efc00b644b7f6b7af638431d57f26149b0848139fdaaa295d282497b8aa56cdfe0 SHA512 a94a896619edb99e9ab841c63516a4a6fd673ea21a1b6276d65a9dff5e55f93825b88396defdb164c59f550e3537c18e5a59698aa98e6c50919dc9f1bc3f75fc
-EBUILD zabbix-6.2.5.ebuild 10209 BLAKE2B d90d115f137fd778b5051728e6cb5def545b506c7887e634be9f7d503043d53cd24f5b99c0e4905f2ed17fb2a62739a8c79d3cdd8a754396d9fef0e28e88b4f6 SHA512 05e026492443e19c068fb786cc6976afb192b2104035f1c9a38d7c72251541f596b03973aaad16c85e11bfb31dcbd2acdb4e920413c1a1b633f2382edffb5a2d
 EBUILD zabbix-6.2.6.ebuild 10207 BLAKE2B 083d2f1350ad83bd6011a28dba9229a1403f2fa5b2f92559a8bdeb32a7c6b7cc167ad8d64dfae717dee251cd9de696607dd5adc21626409e019e28c7d307dcc2 SHA512 76e6db0eb214a0fb87326f2b96093bab7f70de7b1f6b66c25d559da1db704f08653d31e2dfa3671bab180eb54d088edf8512992e4a9f20d75752d0562e6d21bc
 EBUILD zabbix-6.2.7.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
-MISC metadata.xml 1757 BLAKE2B 4c44773ec6767f5d7edf927347cfae3f45ba1afb0ac1399c5fd31a9ce8c493647b16d22b891d803a820cac76ab2b3a3966ac33704e6e1d728cb23c18f30e02d4 SHA512 e953034478edb317a3657e44725e5e18d0033d70f53a10a3e8d317f0cc2a014a3c5485135999435cf222fa63748d093888054d6556b8ca78b00e39a699d98968
+MISC metadata.xml 1655 BLAKE2B 46ab1f5adaff6069890380b23a6edaf8f0f7380ffc4a320f17df52f2e59867bdcf09633d9c6e242434919d3512d557c2f623d2826b1453424c43dc0b0ee0a262 SHA512 62e5a8853c13dac034360bd1a7b61987b548641b76860f05a8f75181b8d8029e06bc9cbf136d42836e714cf0c193b04a589d214a7864d607bf93dd97066f1a70
diff --git a/net-analyzer/zabbix/metadata.xml b/net-analyzer/zabbix/metadata.xml
index f1d56c470b2a..5a8b28dde8b8 100644
--- a/net-analyzer/zabbix/metadata.xml
+++ b/net-analyzer/zabbix/metadata.xml
@@ -26,7 +26,6 @@ configure different types of notifications for pre-defined events.
     <flag name="odbc">Enable Database Monitor and use UnixODBC Library by default</flag>
     <flag name="openipmi">Enable openipmi things</flag>
     <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> as TLS backend</flag>
-    <flag name="pcre2">Use <pkg>dev-libs/libpcre2</pkg> instead of <pkg>dev-libs/libpcre</pkg></flag>
     <flag name="proxy">Enable proxy support</flag>
     <flag name="server">Enable zabbix server</flag>
     <flag name="ssh">SSH v2 based checks</flag>
diff --git a/net-analyzer/zabbix/zabbix-5.0.29.ebuild b/net-analyzer/zabbix/zabbix-5.0.29.ebuild
deleted file mode 100644
index 901c486faa9c..000000000000
--- a/net-analyzer/zabbix/zabbix-5.0.29.ebuild
+++ /dev/null
@@ -1,398 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# To create the go modules tarball:
-#   cd src/go
-#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
-#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
-
-EAPI=8
-
-GO_OPTIONAL="yes"
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
-	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
-"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	?? ( gnutls openssl )
-	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) !sqlite )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	gnutls? ( net-libs/gnutls:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls:=
-		net-nds/openldap:=
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	server? (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp:= )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? (
-		dev-libs/libpcre
-		net-analyzer/fping[suid]
-	)
-	server? (
-		app-admin/webapp-config
-		dev-libs/libpcre
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	agent2? (
-		>=dev-lang/go-1.12
-		app-arch/unzip
-	)
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-5.0.22-system.sw.packages.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable agent) \
-		$(use_enable agent2) \
-		$(use_enable ipv6) \
-		$(use_enable java) \
-		$(use_enable proxy) \
-		$(use_enable server) \
-		$(use_enable static) \
-		$(use_with curl libcurl) \
-		$(use_with gnutls) \
-		$(use_with ldap) \
-		$(use_with libxml2) \
-		$(use_with mysql) \
-		$(use_with odbc unixodbc) \
-		$(use_with openipmi openipmi) \
-		$(use_with openssl) \
-		$(use_with oracle) \
-		$(use_with postgres postgresql) \
-		$(use_with snmp net-snmp) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssh ssh2)
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		dodir "${dir}"
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-
-	if use agent2; then
-		insinto /etc/zabbix
-		doins "${S}"/src/go/conf/zabbix_agent2.conf
-		fperms 0640 /etc/zabbix/zabbix_agent2.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
-
-		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
-		dosbin src/go/bin/zabbix_agent2
-
-		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-1.2.9.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.2.9.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.7.32.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		tmpfiles_process zabbix-server.conf
-
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	if use proxy; then
-		tmpfiles_process zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		tmpfiles_process zabbix-agentd.conf
-	fi
-
-	if use agent2; then
-		tmpfiles_process zabbix-agent2.conf
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-analyzer/zabbix/zabbix-6.0.10.ebuild b/net-analyzer/zabbix/zabbix-6.0.10.ebuild
deleted file mode 100644
index 0a0d755be321..000000000000
--- a/net-analyzer/zabbix/zabbix-6.0.10.ebuild
+++ /dev/null
@@ -1,411 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# To create the go modules tarball:
-#   cd src/go
-#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
-#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
-
-EAPI=8
-
-GO_OPTIONAL="yes"
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
-	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
-"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh static"
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	?? ( gnutls openssl )
-	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) !sqlite )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	gnutls? ( net-libs/gnutls:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls:=
-		net-nds/openldap:=
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	server? (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp:= )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? (
-		!pcre2? ( dev-libs/libpcre )
-		pcre2? ( dev-libs/libpcre2:= )
-		net-analyzer/fping[suid]
-	)
-	server? (
-		app-admin/webapp-config
-		!pcre2? ( dev-libs/libpcre )
-		pcre2? ( dev-libs/libpcre2:= )
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	agent2? (
-		>=dev-lang/go-1.12
-		app-arch/unzip
-	)
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_configure() {
-	local econf_args=(
-		"$(use_enable agent)"
-		"$(use_enable agent2)"
-		"$(use_enable ipv6)"
-		"$(use_enable java)"
-		"$(use_enable proxy)"
-		"$(use_enable server)"
-		"$(use_enable static)"
-		"$(use_with curl libcurl)"
-		"$(use_with gnutls)"
-		"$(use_with ldap)"
-		"$(use_with libxml2)"
-		"$(use_with mysql)"
-		"$(use_with odbc unixodbc)"
-		"$(use_with openipmi openipmi)"
-		"$(use_with openssl)"
-		"$(use_with oracle)"
-		"$(use_with postgres postgresql)"
-		"$(use_with snmp net-snmp)"
-		"$(use_with sqlite sqlite3)"
-		"$(use_with ssh ssh2)"
-	)
-
-	if use pcre2; then
-		econf_args+=( --with-libpcre2 )
-	else
-		# If pcre2 is not enabled, then use the old pcre library.
-		econf_args+=( --with-libpcre )
-	fi
-
-	econf ${econf_args[@]}
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-	if use agent2; then
-		insinto /etc/zabbix
-		doins "${S}"/src/go/conf/zabbix_agent2.conf
-		fperms 0640 /etc/zabbix/zabbix_agent2.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
-		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
-
-		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
-		dosbin src/go/bin/zabbix_agent2
-
-		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-1.2.9.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.2.9.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.7.32.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		tmpfiles_process zabbix-server.conf
-
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-
-		if ! use pcre2; then
-			ewarn "You are using zabbix with dev-libs/libpcre which is deprecated."
-			ewarn "Consider switching to dev-libs/libpcre2 (USE=pcre2) as soon as possible."
-			ewarn "See https://www.zabbix.com/documentation/6.0/en/manual/installation/upgrade_notes_600#pcre2-support"
-		fi
-	fi
-
-	if use proxy; then
-		tmpfiles_process zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		tmpfiles_process zabbix-agentd.conf
-	fi
-
-	if use agent2; then
-		tmpfiles_process zabbix-agent2.conf
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-analyzer/zabbix/zabbix-6.0.11.ebuild b/net-analyzer/zabbix/zabbix-6.0.11.ebuild
deleted file mode 100644
index 961445bff7c3..000000000000
--- a/net-analyzer/zabbix/zabbix-6.0.11.ebuild
+++ /dev/null
@@ -1,397 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# To create the go modules tarball:
-#   cd src/go
-#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
-#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
-
-EAPI=8
-
-GO_OPTIONAL="yes"
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
-	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
-"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	?? ( gnutls openssl )
-	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) !sqlite )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	gnutls? ( net-libs/gnutls:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls:=
-		net-nds/openldap:=
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	server? (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp:= )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? (
-		dev-libs/libpcre2:=
-		net-analyzer/fping[suid]
-	)
-	server? (
-		app-admin/webapp-config
-		dev-libs/libpcre2:=
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	agent2? (
-		>=dev-lang/go-1.12
-		app-arch/unzip
-	)
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_configure() {
-	local econf_args=(
-		--with-libpcre2
-		"$(use_enable agent)"
-		"$(use_enable agent2)"
-		"$(use_enable ipv6)"
-		"$(use_enable java)"
-		"$(use_enable proxy)"
-		"$(use_enable server)"
-		"$(use_enable static)"
-		"$(use_with curl libcurl)"
-		"$(use_with gnutls)"
-		"$(use_with ldap)"
-		"$(use_with libxml2)"
-		"$(use_with mysql)"
-		"$(use_with odbc unixodbc)"
-		"$(use_with openipmi openipmi)"
-		"$(use_with openssl)"
-		"$(use_with oracle)"
-		"$(use_with postgres postgresql)"
-		"$(use_with snmp net-snmp)"
-		"$(use_with sqlite sqlite3)"
-		"$(use_with ssh ssh2)"
-	)
-
-	econf ${econf_args[@]}
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-	if use agent2; then
-		insinto /etc/zabbix
-		doins "${S}"/src/go/conf/zabbix_agent2.conf
-		fperms 0640 /etc/zabbix/zabbix_agent2.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
-		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
-
-		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
-		dosbin src/go/bin/zabbix_agent2
-
-		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-1.2.9.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.2.9.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.7.32.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		tmpfiles_process zabbix-server.conf
-
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	if use proxy; then
-		tmpfiles_process zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		tmpfiles_process zabbix-agentd.conf
-	fi
-
-	if use agent2; then
-		tmpfiles_process zabbix-agent2.conf
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-analyzer/zabbix/zabbix-6.2.4.ebuild b/net-analyzer/zabbix/zabbix-6.2.4.ebuild
deleted file mode 100644
index 0a0d755be321..000000000000
--- a/net-analyzer/zabbix/zabbix-6.2.4.ebuild
+++ /dev/null
@@ -1,411 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# To create the go modules tarball:
-#   cd src/go
-#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
-#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
-
-EAPI=8
-
-GO_OPTIONAL="yes"
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
-	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
-"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh static"
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	?? ( gnutls openssl )
-	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) !sqlite )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	gnutls? ( net-libs/gnutls:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls:=
-		net-nds/openldap:=
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	server? (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp:= )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? (
-		!pcre2? ( dev-libs/libpcre )
-		pcre2? ( dev-libs/libpcre2:= )
-		net-analyzer/fping[suid]
-	)
-	server? (
-		app-admin/webapp-config
-		!pcre2? ( dev-libs/libpcre )
-		pcre2? ( dev-libs/libpcre2:= )
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	agent2? (
-		>=dev-lang/go-1.12
-		app-arch/unzip
-	)
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_configure() {
-	local econf_args=(
-		"$(use_enable agent)"
-		"$(use_enable agent2)"
-		"$(use_enable ipv6)"
-		"$(use_enable java)"
-		"$(use_enable proxy)"
-		"$(use_enable server)"
-		"$(use_enable static)"
-		"$(use_with curl libcurl)"
-		"$(use_with gnutls)"
-		"$(use_with ldap)"
-		"$(use_with libxml2)"
-		"$(use_with mysql)"
-		"$(use_with odbc unixodbc)"
-		"$(use_with openipmi openipmi)"
-		"$(use_with openssl)"
-		"$(use_with oracle)"
-		"$(use_with postgres postgresql)"
-		"$(use_with snmp net-snmp)"
-		"$(use_with sqlite sqlite3)"
-		"$(use_with ssh ssh2)"
-	)
-
-	if use pcre2; then
-		econf_args+=( --with-libpcre2 )
-	else
-		# If pcre2 is not enabled, then use the old pcre library.
-		econf_args+=( --with-libpcre )
-	fi
-
-	econf ${econf_args[@]}
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-	if use agent2; then
-		insinto /etc/zabbix
-		doins "${S}"/src/go/conf/zabbix_agent2.conf
-		fperms 0640 /etc/zabbix/zabbix_agent2.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
-		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
-
-		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
-		dosbin src/go/bin/zabbix_agent2
-
-		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-1.2.9.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.2.9.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.7.32.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		tmpfiles_process zabbix-server.conf
-
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-
-		if ! use pcre2; then
-			ewarn "You are using zabbix with dev-libs/libpcre which is deprecated."
-			ewarn "Consider switching to dev-libs/libpcre2 (USE=pcre2) as soon as possible."
-			ewarn "See https://www.zabbix.com/documentation/6.0/en/manual/installation/upgrade_notes_600#pcre2-support"
-		fi
-	fi
-
-	if use proxy; then
-		tmpfiles_process zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		tmpfiles_process zabbix-agentd.conf
-	fi
-
-	if use agent2; then
-		tmpfiles_process zabbix-agent2.conf
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-analyzer/zabbix/zabbix-6.2.5.ebuild b/net-analyzer/zabbix/zabbix-6.2.5.ebuild
deleted file mode 100644
index 961445bff7c3..000000000000
--- a/net-analyzer/zabbix/zabbix-6.2.5.ebuild
+++ /dev/null
@@ -1,397 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# To create the go modules tarball:
-#   cd src/go
-#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
-#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
-
-EAPI=8
-
-GO_OPTIONAL="yes"
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
-	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
-"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	?? ( gnutls openssl )
-	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) !sqlite )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	gnutls? ( net-libs/gnutls:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls:=
-		net-nds/openldap:=
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	server? (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp:= )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? (
-		dev-libs/libpcre2:=
-		net-analyzer/fping[suid]
-	)
-	server? (
-		app-admin/webapp-config
-		dev-libs/libpcre2:=
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	agent2? (
-		>=dev-lang/go-1.12
-		app-arch/unzip
-	)
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_configure() {
-	local econf_args=(
-		--with-libpcre2
-		"$(use_enable agent)"
-		"$(use_enable agent2)"
-		"$(use_enable ipv6)"
-		"$(use_enable java)"
-		"$(use_enable proxy)"
-		"$(use_enable server)"
-		"$(use_enable static)"
-		"$(use_with curl libcurl)"
-		"$(use_with gnutls)"
-		"$(use_with ldap)"
-		"$(use_with libxml2)"
-		"$(use_with mysql)"
-		"$(use_with odbc unixodbc)"
-		"$(use_with openipmi openipmi)"
-		"$(use_with openssl)"
-		"$(use_with oracle)"
-		"$(use_with postgres postgresql)"
-		"$(use_with snmp net-snmp)"
-		"$(use_with sqlite sqlite3)"
-		"$(use_with ssh ssh2)"
-	)
-
-	econf ${econf_args[@]}
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-	if use agent2; then
-		insinto /etc/zabbix
-		doins "${S}"/src/go/conf/zabbix_agent2.conf
-		fperms 0640 /etc/zabbix/zabbix_agent2.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
-		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
-
-		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
-		dosbin src/go/bin/zabbix_agent2
-
-		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-1.2.9.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.2.9.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.7.32.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		tmpfiles_process zabbix-server.conf
-
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	if use proxy; then
-		tmpfiles_process zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		tmpfiles_process zabbix-agentd.conf
-	fi
-
-	if use agent2; then
-		tmpfiles_process zabbix-agent2.conf
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 26aa6029d40e..f8a6ed5c1673 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 54c3ee8ff228..b3448dfe55c7 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -2,7 +2,13 @@ AUX freeradius-3.0.20-systemd-service.patch 2162 BLAKE2B 3aa32e5a15efa223aab7880
 AUX radius.conf-r6 599 BLAKE2B 35c97ec8a31577afc89bc4f6d7a1310624bea46c2a12ea3cc010fda237b47d5a543225f54d7d4a8b00c1e15f904b149414c597525dd8b6425f20785ca636798d SHA512 acc9b0b178096e44ebfb84228caab1c82bf2f7bb38be386755169bbfb628165b6ac57194ed5a35e566dd0a2d8425f6790b43228a715e633ae8f59e2ab2b574da
 AUX radius.init-r4 753 BLAKE2B 18c83f704ac30d14d56ce8a2f5e3176dcd1aab83cc4525b728e3080e81470a9b4124af49459c69070d9c3ed67a95c7593b6d01f0259403fa9ceee43abd541f7c SHA512 8b05604a72a6a0dea3e654f36b13e1ed517d0c277d128475bcca768204d720b3cd9730e5776371818b8deb0f9fd099458bf5a3276ea9b61e3dbacafaaa527892
 DIST freeradius-3.0.25.tar.gz 5300245 BLAKE2B bf8908aa7bfabb9e15fa841457f176a4f2697bdec7994485516ef338908b46f2168260b7acf1a7120a687e543f0381bb787567bb4d564b9d14a3eb464a0e9ed6 SHA512 13382a53e6a1a4495c6f53e662ce21b80d73b6134a72f099f05495b64c56ae1a6c1cd1281311f1c3695d8532207fe5bd3d2026ed2c45f3cb5adb1011f1505ee7
+DIST freeradius-3.0.26.tar.gz 5300930 BLAKE2B e8922182f69ff201af331a03ef109072d24fb169c14179c5e71910ed3f767526afd7efe6000fd8a3881fa2ddb0487ebd12f8fdf6845136fdc15fdcb8a83fdf39 SHA512 83825ce1dd3d2e005c11d10ebadd2b37884130c158d3ea43595fa52478e3d194725b15dc73633758b0b1e916e00ea9358d254c38c2b721c475c9a4235aa1a5a3
 DIST freeradius-server-3.2.0.tar.bz2 3399380 BLAKE2B 103cb1faf7efd78520dd613da51671ff37b870fcd356d7d11454d655cf460bcb4132cd91b99be70557242907dd5e4d741b6a776de81c37a24ab9d04a4fe5866b SHA512 e7aa7bfc5a6968cdb860bb565ebd45bc1b3f78a665a9888a8b8dacaa1c5256755468aed33bdffe39465f8678c1fb9d6f47f0dbcf0178dfdcb38d99e3bc4b747d
+DIST freeradius-server-3.2.1.tar.bz2 3399164 BLAKE2B d0e69d468736d2a5dd85b32bb8b1fa44f2e56725ae525a3895df1b926f5ce525c70af08c2b76b62a9479d00d02c3e4915586fb1e5c7d42955c6b9e5cdeda8f6e SHA512 0f9e98cbf0eff4c5af54731ec34a8c9070252eaf2f91ca0c87caae939f6356fa91a6e1ed98ba66dbf1c1bafecdfcf38603fb4f65a5955e88974f49a5b7885f7a
+DIST freeradius-server-3.2.2.tar.bz2 3418998 BLAKE2B 584d1ff79cf3a75c79f5b24f9e47d7c8d8caee0d706eb47bb387300172f0699f904804d963aab8c252a21fe67f7885a47659b8cd9db5292a6d4db087d72e8e38 SHA512 91dc574560a1f75cafa8bc78c0676f0e3dae7154ecbb395e0e1f6738f78d8bcfe1bff122364452798fd0434c4056fd946799b8f29a1141398bf0542a37870689
 EBUILD freeradius-3.0.25-r2.ebuild 7515 BLAKE2B 63f05fa3d9556b614f5b1f60e5b49876880757f648b1a34031e2647e8fe285aa1ac0888107c47344bca0f69bcc0187698a4296f83945e3cf2f8c9a86c8bffe12 SHA512 a0a7fcfddec67576dd3a5df61b844d1cb1d1f28935b97e3196074df2650d45be152facdf5df26d0f476ddc72a77d95e402543b84c23159c9fb74ab6caea15a81
+EBUILD freeradius-3.0.26.ebuild 7518 BLAKE2B a869e680f55f1fa1c02a366f293425123398e6ca1499c28aee3e53b6a17fd92d221bfcac7ded79be8e7891dc3ccc8e883f326c13ea2e97403b597d3c5cdeb6db SHA512 79735a74828928dacea3ecbdf371c2865b91eb3fbd57be3cc72f91ed4b55f4b79f4eda42f19cf43f71b5f67c461563e22b1cd762ef3bf3d9beae2c03fc230d66
 EBUILD freeradius-3.2.0.ebuild 8313 BLAKE2B d5a2314f7b780349240de777500770f2851ee72cc6683a6645340dd0f1a53a1aa14424956ac75576519cfe89927b88597f1689350c99eb460777365794a6f51d SHA512 c14101fe8d2bfb93f2206acd332b08b325253a9d8e76d167ab21f49f74ed0126682c16ec074a65e7dbbe6e09b7aed9cae45f36bc85a6f376e3da929453c6af61
+EBUILD freeradius-3.2.1.ebuild 8354 BLAKE2B a325035ef6e125e1e70c67f1cecf49f73c7faacbb71353297f1f70a3779f5cae0145def15931229116ce8d665d1b886c001998db3a314a80c2b598cd5e1955d1 SHA512 5aaf707ea4df676033644bfa34da17e0fb89e8c7a324bb73b2065be67458b0dafb290338ac4898c80acb25fe55bc28bc41537d3596944109a6f32a92271e9b71
+EBUILD freeradius-3.2.2.ebuild 8300 BLAKE2B d49507d8ef3e2ee7a1e5154205eef6503ed789ee6c250935cdfdf7c61dfdacb555b03a378e7c4f1d981c676163a00171b3a94b53040c357b90f9fb16ea94d3b2 SHA512 a99a99ba4767e4816d9dac2339a2997194a600375ef6dfc7ceb2621973be575646cb28a7c6dd3031c402250c00cdf76bc9cd58a1c05236d9eb59bb5883904207
 MISC metadata.xml 754 BLAKE2B 2aaf6e500fe361f2c456ea4e4d9da51c3056d8c993725bd3372cc3ebfecec129b8196cecf4829083084d3c664c338569db75fd2304dfc9123e04db3b222642ed SHA512 b6e99eefac90938f55be7abd56604e5ba37bacbcde609f7f9c71deef4d80c6257404baa1b676f426d9182345d4b742591b677b64c016eabdfafb1b18eb2d35e9
diff --git a/net-dialup/freeradius/freeradius-3.0.26.ebuild b/net-dialup/freeradius/freeradius-3.0.26.ebuild
new file mode 100644
index 000000000000..a2e2c1dd3980
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-3.0.26.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..10} )
+inherit autotools pam python-single-r1 systemd
+
+MY_PV=$(ver_rs 1- "_")
+
+DESCRIPTION="Highly configurable free RADIUS server"
+HOMEPAGE="https://freeradius.org/"
+SRC_URI="https://github.com/FreeRADIUS/freeradius-server/archive/release_${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/freeradius-server-release_${MY_PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="
+	debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam
+	pcap postgres python readline redis rest samba sqlite ssl systemd
+"
+
+RESTRICT="test firebird? ( bindist )"
+
+# NOTE: Temporary freeradius doesn't support linking with mariadb client
+#       libs also if code is compliant, will be available in the next release.
+#       (http://lists.freeradius.org/pipermail/freeradius-devel/2018-October/013228.html)a
+
+# TODO: rlm_mschap works with both samba library or without. I need to avoid
+#       linking of samba library if -samba is used.
+RDEPEND="acct-group/radius
+	acct-user/radius
+	!net-dialup/cistronradius
+	dev-lang/perl:=
+	sys-libs/gdbm:=
+	sys-libs/talloc
+	virtual/libcrypt:=
+	firebird? ( dev-db/firebird )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	memcached? ( dev-libs/libmemcached )
+	mysql? ( dev-db/mysql-connector-c:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 )
+	odbc? ( dev-db/unixODBC )
+	oracle? ( dev-db/oracle-instantclient[sdk] )
+	pam? ( sys-libs/pam )
+	pcap? ( net-libs/libpcap )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	redis? ( dev-libs/hiredis:= )
+	rest? ( dev-libs/json-c:= )
+	samba? ( net-fs/samba )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		dev-libs/openssl:0=[-bindist(-)]
+	)
+	systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# 721040
+QA_SONAME="usr/lib.*/libfreeradius-.*.so"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.20-systemd-service.patch
+)
+
+pkg_setup() {
+	if use python ; then
+		python-single-r1_pkg_setup
+		export PYTHONBIN="${EPYTHON}"
+	fi
+}
+
+src_prepare() {
+	# most of the configuration options do not appear as ./configure
+	# switches. Instead it identifies the directories that are available
+	# and run through them. These might check for the presence of
+	# various libraries, in which case they are not built.  To avoid
+	# automagic dependencies, we just remove all the modules that we're
+	# not interested in using.
+
+	eapply_user
+	default
+
+	use ssl || { rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} || die ; }
+	use ldap || { rm -r src/modules/rlm_ldap || die ; }
+	use kerberos || { rm -r src/modules/rlm_krb5 || die ; }
+	use memcached || { rm -r src/modules/rlm_cache/drivers/rlm_cache_memcached || die ; }
+	use pam || { rm -r src/modules/rlm_pam || die ; }
+	# Drop support of python2
+	rm -r src/modules/rlm_python || die
+	use python || { rm -r src/modules/rlm_python3 || die ; }
+	use rest || { rm -r src/modules/rlm_rest || die ; }
+	use redis || { rm -r src/modules/rlm_redis{,who} || die ; }
+	# Do not install ruby rlm module, bug #483108
+	rm -r src/modules/rlm_ruby || die
+
+	# these are all things we don't have in portage/I don't want to deal
+	# with myself
+	rm -r src/modules/rlm_eap/types/rlm_eap_tnc || die # requires TNCS library
+	rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 || die # requires libeap-ikev2
+	rm -r src/modules/rlm_opendirectory || die # requires some membership.h
+	rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} || die
+
+	# sql drivers that are not part of experimental are loaded from a
+	# file, so we have to remove them from the file itself when we
+	# remove them.
+	usesqldriver() {
+		local flag=$1
+		local driver=rlm_sql_${2:-${flag}}
+
+		if ! use ${flag}; then
+			rm -r src/modules/rlm_sql/drivers/${driver} || die
+			sed -i -e /${driver}/d src/modules/rlm_sql/stable || die
+		fi
+	}
+
+	sed -i \
+		-e 's:^#\tuser = :\tuser = :g' \
+		-e 's:^#\tgroup = :\tgroup = :g' \
+		-e 's:/var/run/radiusd:/run/radiusd:g' \
+		-e '/^run_dir/s:${localstatedir}::g' \
+		raddb/radiusd.conf.in || die
+
+	# verbosity
+	# build shared libraries using jlibtool -shared
+	sed -i \
+		-e '/$(LIBTOOL)/s|--quiet ||g' \
+		-e 's:--mode=\(compile\|link\):& -shared:g' \
+		Make.inc.in || die
+
+	sed -i \
+		-e 's|--silent ||g' \
+		-e 's:--mode=\(compile\|link\):& -shared:g' \
+		scripts/libtool.mk || die
+
+	# crude measure to stop jlibtool from running ranlib and ar
+	sed -i \
+		-e '/LIBRARIAN/s|".*"|"true"|g' \
+		-e '/RANLIB/s|".*"|"true"|g' \
+		scripts/jlibtool.c || die
+
+	usesqldriver mysql
+	usesqldriver postgres postgresql
+	usesqldriver firebird
+	usesqldriver iodbc
+	usesqldriver odbc unixodbc
+	usesqldriver oracle
+	usesqldriver sqlite
+	usesqldriver mongodb mongo
+
+	eautoreconf
+}
+
+src_configure() {
+	# do not try to enable static with static-libs; upstream is a
+	# massacre of libtool best practices so you also have to make sure
+	# to --enable-shared explicitly.
+	local myeconfargs=(
+		--enable-shared
+		--disable-static
+		--disable-ltdl-install
+		--with-system-libtool
+		--with-system-libltdl
+		--with-ascend-binary
+		--with-udpfromto
+		--with-dhcp
+		--with-iodbc-include-dir=/usr/include/iodbc
+		--with-experimental-modules
+		--with-docdir=/usr/share/doc/${PF}
+		--with-logdir=/var/log/radius
+		$(use_enable debug developer)
+		$(use_with ldap edir)
+		$(use_with ssl openssl)
+		$(use_with systemd systemd)
+	)
+	# fix bug #77613
+	if has_version app-crypt/heimdal; then
+		myeconfargs+=( --enable-heimdal-krb5 )
+	fi
+
+	if use python ; then
+		myeconfargs+=(
+			--with-rlm-python3-bin=${EPYTHON}
+			--with-rlm-python3-config-bin=${EPYTHON}-config
+		)
+	fi
+
+	use readline || export ac_cv_lib_readline=no
+	use pcap || export ac_cv_lib_pcap_pcap_open_live=no
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# verbose, do not generate certificates
+	emake \
+		Q='' ECHO=true \
+		LOCAL_CERT_PRODUCTS=''
+}
+
+src_install() {
+	dodir /etc
+	diropts -m0750 -o root -g radius
+	dodir /etc/raddb
+	diropts -m0750 -o radius -g radius
+	dodir /var/log/radius
+	keepdir /var/log/radius/radacct
+	diropts
+
+	# verbose, do not install certificates
+	# Parallel install fails (#509498)
+	emake -j1 \
+		Q='' ECHO=true \
+		LOCAL_CERT_PRODUCTS='' \
+		R="${D}" \
+		install
+
+	if use pam; then
+		pamd_mimic_system radiusd auth account password session
+	fi
+
+	# fix #711756
+	fowners -R radius:radius /etc/raddb
+	fowners -R radius:radius /var/log/radius
+
+	dodoc CREDITS
+
+	rm "${ED}/usr/sbin/rc.radiusd" || die
+
+	newinitd "${FILESDIR}/radius.init-r4" radiusd
+	newconfd "${FILESDIR}/radius.conf-r6" radiusd
+
+	if ! use systemd ; then
+		# If systemd builtin is not enabled we need use Type=Simple
+		# as systemd .service
+		sed -i -e 's:^Type=.*::g' \
+			-e 's:^WatchdogSec=.*::g' -e 's:^NotifyAccess=all.*::g' \
+			"${S}"/debian/freeradius.service
+	fi
+	systemd_dounit "${S}"/debian/freeradius.service
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+pkg_config() {
+	if use ssl; then
+		cd "${ROOT}"/etc/raddb/certs || die
+		./bootstrap || die "Error while running ./bootstrap script."
+		chown root:radius "${ROOT}"/etc/raddb/certs || die
+		chown root:radius "${ROOT}"/etc/raddb/certs/ca.pem || die
+		chown root:radius "${ROOT}"/etc/raddb/certs/server.{key,crt,pem} || die
+	fi
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} && use ssl; then
+		elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
+		elog "to start the radiusd service."
+	fi
+}
diff --git a/net-dialup/freeradius/freeradius-3.2.1.ebuild b/net-dialup/freeradius/freeradius-3.2.1.ebuild
new file mode 100644
index 000000000000..86036194b49c
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-3.2.1.ebuild
@@ -0,0 +1,311 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit autotools pam python-single-r1 systemd
+
+MY_PN=${PN}-server
+MY_P=${MY_PN}-${PV}
+MY_PV=$(ver_rs 1- "_")
+
+DESCRIPTION="Highly configurable free RADIUS server"
+HOMEPAGE="https://freeradius.org/"
+SRC_URI="https://github.com/FreeRADIUS/freeradius-server/releases/download/release_${MY_PV}/${MY_P}.tar.bz2"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="
+	debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam
+	postgres python readline redis samba sqlite ssl systemd
+"
+
+RESTRICT="firebird? ( bindist )"
+
+# NOTE: Temporary freeradius doesn't support linking with mariadb client
+#       libs also if code is compliant, will be available in the next release.
+#       (http://lists.freeradius.org/pipermail/freeradius-devel/2018-October/013228.html)a
+
+# TODO: rlm_mschap works with both samba library or without. I need to avoid
+#       linking of samba library if -samba is used.
+
+# TODO: unconditional json-c for now as automagic dep despite efforts to stop it
+# ditto libpcap. Can restore USE=rest, USE=pcap if/when fixed.
+
+RDEPEND="acct-group/radius
+	acct-user/radius
+	!net-dialup/cistronradius
+	dev-libs/libltdl
+	dev-libs/libpcre
+	dev-libs/json-c:=
+	dev-lang/perl:=
+	net-libs/libpcap
+	sys-libs/gdbm:=
+	sys-libs/libcap
+	sys-libs/talloc
+	virtual/libcrypt:=
+	firebird? ( dev-db/firebird )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	memcached? ( dev-libs/libmemcached )
+	mysql? ( dev-db/mysql-connector-c:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 )
+	odbc? ( dev-db/unixODBC )
+	oracle? ( dev-db/oracle-instantclient[sdk] )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+	redis? ( dev-libs/hiredis:= )
+	samba? ( net-fs/samba )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] )
+	systemd? ( sys-apps/systemd:= )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# bug #721040
+QA_SONAME="usr/lib.*/libfreeradius-.*.so"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.20-systemd-service.patch
+)
+
+pkg_setup() {
+	if use python ; then
+		python-single-r1_pkg_setup
+		export PYTHONBIN="${EPYTHON}"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Most of the configuration options do not appear as ./configure
+	# switches. Instead it identifies the directories that are available
+	# and run through them. These might check for the presence of
+	# various libraries, in which case they are not built.  To avoid
+	# automagic dependencies, we just remove all the modules that we're
+	# not interested in using.
+	# TODO: shift more of these into configure args below as things
+	# are a bit better now.
+	use ssl || { rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} || die ; }
+	use ldap || { rm -r src/modules/rlm_ldap || die ; }
+	use kerberos || { rm -r src/modules/rlm_krb5 || die ; }
+	use memcached || { rm -r src/modules/rlm_cache/drivers/rlm_cache_memcached || die ; }
+	use pam || { rm -r src/modules/rlm_pam || die ; }
+
+	# Drop support for python2
+	rm -r src/modules/rlm_python || die
+
+	use python || { rm -r src/modules/rlm_python3 || die ; }
+	#use rest || { rm -r src/modules/rlm_rest || die ; }
+	# Do not install ruby rlm module, bug #483108
+	rm -r src/modules/rlm_ruby || die
+
+	# These are all things we don't have in portage/I don't want to deal
+	# with myself.
+	#
+	# Requires TNCS library
+	rm -r src/modules/rlm_eap/types/rlm_eap_tnc || die
+	# Requires libeap-ikev2
+	rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 || die
+	# Requires some membership.h
+	rm -r src/modules/rlm_opendirectory || die
+	# ?
+	rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} || die
+
+	# SQL drivers that are not part of experimental are loaded from a
+	# file, so we have to remove them from the file itself when we
+	# remove them.
+	usesqldriver() {
+		local flag=$1
+		local driver=rlm_sql_${2:-${flag}}
+
+		if ! use ${flag} ; then
+			rm -r src/modules/rlm_sql/drivers/${driver} || die
+			sed -i -e /${driver}/d src/modules/rlm_sql/stable || die
+		fi
+	}
+
+	sed -i \
+		-e 's:^#\tuser = :\tuser = :g' \
+		-e 's:^#\tgroup = :\tgroup = :g' \
+		-e 's:/var/run/radiusd:/run/radiusd:g' \
+		-e '/^run_dir/s:${localstatedir}::g' \
+		raddb/radiusd.conf.in || die
+
+	# - Verbosity
+	# - B uild shared libraries using jlibtool -shared
+	sed -i \
+		-e '/$(LIBTOOL)/s|--quiet ||g' \
+		-e 's:--mode=\(compile\|link\):& -shared:g' \
+		Make.inc.in || die
+	sed -i \
+		-e 's|--silent ||g' \
+		-e 's:--mode=\(compile\|link\):& -shared:g' \
+		scripts/libtool.mk || die
+
+	# Crude measure to stop jlibtool from running ranlib and ar
+	sed -i \
+		-e '/LIBRARIAN/s|".*"|"true"|g' \
+		-e '/RANLIB/s|".*"|"true"|g' \
+		scripts/jlibtool.c || die
+
+	usesqldriver mysql
+	usesqldriver postgres postgresql
+	usesqldriver firebird
+	usesqldriver iodbc
+	usesqldriver odbc unixodbc
+	usesqldriver oracle
+	usesqldriver sqlite
+	usesqldriver mongodb mongo
+
+	eautoreconf
+}
+
+src_configure() {
+	# Do not try to enable static with static-libs; upstream is a
+	# massacre of libtool best practices so you also have to make sure
+	# to --enable-shared explicitly.
+	local myeconfargs=(
+		# Revisit confcache when not needing to use ac_cv anymore
+		# for automagic deps.
+		#--cache-file="${S}"/config.cache
+
+		--enable-shared
+		--disable-ltdl-install
+		--disable-silent-rules
+		--with-system-libtool
+		--with-system-libltdl
+
+		--enable-strict-dependencies
+		--without-rlm_couchbase
+		--without-rlm_securid
+		--without-rlm_unbound
+		--without-rlm_idn
+		#--without-rlm_json
+		#$(use_with rest libfreeradius-json)
+
+		# Our OpenSSL should be patched. Avoid false-positive failures.
+		--disable-openssl-version-check
+		--with-ascend-binary
+		--with-udpfromto
+		--with-dhcp
+		--with-pcre
+		--with-iodbc-include-dir=/usr/include/iodbc
+		--with-experimental-modules
+		--with-docdir=/usr/share/doc/${PF}
+		--with-logdir=/var/log/radius
+
+		$(use_enable debug developer)
+		$(use_with ldap edir)
+		$(use_with redis rlm_cache_redis)
+		$(use_with redis rlm_redis)
+		$(use_with redis rlm_rediswho)
+		$(use_with ssl openssl)
+		$(use_with systemd systemd)
+	)
+
+	# bug #77613
+	if has_version app-crypt/heimdal ; then
+		myeconfargs+=( --enable-heimdal-krb5 )
+	fi
+
+	if use python ; then
+		myeconfargs+=(
+			--with-rlm-python3-bin=${EPYTHON}
+			--with-rlm-python3-config-bin=${EPYTHON}-config
+		)
+	fi
+
+	if ! use readline ; then
+		export ac_cv_lib_readline=no
+	fi
+
+	#if ! use pcap ; then
+	#	export ac_cv_lib_pcap_pcap_open_live=no
+	#	export ac_cv_header_pcap_h=no
+	#fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Verbose, do not generate certificates
+	emake \
+		Q='' ECHO=true \
+		LOCAL_CERT_PRODUCTS=''
+}
+
+src_install() {
+	dodir /etc
+
+	diropts -m0750 -o root -g radius
+	dodir /etc/raddb
+
+	diropts -m0750 -o radius -g radius
+	dodir /var/log/radius
+
+	keepdir /var/log/radius/radacct
+	diropts
+
+	# - Verbose, do not install certificates
+	# - Parallel install fails (bug #509498)
+	emake -j1 \
+		Q='' ECHO=true \
+		LOCAL_CERT_PRODUCTS='' \
+		R="${D}" \
+		install
+
+	if use pam ; then
+		pamd_mimic_system radiusd auth account password session
+	fi
+
+	# bug #711756
+	fowners -R radius:radius /etc/raddb
+	fowners -R radius:radius /var/log/radius
+
+	dodoc CREDITS
+
+	rm "${ED}"/usr/sbin/rc.radiusd || die
+
+	newinitd "${FILESDIR}"/radius.init-r4 radiusd
+	newconfd "${FILESDIR}"/radius.conf-r6 radiusd
+
+	if ! use systemd ; then
+		# If systemd builtin is not enabled we need use Type=Simple
+		# as systemd .service
+		sed -i -e 's:^Type=.*::g' \
+			-e 's:^WatchdogSec=.*::g' -e 's:^NotifyAccess=all.*::g' \
+			"${S}"/debian/freeradius.service
+	fi
+
+	systemd_dounit "${S}"/debian/freeradius.service
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+pkg_config() {
+	if use ssl ; then
+		cd "${ROOT}"/etc/raddb/certs || die
+
+		./bootstrap || die "Error while running ./bootstrap script."
+		chown root:radius "${ROOT}"/etc/raddb/certs || die
+		chown root:radius "${ROOT}"/etc/raddb/certs/ca.pem || die
+		chown root:radius "${ROOT}"/etc/raddb/certs/server.{key,crt,pem} || die
+	fi
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} && use ssl ; then
+		elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
+		elog "to start the radiusd service."
+	fi
+}
diff --git a/net-dialup/freeradius/freeradius-3.2.2.ebuild b/net-dialup/freeradius/freeradius-3.2.2.ebuild
new file mode 100644
index 000000000000..3861bc2421d5
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-3.2.2.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+AUTOTOOLS_DEPEND=">=sys-devel/autoconf-2.69"
+inherit autotools pam python-single-r1 systemd
+
+MY_PN=${PN}-server
+MY_P=${MY_PN}-${PV}
+MY_PV=$(ver_rs 1- "_")
+
+DESCRIPTION="Highly configurable free RADIUS server"
+HOMEPAGE="https://freeradius.org/"
+SRC_URI="https://github.com/FreeRADIUS/freeradius-server/releases/download/release_${MY_PV}/${MY_P}.tar.bz2"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="
+	debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam
+	postgres python readline redis samba sqlite ssl systemd
+"
+
+RESTRICT="firebird? ( bindist )"
+
+# NOTE: Temporary freeradius doesn't support linking with mariadb client
+#       libs also if code is compliant, will be available in the next release.
+#       (http://lists.freeradius.org/pipermail/freeradius-devel/2018-October/013228.html)a
+
+# TODO: rlm_mschap works with both samba library or without. I need to avoid
+#       linking of samba library if -samba is used.
+
+# TODO: unconditional json-c for now as automagic dep despite efforts to stop it
+# ditto libpcap. Can restore USE=rest, USE=pcap if/when fixed.
+
+RDEPEND="acct-group/radius
+	acct-user/radius
+	!net-dialup/cistronradius
+	dev-libs/libltdl
+	dev-libs/libpcre
+	dev-libs/json-c:=
+	dev-lang/perl:=
+	net-libs/libpcap
+	net-misc/curl
+	sys-libs/gdbm:=
+	sys-libs/libcap
+	sys-libs/talloc
+	virtual/libcrypt:=
+	firebird? ( dev-db/firebird )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	memcached? ( dev-libs/libmemcached )
+	mysql? ( dev-db/mysql-connector-c:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 )
+	odbc? ( dev-db/unixODBC )
+	oracle? ( dev-db/oracle-instantclient[sdk] )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+	redis? ( dev-libs/hiredis:= )
+	samba? ( net-fs/samba )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] )
+	systemd? ( sys-apps/systemd:= )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# bug #721040
+QA_SONAME="usr/lib.*/libfreeradius-.*.so"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.20-systemd-service.patch
+)
+
+pkg_setup() {
+	if use python ; then
+		python-single-r1_pkg_setup
+		export PYTHONBIN="${EPYTHON}"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Most of the configuration options do not appear as ./configure
+	# switches. Instead it identifies the directories that are available
+	# and run through them. These might check for the presence of
+	# various libraries, in which case they are not built.  To avoid
+	# automagic dependencies, we just remove all the modules that we're
+	# not interested in using.
+	# TODO: shift more of these into configure args below as things
+	# are a bit better now.
+	use ssl || { rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} || die ; }
+	use ldap || { rm -r src/modules/rlm_ldap || die ; }
+	use kerberos || { rm -r src/modules/rlm_krb5 || die ; }
+	use memcached || { rm -r src/modules/rlm_cache/drivers/rlm_cache_memcached || die ; }
+	use pam || { rm -r src/modules/rlm_pam || die ; }
+
+	# Drop support for python2
+	rm -r src/modules/rlm_python || die
+
+	use python || { rm -r src/modules/rlm_python3 || die ; }
+	#use rest || { rm -r src/modules/rlm_rest || die ; }
+	# Do not install ruby rlm module, bug #483108
+	rm -r src/modules/rlm_ruby || die
+
+	# These are all things we don't have in portage/I don't want to deal
+	# with myself.
+	#
+	# Requires TNCS library
+	rm -r src/modules/rlm_eap/types/rlm_eap_tnc || die
+	# Requires libeap-ikev2
+	rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 || die
+	# Requires some membership.h
+	rm -r src/modules/rlm_opendirectory || die
+	# ?
+	rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} || die
+
+	# SQL drivers that are not part of experimental are loaded from a
+	# file, so we have to remove them from the file itself when we
+	# remove them.
+	usesqldriver() {
+		local flag=$1
+		local driver=rlm_sql_${2:-${flag}}
+
+		if ! use ${flag} ; then
+			rm -r src/modules/rlm_sql/drivers/${driver} || die
+			sed -i -e /${driver}/d src/modules/rlm_sql/stable || die
+		fi
+	}
+
+	sed -i \
+		-e 's:^#\tuser = :\tuser = :g' \
+		-e 's:^#\tgroup = :\tgroup = :g' \
+		-e 's:/var/run/radiusd:/run/radiusd:g' \
+		-e '/^run_dir/s:${localstatedir}::g' \
+		raddb/radiusd.conf.in || die
+
+	# - Verbosity
+	# - B uild shared libraries using jlibtool -shared
+	sed -i \
+		-e 's|--silent ||g' \
+		-e 's:--mode=\(compile\|link\):& -shared:g' \
+		scripts/libtool.mk || die
+
+	# Crude measure to stop jlibtool from running ranlib and ar
+	sed -i \
+		-e '/LIBRARIAN/s|".*"|"true"|g' \
+		-e '/RANLIB/s|".*"|"true"|g' \
+		scripts/jlibtool.c || die
+
+	usesqldriver mysql
+	usesqldriver postgres postgresql
+	usesqldriver firebird
+	usesqldriver iodbc
+	usesqldriver odbc unixodbc
+	usesqldriver oracle
+	usesqldriver sqlite
+	usesqldriver mongodb mongo
+
+	eautoreconf
+}
+
+src_configure() {
+	# Do not try to enable static with static-libs; upstream is a
+	# massacre of libtool best practices so you also have to make sure
+	# to --enable-shared explicitly.
+	local myeconfargs=(
+		# Revisit confcache when not needing to use ac_cv anymore
+		# for automagic deps.
+		#--cache-file="${S}"/config.cache
+
+		--enable-shared
+		--disable-ltdl-install
+		--disable-silent-rules
+		--with-system-libtool
+		--with-system-libltdl
+
+		--enable-strict-dependencies
+		--without-rlm_couchbase
+		--without-rlm_securid
+		--without-rlm_unbound
+		--without-rlm_idn
+		#--without-rlm_json
+		#$(use_with rest libfreeradius-json)
+
+		# Our OpenSSL should be patched. Avoid false-positive failures.
+		--disable-openssl-version-check
+		--with-ascend-binary
+		--with-udpfromto
+		--with-dhcp
+		--with-pcre
+		--with-iodbc-include-dir=/usr/include/iodbc
+		--with-experimental-modules
+		--with-docdir=/usr/share/doc/${PF}
+		--with-logdir=/var/log/radius
+
+		$(use_enable debug developer)
+		$(use_with ldap edir)
+		$(use_with redis rlm_cache_redis)
+		$(use_with redis rlm_redis)
+		$(use_with redis rlm_rediswho)
+		$(use_with ssl openssl)
+		$(use_with systemd systemd)
+	)
+
+	# bug #77613
+	if has_version app-crypt/heimdal ; then
+		myeconfargs+=( --enable-heimdal-krb5 )
+	fi
+
+	if use python ; then
+		myeconfargs+=(
+			--with-rlm-python3-bin=${EPYTHON}
+			--with-rlm-python3-config-bin=${EPYTHON}-config
+		)
+	fi
+
+	if ! use readline ; then
+		export ac_cv_lib_readline=no
+	fi
+
+	#if ! use pcap ; then
+	#	export ac_cv_lib_pcap_pcap_open_live=no
+	#	export ac_cv_header_pcap_h=no
+	#fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Verbose, do not generate certificates
+	emake \
+		Q='' ECHO=true \
+		LOCAL_CERT_PRODUCTS=''
+}
+
+src_install() {
+	dodir /etc
+
+	diropts -m0750 -o root -g radius
+	dodir /etc/raddb
+
+	diropts -m0750 -o radius -g radius
+	dodir /var/log/radius
+
+	keepdir /var/log/radius/radacct
+	diropts
+
+	# - Verbose, do not install certificates
+	# - Parallel install fails (bug #509498)
+	emake -j1 \
+		Q='' ECHO=true \
+		LOCAL_CERT_PRODUCTS='' \
+		R="${D}" \
+		install
+
+	if use pam ; then
+		pamd_mimic_system radiusd auth account password session
+	fi
+
+	# bug #711756
+	fowners -R radius:radius /etc/raddb
+	fowners -R radius:radius /var/log/radius
+
+	dodoc CREDITS
+
+	rm "${ED}"/usr/sbin/rc.radiusd || die
+
+	newinitd "${FILESDIR}"/radius.init-r4 radiusd
+	newconfd "${FILESDIR}"/radius.conf-r6 radiusd
+
+	if ! use systemd ; then
+		# If systemd builtin is not enabled we need use Type=Simple
+		# as systemd .service
+		sed -i -e 's:^Type=.*::g' \
+			-e 's:^WatchdogSec=.*::g' -e 's:^NotifyAccess=all.*::g' \
+			"${S}"/debian/freeradius.service
+	fi
+
+	systemd_dounit "${S}"/debian/freeradius.service
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+pkg_config() {
+	if use ssl ; then
+		cd "${ROOT}"/etc/raddb/certs || die
+
+		./bootstrap || die "Error while running ./bootstrap script."
+		chown root:radius "${ROOT}"/etc/raddb/certs || die
+		chown root:radius "${ROOT}"/etc/raddb/certs/ca.pem || die
+		chown root:radius "${ROOT}"/etc/raddb/certs/server.{key,crt,pem} || die
+	fi
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} && use ssl ; then
+		elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
+		elog "to start the radiusd service."
+	fi
+}
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 1c27a980c713..c3cb15494d8c 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index f971bd111cd8..842b97a1b9c2 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -4,8 +4,6 @@ AUX mail 82 BLAKE2B 6d9cc293deff8f99cea0ce8842dd34e658844ca9a1f4e530d3c95f8154ed
 AUX mailutils-3.5-add-include.patch 275 BLAKE2B 2502fb3226bc63ae98d018392fa1107b4079ea51cd8e57b4e97522d21e696bd6048fad2de885f88644d23f434a6e407f42ba8fcbcfe5b1e65884f37718e34328 SHA512 0972cde536a1a82fe243c9b048fc15f4863586a2344b54c9b4f6f8a5935762c7272c0af2698239af7de9da62b1c2928bc7f621e01f447423fdd8288cedee88b6
 AUX mailutils.rc 258 BLAKE2B 3dc68190e11c8bf5016b0fe8b22c61f79ba7de96a1f230f7d0743ba23fa903cb9f99fac94a7363c7d80b7bbaf76e2d4de848e7ac726642fb23c56caf43a46568 SHA512 691bcc81fd355d8f2776e72006c149996273579e099f24970ff0c5dd6bdf65cd64e31597f8b3d8e0a900a91c3325b8d2a1a96682a9b3ff53acd41218fe8721fe
 AUX pop3d.initd 563 BLAKE2B fd09d7a7499c888eddfb812644102f979c2423e9b1a9f0077655b6ae4c1eb4214f685ef7843e74a808e52ee988cc3fbefa278754db824256a4972c83fc0ada31 SHA512 7847c29a03f21df82d36c077ccb38329457a332cccdfba24bee3b1c9a8170fc71c07ee674408f069693953dd1bf44b8b8f782dcc35d6b16e62f70b2b32ce018f
-DIST mailutils-3.14.tar.xz 3215944 BLAKE2B 64965c177065eacab9f5545fbeacd538492995f808dab731d02acbe7d63161f3bfb1528a0ca71e30c32ba12edc7e4f68642f2e5154b66d3bb48c479cae95c754 SHA512 9797deb8901d03a231c3503d75a758fbfb1220d1e064dd8be74735e6c88aa04c94533e802a60fdfbe12f1bd7daec4a39249cd957b103f09b89df364bd9a8869d
 DIST mailutils-3.15.tar.xz 3112212 BLAKE2B 78101178c101897bc75897a1e134796150fafccd7e8f4b603c82698dd0cd27a98dd1ed7837a87be4760e8bdb39ec7275023a8e2847f832e683b8e97e5e95d75d SHA512 b6b90ad4f71c83e500a9b176694f5fb51a99baf26e52d567d222d6f037a23a0814ac84f88762cbfb4f22382c0e662191af89fb74a8a287134b8fffa58086bdd8
-EBUILD mailutils-3.14-r1.ebuild 3572 BLAKE2B 66dda2a5b666aa1c799cb6e6932d6068caa4a7a48fde1c8c019e01bf7b7ad3ac7518803116cc893701aa907d5ab2f08c1f0f308766dd25544610ecafaa23ed3b SHA512 053feda60675f380685d555bdf1e7c1ae83ca4f53a6d54066844fccc4d45de29c859d70f587cb3702559a364605f26a186070236d7483273331d3bb391a49227
 EBUILD mailutils-3.15.ebuild 3579 BLAKE2B af56ad0575b2cd068ce9649b63d8124103cfda960a03daf7e1b62411082b406b40f5992fa14043dedcdda9395abd227c383fd3ff82f63f5dab16bd9fcfdf183f SHA512 98ea384a6f1b56397bf60e6d186054879fb872611617fa4d2acde52468609aad3303c22ddf13ff5d8853a5b1e9973c47e721a1cbd7cbc973afb50e87ddb70c2a
 MISC metadata.xml 696 BLAKE2B bb3b5a94573794ee2eb692533f32cba1dcf432166d9b2997cf60104d88e80f5eac7bb836479e4392700b06efe07c071930308183fb235c42be2cf1fdb8810ac0 SHA512 bb093e2aff71bb09a8f20fc64926f8a8d8c036ad3b3cd3ca61389975d623251841e8d93489f457a56a898db81cf71ecdc071190b9bc1990728b3fa0c9b4cfda1
diff --git a/net-mail/mailutils/mailutils-3.14-r1.ebuild b/net-mail/mailutils/mailutils-3.14-r1.ebuild
deleted file mode 100644
index bbdd56f1a541..000000000000
--- a/net-mail/mailutils/mailutils-3.14-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit autotools elisp-common flag-o-matic python-single-r1 toolchain-funcs
-
-DESCRIPTION="A useful collection of mail servers, clients, and filters"
-HOMEPAGE="https://mailutils.org/"
-SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-
-LICENSE="GPL-3+ LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
-IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
-	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
-	tokyocabinet"
-
-RDEPEND="
-	!mail-filter/libsieve
-	!mail-client/mailx
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-	dev-libs/libltdl:0
-	virtual/libcrypt:=
-	virtual/mta
-	berkdb? ( sys-libs/db:= )
-	bidi? ( dev-libs/fribidi )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	gdbm? ( sys-libs/gdbm:= )
-	guile? ( dev-scheme/guile:12/2.2-1 )
-	kerberos? ( virtual/krb5 )
-	kyotocabinet? ( dev-db/kyotocabinet )
-	ldap? ( net-nds/openldap:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	nls? ( sys-devel/gettext )
-	pam? ( sys-libs/pam:= )
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS} )
-	sasl? ( virtual/gsasl )
-	servers? ( virtual/libiconv dev-libs/libunistring:= )
-	ssl? ( net-libs/gnutls:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	servers? ( tcpd ldap )"
-
-DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-add-include.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	if use mysql; then
-		sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
-			sql/Makefile.am || die
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	# maildir is the Gentoo default
-	econf \
-		MU_DEFAULT_SCHEME=maildir \
-		CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
-		$(use_with berkdb berkeley-db) \
-		$(use_with bidi fribidi) \
-		$(use_enable ipv6) \
-		$(use_with gdbm) \
-		$(use_with sasl gsasl) \
-		$(use_with guile) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with mysql) \
-		$(use_enable nls) \
-		$(use_enable pam) \
-		$(use_with postgres) \
-		$(use_enable python) \
-		$(use_with ssl gnutls) \
-		$(use_enable static-libs static) \
-		$(use_enable threads pthread) \
-		$(use_with tokyocabinet) \
-		$(use_with kyotocabinet) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable servers build-servers) \
-		$(use_with servers unistring ) \
-		$(use_enable clients build-clients) \
-		EMACS=$(usex emacs emacs no) \
-		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		--with-mail-spool=/var/spool/mail \
-		--with-readline \
-		--enable-sendmail \
-		--disable-debug
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	# bug 613112
-	newins "${FILESDIR}/mailutils.rc" mailutils.conf
-	keepdir /etc/mailutils.d/
-	insinto /etc/mailutils.d
-	doins "${FILESDIR}/mail"
-
-	if use python; then
-		python_optimize
-		if use static-libs; then
-			rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
-		fi
-	fi
-
-	if use servers; then
-		newinitd "${FILESDIR}"/imap4d.initd imap4d
-		newinitd "${FILESDIR}"/pop3d.initd pop3d
-		newinitd "${FILESDIR}"/comsatd.initd comsatd
-	fi
-
-	# compatibility link
-	if use clients && use split-usr; then
-		dosym ../usr/bin/mail /bin/mail
-	fi
-
-	if ! use static-libs; then
-		find "${D}" -name "*.la" -delete || die
-	fi
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 2126ebca6ca5..61500c637c41 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest
index 23555bb5e4a9..f62be333a1c5 100644
--- a/net-misc/axel/Manifest
+++ b/net-misc/axel/Manifest
@@ -1,5 +1,5 @@
 DIST axel-2.17.10.tar.xz 274648 BLAKE2B ee89614412dda04092bd89821ce78d1fff9224d0e026b136d50f2c52a42bbb6a3a110dcf8c0e8110dfdb6a67d0b6aecf0322101f75016b38888f35f44849340c SHA512 f102ae742940d123364de49f01fe97cc146afc32adfb3776437a53ffef14fcca0c5926c39d6ac338fe2bd368529d18b0c885b694de48f7cb0e6d0195d2339437
 DIST axel-2.17.11.tar.xz 279964 BLAKE2B d2a740b6a9471cc384ddb8556c3dce946edffc3ef7b2740306040cb22d4cbabea92064ed3b0f351235f004b1017cefb5b0fc8a427691a74f29880eec7e3f5b85 SHA512 111e8b3bbb70e717bee8b3c318c18d0121776301c609c0894376a371238dd839f5dae7edda6738d2b89296fd4b6ac1083399acf62308eaa479b6d70b080e65a1
 EBUILD axel-2.17.10.ebuild 987 BLAKE2B 501a8487c3c9ee7dc1259684e4b786cd2d85c7b54f770410278b431ae59b14f2ba3d337e49f152e9e8805b54f2d07baf3b88ea71fe6393d4b30cf9eebeaf66c9 SHA512 06300c333d23f5060f559694990429223884a79a77f6f13d51f2ba84842a5f2de01ea5de13fa6bf47751098beddaff9ab4edc31615e41a770034b3e2c4b256eb
-EBUILD axel-2.17.11.ebuild 987 BLAKE2B c1c26475f747767e89884e1740c3f62e27eed1bd747b35073520d526b45f3d6a151af0f799e1b558bd681e84feee17458f56df848ac6400bdeded0d827146d60 SHA512 1583f8860109582f97ab20aadee6674a3165c3327fb30a1cdbb426b99678a6752aa160efd1eaee7bbdc2a3a159efc2c1a67bf09a55f0afadf9e7b52f5583acbf
+EBUILD axel-2.17.11.ebuild 994 BLAKE2B 0459b09b2345c5d1f7a05dddd348bf6495fdcd307a4d96385988456b1adeb3a52d42314449643d67cc691b6523ad08896bef625fbd1d42608c7587190c6dcba5 SHA512 db17d0680199b4dcb64fb641834b85154c707560220d8a87cb8bf97193eb06990ba0b206a84274481f99e05015cb9c61a3fb09ef877da798f4b4b915e54810fa
 MISC metadata.xml 348 BLAKE2B 417259b2a3d63e0899cf47ec52efdc08d68435ec74d36171b5d1319275d9c28ca35950eee29ba159e3804345e35ae9ad7ab929a53857eb53fc508a576dba65d3 SHA512 745097df6e7ba8b00e0b5214d10c9f413d9e83b1bb45ccaadb86cee54d6244a2614b6fa682bf6e8673e51de45d06fe6a5ba97981a423cb1ec28c7b3d918ae66d
diff --git a/net-misc/axel/axel-2.17.11.ebuild b/net-misc/axel/axel-2.17.11.ebuild
index 9652f4f27a2c..65b8d2b117b6 100644
--- a/net-misc/axel/axel-2.17.11.ebuild
+++ b/net-misc/axel/axel-2.17.11.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=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/axel-download-accelerator/axel/releases/download/v${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="debug nls ssl"
 
 CDEPEND="
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 7c0c1dbf78a2..a3b78cf8ccd5 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index bea419f71101..ce4b3688b197 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -326,14 +326,6 @@ dev-ruby/ruby_gntp
 # Removal on 2023-02-27.
 app-admin/bastille
 
-# Ionen Wolkens <ionen@gentoo.org> (2023-01-28)
-# Recently broke at runtime, and its relationship with evolving
-# swig+python is likely to keep breaking this further without an
-# active upstream (no activty since 2018) to keep up with changes.
-# Removal: 2023-02-27. Bug #892323
-games-rpg/adonthell
-games-rpg/wastesedge
-
 # Florian Schmaus <flow@gentoo.org> (2023-01-27)
 # Previous dependencies of dev-lang/clojure, now part of the clojure
 # ebuild and no longer needed.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 84cf206e8f2d..09e6d6ce3caa 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -5433,7 +5433,6 @@ net-analyzer/zabbix:mbedtls - Use net-libs/mbedtls as TLS backend
 net-analyzer/zabbix:odbc - Enable Database Monitor and use UnixODBC Library by default
 net-analyzer/zabbix:openipmi - Enable openipmi things
 net-analyzer/zabbix:openssl - Use dev-libs/openssl as TLS backend
-net-analyzer/zabbix:pcre2 - Use dev-libs/libpcre2 instead of dev-libs/libpcre
 net-analyzer/zabbix:proxy - Enable proxy support
 net-analyzer/zabbix:server - Enable zabbix server
 net-analyzer/zabbix:ssh - SSH v2 based checks
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index aaa04692ea6b..275a5abd5ac4 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index 212a6c247cd6..73d6d616ed33 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -3,5 +3,5 @@ AUX caffe2-1.12.0-glog-0.6.0.patch 959 BLAKE2B eb0c18a34a2c5a1b68a420b9001eac5c8
 AUX caffe2-1.13.0-gentoo.patch 8000 BLAKE2B a11a6bccac970ce8658041db20f90814183a8eef45571565512bafa9f172348f08ccdb67f5e543c8f9e236a6283f2d50a608cfc671e18886319a82dc84cd95e5 SHA512 20a43490cb80174fc688f7a773ac332362a5a013885a7cfdfdfe89996bc3e2483ad4b29149d71730213174d27d8534707813e825bdf4ea3e3bc7b664bad39953
 AUX caffe2-1.13.0-install-dirs.patch 5737 BLAKE2B 10b10e3a29976344c7596e1c4e7a604856c66d91cb7518308422f7ffac82ffe183dc81becab27866814c06e321e97458ab6a6908aa01379299c7fdf8fdccf153 SHA512 1e2e4f646cec24b5373872865522a909d1c154623e232c06e3da361e4d29b8d7520c446f53fbf42aab5f00bab05d1f278ce9425e506a9a5ac73cbb10570bd325
 DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B 75de03b74dfdaf8d8fb5ea743fcc0c1b0e408a714ad4160c487921220a7b1755e5fa6e587e6bbc8c9f34dd75e096d2e6dd69c80d24821835fff6c833314434d3 SHA512 f16f89d027efade11d057245cad5b69a390e88b458398310ae30de2dbff7c8fd7f1165be7b8da7ea989c81ac3f5a66c5cb9050610e441a97c83fb8aa28c0bd62
-EBUILD caffe2-1.13.1-r1.ebuild 4492 BLAKE2B eeb0ec297dedfbfa0c3b0ef71569432b97fa7e448022ab88c714ff044f11fa9e3ad1aad2ce34e0ef04382c31eced8da34681161b981fa46b840c61ea4b18083a SHA512 c22d7d1b3393e85a7ce530ddc6eeba2c878e7c2caa00f65a2d180f24a651c7713ad0bc994477b309b54f99c745f6d961421f247b1b40602c8bcdb7fedaf76cb9
+EBUILD caffe2-1.13.1-r1.ebuild 4584 BLAKE2B 787f580fb41991d73484f174d4c9d5445297d929b7bc085d750827d86d0379fbed4182369b84667e0eb1db80e657f18d544e250c7c9494e2678e3679be266298 SHA512 56d368900401e766b6a7f393ab78e99fa87880397ea9655174e0cbc2249d9596040d3628c13536b7c4c0fcb30a478fb829c72e898a84c35c48bd2e2b13151973
 MISC metadata.xml 961 BLAKE2B 7e0924bce6c952cf8b5e997a50e11aad18d572060087ab877d9600399712a6e46f7bee9938aef6b7af142de21046c1cbe541302a68a20072d1040e7b084b202c SHA512 9ff387a4d11eb83799665e38690f0c668ea6147ab92cc8fd68d4fb60590e51863d4530b885f71bd660429c6d38e573a2a7d8fca5e0139b82111ab05cb61b67d9
diff --git a/sci-libs/caffe2/caffe2-1.13.1-r1.ebuild b/sci-libs/caffe2/caffe2-1.13.1-r1.ebuild
index 352a593d3559..4e0dfcb9b980 100644
--- a/sci-libs/caffe2/caffe2-1.13.1-r1.ebuild
+++ b/sci-libs/caffe2/caffe2-1.13.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
-inherit python-single-r1 cmake flag-o-matic
+inherit python-single-r1 cmake cuda flag-o-matic
 
 MYPN=pytorch
 MYP=${MYPN}-${PV}
@@ -148,7 +148,13 @@ src_configure() {
 		-DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir)
 	)
 
-	use cuda && addpredict "/dev/nvidiactl" # bug 867706
+	if use cuda; then
+		addpredict "/dev/nvidiactl" # bug 867706
+
+		mycmakeargs+=(
+			-DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
+		)
+	fi
 	cmake_src_configure
 }
 
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 447646610118..cd861962febc 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 943182ee13ae..52998850158f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,9 +3,9 @@ AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906
 AUX portage-tmpdir.conf 76 BLAKE2B 79f35df57dbdcd461d94d558212261df7df54253d5205b40a0a0640ce2a7ae553a84d7aa8d8c11a776cac44b7573b842951ec11f8ab393145edb1786d6837e79 SHA512 4810d8ae1f8291d34b756897972841d30d5f50b48597a430cb8ddb102dab07a7f0d78c3901b6fdd6763180e92b5ae90a3cb88ae5a5c1cae845b23b49d03a87fd
 DIST portage-3.0.43.tar.bz2 1139615 BLAKE2B e0f2646c3b6d5d49ec23038ad27507f7b9c0c03b848e82aff336896802c07b29344f924c4525d880f8895ba38f8116a7c79ecea51c794a433da9bd146efadc20 SHA512 b5e5339f3b5446f5c8f9b319e86e82d260e004b0606c3d0eadf09f91c95de0279c64c0fc4d7f6251ebd2cf7a65ba1ba37d752ed48b712e72b8c024835e747691
 DIST portage-3.0.44.tar.bz2 1140911 BLAKE2B 06f584e6e37bbb309b9bb0e29ba4381eadd4ae6246aeb1045e3a5c5dcb33d74f74e74aa3f2325acbf37e16a535095c433f2796ed042f73cea5e208150e210cb0 SHA512 d40c95f3a31c5e2ae35374243c40c8d1f6b47b7c89f6a711a12d8744cb6848a85443298c0f947475b32acf52332e7f09b1e85915149ab8363930c0404f08410e
-DIST portage-3.0.45.tar.bz2 1145640 BLAKE2B f4956e3c56613f782d07947b28b1a30b47c780c13455f68b42ae26722544698ae02849279474a22c3239844712bbf255c2783edf351959200708592d852d903e SHA512 f089a75046b3e6bcac3eb8d01f776364f1c5c6873931e13c54375d35c2d85702914cd243db9fdc1b6898b8c05334663cfdc96710af7ac3b67ba19ee8d2d4fc67
+DIST portage-3.0.45.1.tar.bz2 1146037 BLAKE2B 562900b41684a4da3b10a91d796e91b75d631267145c36f0e46d0b3bc749b2e88bbc7e20c4a3c1a8cba74e8bfb25dc1ffc9ffd481ec11a2a2e1d23f9cae770a3 SHA512 961630cd0959001a841d62b3a293458442aeb7725241d6808d4052dd47209bf5d0abdf229a48013d91f9c441349075117747229639a1228fccd5bf6f75e947fd
 EBUILD portage-3.0.43-r1.ebuild 9141 BLAKE2B 65ef9a74f548093ee70a068bca2084ae3abb0e3eb697481c07f1f3c7ff29b89cefa692254d12cdd7b1465538151fd6bb9e1920271aed72f2d84f517544cdcda6 SHA512 986464312f8a919543eb6db4d2c5e4d418c2cc3bd9508ee6eb4ed6f19ec05a3a4bc6c450df25f9e068a0f858cc621159022aef0d3b97f00b2e3dd97a985c40e3
 EBUILD portage-3.0.44.ebuild 9142 BLAKE2B 4e38276dc99c3ccfe1880834819123186d3d4a6b6ad457808ab12c129f960755f45a1ac0ce3bb9d67d0d84b611be6f5ed9a4efa89cbc511e16831ed2b7d6d568 SHA512 e332d70a76809cf99fd1b9d5ee3185671f3b8937ed1a12f582d6e65ff29fdb061303af1699f1065b72af388f973e21f036b5a41ed879d57a3f9e0b7d74dfd398
-EBUILD portage-3.0.45.ebuild 9149 BLAKE2B bcf19389294fde11bc757ef5672ad56844671480beb6dd585e6697fd899b0379748bc5f142e792f5943227ec53c2b38f1b2f305c30ff7b8b4d71c7010611b394 SHA512 aded47dd1fee869a32c4897242b1a67f9564736d50598f7c6a31a148c84979d4526450ecb6717becb9354a219e75f515091ed97845bfdf3a41a3667239e41fea
+EBUILD portage-3.0.45.1.ebuild 9149 BLAKE2B bcf19389294fde11bc757ef5672ad56844671480beb6dd585e6697fd899b0379748bc5f142e792f5943227ec53c2b38f1b2f305c30ff7b8b4d71c7010611b394 SHA512 aded47dd1fee869a32c4897242b1a67f9564736d50598f7c6a31a148c84979d4526450ecb6717becb9354a219e75f515091ed97845bfdf3a41a3667239e41fea
 EBUILD portage-9999.ebuild 8387 BLAKE2B 00e1655311893776dedd2c78c6d6ba9558afa335fd4f9eb5dcf472e74a7fe6bdf2d95bce2b880e38ca92a98eca7d60de527bbbdf1514b2255b9971953073f625 SHA512 40eecfe443a6c4dbba65315c719582ca4a99557a33b5351fd70584ac349c5a2cc3ae31c5c9b418ac31f373bd3a353c2008a6873d1953a59a890861208ee2000d
 MISC metadata.xml 1539 BLAKE2B 0efa1ae365449d6593909046c32158a9f6755aa9252c34ae00eb866dd29a0b6a5c2e7a4af9293d0f87c4dd9231132fc5361acb0818fb6beff6dd6fbbdc6f409b SHA512 675f5baa1b3079592e3930b11ca18f324e27c42b5515f9ae815a26e53a465640fa6e9c4069df0e2121932b9f1cc73f2c9469c1529728f3c5ed5c3e687743ac0d
diff --git a/sys-apps/portage/portage-3.0.45.ebuild b/sys-apps/portage/portage-3.0.45.1.ebuild
index df564a4830d3..df564a4830d3 100644
--- a/sys-apps/portage/portage-3.0.45.ebuild
+++ b/sys-apps/portage/portage-3.0.45.1.ebuild
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 31e1ff23d2f3..736cdb0e9349 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 7f474c90bd43..8f8d7568424c 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -140,5 +140,5 @@ EBUILD gentoo-sources-6.1.12.ebuild 743 BLAKE2B 39249fb257735f33220ee38d7abf4ba8
 EBUILD gentoo-sources-6.1.13.ebuild 748 BLAKE2B 722d00bf0b173cf2d07bd7221c6ad5ffc770f3ab25210f75a3130a6784416a453a2a84517dfe926c843cbcd90c7ca03c86006645c27546fede1e965b7dec8d62 SHA512 967fd63b6fce6617c0c0ca9c4ec0225545be2f25dc9ea000acf84091573d056cd719ab3431db90607d72b0df296a23a680a4aae45d77a0de231f7b8d210038bb
 EBUILD gentoo-sources-6.1.14.ebuild 748 BLAKE2B 0299378095f92adfdc609ee8b8eb25349690323e1212e2265bdd7cd88ea291e45735d77edf60eb6e58ad1b6905c0f8d40b07b31c484e17c7bda78bb45903abf9 SHA512 4e247cd253056214b1cd12967ce6c9432c72e7768b67fc7e14ec7f56ec0d3d76703732fe56e9efff8bff52b9034179793a2e18ead13a3a71fcea25bc7dd59a43
 EBUILD gentoo-sources-6.2.0.ebuild 748 BLAKE2B df0e9575e6378bb5d59f023e98267133aeeaa40f6b459378ca90b32892237a11912156f0edef99929b3b9ee1ba31a7ccc6cdf92861eb23e9f47b20119f678366 SHA512 d7d01a362d77154ad03edcdc9d004f97364e7e660a56786d38652e43a8229a9fdab25ac82287ea53977958ae2e23d446067dc14bb7e71df4a52e883adfb7282b
-EBUILD gentoo-sources-6.2.1.ebuild 747 BLAKE2B 93ccd1410a02417c588facd9e43d5bcba0634aa3e6835513cc53328e22e55457fc198a315778e998098a14057ac1bf9251bbf4517e94332e08f96669d659634f SHA512 95934765246eea89c4268f64d64ad6670b0d2272080ebbe8f5466f28ecc4dfda4812699ede246c2ece2e47c6004a7eff022a398fa8e346ffeb81e7a66a5e8d73
+EBUILD gentoo-sources-6.2.1.ebuild 754 BLAKE2B 9cdc4ea2caa3844cfc14bb405a689f149130c8464386b0539b7fef53aab26da5ec75ffdde2b848a5a86de634fe676939036a602a61c71cf9247b0fc373a903f7 SHA512 5257144d27d9bb260249e15a11ab2132276123705469e00584dd85753d63d3d32e364b89210a14f875a0215ebafda592f86fe08ffa9712ffe49ebc3f9c0b3d5f
 MISC metadata.xml 501 BLAKE2B f5363c8a19540d5bb924b38bdebeb8dbc60c84e58d1d87a9148a3e7abb09b0a1b733c98b130b778b8ab3a88375598444aa9d537d8c5338864a3d4497600d7836 SHA512 bc1ba0d75dbf5b95b3f93e666389c6408f20aebeec99bc8ec00653758b67588e07214285ed106fd9e5aed2c8d57c625d666c797212fda51e1ab98ce1df816467
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.2.1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.2.1.ebuild
index d063eb9129f7..a3df1cbbfc15 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-6.2.1.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.2.1.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 1288900bff0d..163b573504d1 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/fcron/Manifest b/sys-process/fcron/Manifest
index 5974217bd646..6aec84269fe9 100644
--- a/sys-process/fcron/Manifest
+++ b/sys-process/fcron/Manifest
@@ -5,8 +5,6 @@ AUX fcron-3.2.1-musl-getopt-order.patch 1420 BLAKE2B 69da87a05cae2e750eb1cf09a4a
 AUX fcron.confd 134 BLAKE2B 3ab11ae5641f1c2f049da2aec3d1561fa3b10b7fe5d29701e5fb1e8b75a613c110924999ed0afed3b7118196636c1c3198b4499127e4065200791d821ab737ce SHA512 58a66cd495fcb6a9b49f1d244357dfd61188a0c09d2c02a93c9250b8d77d9b89aff41d947e25fd4c1248f39b6a97f045e760b52cdf2f065145a8bfe74b7bf25e
 AUX fcron.init-r5 2633 BLAKE2B 3e3a1991f67f9e9ed2021c8ed0f7442032feb88af89088caad2fd0c090e8c588a8621b45a7b320309065f1a5bef743aa00bf9cb2e531ddb55104ccdba43c9350 SHA512 bf53158d6326a742fc3af0cdf196f76a2930f61e58c8a7f4488d3a17aa18bdbd12a3258034f649ae9998627caec7c55bf4c392265525a8fa7c6614cc38f2d0e0
 AUX fcrontab.2 226 BLAKE2B 4fc55d14c44797b1dcc34000de1a9ffa43b1a52037db5dcec76854dfc4c84283dceafdc84f2dec9dfcb95dd5a39d90f31c828b819d29122b2b7b2135f4c65899 SHA512 f0c74c2cd601750f7de8d9926278bd79026b236f2bda4033fe1961c48171b3aa3712bd8d8917f9c784bf0ce54ed09781572cb7e9397d9579a8ba6a114c1e5c2e
-DIST fcron-3.2.1.src.tar.gz 601142 BLAKE2B 184b74f9d64186b7d3aae87d48ed0107525fd0c73bb8db86408bd246592ff4fbcbc04f8ca0064868a8555d7c6be2f183172d62daeed75275cd836517da504d0f SHA512 ddfd3e3a297b843c924aacccffaa5c1c6b300497f39daa1cdb90dc4cf4bc757042b0b2c1f055c119c8128c64d830ee0e8757091610432f5ffcacca25d369e5cd
 DIST fcron-3.3.1.tar.gz 593688 BLAKE2B 5c2f91667c94fc9eae7ae014a7826ab1f26647a192425630dbdb84bbe3c9041be23a2a480eb13844dc18a5ba406fe77a157938af1e0343e5f9b0ce1a1405d66b SHA512 b9c5066bdf8588a6b8d811ccc0d49f1d41a17dabf898a280997a8136dc449c2a505c46868abf732f86184ff0720d51f17442691909acae8fb26edcd180cff281
-EBUILD fcron-3.2.1-r8.ebuild 7069 BLAKE2B 7a4996a05a37dfb99251d09fa9eebad8a37a37698918c1e44ef75ff6393e8f38ad64e32eaf2e4f2c7291a7cca40104b5b529774c764df09a0ccd36a8804dd495 SHA512 4c29f40d08f5dca8991282c44bcf75765aa4e3511b3aafdc173297af103b6cb7df39d3b951fb797adf8200ff6ad3010d2b78a803ce5a3ae59eb8b739afd97558
 EBUILD fcron-3.3.1.ebuild 7092 BLAKE2B eff016eda4dcd9ac1a119952f961f394f12152d7d695eafa07d6c402d7f6d1e63d2655b6b664cb39b0cdc2655c04d55e44f45e43d4b7706aba94321bac890113 SHA512 582deecee84a8d9f0f0ebd4e12efa8eb056e4676fee2d1eeb2c481f96d6c31e65ada330c964083c5fb263634de6e5d0840a3a9dd628ce0a5eccc5ad0dd43ea70
 MISC metadata.xml 1320 BLAKE2B 169511184222d072788a2f66e329a149147d91003767e0c2a9a88db1d71a4c809b828563e2296960f132db96d4fe46996dbecdbb5e6badb3ec72d9998e111ad0 SHA512 6becadb18f88e7601111bace913a59e37c9337a4fea7442511872da351a03a7751fe38caa1eb5872a16d67069cba5a04388fe5c872dd2cfa79342fdb9f42ac7c
diff --git a/sys-process/fcron/fcron-3.2.1-r8.ebuild b/sys-process/fcron/fcron-3.2.1-r8.ebuild
deleted file mode 100644
index cdf73c577fde..000000000000
--- a/sys-process/fcron/fcron-3.2.1-r8.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WANT_AUTOMAKE="none"
-
-inherit autotools cron flag-o-matic pam systemd user-info
-
-DESCRIPTION="A command scheduler with extended capabilities over cron and anacron"
-HOMEPAGE="http://fcron.free.fr/"
-SRC_URI="http://fcron.free.fr/archives/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="audit debug pam selinux l10n_fr +mta +system-crontab readline"
-
-DEPEND="
-	acct-group/fcron
-	acct-user/fcron
-	virtual/libcrypt:=
-	audit? ( sys-process/audit )
-	pam? ( sys-libs/pam )
-	readline? ( sys-libs/readline:= )
-	selinux? ( sys-libs/libselinux )
-"
-
-RDEPEND="
-	${DEPEND}
-	app-misc/editor-wrapper
-	mta? ( virtual/mta )
-	pam? ( sys-auth/pambase )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.1-noreadline.patch
-	"${FILESDIR}"/${PN}-3.2.1-configure-fix-audit-parameter-check.patch
-	"${FILESDIR}"/${PN}-3.2.1-musl-getopt-order.patch
-)
-
-pkg_setup() {
-	rootuser=$(egetent passwd 0 | cut -d ':' -f 1)
-	[[ ${rootuser} ]] || rootuser=root
-	rootgroup=$(egetent group 0 | cut -d ':' -f 1)
-	[[ ${rootgroup} ]] || rootgroup=root
-}
-
-src_prepare() {
-	default
-
-	# respect LDFLAGS
-	sed "s:\(@LIBS@\):\$(LDFLAGS) \1:" -i Makefile.in || die "sed failed"
-
-	# Adjust fcrontab path
-	sed -e 's:/etc/fcrontab:/etc/fcron/fcrontab:' -i script/check_system_crontabs.sh || die
-
-	mv configure.in configure.ac || die
-
-	cp "${FILESDIR}"/crontab.2 "${WORKDIR}"/crontab || die
-
-	eautoconf
-}
-
-src_configure() {
-	# Don't try to pass --with-debug as it'll play with cflags as
-	# well, and run foreground which is a _very_ nasty idea for
-	# Gentoo.
-	use debug && append-cppflags -DDEBUG
-
-	# bindir is used just for calling fcronsighup
-	local myeconfargs=(
-		--with-cflags="${CFLAGS}"
-		--bindir=/usr/libexec
-		--sbindir=/usr/libexec
-		$(use_with audit)
-		$(use_with mta sendmail)
-		$(use_with pam)
-		$(use_with readline)
-		$(use_with selinux)
-		--sysconfdir=/etc/fcron
-		--with-username=fcron
-		--with-groupname=fcron
-		--with-piddir=/run
-		--with-spooldir=/var/spool/fcron
-		--with-fifodir=/run
-		--with-fcrondyn=yes
-		--disable-checks
-		--with-editor=/usr/libexec/editor
-		--with-shell=/bin/sh
-		--without-db2man
-		--without-dsssl-dir
-		--with-rootname=${rootuser}
-		--with-rootgroup=${rootgroup}
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	# bug #216460
-	sed \
-		-e 's:/usr/local/etc/fcron:/etc/fcron/fcron:g' \
-		-e 's:/usr/local/etc:/etc:g' \
-		-e 's:/usr/local/:/usr/:g' \
-		-i doc/*/*/*.{txt,1,5,8,html} \
-		|| die "unable to fix documentation references"
-}
-
-src_install() {
-	keepdir /var/spool/fcron
-
-	exeinto /usr/libexec
-	doexe fcron fcronsighup
-
-	dobin fcrondyn fcrontab
-
-	insinto /etc/fcron
-	doins files/fcron.{allow,deny,conf}
-
-	if use system-crontab; then
-		dosym fcrontab /usr/bin/crontab
-
-		exeinto /usr/libexec
-		newexe script/check_system_crontabs.sh check_system_crontabs
-
-		insinto /etc/fcron
-		newins "${FILESDIR}"/fcrontab.2 fcrontab
-
-		fowners ${rootuser}:fcron /etc/fcron/fcrontab
-		fperms 0640 /etc/fcron/fcrontab
-
-		insinto /etc
-		newins "${FILESDIR}"/crontab.2 crontab
-	fi
-
-	fowners fcron:fcron \
-		/var/spool/fcron \
-		/usr/bin/fcron{dyn,tab}
-
-	# fcronsighup needs to be suid root, because it sends a HUP to the
-	# running fcron daemon, but only has to be called by the fcron group
-	# anyway
-	fowners ${rootuser}:fcron \
-		/usr/libexec/fcronsighup \
-		/etc/fcron/fcron.{allow,deny,conf} \
-		/etc/fcron
-
-	fperms 6770 /var/spool/fcron
-	fperms 6775 /usr/bin/fcron{dyn,tab}
-
-	fperms 4710 /usr/libexec/fcronsighup
-
-	fperms 0750 /etc/fcron
-	fperms 0640 /etc/fcron/fcron.{allow,deny,conf}
-
-	use pam && pamd_mimic system-services fcron auth account session
-	cat > "${T}"/fcrontab.pam <<- EOF
-	# Don't ask for the user's password; fcrontab will only allow to
-	# change user if running as root.
-	auth		sufficient		pam_permit.so
-
-	# Still use the system-auth stack for account and session as the
-	# sysadmin might have set up stuff properly, and also avoids
-	# sidestepping limits (since fcrontab will run \$EDITOR).
-	account		include			system-auth
-	session		include			system-auth
-	EOF
-	use pam && newpamd "${T}"/fcrontab.pam fcrontab
-
-	newinitd "${FILESDIR}"/fcron.init-r5 fcron
-	systemd_newunit "${S}/script/fcron.init.systemd" fcron.service
-
-	newconfd "${FILESDIR}"/fcron.confd fcron
-
-	local DOCS=( MANIFEST VERSION "${WORKDIR}/crontab")
-	DOCS+=( doc/en/txt/{readme,thanks,faq,todo,relnotes,changes}.txt )
-
-	local HTML_DOCS=( doc/en/HTML/. )
-
-	einstalldocs
-
-	newdoc files/fcron.conf fcron.conf.sample
-	doman doc/en/man/*.{1,5,8}
-
-	for lang in fr; do
-		use l10n_${lang} || continue
-
-		doman -i18n=${lang} doc/${lang}/man/*.{1,5,8}
-
-		docinto html/${lang}
-		dodoc -r doc/${lang}/HTML/.
-	done
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Make sure you execute"
-		elog ""
-		elog "  # emerge --config ${CATEGORY}/${PN}"
-		elog ""
-		elog "to install the default systab on this system."
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "3.2.1" -gt ${v}; then
-				# This is an upgrade
-
-				elog "fcron's default systab was updated since your last installation."
-				elog "You can use"
-				elog ""
-				elog "  # emerge --config ${CATEGORY}/${PN}"
-				elog ""
-				elog "to re-install systab (do not call this command before you"
-				elog "have merged your configuration files)."
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if ! use system-crontab; then
-		echo ""
-		ewarn "Remember that fcron will *not* use /etc/cron.d in this configuration"
-		ewarn "due to USE=-system-crontab!"
-		echo ""
-	fi
-}
-
-pkg_config() {
-	if [[ $(fcrontab -l -u systab 2>/dev/null) ]]; then
-		eerror "We're not going to make any change to your systab as long as"
-		eerror "it contains data; please clear it before proceeding."
-		eerror "You can do that with"
-		eerror ""
-		eerror "  # fcrontab -u systab -r"
-		eerror ""
-		eerror "However you are advised to do this by hand to review existing"
-		eerror "systab just in case."
-		return 1
-	fi
-
-	if use system-crontab; then
-		elog "This is going to set up fcron to execute check_system_crontabs."
-		elog "In this configuration, /etc/crontab and /etc/cron.d are respected."
-		elog "Per default fcron will check for modifications every 10 minutes."
-		/usr/libexec/check_system_crontabs -v -i -f
-	else
-		elog "This is going to set up fcron to set up a default systab that"
-		elog "executes /etc/cron.{hourly,daily,weekly,monthly} but will ignore"
-		elog "/etc/crontab and /etc/cron.d."
-		fcrontab -u systab - <<- EOF
-		!serial(true)
-		00   *    *    *    *     /bin/rm -f /var/spool/cron/lastrun/cron.hourly
-		00   00   *    *    *     /bin/rm -f /var/spool/cron/lastrun/cron.daily
-		00   00   *    *    6     /bin/rm -f /var/spool/cron/lastrun/cron.weekly
-		00   00   1    *    *     /bin/rm -f /var/spool/cron/lastrun/cron.monthly
-		*/10 *    *    *    *     /usr/bin/test -x /usr/sbin/run-crons && /usr/sbin/run-crons
-		!serial(false)
-		EOF
-	fi
-}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 54677d87317b..629bb4f9199e 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest
index 072d5290c09b..a3865abb6d3b 100644
--- a/x11-misc/qt5ct/Manifest
+++ b/x11-misc/qt5ct/Manifest
@@ -1,3 +1,5 @@
 DIST qt5ct-1.5.tar.bz2 81089 BLAKE2B 8bf02a6c53c68f30e0647ff7c40c9d80044cbf914ee13f9e7f13ad6424e5cf73b9460af70ea484d498bfb693e8f8b018f7e32cac6205ffa2dba05930c6d0610c SHA512 fc16c7849a89aa8ee9480162888294638bc01f83b89d86c978397e58f6da4360cf07b9f558635b8a5b13bd10d18f3ad49663fe8a76183da9ae55aac23230b1e5
+DIST qt5ct-1.6.tar.bz2 85354 BLAKE2B 74c8976005cfedb65da25d7229014ab22b97bfc7ad5a0cb1a2263bf272cc4b4c9f9f3542913c16f45af84e27e9e093c86ce7f6bbafc646caeb8b7259dcc3ae3d SHA512 10172c664eaf573aa998a64c654c99a27400a47d52fc4b3691f2d1108d5a4df20d2d5c9a9235c52708759ed2be267d1bec9a792bfedb6e472f3cfe9ee1eced0c
 EBUILD qt5ct-1.5.ebuild 940 BLAKE2B c9d55db36f480fc0aa359bf733b934c7a0fd8d645efea1da67eabaa2613e0e7f22e566462394aa76527487c9fa85dcb5cda8ae801d13de4caabb2107e316aa8f SHA512 a4be1beff438936fa9f71722d3411530ced007a26d127185e65c4ca08564532aeb332c740f407c7a282a152e5e54b8427e0226aa3491c2ce87b702850d874924
+EBUILD qt5ct-1.6.ebuild 942 BLAKE2B 430de3983c05894a3d0cb03f52f2c397e994dcc67fa9b6ce89b3b8a59f835f4291e61cd0565eb3ea04c57168f038ad85f8868d040e4f90b11d86ec1862e5e9d7 SHA512 f787d160cfc93ea181722a785e3b9b2e925c5c824822bcd2c24b40509da6617463b1121c90de3e25b3e0c5497c769f7f48a4bc5971282ccc2fac534f45267159
 MISC metadata.xml 482 BLAKE2B fac0c00072791bfee45fe52707734e35a18e58f21704b6897bc315ffbd4db50f2fcc058586d04c2459d39d040cd55ef3bd328b12d66c9b35f61cf985462f4d2a SHA512 6c0a13ee72cfdb1415899864758870c837adc76471358ec61aa661348caf4dccad6398a0f25a1e4bd638b7d01eeee484b7350726c0626cf991db7cd32ccc518c
diff --git a/x11-misc/qt5ct/qt5ct-1.6.ebuild b/x11-misc/qt5ct/qt5ct-1.6.ebuild
new file mode 100644
index 000000000000..dac5f4a047cf
--- /dev/null
+++ b/x11-misc/qt5ct/qt5ct-1.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4"
+HOMEPAGE="https://sourceforge.net/projects/qt5ct/"
+SRC_URI="https://download.sourceforge.net/qt5ct/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5=[dbus]
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	dev-qt/qtpaths:5
+"
+
+src_install() {
+	cmake_src_install
+
+	newenvd - 98qt5ct <<< 'QT_QPA_PLATFORMTHEME=qt5ct'
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		ewarn "qt5ct configuration won't be applied to the currently running sessions."
+		ewarn "Please relogin."
+	fi
+	if ! has_version 'dev-qt/qtsvg:5'; then
+		elog
+		elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'."
+		elog
+	fi
+}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index b9041b544550..61c8c07a96d0 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index 0a767c3b0589..9168da791254 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -1,9 +1,5 @@
 AUX terminator-1.91-desktop.patch 355 BLAKE2B c8c1488779116eee3e1c41440e04409381c6b66389e1ca8e82ebd961d970b84543133b098166008310fc035a591eb26e93c10fcc1bbb02ebc66752bb26145cbd SHA512 8944e27a6ab20f7f74c7dac9e2e93877a156ee5082c617dc7de84298bec303c7a0cf57fc1dd3cad4ae76ce2e15c50aacb8fe5587fe977727c10a6a3c48cca880
-AUX terminator-1.91-without-icon-cache.patch 567 BLAKE2B 72ebaa0eaee27491d0f93982b84c56009fd327108cb8e0b3a8e88a95a781dc324f11f6f8290e7082919a7753a1419777e7e028bafcc1437cc62e51eda465f3f3 SHA512 36f5f08f1724b6cd4bd43d37a27e5161feec66f03a9dd1de973e50eb557f5fe171329903a8074343b5fc816bcaa0fec2642060001c727c35792680a8007a7c50
-DIST terminator-2.1.1.tar.gz 1033153 BLAKE2B f92235bacf34ec5bfe2400c6bbfc8bbdee3867531fac5129fb59b84459101f2d673e3a6699eecf1fa0d19c33d30467bb043010bd19737c2bc0461cea861c71a7 SHA512 a916b9718801bb015d14bdec2eede24c89101d5ea36d22131b7d34f8dad48b9db9e79811645ce571e3c95c9e4b2f18d6b8508f519de7ff54c4246c5f7b546af2
-DIST terminator-2.1.1.tar.gz.asc 866 BLAKE2B d7362ce47f0cba18a3d10c54dca40b23001c818784cf5b5e4c98fbbd13983cf46e6ce631c4a4f5464c2badbb21e6052ce31456bf8b2d2c2deea6a647ad184b5c SHA512 ab171e0538686599fd86a35d0f5455aa9763c5f29c2c6bd5677cfd678beaeaad4dc141553e0abfecd19279a1a1653f12e07ed20f03ee09ee8ec10edbd63d6c14
 DIST terminator-2.1.2.tar.gz 1039160 BLAKE2B 2ca98c1caeadfffd2c7f737947b216a1db438a426a95cb9871504b827c3e85384df157d96a47c5f3d2cdc33e5e6b0e35cb8019b7a4bbc92fe59603379610e2e0 SHA512 070bf49979dd93e694b536877bac2d6ad274a1e961ef74df90348da6520fc411e7d0a73cd0d0c8fa2989c94ea75758fd15c09357f4f2ca8e7f6a4ab6c1236748
 DIST terminator-2.1.2.tar.gz.asc 866 BLAKE2B 3d998365e039935742635f049513f5c43cd45c067d7d31914bf8284b79af3daccdbd524b35c37ca419b96083e5986d365a6e7654b847d460c85179ff9da1886e SHA512 422b81676c6a53f736d39b5ff771d87e18053c188e0e97807f199080523430ede1e6d90d3f001fb3654b4b6bc90da9cc5f874a2639fa87ef8848868caa71342e
-EBUILD terminator-2.1.1-r1.ebuild 1713 BLAKE2B 6cb8c8820397839d08cec35400f996c5c10115a43b603913e5da812759de9b3329e0c37a00041fea4136c4f5cf9da743d7402df426272a797310f9eba49a3343 SHA512 86ff6446b54598d9960f657d778a2e4d2247ae0e2f71df258d8982dca2e021ee1ce396c04c3507abdd0e22e60725ac5ef55a018173291aa0339019b84a848f1d
 EBUILD terminator-2.1.2.ebuild 1634 BLAKE2B 5b9c499b4c874c1e0cdd6bf066f71ca45df9299aaaafff05e092b88af9797af6d32cadc6aa9cdf1aa40ed389e5b55d4761f764fe9e1f217e37b1ac6315c1879f SHA512 7a64795659818e9a2909c10aa175424f72ef936e4c2cd23bc9063ddd90889e4bde9aa1def7ba591895071f44328d30b6c5052200517fbc2449e664b26e53db03
 MISC metadata.xml 859 BLAKE2B 315ffd413597c4b0b5e847e4869c330be0f9092f3c272dcb362fdce1b89423a65a887a6e63b2770253aa2125cc3e6368adb058491f0fd420594d315047279c83 SHA512 2a56b28dcc37b9697c778de2482b7e191fc83907f1e8930a015b3e60a8a672faeec18a6602565ad60c0883f7857b956a1abccf06800f4a4276f72cd643449030
diff --git a/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch b/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch
deleted file mode 100644
index c924de3607f5..000000000000
--- a/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Without this patch, terminator's build script runs gtk-update-icon-cache which
-causes terminator package to claim /usr/share/icons/hicolor/icon-theme.cache as
-its own. To avoid that, gtk-update-icon-cache is run later, as part of
-xdg_pkg_postinst in the ebuild.
-
---- a/setup.py	2009-08-12 22:22:53.000000000 -0400
-+++ b/setup.py	2009-08-12 22:22:57.000000000 -0400
-@@ -25,7 +25,7 @@
- 
-   def __init__ (self, *args):
-     self.without_gettext = False
--    self.without_icon_cache = False
-+    self.without_icon_cache = True
-     Distribution.__init__(self, *args)
- 
- 
diff --git a/x11-terms/terminator/terminator-2.1.1-r1.ebuild b/x11-terms/terminator/terminator-2.1.1-r1.ebuild
deleted file mode 100644
index 16cec74dd7c2..000000000000
--- a/x11-terms/terminator/terminator-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1 optfeature verify-sig virtualx xdg
-
-DESCRIPTION="Multiple GNOME terminals in one window"
-HOMEPAGE="https://github.com/gnome-terminator/terminator"
-SRC_URI="
-	https://github.com/gnome-terminator/terminator/releases/download/v${PV}/${P}.tar.gz
-	verify-sig? ( https://github.com/gnome-terminator/terminator/releases/download/v${PV}/${P}.tar.gz.asc )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~riscv x86"
-IUSE="test"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	gnome-base/gsettings-desktop-schemas[introspection]
-	x11-libs/gtk+:3
-	x11-libs/vte:2.91[introspection]
-"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	test? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		x11-libs/libnotify[introspection]
-	)
-	verify-sig? ( sec-keys/openpgp-keys-terminator )
-"
-distutils_enable_tests pytest
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/terminator.asc
-
-PATCHES=(
-	"${FILESDIR}"/terminator-1.91-without-icon-cache.patch
-	"${FILESDIR}"/terminator-1.91-desktop.patch
-)
-
-src_prepare() {
-	xdg_environment_reset
-	sed -i -e '/pytest-runner/d' setup.py || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "D-Bus" dev-python/dbus-python
-	optfeature "desktop notifications" "x11-libs/libnotify[introspection]"
-	optfeature "global keyboard shortcuts" "dev-libs/keybinder:3[introspection]"
-}
author	V3n3RiX <venerix@koprulu.sector>	2023-02-27 10:00:13 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-02-27 10:00:13 +0000
commit	73ef00f9e2b100c7d0fedede11300940cc26670a (patch)
tree	19d1f10cdd98aec4743c36942242eac9f318641d
parent	063e5b486db858a2b1ecec798af89f5484d475bd (diff)