gentoo auto-resync : 12:10:2024 - 04:04:10

18 files changed, 10 insertions, 631 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 16ff88884dab..701424e4ef0c 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index 5b35a99e1c44..0b3390b7cb3f 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -1,7 +1,5 @@
-DIST asm-ASM_9_6.tar.bz2 1374579 BLAKE2B 621b19f1818ffdd451037af210ec7c3286e3dabdb1d6192157c2e6e8c101f599691cd4de57adf500f5413b4aaf4f808d6ac791e84626223a7be5672a17137670 SHA512 86b2db3e81c29c465d4128736f88ae3b73af8f312915921549d0acdb50a8d2c2c2beed5162af164b6e75278702af0c6f0a8d84b4133516eb4ac419520b7c764d
 DIST asm-ASM_9_7.tar.bz2 1376322 BLAKE2B 397a884b257edfd61f67909390c8fe07880d5a295b51dd3982ebbe9b6f8fbac200c46913e6c18e4efdcc80f0e1f0b8463ca9d912484b466ca174b55919a1c259 SHA512 9b7f2d4895f105f75e2c42d8882b176dba32defb17d8da4bdedb2bfe4e5413b03c05a9694114d171aa9623e86a65a677a24ab16a47aef774342d56224400274f
 DIST asm-ASM_9_7_1.tar.bz2 1378103 BLAKE2B f7da3a9c1bcf76398c9e9b9b86d60f8854e5248632a8b2d76605851e29ee1807713fb28c9e76012ec8f9444c44e3a151ed409cd120c34ab8d3495fdc9c84edcb SHA512 77ae76464eec97dbc8129c4a746d13f0d286d2033f909b65e0e34858e1785616b7bee22faa92128b91eb39cbd849e262efe574b73ed2859920add457d6422dd0
-EBUILD asm-9.6.ebuild 2443 BLAKE2B 324fbe45ac823e70b8827c6ce6bd7fe9f89d0713050a9884d9f12444b07e57735a8ee042ef73974c7e5791b7f6b6a83ce272dd841658ce2f5e70fafa40dd592b SHA512 9e423e980744892a16bafee114a48b376978b492574b93f6915eeda2db2c885603cb5a5cbb8bf9cb082a38e4fc35b1abf038ae51cfa91271e74fac43ebb92fbd
 EBUILD asm-9.7.1.ebuild 2507 BLAKE2B 630d61129c94c80db003a9c83561d0d363be43535920055d5cc499f70c71faf02053915895704f65d70b8c2f7dea8f85c883782ed498f8c405b44386091415a1 SHA512 9278a37cbb3051cb1c9133e939e4c89f3c66d352f5a203ba2fdbe31513bbc4b4936b538cccae69e5e77a5559fd1a6cde6efa07b2754e4725d3cbc5da2aedf25b
 EBUILD asm-9.7.ebuild 2503 BLAKE2B 3d3564248617d006664119a06a52b9fbc730abb69723b3f7660005a0cad37bf909c39df4ac9b5935a23e130b316edf1df6869c4230eddf763ae539279b209285 SHA512 3ba7ed8f580a40d06f5aa2c00385dc93af2bcb0cf4e165429cf3b7590ef2722b8867ad560304d7b5fe7e0efc7ee5551b333b1c3775306262a15084bcfe8823c5
 MISC metadata.xml 1233 BLAKE2B 13faf251d3d40ed558c83262972ea106892cc3be0f7a1b95a0b484123d93473bd867b2f7b53c3e5ccc2f1fe249ebe66cb9e757e19ad36c8d3e3eac6a7a981d98 SHA512 59a292291ac757818e41d009e2cdbb73b6d914c1f552c34e9360635cb468f1ebfdf9c58d6642710d5218689d08797320102c8ccb6d5f4bc9478883feb9b9b397
diff --git a/dev-java/asm/asm-9.6.ebuild b/dev-java/asm/asm-9.6.ebuild
deleted file mode 100644
index ac4e0a56d01f..000000000000
--- a/dev-java/asm/asm-9.6.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# tests not enabled because of missing eclass support of junit-jupiter
-JAVA_PKG_IUSE="doc source"
-MAVEN_PROVIDES="
-	org.ow2.asm:asm-bom:${PV}
-	org.ow2.asm:asm:${PV}
-	org.ow2.asm:asm-analysis:${PV}
-	org.ow2.asm:asm-commons:${PV}
-	org.ow2.asm:asm-tree:${PV}
-	org.ow2.asm:asm-util:${PV}
-"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bytecode manipulation framework for Java"
-HOMEPAGE="https://asm.ow2.io"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.bz2"
-S="${WORKDIR}/asm-${MY_P}"
-
-LICENSE="BSD"
-SLOT="9"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~x64-macos"
-
-DEPEND=">=virtual/jdk-11:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-ASM_MODULES=( "asm" "asm-tree" "asm-analysis" "asm-commons" "asm-util" )
-
-src_prepare() {
-	default
-	local module
-	touch "${T}/asm.module" || die
-	for module in "${ASM_MODULES[@]}"; do
-		module=${module/-/.}
-		cat > ${module/./-}/src/main/java/module-info.java <<-EOF || die
-			open module org.objectweb.${module/analysis/tree.analysis} {
-				$(cat ${T}/asm.module)
-				requires java.base;
-				exports org.objectweb.${module/analysis/tree.analysis};
-			}
-		EOF
-		echo "requires transitive org.objectweb.${module/analysis/tree.analysis};" \
-			>> "${T}/asm.module" || die
-	done
-	sed -e '/^$/d' \
-		-e '/asm;/p;s:\(asm\)\(;\):\1.signature\2:' \
-		-i  asm/src/main/java/module-info.java || die
-	sed -e '/analysis/d' \
-		-i  asm-commons/src/main/java/module-info.java || die
-	sed -e '/commons/d' \
-		-i  asm-util/src/main/java/module-info.java || die
-}
-
-src_compile() {
-	local module
-	for module in "${ASM_MODULES[@]}"; do
-		einfo "Compiling ${module}"
-		JAVA_JAR_FILENAME="${module}.jar"
-		JAVA_SRC_DIR="${module}/src/main/java"
-		java-pkg-simple_src_compile
-		JAVA_GENTOO_CLASSPATH_EXTRA+=":${module}.jar"
-		rm -r target || die
-	done
-
-	if use doc; then
-		einfo "Compiling javadocs"
-		JAVA_JAR_FILENAME="ignoreme.jar"
-		JAVA_SRC_DIR=()
-		for module in "${ASM_MODULES[@]}"; do
-			rm "${module}/src/main/java/module-info.java" || die
-			JAVA_SRC_DIR+=("${module}/src/main/java")
-		done
-		java-pkg-simple_src_compile
-	fi
-}
-
-src_install() {
-	local module
-	for module in "${ASM_MODULES[@]}"; do
-		java-pkg_dojar ${module}.jar
-		if use source; then
-			java-pkg_dosrc "${module}/src/main/java/*"
-		fi
-	done
-	if use doc; then
-		java-pkg_dojavadoc target/api
-	fi
-	default
-}
diff --git a/dev-java/commons-cli/Manifest b/dev-java/commons-cli/Manifest
index 4d6643c56ce1..6ce220b4f33e 100644
--- a/dev-java/commons-cli/Manifest
+++ b/dev-java/commons-cli/Manifest
@@ -2,5 +2,5 @@ DIST commons-cli-1.5.0-src.tar.gz 156731 BLAKE2B b3bc3c7426f4564187f6b2fecf2977a
 DIST commons-cli-1.9.0-src.tar.gz 187533 BLAKE2B d38f6602e065059521a052e2a9bfe7b05f9cd7da26537b3237868e583d7ca904e36cd58ffe04b9ea5feae81594cdc2bcbab7c16d2c95f2888f5ffd35c78c485c SHA512 d20df809e8e0ebed79c57af9c9b447b0068347ba0edfcdec3652cb00bd9575b24fc77093d735e827d9d02a6fe2681bf239fd01df5f7c682ae34ade0781c53e35
 DIST commons-cli-1.9.0-src.tar.gz.asc 488 BLAKE2B 22992f7fe15617c0422061447f9bae8ff5ab5804514b48bb277cfad0483e932694048159b82f1782369bdf1f25f5a9387f63ea2d83f147ea80f9ef21d1b772c5 SHA512 27f46b143efef09c6ec84382b2c7ca3877441190f3201ed167560572e741c23d641c3c534b1c25df399445957353285bed7913f113db8489c097b2057ed70571
 EBUILD commons-cli-1.5.0-r1.ebuild 1244 BLAKE2B 0584bcaa75f289e4fad9fea054867dcd5accb4699602b02f1acc8be3b05263d8175f55a47e99d6bf6a0cba9b5e29f3fa6a6bb368376fae7db48aeeac358fa3eb SHA512 ec05288d579331708288bc2e8a64ab13530342ccd8211f026a0b59c3b243d1a509b8d4a8bd39d780b88aaff4ab7328d64316533b58fce449ef5efb40121dc35e
