gentoo auto-resync : 22:03:2024 - 13:00:51

10 files changed, 6 insertions, 281 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 49b28eeaa795..cb4e1cb69e3a 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest
index fde4d061757f..2447485e9bf4 100644
--- a/dev-java/commons-compress/Manifest
+++ b/dev-java/commons-compress/Manifest
@@ -1,10 +1,8 @@
 AUX commons-compress-1.21-asm7+.patch 7037 BLAKE2B 49270e040492c413fb9f26ce81dde2e7594a02b48d4dfd68bfe977eefc9d41e21e585d1a0d2e56803d08d1af617f8c2d0e3f3d3b0cffa893bfc8d2d3c50b6d9d SHA512 6722a9fb119d72c7061d12b94452fac40eef63be7610eee81ddc115c346610e5e4caca0cbf659ec9e7ff1a58f9def4ebfef26476b915bc74299a1f984d2eb29c
-DIST commons-compress-1.21-src.tar.gz 15165800 BLAKE2B 3fed32af039860c6b434c485f0c78939ed810a224a12680ddf1d9d6ed540f4e74530edd0e0077fd41af31404c296a607db912465cfd725c31446bc6fa7b8df8a SHA512 8041371b491057435ca62390e70b30031e4d21e80c37d9cb922fdffa794b56aee3b5d60d8241e4db0cecc28c82dfdaafbe52b2175e26062da169fec8efbb17e1
 DIST commons-compress-1.26.0-src.tar.gz 54670636 BLAKE2B e29adcab9a10a7d4ada3624afb0d674a592fbd76d93badea833af355415a4e4adb1f954a2986cc9d1ae78dc84cd0380de0f21366cf7ae582e9d89f2cb2cea943 SHA512 9348e2792d67fe977cbfcede80ab95de96e582c3f7239e16e99360decac4e7703f57d4cfec9535cd4a0f884319df851eb5e44214ba8c3dd321cc6ea67f9d1abb
 DIST commons-compress-1.26.0-src.tar.gz.asc 488 BLAKE2B 0b51158ad0eeb91c8ecad1a6d87afd482ddaae7c6d4fd1d86b586886b1d6ba4073d9e6846a84334593676f1a6bb337b250009ddfc0f67838bab38238cd5d2a4c SHA512 31080e6fba38574d84b0af09450eba3c0b4b2781c50e432d5ce0e128a8b3edd105ad75908177c1aa8942d68a095d47e7f3f4d141c8f2227828b294f3da6b343c
 DIST commons-compress-1.26.1-src.tar.gz 54843710 BLAKE2B 84c4c1363a4396a06773a8c120f5f32d98fceaa139e33a2a27df79a9aea41b8084a93a5735b0c4cd17fa88c404060af2336ab20f127acceb0da948ff170164c3 SHA512 096c94344a9bbcd021a3cce0869456cf6d22ca5136b63de017922d7c3de5d94b591961fe550201b654f9dc90b2cd8f32ef9bf1e507fddfb2e2f7c33bddc790c4
 DIST commons-compress-1.26.1-src.tar.gz.asc 488 BLAKE2B 4df27d6d7ab226eb87ca6b7691c677b95d59c2d37f44ced6a5c0586aefa2506c9a635d869fd181526149416c228a8859a961386ca98519dc080709a55d9264c9 SHA512 b9533d63f961022ca42e79f8aed91a6c4b8a91cb0f3aa095a4ffa2202ed87d171f6c0d32babfbd730eb0c250be2331da4bd12e5251f7e7076f78536d20d96ced
