gentoo auto-resync : 27:01:2023 - 13:58:28

20 files changed, 13 insertions, 836 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 5373334c9d5b..34fc6e874361 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/commons-daemon/Manifest b/dev-java/commons-daemon/Manifest
index b0db33ee0b08..b0b5e8cdea0b 100644
--- a/dev-java/commons-daemon/Manifest
+++ b/dev-java/commons-daemon/Manifest
@@ -1,7 +1,5 @@
 AUX commons-daemon-1.3.1-Make.patch 508 BLAKE2B a7645b93b44f15b4ebb9a0864a3c467999bcb0becf006f2806f897a26435140017384fb8cf14151e3a7b969c9397c4047f47e2a35f53904a9a013d5f085ab04c SHA512 f01c485a0832aef27b1fa6b681c7f66096a0206d6e75e702e32bd6131eb1ea4d85fb363d12eb6d29c386d2af773ca0ff17f14ea7a6ebc8469e641b0760e9a82f
-DIST commons-daemon-1.3.1-src.tar.gz 287642 BLAKE2B 02e85a5534af7f804a0374789506ee25ee8313987c68153974aa938b983745ae44d579f17deb362764d1a03b04bc552115bd69ef28b4f7d3bbb06f3bb4199814 SHA512 b810ac152f8296d980a4fb3786eff9d147b234dc2377df5fe1bded0824c694c9e82a7ef50b0a63c3e6432dfc4684a3aa2ce8d583aacb740bd4664c3dfb8b8f16
 DIST commons-daemon-1.3.3-src.tar.gz 290415 BLAKE2B c9c175ba52cef25ce6d1b56c7466aa5e775ed1ac3ca7c710c3519574c35e8a66ff5846313de8da594511ad411e802b7e0b647cbfd66a50abaaa0d39574a4e103 SHA512 ec246e2c05d66408374ba56b3715b13f8f24f89af11fa00c2381dc19c188f1b6228f19351c97d5774808a804b83fdbdfb8f537d099db062c39ffd281c142ee77
 DIST commons-daemon-1.3.3-src.tar.gz.asc 873 BLAKE2B 01fc7ec60393f2077a2bbf80aacb1a03b821cb52f88d87010f26a5811e2695d08b7c01193d00c2fb1a28bb875b63a5a0a935feadf7c1f00c4799aafa32592804 SHA512 c42b36acd45665daeda06a59006f05fd9846817e4e1065ef89dfedef060216ecce0316d06400437e4fb5138cf41c2fe52790cd5da9306c64e3000a3765bad2a2
-EBUILD commons-daemon-1.3.1.ebuild 1559 BLAKE2B fc04c3bff7ab689fafc90dcc7e90b3ae34a1d4662d7ee597ce9616a5191b628c4581e69df342970ddd3fb2e9a278d2bcb23a944fda72db3e045d192ca052433d SHA512 7518da1a0efa66f76d9f601429329e690f2447f60903d0c520de07be7a366045c282bc9998d0aa5d9443352702fff5549534cbbc70339dc0729f077a49f337ec
 EBUILD commons-daemon-1.3.3.ebuild 1611 BLAKE2B e48d4e87cb120df6cd38e73f7b3d5029106d6b6b4f5de505b2b86ae0bfdf2815dcc492f0cfc8927e1bd798f5259982452ef1f743a0594b686b2cad501f7aaabc SHA512 2ee0975cd3af3b20627bd10c36fe18791045eeb01d2e433aa87052d0d51b29106d1378874960814805b194af42d6bffe0f9a1c8cd6e110a54a3fba0cc0b0c85e
 MISC metadata.xml 693 BLAKE2B 327524cf8db429b89ebf8e16745b6125fdfef850402000b1ddefa96254aa827a1fa8a2bd61af3ac219b26f0fd14f7c6d9718462f095ef1264b6119ccbc21f9be SHA512 ab8232bbc9d93e5c3f056f3230f3cf4bd095dbf8985a25094b8ba541679814d4dc10e3a211537397577f30d3d84d3335a0d512b26ca82b14a58f3994b6954810
diff --git a/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild b/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild
deleted file mode 100644
index baa152a4895a..000000000000
--- a/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild
+++ /dev/null
@@ -1,65 +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 mirror://apache/commons/daemon/source/commons-daemon-1.2.4-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-daemon-1.2.4.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="commons-daemon:commons-daemon:1.3.1"
-# JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple toolchain-funcs
-
-DESCRIPTION="Tools to allow Java programs to run as UNIX daemons"
-HOMEPAGE="https://commons.apache.org/proper/commons-daemon/"
-SRC_URI="mirror://apache/commons/daemon/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-PATCHES=( "${FILESDIR}/commons-daemon-1.3.1-Make.patch" )
-DOCS=( {CONTRIBUTING,README}.md {HOWTO-RELEASE,NOTICE,RELEASE-NOTES}.txt )
-HTML_DOCS=( PROPOSAL.html )
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ENCODING="iso-8859-1"
-
-JAVA_SRC_DIR="src/main/java"
-
-# There is only org/apache/commons/daemon/SimpleDaemon.java
-# which is not even run upstream ( mvn test ).
-# JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-# JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
-	default
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-
-	pushd src/native/unix || die
-		./configure
-		emake AR="$(tc-getAR)"
-	popd
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-
-	dobin src/native/unix/jsvc
-}
diff --git a/dev-java/felix-framework/Manifest b/dev-java/felix-framework/Manifest
index 793c9b98ddd1..ab7b011fe635 100644
--- a/dev-java/felix-framework/Manifest
+++ b/dev-java/felix-framework/Manifest
@@ -1,3 +1,3 @@
 DIST felix-framework-7.0.5.tar.gz 505118 BLAKE2B 3652d46dfb4c9c5b43b159450b81ad896483fb2df40165d7e7b8bbd718c8e3297163065474bd10f3858ff7fc2646134ed470e34ede8eeb5efc05cec75f1a7aec SHA512 58fa96500fed827c348a47ac8672aeb4e5b94bfd681c4cde610b3a453fd2abfe2d631742281a192c76718ee83fc4c30980a5179926ff3bc7b8ea649ef07f34a3
-EBUILD felix-framework-7.0.5.ebuild 3583 BLAKE2B 748cb21585def179ffda1c0835b3f3065d113c2fb4a2c67f89f827f6467f24935b54274077b5eb524a221a536ba04b516f96e37a5fae82f8465eb962c0dea23a SHA512 9ed2eb5fde2a3f1b1361a1a9d45e9236fb5781b4d0cae24dd72662f01aade4bd12bbb20e360180545b44f1eb4c1c9f51ff7dfb9b3c56f67d58b30af9f3dea414
+EBUILD felix-framework-7.0.5-r1.ebuild 3357 BLAKE2B bb26fb46b16d94b5f8ec006764589a0107c45ccef65987c2789c98de8c3cb899ccd28796ea96782bd6a5e8be6233d3610e40c8a4820370d41afb1ee9cbbcf4ce SHA512 bfdb2d45a56e6085cdcdaac3e2da2bd5d70c3b32dde3e09bf653c02279d0e12b675274904ddf3cf91463d5bb2e9fcda63dd1875f19036a4bb9efabef0646da92
 MISC metadata.xml 455 BLAKE2B 69e2d92cd05dd44530363b6920e0673ac8f6d87cebf7ca931d4699378062348b83391fdfeaa4dc95d470a718d363fa7e6578f949b6f8f3510317f6d63bc7c514 SHA512 585dc4c8a3fb5c6c01940c887207346065ca9c7499abdb79ab6f6554a05fe6b27734e48101cb0dab61b8e0e32417bf28e722947864bd0ea3d48296198a3f3264