-EBUILD commons-cli-1.9.0.ebuild 1275 BLAKE2B db6fae2b92b37b0099f93d9430afc1b1fc50596c0b9525418b9f1e5df735eb045fb14f4b73462c065ac2c05f9a8d13d9aa2c81bdd3bb69c96c44e9a7c1746894 SHA512 724dfa9b4bec83e558e28645794e6371da8fb3e4c4e9097ae23808f931546cc4e52e60ff3695641bc194140397969019a9fef009cea14afd2447460e2f7b04d8
+EBUILD commons-cli-1.9.0.ebuild 1272 BLAKE2B f8a772bf05571e3f1bc7eb19f8c4b28c7a47658b6b1be5b12a7e2531176c64b8763e718011fa6c951c8797ef375bf24698d820fde913c8336b4fa1ef77163c89 SHA512 882e8e3ef40b560e478ed96412c34fd504f208863e0f0f8ceb7239decb817f192f0fbbea4f6da0514dda4ff58490f0e948e0db681a6710b55949e69c1f5d50d7
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/commons-cli/commons-cli-1.9.0.ebuild b/dev-java/commons-cli/commons-cli-1.9.0.ebuild
index c25fd62d91e9..ebe75388808b 100644
--- a/dev-java/commons-cli/commons-cli-1.9.0.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.9.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
diff --git a/dev-java/commons-daemon/Manifest b/dev-java/commons-daemon/Manifest
index eb70202e986d..b9d334ad128b 100644
--- a/dev-java/commons-daemon/Manifest
+++ b/dev-java/commons-daemon/Manifest
@@ -4,5 +4,5 @@ DIST commons-daemon-1.3.4-src.tar.gz.asc 873 BLAKE2B f7886e67e2cfb0211d3271d79c2
 DIST commons-daemon-1.4.0-src.tar.gz 291610 BLAKE2B 3a13a00e209ad501a34ebef32a5e5bf9bd25de309434249d81a5ba96bad2e922a6cdae42624a7a8da64555838c9bb12cb54de4da59193f16d91f4869ff72a9eb SHA512 285f33ce36e2591f49b6067da16612ec1b49b23a8637d077618aefaae4452993dc2a31660665551ea761857390d940100e162e205fe7c0fad9c72374f2d15bb8
 DIST commons-daemon-1.4.0-src.tar.gz.asc 833 BLAKE2B ac97dd01c02b4a52e2c3cdf4047504cc10b7b4bbfe70f86d442e301af48520c51513f2dae37eaa08648ac9a29e6212abb153b2e36cf85baf03245d8e528166b8 SHA512 8144068c97e76ca358850455d7b867ae106f04083223b43229cc1e05f21c99150c6734174e1b77e89eee93f94ec198831df57f3f53217f3416584509ca289fe1
 EBUILD commons-daemon-1.3.4.ebuild 1480 BLAKE2B 9e028b172140611de19ccbf8aad46383d9b684275b0507fa9a1a03a2985a4205fbd91d78cb04d7ca41c72ca40e1de5e32996e5b66bcc16b934be520cddd6fbe5 SHA512 d13ff71c28c35b5c505dec7d372055f7c6126ad696851dbbf27a86922014a3d533d4dde66a4c7710e3d411d5a17d3848b5225b046ab048e6576003e427bdfe57
-EBUILD commons-daemon-1.4.0.ebuild 1633 BLAKE2B 06ccfc89cd9210a9d882d2a1334d96c778de86ed52863bd0427f82b1bc1265d9200a01bd02466884d7c27da09d8c70848bfaacf10c9948a63936a734171614ed SHA512 98d3fc24329150fd978cacb811039f5c97719af16f2f522493084323500a21bcbfaa3754566a81a5559ad76c8b2f7956a0df69132be28336be26c0c17520c2b8
+EBUILD commons-daemon-1.4.0.ebuild 1630 BLAKE2B 9acccc4146068aa6c7ea3a07f7d2a829fa2e43dc41aef7d6609bd1f3921ba129521778db13a71c549e570d7ffa7989b3dad9621976a07afa971f26a85f62eca3 SHA512 fcafee9cb3d8d933d6b50bd51a162c9847a53ca8398229bf95fe5b4419a885e74a680296d8d56900efdbfed61afe083f565483b28c5118c21e5e99b50d86850c
 MISC metadata.xml 693 BLAKE2B 327524cf8db429b89ebf8e16745b6125fdfef850402000b1ddefa96254aa827a1fa8a2bd61af3ac219b26f0fd14f7c6d9718462f095ef1264b6119ccbc21f9be SHA512 ab8232bbc9d93e5c3f056f3230f3cf4bd095dbf8985a25094b8ba541679814d4dc10e3a211537397577f30d3d84d3335a0d512b26ca82b14a58f3994b6954810