-EBUILD commons-compress-1.21-r1.ebuild 4337 BLAKE2B bdde5ecec9736c68e7809fb173e89c2524c0603ee0b9088e11fe958685ed0e3c8fe41518fb11e555bb8ee933fcdda042fc944f6e06f413de0df5a0bd88e92694 SHA512 be83cd009b19e77c15b488742a646db3311a1f632b32d8da7eedd64ec3d468427d35304308ae03304760d4c3666f244a9df68179382001eeea6c9a06c91a06cf
-EBUILD commons-compress-1.26.0-r1.ebuild 1343 BLAKE2B 9deb3684f512752ef8e335c063509f464def190dc035a0216c95cc449c61419c4a334ba15a3f87797a316f22bfd22f38d8e925d91d84f662f9dcf9faca604f84 SHA512 1ff5cb694418802bcc067e6edc7882abbbe37911fa7c5d078fad5390a236514a73841c863b40a422034be00e31ecf2704380cff537ef65d6ebb0641600277567
+EBUILD commons-compress-1.26.0-r1.ebuild 1341 BLAKE2B 85ddf9f5e226669d9eef5ae7d23f0db9f34b87d89a1e35219898bf98f516cdee5508865aff05c4250dfd54c90638d23675da1c010a435d1f3ea1dd7e29335f3c SHA512 4985b05053b4ed3e7802db592674ed551c88f67eee48efa1fcd6bc62792c043253de8f10df6d44d8c74d50a4cd33568d80df98d4afd65624fcf3e0123235179b
 EBUILD commons-compress-1.26.1.ebuild 1311 BLAKE2B a79f18019a9a3db0971847376af23bc7a38cb58e2883e90e6489f65ed0d23d89199b37142d6fa01cbca7d6cf0003d3bd30d4d5476c97f20fb081cfca80302154 SHA512 6b80d0c1ccdde1b10def9c85c1971c3249a2b412db3e8fbee2b3688178ea5f8fa0415376e2a79291fcc98f586747a39210de7804540a2cd5b8913027b9f66cd5
 MISC metadata.xml 325 BLAKE2B 9edddb431124415fe343c5fcfbef16627943a28d12f4bba89559a577e1a2b2eed63a866521f47c504c102c1f5f01cd014c6e453940347ae0bd8e3ebfc5cae68f SHA512 54562f74ac55704a1f09b8dc4d78c5620ba61197e71350d770bddbeafe53c2faaad6d900d284cc265be555d378022b228c6a14b0606f540e2faa16b3df27e939