diff --git a/dev-java/felix-framework/felix-framework-7.0.5.ebuild b/dev-java/felix-framework/felix-framework-7.0.5-r1.ebuild
index df163b2381bb..11539e0d1f65 100644
--- a/dev-java/felix-framework/felix-framework-7.0.5.ebuild
+++ b/dev-java/felix-framework/felix-framework-7.0.5-r1.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2022 Gentoo Authors
+# 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 mirror://apache/felix/org.apache.felix.framework-7.0.5-source-release.tar.gz --slot 0 --keywords "~amd64" --ebuild felix-framework-7.0.5.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
@@ -15,6 +12,7 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Implementation of the OSGi R8 core framework specification"
 HOMEPAGE="https://felix.apache.org/documentation/subprojects/apache-felix-framework.html"
 SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/org.apache.felix.framework-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -42,7 +40,7 @@ DEPEND="
 	dev-java/osgi-annotation:0
 	dev-java/felix-resolver:0
 	test? (
-		dev-java/asm:4
+		dev-java/asm:9
 		dev-java/easymock:2.5
 		dev-java/mockito:0
 	)
@@ -52,8 +50,6 @@ RDEPEND="
 	>=virtual/jre-1.8:*
 	${CP_DEPEND}"
 
-S="${WORKDIR}/org.apache.felix.framework-${PV}"
-
 JAVA_CLASSPATH_EXTRA="felix-resolver,osgi-annotation"
 JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
