Adding metadata

15 files changed, 104 insertions, 442 deletions

diff --git a/dev-java/cglib/Manifest b/dev-java/cglib/Manifest
index ccfbef220123..cf2193ec38be 100644
--- a/dev-java/cglib/Manifest
+++ b/dev-java/cglib/Manifest
@@ -1 +1,2 @@
+DIST cglib-RELEASE_3_3_0.tar.gz 151490 BLAKE2B d7ca4cc9ea6dad9f7a827c784ad13f93e8f31c817c5a0182a86b2ba759ccd3dfbec88d5178507599cd08a97a1ef13ba4880cab016b68b92dda3358bfb0a751c0 SHA512 635dcdb10a8fe83887a1dc8cf12844fe61b73a12fb530bf84d6ac53f75b0103820d76518cbc0d93d63dba86d13929f0df4dbae3b4943a402cf9f2af76f44161a
 DIST cglib-src-3.1.jar 1541525 BLAKE2B 46df8c11a8d05549c15a3bbf0f9789fbe4ad0540caa5be6d30f922aec95b55427cf36bff7740ba8c050c3c72749c6e9c98d8119a6de345126d7ef72343130568 SHA512 3b246b37f1c90acaefd4ba64f1f1db0b4d1fa64025f0e4e216ae7955e05701671bf8dc01d19c754286966cc5f8c06d78d02cb4f4500542f4448656768109c13f
diff --git a/dev-java/cglib/cglib-3.3.0.ebuild b/dev-java/cglib/cglib-3.3.0.ebuild
new file mode 100644
index 000000000000..418da3689e5f
--- /dev/null
+++ b/dev-java/cglib/cglib-3.3.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# doc USE flag is not in IUSE as the docs does not compile because of errors
+JAVA_PKG_IUSE="examples source test"
+MAVEN_ID="cglib:cglib:3.3.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PV=RELEASE_${PV//./_}
+MY_P=cglib-${MY_PV}
+
+DESCRIPTION="cglib is a powerful, high performance and quality Code Generation Library"
+HOMEPAGE="https://github.com/cglib/cglib"
+SRC_URI="https://github.com/cglib/cglib/archive/refs/tags/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CDEPEND="dev-java/ant-core:0
+	dev-java/asm:9
+"
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+"
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}
+"
+
+S="${WORKDIR}"
+
+JAVA_GENTOO_CLASSPATH="asm-9 ant-core"
+JAVA_SRC_DIR="${MY_P}/${PN}/src/main/java"
+JAVA_RESOURCE_DIRS="${MY_P}/${PN}/src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="${MY_P}/${PN}/src/test/java"
+JAVA_TEST_EXCLUDES=(
+	"net.sf.cglib.CodeGenTestCase"		# not a test class
+	"net.sf.cglib.TestAll"
+	"net.sf.cglib.TestGenerator"		# not a test class
+	"net.sf.cglib.proxy.TestEnhancer"	# broken tests
+	"net.sf.cglib.proxy.TestInterceptor"	# not a test class
+	"net.sf.cglib.reflect.TestFastClass"	# broken tests
+)
+
+src_install() {
+	java-pkg-simple_src_install
+
+	use examples && java-pkg_doexamples --subdir samples ${MY_P}/cglib-sample/src/main/java
+}
diff --git a/dev-java/cglib/metadata.xml b/dev-java/cglib/metadata.xml
index 35eb51f0c806..6c771a3d2c3f 100644
--- a/dev-java/cglib/metadata.xml
+++ b/dev-java/cglib/metadata.xml
@@ -13,6 +13,8 @@
  <upstream>
   <remote-id type="github">cglib/cglib</remote-id>
   <remote-id type="sourceforge">cglib</remote-id>
