Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2021-08-09 13:35:45 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2021-08-09 13:35:45 +0000
commit: 29cff1dd3f6abbe215265ce13dd4ee2882755914 (patch)
tree: b99f16c3e20331af54936d799ff4b77de09a4682 /dev-java
parent: b05c1d3b9a18deef50902333d398cec1968928aa (diff)
download: baldeagleos-repo-29cff1dd3f6abbe215265ce13dd4ee2882755914.tar.gz
baldeagleos-repo-29cff1dd3f6abbe215265ce13dd4ee2882755914.tar.xz
baldeagleos-repo-29cff1dd3f6abbe215265ce13dd4ee2882755914.zip
68 files changed, 206 insertions, 1821 deletions
diff --git a/dev-java/annogen/Manifest b/dev-java/annogen/Manifest
deleted file mode 100644
index f60ebe50d3ab..000000000000
--- a/dev-java/annogen/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST annogen-0.1.0.zip 1008931 BLAKE2B ca0da18f095c0db0aedfca1b83c5df6bc8fd348be3764e9ed182807189e151302f88f10c78c05a44dace66509a5a4d0e532541356758373a76932b8d284101dc SHA512 f5c4eeb92ef8c87874df6619ef701b99dace01bd3ebc87f201ee3ab523fe612b6d143da2646c280d4831bc8e3051887514aa06b8bad6928b68ddd6cd6357fa16
diff --git a/dev-java/annogen/annogen-0.1.0-r3.ebuild b/dev-java/annogen/annogen-0.1.0-r3.ebuild
deleted file mode 100644
index f6d31072bfeb..000000000000
--- a/dev-java/annogen/annogen-0.1.0-r3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A tool which helps you work with JSR175 annotations"
-HOMEPAGE="https://github.com/codehaus/annogen"
-SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
-
-CDEPEND="
-	dev-java/qdox:1.6
-	dev-java/ant-core:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-# com.sun.mirror.declaration was removed from JDK 7 onwards.
-# These two files are just interfaces anyway.
-JAVA_RM_FILES=(
-	org/codehaus/annogen/view/MirrorAnnoViewer.java
-	org/codehaus/annogen/override/MirrorElementIdPool.java
-)
-
-JAVA_GENTOO_CLASSPATH="
-	ant-core
-	qdox-1.6
-"
-
-src_unpack() {
-	default
-	unzip -o -q "${S}/${PN}-src-${PV}.zip" || die
-}
-
-java_prepare() {
-	java-pkg_clean
-	rm -rv examples || die
-}
-
-src_compile() {
-	# Needed for com.sun.* imports
-	JAVA_GENTOO_CLASSPATH_EXTRA="$(java-config -t)" \
-		java-pkg-simple_src_compile
-}
diff --git a/dev-java/annogen/metadata.xml b/dev-java/annogen/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/annogen/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/bcmail/bcmail-1.69.ebuild b/dev-java/bcmail/bcmail-1.69.ebuild
index 26c40175c4ae..ec8117b4c80f 100644
--- a/dev-java/bcmail/bcmail-1.69.ebuild
+++ b/dev-java/bcmail/bcmail-1.69.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/refs/tags/r${PV/./rv}.tar.gz -
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 
 CDEPEND="
 	~dev-java/bcpkix-${PV}:0
diff --git a/dev-java/bcpg/bcpg-1.69.ebuild b/dev-java/bcpg/bcpg-1.69.ebuild
index 6b97042eda53..dc0781dac29c 100644
--- a/dev-java/bcpg/bcpg-1.69.ebuild
+++ b/dev-java/bcpg/bcpg-1.69.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/refs/tags/r${PV/./rv}.tar.gz -
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 
 CDEPEND="~dev-java/bcprov-${PV}:0"
 DEPEND="${CDEPEND}
diff --git a/dev-java/bcpkix/bcpkix-1.69.ebuild b/dev-java/bcpkix/bcpkix-1.69.ebuild
index 461d901edcf5..ef36ded451f8 100644
--- a/dev-java/bcpkix/bcpkix-1.69.ebuild
+++ b/dev-java/bcpkix/bcpkix-1.69.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/refs/tags/r${PV/./rv}.tar.gz -
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 
 CDEPEND="
 	~dev-java/bcprov-${PV}:0
diff --git a/dev-java/bcprov/bcprov-1.69.ebuild b/dev-java/bcprov/bcprov-1.69.ebuild
index c0ba00351a41..4db296a5529d 100644
--- a/dev-java/bcprov/bcprov-1.69.ebuild
+++ b/dev-java/bcprov/bcprov-1.69.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/refs/tags/r${PV/./rv}.tar.gz -
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/bctsp/Manifest b/dev-java/bctsp/Manifest
deleted file mode 100644
index 688d159da2ba..000000000000
--- a/dev-java/bctsp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bctsp-jdk15-145.tar.gz 100494 BLAKE2B 916972fc2c0585b8ff22cfef890a9324391d1723030ce926d1ba041631162fcc800f4e3e43733191c2bb7eb39235a98c99f8a0b59df5b42b771d0a3389fee569 SHA512 8e06598b6286502a6cf908f60b9bcae134dca070869c58e408746470e1f4f80ad8bca8c6f2fe5265fed051b5ddbeb710154ae7bf3a50fff2980c6b562ba6a606
diff --git a/dev-java/bctsp/bctsp-1.45-r1.ebuild b/dev-java/bctsp/bctsp-1.45-r1.ebuild
deleted file mode 100644
index 8bfc4e6882a5..000000000000
--- a/dev-java/bctsp/bctsp-1.45-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15-${PV/./}"
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CDEPEND="dev-java/bcprov:1.45
-	dev-java/bcmail:1.45"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	app-arch/unzip"
-
-S="${WORKDIR}"/${MY_P}
-
-JAVA_GENTOO_CLASSPATH="bcprov-1.45,bcmail-1.45"
-
-src_unpack() {
-	default
-	cd "${S}" || die
-	unpack ./src.zip
-}
-
-java_prepare() {
-	# Remove tests
-	rm -R org/bouncycastle/tsp/test || die
-}
diff --git a/dev-java/bctsp/metadata.xml b/dev-java/bctsp/metadata.xml
deleted file mode 100644
index 4a0d46e7fb40..000000000000
--- a/dev-java/bctsp/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <remote-id type="cpe">cpe:/a:bouncycastle:legion-of-the-bouncy-castle</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/bcutil/bcutil-1.69.ebuild b/dev-java/bcutil/bcutil-1.69.ebuild
index 938f7b0a7f43..761c77e705c4 100644
--- a/dev-java/bcutil/bcutil-1.69.ebuild
+++ b/dev-java/bcutil/bcutil-1.69.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/refs/tags/r${PV/./rv}.tar.gz -
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 
 CDEPEND="~dev-java/bcprov-${PV}:0"
 DEPEND="${CDEPEND}
diff --git a/dev-java/bytelist/Manifest b/dev-java/bytelist/Manifest
deleted file mode 100644
index a7640c923926..000000000000
--- a/dev-java/bytelist/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bytelist-1.0.15-sources.tar.gz 50512 BLAKE2B f17094ac4ef8ea68d48b05589b9fe3b8a90033dbc33992d0ebbcf70851c6877e20dcbe68f2e505e62301346653519833318d2c671bea9d6914d9f017610204f7 SHA512 1575a97229db7a7b99abd4fc74e713f79cd9bca4b7ffa13ba52607d84d5f7af8863c45dfd65dd32e12b03feb659808cf2f07ea494c87ca496061ab00280a40f4
diff --git a/dev-java/bytelist/bytelist-1.0.15.ebuild b/dev-java/bytelist/bytelist-1.0.15.ebuild
deleted file mode 100644
index 8800cb76ac02..000000000000
--- a/dev-java/bytelist/bytelist-1.0.15.ebuild
+++ /dev/null
@@ -1,47 +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 pom.xml --download-uri https://github.com/jruby/bytelist/archive/refs/tags/bytelist-1.0.15.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild bytelist-1.0.15.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.jruby.extras:bytelist:1.0.15"
-JAVA_TESTING_FRAMEWORKS="junit"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Byte array based container"
-HOMEPAGE="https://github.com/jruby/bytelist"
-SRC_URI="https://github.com/jruby/${PN}/archive/refs/tags/${P}.tar.gz -> ${P}-sources.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# org.jruby.jcodings:jcodings:1.0.18 -> >=dev-java/jcodings-1.0.11:1
-
-CDEPEND="
-	>=dev-java/jcodings-1.0.11:1
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CDEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_GENTOO_CLASSPATH="jcodings-1"
-JAVA_SRC_DIR="src"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit"
-JAVA_TEST_SRC_DIR="test"
diff --git a/dev-java/bytelist/metadata.xml b/dev-java/bytelist/metadata.xml
deleted file mode 100644
index e392f528dfb6..000000000000
--- a/dev-java/bytelist/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
- </maintainer>
- <upstream>
-  <bugs-to>https://github.com/jruby/bytelist/issues</bugs-to>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2.ebuild
index d66cea7f3dd0..5b47a111d00e 100644
--- a/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2.ebuild
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> $
 
 LICENSE="EPL-1.0"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jakarta-activation/jakarta-activation-1.2.2.ebuild b/dev-java/jakarta-activation/jakarta-activation-1.2.2.ebuild