@@ -62,7 +58,7 @@ JAVA_TEST_GENTOO_CLASSPATH="asm-4,junit-4,easymock-2.5,mockito"
 JAVA_TEST_SRC_DIR="src/test/java"
 
 src_prepare() {
-	default
+	java-pkg-2_src_prepare
 	# 58,91 pom.xml
 	cat > src/main/java/module-info.java <<-EOF
 		$( sed -n '/<moduleInfoSource>/,/<\/moduleInfoSource/p' pom.xml \
diff --git a/dev-java/fontbox/Manifest b/dev-java/fontbox/Manifest
index 8d24fba7bf90..c8323540be76 100644
--- a/dev-java/fontbox/Manifest
+++ b/dev-java/fontbox/Manifest
@@ -3,8 +3,6 @@ DIST NotoEmoji-Regular.ttf 418804 BLAKE2B e94f7b1d5bced052ff3f15a32ecce8f0f1dc2e
 DIST NotoSansSC-Regular.otf 8481960 BLAKE2B 3eee2c1e6be5e013d2ed679ccb361221e3e410150c7dc32d570382355e80e540c71be9009ece9951eea2379fb08fc05d8bcd65e941677660c55b450d660e8b03 SHA512 cbdd317d16099d24736457eef631353c7830a1a3c132b01f2cdc1e6a0c21a78e3b1fe8479b3f40179e7630a15cc23a093775bb22d521dba39376bb367d497b21
 DIST OpenSans-Regular.pfb 100962 BLAKE2B ff906c67a79df9d8deb9736f7439ba5429b72940b6a6fa49751fdea88adef70a3b57f28b2c31014da3206efe601095a8caeb98382fb36f8544afd0bec5cce355 SHA512 2787fcecc0feb1c9e6ff0d8de6193658413863e44eaab572751ca7e6c3b369c0a9731f4952cb0821f307760f0422f77c5f0d3fe7df6b054643fb39423e8d70ee
 DIST SourceSansProBold.otf 104072 BLAKE2B 2c6538ed97cca04a6a38a1bcca7def6c9e923f0e7a773c2715d50ca1a526b1ff683bc6544155b1e170fb828c3923d6b22cdf7017f9da9de164523f328c1cc187 SHA512 28a044a2685fbc8da7810d9ac7b6b93a95542d504d7d8e671f009b8ebb2f5b70c974be7ea78974b188d8e6ab17d65b08f276c054927857315d5aad26f6fe36fc
-DIST pdfbox-2.0.26-src.zip 15766524 BLAKE2B eafedf1db5a54d36cb42111b736ad79adfcc106630fa4b2bc57873dcfbdbbb7bd0e9408611b0d8771909e719813e388430944ae0fbaf800bdc859595de2b101b SHA512 e14c57e28d10324dbcb6ad239bad5751a2dab0035bbd80427afd03f65467ec1376ddd7d08e7cefd4d950b149f85d8f505f6f50cc3093fd65bb8a2cbb2b8c7c1e
 DIST pdfbox-2.0.27-src.zip 15770627 BLAKE2B 9f93d597141ff3da39b69da3ce989a0cc7f4020071e5cb1609a8b86d0f12a3219037cb4c7b276acf58ee6b07d842b6d7c76e14fdf79e9efdeac401048e345f89 SHA512 59a5675f5d1d34f092adc019679f7d10e7e93c0f554a002ac29d48cbffcaa600d930309fa94a92191c01ead8da905cbb37ce5e233dcc9b8732a881d4abf75def
-EBUILD fontbox-2.0.26.ebuild 1959 BLAKE2B aec4115a79052a22fdf2c82604a75c9af57e01aaf10dc4fcb640f9959f8553f68775c25d15ff16a18a907b13765fe4f405e086c99627c72918d05a3b507221de SHA512 e09fdd42a7ef24a11a6714c11717f65e80f5329b4b9073928fbc4cf91f2bbd240ce8959f087e59dd741f8b4d0dcd7cfab8e436ad6fe6100a206f16f65a7d085b
 EBUILD fontbox-2.0.27.ebuild 1989 BLAKE2B b3835819318f95235327f4a3267e7a385b8c50d24353c480432a7bc3880bd8f49aa7f74ad5ea101780ea7f4262985bd081c054c4e26cc738cf660c1b2a5e0d97 SHA512 3e3119f4e49971f7e2c06e180167c7399d009e252c83a02094e68d18118647e73782915421fb32e113bf1f2b75abab40f897d27c5212c5898ca6ed26e9779abe
 MISC metadata.xml 571 BLAKE2B 1ffa3f19fb3e5035c5a73503ce6abbeb02de7ea42fb74e21eecb30aa3827085802644b797f197f35d9001d86ec969b0cc6cbdaa634ab0d003fa65bd03c3d09ab SHA512 e1b958bb3eff6c3428581dd3851b8857048e81df192b87ad91fc61d3074a4ebf88dfecf6310ac96a3da6ba6b96d476ef1e258781e36b8f0c5cbf3110d5608f8e
diff --git a/dev-java/fontbox/fontbox-2.0.26.ebuild b/dev-java/fontbox/fontbox-2.0.26.ebuild
deleted file mode 100644
index 693dc662a08d..000000000000
--- a/dev-java/fontbox/fontbox-2.0.26.ebuild
+++ /dev/null
@@ -1,62 +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 mirror://apache/pdfbox/2.0.26/pdfbox-2.0.26-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild fontbox-2.0.26.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.pdfbox:fontbox:2.0.26"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="An open source Java library for parsing font files"
-HOMEPAGE="https://pdfbox.apache.org/"
-SRC_URI="mirror://apache/pdfbox/${PV}/pdfbox-${PV}-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
-		http://mirrors.ctan.org/fonts/opensans/type1/OpenSans-Regular.pfb
-	)"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pdfbox-${PV}/${PN}/pom.xml
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-
-CP_DEPEND="dev-java/commons-logging:0"
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/pdfbox-${PV}/${PN}"
-
-JAVA_SRC_DIR="src/main/java"
-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"
-
-src_test() {
-	mkdir --parents target/{pdfs,fonts} || die
-	cp \
-		"${DISTDIR}"/SourceSansProBold.otf \
-		"${DISTDIR}"/NotoEmoji-Regular.ttf \
-		"${DISTDIR}"/DejaVuSansMono.ttf \
-		"${DISTDIR}"/NotoSansSC-Regular.otf \
-		"target/pdfs" || die
-	cp "${DISTDIR}"/OpenSans-Regular.pfb \
-		"target/fonts" || die
-
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/jol-core/Manifest b/dev-java/jol-core/Manifest
index 55e80412dcb6..337c8a6ce181 100644
--- a/dev-java/jol-core/Manifest
+++ b/dev-java/jol-core/Manifest
@@ -1,3 +1,3 @@
 DIST jol-0.16.tar.gz 120373 BLAKE2B 06301e1802c89c76038aec2247cbb45d96cc74afa9f099500f8e5f33b919117e85744bc2b8214b6c9e765a2579a43f256eecc2ba8537e76c81aceaa8694f49dc SHA512 d9abf579d0230f2b6d0e0a33ee11c9599b4f36d945239dd8670bbd00591137c2229e5251b32dd5405fd4b08e0070af70e6b04e4ea4be0c28c4d5bc94874858de
-EBUILD jol-core-0.16.ebuild 956 BLAKE2B af95545690764c9d5478a4ecf4e29ab8455aac4ba06e0cd3867c7aa5a47188be59702530e121d90b00efa9c5c304bea2527f875d97ffe85dfd199522a228ef0f SHA512 c1154530ce7439af30ee8e5d1b8682fde69dd533b6eb191e71dafac7800186e085b383c5f205f5ac9158249e218a0af08b74c415d3d29ed9867bb2e1a4f1aac8
+EBUILD jol-core-0.16-r1.ebuild 852 BLAKE2B 1f4ff93be61472f1de0d78908677f8db2d15a1610d78c69f65196b1dac2dac387fd443e11395c4e6f2afe8d17751c3b1b0642ea58d64292459d94a423989e6d8 SHA512 6e8e1f609bcb43850a3cc9fdb8a80e376eae17c14ec4f0b3a80898adb58a3b2752919bcbe3982b7e7fc1a94fdf83fe31077a78ffe01c33fb970393a76836e356
 MISC metadata.xml 313 BLAKE2B 3925dd7555fc2d9739c092e1949399e496d7b2d40bc2219dd95a5c3bba98e398e57e64eb30414e6efe5e432582ec52b3b2926c7858da7a09ec2590f72b52948a SHA512 e7d4a307cc24ee5ff8f7d5c1c65c87bd7ff2edbc48730355f05faa50c35c7f3dcb4d4667dce909ce77d299da603503b2c30eab4e68f1293f5f4410d20bd53314
diff --git a/dev-java/jol-core/jol-core-0.16.ebuild b/dev-java/jol-core/jol-core-0.16-r1.ebuild
index a36940d2c74b..18b26a837482 100644
--- a/dev-java/jol-core/jol-core-0.16.ebuild
+++ b/dev-java/jol-core/jol-core-0.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,8 +13,8 @@ MY_PN="${PN%-core}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Java Object Layout: Core"
-HOMEPAGE="https://openjdk.java.net/projects/code-tools/jol/"
-SRC_URI="https://github.com/openjdk/jol/archive/refs/tags/${PV}.tar.gz -> jol-${PV}.tar.gz"
+HOMEPAGE="https://openjdk.org/projects/code-tools/jol/"
+SRC_URI="https://github.com/openjdk/jol/archive/${PV}.tar.gz -> jol-${PV}.tar.gz"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="0"
@@ -23,7 +23,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 DEPEND="
 	>=virtual/jdk-1.8:*
 	test? (
-		dev-java/asm:4
+		dev-java/asm:9
 	)
 "
 
@@ -34,12 +34,7 @@ RDEPEND="
 S="${WORKDIR}/${MY_P}"
 
 JAVA_SRC_DIR="${PN}/src/main/java"
-JAVA_RESOURCE_DIRS=( "${PN}/src/main/resources" )
+JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
 
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,asm-4"
-JAVA_TEST_SRC_DIR="${PN}/src/test"
-
-src_install() {
-	java-pkg-simple_src_install
-	einstalldocs # https://bugs.gentoo.org/789582
-}
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,asm-9"
+JAVA_TEST_SRC_DIR="${PN}/src/test/java"
diff --git a/dev-java/log4j-12-api/Manifest b/dev-java/log4j-12-api/Manifest
index 6a66af3cfaf1..0617c1cdde47 100644
--- a/dev-java/log4j-12-api/Manifest
+++ b/dev-java/log4j-12-api/Manifest
@@ -1,5 +1,3 @@
-DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b
 DIST apache-log4j-2.19.0-src.tar.gz 11764795 BLAKE2B 02ec7c5c825cabe9994a2f50d6761110f87a19ff46874c00d46986da7338c32148f3b6c3551c95721aaf94b71d1d5ce8bcea32462e11fa3fe0c3cbbc0cf5f887 SHA512 c72859c415e701921497bb4f02047fa022083f66b4d21b1dbae28361bd73498b2eae335b9a1ac2d7f796df734a6d54db2701ae5ebf999197597e9e2ad064c271
-EBUILD log4j-12-api-2.18.0.ebuild 3316 BLAKE2B c675a6ad27275209484176ecdf25761ced841c600121f1175cd78f8c0649899df8e8de64e40863d69853289a47f51e3296ae455cbd0014dcd7d0bec7b3029e57 SHA512 f4f0bfe344ce508b2e3ebade246bbff3122f5701949e6e0fd11557cbe531c52ba6b688eeb3103f8838a69769a499c9b279a53bad2b857c794ca8a9013b3186c8
 EBUILD log4j-12-api-2.19.0.ebuild 3518 BLAKE2B f297a7ea6f112fca913b3608be99c41482be54db3cc9b198aa0c6b19a6449aee004cf9f0f2d0a818a379f3e1ab5c084866bba76583057a4983994d3b1c4f9cad SHA512 a6ec7b0fd763713a1345e0065ae0d58218319eb8559192faa69d8e0a29d4e14030bb96b68922a48b0afe756085604889640e6195850cc1fbc079ce1beb95b9b7
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-12-api/log4j-12-api-2.18.0.ebuild b/dev-java/log4j-12-api/log4j-12-api-2.18.0.ebuild
deleted file mode 100644
index 7bc2e52908c5..000000000000
--- a/dev-java/log4j-12-api/log4j-12-api-2.18.0.ebuild
+++ /dev/null
@@ -1,84 +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 log4j-1.2-api/pom.xml --download-uri mirror://apache/logging/log4j/2.18.0/apache-log4j-2.18.0-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-12-api-2.18.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.logging.log4j:log4j-1.2-api:2.18.0"
-JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The Apache Log4j 1.x Compatibility API"
-HOMEPAGE="https://logging.apache.org/log4j/2.x/"
-SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# We don't have junit-vintage and junit-jupiter
-RESTRICT="test"
-
-# Common dependencies
-# POM: log4j-1.2-api/pom.xml
-# org.apache.logging.log4j:log4j-api:2.18.0 -> >=dev-java/log4j-api-2.18.0:2
-# org.apache.logging.log4j:log4j-core:2.18.0 -> >=dev-java/log4j-core-2.18.0:2
-
-CP_DEPEND="
-	~dev-java/log4j-api-${PV}:2
-	~dev-java/log4j-core-${PV}:2
-"
-
-# Compile dependencies
-# POM: log4j-1.2-api/pom.xml
-# javax.jms:javax.jms-api:2.0.1 -> !!!groupId-not-found!!!
-# POM: log4j-1.2-api/pom.xml
-# test? com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.3 -> >=dev-java/jackson-dataformat-xml-2.13.3:0
-# test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
-# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
-# test? org.apache.felix:org.apache.felix.framework:7.0.5 -> !!!groupId-not-found!!!
-# test? org.apache.logging.log4j:log4j-api:2.18.0 -> >=dev-java/log4j-api-2.18.0:2
-# test? org.apache.logging.log4j:log4j-core:2.18.0 -> >=dev-java/log4j-core-2.18.0:2
-# test? org.apache.velocity:velocity:1.7 -> !!!artifactId-not-found!!!
-# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-params:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!!
-# test? org.mockito:mockito-core:4.4.0 -> >=dev-java/mockito-4.4.0:4
-# test? oro:oro:2.0.8 -> >=dev-java/jakarta-oro-2.0.8:2.0
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	dev-java/javax-jms-api:0
-"
-#	test? (
-#		!!!artifactId-not-found!!!
-#		!!!groupId-not-found!!!
-#		>=dev-java/commons-io-2.11.0:1
-#		>=dev-java/jackson-dataformat-xml-2.13.0:0
-#		~dev-java/log4j-api-${PV}:2
-#		~dev-java/log4j-core-${PV}:2
-#	)
-#"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*
-"
-
-DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md )
-
-S="${WORKDIR}/apache-log4j-${PV}-src"
-
-JAVA_CLASSPATH_EXTRA="javax-jms-api"
-JAVA_SRC_DIR="log4j-1.2-api/src/main/java"
-JAVA_RESOURCE_DIRS="log4j-1.2-api/src/main/resources"
-
-#JAVA_TEST_GENTOO_CLASSPATH="jackson-dataformat-xml,commons-io-1,commons-lang-3.6,!!!groupId-not-found!!!,log4j-api-2,log4j-core-2,!!!artifactId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,mockito-4,jakarta-oro-2.0"
-#JAVA_TEST_SRC_DIR="log4j-1.2-api/src/test/java"
-#JAVA_TEST_RESOURCE_DIRS=(
-#	"log4j-1.2-api/src/test/resources"
-#)
diff --git a/dev-java/log4j-api/Manifest b/dev-java/log4j-api/Manifest
index 0c6fd1122977..cc0d56724384 100644
--- a/dev-java/log4j-api/Manifest
+++ b/dev-java/log4j-api/Manifest
@@ -1,6 +1,4 @@
-DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b
 DIST apache-log4j-2.19.0-src.tar.gz 11764795 BLAKE2B 02ec7c5c825cabe9994a2f50d6761110f87a19ff46874c00d46986da7338c32148f3b6c3551c95721aaf94b71d1d5ce8bcea32462e11fa3fe0c3cbbc0cf5f887 SHA512 c72859c415e701921497bb4f02047fa022083f66b4d21b1dbae28361bd73498b2eae335b9a1ac2d7f796df734a6d54db2701ae5ebf999197597e9e2ad064c271
 DIST apache-log4j-2.19.0-src.tar.gz.asc 858 BLAKE2B 36cefcd5f016919d18a7d74121bbd913be65e32daa38cef312c167be5c4a0e722aac1c2c802f95792c7c7e8e455a755cd3c5a737b34c36ffa061c60eb6488775 SHA512 0de52ad15d593330631cd26feb4827f1dadc4858c16e33c33099efe27cddf854c5c4ed7f0cde4c6593bc74e573b6378e7f993477d02215295ec7992b81d0b338
-EBUILD log4j-api-2.18.0.ebuild 3007 BLAKE2B 5a40542111a3afd18b3814622d370bcab1fa8eb908335b9464f9f4d8545e1080aa1ef43022bb06847b4f2ed0b10b08c8151278db08ee7002a2e3528b2916a787 SHA512 1b447d0637decee4783728d4e562def111869ef0e7990e09d0c1f3547247317a1dfea3934c4024428b42fc2c6ba524af14d79188001d2fa2c64db2d62776408c
 EBUILD log4j-api-2.19.0.ebuild 3317 BLAKE2B 0a2ccf1611911f5b4af691bd913725113064c2a239ad26aecf07a67e320055b39964c54b93b6a80aa8113905811929ca0507835227c1e0dd579c34786d5d2c73 SHA512 50ffe684dcb6dd5df4464b132c7f07cda6564847aac26846230323ade55468a70bc8b0579df0cd64e65072545189a70da695904628def6a306f5ac2c677ba340
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-api/log4j-api-2.18.0.ebuild b/dev-java/log4j-api/log4j-api-2.18.0.ebuild
deleted file mode 100644
index 918cc1725411..000000000000
--- a/dev-java/log4j-api/log4j-api-2.18.0.ebuild
+++ /dev/null
@@ -1,71 +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 log4j-api/pom.xml --download-uri mirror://apache/logging/log4j/2.18.0/apache-log4j-2.18.0-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-api-2.18.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.logging.log4j:log4j-api:2.18.0"
-JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The Apache Log4j API"
-HOMEPAGE="https://logging.apache.org/log4j/2.x/"
-SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# junit-{jupiter,vintage} is not available in ::gentoo
-RESTRICT="test"
-
-# Compile dependencies
-# POM: ${PN}/pom.xml
-# org.osgi:org.osgi.core:6.0.0 -> >=dev-java/osgi-core-8.0.0:0
-# POM: ${PN}/pom.xml
-# test? com.fasterxml.jackson.core:jackson-core:2.13.3 -> >=dev-java/jackson-core-2.13.3:0
-# test? com.fasterxml.jackson.core:jackson-databind:2.13.3 -> >=dev-java/jackson-databind-2.13.3:0
-# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
-# test? org.apache.felix:org.apache.felix.framework:7.0.5 -> !!!groupId-not-found!!!
-# test? org.apache.maven:maven-core:3.8.5 -> !!!groupId-not-found!!!
-# test? org.assertj:assertj-core:3.23.1 -> !!!suitable-mavenVersion-not-found!!!
-# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
-# test? org.junit-pioneer:junit-pioneer:1.6.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-migrationsupport:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-params:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!!
-# test? uk.org.webcompere:system-stubs-jupiter:2.0.1 -> !!!groupId-not-found!!!
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	dev-java/osgi-core:0
-"
-#		test? (
-#			!!!groupId-not-found!!!
-#			!!!suitable-mavenVersion-not-found!!!
-#			>=dev-java/commons-lang-3.12.0:3.6
-#			>=dev-java/jackson-core-2.13.3:0
-#			>=dev-java/jackson-databind-2.13.3:0
-#		)
-#	"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md )
-
-S="${WORKDIR}/apache-log4j-${PV}-src"
-
-JAVA_CLASSPATH_EXTRA="osgi-core"
-JAVA_SRC_DIR="${PN}/src/main/java"
-JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
-
-#	JAVA_TEST_GENTOO_CLASSPATH="jackson-core,jackson-databind,commons-lang-3.6,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!suitable-mavenVersion-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
-#	JAVA_TEST_SRC_DIR="${PN}/src/test/java"
-#	JAVA_TEST_RESOURCE_DIRS=(
-#		"${PN}/src/test/resources"
-#	)
diff --git a/dev-java/log4j-core/Manifest b/dev-java/log4j-core/Manifest
index 56d9307caed6..eb7a385a7fd7 100644
--- a/dev-java/log4j-core/Manifest
+++ b/dev-java/log4j-core/Manifest
@@ -1,5 +1,3 @@
-DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b
 DIST apache-log4j-2.19.0-src.tar.gz 11764795 BLAKE2B 02ec7c5c825cabe9994a2f50d6761110f87a19ff46874c00d46986da7338c32148f3b6c3551c95721aaf94b71d1d5ce8bcea32462e11fa3fe0c3cbbc0cf5f887 SHA512 c72859c415e701921497bb4f02047fa022083f66b4d21b1dbae28361bd73498b2eae335b9a1ac2d7f796df734a6d54db2701ae5ebf999197597e9e2ad064c271
-EBUILD log4j-core-2.18.0-r1.ebuild 8527 BLAKE2B af5aac4dc73b2b44b8c81b43b99b70ebba8b2893044516cffb97adcce4a98cfd314d0ee0ff0ddbc9276cc6c05c69f0fdefb89af4bdfc962ee8888002220079c7 SHA512 6ac65512701fb4a655257a9844f995bd0cdf91bb170e7a192f772b027662806edfd548c4174628c0c69ea82083b2d0d167533de5b90e71552c04747fd34b11c1
 EBUILD log4j-core-2.19.0.ebuild 8754 BLAKE2B adf025c108c73f92e864c7b2d738fcdef3d78b85eca63845cecf14bd580ff3b4b794a7060d717e2904036a914cce2934f52f07b5072062a4ee1e9c732d6ca6f1 SHA512 95177eb4e946e4b4e26a86bb5caeb651af60c5efc6cae61931f441261ae0b5f6b84a01d50fb05fd58ea6f3d01271ac0befa65ddef7328c57a14a478c2138986b
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-core/log4j-core-2.18.0-r1.ebuild b/dev-java/log4j-core/log4j-core-2.18.0-r1.ebuild
deleted file mode 100644
index cafb2b256299..000000000000
--- a/dev-java/log4j-core/log4j-core-2.18.0-r1.ebuild
+++ /dev/null
@@ -1,175 +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 log4j-core/pom.xml --download-uri mirror://apache/logging/log4j/2.18.0/apache-log4j-2.18.0-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-core-2.18.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.logging.log4j:log4j-core:2.18.0"
-# JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The Apache Log4j Implementation"
-HOMEPAGE="https://logging.apache.org/log4j/2.x/"
-SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# We don't have junit-vintage and junit-jupiter
-RESTRICT="test"
-
-# Common dependencies
-# POM: ${PN}/pom.xml
-# com.conversantmedia:disruptor:1.2.15 -> >=dev-java/conversant-disruptor-1.2.19:0
-# com.fasterxml.jackson.core:jackson-core:2.13.3 -> >=dev-java/jackson-core-2.13.3:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.3 -> >=dev-java/jackson-databind-2.13.3:0
-# com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.3 -> >=dev-java/jackson-dataformat-xml-2.13.3:0
-# com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.3 -> >=dev-java/jackson-dataformat-yaml-2.13.3:0
-# com.fasterxml.woodstox:woodstox-core:6.2.8 -> >=dev-java/woodstox-core-6.2.8:0
-# com.lmax:disruptor:3.4.4 -> >=dev-java/lmax-disruptor-3.4.4:0
-# org.apache.commons:commons-compress:1.21 -> >=dev-java/commons-compress-1.21:0
-# org.apache.commons:commons-csv:1.9.0 -> >=dev-java/commons-csv-1.9.0:0
-# org.apache.kafka:kafka-clients:1.1.1 -> >=dev-java/kafka-clients-1.1.1:0
-# org.apache.logging.log4j:log4j-api:2.18.0 -> >=dev-java/log4j-api-2.18.0:2
-# org.fusesource.jansi:jansi:2.4.0 -> >=dev-java/jansi-2.4.0:2
-# org.jctools:jctools-core:3.3.0 -> !!!suitable-mavenVersion-not-found!!!
-# org.slf4j:slf4j-api:1.7.36 -> >=dev-java/slf4j-api-1.7.36:0
-# org.zeromq:jeromq:0.5.2 -> >=dev-java/jeromq-0.5.2:0
-
-CP_DEPEND="
-	dev-java/commons-compress:0
-	dev-java/commons-csv:0
-	dev-java/conversant-disruptor:0
-	dev-java/jackson-core:0
-	dev-java/jackson-databind:0
-	dev-java/jackson-dataformat-xml:0
-	dev-java/jackson-dataformat-yaml:0
-	dev-java/jansi:2
-	dev-java/javax-mail:0
-	dev-java/jctools-core:3
-	dev-java/jeromq:0
-	dev-java/kafka-clients:0
-	dev-java/lmax-disruptor:0
-	~dev-java/log4j-api-${PV}:2
-	dev-java/slf4j-api:0
-	dev-java/woodstox-core:0
-"
-
-# Compile dependencies
-# POM: ${PN}/pom.xml
-# javax.activation:javax.activation-api:1.2.0 -> !!!groupId-not-found!!!
-# javax.jms:javax.jms-api:2.0.1 -> !!!groupId-not-found!!!
-# javax.mail:javax.mail-api:1.6.2 -> !!!groupId-not-found!!!
-# org.osgi:org.osgi.core:6.0.0 -> >=dev-java/osgi-core-8.0.0:0
-# POM: ${PN}/pom.xml
-# test? ch.qos.logback:logback-classic:1.2.11 -> >=dev-java/logback-classic-1.2.11:0
-# test? ch.qos.logback:logback-core:1.2.11 -> >=dev-java/logback-core-1.2.11:0
-# test? com.github.tomakehurst:wiremock:2.26.3 -> !!!groupId-not-found!!!
-# test? com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0 -> !!!groupId-not-found!!!
-# test? com.h2database:h2:2.1.214 -> !!!groupId-not-found!!!
-# test? commons-codec:commons-codec:1.15 -> >=dev-java/commons-codec-1.15:0
-# test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
-# test? commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-# test? net.javacrumbs.json-unit:json-unit:2.32.0 -> !!!groupId-not-found!!!
-# test? org.apache-extras.beanshell:bsh:2.0b6 -> >=dev-java/bsh-2.0_beta6:0
-# test? org.apache.activemq:activemq-broker:5.17.1 -> !!!groupId-not-found!!!
-# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
-# test? org.apache.felix:org.apache.felix.framework:7.0.5 -> !!!groupId-not-found!!!
-# test? org.apache.logging.log4j:log4j-api:2.18.0 -> >=dev-java/log4j-api-2.18.0:2
-# test? org.apache.maven:maven-core:3.8.5 -> !!!groupId-not-found!!!
-# test? org.awaitility:awaitility:4.2.0 -> !!!groupId-not-found!!!
-# test? org.codehaus.groovy:groovy-dateutil:3.0.10 -> !!!groupId-not-found!!!
-# test? org.codehaus.groovy:groovy-jsr223:3.0.10 -> !!!groupId-not-found!!!
-# test? org.codehaus.plexus:plexus-utils:3.4.2 -> !!!groupId-not-found!!!
-# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
-# test? org.hamcrest:hamcrest:2.2 -> >=dev-java/hamcrest-2.2:0
-# test? org.hsqldb:hsqldb:2.5.2 -> !!!groupId-not-found!!!
-# test? org.jmdns:jmdns:3.5.7 -> !!!groupId-not-found!!!
-# test? org.junit-pioneer:junit-pioneer:1.6.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-params:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.platform:junit-platform-commons:1.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!!
-# test? org.mockito:mockito-core:4.4.0 -> >=dev-java/mockito-4.4.0:4
-# test? org.mockito:mockito-junit-jupiter:4.4.0 -> !!!artifactId-not-found!!!
-# test? org.slf4j:slf4j-ext:1.7.36 -> >=dev-java/slf4j-ext-1.7.36:0
-# test? org.springframework:spring-test:5.3.20 -> !!!groupId-not-found!!!
-# test? org.tukaani:xz:1.9 -> >=dev-java/xz-java-1.9:0
-# test? org.xmlunit:xmlunit-core:2.9.0 -> !!!groupId-not-found!!!
-# test? org.xmlunit:xmlunit-matchers:2.9.0 -> !!!groupId-not-found!!!
-# test? org.zapodot:embedded-ldap-junit:0.8.1 -> !!!groupId-not-found!!!
-
-DEPEND="${CP_DEPEND}
-	dev-java/jakarta-activation-api:1
-	dev-java/jakarta-mail-api:0
-	dev-java/javax-jms-api:0
-	dev-java/osgi-core:0
-	>=virtual/jdk-1.8:*"
-#	test? (
-#		!!!artifactId-not-found!!!
-#		!!!groupId-not-found!!!
-#		>=dev-java/bsh-2.0_beta6:0
-#		>=dev-java/commons-codec-1.15:0
-#		>=dev-java/commons-io-2.11.0:1
-#		>=dev-java/commons-lang-3.12.0:3.6
-#		>=dev-java/commons-logging-1.2:0
-#		>=dev-java/hamcrest-2.2:0
-#		>=dev-java/log4j-api-2.18.0:2
-#		>=dev-java/logback-classic-1.2.11:0
-#		>=dev-java/logback-core-1.2.11:0
-#		>=dev-java/mockito-4.4.0:4
-#		>=dev-java/slf4j-ext-1.7.36:0
-#		>=dev-java/xz-java-1.9:0
-#	)
-#"
-
-# Runtime dependencies
-# POM: ${PN}/pom.xml
-# com.sun.mail:javax.mail:1.6.2 -> !!!artifactId-not-found!!!
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md )
-
-S="${WORKDIR}/apache-log4j-${PV}-src"
-
-JAVA_CLASSPATH_EXTRA="jakarta-activation-api-1,jakarta-mail-api,javax-jms-api,osgi-core"
-JAVA_SRC_DIR="${PN}/src/main/java"
-JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
-
-#JAVA_TEST_GENTOO_CLASSPATH="logback-classic,logback-core,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,commons-codec,commons-io-1,commons-logging,!!!groupId-not-found!!!,bsh,!!!groupId-not-found!!!,commons-lang-3.6,!!!groupId-not-found!!!,log4j-api-2,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,hamcrest,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,mockito-4,!!!artifactId-not-found!!!,slf4j-ext,!!!groupId-not-found!!!,xz-java,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
-#JAVA_TEST_SRC_DIR="${PN}/src/test/java"
-#JAVA_TEST_RESOURCE_DIRS=(
-#	"${PN}/src/test/resources"
-#)
-
-src_compile() {
-	java-pkg-simple_src_compile
-
-	# Process the @Plugin annotation used on Log4j 2 built-in plugins
-	# to generate a serialized plugin listing file
-	# https://logging.apache.org/log4j/2.x/manual/plugins.html
-	local processor="org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor"
-	local classes="target/classes"
-	local classpath="${JAVA_JAR_FILENAME}:$(\
-		java-pkg_getjars --build-only --with-dependencies \
-		"${JAVA_GENTOO_CLASSPATH},${JAVA_CLASSPATH_EXTRA}")"
-	# Just in case java-pkg-simple.eclass changes the path in the future
-	mkdir -p "${classes}" || die "Failed to create directory for classes"
-	local sources_list_file="${T}/sources.lst"
-	find "${JAVA_SRC_DIR}" -type f -name "*.java" > "${sources_list_file}" || die
-	ejavac -d "${classes}" -cp "${classpath}" \
-		-proc:only -processor "${processor}" \
-		@"${sources_list_file}"
-	# Update the JAR to include the serialized plugin listing file
-	local jar="$(java-config -j)"
-	"${jar}" -uf "${JAVA_JAR_FILENAME}" -C "${classes}" . ||
-		die "Failed to update JAR"
-}
diff --git a/dev-java/pdfbox/Manifest b/dev-java/pdfbox/Manifest
index 659e99f364e6..78a695b0912d 100644
--- a/dev-java/pdfbox/Manifest
+++ b/dev-java/pdfbox/Manifest
@@ -1,4 +1,3 @@
-AUX 2.0.24-tests-ignore.patch 669 BLAKE2B bde2c9ffc223f5b390c1574abfbc26404bf35d6ee33f795704a98fec615b89f8d8f4f81ecfcc46bb46e28c32868650c0db4d145f2fee04e0ff9d9a3ccb231b68 SHA512 dbf7497789c62a74d78af9b3865f9158711d378ca2881fcffea128f5945ec9268f980edb2dcdd2aeb80c77771b815f75412f4cf58e58315a91860f91f2989f0c
 DIST PDFBOX-1031-1.pdf 79480 BLAKE2B d0d43ddc3e66e59701634f85f6cca844d790a19f9dbdea93a2b1101d3228368ee02b31dc71520619429bd2dc559fd4e9c2447ef1a292a3ed7e01e74be1092a90 SHA512 f943df43cc2a6929caa484c79eafa44b06a5902e325139e19e1f1ebda7c5fd0c86cc221311659d68351c0ff56d921350ff61e97b9d2c425180d810842c963a5b
 DIST PDFBOX-1031-2.pdf 84803 BLAKE2B 4876cb705f855b2fb788ec7584f554bc40037ddae41d7966957d0ea70acf2b15b92b415b1aa325f6c8a8e17b6a2cd6aa4b9cd60fb036905ad4bb2b0f16921772 SHA512 8a9e836ad77c3e9e1e75476f4b46ff4b8958c099970bf57a0b4789fd37236b2bed7e1f14909fa0e3bbacf1a867c1a5c56cbe293383275c1b9c6c0396bec51085
 DIST PDFBOX-1065-1.pdf 30200 BLAKE2B 5d4da971a0b9608292c5bffe18eb18fbd46de66b0fd3cda16c438f4b24bf0f332cbb8e9b9f4c2ba308f908ae286fec748fa66f3d7ebb9552cce38049b9fddc71 SHA512 6b44f363653a9c0cba049495d0ed67659f98b2622b25d647ae556dc4a708847f6c3e4428aa5de2fa0d67f5e8ba08183abf9e8e640e474c6b00c544782e3bba3e