diff --git a/dev-java/commons-compress/commons-compress-1.21-r1.ebuild b/dev-java/commons-compress/commons-compress-1.21-r1.ebuild
deleted file mode 100644
index 40cf830dd60a..000000000000
--- a/dev-java/commons-compress/commons-compress-1.21-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2022 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://apache.miloslavbrada.cz//commons/compress/source/commons-compress-1.21-src.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~x86" --ebuild commons-compress-1.21.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.commons:commons-compress:1.21"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java API for working with archive files"
-HOMEPAGE="https://commons.apache.org/proper/commons-compress/"
-SRC_URI="mirror://apache/commons/compress/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# asm:asm:3.2 -> !!!groupId-not-found!!!
-# com.github.luben:zstd-jni:1.5.0-2 -> >=dev-java/zstd-jni-1.5.0.5:0
-# org.brotli:dec:0.1.2 -> >=dev-java/brotli-dec-0.1.2:0
-# org.tukaani:xz:1.9 -> >=dev-java/xz-java-1.9:0
-
-CP_DEPEND="
-	dev-java/asm:9
-	dev-java/brotli-dec:0
-	dev-java/xz-java:0
-	dev-java/zstd-jni:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# org.osgi:osgi.core:6.0.0 -> >=dev-java/osgi-core-8.0.0:0
-# POM: pom.xml
-# test? com.github.marschall:memoryfilesystem:2.1.0 -> >=dev-java/memoryfilesystem-2.3.0:0
-# test? javax.inject:javax.inject:1 -> >=dev-java/javax-inject-1:0
-# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-# test? org.apache.felix:org.apache.felix.framework:7.0.0 -> >=dev-java/felix-framework-7.0.5:0
-# test? org.hamcrest:hamcrest:2.2 -> >=dev-java/hamcrest-2.2:0
-# test? org.mockito:mockito-core:3.11.1 -> >=dev-java/mockito-4.6.1:4
-# test? org.ops4j.pax.exam:pax-exam-cm:4.13.1 -> !!!groupId-not-found!!!
-# test? org.ops4j.pax.exam:pax-exam-container-native:4.13.1 -> !!!groupId-not-found!!!
-# test? org.ops4j.pax.exam:pax-exam-junit4:4.13.1 -> !!!groupId-not-found!!!
-# test? org.ops4j.pax.exam:pax-exam-link-mvn:4.13.1 -> !!!groupId-not-found!!!
-# test? org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.36:0
-
-DEPEND="
-	>=virtual/jdk-11:*
-	${CP_DEPEND}
-	dev-java/osgi-core:0
-	test? (
-		dev-java/felix-framework:0
-		dev-java/hamcrest:0
-		dev-java/javax-inject:0
-		dev-java/memoryfilesystem:0
-		dev-java/mockito:4
-		dev-java/slf4j-api:0
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-S="${WORKDIR}/${P}-src"
-
-PATCHES=(
-	"${FILESDIR}/${P}-asm7+.patch"
-)
-
-JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.compress"
-JAVA_CLASSPATH_EXTRA="osgi-core"
-JAVA_ENCODING="iso-8859-1"
-JAVA_MAIN_CLASS="org.apache.commons.compress.archivers.Lister"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="memoryfilesystem,javax-inject,junit-4,felix-framework,hamcrest,mockito-4,slf4j-api"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
-	default
-	# error: package org.ops4j.pax.exam does not exist
-	# removing it costs 2 tests
-	rm src/test/java/org/apache/commons/compress/OsgiITest.java || die
-
-	# java.io.FileNotFoundException: couldn't find zstandard.testdata.zst
-	# pom.xml lines 420-422
-	tar xf src/test/resources/zstd-tests.tar \
-		-C src/test/resources || die "cannot unpack zstd-tests.tar"
-
-	# pom.xml lines 518-520
-	tar xjf src/test/resources/zip64support.tar.bz2 \
-		-C src/test/resources || die "cannot unpack zip64support.tar.bz2"
-
-	JAVA_TEST_EXTRA_ARGS=( -Djava.library.path="${EPREFIX}/usr/$(get_libdir)/zstd-jni/" )
-}
-
-JAVA_TEST_EXCLUDES=(
-	# No runnable methods
-	org.apache.commons.compress.archivers.TestArchiveStreamProvider
-	org.apache.commons.compress.compressors.TestCompressorStreamProvider
-
-	# fails without useful message
-	org.apache.commons.compress.compressors.DetectCompressorTestCase # has 8 tests
-
-	# These tests pass but they prevent printing test messages::
-#	org.apache.commons.compress.compressors.pack200.Pack200UtilsTest # has 2 tests
-#	org.apache.commons.compress.compressors.FramedSnappyTestCase # has 5 tests
-#	org.apache.commons.compress.compressors.XZTestCase # has 4 tests
-#	org.apache.commons.compress.compressors.Pack200TestCase # has 15 tests
-#	org.apache.commons.compress.harmony.pack200.tests.PackingOptionsTest # has 12 tests
-#	org.apache.commons.compress.harmony.pack200.tests.ArchiveTest # has 9 tests
-#	org.apache.commons.compress.harmony.unpack200.tests.ArchiveTest # has 13 tests
-)
diff --git a/dev-java/commons-compress/commons-compress-1.26.0-r1.ebuild b/dev-java/commons-compress/commons-compress-1.26.0-r1.ebuild
index 5b6ff5107212..f229ec9ba6d4 100644
--- a/dev-java/commons-compress/commons-compress-1.26.0-r1.ebuild
+++ b/dev-java/commons-compress/commons-compress-1.26.0-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 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 8e6ecca529d6..98ad5f6ec3e9 100644
--- a/dev-java/commons-io/Manifest
+++ b/dev-java/commons-io/Manifest
@@ -1,6 +1,4 @@
-DIST commons-io-2.11.0-sources.tar.gz 498841 BLAKE2B e45ae4400246d7469e8628f08d2f647ea670b994360c1150fe1f414beee5177e7af7c94589a5c81ce6996f2fb755441f29080ca9b69b98cb5ae1ad897f8f00b5 SHA512 e2ab8ebc9c328093a460f8f5f96c80bb45f5073ec7aaa0beabdcdeac2e97324292eab2e2cb8b64d8e78b2c5d89048ba84e50daa0965dffcbe2fd0da7ab789ee3
 DIST commons-io-2.15.1-src.tar.gz 618534 BLAKE2B 6fc539f28ce610e9947bf529154c79f6924d74872d6f03561d477feba6013e48d74cb5097c851173b690b27052d59c38a9ca4048c1ed54736d29d962746182d6 SHA512 809c7aa66354f2e35fd23f295c4e2f325596ee7f842b7f63f6acc3bd9377c17d4dd276ce62c477fff8d51d0d660e9addbc068270a876097cbecfe3e64f57f385
 DIST commons-io-2.15.1-src.tar.gz.asc 488 BLAKE2B 5fb3128a63d2fbc74cd96bf00919cca0fbf7b0a2cbd48287c8495c0fdb78c9df53dcc06a443b626b52ff3f9c32c55425ba619a4f61de542f3dd912916f3b2469 SHA512 1d358d3acd88816fb4d95746d8e4bd4351062cf35caad8c6f4d2da42c7974a4a583db4f7d98d8768ca7fcb4900172b869c6d6f714b8df71bb214634f83c7a55a