index 6c2ae11e3b08..95a7266e4a11 100644
--- a/dev-java/jakarta-activation/jakarta-activation-1.2.2.ebuild
+++ b/dev-java/jakarta-activation/jakarta-activation-1.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> $
 
 LICENSE="EPL-1.0"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 CDEPEND="dev-java/jakarta-activation-api:1"
 DEPEND="${CDEPEND}
diff --git a/dev-java/jcodings/Manifest b/dev-java/jcodings/Manifest
deleted file mode 100644
index 2b0ee9a44154..000000000000
--- a/dev-java/jcodings/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jcodings-1.0.11.tar.gz 123802 BLAKE2B 22cde3714da0f1b9434d630905d9a5a8bcdf7ebcab8de5b03ff12d6b31d6fd256f87680743d96e860cd5af34a0b5e70bb1a326000b5440d9b4c4f8a20d9964ee SHA512 6bff29718ff04fd2f52cff767440d87f3dcb0f4acf71ee7b037241af7ef7533284176f53d08da5b1f37c643b766f4a9113651c994d1893ef302a2056d9ff40f3
-DIST jcodings-1.0.5-git.tar.gz 90788 BLAKE2B f1a72a1879e89c60bbb1537d5a6dd174b9f0a2bb4a3eb80520a2b4f7ddae5da359f11ba220b4f64db0413fd423c31623a0863cedbf62f7efd83ce73952557b35 SHA512 a0122eea18077daefdcf38ec9e6f12b000c558837835fe900f6e0c282fdfcf95dbb10652b4cfeb32e556ae8ebe1aec8c10e4a352cdb565837b2f16335140f8e3
-DIST jcodings-1.0.55.tar.gz 1390865 BLAKE2B 8c10c489f5c64ce0b394f7efa43cf996aa630e90d88329d4955d43c5e41666f665d8ea922b34477b545040417cc2003aacc75b45410f84176b3ee9e4087126e7 SHA512 c450b3df49ff39a974e1ce8eea1adcd8febb0f4d7b8a1b0b69e7f2bb97b365729c282600a04666b03821fc8d1b3df77e75f1611dbed997f6651e6ec481658874
diff --git a/dev-java/jcodings/files/maven-build.xml b/dev-java/jcodings/files/maven-build.xml
deleted file mode 100644
index c09847a4fa00..000000000000
--- a/dev-java/jcodings/files/maven-build.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="jcodings-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="jcodings"/>
-  <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"/>
-  <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="test"/>
-  <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/3.8.1/junit-3.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}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases"/>
-
-  <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" 
-             linksource="false" 
-             breakiterator="false"/>
-  </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" 
-         manifest="MANIFEST.MF" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </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">
-  </target>
-
-</project>
diff --git a/dev-java/jcodings/jcodings-1.0.11-r1.ebuild b/dev-java/jcodings/jcodings-1.0.11-r1.ebuild
deleted file mode 100644
index 16aeaf0589a1..000000000000
--- a/dev-java/jcodings/jcodings-1.0.11-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Byte-based encoding support library for Java"
-HOMEPAGE="https://github.com/codehaus"
-SRC_URI="https://github.com/jruby/${PN}/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*
-	test? (
-		dev-java/ant-junit:0
-		>=dev-java/junit-4.8:4
-	)"
-
-S="${WORKDIR}/${PN}-${PN}-${PV}"
-
-src_prepare() {
-	default
-	cp "${FILESDIR}"/maven-build.xml build.xml || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/jcodings/jcodings-1.0.5-r1.ebuild b/dev-java/jcodings/jcodings-1.0.5-r1.ebuild
deleted file mode 100644
index 813a91f20367..000000000000
--- a/dev-java/jcodings/jcodings-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Byte-based encoding support library for Java"
-HOMEPAGE="https://github.com/codehaus"
-SRC_URI="https://github.com/jruby/${PN}/archive/${PV}.tar.gz -> ${P}-git.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-
-src_unpack() {
-	default
-	mv jruby-${PN}-* ${P} || die
-}
-
-src_prepare() {
-	default
-	cp "${FILESDIR}"/maven-build.xml build.xml || die
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/jcodings/jcodings-1.0.55.ebuild b/dev-java/jcodings/jcodings-1.0.55.ebuild
deleted file mode 100644
index a85095ee47b2..000000000000
--- a/dev-java/jcodings/jcodings-1.0.55.ebuild
+++ /dev/null
@@ -1,37 +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 pom.xml --download-uri https://github.com/jruby/jcodings/archive/refs/tags/jcodings-1.0.55.tar.gz --slot 1 --keywords "~amd64 ~x86" --ebuild jcodings-1.0.55.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.jruby.jcodings:jcodings:1.0.55"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Byte based encoding support library for java"
-HOMEPAGE="https://github.com/jruby/jcodings"
-SRC_URI="https://github.com/jruby/${PN}/archive/refs/tags/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	>=virtual/jdk-11:*
-"
-
-RDEPEND="
-	>=virtual/jre-11:*
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_SRC_DIR="src"
-JAVA_RESOURCE_DIRS="resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="test"
diff --git a/dev-java/jcodings/metadata.xml b/dev-java/jcodings/metadata.xml
deleted file mode 100644
index 24b20e7402bf..000000000000
--- a/dev-java/jcodings/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <bugs-to>https://github.com/jruby/jcodings/issues</bugs-to>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/jgoodies-looks/Manifest b/dev-java/jgoodies-looks/Manifest
index 85fb7177b8f0..e3e9f620dc2d 100644
--- a/dev-java/jgoodies-looks/Manifest
+++ b/dev-java/jgoodies-looks/Manifest
@@ -1,3 +1,2 @@
 DIST jgoodies-looks-2_6_0.zip 2444893 BLAKE2B 97d00131cf07f609141c97e4fd3e6b3c93f67dc879eb0ad99469c602e7e30b0d78dc4bd59202db1a3a503dec6c92ea061a176ef11e6c5f4fc26a86c697cf961f SHA512 1c33413379f391109d1db35bdf301acf0cc6d66bf8aa1026280015946bddb230b4cc1d233b700d46a519fb02c169df4670c874058f5e636e1e924a9d3a42442a
-DIST looks-1_2_2.zip 1811849 BLAKE2B 47dd516b5523b655757c08ba108b58e7b1e2e113ae4d0e90649db88c4353b66810f9a7b3cc810fe7bdbd5e9c1ad2a32d4b504665d3ffa2917f7a46647f444d09 SHA512 d9c5f0590a44dbc7d778a9da135361f5753eca4d47bef3636f21aa0d014df86dbad90031b5289928b99c352147ea702948028b18b36eb3bc44aef800326fb302
 DIST looks-2_3_1.zip 2105839 BLAKE2B 590412d7ed00d68a3fd8f8e5402802ca69039f2619e542619de787c6e9b4b2019096e87b7809e3b1f5a7d72963da3657fae7e465a245ef1ab0a5630219a968ed SHA512 61278cc0b8556ce19cfb5bdaaab2b42d7035fcdf71d614a8d3673629d5b04c5698e2be521df3e0518e781f78c03a8d3f466f1fdfba525f679e9de7409faf1088
diff --git a/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.ebuild
deleted file mode 100644
index 4dee649843f9..000000000000
--- a/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source examples"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="looks"
-MY_PV="${PV//./_}"
-
-DESCRIPTION="JGoodies Looks Library"
-HOMEPAGE="http://www.jgoodies.com/"
-SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}-${MY_PV}.zip"
-
-LICENSE="BSD"
-SLOT="1.2"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-DEPEND="
-	>=virtual/jdk-1.5
-	app-arch/unzip"
-
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-EANT_DOC_TARGET="javadoc"
-
-java_prepare() {
-	java-pkg_clean
-
-	cp "${FILESDIR}/${P}-build.xml" "${S}"/build.xml || die
-	cp "${FILESDIR}/${P}-plastic.txt" "${S}"/plastic.txt || die
-
-	unzip ${MY_PN}-${PV}-src.zip || die
-}
-
-src_install() {
-	java-pkg_dojar "${MY_PN}.jar"
-
-	dodoc RELEASE-NOTES.txt
-	use source && java-pkg_dosrc com
-	use doc && java-pkg_dohtml -r build/doc
-	use examples && java-pkg_doexamples src/examples
-}
diff --git a/dev-java/jibx-tools/Manifest b/dev-java/jibx-tools/Manifest
deleted file mode 100644
index dcfe103fc7b6..000000000000
--- a/dev-java/jibx-tools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jibx_1_1_5.zip 6788994 BLAKE2B 0b579e6eb9f6037c92dce3acbec4e9fd5a6aec179cb0f4ecf935ff0bbfb525c4c317d79d21683c3ea6136256b69f5aa9250851802c8eaccf14f3dff9f5ad8aa6 SHA512 13c3a43a53746e9146d1240d73d1948b3c03ead55aa0e79158c2700a385b0dfba0e31122efd11446c1a46c2b3f85235035dc198c6b3acf2fcefa88b2a0683cc7
diff --git a/dev-java/jibx-tools/files/1.1.5-build.patch b/dev-java/jibx-tools/files/1.1.5-build.patch
deleted file mode 100644
index 7e2354c2cbde..000000000000
--- a/dev-java/jibx-tools/files/1.1.5-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- build/src/org/jibx/binding/SchemaGenerator.java	2007-05-23 21:31:14.000000000 +0300
-+++ build/src/org/jibx/binding/SchemaGenerator.java	2008-02-21 23:14:06.000000000 +0200
-@@ -178,7 +178,7 @@
-         m_classLocator = new IClassLocator() {
-             public IClass getClassInfo(String name) {
-                 try {
--                    return new ClassWrapper(ClassCache.getClassFile(name));
-+                    return new ClassWrapper(m_classLocator, ClassCache.getClassFile(name));
-                 } catch (JiBXException e) {
-                     throw new IllegalStateException("Class not found " + name);
-                 }
-@@ -382,7 +382,7 @@
-             
-             // check for reference to a mapped class
-             StructureElement structure = (StructureElement)comp;
--            TemplateElementBase templ = structure.getMapAsMapping();
-+            TemplateElementBase templ = structure.getEffectiveMapping();
-             if (! (templ instanceof MappingElement)) {
-                 
-                 // unknown content, leave it to user to fill in details
diff --git a/dev-java/jibx-tools/jibx-tools-1.1.5-r2.ebuild b/dev-java/jibx-tools/jibx-tools-1.1.5-r2.ebuild
deleted file mode 100644
index dd75ab9faf44..000000000000
--- a/dev-java/jibx-tools/jibx-tools-1.1.5-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2 versionator
-
-MY_PV=$(replace_all_version_separators '_')
-
-DESCRIPTION="JiBX: Binding XML to Java Code - Generators"
-HOMEPAGE="http://jibx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/jibx/jibx_${MY_PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="dev-java/bcel:0
-	java-virtuals/stax-api:0
-	dev-java/jibx:0"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-S="${WORKDIR}/jibx"
-
-java_prepare() {
-	# http://jira.codehaus.org/browse/JIBX-207
-	epatch "${FILESDIR}/1.1.5-build.patch"
-
-	java-ant_rewrite-classpath "${S}/build/build.xml"
-
-	rm -v "${S}"/lib/*.jar || die
-}
-
-EANT_FILTER_COMPILER="ecj-3.3"
-EANT_BUILD_XML="build/build.xml"
-EANT_BUILD_TARGET="jar-tools"
-EANT_GENTOO_CLASSPATH="bcel,stax-api,jibx"
-
-src_install() {
-	java-pkg_register-dependency jibx
-
-	java-pkg_dojar "${S}/lib"/jibx-*.jar
-	use source && java-pkg_dosrc "${S}"/build/src/* "${S}"/build/extras/*
-}
diff --git a/dev-java/jibx-tools/jibx-tools-1.1.5-r3.ebuild b/dev-java/jibx-tools/jibx-tools-1.1.5-r3.ebuild
deleted file mode 100644
index c60763f4676e..000000000000
--- a/dev-java/jibx-tools/jibx-tools-1.1.5-r3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2 versionator
-
-MY_PV=$(replace_all_version_separators '_')
-
-DESCRIPTION="JiBX: Binding XML to Java Code - Generators"
-HOMEPAGE="http://jibx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/jibx/jibx_${MY_PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="dev-java/bcel:0
-	dev-java/jibx:0"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-S="${WORKDIR}/jibx"
-
-java_prepare() {
-	# http://jira.codehaus.org/browse/JIBX-207
-	epatch "${FILESDIR}/1.1.5-build.patch"
-
-	java-ant_rewrite-classpath "${S}/build/build.xml"
-
-	rm -v "${S}"/lib/*.jar || die
-}
-
-EANT_FILTER_COMPILER="ecj-3.3"
-EANT_BUILD_XML="build/build.xml"
-EANT_BUILD_TARGET="jar-tools"
-EANT_GENTOO_CLASSPATH="bcel,jibx"
-
-src_install() {
-	java-pkg_register-dependency jibx
-
-	java-pkg_dojar "${S}/lib"/jibx-*.jar
-	use source && java-pkg_dosrc "${S}"/build/src/* "${S}"/build/extras/*
-}
diff --git a/dev-java/jibx-tools/metadata.xml b/dev-java/jibx-tools/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/jibx-tools/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/joni/Manifest b/dev-java/joni/Manifest
deleted file mode 100644
index 940c22ce389c..000000000000
--- a/dev-java/joni/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST joni-2.1.0.tar.gz 125084 BLAKE2B 4f5fa651f2a2c898b29c311f8bdabe10ded3dc86ededbdf35d703a08618e2dcc57e34a9ab928f0f69e4f47d59a287e138dcf2ec7d2bb71e1152637f174f5fa8e SHA512 dd40b3a857deb02848d4a87de010ec6b9c96fb962643ea1022833a1bb5ebd76ffac403ff2a54497df288998939ed81910c22c02a2df1f7290112bb2ea506db0e
-DIST joni-2.1.41.tar.gz 178366 BLAKE2B a83b9df9fb481a8b1650f9542bd88028d638042946c68a03add8f64449136b655ca0425e488487803f48f8bb1a9101d5d1531350ba534fa081fb9e61cb3795f7 SHA512 6306a871b1d34cf6bb838220ad0cf4824d75a055412740848d02a89ce3198fb7a0d909838a31e33d85f504cc43fa26ee73d9665b4cf81481226c19f5186dab53
diff --git a/dev-java/joni/joni-2.1.0-r1.ebuild b/dev-java/joni/joni-2.1.0-r1.ebuild
deleted file mode 100644
index cf7f00117692..000000000000
--- a/dev-java/joni/joni-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java port of the Oniguruma regular expression engine"
-HOMEPAGE="https://github.com/codehaus"
-SRC_URI="https://github.com/jruby/${PN}/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2.1"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-CDEPEND="dev-java/asm:9
-	dev-java/jcodings:1"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*"
-
-S="${WORKDIR}/${PN}-${PN}-${PV}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="build"
-EANT_GENTOO_CLASSPATH="asm-9 jcodings-1"
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/joni/joni-2.1.41.ebuild b/dev-java/joni/joni-2.1.41.ebuild
deleted file mode 100644
index 65d03d06022a..000000000000
--- a/dev-java/joni/joni-2.1.41.ebuild
+++ /dev/null
@@ -1,46 +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 pom.xml --download-uri https://github.com/jruby/joni/archive/refs/tags/joni-2.1.41.tar.gz --slot 2.1 --keywords "~amd64 ~ppc64 ~x86" --ebuild joni-2.1.41.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.jruby.joni:joni:2.1.41"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java port of the Oniguruma regular expression engine"
-HOMEPAGE="https://github.com/jruby/joni"
-SRC_URI="https://github.com/jruby/${PN}/archive/refs/tags/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2.1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-# Common dependencies
-# POM: pom.xml
-# org.jruby.jcodings:jcodings:1.0.55 -> >=dev-java/jcodings-1.0.55:1
-
-CDEPEND="
-	dev-java/jcodings:1
-"
-
-DEPEND="
-	>=virtual/jdk-11:*
-	${CDEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-11:*
-	${CDEPEND}"
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_GENTOO_CLASSPATH="jcodings-1"
-JAVA_SRC_DIR="src"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="test"
diff --git a/dev-java/joni/metadata.xml b/dev-java/joni/metadata.xml
deleted file mode 100644
index 9b0349720dba..000000000000
--- a/dev-java/joni/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <bugs-to>https://github.com/jruby/joni/issues</bugs-to>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/jsr173/Manifest b/dev-java/jsr173/Manifest
deleted file mode 100644
index c6dc5ebf90b1..000000000000
--- a/dev-java/jsr173/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jsr173-1.0.jar 639734 BLAKE2B f34caff27d216303d14050c78c3a4413685e843b9a5aacb228c38c57c50a009b691bff889ebc970097f998ba93b3a0737256c3b8a19f9df3529d238b43f71538 SHA512 8b299532716682772e5eeafb63a5dd125dec8954a9a284f6766bac05409fff611724ae1a9b6f4f6f303b64c12b19e394371a6b0a87132b36e88f94e20b69efe4
diff --git a/dev-java/jsr173/jsr173-1.0-r4.ebuild b/dev-java/jsr173/jsr173-1.0-r4.ebuild
deleted file mode 100644
index d9fb07247d0c..000000000000
--- a/dev-java/jsr173/jsr173-1.0-r4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Yet another Java library for parsing and writing XML"
-HOMEPAGE="http://dev2dev.bea.com/xml/stax.html"
-SRC_URI="mirror://gentoo/${P}.jar"
-
-LICENSE="bea.ri.jsr173"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}"
-
-DOCS=( README.txt jsr173_1.0.pdf )
-
-src_unpack() {
-	cd "${S}" || die
-	jar xvf "${DISTDIR}/${A}" || die "failed to unpack"
-	jar xvf "${P//-/_}_src.jar" || die "failed to unpack"
-}
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use doc && einstalldocs
-}
diff --git a/dev-java/jsr173/metadata.xml b/dev-java/jsr173/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/jsr173/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/jvyamlb/Manifest b/dev-java/jvyamlb/Manifest
deleted file mode 100644
index 83024eaa4112..000000000000
--- a/dev-java/jvyamlb/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jvyamlb-0.2.5.tar.gz 526052 BLAKE2B 8b55748eb4e9b03b1e5ca78fd41145456d1329a3edb0a7d02c6b5e37a15c4a25e93cae9337ee9aeedb6611ee87ba09157e00ef4a55ed4a8202f8282e287b56dc SHA512 28d707255ca7447ad00f29bf1215e28fa485557e76795c47cbf309a5b1b97ba4c901ddc7b1507d06301b4f544bfc437c4926f457516832f953aff6b29b01b711
diff --git a/dev-java/jvyamlb/jvyamlb-0.2.5-r2.ebuild b/dev-java/jvyamlb/jvyamlb-0.2.5-r2.ebuild
deleted file mode 100644
index d0f8d8558026..000000000000
--- a/dev-java/jvyamlb/jvyamlb-0.2.5-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JvYAMLb, YAML processor extracted from JRuby"
-HOMEPAGE="https://github.com/olabini/jvyamlb"
-SRC_URI="https://github.com/olabini/jvyamlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-CDEPEND="
-	dev-java/bytelist:0
-	dev-java/jcodings:1
-	dev-java/joda-time:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*
-	test? ( dev-java/ant-junit )"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="bytelist jcodings-1 joda-time"
-
-DOCS=( CREDITS README )
-
-src_prepare() {
-	default
-
-	java-pkg_clean
-
-	sed -i 's:depends="test":depends="compile":' build.xml || die
-}
-
-src_install() {
-	einstalldocs
-	java-pkg_newjar lib/${P}.jar
-	use source && java-pkg_dosrc src/*
-}
-
-src_test() {
-	ANT_TASKS="ant-junit" eant test
-}
diff --git a/dev-java/jvyamlb/metadata.xml b/dev-java/jvyamlb/metadata.xml
deleted file mode 100644
index a63267abaf71..000000000000
--- a/dev-java/jvyamlb/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/squareness-jlf/Manifest b/dev-java/squareness-jlf/Manifest
deleted file mode 100644
index 16c24b77ef73..000000000000
--- a/dev-java/squareness-jlf/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST squareness_jlf_src-2.3.0.zip 67307 BLAKE2B c7719eae69fd710e0f30fc2f4cee025a56c846bbc78631a390292730bb82d2b753bc24a367e5568e5ddec0f7444a3903fda9e4d09a5e0d57a46561ed713bdf74 SHA512 9c3d1de6f682968b2e2db37afdaa571f53857897415df04489ecac1c545ddc0a8342df94c658797979a6024e6e69bbc9a8828029ec428248848c933c9f901a71
diff --git a/dev-java/squareness-jlf/files/build.xml b/dev-java/squareness-jlf/files/build.xml
deleted file mode 100644
index d4d7fdc7cf1a..000000000000
--- a/dev-java/squareness-jlf/files/build.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<project name="squareness-jlf" default="jar">
-	<target name="compile">
-		<mkdir dir="build"/>
-		<javac srcdir="." destdir="build" classpath="${gentoo.classpath}">
-		</javac>
-	</target>
-
-	<target name="jar" depends="compile">
-		<jar destfile="squareness-jlf.jar" basedir="build"/>
-	</target>
-
-	<target name="javadoc" depends="compile">
-		<mkdir dir="docs"/>
-		<javadoc sourcepath="." destdir="docs" classpath="${gentoo.classpath}"/>
-	</target>
-
-</project>
diff --git a/dev-java/squareness-jlf/metadata.xml b/dev-java/squareness-jlf/metadata.xml
deleted file mode 100644
index a63267abaf71..000000000000
--- a/dev-java/squareness-jlf/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/squareness-jlf/squareness-jlf-2.3.0-r1.ebuild b/dev-java/squareness-jlf/squareness-jlf-2.3.0-r1.ebuild
deleted file mode 100644
index de776af3a056..000000000000
--- a/dev-java/squareness-jlf/squareness-jlf-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Squareness Java Look and Feel"
-HOMEPAGE="http://squareness.beeger.net/"
-SRC_URI="mirror://sourceforge/squareness/${PN/-/_}_src-${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="${JAVA_PKG_IUSE}"
-
-S="${WORKDIR}"
-
-RDEPEND=">=virtual/jre-1.4
-	dev-java/laf-plugin:0"
-
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.4
-	dev-java/laf-plugin:0"
-
-EANT_GENTOO_CLASSPATH="laf-plugin"
-
-java_prepare() {
-	cp "${FILESDIR}"/build.xml build.xml || die
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-
-	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc net
-}
diff --git a/dev-java/sun-jimi/Manifest b/dev-java/sun-jimi/Manifest
deleted file mode 100644
index e3e08403373f..000000000000
--- a/dev-java/sun-jimi/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jimi1_0.zip 3880977 BLAKE2B b286cdc725cad2037d19bb188145ca0cd0799993011a8f22aa671e8807afd96dd3a9f3035a82dff9823ccba503e711db6b2ef377fc039c7050fc105655114ce6 SHA512 28ae3b3044910fca80dbdf23fee5f0d050df64ef48a09c41a836f3ff78365258c747f69a958579abda68d6d6f1c6b6a3ea5e960d36f2199afdb06258a25173d5
diff --git a/dev-java/sun-jimi/metadata.xml b/dev-java/sun-jimi/metadata.xml
deleted file mode 100644
index 2a9f4c2edd88..000000000000
--- a/dev-java/sun-jimi/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <longdescription>
-
-Jimi is a class library for managing images. Its primary function is image I/O.
-Jimi was formerly a product of Activated Intelligence. Sun is making it
-available for developers who have code with dependencies on Jimi or for those
-who need image I/O functionality in applications running under 1.1.x versions of
-the Java Platform.
-
-</longdescription>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/sun-jimi/sun-jimi-1.0-r3.ebuild b/dev-java/sun-jimi/sun-jimi-1.0-r3.ebuild
deleted file mode 100644
index 23519e269b4d..000000000000
--- a/dev-java/sun-jimi/sun-jimi-1.0-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2
-
-DESCRIPTION="Jimi is a class library for managing images"
-HOMEPAGE="http://www.oracle.com/technetwork/java/index.html"
-SRC_URI="jimi1_0.zip"
-
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.3"
-DEPEND=">=virtual/jdk-1.3
-	app-arch/unzip"
-
-RESTRICT="bindist fetch"
-
-S=${WORKDIR}/Jimi
-
-pkg_nofetch() {
-	local download_url="http://www.oracle.com/technetwork/java/javasebusiness/downloads/java-archive-downloads-java-client-419417.html#7259-jimi_sdk-1.0-oth-JPR"
-	einfo "Please download ${A} from the following url and place it into your"
-	einfo "DISTDIR directory:"
-	einfo "${download_url} "
-}
-
-java_prepare() {
-	rm -r src/classes/* || die
-}
-
-src_compile() {
-	cd "${S}/src"
-	ejavac -classpath . -d classes $(cat main_classes.txt) || die "failes to	compile"
-	jar -cf ${PN}.jar -C classes . || die "failed to create jar"
-}
-
-src_install() {
-	java-pkg_dojar src/${PN}.jar
-
-	dodoc Readme
-	use doc && java-pkg_dohtml -r docs/*
-}
diff --git a/dev-java/swt/swt-4.10-r1.ebuild b/dev-java/swt/swt-4.10-r1.ebuild
deleted file mode 100644
index cf11ea7c5ebc..000000000000
--- a/dev-java/swt/swt-4.10-r1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
-
-MY_PV="${PV/_rc/RC}"
-MY_DMF="http://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201812060815"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="GTK based SWT Library"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="
-	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
-	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )"
-
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-SLOT="4.10"
-KEYWORDS="amd64 ~ppc64"
-IUSE="cairo opengl webkit"
-
-COMMON_DEP="
-	>=dev-libs/atk-1.10.2
-	>=dev-libs/glib-2.32
-	>=x11-libs/gtk+-2.6.8:2
-	x11-libs/libXtst
-	cairo? ( >=x11-libs/cairo-1.4.14 )
-	opengl?	(
-		virtual/glu
-		virtual/opengl
-	)
-	webkit? (
-		net-libs/webkit-gtk:4
-	)"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.8:*
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/libXtst-1.1.0"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.8:*"
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}"
-
-# JNI libraries don't need SONAME, bug #253756
-QA_SONAME='usr/lib[^/]*/libswt-[^/]+.so'
-
-PATCHES=(
-	"${FILESDIR}"/${P}-as-needed-and-flag-fixes.patch
-)
-
-src_unpack() {
-	local DISTFILE=${A}
-	unzip -jq "${DISTDIR}"/${DISTFILE} swt.jar src.zip || die "Unable to extract distfile"
-	unpack "./src.zip"
-
-	# Cleanup the redirtied directory structure
-	rm -rf about_files/ || die
-}
-
-src_prepare() {
-	# Replace the build.xml to allow compilation without Eclipse tasks
-	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
-	mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
-
-	# Apply patches
-	default
-
-	# Define missing g_thread_supported() to be already started.
-	sed -i '1s/^/#define g_thread_supported() 1\n\n/' "${S}"/os_custom.h || die
-
-	# Webext is also in the library directory
-	sed -i 's|findResource([^,]\+|findResource("swt"|' \
-		"${S}"/src/org/eclipse/swt/browser/WebKit.java || die
-}
-
-src_compile() {
-	append-cflags -fcommon # https://bugs.gentoo.org/707838
-
-	# Drop jikes support as it seems to be unfriendly with SWT
-	java-pkg_filter-compiler jikes
-
-	local AWT_ARCH
-	local JAWTSO="libjawt.so"
-	if [[ $(tc-arch) == 'ppc64' ]] ; then
-		# no big-endian support
-		AWT_ARCH="ppc64le"
-	else
-		AWT_ARCH="amd64"
-	fi
-	if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
-		export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
-	elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
-		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
-	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
-		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
-	elif [[ -f "${JAVA_HOME}/lib/${JAWTSO}" ]] ; then
-		export AWT_LIB_PATH="${JAVA_HOME}/lib"
-	else
-		eerror "${JAWTSO} not found in the JDK being used for compilation!"
-		die "cannot build AWT library"
-	fi
-
-	# Fix the pointer size for AMD64
-	export SWT_PTR_CFLAGS=-DJNI64
-
-	# Bug #461784, g_thread_init is deprecated since glib-2.32.
-	append-cflags -DNO__1g_1thread_1init
-
-	local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
-
-	einfo "Building AWT library"
-	${make} make_awt AWT_LIBS="-L\$(AWT_LIB_PATH) -Wl,-rpath,\$(AWT_LIB_PATH) -ljawt \`pkg-config --libs x11\`"
-
-	einfo "Building SWT library"
-	${make} make_swt
-
-	einfo "Building JAVA-AT-SPI bridge"
-	${make} make_atk
-
-	if use cairo ; then
-		einfo "Building CAIRO support"
-		${make} make_cairo
-	fi
-
-	if use opengl ; then
-		einfo "Building OpenGL component"
-		${make} make_glx
-	fi
-
-	if use webkit ; then
-		einfo "Building WebKit component"
-		${make} make_webkit make_webkit2extension
-	fi
-
-	einfo "Building JNI libraries"
-	eant compile
-
-	einfo "Copying missing files"
-	cp -i "${S}/version.txt" "${S}/build/version.txt" || die
-	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
-		"${S}/build/org/eclipse/swt/internal/" || die
-	unzip swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d build || die
-
-	einfo "Packing JNI libraries"
-	eant jar
-}
-
-src_install() {
-	local swtArch=${ARCH}
-	use amd64 && swtArch=x86_64
-
-	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
-	remove_from_manifest() {
-		local subpkg=$1
-		sed -i -e "/ org.eclipse.swt.internal.$subpkg; x-internal:=true,/d" "MANIFEST_TMP.MF" || die
-	}
-	use cairo || remove_from_manifest cairo
-	use opengl || remove_from_manifest opengl.glx
-	use webkit || remove_from_manifest webkit
-	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
-
-	java-pkg_sointo "/usr/$(get_libdir)/swt"
-	java-pkg_doso *.so
-
-	dodoc about.html
-}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 029209946a37..0946000063f8 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,3 +1,4 @@
+DIST apache-tomcat-10.0.10-src.tar.gz 6032784 BLAKE2B f73d2b0d549d773a13a8adcc76a87713f0f146d80bca2d2ba633ce3145d69505fb7172eac0f04bb6d10fd9f9abb0cbbca7fb6d5b4608e2f6f07df88e5e661d70 SHA512 6241a62d01dcbf37e4745803c77dfbc4307d43c884e8e4c78c33b10d45a9b42e0103ef94acaff19790fa4876bdb369e9aca4974a4dae2622cedfa56b3fbe0658
 DIST apache-tomcat-10.0.8-src.tar.gz 6010420 BLAKE2B 86390f04147d3082fbc9f15704121cbd6aa8ba756b4bc03e64a49aae3dca96c6b503949da0096f8ddf143bdeb1320b7601008683ce94bdad9ef235e1f73ad948 SHA512 c264be4cb29d87c95918d2723ab20bc7e2cb5149cb366cca348c6cd311b0f38ac500ed6b4756b20245a446ead50e7208f77093d6081563ed76d6691abfcbe14c
 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
@@ -6,3 +7,4 @@ DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a88
 DIST apache-tomcat-8.5.68-src.tar.gz 5907026 BLAKE2B 2312edb94f98ee98b594325fbc32521776e9cadc4422a3a46f3651f1fee072a99c5f6874378ac06215396504d34ad750edd6ec3399a3931554068195a8ee15ef SHA512 579a35f944ead756995d288b66ea8a4ab30289a90c32aa01119abcea85a8524f6594ce5cb7ac9df6d352c1e3b54a18c814b5d3a6409dce6a43614e3a89284066
 DIST apache-tomcat-8.5.69-src.tar.gz 5916996 BLAKE2B 4a3ef958b6bb0089149877c25baaa2c1a0bcee473c0942b419c5c1d7071dcae4f8a6e6f1805efdee1201042feedc64e213fffbcdb35cf2b7f9a67217b8dcad48 SHA512 467dd38bd77d8b5ac6fa2acf9f6ee71d04467a3182647757fa47f5d1d9576c96e5061db61ba08b04318f1db9ee4f2bcac7b45f1f9f4f81cd1807a57483dd7bbb
 DIST apache-tomcat-9.0.50-src.tar.gz 6086608 BLAKE2B 59b5eb1616d377193f330fd8c5abb6e98926ab0a2f75b1ea14251d249837aad733f55a0b79f2a67de57f612dd1afdeae53836be97e81701d8dc27ecb0a381d4a SHA512 1032d2d5c342fb495b76426fdc301e0e5546815e709e604061d7aa2cdab19bcd376adc957fd25dee1d574306186eafd2e9d24140dd5e725b130128592cac47a2
+DIST apache-tomcat-9.0.52-src.tar.gz 6110883 BLAKE2B 8d2d4e3640fdc43a3b20d9722a73a8756de7ad71b2f05e8b2090bc712811cfcf6f8e79eeded039291b9306d1c49aec46fe8c7e347aab10384ca293894984ab27 SHA512 8b1817c171fa49e5568fb24a72b6b7533c5eb3ddd6d232b78e67186574f70bb311bbef9a58af047caa14bdae57c27c6a3df721c4583072740fec0a3863bb068d
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.10.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.10.ebuild
new file mode 100644
index 000000000000..fb739b89bf7a
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.10.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_A="apache-${PN}-${PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="5.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${MY_P}/"
+
+JAVA_TEST_SRC_DIR="src/test"
+
+SERVLET_API_JAR="servlet-api.jar"
+SERVLET_API_SRC="src/main/servlet-api"
+SERVLET_API_RESOURCES="src/resources/servlet-api"
+EL_API_JAR="el-api.jar"
+EL_API_SRC="src/main/el-api"
+EL_API_RESOURCES="src/resources/el-api"
+JSP_API_JAR="jsp-api.jar"
+JSP_API_SRC="src/main/jsp-api"
+JSP_API_RESOURCES="src/resources/jsp-api"
+
+src_prepare() {
+	default
+
+	# The sources and also resources are mixed together so we first give it a structure to make it easier to compile and package
+	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
+		${EL_API_SRC} ${EL_API_RESOURCES} \
+		${JSP_API_SRC}/jakarta/servlet ${JSP_API_RESOURCES} \
+		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
+
+	pushd java || die "Failed to cd to java dir"
+
+	cp --parents -R jakarta/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
+	mv "${S}/${SERVLET_API_SRC}/jakarta/servlet/jsp" "${S}/${JSP_API_SRC}/jakarta/servlet" || die "Failed to copy jsp-api sources"
+	cp --parents -R jakarta/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
+
+	popd
+
+	for file in $(find src -type f | grep -vE "\.java$"); do
+		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
+		mkdir -p ${target_dir} || die "Failed to create resource directory"
+		mv $file ${target_dir} || die "Failed to move resource file"
+	done
+
+	mv test/jakarta ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.52.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.52.ebuild
new file mode 100644
index 000000000000..4a8d22d12869
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.52.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_A="apache-${PN}-${PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${MY_P}/"
+
+JAVA_TEST_SRC_DIR="src/test"
+
+SERVLET_API_JAR="servlet-api.jar"
+SERVLET_API_SRC="src/main/servlet-api"
+SERVLET_API_RESOURCES="src/resources/servlet-api"
+EL_API_JAR="el-api.jar"
+EL_API_SRC="src/main/el-api"
+EL_API_RESOURCES="src/resources/el-api"
+JSP_API_JAR="jsp-api.jar"
+JSP_API_SRC="src/main/jsp-api"
+JSP_API_RESOURCES="src/resources/jsp-api"
+
+src_prepare() {
+	default
+
+	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
+
+	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
+		${EL_API_SRC} ${EL_API_RESOURCES} \
+		${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
+		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
+
+	pushd java || die "Failed to cd to java dir"
+
+	cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
+	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
+	cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
+
+	popd
+
+	for file in $(find src -type f | grep -vE "\.java$"); do
+		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
+		mkdir -p ${target_dir} || die "Failed to create resource directory"
+		mv $file ${target_dir} || die "Failed to move resource file"
+	done
+
+	mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/werken-xpath/Manifest b/dev-java/werken-xpath/Manifest
deleted file mode 100644
index 523701f12852..000000000000
--- a/dev-java/werken-xpath/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST werken.xpath-0.9.4-beta-src.tar.gz 1652916 BLAKE2B 4dde7f4be8c4cf401d1edb69b96d6ffffd4c3d53c75194db04a7351ee0ffd90d94bc59855d14dd45162cd2f4b29b02b373ecb4f7a00bf267ed58e2c1e7aece33 SHA512 c58878ee0b6e88651335e2be60d0afcd65fc164864e826bb209ec660e97315233b25341733a4118ed3ee003f61998d84e480706bda5be4630c599efb616b845d
diff --git a/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-gentoo.patch b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-gentoo.patch
deleted file mode 100644
index 1cd61fc818ad..000000000000
--- a/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-gentoo.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ru werken.xpath/build.xml werken.xpath-patched/build.xml
---- werken.xpath/build.xml	2000-11-19 21:45:16.000000000 -0500
-+++ werken.xpath-patched/build.xml	2005-07-14 21:14:01.000000000 -0400
-@@ -49,6 +49,9 @@
-     <!-- JDK1.1 collections -->
-     <property name="coll.import" value="com.sun.java.util.collections"/>
-     <available classname="${coll.import}.Collection" property="coll.present"/>
-+	<path id="lib.classpath">
-+		<fileset dir="${lib.dir}" includes="**/*.jar"/>
-+	</path>
-   </target>
- 
-   <!-- =================================================================== -->
-@@ -174,7 +177,8 @@
-     <javac srcdir="${build.src}"
-            destdir="${build.dest}"
-            debug="${debug}"
--           optimize="${optimize}">
-+           optimize="${optimize}"
-+		   classpathref="lib.classpath">
-     </javac>
-   </target>
- 
-diff -ru werken.xpath/src/com/werken/xpath/Test.java werken.xpath-patched/src/com/werken/xpath/Test.java
---- werken.xpath/src/com/werken/xpath/Test.java	2000-10-23 23:45:32.000000000 -0400
-+++ werken.xpath-patched/src/com/werken/xpath/Test.java	2005-07-14 21:22:42.000000000 -0400
-@@ -57,7 +57,7 @@
-       System.err.println("Results :: " + results);
- 
-     }
--    catch (JDOMException jde)
-+    catch (Exception jde)
-     {
-       jde.printStackTrace(System.err);
-     }
diff --git a/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jdom-1.0.patch b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jdom-1.0.patch
deleted file mode 100644
index 099f7110a5da..000000000000
--- a/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jdom-1.0.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- werken.xpath/src/com/werken/xpath/ElementNamespaceContext.java
-+++ werken.xpath/src/com/werken/xpath/ElementNamespaceContext.java
-@@ -62,12 +62,12 @@
- 
-       lineage.push(_element);
- 
--      Element elem = _element.getParent();
-+      Element elem = _element.getParentElement();
- 
-       while (elem != null)
-       {
-         lineage.push(elem);
--        elem = elem.getParent();
-+        elem = elem.getParentElement();
-       }
- 
-       List      nsList = null;
---- werken.xpath/src/com/werken/xpath/impl/ParentStep.java
-+++ werken.xpath/src/com/werken/xpath/impl/ParentStep.java
-@@ -28,7 +28,7 @@
-   {
-     if ( node instanceof Element )
-     {
--      return ((Element)node).getParent();
-+      return ((Element)node).getParentElement();
-     }
- 
-     return null;
-@@ -50,7 +50,7 @@
- 
-       if ( each instanceof Element )
-       {
--        parent = ((Element)each).getParent();
-+        parent = ((Element)each).getParentElement();
- 
-         if (parent != null)
-         {
---- werken.xpath/src/com/werken/xpath/util/Partition.java
-+++ werken.xpath/src/com/werken/xpath/util/Partition.java
-@@ -67,7 +67,7 @@
- 
-   public static List followingSiblings(Element node)
-   {
--    Element parent = node.getParent();
-+    Element parent = node.getParentElement();
- 
-     if (parent == null)
-     {
-@@ -95,7 +95,7 @@
- 
-   public static List preceedingSiblings(Element node)
-   {
--    Element parent = node.getParent();
-+    Element parent = node.getParentElement();
- 
-     if (parent == null)
-     {
-@@ -137,7 +137,7 @@
-       results.addAll( Partition.descendants( each ) );
-     }
- 
--    Element parent = node.getParent();
-+    Element parent = node.getParentElement();
- 
-     if (parent != null)
-     {
-@@ -170,7 +170,7 @@
-       results.addAll( Partition.descendants( each ) );
-     }
- 
--    Element parent = node.getParent();
-+    Element parent = node.getParentElement();
- 
-     if (parent != null)
-     {
---- werken.xpath/test/src/com/werken/xpath/test/Driver.java
-+++ werken.xpath/test/src/com/werken/xpath/test/Driver.java
-@@ -47,7 +47,7 @@
- 
-         System.out.println("Using test-cases in [" + args[0] + "]");
- 
--        File dataDir = driverXML.getParentFile();
-+        File dataDir = driverXML.getParentElementFile();
- 
-         Driver driver = Driver(dataDir,
-                                    driverXML);
diff --git a/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-compile.patch b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-compile.patch
deleted file mode 100644
index 516158f63083..000000000000
--- a/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-compile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nru werken.xpath.orig/src/com/werken/xpath/impl/Op.java werken.xpath/src/com/werken/xpath/impl/Op.java
---- werken.xpath.orig/src/com/werken/xpath/impl/Op.java	2000-08-27 03:16:03.000000000 +0300
-+++ werken.xpath/src/com/werken/xpath/impl/Op.java	2003-03-02 01:44:52.000000000 +0200
-@@ -19,7 +19,7 @@
-   public final static Op GT        = new Op(">");
-   public final static Op LT_EQUAL  = new Op("<=");
-   public final static Op GT_EQUAL  = new Op(">=");
--  public final static Op MOD       = new Op("%");;
-+  public final static Op MOD       = new Op("%");
-   public final static Op DIV       = new Op("/");
-   public final static Op PLUS      = new Op("+");
-   public final static Op MINUS     = new Op("-");
-diff -Nru werken.xpath.orig/src/com/werken/xpath/impl/UnAbbrStep.java werken.xpath/src/com/werken/xpath/impl/UnAbbrStep.java
---- werken.xpath.orig/src/com/werken/xpath/impl/UnAbbrStep.java	2000-10-31 22:20:56.000000000 +0200
-+++ werken.xpath/src/com/werken/xpath/impl/UnAbbrStep.java	2003-03-02 01:45:04.000000000 +0200
-@@ -175,7 +175,7 @@
-       }
-     }
- 
--    return aggregateResults;;
-+    return aggregateResults;
-   }
- 
-   private List applyPredicates(List nodeSet,
diff --git a/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-jdom.patch b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-jdom.patch
deleted file mode 100644
index ba2b268f1c89..000000000000
--- a/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-jdom.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -Nru werken.xpath.orig/src/com/werken/xpath/function/StringFunction.java werken.xpath/src/com/werken/xpath/function/StringFunction.java
---- werken.xpath.orig/src/com/werken/xpath/function/StringFunction.java	2000-10-24 06:30:00.000000000 +0300
-+++ werken.xpath/src/com/werken/xpath/function/StringFunction.java	2003-03-02 01:56:03.000000000 +0200
-@@ -71,7 +71,7 @@
- 
-   public static String evaluate(Element elem)
-   {
--    List content = elem.getMixedContent();
-+    List content = elem.getContent();
- 
-     Iterator contentIter = content.iterator();
-     Object each = null;
-diff -Nru werken.xpath.orig/src/com/werken/xpath/impl/NodeTypeStep.java werken.xpath/src/com/werken/xpath/impl/NodeTypeStep.java
---- werken.xpath.orig/src/com/werken/xpath/impl/NodeTypeStep.java	2000-10-26 04:09:41.000000000 +0300
-+++ werken.xpath/src/com/werken/xpath/impl/NodeTypeStep.java	2003-03-02 01:56:03.000000000 +0200
-@@ -84,16 +84,16 @@
-     {
-       if ( isAbsolute() )
-       {
--        results.addAll(  applyToNodes( ((Element)node).getDocument().getMixedContent() ) );
-+        results.addAll(  applyToNodes( ((Element)node).getDocument().getContent() ) );
-       }
-       else
-       {
--        results.addAll( applyToNodes( ((Element)node).getMixedContent() ) );
-+        results.addAll( applyToNodes( ((Element)node).getContent() ) );
-       }
-     }
-     else if ( node instanceof Document )
-     {
--      results.addAll( applyToNodes( ((Document)node).getMixedContent() ) );
-+      results.addAll( applyToNodes( ((Document)node).getContent() ) );
-     }
- 
-     return results;
-diff -Nru werken.xpath.orig/src/com/werken/xpath/impl/UnAbbrStep.java werken.xpath/src/com/werken/xpath/impl/UnAbbrStep.java
---- werken.xpath.orig/src/com/werken/xpath/impl/UnAbbrStep.java	2000-10-31 22:20:56.000000000 +0200
-+++ werken.xpath/src/com/werken/xpath/impl/UnAbbrStep.java	2003-03-02 01:56:03.000000000 +0200
-@@ -227,7 +227,7 @@
- 
-     if ( node instanceof Element )
-     {
--      List children = ((Element)node).getMixedContent();
-+      List children = ((Element)node).getContent();
-       
-       results.addAll( applyTo( children,
-                                support,
-@@ -235,7 +235,7 @@
-     }
-     else if ( node instanceof Document )
-     {
--      List children = ((Document)node).getMixedContent();
-+      List children = ((Document)node).getContent();
-       
-       results.addAll( applyTo( children,
-                                support,
-@@ -256,7 +256,7 @@
- 
-     if ( node instanceof Element )
-     {
--      List children = ((Element)node).getMixedContent();
-+      List children = ((Element)node).getContent();
-       
-       results.addAll( applyTo( children,
-                                support,
-@@ -264,7 +264,7 @@
-     }
-     else if ( node instanceof Document )
-     {
--      List children = ((Document)node).getMixedContent();
-+      List children = ((Document)node).getContent();
- 
-       results.addAll( applyTo( children,
-                                support,
-diff -Nru werken.xpath.orig/test/src/com/werken/xpath/test/Driver.java werken.xpath/test/src/com/werken/xpath/test/Driver.java
---- werken.xpath.orig/test/src/com/werken/xpath/test/Driver.java	2000-11-09 19:43:30.000000000 +0200
-+++ werken.xpath/test/src/com/werken/xpath/test/Driver.java	2003-03-02 01:56:55.000000000 +0200
-@@ -412,7 +412,7 @@
-                     elemID = "";
-                 }
- 
--                resultNode.addAttribute("id", elemID);
-+                resultNode.setAttribute("id", elemID);
-                 node.addContent( resultNode );
-                 results.addContent( node );
-             }
diff --git a/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-tests.patch b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-tests.patch
deleted file mode 100644
index bcb84f1ee237..000000000000
--- a/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./runtests.sh~	2000-10-31 23:42:01.000000000 +0200
-+++ ./runtests.sh	2003-03-02 01:59:55.000000000 +0200
-@@ -9,6 +9,6 @@
- XPATH_CP=./build/werken.xpath.jar
- TEST_CP=./build/test/classes/
- 
--CP=$ANTLR_CP:$JDOM_CP:$XPATH_CP:$TEST_CP:$XERCES_CP
-+CP=$ANTLR_CP:$JDOM_CP:$XPATH_CP:$TEST_CP:$XERCES_CP:$CLASSPATH
- 
- java -classpath $CP $TEST_DRIVER $TESTS_XML
diff --git a/dev-java/werken-xpath/metadata.xml b/dev-java/werken-xpath/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/werken-xpath/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r5.ebuild b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r5.ebuild
deleted file mode 100644
index 97f1586aa696..000000000000
--- a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-WANT_ANT_TASKS="ant-antlr"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN=${PN/-/.}
-MY_PV=${PV//_/-}
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="W3C XPath-Rec implementation for DOM4J"
-HOMEPAGE="https://sourceforge.net/projects/werken-xpath/"
-SRC_URI="mirror://gentoo/${MY_P}-src.tar.gz"
-# This tarball was acquired from jpackage's src rpm of the package by the same name
-
-LICENSE="JDOM"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-COMMON_DEP="
-	dev-java/jdom:0
-	>=dev-java/antlr-2.7.7-r7:0"
-DEPEND=">=virtual/jdk-1.8:*
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.8:*
-	${COMMON_DEP}"
-
-S=${WORKDIR}/${MY_PN}
-
-EANT_BUILD_TARGET="package"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="antlr,jdom"
-
-src_prepare() {
-	default
-	# Courtesy of JPackages :)
-	eapply "${FILESDIR}"/${P}-jpp-compile.patch
-	eapply "${FILESDIR}"/${P}-jpp-jdom.patch
-	eapply "${FILESDIR}"/${P}-jpp-tests.patch
-	eapply "${FILESDIR}"/${P}-gentoo.patch
-
-	# API updates to support jdom-1
-	eapply "${FILESDIR}"/${P}-jdom-1.0.patch
-
-	java-pkg_clean
-	rm -rv lib/bin || die
-}
-
-src_install() {
-	java-pkg_newjar build/${MY_PN}.jar
-
-	dodoc README TODO LIMITATIONS
-	use doc && java-pkg_dojavadoc build/apidocs
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/xml-commons/Manifest b/dev-java/xml-commons/Manifest
deleted file mode 100644
index dfbeceaf8f6b..000000000000
--- a/dev-java/xml-commons/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xml-commons-1.4.01.tar.gz 358779 BLAKE2B 8e1f42b25279eb2ed8bc33be5ac421b91e256cc1ef170b91f38800417502cb546598fb4c3d4619ab7b3637a9b7173d2d5fefd39af12f75c7b10cfb219396cda7 SHA512 9e8f77f7dc65a492548fa2313b49855ad0880fe663acdac865a1b235ea3bc0ba347c4fad3ca16f0c92a60df42a0a802a74525b56ea58dc575cd2d94013561868
diff --git a/dev-java/xml-commons/metadata.xml b/dev-java/xml-commons/metadata.xml
deleted file mode 100644
index 7ba7ef51ce8a..000000000000
--- a/dev-java/xml-commons/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <longdescription>
-		These are some of the components that are provided by the Apache XML Commons
-		project.
-
-		* Resolver - An XML Entity and URI Resolver donated by Norman Walsh.
-		* Which - A simple environment checking utility for Apache projects by Shane Curcuru
-		* External Interfaces (xml-apis) - An Apache-hosted set of externally-defined standards interfaces, namely DOM, SAX, and JAXP.
-	</longdescription>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/xml-commons/xml-commons-1.4.01.ebuild b/dev-java/xml-commons/xml-commons-1.4.01.ebuild
deleted file mode 100644
index 028c71cf67d2..000000000000
--- a/dev-java/xml-commons/xml-commons-1.4.01.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-MY_PN="${PN}-external"
-MY_P="${MY_PN}-${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache XML Commons"
-HOMEPAGE="http://xml.apache.org/commons/"
-SRC_URI="mirror://apache/xerces/${PN}/source/${MY_P}-src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-1.1 public-domain W3C-document W3C"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	source? ( app-arch/zip )"
-
-JAVA_SRC_DIR=( "org" "javax" )
diff --git a/dev-java/xml-xmlbeans/Manifest b/dev-java/xml-xmlbeans/Manifest
deleted file mode 100644
index 27b8c478340e..000000000000
--- a/dev-java/xml-xmlbeans/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xmlbeans-2.6.0-src.zip 9005098 BLAKE2B e8fb7b22eab718245a24856893268dbc1a09b3228596f274e470ea55aca4c0d01c05ef8e3cbd2ddbdedfd16c66991ee5f8c4001cb68ff9876d5749f47d640006 SHA512 162dc3d283ebf9f7fae823a2ae8d835b708c2cbeed48349c85996e60b2b8dfe0e51b17bd37eb34327c6452b2c0fc7df8a4902816b145993e36ca614ceb43b2b7
diff --git a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-SchemaCompiler.java.patch b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-SchemaCompiler.java.patch
deleted file mode 100644
index 9f2958bc243a..000000000000
--- a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-SchemaCompiler.java.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompiler.java.orig	2015-11-11 15:58:46.578486000 +0000
-+++ src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompiler.java	2015-11-11 15:59:05.351486000 +0000
-@@ -217,8 +217,9 @@
-         boolean debug = (cl.getOpt("debug") != null);
- 
-         String allowmdef = cl.getOpt("allowmdef");
--        Set mdefNamespaces = (allowmdef == null ? Collections.EMPTY_SET :
--                new HashSet(Arrays.asList(XmlListImpl.split_list(allowmdef))));
-+        Set mdefNamespaces = Collections.EMPTY_SET;
-+        // Set mdefNamespaces = (allowmdef == null ? Collections.EMPTY_SET :
-+        //         new HashSet(Arrays.asList(XmlListImpl.split_list(allowmdef))));
- 
-         List extensions = new ArrayList();
-         if (cl.getOpt("extension") != null) {
diff --git a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-jam.patch b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-jam.patch
deleted file mode 100644
index 8081f71775f6..000000000000
--- a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-jam.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -Nru /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java
---- /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java	2010-04-14 08:30:34.000000000 +0300
-+++ src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java	2012-09-05 23:03:48.617016181 +0300
-@@ -27,10 +27,10 @@
- import org.apache.xmlbeans.XmlError;
- import org.apache.xmlbeans.InterfaceExtension;
- import org.apache.xmlbeans.PrePostExtension;
--import org.apache.xmlbeans.impl.jam.JamClassLoader;
--import org.apache.xmlbeans.impl.jam.JamService;
--import org.apache.xmlbeans.impl.jam.JamServiceFactory;
--import org.apache.xmlbeans.impl.jam.JamServiceParams;
-+import org.codehaus.jam.JamClassLoader;
-+import org.codehaus.jam.JamService;
-+import org.codehaus.jam.JamServiceFactory;
-+import org.codehaus.jam.JamServiceParams;
- import org.apache.xmlbeans.impl.schema.StscState;
- 
- import javax.xml.namespace.QName;
-diff -Nru /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
---- /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java	2010-04-14 08:30:34.000000000 +0300
-+++ src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java	2012-09-05 23:09:00.320097542 +0300
-@@ -18,10 +18,10 @@
- import org.apache.xmlbeans.impl.xb.xmlconfig.Extensionconfig;
- import org.apache.xmlbeans.InterfaceExtension;
- import org.apache.xmlbeans.XmlObject;
--import org.apache.xmlbeans.impl.jam.JMethod;
--import org.apache.xmlbeans.impl.jam.JClass;
--import org.apache.xmlbeans.impl.jam.JParameter;
--import org.apache.xmlbeans.impl.jam.JamClassLoader;
-+import org.codehaus.jam.JMethod;
-+import org.codehaus.jam.JClass;
-+import org.codehaus.jam.JParameter;
-+import org.codehaus.jam.JamClassLoader;
- 
- public class InterfaceExtensionImpl implements InterfaceExtension
- {
-diff -Nru /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java
---- /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java	2010-04-14 08:30:34.000000000 +0300
-+++ src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java	2012-09-05 23:06:48.081760004 +0300
-@@ -17,9 +17,9 @@
- 
- import org.apache.xmlbeans.XmlObject;
- import org.apache.xmlbeans.PrePostExtension;
--import org.apache.xmlbeans.impl.jam.JamClassLoader;
--import org.apache.xmlbeans.impl.jam.JClass;
--import org.apache.xmlbeans.impl.jam.JMethod;
-+import org.codehaus.jam.JamClassLoader;
-+import org.codehaus.jam.JClass;
-+import org.codehaus.jam.JMethod;
- import org.apache.xmlbeans.impl.xb.xmlconfig.Extensionconfig;
- 
- 
-diff -Nru /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/UserTypeImpl.java src/xmlconfig/org/apache/xmlbeans/impl/config/UserTypeImpl.java
---- /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/UserTypeImpl.java	2010-04-14 08:30:34.000000000 +0300
-+++ src/xmlconfig/org/apache/xmlbeans/impl/config/UserTypeImpl.java	2012-09-05 23:06:33.710940667 +0300
-@@ -3,7 +3,7 @@
- import javax.xml.namespace.QName;
- 
- import org.apache.xmlbeans.UserType;
--import org.apache.xmlbeans.impl.jam.JamClassLoader;
-+import org.codehaus.jam.JamClassLoader;
- import org.apache.xmlbeans.impl.xb.xmlconfig.Usertypeconfig;
- 
- public class UserTypeImpl implements UserType
diff --git a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-piccolo.patch b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-piccolo.patch
deleted file mode 100644
index 866dc0f6ed53..000000000000
--- a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-piccolo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur /tmp/xmlbeans-2.6.0.orig/src/store/org/apache/xmlbeans/impl/store/Locale.java src/store/org/apache/xmlbeans/impl/store/Locale.java
---- /tmp/xmlbeans-2.6.0.orig/src/store/org/apache/xmlbeans/impl/store/Locale.java	2012-09-05 14:31:47.743396340 +0300
-+++ src/store/org/apache/xmlbeans/impl/store/Locale.java	2012-09-05 14:35:31.527582989 +0300
-@@ -106,8 +106,8 @@
- import org.apache.xmlbeans.impl.values.TypeStoreUser;
- import org.apache.xmlbeans.impl.values.TypeStoreUserFactory;
- 
--import org.apache.xmlbeans.impl.piccolo.xml.Piccolo;
--import org.apache.xmlbeans.impl.piccolo.io.FileFormatException;
-+import com.bluecast.xml.Piccolo;
-+import com.bluecast.io.FileFormatException;
- 
- public final class Locale
-     implements DOMImplementation, SaajCallback, XmlLocale
diff --git a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-remove-jamsupport.patch b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-remove-jamsupport.patch
deleted file mode 100644
index 23467d2b24a6..000000000000
--- a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-remove-jamsupport.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -433,7 +433,6 @@
-         <jar jarfile="build/private/xmlbeans-${version.base}${version.rc}-sources.jar" index="false">
-             <fileset dir="src/common" includes="**/*.java"/>
-             <fileset dir="src/configschema" includes="**/*.java"/>
--            <fileset dir="src/jamsupport" includes="**/*.java"/>
-             <fileset dir="src/marshal" includes="**/*.java"/>
-             <fileset dir="src/repackage" includes="**/*.java"/>
-             <fileset dir="src/saaj_api" includes="**/*.java"/>
-@@ -488,7 +487,7 @@
-                  store.classes, saaj_api.classes,
-                  marshal.classes, xpath.classes, oldxbean.jar, xsdschema.classes,
-                  xmlinputstream.classes, resolver.jar, xbean_xpath.jar,
--                 piccolo.classes, tools.classes, jamsupport.classes">
-+                 piccolo.classes, tools.classes">
-         <jar jarfile="build/lib/xbean.jar" index="true">
-             <fileset dir="build/classes/xmlpublic"
-                 excludes="javax/**"/>
-@@ -711,17 +710,6 @@
-             </classpath>
-         </javac>
-     </target>
--
--
--    <!-- support for running JAM under JDK1.5 ========================= -->
--
--    <target name="jamsupport.classes" depends="dirs,jam.classes">
--        <javac srcdir="src/jamsupport" destdir="build/classes/jam" source="${javac.source}" target="${javac.target}" debug="on">
--            <classpath id="jamsupport.compile.path">
--                <pathelement location="build/classes/jam"/>
--            </classpath>
--        </javac>
--    </target>
- 
-     <!-- saaj_api target ============================================== -->
- 
diff --git a/dev-java/xml-xmlbeans/metadata.xml b/dev-java/xml-xmlbeans/metadata.xml
deleted file mode 100644
index 5b68f8dc3eee..000000000000
--- a/dev-java/xml-xmlbeans/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <longdescription>
-
-XMLBeans is a tool that allows you to access the full power of XML in a Java
-friendly way. It is an XML-Java binding tool. The idea is that you can take
-advantage the richness and features of XML and XML Schema and have these
-features mapped as naturally as possible to the equivalent Java language and
-typing constructs. XMLBeans uses XML Schema to compile Java interfaces and
-classes that you can then use to access and modify XML instance data. Using
-XMLBeans is similar to using any other Java interface/class, you will see things
-like getFoo or setFoo just as you would expect when working with Java. While a
-major use of XMLBeans is to access your XML instance data with strongly typed
-Java classes there are also API's that allow you access to the full XML infoset
-(XMLBeans keeps full XML Infoset fidelity) as well as to allow you to reflect
-into the XML schema itself through an XML Schema Object model.
-
-</longdescription>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild b/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild
deleted file mode 100644
index 9c2f973e212d..000000000000
--- a/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="xmlbeans-${PV}"
-
-DESCRIPTION="An XML-Java binding tool"
-HOMEPAGE="https://xmlbeans.apache.org/"
-SRC_URI="https://archive.apache.org/dist/xmlbeans/source/${MY_P}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-CDEPEND="
-	dev-java/saxon:9
-	dev-java/jsr173:0
-	dev-java/annogen:0
-	dev-java/piccolo:0
-	dev-java/ant-core:0
-	dev-java/xml-commons-resolver:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-remove-jamsupport.patch
-	"${FILESDIR}"/${P}-piccolo.patch
-	"${FILESDIR}"/${P}-jam.patch
-	"${FILESDIR}"/${P}-SchemaCompiler.java.patch
-)
-
-java_prepare() {
-	epatch "${PATCHES[@]}"
-
-	# Preserve the old xbean jar, which is required for bootstrapping schemas.
-	mv external/lib/oldxbean.jar "${T}"/ || die
-
-	# Remove bundled binary files.
-	find . -name '*.jar' -exec rm -v {} + || die
-
-	pushd external/lib > /dev/null || die
-
-	find . -iname '*.zip' -exec rm -v {} + || die
-
-	# Symlink the dependencies.
-	java-pkg_jar-from jsr173{,.jar,_1.0_api_bundle.jar}
-	java-pkg_jar-from jsr173{,.jar,_1.0_api.jar}
-
-	mkdir xml-commons-resolver-1.1 || die
-	java-pkg_jar-from xml-commons-resolver{,.jar} xcresolver.zip
-	java-pkg_jar-from xml-commons-resolver{,.jar,-1.1/resolver.jar}
-
-	# Put back the preserved old xbean jar.
-	mv "${T}"/oldxbean.jar . || die
-
-	popd > /dev/null || die
-
-	# Create empty directories to let the build pass.
-	mkdir -p build/classes/{jam,piccolo} || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_GENTOO_CLASSPATH="
-	annogen
-	piccolo
-	ant-core
-	saxon-9
-"
-
-EANT_BUILD_TARGET="deploy"
-EANT_DOC_TARGET="docs"
-
-EANT_EXTRA_ARGS="-Dpiccolo.classes.notRequired=true"
-EANT_EXTRA_ARGS+=" -Djam.classes.notRequired=true"
-EANT_EXTRA_ARGS+=" -Dsaxon9.jar.exists=true"
-
-src_install() {
-	java-pkg_dojar build/lib/xbean*.jar
-
-	dodoc NOTICE.txt README.txt
-	if use doc; then
-		java-pkg_dojavadoc build/docs/reference
-		java-pkg_dohtml -r docs
-	fi
-
-	use source && java-pkg_dosrc src/*
-}
-
-pkg_postinst() {
-	ewarn "This package uses an old binary xbean to bootstrap its schemas."
-	ewarn "If you do not trust the binary part of this build, please unmerge."
-}
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2021-08-09 13:35:45 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2021-08-09 13:35:45 +0000
commit	29cff1dd3f6abbe215265ce13dd4ee2882755914 (patch)
tree	b99f16c3e20331af54936d799ff4b77de09a4682 /dev-java
parent	b05c1d3b9a18deef50902333d398cec1968928aa (diff)
download	baldeagleos-repo-29cff1dd3f6abbe215265ce13dd4ee2882755914.tar.gz baldeagleos-repo-29cff1dd3f6abbe215265ce13dd4ee2882755914.tar.xz baldeagleos-repo-29cff1dd3f6abbe215265ce13dd4ee2882755914.zip