Adding metadata

17 files changed, 333 insertions, 613 deletions

diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 33f7b1515575..4ac30465bd11 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,2 +1 @@
 DIST batik-src-1.14.tar.gz 17647867 BLAKE2B 9385e77e739ece921012310a53953a6e258a5d748987e85dd20783ca248ae55619db6472b7590a45fe40a1b51c693478a37a7dbe1a958b42392c525e5f228815 SHA512 689c52f58f8f0456c89bd18745d2d92e7590b9054bea71b96be87d44977057d583e78504cbf14afc3e0c585d2383dac3009c7c421de868c847db045e921da8fb
-DIST batik-src-1.9.tar.gz 16748072 BLAKE2B 4e23c0de3d56ba130c5bc9ef80a01549e8c11ab4db3b1ac5dae8525cf0a3a8b7f4df3161c12f1f0df9c74229aaf2034fb6c9c2f91b7fc7407a0af580d144e606 SHA512 96a5c16bd3d61ea33ed5013fd0b00f1724470d9b667f0f84ef4a29dcaaa19b1cc8ffcc92dc49767f4e29d77a47f99df5afca479336ac5619778b51a6fb6cd952
diff --git a/dev-java/batik/batik-1.9.ebuild b/dev-java/batik/batik-1.9.ebuild
deleted file mode 100644
index 2e905bf8073d..000000000000
--- a/dev-java/batik/batik-1.9.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2 java-ant-2 epatch
-
-DESCRIPTION="Java based SVG toolkit"
-HOMEPAGE="https://xmlgraphics.apache.org/batik/"
-SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/source/${PN}-src-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.9"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc python tcl"
-
-CDEPEND="
-	tcl? ( dev-java/jacl:0 )
-	python? ( dev-java/jython:2.7 )
-	dev-java/xalan:0
-	dev-java/rhino:1.6
-	dev-java/ant-core:0
-	dev-java/xmlgraphics-commons:2
-	dev-java/xml-commons-external:1.3"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_GENTOO_CLASSPATH="
-	xml-commons-external-1.3
-	xmlgraphics-commons-2
-	rhino-1.6
-	xalan"
-
-src_prepare() {
-	default
-
-	# See bug 318323.
-	local file
-	for file in build.xml contrib/rasterizertask/build.xml; do
-		java-ant_xml-rewrite -f ${file} -c -e javadoc -a failonerror -v no -a maxmemory -v 512m
-	done
-
-	# See bug 628812.
-	use tcl && epatch "${FILESDIR}/${P}-ImportInfo.patch"
-
-	cd lib || die
-	rm -v *.jar build/*.jar || die
-	use python && java-pkg_jar-from jython-2.7
-	use tcl && java-pkg_jar-from jacl
-}
-
-src_compile() {
-	# Fails to build on amd64 without this
-	export ANT_OPTS="-Xmx256m"
-	use amd64 && export ANT_OPTS="-Xmx1g"
-
-	eant jars all-jar $(use_doc)
-	cd contrib/rasterizertask || die
-	eant -Dgentoo.classpath="$(java-pkg_getjar ant-core ant.jar):../../classes" jar $(use_doc)
-}
-
-src_install() {
-	batik_unversion_jars() {
-		local jar
-		for jar in batik-*.jar; do
-			newj="${jar%-*}.jar"
-			java-pkg_newjar ${jar} ${newj}
-		done
-	}
-
-	# First unversion jars in ${P}/lib
-	cd "${S}/${P}/lib" || die
-	batik_unversion_jars
-
-	# Then, only those in ${P}
-	cd "${S}/${P}" || die
-	batik_unversion_jars
-
-	# Proceed with documentation installation
-	cd "${S}" || die
-	dodoc README CHANGES
-	use doc && java-pkg_dojavadoc "${P}/docs/javadoc"
-
-	# See bug #116976.
-	java-pkg_dolauncher "batik-${SLOT}" \
-		--pwd "${EPREFIX}/usr/share/${PN}-${SLOT}/" \
-		--main org.apache.batik.apps.svgbrowser.Main
-
-	# To find these lsjar batik-${SLOT} | grep Main.class
-	local launcher
-	for launcher in ttf2svg slideshow svgpp rasterizer; do
-		java-pkg_dolauncher batik-${launcher}-${SLOT} \
-			--main org.apache.batik.apps.${launcher}.Main
-	done
-
-	# Install and register the ant task.
-	java-pkg_dojar contrib/rasterizertask/build/lib/RasterizerTask.jar
-	java-pkg_register-ant-task
-}
diff --git a/dev-java/batik/files/batik-1.9-ImportInfo.patch b/dev-java/batik/files/batik-1.9-ImportInfo.patch
deleted file mode 100644
index 103b99e1b967..000000000000
--- a/dev-java/batik/files/batik-1.9-ImportInfo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/batik-script/src/main/java/org/apache/batik/script/jacl/JaclInterpreterFactory.java	2017-10-28 17:24:11.401276868 +0000
-+++ b/batik-script/src/main/java/org/apache/batik/script/jacl/JaclInterpreterFactory.java	2017-10-28 17:27:13.314255999 +0000
-@@ -20,6 +20,7 @@
- 
- import java.net.URL;
- 
-+import org.apache.batik.script.ImportInfo;
- import org.apache.batik.script.Interpreter;
- import org.apache.batik.script.InterpreterFactory;
- 
diff --git a/dev-java/fontbox/Manifest b/dev-java/fontbox/Manifest
index 8da187270c9b..dcc7f67ef612 100644
--- a/dev-java/fontbox/Manifest
+++ b/dev-java/fontbox/Manifest
@@ -1,5 +1,4 @@
 DIST DejaVuSansMono.ttf 317336 BLAKE2B c80f50cea451963a75c66160596b67655afb19c9ea0d61b8a5cd38b81c66bdd89a24872d293fa8752b1ce0bb828d63caf91e682c283312d5828218943c63c095 SHA512 1af1ce3e6d34a0b89c93072d8646e92cceb45b276389d2dd0d84457ec1193394d2bcc49bf3ce99c9c6b2658cd1337fc40ee5c61957f74cd45dbc3d51b6aef417
 DIST NotoEmoji-Regular.ttf 418804 BLAKE2B e94f7b1d5bced052ff3f15a32ecce8f0f1dc2ef19565d3bcaa75b82676fbf0efeaa6efa1d25edf352b577acce17a45c6f0e7be1550c46a8c2ab6cef208cd6f11 SHA512 51b01ab0794be9f92c59679f6d56d4ce09ed959daeb9ec945bb837eb15a82ab302e83b29aab1972ac9cb648f7196a5f5ff4488a4622b36bedbc9cd0cab6dc3de
 DIST SourceSansProBold.otf 104072 BLAKE2B 2c6538ed97cca04a6a38a1bcca7def6c9e923f0e7a773c2715d50ca1a526b1ff683bc6544155b1e170fb828c3923d6b22cdf7017f9da9de164523f328c1cc187 SHA512 28a044a2685fbc8da7810d9ac7b6b93a95542d504d7d8e671f009b8ebb2f5b70c974be7ea78974b188d8e6ab17d65b08f276c054927857315d5aad26f6fe36fc
-DIST fontbox-1.7.1.zip 9167805 BLAKE2B f9e02d1540eaf7e4bb748906e56887494d81eecc88685fa9d758cb50712a530528573f4a7e5f816b4ff57d664a416b35444517d840c9b37239ec1e2b5a62b5a1 SHA512 8b2af3d8f431626c106e4f6e9e1d59d14abcd58cfdc9553f20c5057eef9f9cfbd0287e14e58e4d34472ad81198eb3f4d0a2fd6e88bd1fa5cbcf01e4befbf77d0
 DIST pdfbox-2.0.24-src.zip 15651754 BLAKE2B 5d0220c28c2be18a66aa66c2540d3e1d85ecc6826f632e6c9a0193f2f02dca645909b0a54c707d856bb2886d52b0b5fb706503b4f89f0eb7aede8e612bebfa8e SHA512 5d55b3cadbbae266d90c47f5b10c9b09b6dc16f53b77a0cf15c78e62fc69afc7b6eab5a4329608ecdf25de9194b38db1f7d23e7d71af473cc1bf7b09b0028642
diff --git a/dev-java/fontbox/files/fontbox-1.7.1-build.xml b/dev-java/fontbox/files/fontbox-1.7.1-build.xml
deleted file mode 100644
index ccde1983d680..000000000000
--- a/dev-java/fontbox/files/fontbox-1.7.1-build.xml
+++ /dev/null
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 8/2/12 1:39 PM                        -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="fontbox-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="fontbox-1.7.1"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath"/>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/junit/junit/4.8.1/junit-4.8.1.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             source="1.5" 
-             linksource="false" 
-             breakiterator="false">
-      <link href="http://download.oracle.com/javase/1.5.0/docs/api/"/>
-    </javadoc>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html">
-    </jar>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/4.8.1"/>
-    <get src="http://repository.apache.org/snapshots/junit/junit/4.8.1/junit-4.8.1.jar" 
-         dest="${maven.repo.local}/junit/junit/4.8.1/junit-4.8.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.8.1/junit-4.8.1.jar" 
-         dest="${maven.repo.local}/junit/junit/4.8.1/junit-4.8.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
diff --git a/dev-java/fontbox/fontbox-1.7.1-r1.ebuild b/dev-java/fontbox/fontbox-1.7.1-r1.ebuild
deleted file mode 100644
index d2cd213f9ef4..000000000000
--- a/dev-java/fontbox/fontbox-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="pdfbox"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="An open source Java library for parsing font files"
-HOMEPAGE="https://pdfbox.apache.org/"
-SRC_URI="https://archive.apache.org/dist/pdfbox/${PV}/${MY_P}-src.zip -> ${P}.zip"
-
-LICENSE="BSD"
-SLOT="1.7"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~x64-macos"
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/ant-junit:0
-		dev-java/junit:4
-	)"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-
-src_prepare() {
-	default
-	cp -v "${FILESDIR}/${P}-build.xml" build.xml || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/org
-}
diff --git a/dev-java/fontbox/fontbox-1.7.1-r2.ebuild b/dev-java/fontbox/fontbox-1.7.1-r2.ebuild
deleted file mode 100644
index 6125efbc8ddb..000000000000
--- a/dev-java/fontbox/fontbox-1.7.1-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="pdfbox"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="An open source Java library for parsing font files"
-HOMEPAGE="https://pdfbox.apache.org/"
-SRC_URI="https://archive.apache.org/dist/pdfbox/${PV}/${MY_P}-src.zip -> ${P}.zip"
-
-LICENSE="BSD"
-SLOT="1.7"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86 ~x64-macos"
-
-RDEPEND="
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/ant-junit:0
-		dev-java/junit:4
-	)"
-
-BDEPEND="
-	app-arch/unzip"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-
-src_prepare() {
-	default
-	cp -v "${FILESDIR}/${P}-build.xml" build.xml || die
-}
-
-src_test() {
-	# junit.framework.AssertionFailedError:
-	# No tests found in org.apache.fontbox.cff.Type1CharStringTest
-	rm src/test/java/org/apache/fontbox/cff/Type1CharStringTest.java || die
-
-	# junit.framework.AssertionFailedError:
-	# No tests found in org.apache.fontbox.cff.Type1FontUtilTest
-	rm src/test/java/org/apache/fontbox/cff/Type1FontUtilTest.java || die
-
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/org
-}
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index 27bd73277440..0cbe07fc9d42 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1,3 +1,2 @@
-DIST fop-2.0-src.zip 26381859 BLAKE2B 8500de6a23e93c14fdb4f27c59bafba27a64e6aaffb7a761f16de5bd523e2fdb83593ab53a66de79bf7b7d6c2b887ab97a34accb18be416b26448753babe2395 SHA512 428793303fcf143cffaecadc22cfdb8a065bad0108cceebcabc479d92dbe9834b4f81fd27f3e0314546d848e1960b2fe1a9d443999d8f336f7e87fce771beb7a
 DIST fop-2.7-jars.tar.xz 7348 BLAKE2B 79a5b4f1948bbc9628e571a9873494e2d2088d7a90296e81e03cafa6ecd8f9d1c8dd6779d15c47a0e110304aa07e706c56412e3766a84e0a66c8224fdd92f61c SHA512 71c39cbb20416dc29beb8628ae8bac2a663c0b0d1f0418a241f3795a2d5e01159572c210b5a2d2eff8274247dc3631980de50fea4f94182ddde095d0e5e605c6
 DIST fop-2.7-src.tar.gz 26799877 BLAKE2B 00bcbd4cc915aad67c0dac54e85b7c5d10576115a0a8a16517846af249137c73b10c8b0ff161c9957f7c49686eefbf9777dc452b038573c996e29cbad951176a SHA512 bffbc0a97db8bbc826cf9af89fbf4a7e6f705585ea4915c0954df57c6d7af50d323387bb4bb9e2d13047826352d9eb7cbf4f23d5146ce246965b4c531e015633
diff --git a/dev-java/fop/files/headless-launcher.bash b/dev-java/fop/files/headless-launcher.bash
deleted file mode 100644
index a01c56f5e6ef..000000000000
--- a/dev-java/fop/files/headless-launcher.bash
+++ /dev/null
@@ -1 +0,0 @@
-[[ "${!#}" = "-awt" ]] || gjl_java_args="-Djava.awt.headless=true"
diff --git a/dev-java/fop/fop-2.0-r3.ebuild b/dev-java/fop/fop-2.0-r3.ebuild
deleted file mode 100644
index 6265183f67ad..000000000000
--- a/dev-java/fop/fop-2.0-r3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: if 'doc' use flag is used then should build also extra docs ('docs' ant target), currently it cannot
-#       be built as it needs forrest which we do not have
-# TODO: package and use optional dependency jeuclid
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
-HOMEPAGE="https://xmlgraphics.apache.org/fop/"
-SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-# Tests are broken even in 2.0
-RESTRICT="test"
-
-CDEPEND="
-	dev-java/batik:1.9
-	dev-java/ant-core:0
-	dev-java/fontbox:1.7
-	dev-java/commons-io:1
-	dev-java/commons-logging:0
-	java-virtuals/servlet-api:3.0
-	dev-java/avalon-framework:4.2
-	dev-java/xmlgraphics-commons:2
-	dev-java/xml-commons-external:1.3
-	dev-java/qdox:1.12"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-#	test? (
-#		dev-java/ant-junit:0
-#		dev-java/junit:4
-#		dev-java/xmlunit:1
-#		dev-java/mockito:0
-#	)"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_GENTOO_CLASSPATH="
-	ant-core
-	batik-1.9
-	fontbox-1.7
-	commons-io-1
-	commons-logging
-	servlet-api-3.0
-	avalon-framework-4.2
-	xmlgraphics-commons-2
-	xml-commons-external-1.3
-"
-
-TARGETS=(
-	resourcegen
-	jar-hyphenation
-	jar-sandbox
-	jar-main
-)
-
-java_prepare() {
-	find "${S}"/lib -type f | xargs rm -v
-}
-
-src_compile() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=554386
-	# http://wiki.apache.org/xmlgraphics-fop/HowTo/BuildFOPAlternatively
-	java-pkg_jar-from --into lib qdox-1.12 qdox.jar
-	java-pkg_jar-from --into lib xmlgraphics-commons-2 xmlgraphics-commons.jar
-	java-pkg_jar-from --into lib commons-logging commons-logging.jar
-	java-pkg_jar-from --into lib commons-io-1 commons-io.jar
-	java-pkg_jar-from --into lib fontbox-1.7 fontbox.jar
-	java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis-ext.jar
-	java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis.jar
-	java-pkg_jar-from --into lib avalon-framework-4.2 avalon-framework.jar
-	java-pkg_jar-from --virtual --into lib servlet-api-3.0 servlet-api.jar
-
-	for target in ${TARGETS[@]}; do
-		EANT_BUILD_TARGET="${target}" \
-			java-pkg-2_src_compile
-	done
-
-	if use doc; then
-		sed -i -e 's/failonerror=\"true\"/failonerror=\"false\"/;' ./build.xml
-		EANT_BUILD_TARGET="javadocs" \
-			java-pkg-2_src_compile
-	fi
-}
-
-src_install() {
-	java-pkg_dojar \
-		build/${PN}.jar \
-		build/${PN}-sandbox.jar \
-		build/${PN}-hyph.jar
-
-	java-pkg_dolauncher \
-		${PN} --main org.apache.fop.cli.Main \
-		-pre "${FILESDIR}/headless-launcher.bash"
-
-	dodoc NOTICE README
-
-	if use doc; then
-		java-pkg_dojavadoc \
-			build/javadocs
-	fi
-
-	if use examples; then
-		java-pkg_doexamples \
-			examples/* conf
-	fi
-
-	if use source; then
-		java-pkg_dosrc \
-			src/java/org \
-			src/sandbox/org
-	fi
-}
diff --git a/dev-java/gnu-jaf/gnu-jaf-1.1.2-r1.ebuild b/dev-java/gnu-jaf/gnu-jaf-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..6c4ef7d1e74d
--- /dev/null
+++ b/dev-java/gnu-jaf/gnu-jaf-1.1.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="GNU implementation of the JavaBeans Activation Framework"
+HOMEPAGE="https://www.gnu.org/software/classpathx/jaf/jaf.html"
+SRC_URI="mirror://gnu/classpathx/activation-${PV}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="1"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/activation-${PV}"
+
+EANT_BUILD_TARGET="activation.jar"
+
+src_install() {
+	java-pkg_dojar activation.jar
+	einstalldocs
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc source/*
+}
diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild
new file mode 100644
index 000000000000..bfedce9fba1b
--- /dev/null
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT="3ca862d8626096770598a3a256886d205246f4a4"
+JAVA_PKG_IUSE="examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="The JavaHelp system online help system"
+HOMEPAGE="https://javaee.github.io/javahelp/"
+SRC_URI="https://github.com/javaee/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+CDEPEND="java-virtuals/servlet-api:2.4"
+
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+
+DEPEND="virtual/jdk:1.8
+	${CDEPEND}"
+
+JAVA_PKG_NV_DEPEND="virtual/jdk:1.8"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+_eant() {
+	local \
+		servlet_jar=$(java-pkg_getjar --virtual servlet-api-2.4 servlet-api.jar) \
+		jsp_jar=$(java-pkg_getjar --virtual servlet-api-2.4 jsp-api.jar)
+
+	eant \
+		-f javahelp_nbproject/build.xml \
+		-Dfile.reference.servlet-api.jar="${servlet_jar}" \
+		-Dfile.reference.jsp-api.jar="${jsp_jar}" \
+		-Dservlet-jar="${servlet_jar}" \
+		-Djsp-jar="${jsp_jar}" \
+		-Dservlet-jar-present=true \
+		-Djsp-jar-present=true \
+		-Dtomcat-zip-present=true \
+		${@}
+}
+
+src_compile() {
+	_eant release
+}
+
+#Does not actually run anything
+#src_test() {
+#	_eant test
+#}
+
+src_install() {
+	java-pkg_dojar javahelp_nbproject/dist/lib/*.jar
+
+	java-pkg_dolauncher jhsearch \
+		--main com.sun.java.help.search.QueryEngine
+	java-pkg_dolauncher jhindexer \
+		--main com.sun.java.help.search.Indexer
+
+	use source && java-pkg_dosrc \
+		jhMaster/JSearch/*/com \
+		jhMaster/JavaHelp/src/*/{javax,com}
+
+	use examples && java-pkg_doexamples jhMaster/JavaHelp/demos
+}
diff --git a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r2.ebuild b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r2.ebuild
new file mode 100644
index 000000000000..be9fe048e586
--- /dev/null
+++ b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="OSGi Enterprise Release 5 Companion Code"
+HOMEPAGE="https://www.osgi.org/Main/HomePage"
+SRC_URI="https://docs.osgi.org/download/r5/osgi.enterprise-${PV}.jar"
+
+LICENSE="Apache-2.0 OSGi-Specification-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RESTRICT="bindist"
+
+CP_DEPEND="dev-java/glassfish-persistence:0
+	dev-java/osgi-core-api:0
+	dev-java/tomcat-servlet-api:2.5"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+JAVA_SRC_DIR="OSGI-OPT/src"
+
+src_prepare() {
+	default
+	rm -r org || die
+}
diff --git a/dev-java/reflections/reflections-0.9.12-r1.ebuild b/dev-java/reflections/reflections-0.9.12-r1.ebuild
new file mode 100644
index 000000000000..e2783101dc9a
--- /dev/null
+++ b/dev-java/reflections/reflections-0.9.12-r1.ebuild
@@ -0,0 +1,99 @@
+# 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://github.com/ronmamo/reflections/archive/0.9.12.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild reflections-0.9.12.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.reflections:reflections:0.9.12"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Reflections - a Java runtime metadata analysis"
+HOMEPAGE="https://github.com/ronmamo/reflections"
+SRC_URI="https://github.com/ronmamo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="WTFPL-2 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# com.google.code.gson:gson:2.8.6 -> >=dev-java/gson-2.8.8:2.6
+# org.dom4j:dom4j:2.1.1 -> >=dev-java/dom4j-2.1.3:1
+# org.javassist:javassist:3.26.0-GA -> !!!suitable-mavenVersion-not-found!!!
+# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
+# org.slf4j:slf4j-simple:1.7.24 -> >=dev-java/slf4j-simple-1.7.30:0
+
+CP_DEPEND="
+	dev-java/dom4j:1
+	dev-java/gson:2.6
+	dev-java/javassist:3
+	dev-java/slf4j-api:0
+	dev-java/slf4j-simple:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# javax.servlet:servlet-api:2.5 -> java-virtuals/servlet-api:2.5
+# POM: pom.xml
+# test? junit:junit:4.13 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="
+	dev-java/tomcat-servlet-api:2.5
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_CLASSPATH_EXTRA="tomcat-servlet-api-2.5"
+JAVA_SRC_DIR=( "src/main/java" )
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR=( "src/test/java" )
+JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" )
+JAVA_TEST_EXCLUDES=(
+	# Upstream does not run this test
+	"org.reflections.TestModel"
+	# 1) testMethodParameterNames(org.reflections.ReflectionsCollectTest)
+	# org.reflections.ReflectionsException: Scanner MethodParameterNamesScanner was not configured
+	#         at org.reflections.Store.get(Store.java:39)
+	#         at org.reflections.Store.get(Store.java:61)
+	#         at org.reflections.Store.get(Store.java:46)
+	#         at org.reflections.Reflections.getMethodParamNames(Reflections.java:579)
+	#         at org.reflections.ReflectionsTest.testMethodParameterNames(ReflectionsTest.java:239)
+	org.reflections.ReflectionsCollectTest
+	# 2) testMethodParameterNames(org.reflections.ReflectionsParallelTest)
+	# org.reflections.ReflectionsException: Scanner MethodParameterNamesScanner was not configured
+	#         at org.reflections.Store.get(Store.java:39)
+	#         at org.reflections.Store.get(Store.java:61)
+	#         at org.reflections.Store.get(Store.java:46)
+	#         at org.reflections.Reflections.getMethodParamNames(Reflections.java:579)
+	#         at org.reflections.ReflectionsTest.testMethodParameterNames(ReflectionsTest.java:239)
+	org.reflections.ReflectionsParallelTest
+	# 3) testMethodParameterNames(org.reflections.ReflectionsTest)
+	# org.reflections.ReflectionsException: Scanner MethodParameterNamesScanner was not configured
+	#         at org.reflections.Store.get(Store.java:39)
+	#         at org.reflections.Store.get(Store.java:61)
+	#         at org.reflections.Store.get(Store.java:46)
+	#         at org.reflections.Reflections.getMethodParamNames(Reflections.java:579)
+	#         at org.reflections.ReflectionsTest.testMethodParameterNames(ReflectionsTest.java:239)
+	org.reflections.ReflectionsTest
+	#
+	# https://github.com/ronmamo/reflections/issues/277#issuecomment-927152981
+	# scanner was not configured exception - this is a known issue in 0.9.12, a simple workaround is to
+	# check if the getStore() contains index for the scanner before querying. next version 0.10 fixes this.
+)
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r3.ebuild b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r3.ebuild
new file mode 100644
index 000000000000..5886aafc3e3f
--- /dev/null
+++ b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+MY_PN="relaxngDatatype"
+MY_P="${MY_PN}-${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Interface between RELAX NG validators and datatype libraries"
+HOMEPAGE="https://relaxng.org/"
+SRC_URI="mirror://sourceforge/relaxng/${MY_P}.zip -> ${P}.zip"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+LICENSE="BSD"
+SLOT="0"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	einstalldocs
+}
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index f0ae34d1ef9e..8e8e960e5e21 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1 +1,2 @@
 DIST tomcat-native-1.2.32-src.tar.gz 429747 BLAKE2B 48fd1d93866cd4c4e610d54a65b429a31be27a90507bf28c547c2127218896646b385eb9741af3eba46d2dd3534b998352c7ab655dbb02dd8a646127e5bfaad3 SHA512 97587fdec8f12550003db44ae41cb864a16c08fc9362ca4c709b8090ead178d4f9d841436699b29496004b412a097ed5f56655f4fddfc5f4b6e333cbf890423e
+DIST tomcat-native-1.2.33-src.tar.gz 430359 BLAKE2B 2253907b5e3e0121ad520e1a5938cd8ceea55bd1403d320d382b959a0885c7e9374afb2b1828714d2f028dc0bfe6b6010d493e1e1b6d45942b4d27321d79614b SHA512 b9ffe0ecfd14482ed8c752caf2c28d880ab5fca1f5ea1d5b2a8330d26a14266406bdecda714644603ba2d4ca78c22ec5fc2341afd09172d073f21cf5a1099a0f
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.33.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.33.ebuild
new file mode 100644
index 000000000000..1d527ab32b16
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.2.33.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/apr:1=
+	dev-libs/openssl:0=
+	>=virtual/jre-1.8:*"
+
+DEPEND=">=virtual/jdk-1.8:*
+	test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${P}-src
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+src_configure() {
+	local myeconfargs=(
+		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
+		--with-ssl="${EPREFIX}"/usr
+	)
+
+	cd native || die
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	eant jar
+
+	cd native || die
+	default
+}
+
+src_install() {
+	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
+
+	cd native || die
+	default
+
+	! use static-libs && find "${D}" -name '*.la' -delete || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+pkg_postinst() {
+	elog "For more information, please visit"
+	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
+}