-EBUILD commons-io-2.11.0-r1.ebuild 1819 BLAKE2B 71a3f99e960c1b47dbc3163a1f68885dc368cbad322a4bfb73360d9ab860c47a796c7296b0a540c2e9b175901e92571a1d47e0b0c9cbb04f7b00c41eba4931e1 SHA512 b2f371cfa1d005c0b9f251bf10d3d35f366842720f519b3ef452745bc0a399f78c5bdaa46c087773ffa3e4437d299a645d5df6d6414cb570acf45052be95915b
-EBUILD commons-io-2.15.1.ebuild 996 BLAKE2B b44c1f4a4e2b878488204c26362c70828585b6697cc260e335918b084b016d592083cc24c068c135b4320a45f645ce3b3084ee3f588772ab8f735f3fea9d6023 SHA512 b57a9f0a31302bbe4dfe60b16cac0a8563ba4b88e12bb1d8deb7d1e1c044c7db0649826bcbada6e351638ac39c8ae2b763fbc3f51ea82e35017418221b9082a5
+EBUILD commons-io-2.15.1.ebuild 994 BLAKE2B 9c3204eaa65b369b7a7529222e648f44437fbf915a7f6a62114c7f93372fef9deac75536962e06023b8297484fb60247db8923acf162efd704c4c5fa44b41bb8 SHA512 76f4bc4dd5baff6bfac14d9425bc9e27dbdbbbbf26393279bd5fdd3791927fba9c666f86d2c21c4851b038e80eb7cda1f73103917afb8cb3cb2dd920d808497d
 MISC metadata.xml 319 BLAKE2B 0cf0293595d7916fd34cf3a108f6f79e8ce3fc32d4bc02bcb093578e02c5386ed80b50487fb8e663cbcfa98873ab0a5a3763b3b002ff89323617b30c4a1b4143 SHA512 acbe501db8b7fe74845d68c3c288231b2140473652c12b04d4b4edac4a6031be67c470d4b59a170e743023e1f931a7daae647be0a23bf5d227d1fbd9c4927cfa