diff --git a/dev-java/commons-daemon/commons-daemon-1.4.0.ebuild b/dev-java/commons-daemon/commons-daemon-1.4.0.ebuild
index 148d6bb0b68d..7780a7c4fbc0 100644
--- a/dev-java/commons-daemon/commons-daemon-1.4.0.ebuild
+++ b/dev-java/commons-daemon/commons-daemon-1.4.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
diff --git a/dev-java/commons-io/Manifest b/dev-java/commons-io/Manifest
index 2c30de5bed2b..0437979da85a 100644
--- a/dev-java/commons-io/Manifest
+++ b/dev-java/commons-io/Manifest
@@ -5,6 +5,6 @@ DIST commons-io-2.16.1-src.tar.gz.asc 488 BLAKE2B e42af1fe9cbb50371c981737e7899b
 DIST commons-io-2.17.0-src.tar.gz 652908 BLAKE2B c87f10584d7933215aa24e8bde1037eced0738098149e9423371a1fef0255e36e38a6c92cdafd75eecbf56d13c4c38d479fe2706afc86224900fcaf7cae5e5f5 SHA512 5681b7bab9e34e9051e4f7a48925ecdf5d8814894c2626298dfca7aa0566c2dc46c15843850e3e14a3e05613ae9ef9fd08077042931e2fe552057f9c1bee6b69
 DIST commons-io-2.17.0-src.tar.gz.asc 488 BLAKE2B 451dcfbc952994a2402a7657fb0702572c8873c977681236c26326eec15316d543a39a48530760cf8a7c8b8469c7d18b1a7f88a80ab096d1604c33ec050c9b27 SHA512 8708d9cd17a2805c385006fbd5d0db883b593c67ff4afaaac507ca2dbe9f4b2e51cc1c492577b2e2cc6151a766264f1b3cd7c4b526fe16afa814d7ae29d2722c
 EBUILD commons-io-2.15.1.ebuild 994 BLAKE2B 9c3204eaa65b369b7a7529222e648f44437fbf915a7f6a62114c7f93372fef9deac75536962e06023b8297484fb60247db8923acf162efd704c4c5fa44b41bb8 SHA512 76f4bc4dd5baff6bfac14d9425bc9e27dbdbbbbf26393279bd5fdd3791927fba9c666f86d2c21c4851b038e80eb7cda1f73103917afb8cb3cb2dd920d808497d
-EBUILD commons-io-2.16.1.ebuild 1292 BLAKE2B b9fe8c18daa8331dff639e87877aaa1788cfc97bdd33817c1517d66c9a53034c5a21b53e0d281eb40ceadec99928f1b2b20b94ed8836a3b0f8f39ae7d44cdb2d SHA512 dfb396a0584319fff1dc7386689aa6e744b6b5e92df3a6ec8970319b4262bc30cc41989d0b66009f66b96c48a7e54a1b054336326c7204dbaaf756dcd2092a92
+EBUILD commons-io-2.16.1.ebuild 1289 BLAKE2B a9a1c61fbe8011c232895a0ac710baeeffc963fccba5ee6bbf4db5b5b2d8142bda2b78b8ed099da384a744addf5e69e771a135f9784e943b5d35fa27d6b8a9d6 SHA512 8139de9880cfed85a5408bd6cc35b5c2a333a46922b0de4e95e09824eeafe09e5b21344fc2017dbc73dc2c0cc56d06fa05fe805d0243b62cbd2e371a723b84fc
 EBUILD commons-io-2.17.0.ebuild 1264 BLAKE2B d77ba02cb9ea366ef445c950ff2ee57d1ade99d21844d9017649eccf29f0cb7d720dc2e0e79ffa034eab3efbb0d1b2fe62d64a9ad6b79ad9af61c4109ee67806 SHA512 bf38225aeca175d40d6fee4616d02ef10f320ec8e54e7d44fbbc481a2d2f537d0bb017865a3542073edf4d500daf47b2405ee3c069aa13e9427f3ddaae46adb1
 MISC metadata.xml 319 BLAKE2B 0cf0293595d7916fd34cf3a108f6f79e8ce3fc32d4bc02bcb093578e02c5386ed80b50487fb8e663cbcfa98873ab0a5a3763b3b002ff89323617b30c4a1b4143 SHA512 acbe501db8b7fe74845d68c3c288231b2140473652c12b04d4b4edac4a6031be67c470d4b59a170e743023e1f931a7daae647be0a23bf5d227d1fbd9c4927cfa
diff --git a/dev-java/commons-io/commons-io-2.16.1.ebuild b/dev-java/commons-io/commons-io-2.16.1.ebuild
index 35be4d805df0..84b9916544f7 100644
--- a/dev-java/commons-io/commons-io-2.16.1.ebuild
+++ b/dev-java/commons-io/commons-io-2.16.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest
index ecae6617389e..6a494bf86848 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -3,5 +3,5 @@ DIST commons-lang-3.14.0-src.tar.gz.asc 488 BLAKE2B 3ef9b7529a1681e2687f533bf8d4
 DIST commons-lang-3.17.0-src.tar.gz 1195408 BLAKE2B 1f612b8e5ef3ecc820ae040090633fd1a145298f0abdcc404e344adf9fb8c3632d144d1ee1cea4009ec32932b5b49a767abf77c45ff110129b98bdb0a7ba4557 SHA512 e633b0caeb9556c68384c2bf20e374fbac910b9979b25774c632e50c1bec41e97c14362978dc092c8b5859291e54fe51e76ad7a61c9b2efbe1e4538f46c1e3ee
 DIST commons-lang-3.17.0-src.tar.gz.asc 488 BLAKE2B ad6bbd5658a4fcdd56f830d55abef4a387fc8f42f4e3cc19d4700033acef8b02e30df4d6774014ae2b0a4f6811bdcc97a5c1a0c154705aa37724325850218beb SHA512 34f48ab6080c5730821bbf32f3715672c9f916d69985940f1dd17f9ab2c2ec04d1907426ee1dac1bd3654f7f50c65730042ebbffde1c12aa758f9a1e5634fcd0
 EBUILD commons-lang-3.14.0.ebuild 1120 BLAKE2B a7d07b12667f76c24f2bda932c98dec418d27859e2b14e0ae6a95b9cdc6397799bf381f28380da5affe8fb92fd16161577ebe6137d5fbe25de455fc9529466b0 SHA512 930882c78902b5138d35c3c8a540ca1d613982946345d37c221ae7c10a3bab13d1cdee8fcbe9fda3e7e3011a6b8cfb74b6941b69116fc4162c676c89e1264831
-EBUILD commons-lang-3.17.0.ebuild 1358 BLAKE2B 0364bafce4d09336961bf50720e0154eb31612df2c85a6ecb758ce9e83669e4f07dea093e1cc7bea4cef6b541ce4164fd98c0c028b932ba286ac9928d5192d6d SHA512 e2757ab9a7ae2eca32d5138311393e50439bdd4b0fa94336062150dcfe6af38cf59b183d9c272e078399b92fbff9e22f4db3150b90a60e0354f68e30f832431c
+EBUILD commons-lang-3.17.0.ebuild 1355 BLAKE2B 4515c4d56de746d140eaf8f6def9eebb82fcc2470ebaa45c614f7758e7f0a91c53bff96e4af81597351f125e68d54c522f5f2f3678687f5cd81d4f281452baf3 SHA512 866e2a2a35ddc9adf26662a81f268a0a2de8982e4a61cf61e5966492516d4c66cd8ad9c598cbfd76dfab7f485001a2ebeb6661b6dbff81fc65d8ff6ec7475bcd
 MISC metadata.xml 321 BLAKE2B f819853737f06392675eee2f97361ee693ab04e6f62c1c801c450d1da45a44ad598bc1837e366502bdccb68c94660c394bb74cd0a2bca07a6d86c9286e973e33 SHA512 a44dc189ce760a3d845652c3361d2eca847a2df71c64290ae71f830e28a5982a6da3145bb958c52bb75db9970182948c19b51a55888a2a888d3e56966cd788a1