@@ -39,8 +38,6 @@ DIST genko_oc_shiryo1.pdf 124896 BLAKE2B c3a9921afb052ee4fe5080a1f1e66d991e3041f
 DIST ipag00303.zip 4295310 BLAKE2B b68dd7dd7a7320894d782350c4598572c31d6ef492f9572adc2aac20ca98b5c5027995c0169bf815bc1e3a64d635b0e2d4e378b749e034f2fe718bcb7901d40a SHA512 59535137c649a2f8bdbb463cd716426811a6003a65883ca6e45bb0af1d526b3889af0fba3a353e90bc8d373cd32b90a27ff9ff6916ecbccb42e922c09e9b046a
 DIST ipagp00303.zip 4295877 BLAKE2B e096303106029daaedae9befb003f70c2c7d00b858f89f5f8fffb9fc73679e63ec0dde8e0304cad2c611aa74d3cf1bfea56b9ac35e6838953d38b028654f5434 SHA512 26d0a9bfba7f5457a98b0bf45a4a6b081bca4140047a0886625691231459f8c81a6cdbe523e9abcbd45fd7caed21d78f1baf3a2cf9167320f6b79be3d697cb5b
 DIST n019003l.pfb 79155 BLAKE2B 2995cd6e35de2d49cc6d4a5f6c7461396b23e14c6403cd7aecedbd5cec904fd0c42a114c4c5f5079fd1fad306dd8ddba649a13424ec5183395fb0fc1cbe2abb9 SHA512 8eafe21ffa6f3d7d0a50e9f4e5bcdeb727e804b552d74e65b709e778c9ed4605e5aa63743be285f0bc17ad162768583fec4196e1d1146d98f8703359247f22d0