+  <bugs-to>https://github.com/cglib/cglib/issues</bugs-to>
+  <doc>https://github.com/cglib/cglib/wiki</doc>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/hamcrest-core/files/hamcrest-1.3-empty_generator.patch b/dev-java/hamcrest-core/files/hamcrest-1.3-empty_generator.patch
deleted file mode 100644
index 709bca62c02d..000000000000
--- a/dev-java/hamcrest-core/files/hamcrest-1.3-empty_generator.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/build.xml	2012-07-02 21:14:09.000000000 +0200
-+++ b/build.xml	2013-06-15 22:00:19.919038284 +0200
-@@ -12,18 +12,6 @@
-     </target>

- 

-     <target name="generator" description="Build code generator tool">

--        <java-to-jar srcdir="hamcrest-generator/src/main/java"

--                     modulename="hamcrest-generator-nodeps"

--                     classpath="lib/generator/qdox-1.12.jar"/>

--

--        <!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->

--        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar-1.3.jar"/>

--        <jarjar jarfile="build/hamcrest-generator-${version}.jar">

--            <zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>

--            <zipfileset src="lib/generator/qdox-1.12.jar"/>

--            <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/>

--        </jarjar>

--        <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>

-     </target>

- 

-     <target name="core" depends="generator" description="Build core Hamcrest library">

diff --git a/dev-java/hamcrest-core/files/hamcrest-core-1.3-fix_javadoc.patch b/dev-java/hamcrest-core/files/hamcrest-core-1.3-fix_javadoc.patch
deleted file mode 100644
index 4f210ca3380a..000000000000
--- a/dev-java/hamcrest-core/files/hamcrest-core-1.3-fix_javadoc.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/build.xml	2013-06-15 22:29:44.445548674 +0200
-++- b/build.xml	2013-06-15 22:30:45.098876635 +0200
-@@ -132,30 +132,15 @@
-     </target>

- 

-     <target name="javadoc" description="build javadoc jars">

--        <java-to-javadoc-jar modulename="hamcrest-generator-nodeps"/>

-         <java-to-javadoc-jar modulename="hamcrest-core"/>

--        <java-to-javadoc-jar modulename="hamcrest-library"/>

--        <java-to-javadoc-jar modulename="hamcrest-integration"/>

--        <copy file="build/hamcrest-generator-nodeps-${version}-javadoc.jar" tofile="build/hamcrest-generator-${version}-javadoc.jar"/>

- 

-         <javadoc packagenames="org.hamcrest.*" defaultexcludes="yes"

-                  destdir="build/temp/hamcrest-all-${version}-javadoc.jar.contents" author="true" version="true" use="true"

--                 windowtitle="Hamcrest" source="1.6" failonerror="yes" overview="overview.html">

-+                 windowtitle="Hamcrest" source="1.6" failonerror="yes">

--            <classpath>

--                <fileset dir="lib/integration">

--                    <include name="*.jar"/>

--                </fileset>

--            </classpath>

-             <packageset dir="build/temp/hamcrest-core-${version}-sources.jar.contents"/>

--            <packageset dir="build/temp/hamcrest-library-${version}-sources.jar.contents" excludes="org/hamcrest/internal"/>

--            <packageset dir="build/temp/hamcrest-integration-${version}-sources.jar.contents"/>

-             

-             <group title="Hamcrest API and Utility Classes" packages="org.hamcrest"/>

-             <group title="Matcher Library" packages="org.hamcrest.*"/>

--            <group title="Integration" packages="org.hamcrest.integration, org.hamcrest.integration.*"/>

--            

--            <link offline="false" href="http://www.junit.org/junit/javadoc/3.8.1/"/>

--            <link offline="false" href="http://kentbeck.github.com/junit/javadoc/latest/"/>

-         </javadoc>

-         <jar jarfile="build/hamcrest-all-${version}-javadoc.jar">

-             <fileset dir="build/temp/hamcrest-all-${version}-javadoc.jar.contents"/>

-@@ -302,14 +287,7 @@
-                      destdir="build/temp/@{modulename}-${version}-javadoc.jar.contents" author="true" version="true" use="true"

-                      windowtitle="Hamcrest" source="1.6" failonerror="yes">

-                 <classpath>