diff --git a/dev-java/commons-lang/commons-lang-3.17.0.ebuild b/dev-java/commons-lang/commons-lang-3.17.0.ebuild
index 39a3dddf56a5..95385719df0d 100644
--- a/dev-java/commons-lang/commons-lang-3.17.0.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.17.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}3-${PV}-src"
 
 LICENSE="Apache-2.0"
 SLOT="3.6"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
diff --git a/dev-java/commons-net/Manifest b/dev-java/commons-net/Manifest
index 5b61f322fdf8..4091a9976e01 100644
--- a/dev-java/commons-net/Manifest
+++ b/dev-java/commons-net/Manifest
@@ -3,5 +3,5 @@ DIST commons-net-3.10.0-src.tar.gz.asc 488 BLAKE2B 31a15e952c55079e595f33be17301
 DIST commons-net-3.11.1-src.tar.gz 460104 BLAKE2B 5542a7d9d3d8f2f07a90b3ab21e4e8a66bceecfef8f1ae8ec378003e4c3906414435b095cc0c0016f24d3e174a5e16da52cf4c5503209c08d5e550ef25a7bbdc SHA512 0999067cc73cb0e0ab4940302180a0afa998b37c51f93c1c744bf1d346d14c89283166a665283d98200e98f0b8c39854f17493890d49ddad5769c4deb49de37e
 DIST commons-net-3.11.1-src.tar.gz.asc 488 BLAKE2B ea6ba15b7b6800b1c249cb82d784057f701fb13775fc9838e5247e1e8ead9360a7c5381083fa0c0e2b783e339b6e4ebb8ff66cb8c8924b3c00c9b28ee696e7a3 SHA512 c9e4c896d2f514996aa50c8af20bab6564d574db4fef69832fe2391beefabfed74a727faf7fe9227b037e943cdba5b2ac143164d5c0df3140b9b7c44ca316e53
 EBUILD commons-net-3.10.0.ebuild 1190 BLAKE2B e8834b035b2178ec880c79502cbd9606e851a131dd25cd030b2df82181e1e3ab90009179f94db532529110a99b45a64ebadc7c555f3faee21c3c736e17517137 SHA512 ee3d68e1bb51983f05884c93c479df4308da171ae295846475731c26bc970e563046d63f80b1abf78746747b6ade2d29cfb632ca496c8e2a9ce36133b99ddc61
-EBUILD commons-net-3.11.1.ebuild 1521 BLAKE2B 95ad59e7d5c8ad9766a117a5138f209fe3ce803a921d588c91d94a4d9269d3f8f2cef785ecb0c22968146f9dd228d7781535db7349950c17c8bb6669924058b0 SHA512 823e4ce119339a70ca458ca6e2997d47d0214bc7910a9c30707cfdedaa87e5f971919a166d670f3ca0bb642d67027588dc5d746b2d32ee8cb8c8d0cf0d5c9cf7
+EBUILD commons-net-3.11.1.ebuild 1518 BLAKE2B 4b6b13f582179e9a62262e78bf718547226e37324406c50626cc323e03f0922f5fb3e348065e59498a21e79989f1d8bf76951e9039b22c8efd3b706efae638c6 SHA512 280c337a4d522d958189ae40a7bca00ffabd8819e1830be42dc204b7c3f584d56481887cd6671bc13c81874224390a7be214ee9e79cf64ad249a894f126f8555
 MISC metadata.xml 393 BLAKE2B 344ccb7c8387f2d977c30219cefde70b31255c859898f243ecfde94643641474047299f2438a4067f70cd77ace99fb754ff6dfc2ccdedd2772081870f1444d8f SHA512 75b957e0f6a08377b402e23f49b081ed9add10ff7b3a5d9f52009d48ef4f8d49bb78f48310b93a579b29857562af2d5261f5b4fe4405edd566c1f320ec729046
diff --git a/dev-java/commons-net/commons-net-3.11.1.ebuild b/dev-java/commons-net/commons-net-3.11.1.ebuild
index 2563be67f5d0..2c009c33bb73 100644
--- a/dev-java/commons-net/commons-net-3.11.1.ebuild
+++ b/dev-java/commons-net/commons-net-3.11.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
diff --git a/dev-java/hamcrest/Manifest b/dev-java/hamcrest/Manifest
index e063b4570826..eba08d2122b1 100644
--- a/dev-java/hamcrest/Manifest
+++ b/dev-java/hamcrest/Manifest
@@ -1,6 +1,3 @@
-AUX hamcrest-2.2-java-11.patch 6356 BLAKE2B 4950e452b7e785e575db862902c2deda6fd46575de46e5d429df116e642c9e95077a710f3e74069ec39d6eba177c498580cd81ac398a7f1395b6a9e278dcbf17 SHA512 d8240e2be33bb7594b570da8224f149ddbc36e55249b9e4ced0d03e2851d781a34b1763b8022b59345b90c0033f25c0d4a8a4e03b124abf08c183b30aa8eb556
-DIST hamcrest-2.2.tar.gz 603615 BLAKE2B b367fcb13be3314655e29e9196f3ae202200335801ea5bd8f97b5cd845bf7ecb39c4910b10e49938a373aa7897b62bc0935780490386bde1993add5b943b1eaf SHA512 8120e4f4ad83ff41b8b8ede1fe0817eb8fce6f13072e932aff7fc8c9f64689698753ae47b9f024922d5ab0a5bf7bb88b9e1998064d69a58b8c418ab89200e66a
 DIST hamcrest-3.0.tar.gz 880513 BLAKE2B f2240a08d6d54e14a8e5441311127fc09f78c8a38a7dcf56d888827f716090cbf15e4a4a563ee56d5afc22574ca1d081276d0173e9361effd20ea3f5389e37a7 SHA512 7997afbc414d7ace3f150eb3ce775c10de4beb595deba02dd41f195e3d885e11dec9af1df4b92d36140217503aebb8c4b97192ed6f925f92287f72b0c2b1b6f5