-DIST pdfbox-2.0.26-src.zip 15766524 BLAKE2B eafedf1db5a54d36cb42111b736ad79adfcc106630fa4b2bc57873dcfbdbbb7bd0e9408611b0d8771909e719813e388430944ae0fbaf800bdc859595de2b101b SHA512 e14c57e28d10324dbcb6ad239bad5751a2dab0035bbd80427afd03f65467ec1376ddd7d08e7cefd4d950b149f85d8f505f6f50cc3093fd65bb8a2cbb2b8c7c1e
 DIST pdfbox-2.0.27-src.zip 15770627 BLAKE2B 9f93d597141ff3da39b69da3ce989a0cc7f4020071e5cb1609a8b86d0f12a3219037cb4c7b276acf58ee6b07d842b6d7c76e14fdf79e9efdeac401048e345f89 SHA512 59a5675f5d1d34f092adc019679f7d10e7e93c0f554a002ac29d48cbffcaa600d930309fa94a92191c01ead8da905cbb37ce5e233dcc9b8732a881d4abf75def
-EBUILD pdfbox-2.0.26.ebuild 10949 BLAKE2B 49db375f1f781700a9e2df91dca92d1ddd72362380b23e864fe2be798abca98e9b8b15e148c4b968a1992252b7914fa843f11ee25b39214b97042ec81568ac11 SHA512 3e3f68c8eae5058863ba3f3e873c15bce59c5c28a542fb0486a4014fbded704eab14db04fecbcba7d10e7f61d7a061ebfc7b873880b0b45b2ec991ff0ab2c9ab
 EBUILD pdfbox-2.0.27.ebuild 11027 BLAKE2B f44e3dbc3b5b6bc65a27a53f826a1eee50f10c2df9329e0e6cff1381844cc041e81c7f06b87c1387b6933dd9c50a81b730726b178ad4234b2accf0cfd9791ed7 SHA512 9e4509481e9d39f12056f5a1ac487bfaf9b607379914d5b02971458975c2e60692d94f699d1858ef721bbff4e9a53616f9a89d5f78c6dee1c79161d57d2f58c3
 MISC metadata.xml 782 BLAKE2B 96e76863aeaf1791f4a7a44aeb49df8b5a9bf91ac0d8d69e5642128df590456a2d38c64c84e8b50c917d3361bbaeb880a1b7744b994db9eee5ca8d250d765d6a SHA512 d7d47cc9eb182780424161f2a136cdec74bbe0cf4d63f52bfc77df8ad4fadc2bb9f3bd7b1ccff667d25928b4e0bc4a979b725ce77f1dff244585713ca40f88cc