diff --git a/dev-java/commons-io/commons-io-2.11.0-r1.ebuild b/dev-java/commons-io/commons-io-2.11.0-r1.ebuild
deleted file mode 100644
index 29bd88fca479..000000000000
--- a/dev-java/commons-io/commons-io-2.11.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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://mirror.dkm.cz/apache//commons/io/source/commons-io-2.11.0-src.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" --ebuild commons-io-2.11.0.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="commons-io:commons-io:2.11.0"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Utility classes, stream implementations, file filters, and much more"
-HOMEPAGE="https://commons.apache.org/proper/commons-io/"
-SRC_URI="mirror://apache/commons/io/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-# Compile dependencies
-# POM: pom.xml
-# test? com.google.jimfs:jimfs:1.2 -> !!!groupId-not-found!!!
-# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
-# test? org.junit-pioneer:junit-pioneer:1.4.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter:5.7.2 -> !!!groupId-not-found!!!
-# test? org.mockito:mockito-inline:3.11.2 -> !!!artifactId-not-found!!!
-# test? org.openjdk.jmh:jmh-core:1.32 -> !!!groupId-not-found!!!
-# test? org.openjdk.jmh:jmh-generator-annprocess:1.32 -> !!!groupId-not-found!!!
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		>=dev-java/commons-lang-3.12.0:3.6
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-# some test dependencies are missing
-RESTRICT="test"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ENCODING="iso-8859-1"
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="commons-lang-3.6"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.io"
diff --git a/dev-java/commons-io/commons-io-2.15.1.ebuild b/dev-java/commons-io/commons-io-2.15.1.ebuild
index 2e300e56b692..99a17eafd8b9 100644
--- a/dev-java/commons-io/commons-io-2.15.1.ebuild
+++ b/dev-java/commons-io/commons-io-2.15.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"
 RESTRICT="test" #839681
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest
index 8ae543b1cddb..12c52dd52e1b 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1,5 +1,3 @@
-DIST jakartaee-migration-1.0.7-sources.tar.gz 43381 BLAKE2B 9a1a6bfd217f77890940240c6c860e21e0b72c758a63426a0c63009213738a9322a758d4525a9a8a8c69883c490edf128d8b70a6120ede431da434c4d1408e19 SHA512 f7edd70b997b2ae2a93b14b93c5b6dcb80de04f554125729f89e62eddaecfbfea21b304226887edb029c8a7b255b50a55a38381d017c7d44859f2e56b912f25a
 DIST jakartaee-migration-1.0.8-sources.tar.gz 43466 BLAKE2B f9ffbb46ef6a26c9884e1d3eb55f283556cf8dbaf0955c9efe7e9766f77eadaae1e5bd066225948e9d97adac0f2f34fee3d6ad552bbbdad7303a0abb98d3070c SHA512 ecb1db63cb258b1b8c0e8106ea171e80e66622a48cafa62f8fb75e1b1ba6d539cfefc5dfe0ba9536d06b102c599afeba80d094598d2af3fe1d2ca153ef61ced8