-EBUILD hamcrest-2.2-r1.ebuild 912 BLAKE2B c4efa76a1c6b935fd6abdc4bdcec98e1f5bde829aa6316b8fca97c7898f28d05acc22cb34f5affec327fcc5410551c3ef196f0fb6280f028f4adf7df400ed9ae SHA512 81a189bab441d2593cfa2091acdbc4a905ed080f5b86fb505b58c4f565be157c3b124e6b73c9804cf0c47887301a75ee5b1738e077accfec62af94bbe41efef5
 EBUILD hamcrest-3.0.ebuild 799 BLAKE2B 006ac976260fe42dd698a450d9e2bfef862966aaf254fe8dcdfc5730cffdc1aff885d141ddb6ca2edd5767abdc813539dade17b791df81596b689b73797c58db SHA512 731dfa621d9c1de2d85933f6b9820d65749f1a594a0e5ad0a92704d8308a7f47f2ea7e47b89e5e677830d39ddf780f435fb927a2793b937b581b6df5364a387b
 MISC metadata.xml 303 BLAKE2B b415b83e9cd87ea6d0c58b8096930a08d4f3732068be492e201820cfef6599045327972bdc36d5936fc2f04c49b5c82c16b64b808edc882f863047989c94256e SHA512 97de5ee8a7aa583829434d5768522c3d73cebbc70a44874cafc87f0827d595d01b6b545b9709ec24f034e3c62527627828c6c0b0ac158cc6a7c4a633bb26748f
diff --git a/dev-java/hamcrest/files/hamcrest-2.2-java-11.patch b/dev-java/hamcrest/files/hamcrest-2.2-java-11.patch
deleted file mode 100644
index 83d8ddea9108..000000000000
--- a/dev-java/hamcrest/files/hamcrest-2.2-java-11.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff --git a/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java b/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java
-index fc968e0..3bbc36e 100644
---- a/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java
-+++ b/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java
-@@ -67,7 +67,7 @@ public class ArrayMatching {
-    */
-   @SafeVarargs
-   public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) {
--      return arrayContainingInAnyOrder(asList(itemMatchers));
-+      return arrayContainingInAnyOrder((List<Matcher<? super E>>) asList(itemMatchers));
-   }
- 
-   /**
-diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
-index 7e72a62..35ff806 100644
---- a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
-+++ b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
-@@ -59,7 +59,7 @@ public class IsArrayContainingInAnyOrder<E> extends TypeSafeMatcher<E[]> {
-      *     a list of matchers, each of which must be satisfied by an entry in an examined array
-      */
-     public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) {
--        return arrayContainingInAnyOrder(Arrays.asList(itemMatchers));
-+	return arrayContainingInAnyOrder((List<Matcher<? super E>>) Arrays.asList(itemMatchers));
-     }
- 
-     /**
-diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
-index c046914..312543f 100644
---- a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
-+++ b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
-@@ -73,7 +73,7 @@ public class IsArrayContainingInOrder<E> extends TypeSafeMatcher<E[]> {
-      *     the matchers that must be satisfied by the items in the examined array
-      */
-     public static <E> Matcher<E[]> arrayContaining(Matcher<? super E>... itemMatchers) {
--        return arrayContaining(asList(itemMatchers));
-+	return arrayContaining((List<Matcher<? super E>>) asList(itemMatchers));
-     }
- 
-     /**
-diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
-index d6a9a33..6b4e39e 100644
---- a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
-+++ b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
-@@ -98,7 +98,7 @@ public class IsIterableContainingInAnyOrder<T> extends TypeSafeDiagnosingMatcher
-      */
-     @SafeVarargs
-     public static <T> Matcher<Iterable<? extends T>> containsInAnyOrder(Matcher<? super T>... itemMatchers) {
--        return containsInAnyOrder(Arrays.asList(itemMatchers));
-+	return containsInAnyOrder((List<Matcher<? super T>>) Arrays.asList(itemMatchers));
-     }
- 
-     /**
-diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java
-index 0657768..383c552 100644
---- a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java
-+++ b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java
-@@ -99,7 +99,7 @@ public class IsIterableContainingInRelativeOrder<E> extends TypeSafeDiagnosingMa
-      */
-     @SafeVarargs
-     public static <E> Matcher<Iterable<? extends E>> containsInRelativeOrder(Matcher<? super E>... itemMatchers) {
--        return containsInRelativeOrder(asList(itemMatchers));
-+        return containsInRelativeOrder((List<Matcher<? super E>>) asList(itemMatchers));
-     }
- 
-     /**
-diff --git a/hamcrest/src/main/java/org/hamcrest/core/AllOf.java b/hamcrest/src/main/java/org/hamcrest/core/AllOf.java
-index b8c3faa..e7e2550 100644
---- a/hamcrest/src/main/java/org/hamcrest/core/AllOf.java
-+++ b/hamcrest/src/main/java/org/hamcrest/core/AllOf.java
-@@ -4,6 +4,7 @@ import org.hamcrest.Description;
- import org.hamcrest.DiagnosingMatcher;
- import org.hamcrest.Matcher;
- 
-+import java.util.List;
- import java.util.Arrays;
- 
- /**
-@@ -56,6 +57,6 @@ public class AllOf<T> extends DiagnosingMatcher<T> {
-      */
-     @SafeVarargs
-     public static <T> Matcher<T> allOf(Matcher<? super T>... matchers) {
--        return allOf(Arrays.asList(matchers));
-+        return allOf((List<Matcher<? super T>>) Arrays.asList(matchers));
-     }
- }
-diff --git a/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java b/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java
-index 7a22c22..ba52275 100644
---- a/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java
-+++ b/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java
-@@ -3,6 +3,7 @@ package org.hamcrest.core;
- import org.hamcrest.Description;
- import org.hamcrest.Matcher;
- 
-+import java.util.List;
- import java.util.Arrays;
- 
- /**
-@@ -46,6 +47,6 @@ public class AnyOf<T> extends ShortcutCombination<T> {
-      */
-     @SafeVarargs
-     public static <T> AnyOf<T> anyOf(Matcher<? super T>... matchers) {
--        return anyOf(Arrays.asList(matchers));
-+        return anyOf((List<Matcher<? super T>>) Arrays.asList(matchers));
-     }
- }
-diff --git a/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java b/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java
-index e37efce..3ca6f96 100644
---- a/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java
-+++ b/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java
-@@ -57,7 +57,7 @@ public class CombinableMatcher<T> extends TypeSafeDiagnosingMatcher<T> {
-         this.first = matcher;
-     }
-     public CombinableMatcher<X> and(Matcher<? super X> other) {
--      return new CombinableMatcher<>(first).and(other);
-+      return new CombinableMatcher<X>(first).and(other);
-     }
-   }
- 
-@@ -76,7 +76,7 @@ public class CombinableMatcher<T> extends TypeSafeDiagnosingMatcher<T> {
-         this.first = matcher;
-     }
-     public CombinableMatcher<X> or(Matcher<? super X> other) {
--      return new CombinableMatcher<>(first).or(other);
-+      return new CombinableMatcher<X>(first).or(other);
-     }
-   }
- }
diff --git a/dev-java/hamcrest/hamcrest-2.2-r1.ebuild b/dev-java/hamcrest/hamcrest-2.2-r1.ebuild
deleted file mode 100644
index 401f297eddd3..000000000000
--- a/dev-java/hamcrest/hamcrest-2.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.hamcrest:hamcrest:2.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Core API and libraries of hamcrest matcher framework."
-HOMEPAGE="https://hamcrest.org/JavaHamcrest/"
-SRC_URI="https://github.com/${PN}/JavaHamcrest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/JavaHamcrest-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-PATCHES=( "${FILESDIR}"/hamcrest-2.2-java-11.patch )
-
-DOCS=( {CHANGES,README}.md )
-
-JAVA_AUTOMATIC_MODULE_NAME="org.hamcrest"
-JAVA_SRC_DIR="hamcrest/src/main/java"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="hamcrest/src/test/java"
-
-src_prepare() {
-	default
-	java-pkg-2_src_prepare
-}
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index 4cac458eb29f..355d5cc26144 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,12 +1,9 @@
 AUX junit-4.13.2_p20240222-ignore-failing-test.patch 5184 BLAKE2B d846ac9599216bd9486a26082029dea6a1f1e252f8b023c3e553cc6586365a582b78e20d3a305b7d911ad6a9bd8206057f7ad617e18103c050dd19f46f6c7031 SHA512 bb1f1c13b128fd2a178d58be02b3cc206b030ea421815309dcca3dbed33e529733576e4db0ed5d44d1126ffd077bdad8b9b4cb96d980f8b42d394a32c90d50f6
 AUX junit5-java18-compatibility.patch 742 BLAKE2B 89bfa36330278cdee2f7f66ed5527895e650a7b490d3f3695772a27541be1d8383c1742bab4e8494f3a84c29f93f553880a3bd5cd4d84792cf662fbc33a6e594 SHA512 5a9a562eb61a875764da369ff40da6ff95c6de8b3b3ecb612634112076741d75d6eab385743843b4fe7ca8a1827960e06550f6e90c8b7ef75b55006b41c416cd
 DIST junit-4.13.2_p20240222.tar.gz 1007781 BLAKE2B 4eeab59aa7ff3cc65c73318acb562523e6ba781da6a0baf28f8fa82042f1affddb583d188c550207a7e267b3475f4a546e8e25eba61d5ba36d13bd7e277ad156 SHA512 89506413b7aca7c2d0b41c8297dde48c1b90a44133bfb3ebf300247c7837839a3aff2d785d891ddb8762427d718eacf016a1d67e2e24edda05f4eae36ca311f1