diff --git a/dev-java/pdfbox/files/2.0.24-tests-ignore.patch b/dev-java/pdfbox/files/2.0.24-tests-ignore.patch
deleted file mode 100644
index 6454aa776324..000000000000
--- a/dev-java/pdfbox/files/2.0.24-tests-ignore.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# public void testPDFBox3826() throws IOException, URISyntaxException
-# https://issues.apache.org/jira/browse/PDFBOX-3826
---- a/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/PDFontTest.java
-+++ b/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/PDFontTest.java
-@@ -44,6 +44,7 @@ import org.apache.pdfbox.text.PDFTextStripper;
- import org.junit.Assert;
- import org.junit.Before;
- import org.junit.Test;
-+import org.junit.Ignore;
- 
- /**
-  * 
-@@ -133,6 +134,7 @@ public class PDFontTest
-      * @throws IOException
-      * @throws URISyntaxException
-      */
-+    @Ignore
-     @Test
-     public void testPDFBox3826() throws IOException, URISyntaxException
-     {
diff --git a/dev-java/pdfbox/pdfbox-2.0.26.ebuild b/dev-java/pdfbox/pdfbox-2.0.26.ebuild
deleted file mode 100644
index 13e5a7c7f68f..000000000000
--- a/dev-java/pdfbox/pdfbox-2.0.26.ebuild
+++ /dev/null
@@ -1,261 +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 mirror://apache/pdfbox/2.0.26/pdfbox-2.0.26-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild pdfbox-2.0.26.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.pdfbox:pdfbox:2.0.26"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java library and utilities for working with PDF documents"
-HOMEPAGE="https://pdfbox.apache.org/"
-SRC_URI="mirror://apache/${PN}/${PV}/${P}-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
-	)"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="+tools"
-
-PROPERTIES="test_network"
-RESTRICT="test"
-
-# Common dependencies
-# POM: ${P}/${PN}/pom.xml
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-# org.apache.pdfbox:fontbox:2.0.24 -> >=dev-java/fontbox-2.0.24:0
-# org.bouncycastle:bcmail-jdk15on:1.64 -> >=dev-java/bcmail-1.68:0
-# org.bouncycastle:bcprov-jdk15on:1.64 -> >=dev-java/bcprov-1.68:0
-
-CP_DEPEND="
-	dev-java/bcmail:0
-	dev-java/bcprov:0
-	dev-java/commons-logging:0
-	~dev-java/fontbox-${PV}:0
-"
-
-# Compile dependencies
-# POM: ${P}/${PN}/pom.xml
-# test? com.github.jai-imageio:jai-imageio-core:1.4.0 -> >=dev-java/jai-imageio-core-1.4.0:0
-# test? com.github.jai-imageio:jai-imageio-jpeg2000:1.4.0 -> >=dev-java/jai-imageio-jpeg2000-1.4.0:0
-# test? com.googlecode.java-diff-utils:diffutils:1.3.0 -> >=dev-java/java-diff-utils-1.3.0:0
-# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-# test? org.apache.pdfbox:jbig2-imageio:3.0.3 -> >=dev-java/jbig2-imageio-3.0.3:0
-# test? org.mockito:mockito-core:3.10.0 -> !!!suitble-mavenVersion-not-found!!!
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/jai-imageio-core:0
-		dev-java/jai-imageio-jpeg2000:0
-		dev-java/java-diff-utils:0
-		dev-java/jbig2-imageio:0
-		dev-java/mockito:4
-	)"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-BDEPEND="app-arch/unzip"
-
-DOCS=( README.md {NOTICE,RELEASE-NOTES}.txt )
-
-PATCHES=(
-	# adds @Ignore annotation to
-	# public void testPDFBox3826() throws IOException, URISyntaxException
-	# https://issues.apache.org/jira/browse/PDFBOX-3826
-	"${FILESDIR}"/2.0.24-tests-ignore.patch
-)
-
-S="${WORKDIR}/${P}"
-
-JAVA_GENTOO_CLASSPATH_EXTRA="pdfbox.jar:pdfbox-debugger.jar"
-JAVA_TEST_GENTOO_CLASSPATH="jai-imageio-core,jai-imageio-jpeg2000,java-diff-utils,jbig2-imageio,junit-4,mockito-4"
-
-JAVA_TEST_EXCLUDES=(
-	# excluded upstream according to
-	# https://github.com/apache/pdfbox/blob/2.0.26/pdfbox/pom.xml#L123
-	"org.apache.pdfbox.rendering.TestPDFToImage"
-
-	# Causing test failures. Upstream does not run these tests.
-	"org.apache.pdfbox.cos.TestCOSBase"
-	"org.apache.pdfbox.cos.TestCOSNumber"
-)
-
-src_prepare() {
-	default
-}
-
-src_compile() {
-	einfo "Compiling pdfbox"
-	JAVA_SRC_DIR="pdfbox/src/main/java"
-	JAVA_RESOURCE_DIRS="pdfbox/src/main/resources"
-	JAVA_JAR_FILENAME="pdfbox.jar"
-	java-pkg-simple_src_compile
-
-	if use tools; then
-		einfo "Compiling debugger"
-		JAVA_SRC_DIR="debugger/src/main/java"
-		JAVA_RESOURCE_DIRS="debugger/src/main/resources"
-		JAVA_JAR_FILENAME="pdfbox-debugger.jar"
-		java-pkg-simple_src_compile
-
-		einfo "Compiling pdfbox-tools"
-		JAVA_SRC_DIR="tools/src/main/java"
-		JAVA_RESOURCE_DIRS=""
-		JAVA_JAR_FILENAME="pdfbox-tools.jar"
-		java-pkg-simple_src_compile
-	fi
-
-	if use doc; then
-		einfo "Compiling javadocs"
-		JAVA_SRC_DIR=(
-			"${S}/pdfbox/src/main/java"
-			"${S}/debugger/src/main/java"
-		)
-		if use tools; then
-			JAVA_SRC_DIR+=( "${S}/tools/src/main/java" )
-		fi
-		JAVA_JAR_FILENAME="ignoreme.jar"
-		java-pkg-simple_src_compile
-	fi
-}
-
-src_test() {
-	einfo "Testing pdfbox"
-	JAVA_TEST_SRC_DIR="pdfbox/src/test/java"
-	JAVA_TEST_RESOURCE_DIRS="pdfbox/src/test/resources"
-
-	# tests failed with S="${WORKDIR}/${P}"
-	find pdfbox/src/test/ -type f -exec sed -i 's:src/test/resources:pdfbox/src/test/resources:' {} + || die
-
-	mkdir --parents target/pdfs || die
-	cp \
-		"${DISTDIR}"/PDFBOX-1031-1.pdf \
-		"${DISTDIR}"/PDFBOX-1031-2.pdf \
-		"${DISTDIR}"/PDFBOX-1065-1.pdf \
-		"${DISTDIR}"/PDFBOX-1065-2.pdf \
-		"${DISTDIR}"/PDFBOX-1100-1.pdf \
-		"${DISTDIR}"/PDFBOX-1100-2.pdf \
-		"${DISTDIR}"/PDFBOX-3656.pdf \
-		"${DISTDIR}"/PDFBOX-3682.pdf \
-		"${DISTDIR}"/PDFBOX-3940-079977.pdf \
-		"${DISTDIR}"/PDFBOX-3785-202097.pdf \
-		"${DISTDIR}"/PDFBOX-3947-670064.pdf \
-		"${DISTDIR}"/PDFBOX-3948-EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf \
-		"${DISTDIR}"/PDFBOX-3949-MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf \
-		"${DISTDIR}"/PDFBOX-3950-23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf \
-		"${DISTDIR}"/PDFBOX-3951-FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf \
-		"${DISTDIR}"/PDFBOX-3964-c687766d68ac766be3f02aaec5e0d713_2.pdf \
-		"${DISTDIR}"/PDFBOX-3977-63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf \
-		"${DISTDIR}"/PDFBOX-3999-GeneralForbearance.pdf \
-		"${DISTDIR}"/PDFBOX-4197.pdf \
-		"${DISTDIR}"/PDFBOX-4308.pdf \
-		"${DISTDIR}"/PDFBOX-4408.pdf \
-		"${DISTDIR}"/PDFBOX-4418-000314.pdf \
-		"${DISTDIR}"/PDFBOX-4418-000671.pdf \
-		"${DISTDIR}"/PDFBOX-4423-000746.pdf \
-		"${DISTDIR}"/PDFBOX-4517-cryptfilter.pdf \
-		"${DISTDIR}"/PDFBOX-4750.pdf \
-		"${DISTDIR}"/PDFBOX-4153-WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf \
-		"${DISTDIR}"/PDFBOX-4490.pdf \
-		"${DISTDIR}"/PDFBOX-3208-L33MUTT2SVCWGCS6UIYL5TH3PNPXHIS6.pdf \
-		"${DISTDIR}"/PDFBOX-3783-72GLBIGUC6LB46ELZFBARRJTLN4RBSQM.pdf \
-		"${DISTDIR}"/PDFBOX-4338.pdf \
-		"${DISTDIR}"/PDFBOX-4339.pdf \
-		"${DISTDIR}"/genko_oc_shiryo1.pdf \
-		"${DISTDIR}"/PDFBOX-4831.pdf \
-		"target/pdfs" || die
-
-	mkdir target/fonts || die
-	cp "${DISTDIR}"/n019003l.pfb "target/fonts" || die
-	unzip "${DISTDIR}"/ipag00303.zip -d "target/fonts" || die
-	unzip "${DISTDIR}"/ipagp00303.zip -d "target/fonts" || die
-
-	mkdir target/imgs || die
-	cp \
-		"${DISTDIR}"/PDFBOX-5196-lotus.jpg \
-		"${DISTDIR}"/PDFBOX-4184-032163.jpg \
-		"${DISTDIR}"/PDFBOX-4184-16bit.png \
-		"target/imgs" || die
-
-	java-pkg-simple_src_test
-	rm -r target/test-classes || die # avoid to run previous tests again
-
-	if use tools; then
-		einfo "Testing pdfbox-tools"
-		find tools/src/test/ -type f -exec sed -i 's:src/test/resources:tools/src/test/resources:' {} + || die
-		JAVA_TEST_SRC_DIR="tools/src/test/java"
-		JAVA_TEST_RESOURCE_DIRS="tools/src/test/resources"
-		java-pkg-simple_src_test
-	fi
-}
-
-src_install() {
-	# https://bugs.gentoo.org/789582
-	default
-
-	java-pkg_dojar "pdfbox.jar"
-	if use tools; then
-		java-pkg_dojar "pdfbox-debugger.jar"
-		java-pkg_dojar "pdfbox-tools.jar"
-		java-pkg_dolauncher ${PN} --main org.apache.pdfbox.tools.PDFBox
-	fi
-
-	if use doc; then
-		java-pkg_dojavadoc target/api
-	fi
-
-	if use source; then
-		java-pkg_dosrc \
-			"${S}/pdfbox/src/main/java/*" \
-			"${S}/debugger/src/main/java/*" \
-			"${S}/tools/src/main/java/*"
-	fi
-}
diff --git a/dev-java/xmpbox/Manifest b/dev-java/xmpbox/Manifest
index e547af034822..143982a9bcdb 100644
--- a/dev-java/xmpbox/Manifest
+++ b/dev-java/xmpbox/Manifest
@@ -1,5 +1,3 @@
-DIST pdfbox-2.0.26-src.zip 15766524 BLAKE2B eafedf1db5a54d36cb42111b736ad79adfcc106630fa4b2bc57873dcfbdbbb7bd0e9408611b0d8771909e719813e388430944ae0fbaf800bdc859595de2b101b SHA512 e14c57e28d10324dbcb6ad239bad5751a2dab0035bbd80427afd03f65467ec1376ddd7d08e7cefd4d950b149f85d8f505f6f50cc3093fd65bb8a2cbb2b8c7c1e
 DIST pdfbox-2.0.27-src.zip 15770627 BLAKE2B 9f93d597141ff3da39b69da3ce989a0cc7f4020071e5cb1609a8b86d0f12a3219037cb4c7b276acf58ee6b07d842b6d7c76e14fdf79e9efdeac401048e345f89 SHA512 59a5675f5d1d34f092adc019679f7d10e7e93c0f554a002ac29d48cbffcaa600d930309fa94a92191c01ead8da905cbb37ce5e233dcc9b8732a881d4abf75def
