Adding metadata

12 files changed, 4 insertions, 520 deletions

diff --git a/dev-java/fontbox/Manifest b/dev-java/fontbox/Manifest
index 2537af4ecc13..3336cdec5c6b 100644
--- a/dev-java/fontbox/Manifest
+++ b/dev-java/fontbox/Manifest
@@ -3,5 +3,4 @@ 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.24-src.zip 15651754 BLAKE2B 5d0220c28c2be18a66aa66c2540d3e1d85ecc6826f632e6c9a0193f2f02dca645909b0a54c707d856bb2886d52b0b5fb706503b4f89f0eb7aede8e612bebfa8e SHA512 5d55b3cadbbae266d90c47f5b10c9b09b6dc16f53b77a0cf15c78e62fc69afc7b6eab5a4329608ecdf25de9194b38db1f7d23e7d71af473cc1bf7b09b0028642
 DIST pdfbox-2.0.26-src.zip 15766524 BLAKE2B eafedf1db5a54d36cb42111b736ad79adfcc106630fa4b2bc57873dcfbdbbb7bd0e9408611b0d8771909e719813e388430944ae0fbaf800bdc859595de2b101b SHA512 e14c57e28d10324dbcb6ad239bad5751a2dab0035bbd80427afd03f65467ec1376ddd7d08e7cefd4d950b149f85d8f505f6f50cc3093fd65bb8a2cbb2b8c7c1e
diff --git a/dev-java/fontbox/fontbox-2.0.24.ebuild b/dev-java/fontbox/fontbox-2.0.24.ebuild
deleted file mode 100644
index ee8d0a7099de..000000000000
--- a/dev-java/fontbox/fontbox-2.0.24.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pdfbox-2.0.24/fontbox/pom.xml --download-uri https://downloads.apache.org/pdfbox/2.0.24/pdfbox-2.0.24-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild fontbox-2.0.24.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.pdfbox:fontbox:2.0.24"
-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
-	)"
-
-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
-
-CDEPEND="dev-java/commons-logging:0"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/pdfbox-${PV}/${PN}"
-
-JAVA_GENTOO_CLASSPATH="commons-logging"
-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 || die
-	cp "${DISTDIR}"/DejaVuSansMono.ttf \
-		"${DISTDIR}"/NotoEmoji-Regular.ttf \
-		"${DISTDIR}"/SourceSansProBold.otf \
-		"target/pdfs" || die
-
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0.ebuild b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0.ebuild
index 09cfe30dcac6..796d357d7e17 100644
--- a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0.ebuild
+++ b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0.ebuild
@@ -13,7 +13,7 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Jakarta Mail API 2.1 Specification API"
-HOMEPAGE="https://projects.eclipse.org/projects/ee4j/jakarta.mail-api"
+HOMEPAGE="https://eclipse-ee4j.github.io/mail/"
 SRC_URI="https://github.com/eclipse-ee4j/mail/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