--                    <fileset dir="lib/integration">

--                        <include name="*.jar"/>

--                    </fileset>

--                    <fileset file="lib/generator/qdox-1.12.jar"/>

-                     <fileset file="build/hamcrest-core-${version}.jar"/>

--                    <fileset file="build/hamcrest-library-${version}.jar"/>

--                    <fileset file="build/hamcrest-generator-${version}.jar"/>

--                    <fileset file="build/hamcrest-integration-${version}.jar"/>

-                 </classpath>

-             </javadoc>

-             <jar jarfile="build/@{modulename}-${version}-javadoc.jar">

diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild
deleted file mode 100644
index 5d747d9d15f4..000000000000
--- a/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 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-pkg-simple
-
-MY_PN="hamcrest"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Library of matchers for building test expressions"
-HOMEPAGE="https://github.com/hamcrest"
-SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x64-solaris"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-DEPEND="
-	virtual/jdk:1.8
-	source? ( app-arch/zip )"
-
-S="${WORKDIR}/JavaHamcrest-${MY_PN}-java-${PV}"
-
-JAVA_SRC_DIR="${PN}/src"
-
-java_prepare() {
-	java-pkg_clean
-}
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild
deleted file mode 100644
index 977e37eca2f5..000000000000
--- a/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 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_PN="hamcrest"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Core library of matchers for building test expressions"
-HOMEPAGE="https://github.com/hamcrest"
-SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
-
-DEPEND="virtual/jdk:1.8
-	~dev-java/hamcrest-generator-${PV}:1.3
-	userland_GNU? ( sys-apps/findutils )"
-
-RDEPEND=">=virtual/jre-1.8"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
-
-EANT_BUILD_TARGET="core"
-
-java_prepare() {
-	# Empty out the contents of the generator target; it has already been built.
-	epatch "${FILESDIR}/hamcrest-1.3-empty_generator.patch"
-
-	# Fix problems with Javadoc target.
-	epatch "${FILESDIR}/hamcrest-core-1.3-fix_javadoc.patch"
-
-	find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files"
-
-	local cp="build/${P}.jar"
-	cp="${cp}:$(java-pkg_getjars --build-only --with-dependencies hamcrest-generator-${SLOT})"
-	EANT_EXTRA_ARGS="-Dversion=${PV} -Dgentoo.classpath=${cp}"
-}
-
-src_install() {
-	java-pkg_newjar build/${PN}-${PV}.jar ${PN}.jar
-
-	dodoc README.txt CHANGES.txt
-
-	use doc && java-pkg_dojavadoc build/temp/hamcrest-all-${PV}-javadoc.jar.contents
-	use source && java-pkg_dosrc ${PN}/src/main/java/org
-}
diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r2.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r2.ebuild
deleted file mode 100644
index 256b9b9a0b54..000000000000
--- a/dev-java/hamcrest-generator/hamcrest-generator-1.3-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="5"
-
-JAVA_PKG_IUSE="source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="hamcrest"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Code generator for Hamcrest's library of matchers for building test expressions"
-HOMEPAGE="https://github.com/hamcrest"
-SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
-
-CDEPEND=">=dev-java/qdox-1.12-r1:1.12"
-
-DEPEND=">=virtual/jdk-1.8
-	userland_GNU? ( sys-apps/findutils )
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.8
-	${CDEPEND}"
-
-EANT_BUILD_TARGET="generator"
-EANT_EXTRA_ARGS="-Dversion=${PV}"
-
-java_prepare() {
-	# Don't include source in JAR.  If a Gentoo user wants the source the source
-	# USE flag will be enabled.
-	epatch "${FILESDIR}/${P}-no_jarjar.patch"
-
-	find -iname "*.jar" -exec rm -v {} + || die "Unable to remove bundled JAR files"
-
-	# These jars must be symlinked.  Specifying them using gentoo.classpath
-	# does not work.
-	java-pkg_jar-from --into lib/generator qdox-1.12 qdox.jar qdox-1.12.jar
-}
-
-src_install() {
-	java-pkg_newjar build/${PN}-nodeps-${PV}.jar ${PN}.jar
-
-	dodoc README.txt CHANGES.txt
-
-	use source && java-pkg_dosrc ${PN}/src/main/java/org
-}
diff --git a/dev-java/hamcrest-library/files/1.3-remove-targets.patch b/dev-java/hamcrest-library/files/1.3-remove-targets.patch
deleted file mode 100644
index 6923b0bcc68e..000000000000
--- a/dev-java/hamcrest-library/files/1.3-remove-targets.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 1cfd4fb..185c563 100644
---- a/build.xml
-+++ b/build.xml
-@@ -12,42 +12,9 @@
-     </target>