-DIST junit-5.10.2.tar.gz 2942035 BLAKE2B 4880df74b7cbf23acd34c716f9fce26edd28b31c14d720e129e9e1f06aa35b70c447a0d87904e083a54663fba17e0b2b470678dc32480e0a11c5ebf46d5fe38e SHA512 c36ff7c2bd21f9a64c93b836fc1017a8a96ebcc0079cf1d95b09f5b764435178c2dc2336f2493e7e4df561013693dce4f08dfe0cf3bd76cc9b820313f64d064f
 DIST junit-5.10.3.tar.gz 2944861 BLAKE2B 38ca01363ecd1a2bb1b66d93bbc8a6e34c94ee574fd44857239223f6253051c355572ac8ecece21610ea8afeabdc62df30caab1994ae9bbfa9fa9c71097ac956 SHA512 8d3621b6da6e70017957e280fd2848fdc77136497bf4399a1690f2db0f53b1b079f85ec19b6d3115cc01fe24454e118548944d45e1c23f2a404b640e587b0771
 DIST junit3.8.2.zip 461426 BLAKE2B 8fbef1ccdf7f71c611976d63f45838f4cb2564da5f5064e7abc39931a3c99039a40660093aba2cc3c70af761171125f434c16c52021226f2e92fdf23597dbf25 SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930
-DIST junit5-java18-compatibility.patch 742 BLAKE2B 89bfa36330278cdee2f7f66ed5527895e650a7b490d3f3695772a27541be1d8383c1742bab4e8494f3a84c29f93f553880a3bd5cd4d84792cf662fbc33a6e594 SHA512 5a9a562eb61a875764da369ff40da6ff95c6de8b3b3ecb612634112076741d75d6eab385743843b4fe7ca8a1827960e06550f6e90c8b7ef75b55006b41c416cd
 EBUILD junit-3.8.2-r2.ebuild 802 BLAKE2B dd3ad766b9070457499af970d037ed6c5e96208a609d68149c37f348e4d678d950b963e62f54e655a4930b77c09048394da85821d0de2886f28a6693cab23486 SHA512 0e21cbde4dd60723044e9fcfd01ef5991fc62bdcc186e05e86c4fe4a0e04ddb038aaa16b130eeacf1d23b37e4ef3e16e0051e6bb1d40748c66b69ce3ad335755
 EBUILD junit-4.13.2_p20240222.ebuild 1557 BLAKE2B f6353fe928daace6973a1870f4f894cc7ae64a2337087f702c92fc57fd569fb4e71de8c5de4c399a3376f541ba2af737605bcb2d7313c0912ef2411348a79e3e SHA512 f4d37e27b67271137e0a9406ba42681afe89ceee5da4be9f80c9e03d99a6fb6abfaea8bdeaac9cb39db9f5dc9f72383b663c247f27afe8c90c437a9f9baf5cac
-EBUILD junit-5.10.2.ebuild 12395 BLAKE2B 5f03a73ee3bce0d40d685490377374fc6c4ed8a9794d85d94a12619dda6b1f9cab59b59edbc05e2b1e0cdbeb80930ba9d0a98b403d05a185cae4c3ecb50137d9 SHA512 74080cc8c15d15a253974e85b05a9537112690c120d935b770afd902ac783651eaace85117d8af3400ef5608b8dfa62b9c3517ca8206cff63f6b26dae6fae7e5
 EBUILD junit-5.10.3.ebuild 12259 BLAKE2B b7178323dfacb694840d85354ddd9473d622516ecd41e5b9b246a14d1034d69d457311b78999acb16c57945cb587bd6efa39056fea9a8d770b548094ef179ee8 SHA512 e1bd4805c02caa8d733c082f6e960482110eb3dd521bc4fc3f65ab22da71c1635b9b18e8744a795196da4e1c4ceeb75490cbe3ba54e8f0e5fd39e031fe54163f
 MISC metadata.xml 894 BLAKE2B d0f5c989f8a49dc923dfaf51a7d42d6fdc79a9c2cccd48cd31e687bcc5b7d7f25b15f1e7f91ebfe8f87cc15ce11b37c95e06dcf17611b03066f2b079efc6624b SHA512 7d40683565d1e4ff8ceb183fa26d8d6e3ae77dc1f7335a6ea452589f0f794bae8479a9e97c257a7d2332f3fa83b6721b334557944a4f0d6d064b66e0bcda9bd1