diff --git a/dev-java/janino/janino-3.1.7.ebuild b/dev-java/janino/janino-3.1.7.ebuild
index 9987bc1a7f63..46f3e8c96ec4 100644
--- a/dev-java/janino/janino-3.1.7.ebuild
+++ b/dev-java/janino/janino-3.1.7.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/janino-compiler/janino/archive/v3.1.7.tar.gz -> ${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: ${PN}/pom.xml
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index f1a5bdf79b25..ac1c82fc0e38 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,3 +1,2 @@
 DIST JDOM-2.0.6.1.tar.gz 8368301 BLAKE2B b9d5d8e611b9a0505c9576f2c4a2243eddd8a171bbe44d83440edf44154cae80138ddca8a0bceb3124a6825111d30641a28d645507a1bacad6a8cb9ad1dbccdd SHA512 c09b422b0635a478cb70e57e4c35bc7f505f6a2730be813d6e63c053814581e4dc3fdf431b945394c30ab37a8fb83fd103767f8de84d28bef79e95e2c37518e1
-DIST JDOM-2.0.6.tar.gz 8344114 BLAKE2B 0b9a568fe4de1fb9afc5a547d75aa1d3556bf497c76e3d32d1ebd7658634ea02e4fafa3c6261b64d9b803fc6e78ae013fb8a366bcbd5024e8ab0aced83f58e33 SHA512 d585b39159f0887485b2e681609b51113de6bc7c43627c42d7e81eb06ac65c507b43cf3d81c5df4399b1e3abf454c8852264a84567940bc5ba0c358eb9c0c4a1
 DIST jdom-1.1.3.tar.gz 4233403 BLAKE2B 9e4afacc6f10d2be1d793bd3b9f438f79e8e27f50bcae83eac5054df806c01c211ac493465bcda58ac204e796663ffb8aedf43a177f23c23a69af399243461a0 SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278
diff --git a/dev-java/jdom/files/build-xml-2.patch b/dev-java/jdom/files/build-xml-2.patch
deleted file mode 100644
index 420f9eff1993..000000000000
--- a/dev-java/jdom/files/build-xml-2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/build.xml	2015-02-15 02:58:04.000000000 +0000
-+++ b/build.xml	2015-08-27 23:11:09.807800249 +0100
-@@ -267,7 +267,7 @@
- 		</javac>

- 	</target>

- 	

--	<target name="compile" depends="compile.core, compile.junit, compile.contrib, compile.samples"

-+	<target name="compile" depends="compile.core, compile.contrib, compile.samples"

- 	 		description="Compiles all JDOM code (core, samples, junit, contrib)" />

- 

- 	<!-- =================================================================== -->

-@@ -296,7 +296,7 @@
- 	<!-- =================================================================== -->

- 	<!-- Creates the jars                                           -->

- 	<!-- =================================================================== -->

--	<target name="jars" depends="compile, javadoc"

-+	<target name="jars" depends="compile"

- 	    description="Builds the Jars">

- 		<fixcrlf srcdir="." includes="**/*.bat" excludes="build*.*" eol="crlf"/>

- 		<fixcrlf srcdir="." includes="**/*.sh" excludes="build*.*" eol="lf"/>

-@@ -320,6 +320,7 @@
- 			<fileset dir="${contrib.build}" includes="**/*" />

- 			<fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />

- 		</jar>

-+<!--

- 		<jar jarfile="${package}/${jarbase}-junit.jar" >

- 			<fileset dir="${junit.build}" includes="**/*" />

- 			<fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />

-@@ -332,6 +333,7 @@
- 			<fileset dir="${contrib.src}" includes="**/*" />

- 		</jar>

- 	    	    

-+-->

- 	</target>

- 	

- 	<target name="androidtests" depends="jars">

diff --git a/dev-java/jdom/jdom-2.0.6-r5.ebuild b/dev-java/jdom/jdom-2.0.6-r5.ebuild
deleted file mode 100644
index 772c36da6de7..000000000000
--- a/dev-java/jdom/jdom-2.0.6-r5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="JDOM-${PV}"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="https://github.com/hunterhacker/${PN}/archive/${MY_P}.tar.gz"
-HOMEPAGE="http://www.jdom.org"
-
-LICENSE="Apache-1.1"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-java/iso-relax:0
-	dev-java/jaxen:1.2
-	dev-java/xalan:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*
-	test? ( dev-java/ant-junit:0 )"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="jars"
-EANT_TEST_TARGET="junit"
-EANT_GENTOO_CLASSPATH="iso-relax,jaxen-1.2,xalan"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/build-xml-2.patch"
-)
-
-src_prepare() {
-	default
-	java-pkg_clean
-
-	# Remove Android stuff to avoid junit RDEPEND.
-	rm -vr contrib/src/java/org/jdom2/contrib/android || die
-}
-
-src_install() {
-	java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??.jar ${PN}.jar
-	java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??-contrib.jar ${PN}-contrib.jar
-
-	dodoc {CHANGES,COMMITTERS,README,TODO}.txt
-	use doc && java-pkg_dojavadoc build/apidocs
-	use source && java-pkg_dosrc {contrib,core}/src/java/*
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
diff --git a/dev-java/pdfbox/Manifest b/dev-java/pdfbox/Manifest
index 284815e98a4f..c303072cc510 100644
--- a/dev-java/pdfbox/Manifest
+++ b/dev-java/pdfbox/Manifest
@@ -38,5 +38,4 @@ 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.24-src.zip 15651754 BLAKE2B 5d0220c28c2be18a66aa66c2540d3e1d85ecc6826f632e6c9a0193f2f02dca645909b0a54c707d856bb2886d52b0b5fb706503b4f89f0eb7aede8e612bebfa8e SHA512 5d55b3cadbbae266d90c47f5b10c9b09b6dc16f53b77a0cf15c78e62fc69afc7b6eab5a4329608ecdf25de9194b38db1f7d23e7d71af473cc1bf7b09b0028642
 DIST pdfbox-2.0.26-src.zip 15766524 BLAKE2B eafedf1db5a54d36cb42111b736ad79adfcc106630fa4b2bc57873dcfbdbbb7bd0e9408611b0d8771909e719813e388430944ae0fbaf800bdc859595de2b101b SHA512 e14c57e28d10324dbcb6ad239bad5751a2dab0035bbd80427afd03f65467ec1376ddd7d08e7cefd4d950b149f85d8f505f6f50cc3093fd65bb8a2cbb2b8c7c1e
diff --git a/dev-java/pdfbox/pdfbox-2.0.24.ebuild b/dev-java/pdfbox/pdfbox-2.0.24.ebuild
deleted file mode 100644
index c2ae65ec701b..000000000000
--- a/dev-java/pdfbox/pdfbox-2.0.24.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pdfbox-2.0.24/pdfbox/pom.xml --download-uri https://downloads.apache.org/pdfbox/2.0.24/pdfbox-2.0.24-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild pdfbox-2.0.24.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.pdfbox:pdfbox:2.0.24"
-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
-	)"
-
-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
-
-CDEPEND="
-	dev-java/bcmail:0
-	dev-java/bcprov:0
-	dev-java/commons-logging:0
-	~dev-java/fontbox-${PV}:0
-	tools? (
-		dev-java/java-diff-utils:0
-		dev-java/junit:4
-		dev-java/mockito: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="${CDEPEND}
-	>=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:0
-	)"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-BDEPEND="app-arch/unzip"
-
-DOCS=( {README.md,{LICENSE,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_GENTOO_CLASSPATH="commons-logging,fontbox,bcmail,bcprov"
-JAVA_TEST_GENTOO_CLASSPATH="jai-imageio-core,jai-imageio-jpeg2000,java-diff-utils,jbig2-imageio,junit-4,mockito"
-
-JAVA_TEST_EXCLUDES=(
-	# excluded upstream according to
-	# https://github.com/apache/pdfbox/blob/8876e8e1a0adbf619cef4638cc3cea073e3ca484/pdfbox/pom.xml#L123
-	"org.apache.pdfbox.rendering.TestPDFToImage"
-
-	# 1) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testIsSetDirect (java.lang.InstantiationException
-	# 2) warning(junit.framework.TestSuite$1
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testAccept (java.lang.InstantiationException
-	# 3) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testGetCOSObject (java.lang.InstantiationException
-	"org.apache.pdfbox.cos.TestCOSBase"
-
-	# 4) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testFloatValue (java.lang.InstantiationException
-	# 5) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testGet (java.lang.InstantiationException
-	# 6) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testInvalidNumber (java.lang.InstantiationException
-	# 7) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testLongValue (java.lang.InstantiationException
-	# 8) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testIntValue (java.lang.InstantiationException
-	# 9) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testLargeNumber (java.lang.InstantiationException
-	# 10) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testDoubleValue (java.lang.InstantiationException
-	# 11) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testIsSetDirect (java.lang.InstantiationException
-	# 12) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testAccept (java.lang.InstantiationException
-	# 13) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testGetCOSObject (java.lang.InstantiationException
-	"org.apache.pdfbox.cos.TestCOSNumber"	# Tests run: 10,  Failures: 10
-)
-
-src_prepare() {
-	default
-}
-
-src_compile() {
-	JAVA_SRC_DIR="pdfbox/src/main/java"
-	JAVA_RESOURCE_DIRS="pdfbox/src/main/resources"
-	JAVA_JAR_FILENAME="pdfbox.jar"
-	java-pkg-simple_src_compile
-
-	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
-
-	if use tools; then
-		JAVA_GENTOO_CLASSPATH+=" java-diff-utils,junit-4,mockito"
-		JAVA_SRC_DIR="tools/src/main/java"
-		JAVA_RESOURCE_DIRS=""
-		JAVA_JAR_FILENAME="pdfbox-tools.jar"
-		java-pkg-simple_src_compile
-	fi
-
-	JAVA_SRC_DIR=(
-		"${S}/pdfbox/src/main/java"
-		"${S}/debugger/src/main/java"
-	)
-	if use tools; then
-		JAVA_SRC_DIR+=( "${S}/tools" )
-	fi
-	JAVA_JAR_FILENAME="ignoreme.jar"
-	java-pkg-simple_src_compile
-}
-
-src_test() {
-	JAVA_TEST_SRC_DIR="pdfbox/src/test/java"
-	JAVA_TEST_RESOURCE_DIRS="pdfbox/src/test/resources"
-
-	# There was 1 failure
-	# 1) testIsEmbeddingPermittedMultipleVersions(org.apache.pdfbox.pdmodel.font.TestFontEmbedding)
-	# java.lang.ExceptionInInitializerError
-	# Caused by: java.lang.reflect.InaccessibleObjectException: Unable to make protected final java.lang.Class java.lang.ClassLoader.defineClass(java.lang.String,byte[],int,int,java.security.ProtectionDomain) throws java.lang.ClassFormatError accessible: module java.base does not "opens java.lang" to unnamed module @4dc690f9
-	# FAILURES!!!
-	# Tests run: 586,  Failures: 1
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if [[ "${vm_version}" == "17" ]] ; then
-		JAVA_TEST_EXCLUDES+=( "org.apache.pdfbox.pdmodel.font.TestFontEmbedding" )
-	fi
-
-	# 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 \
-		"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
-		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"
-	java-pkg_dojar "pdfbox-debugger.jar"
-	if use tools; then
-		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" "${S}/debugger" "${S}/tools"
-	fi
-}
diff --git a/dev-java/sbt/sbt-0.13.18-r1.ebuild b/dev-java/sbt/sbt-0.13.18-r1.ebuild
index 13fbc7b910f9..bcdc4ac6bcdc 100644
--- a/dev-java/sbt/sbt-0.13.18-r1.ebuild
+++ b/dev-java/sbt/sbt-0.13.18-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 		https://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/${L_PN}/${PV}/${L_PN}.jar -> ${L_P}.jar
 	)
 	binary? (
-		https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.xz
+		https://dev.gentoo.org/~gienah/distfiles/${P}-gentoo-binary.tar.xz
 	)"
 LICENSE="BSD"
 SLOT="0"
@@ -43,7 +43,7 @@ RESTRICT="test"
 # Note: to bump sbt, some things to try are:
 # 1. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.xz
 # https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.xz and
-# binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.xz )
+# binary? ( https://dev.gentoo.org/~gienah/distfiles/${P}-gentoo-binary.tar.xz )
 # from SRC_URI
 # 2. Comment the sbt publishLocal line in src_compile.
 # 3. try:
diff --git a/dev-java/xmpbox/Manifest b/dev-java/xmpbox/Manifest
index f96e2e2a6f13..e5a2828f13bc 100644
--- a/dev-java/xmpbox/Manifest
+++ b/dev-java/xmpbox/Manifest
@@ -1,2 +1 @@
-DIST pdfbox-2.0.24-src.zip 15651754 BLAKE2B 5d0220c28c2be18a66aa66c2540d3e1d85ecc6826f632e6c9a0193f2f02dca645909b0a54c707d856bb2886d52b0b5fb706503b4f89f0eb7aede8e612bebfa8e SHA512 5d55b3cadbbae266d90c47f5b10c9b09b6dc16f53b77a0cf15c78e62fc69afc7b6eab5a4329608ecdf25de9194b38db1f7d23e7d71af473cc1bf7b09b0028642
 DIST pdfbox-2.0.26-src.zip 15766524 BLAKE2B eafedf1db5a54d36cb42111b736ad79adfcc106630fa4b2bc57873dcfbdbbb7bd0e9408611b0d8771909e719813e388430944ae0fbaf800bdc859595de2b101b SHA512 e14c57e28d10324dbcb6ad239bad5751a2dab0035bbd80427afd03f65467ec1376ddd7d08e7cefd4d950b149f85d8f505f6f50cc3093fd65bb8a2cbb2b8c7c1e
diff --git a/dev-java/xmpbox/xmpbox-2.0.24.ebuild b/dev-java/xmpbox/xmpbox-2.0.24.ebuild
deleted file mode 100644
index f7c6fc51fc26..000000000000
--- a/dev-java/xmpbox/xmpbox-2.0.24.ebuild
+++ /dev/null
@@ -1,64 +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://ftp.halifax.rwth-aachen.de/gentoo/distfiles/cc/pdfbox-2.0.24-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild xmpbox-2.0.24.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.pdfbox:xmpbox:2.0.24"
-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"
-
-DOCS=( README.txt )
-
-S="${WORKDIR}/pdfbox-${PV}/${PN}"
-
-JAVA_CLASSPATH_EXTRA="jaxb-api-2"
-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
-}