- 

-     <target name="generator" description="Build code generator tool">

--        <java-to-jar srcdir="hamcrest-generator/src/main/java"

--                     modulename="hamcrest-generator-nodeps"

--                     classpath="lib/generator/qdox-1.12.jar"/>

--

--        <!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->

--        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar-1.3.jar"/>

--        <jarjar jarfile="build/hamcrest-generator-${version}.jar">

--            <zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>

--            <zipfileset src="lib/generator/qdox-1.12.jar"/>

--            <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/>

--        </jarjar>

--        <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>

-     </target>

- 

-     <target name="core" depends="generator" description="Build core Hamcrest library">

--        <java-to-jar srcdir="hamcrest-core/src/main/java" modulename="hamcrest-core"/>

--

--        <!-- Generate one class with all static imports -->

--        <mkdir dir="build/temp/hamcrest-core/generated-code"/>

--

--        <java classname="org.hamcrest.generator.config.XmlConfigurator"

--              fork="yes"

--              failonerror="yes"

--              classpath="

--                build/hamcrest-core-${version}.jar;

--                build/hamcrest-generator-${version}.jar;

--              ">

--            <arg value="core-matchers.xml"/>

--            <arg value="hamcrest-core/src/main/java"/>

--            <arg value="org.hamcrest.CoreMatchers"/>

--            <arg value="build/temp/hamcrest-core/generated-code"/>

--        </java>

--        <!-- Append to core jar -->

--        <java-to-jar srcdir="build/temp/hamcrest-core/generated-code"

--                     modulename="hamcrest-core"

--                     classpath="build/hamcrest-core-${version}.jar"/>

-     </target>

- 

-     <target name="library"

diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
deleted file mode 100644
index b26fd124cfcb..000000000000
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN=${PN/-library}
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Core library of matchers for building test expressions"
-HOMEPAGE="https://github.com/hamcrest"
-SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-
-CDEPEND="
-	dev-java/hamcrest-generator:${SLOT}
-	dev-java/hamcrest-core:${SLOT}
-	dev-java/qdox:1.12
-"
-DEPEND=">=virtual/jdk-1.6
-	userland_GNU? ( sys-apps/findutils )
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
-EANT_GENTOO_CLASSPATH="hamcrest-generator-${SLOT},hamcrest-core-${SLOT},qdox-1.12"
-EANT_BUILD_TARGET="library"
-EANT_EXTRA_ARGS="-Dversion=${PV}"
-EANT_GENTOO_CLASSPATH_EXTRA="build/${P}.jar"
-
-java_prepare() {
-	# remove core+generator target as they are already built.
-	epatch "${FILESDIR}/${PV}-remove-targets.patch"
-
-	find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files"
-}
-
-src_install() {
-	java-pkg_newjar build/${PN/core/library}-${PV}.jar ${PN/core/library}.jar
-
-	use source && java-pkg_dosrc ${PN}/src/main/java/org
-}
diff --git a/dev-java/javacup/javacup-0.11b_p20151001.ebuild b/dev-java/javacup/javacup-0.11b_p20151001.ebuild
deleted file mode 100644
index 9e50193d6fef..000000000000
--- a/dev-java/javacup/javacup-0.11b_p20151001.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PV=${PV/_beta/-}
-MY_PV=${MY_PV/_p/-}
-MY_PV=${MY_PV#0.}
-MY_P=java-cup-${MY_PV%-*}
-
-DESCRIPTION="CUP Parser Generator for Java"
-HOMEPAGE="http://www2.cs.tum.edu/projects/cup/"
-SRC_URI="http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=virtual/jdk-1.7
-	>=dev-java/ant-core-1.7.0:0
-	>=dev-java/jflex-1.6.1:0"
-
-RDEPEND=">=virtual/jre-1.7"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" taskdef"
-
-S="${WORKDIR}"
-
-java_prepare() {
-	# Bizarrely, you can't build from the tarball without this patch.
-	epatch "${FILESDIR}"/${PN}-0.11b_beta20150326-build-xml-svn.patch
-
-	# The JFlex package name has changed to lower case.
-	sed -i "s/JFlex\./jflex./g" build.xml || die
-
-	# Remove the bundled JFlex.
-	rm -v bin/JFlex.jar || die
-}
-
-src_configure() {
-	EANT_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only ant-core,jflex)
-	java-ant-2_src_configure
-}
-
-src_compile() {
-	# Annoyingly javacup bundles an older version of itself that will
-	# break jflex if that has already been built against this newer
-	# version beforehand. Even more annoyingly, the binary download is
-	# built with Java 8, which isn't much use to us. We therefore use
-	# any installed javacup that is newer than the bundled version where
-	# possible. If this approach turns out to be unworkable then we may
-	# just have to use the bundled jflex for bootstrapping.
-	if has_version \>=${CATEGORY}/${PN}-0.11b:${SLOT}; then
-		# Use PORTAGE_QUIET to suppress a QA warning that is spurious
-		# thanks to has_version above. This is Portage-specific but
-		# showing the warning elsewhere isn't the end of the world.
-		einfo "Bootstrapping with installed javacup ..."
-		EANT_GENTOO_CLASSPATH_EXTRA+=":$(PORTAGE_QUIET=1 java-pkg_getjars --build-only javacup)" eant
-	else
-		einfo "Bootstrapping with bundled javacup ..."
-		EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/bin/${MY_P:0:-1}.jar" eant
-	fi
-
-	# Clean everything except the new jar.
-	rm -rv java/ classes/ || die
-
-	einfo "Recompiling with newly built javacup ..."
-	EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/dist/${MY_P}.jar" eant
-
-	use doc && ejavadoc -sourcepath src/ -d javadoc java_cup
-}
-
-src_install() {
-	java-pkg_newjar dist/${MY_P}.jar
-	java-pkg_newjar dist/${MY_P}-runtime.jar ${PN}-runtime.jar
-	java-pkg_dolauncher ${PN} --jar ${PN}.jar
-	java-pkg_register-ant-task
-
-	dodoc changelog.txt
-	docinto html
-	dodoc manual.html
-
-	use source && java-pkg_dosrc java/*
-	use doc && java-pkg_dojavadoc javadoc
-}
diff --git a/dev-java/spec-alpha/Manifest b/dev-java/spec-alpha/Manifest
index 5705ccaf4b0b..4eba39512c02 100644
--- a/dev-java/spec-alpha/Manifest
+++ b/dev-java/spec-alpha/Manifest
@@ -1,2 +1,3 @@
 DIST spec-alpha-0.1.143.tar.gz 35568 BLAKE2B f63fdd2b3c83dbd3936e36ff57b6ea399b7173fe805c60a6ecbd8e4aef5942f051a8551c259d89885a202c20045f67921b66c4dc9e361aacc8903c6542d7c7b5 SHA512 87887d72bc7343f96fad937b90feb4cc1be1eeaad8b7c01ae090ebe5cb17c30612e63797ea9eb39e6fe4c07870dcba9e153a98777d372923e95163f3219a976c
 DIST spec-alpha-0.2.176.tar.gz 37055 BLAKE2B 0588772e4a47a5b122984abefaf5ef2d0fffbacaf277b22737c94889e646c16a029017d405b72b829e88bcf03b12f689cb2053884b24b47193a26978ab54a318 SHA512 decf0dbff09bf8ee12503e6117ab635b98cd8dd2c389acf7aeebf00f32b5fd8250d66c2ec54cfe5da45e727e39480ae738a3ee7fcad71684d8c3acf464fe21e7
+DIST spec-alpha-0.2.194.tar.gz 39101 BLAKE2B 86de07fd83495b72d3b7d85b803ee9ecafba9a72d8541b5c62f22ad32d4e16b0c7be758ea8d30b743eba6fe994e09898e2f59b2b720913e7e1ab3732b496423f SHA512 3170883c1d62acf9af1435a5ca1ced34a318c53d1cd443d58a74afdcae4888553b9dba91fb81ccea8824c3a0c2396a0efbfaeb8ab408d8bbcf1aea0d3da9c82e
diff --git a/dev-java/spec-alpha/metadata.xml b/dev-java/spec-alpha/metadata.xml
index efa745207899..7e3a2911a01e 100644
--- a/dev-java/spec-alpha/metadata.xml
+++ b/dev-java/spec-alpha/metadata.xml
@@ -5,6 +5,10 @@
   <email>tgbugs@gmail.com</email>
   <name>Tom Gillespie</name>
  </maintainer>
+ <maintainer type="person">
+  <email>marco@scardovi.com</email>
+  <name>Marco Scardovi</name>
+ </maintainer>
  <maintainer type="project">
   <email>proxy-maint@gentoo.org</email>
   <name>Proxy Maintainers</name>
diff --git a/dev-java/spec-alpha/spec-alpha-0.2.194.ebuild b/dev-java/spec-alpha/spec-alpha-0.2.194.ebuild
new file mode 100644
index 000000000000..cab6d8cad0c7
--- /dev/null
+++ b/dev-java/spec-alpha/spec-alpha-0.2.194.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2 java-ant-2
+
+EGIT_REF="fb55378"
+
+MY_P=spec.alpha-${PV}
+
+DESCRIPTION="A Clojure library to describe the structure of data and functions"
+HOMEPAGE="https://clojure.org/ https://github.com/clojure/spec.alpha"
+SRC_URI="https://github.com/clojure/spec.alpha/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0.2"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND="
+	dev-java/ant-core:0
+	>=virtual/jdk-1.8:*
+"
+
+S="${WORKDIR}/spec.alpha-${MY_P}"
+
+EANT_TASKS="jar"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${MY_P}"
+
+src_prepare() {
+	default
+	cp "${FILESDIR}/build.xml" . || die
+}
+
+src_install() {
+	java-pkg_newjar "target/${MY_P}.jar"
+	einstalldocs
+}
diff --git a/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild b/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild
deleted file mode 100644
index 5ae253dbf05c..000000000000
--- a/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 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 versionator
-
-MY_PN="xalan-j"
-MY_PV="$(replace_all_version_separators _)"
-MY_P="${MY_PN}_${MY_PV}"
-
-DESCRIPTION="DOM Level 3 serializer from Apache Xalan, shared by Xalan and Xerces"
-HOMEPAGE="http://xalan.apache.org/"
-SRC_URI="mirror://apache/xalan/${MY_PN}/source/${MY_P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=">=virtual/jre-1.3"
-DEPEND=">=virtual/jdk-1.3"
-
-EANT_BUILD_TARGET="serializer.jar"
-EANT_DOC_TARGET="serializer.javadocs"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-	# kill all non-serializer sources to ease javadocs and dosrc
-	find src/org/ -type f ! -path "src/org/apache/xml/serializer/*" -delete || die
-
-	# remove bundled jars
-	find -name "*.jar" -delete || die
-	rm src/*.tar.gz || die
-}
-
-src_install() {
-	java-pkg_dojar build/serializer.jar
-
-	use doc && java-pkg_dojavadoc build/docs/apidocs
-	use source && java-pkg_dosrc src/org
-}