diff --git a/dev-java/junit/junit-5.10.2.ebuild b/dev-java/junit/junit-5.10.2.ebuild
deleted file mode 100644
index 9429d37e25d6..000000000000
--- a/dev-java/junit/junit-5.10.2.ebuild
+++ /dev/null
@@ -1,351 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Declare the 'doc' USE flag in IUSE -- not JAVA_PKG_IUSE -- to
-# prevent java-pkg-simple.eclass from handling Javadoc; instead,
-# let this ebuild handle Javadoc generation and installation itself.
-# This ebuild invokes java-pkg-simple.eclass's phase functions
-# multiple times to build multiple modules, but the eclass always
-# installs each module's Javadoc to the same directory, which would
-# trigger an error when the second module's Javadoc is installed.
-JAVA_PKG_IUSE="source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Simple framework to write repeatable tests"
-HOMEPAGE="https://junit.org/junit5/"
-DEB="5.10.1-1"
-SRC_URI="https://github.com/junit-team/junit5/archive/r${PV}.tar.gz -> ${P}.tar.gz
-	https://sources.debian.org/data/main/j/junit5/${DEB}/debian/patches/18-java-compatibility.patch \
-	-> junit5-java18-compatibility.patch"
-S="${WORKDIR}/junit5-r${PV}"
-
-LICENSE="EPL-2.0"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE="doc migration-support suite vintage"
-
-CP_DEPEND="
-	dev-java/apiguardian-api:0
-	dev-java/opentest4j:0
-	dev-java/open-test-reporting-events:0
-	dev-java/picocli:0
-	dev-java/univocity-parsers:0
-"
-
-# java-utils-2.eclass does not support
-# USE-conditional dependencies in CP_DEPEND
-COND_DEPEND="
-	migration-support? ( dev-java/junit:4 )
-	vintage? ( dev-java/junit:4 )
-"
-
-# Limiting JDK version to >=11 for module-info.java in this package
-# https://bugs.gentoo.org/796875#c3
-DEPEND="
-	>=virtual/jdk-11:*
-	${CP_DEPEND}
-	${COND_DEPEND}
-	test? ( dev-java/jimfs:0 )
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}
-	${COND_DEPEND}
-"
-
-PATCHES=(
-	"${DISTDIR}/junit5-java18-compatibility.patch"
-)
-
-src_prepare() {
-	default #780585
-	java-pkg-2_src_prepare
-}
-
-src_configure() {
-	# Please make sure to declare a module's dependencies before the module itself.
-	# Useful upstream documentation regarding modules and dependencies:
-	# https://junit.org/junit5/docs/current/user-guide/index.html#dependency-metadata
-	# https://junit.org/junit5/docs/current/user-guide/index.html#dependency-diagram
-	JUNIT5_MODULES=(
-		junit-platform-commons
-		junit-platform-engine
-		junit-platform-launcher
-		junit-platform-reporting
-		junit-platform-console # For launching tests from CLI;
-		# an eclass would need it to support running tests using JUnit 5
-
-		$(use suite && echo \
-			junit-platform-suite-api \
-			junit-platform-suite-commons \
-			junit-platform-suite-engine \
-		)
-
-		junit-jupiter-api
-		junit-jupiter-engine # For JUnit Jupiter tests -- the so-called
-		# "JUnit 5 tests", which cannot run on earlier JUnit versions
-		junit-jupiter-params # For parameterized tests; the junit-jupiter
-		# aggregator module includes it, so building it unconditionally
-		$(usev migration-support junit-jupiter-migrationsupport)
-
-		$(usev vintage junit-vintage-engine)
-
-		# Modules not included:
-		# - junit-bom: Has no sources; solely for helping Maven and Gradle
-		#   projects that use JUnit 5 manage dependencies easier
-		# - junit-jupiter: Aggregator; does not have 'src/main/java'
-		# - junit-platform-console-standalone: Has no sources; solely used
-		#   by the upstream to build a fat JAR that bundles everything, so
-		#   users can use just this single JAR to run JUnit 5
-		# - junit-platform-jfr: For an experimental feature
-		# - junit-platform-runner: Deprecated
-		# - junit-platform-suite: Aggregator; does not have 'src/main/java'
-		# - junit-platform-testkit: Requires >=dev-java/assertj-core-3.14.0
-	)
-	local cp_packages=()
-	(use migration-support || use vintage) && cp_packages+=( junit-4 )
-	local save_IFS="${IFS}"
-	IFS=',' JAVA_GENTOO_CLASSPATH="${cp_packages[*]}"
-	IFS="${save_IFS}"
-
-	JUNIT5_VM_VERSION="$(java-config --get-env PROVIDES_VERSION)"
-}
-
-junit5_foreach_module() {
-	local module
-	for module in "${JUNIT5_MODULES[@]}"; do
-		junit5_module_do "${module}" "${@}"
-	done
-}
-
-junit5_module_do() {
-	local module="${1}"
-	# Invocation of the passed function will not be guarded by '|| die'.
-	# Like the case for multibuild_foreach_variant(), it is recommended
-	# that the passed function itself calls 'die'.
-	local func=( "${@:2}" )
-
-	einfo "Running '${func[@]}' for ${module} ..."
-	pushd "${module}" > /dev/null || die "Failed to enter directory '${module}'"
-
-	# Set up Java eclass variables that are
-	# supposed to be set in the ebuild global scope
-
-	local JAVA_JAR_FILENAME="${module}.jar"
-
-	local JAVA_SRC_DIR=(
-		src/main/java
-		src/module
-	)
-
-	local JAVA_RESOURCE_DIRS=()
-	local default_resource_dir="src/main/resources"
-	[[ -d "${default_resource_dir}" ]] &&
-		JAVA_RESOURCE_DIRS+=( "${default_resource_dir}" )
-
-	if [[ "${module}" == junit-platform-console ]]; then
-		local JAVA_MAIN_CLASS="org.junit.platform.console.ConsoleLauncher"
-		local JAVA_LAUNCHER_FILENAME="${module}"
-	fi
-
-	# Invoke the passed function
-	"${func[@]}"
-	local ret="${?}"
-
-	popd > /dev/null || die "Failed to leave directory '${module}'"
-	return "${ret}"
-}
-
-junit5_gen_cp() {
-	echo "$(java-pkg_getjars --build-only --with-dependencies \
-		"${JAVA_GENTOO_CLASSPATH}"):${JAVA_GENTOO_CLASSPATH_EXTRA}"
-}
-
-junit5_module_compile() {
-	if [[ "${module}" == junit-platform-console ]]; then
-		# Unlike other modules that have a src/main/java9 directory, for this
-		# module, the upstream puts the class files built from src/main/java9
-		# in their JAR's top-level directory instead of META-INF/versions/9
-		cp -rv src/main/java9/* src/main/java/ ||
-			die "Failed to merge ${module}'s sources for Java 9+"
-		# Remove for the [[ -d src/main/java9 ]] test
-		# during versioned directory handling
-		rm -rv src/main/java9 ||
-			die "Failed to remove ${module}'s Java 9+ source directory"
-	fi
-
-	java-pkg-simple_src_compile
-	local sources="sources.lst"
-	local classes="target/classes"
-
-	# Collect a list of all compiler input files for building Javadoc
-	local source
-	while read source; do
-		echo "${module}/${source}" >> "${all_sources}"
-	done < "${sources}" ||
-		die "Failed to add ${module}'s sources to Javadoc input list"
-
-	# Handle classes that will go into versioned directories.  This will be
-	# no longer needed after https://bugs.gentoo.org/900433 is implemented.
-	local vm_ver
-	for vm_ver in 9 17; do
-		local versioned_src="src/main/java${vm_ver}"
-		if [[ -d "${versioned_src}" ]]; then
-			if ver_test "${JUNIT5_VM_VERSION}" -ge "${vm_ver}"; then
-				local versioned_classes="target/${vm_ver}/classes"
-				mkdir -p "${versioned_classes}" ||
-					die "Failed to create directory for ${module}'s Java ${vm_ver}+ classes"
-				ejavac -d "${versioned_classes}" -encoding "${JAVA_ENCODING}" \
-					-classpath "${classes}:$(junit5_gen_cp)" ${JAVAC_ARGS} \
-					$(find "${versioned_src}" -type f -name '*.java')
-				"$(java-config --jar)" -uvf "${JAVA_JAR_FILENAME}" \
-					--release "${vm_ver}" -C "${versioned_classes}" . ||
-					die "Failed to add ${module}'s Java ${vm_ver}+ classes to JAR"
-			else
-				# Modules that may hit this branch as of 5.9.2:
-				# - junit-platform-console:
-				#   src/main/java17/.../ConsoleUtils.java tries to use
-				#   java.io.Console.charset() (available since Java 17) to get
-				#   the default output charset.  It is fine to not use this
-				#   file, even if the built artifacts will be used on JRE 17+,
-				#   as src/main/java/.../ConsoleUtils.java still gets the
-				#   default from java.nio.charset.Charset.defaultCharset().
-				elog "JDK ${JUNIT5_VM_VERSION} used; skipping Java ${vm_ver}-dependent parts in ${module}"
-			fi
-		fi
-	done
-
-	# Add the current module's JAR to classpath
-	# for the module's reverse dependencies in this package
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":${S}/${module}/${JAVA_JAR_FILENAME}"
-}
-
-src_compile() {
-	local all_sources="${S}/all-sources.lst"
-	junit5_foreach_module junit5_module_compile
-
-	if use doc; then
-		einfo "Generating Javadoc for all modules ..."
-		local apidoc="target/api"
-		mkdir -p "${apidoc}" || die "Failed to create Javadoc directory"
-		ejavadoc -d "${apidoc}" \
-			-encoding "${JAVA_ENCODING}" -docencoding UTF-8 -charset UTF-8 \
-			-classpath "$(junit5_gen_cp)" ${JAVADOC_ARGS:- -quiet} \
-			-windowtitle "JUnit ${PV} API" \
-			"@${all_sources}"
-	fi
-}
-
-src_test() {
-	# Running the JUnit 5 modules' tests (located in each module's
-	# 'src/test/java') has a few obstacles:
-	# - Some test sources use text blocks -- a feature introduced in Java 15.
-	#   A JDK at a lower version, e.g. 11, cannot compile them.
-	# - Some test classes depend on JUnit 5 modules that this ebuild does not
-	#   include, like junit-platform-runner and junit-platform-testkit.
-	#
-	# Therefore, this ebuild uses a simpler approach to test the artifacts just
-	# built: it uses the artifacts to run tests in examples under the
-	# 'documentation/src' directory.  The test coverage will not be impressive,
-	# but at least this approach verifies that the copy of JUnit 5 just built
-	# is capable of running some simple tests launched from CLI.
-
-	local JUNIT5_TEST_SRC_DIR="documentation/src/test/java"
-	local JUNIT5_TEST_RESOURCE_DIR="documentation/src/test/resources"
-	local JUNIT5_TEST_RM=(
-		$(usev !migration-support example/IgnoredTestsDemo.java)
-		$(use !suite && echo \
-			example/DocumentationTestSuite.java \
-			example/SuiteDemo.java \
-		)
-		$(usev !vintage example/JUnit4Tests.java)
-
-		# Need excluded module junit-platform-runner
-		example/JUnitPlatformClassDemo.java
-		example/JUnitPlatformSuiteDemo.java
-
-		# Need excluded module junit-platform-testkit
-		example/testkit/
-
-		# Not necessary for the tests; some files even require extra dependency
-		org/junit/api/tools/
-
-		# Needs dev-java/hamcrest; no need to pull in extra dependency
-		# as the examples already provide ample tests to run
-		example/HamcrestAssertionsDemo.java
-
-		# Makes an HTTP request and expects a certain response
-		example/session/HttpTests.java
-	)
-
-	pushd "${JUNIT5_TEST_SRC_DIR}" > /dev/null ||
-		die "Failed to enter test source directory"
-	rm -rv "${JUNIT5_TEST_RM[@]}" ||
-		die "Failed to remove unneeded test sources"
-	# Test sources expect the working directory to be 'documentation'
-	sed -i -e "s|src/test/resources|${JUNIT5_TEST_RESOURCE_DIR}|g" \
-		example/ParameterizedTestDemo.java ||
-		die "Failed to update file paths in test sources"
-	popd > /dev/null || die "Failed to leave test source directory"
-
-	local test_dir="${T}/junit5_src_test"
-	local example_classes="${test_dir}/classes"
-	local test_classes="${test_dir}/test-classes"
-	mkdir -p "${example_classes}" "${test_classes}" ||
-		die "Failed to create test directories"
-
-	local example_sources="${test_dir}/sources.lst"
-	local test_sources="${test_dir}/test-sources.lst"
-	find documentation/src/main/java -type f -name '*.java' > "${example_sources}" ||
-		die "Failed to get a list of example sources"
-	find documentation/src/test/java -type f -name '*.java' > "${test_sources}" ||
-		die "Failed to get a list of test sources"
-
-	ejavac -d "${example_classes}" -encoding "${JAVA_ENCODING}" \
-		-classpath "$(junit5_gen_cp)" ${JAVAC_ARGS} \
-		"@${example_sources}"
-
-	local test_cp="${example_classes}:${JUNIT5_TEST_RESOURCE_DIR}:$(junit5_gen_cp)"
-	test_cp="${test_cp}:$(java-pkg_getjars --build-only --with-dependencies jimfs)"
-	ejavac -d "${test_classes}" -encoding "${JAVA_ENCODING}" \
-		-classpath "${test_cp}" ${JAVAC_ARGS} \
-		"@${test_sources}"
-
-	set -- "$(java-config --java)" -classpath "${test_classes}:${test_cp}" \
-		org.junit.platform.console.ConsoleLauncher \
-		--disable-ansi-colors --fail-if-no-tests --scan-classpath \
-		--include-classname='^(Test.*|.+[.$]Test.*|.*Tests?|.*Demo)$' \
-		--exclude-tag="exclude"
-	echo "${@}" >&2
-	"${@}"
-	local status="${?}"
-	[[ "${status}" -eq 2 ]] && die "JUnit did not discover any tests"
-	[[ "${status}" -eq 0 ]] || die "ConsoleLauncher failed"
-}
-
-junit5_module_install() {
-	# It is OK to let java-pkg-simple_src_install call einstalldocs for
-	# each module as long as each documentation file being installed
-	# has a unique filename among _all_ modules; otherwise, some files
-	# would overwrite other ones.
-	if [[ -f README.md ]]; then
-		mv -v README.md "README-${module}.md" ||
-			die "Failed to rename ${module}'s README.md"
-	fi
-	java-pkg-simple_src_install
-}
-
-src_install() {
-	junit5_foreach_module junit5_module_install
-	einstalldocs # For project-global documentation
-
-	if use doc; then
-		einfo "Installing Javadoc for all modules ..."
-		local apidoc="target/api"
-		java-pkg_dojavadoc "${apidoc}"
-	fi
-}