-EBUILD jakartaee-migration-1.0.7-r2.ebuild 2899 BLAKE2B 7610c74888de4245544642e47b186129751b44f3ed936659b12c20182203856e23c2520a0d6488382d30709a2beed897875b8aa622e2995ffb4b496ce9cb14c6 SHA512 bf0d1aa8a4fb808b8a6479e44469261ea5f90cbaf448620b3333ba7af935c264db0a7320c468f4ab2e95453f334039e2b0ead69a5e6288ca181f08d2dd6ad9dd
-EBUILD jakartaee-migration-1.0.8-r1.ebuild 2397 BLAKE2B a1b77be3392a885345254ef826ac60bfba28363b9c0ce6d9e315759a9b9518a2be6f90535fa1b84e17c391e303c233d9ebeafabf8a1dbcdfc0031ae0d2adc899 SHA512 631bb8e81f3be9e021a427452b61952c04813c625c4b69ef572999d11f97a60a2ca9f1bbcae1dcbfa01404476b9f6b0cfaa72082d4c7809f7d25a5b4cec00c44
+EBUILD jakartaee-migration-1.0.8-r1.ebuild 2396 BLAKE2B 284580c3318f854a5e444148fb77b21efd3b53404224a0006b8f5ee01b81a06103f7ec6ef327bde18c22abb54f51a73a3d14349eedd7b536c995705b6643cd62 SHA512 354ffdc0ffb97cb8dbee75602ee8a3ee26a02af54085a3695af66835b12f172d96457e4b77f14b98376c2ec15e74914d503d047312f2006e038c96084b1544ba
 MISC metadata.xml 335 BLAKE2B 5f9b427a9a229435fa8f5ee0a510b4943d95f1728500139d9d72f7c0d8ebe9130827815a4cb12976893f40962e12378480df968b6347efbb0a808bc37da46d9a SHA512 7064bbf92199c8e938c1370e583e0c361a98825016d7766ecc07a8bbe7b73cc13eb4cd4453a9720511a7d83328f3f8107c0447786425b101823b05ebb3eb2719
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r2.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r2.ebuild
deleted file mode 100644
index 7e8daacf6943..000000000000
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.7"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9"
-HOMEPAGE="https://tomcat.apache.org"
-SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
-
-# Common dependencies
-# POM: pom.xml
-# commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
-# org.apache.bcel:bcel:6.6.0 -> >=dev-java/bcel-6.6.0:0
-# org.apache.commons:commons-compress:1.22 -> !!!suitable-mavenVersion-not-found!!!
-
-CDEPEND="
-	>=dev-java/ant-1.10.14-r1:0
-	dev-java/bcel:0
-	dev-java/commons-compress:0
-	dev-java/commons-io:1
-"
-
-# Compile dependencies
-# POM: pom.xml
-# org.apache.ant:ant:1.10.12 -> !!!suitable-mavenVersion-not-found!!!
-# POM: pom.xml
-# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-
-# we need jdk-11 just for some tests as those need stuff from newer jdk,
-# otherwise the package as of version 1.0.7 compiles fine with jdk 1.8
-# with tests disabled
-# see bug https://bugs.gentoo.org/910499
-
-DEPEND="
-	>=virtual/jdk-11:*
-	${CDEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}"
-
-S="${WORKDIR}/${P}"
-
-JAVA_LAUNCHER_FILENAME="${PN}"
-
-JAVA_GENTOO_CLASSPATH="ant,bcel,commons-compress,commons-io-1"
-JAVA_SRC_DIR="src/main/java"
-JAVA_MAIN_CLASS="org.apache.tomcat.jakartaee.MigrationCLI"
-JAVA_RESOURCE_DIRS=(
-	"src/main/resources"
-)
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS=(
-	"src/test/resources"
-)
-JAVA_TEST_EXCLUDES=(
-	"org.apache.tomcat.jakartaee.TesterConstants"
-)
-
-src_prepare() {
-	default
-	sed -i "s/\${project.version}/${PV}/g" src/main/resources/info.properties
-}
-
-src_test() {
-	# we need to create jar files for the tests the same way as it's done using pom.xml
-	local implementation_version=$(grep Implementation-Version pom.xml | grep -oE "[0-9]+\.[0-9]+\.[0-9]+")
-	mkdir -p generated-test/META-INF || die
-	pushd generated-test || die
-	echo "Implementation-Version: ${implementation_version}" > META-INF/MANIFEST.MF
-	ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name CommonGatewayInterface.java) || die
-	jar cfm cgi-api.jar META-INF/MANIFEST.MF $(find -name CommonGatewayInterface.class) || die
-	ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name HelloCGI.java) || die
-	jar cfm hellocgi.jar META-INF/MANIFEST.MF $(find -name HelloCGI.class) || die
-	for enc in rsa dsa ec; do
-		cp hellocgi.jar hellocgi-signed-${enc}.jar || die
-		jarsigner -keystore "${S}/src/test/resources/keystore.p12" -storepass apache hellocgi-signed-${enc}.jar ${enc} || die
-	done
-	popd
-
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.8-r1.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.8-r1.ebuild
index 6203c0152c9b..4ee56f6fa8ae 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.8-r1.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.8-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 
 CP_DEPEND="
 	>=dev-java/ant-1.10.14-r1:0