-EBUILD xmpbox-2.0.26.ebuild 1707 BLAKE2B 775bfd44df6055da28f3256d411035d98de8d247199ad3c0b3e63f2a030937dde311e08bc24433c21a6aa8e6e1856b15bf302f175190f06ee60559751938d31c SHA512 600198cbc3142f6e29ceb07843016d29863c4d98de95aafd1dc72480b6c36aedd655b7002311c05d4e7a4d985373ddbf9da5dbc2a3281cc3f1b9a4f9bbcfb9f3
 EBUILD xmpbox-2.0.27.ebuild 1617 BLAKE2B 768a66165f403000c657e8c1d00e1efb1a9d967ec641558b5e56164047585e1440371ed3e7c6c4daa21c89ef9617ccb075f23c1ce421a0fa51b27fe0228195d7 SHA512 3cf69b46e86e5b6e313e97304d38443b00f1f74fa94b68b4488926eb6e0bde4a7da7032bfe316014004ce2c97c0556433439d3a71056973f0f68866e16efe0d2
 MISC metadata.xml 597 BLAKE2B af69fd45c044a79514701234978475dbd127d305667a831a88ef2ba2fc2e8fe903c77ddfa7e179466e004467da1002cc56f310628c1e69adbcfa40fbe485110b SHA512 baf1c43dc731ac2cc2f5a6e099b4334f06d352d1324e78b1cea4b3d839c55ca36cf368b6cf4f6b5bb41fb0be9c35e1c41546ff93141e7316d84ff9f94074efa9
diff --git a/dev-java/xmpbox/xmpbox-2.0.26.ebuild b/dev-java/xmpbox/xmpbox-2.0.26.ebuild
deleted file mode 100644
index 2782e6957f22..000000000000
--- a/dev-java/xmpbox/xmpbox-2.0.26.ebuild
+++ /dev/null
@@ -1,61 +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 mirror://apache/pdfbox/2.0.26/pdfbox-2.0.26-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild xmpbox-2.0.26.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.pdfbox:xmpbox:2.0.26"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="An open source Java tool that implements Adobe's XMP(TM) specification"
-HOMEPAGE="https://pdfbox.apache.org"
-SRC_URI="mirror://apache/pdfbox/${PV}/pdfbox-${PV}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-
-CP_DEPEND="dev-java/jaxb-api:2"
-
-# Compile dependencies
-# POM: pom.xml
-# javax.xml.bind:jaxb-api:2.3.1 -> !!!groupId-not-found!!!
-# POM: pom.xml
-# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/pdfbox-${PV}/${PN}"
-
-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=(
-	# 1) initializationError(org.apache.xmpbox.parser.PropMappingTest)
-	# org.junit.runners.model.InvalidTestClassError: Invalid test class 'org.apache.xmpbox.parser.PropMappingTest':
-	#   1. No runnable methods
-	org.apache.xmpbox.parser.PropMappingTest
-)
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}