Adding metadata

35 files changed, 117 insertions, 412 deletions

diff --git a/dev-java/commons-csv/commons-csv-1.9.0.ebuild b/dev-java/commons-csv/commons-csv-1.9.0.ebuild
index 8157b3b34412..d320a245b99d 100644
--- a/dev-java/commons-csv/commons-csv-1.9.0.ebuild
+++ b/dev-java/commons-csv/commons-csv-1.9.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-csv/"
 SRC_URI="mirror://apache/commons/csv/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 # missing test deps
 RESTRICT="test"
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild
index d2302a4b865a..38a0c3f54a50 100644
--- a/dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild
+++ b/dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P/_beta/b}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CP_DEPEND="
 	dev-java/ant-core:0
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
deleted file mode 100644
index e72710bc3451..000000000000
--- a/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source examples"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Ant-tasks to compile various source languages and produce executables"
-HOMEPAGE="http://ant-contrib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ant-contrib/ant-contrib/${P/_/-}/${P/_beta/b}.tar.gz"
-S="${WORKDIR}/${P/_beta/b}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-CDEPEND="
-	dev-java/ant-core:0
-	dev-java/xerces:2"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_BUILD_TARGET="jars"
-EANT_DOC_TARGET="javadocs -Dbuild.javadocs=build/api"
-EANT_GENTOO_CLASSPATH="ant-core,xerces-2"
-
-src_prepare() {
-	default
-	find -name '*.jar' -exec rm -v {} + || die
-}
-
-src_install() {
-	java-pkg_dojar target/lib/${PN}.jar
-
-	java-pkg_register-ant-task
-
-	dodoc NOTICE
-	use doc && java-pkg_dojavadoc build/api
-	use examples && java-pkg_doexamples src/samples/*
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.13.0.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.13.0.ebuild
index 453e530262c4..04d11cb62cce 100644
--- a/dev-java/jackson-annotations/jackson-annotations-2.13.0.ebuild
+++ b/dev-java/jackson-annotations/jackson-annotations-2.13.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/refs/tags/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-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-2.0.1.ebuild b/dev-java/jakarta-activation/jakarta-activation-2.0.1.ebuild
index 8483134d724c..d62e9ab9cc40 100644
--- a/dev-java/jakarta-activation/jakarta-activation-2.0.1.ebuild
+++ b/dev-java/jakarta-activation/jakarta-activation-2.0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> $
 
 LICENSE="EPL-1.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/jansi/jansi-2.4.0-r1.ebuild b/dev-java/jansi/jansi-2.4.0-r1.ebuild
index 75e764ffdbfd..7974adb4db91 100644
--- a/dev-java/jansi/jansi-2.4.0-r1.ebuild
+++ b/dev-java/jansi/jansi-2.4.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/fusesource/${PN}/archive/refs/tags/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Compile dependencies
 # POM: pom.xml
diff --git a/dev-java/jaxb-api/jaxb-api-3.0.1.ebuild b/dev-java/jaxb-api/jaxb-api-3.0.1.ebuild
index 8b5484d1310a..7786e7b8b1b9 100644
--- a/dev-java/jaxb-api/jaxb-api-3.0.1.ebuild
+++ b/dev-java/jaxb-api/jaxb-api-3.0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="EPL-1.0"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jsch/Manifest b/dev-java/jsch/Manifest
index 38e84063f341..80775bf0b8a4 100644
--- a/dev-java/jsch/Manifest
+++ b/dev-java/jsch/Manifest
@@ -1,2 +1 @@
-DIST jsch-0.1.54.zip 365455 BLAKE2B 5cd6fa012e5a511bad8f23a233559e6ad6d600f39ea7b519e66e118b1fdb997491b7ac8cff5bc1491c28f7ee99f0f4a3b4727f5d8ec02030576f34949d74e203 SHA512 2ed29f07495fbc28d6eb7b4fe414e8a9a96b911b2feea5b1513cc48a9439adba12341bceb23a3ea9ab307e32d48bfd4356c7bc877c56e77f6f55d69214db3a9e
 DIST jsch-0.1.55.zip 369664 BLAKE2B 4a35845e7b9e57c64a890547b2cabdec5bd03fa462ac3c78d8bcb757dbd5b50b366d41c042e904e44b967c85da01396c7dd085b8fe5f69ad243237fab38fa1f1 SHA512 334b550594272fe179f13fb6bbfc0a353334586786db2b3279608b85cdab3dd604e6dd04aa2376b5532816d906133e636b5359dda36c449d90173be501c61418
diff --git a/dev-java/jsch/jsch-0.1.54-r1.ebuild b/dev-java/jsch/jsch-0.1.54-r1.ebuild
deleted file mode 100644
index 2764fb8bedc7..000000000000
--- a/dev-java/jsch/jsch-0.1.54-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source examples"
-MAVEN_ID="com.jcraft:jsch:0.1.55"
-
-inherit java-pkg-2 java-ant-2 java-osgi
-
-DESCRIPTION="JSch is a pure Java implementation of SSH2"
-HOMEPAGE="http://www.jcraft.com/jsch/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="zlib"
-
-CDEPEND="
-	zlib? ( dev-java/jzlib:0 )"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*"
-
-BDEPEND="
-	app-arch/unzip
-"
-
-EANT_BUILD_TARGET="dist"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_compile() {
-	if use zlib; then
-		EANT_EXTRA_ARGS="-Djzlib.available=true"
-		EANT_GENTOO_CLASSPATH="jzlib"
-	fi
-
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	java-osgi_newjar dist/lib/jsch*.jar \
-		"com.jcraft.jsch" "JSch" \
-		"com.jcraft.jsch, com.jcraft.jsch.jce;x-internal:=true, \
-		com.jcraft.jsch.jcraft;x-internal:=true"
-
-	einstalldocs
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src/*
-	use examples && java-pkg_doexamples examples
-}
diff --git a/dev-java/jsch/jsch-0.1.55.ebuild b/dev-java/jsch/jsch-0.1.55.ebuild
index 4e12aeb3d7a9..33cc6811dfc7 100644
--- a/dev-java/jsch/jsch-0.1.55.ebuild
+++ b/dev-java/jsch/jsch-0.1.55.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: ${P}.pom
diff --git a/dev-java/log4j-12-api/Manifest b/dev-java/log4j-12-api/Manifest
new file mode 100644
index 000000000000..c2ad720f37fa
--- /dev/null
+++ b/dev-java/log4j-12-api/Manifest
@@ -0,0 +1 @@
+DIST apache-log4j-2.17.1-src.tar.gz 11602282 BLAKE2B 6e6a69565ee28fc138ddb78258ac30b13a9be3f3baee64c3427b63b059c552d314be3c4a345ea297010d345c4dcb31d154aaea6cd2fc587512c6087c5dfe0745 SHA512 21cdfca54eb0d6af261a5ae89ff98197473d9c0203b0ab530f3aef6c90957bfb95a423983c8a19d7fbab05ec194b6fad8e46628e32270dd8b94ddd194a1cb177
diff --git a/dev-java/log4j-12-api/log4j-12-api-2.17.1.ebuild b/dev-java/log4j-12-api/log4j-12-api-2.17.1.ebuild
new file mode 100644
index 000000000000..a931e4fe9122
--- /dev/null
+++ b/dev-java/log4j-12-api/log4j-12-api-2.17.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom log4j-1.2-api/pom.xml --download-uri mirror://apache/logging/log4j/2.17.1/apache-log4j-2.17.1-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-12-api-2.17.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.logging.log4j:log4j-1.2-api:2.17.1"
+JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The Apache Log4j 1.x Compatibility API"
+HOMEPAGE="https://logging.apache.org/log4j/2.x/"
+SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# We don't have junit-vintage and junit-jupiter
+RESTRICT="test"
+
+# Common dependencies
+# POM: log4j-1.2-api/pom.xml
+# org.apache.logging.log4j:log4j-api:2.17.1 -> >=dev-java/log4j-api-2.17.1:2
+# org.apache.logging.log4j:log4j-core:2.17.1 -> >=dev-java/log4j-core-2.17.1:2
+
+CP_DEPEND="
+	~dev-java/log4j-api-${PV}:2
+	~dev-java/log4j-core-${PV}:2
+"
+
+# Compile dependencies
+# POM: log4j-1.2-api/pom.xml
+# org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.1.Final -> >=dev-java/jboss-jms-api-1.0.1:1.1
+# POM: log4j-1.2-api/pom.xml
+# test? com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.12.4 -> >=dev-java/jackson-dataformat-xml-2.13.0:0
+# test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
+# test? org.apache.felix:org.apache.felix.framework:5.6.12 -> !!!groupId-not-found!!!
+# test? org.apache.logging.log4j:log4j-api:2.17.1 -> >=dev-java/log4j-api-2.17.1:2
+# test? org.apache.logging.log4j:log4j-core:2.17.1 -> >=dev-java/log4j-core-2.17.1:2
+# test? org.apache.velocity:velocity:1.7 -> !!!artifactId-not-found!!!
+# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-engine:5.7.2 -> !!!groupId-not-found!!!
+# test? org.junit.vintage:junit-vintage-engine:5.7.2 -> !!!groupId-not-found!!!
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	dev-java/jboss-jms-api:1.1"
+#	test? (
+#		!!!artifactId-not-found!!!
+#		!!!groupId-not-found!!!
+#		>=dev-java/commons-io-2.11.0:1
+#		>=dev-java/jackson-dataformat-xml-2.13.0:0
+#		~dev-java/log4j-api-${PV}:2
+#		~dev-java/log4j-core-${PV}:2
+#	)
+#"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md LICENSE.txt )
+
+S="${WORKDIR}/apache-log4j-${PV}-src"
+
+JAVA_CLASSPATH_EXTRA="jboss-jms-api-1.1"
+JAVA_SRC_DIR="log4j-1.2-api/src/main/java"
+JAVA_RESOURCE_DIRS=(
+	"log4j-1.2-api/src/main/resources"
+)
+
+#	JAVA_TEST_GENTOO_CLASSPATH="jackson-dataformat-xml,commons-io-1,!!!groupId-not-found!!!,log4j-api-2,log4j-core-2,!!!artifactId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
+#	JAVA_TEST_SRC_DIR="log4j-1.2-api/src/test/java"
+#	JAVA_TEST_RESOURCE_DIRS=(
+#		"log4j-1.2-api/src/test/resources"
+#	)
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/log4j-12-api/metadata.xml b/dev-java/log4j-12-api/metadata.xml
new file mode 100644
index 000000000000..a63267abaf71
--- /dev/null
+++ b/dev-java/log4j-12-api/metadata.xml
@@ -0,0 +1,9 @@
+<?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/log4j-core/log4j-core-2.17.1.ebuild b/dev-java/log4j-core/log4j-core-2.17.1.ebuild
index d4dc7d3ab0d1..15dd570d7f43 100644
--- a/dev-java/log4j-core/log4j-core-2.17.1.ebuild
+++ b/dev-java/log4j-core/log4j-core-2.17.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 # We don't have junit-vintage and junit-jupiter 
 RESTRICT="test"
diff --git a/dev-java/mchange-commons/Manifest b/dev-java/mchange-commons/Manifest
index 919f9bf6793b..96c8ad15ed34 100644
--- a/dev-java/mchange-commons/Manifest
+++ b/dev-java/mchange-commons/Manifest
@@ -1,2 +1 @@
 DIST mchange-commons-0.2.10.tar.gz 218657 BLAKE2B f073aac7a560c31ea71c4114c5128de55d4b384c9579f649e0ca28c1257be64d22bce406b241f3b7665c5ec0e4cdc64c079c0f27f328e54803612abae43aef42 SHA512 098712b3b61d74a832699b6c92c75fdb243260400c1180511b5299a25553660750261ff8c2cf322350afd3d4b84fdf9900c26123b56add0f772e26e4f3ed8d7b
-DIST mchange-commons-java-0.2.10.zip 773768 BLAKE2B abfcc70e109431afcc514e80a2dc3585a90de07f8cb800d0a9807b72ad10f0488ad0a8b7a641c3de7a91029e3d6b25590985df85e592d90d0af42728389d7e28 SHA512 8196cd4476c3dea55355ba11cc2f801602235de3a977d75eff3835dacaf612647adc0e595e0bf77a6313adcd718d143d08ecf6fd5aa0e6638a419cf1f107c3a9
diff --git a/dev-java/mchange-commons/mchange-commons-0.2.10-r1.ebuild b/dev-java/mchange-commons/mchange-commons-0.2.10-r1.ebuild
index bbae432a3666..6df76356d302 100644
--- a/dev-java/mchange-commons/mchange-commons-0.2.10-r1.ebuild
+++ b/dev-java/mchange-commons/mchange-commons-0.2.10-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/swaldman/${MY_PN}/archive/refs/tags/${MY_P}.tar.gz -
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 IUSE="doc source"
 
diff --git a/dev-java/mchange-commons/mchange-commons-0.2.10.ebuild b/dev-java/mchange-commons/mchange-commons-0.2.10.ebuild
deleted file mode 100644
index da085079a41a..000000000000
--- a/dev-java/mchange-commons/mchange-commons-0.2.10.ebuild
+++ /dev/null
@@ -1,43 +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"
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="${PN}-java"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="a library of arguably useful Java utilities"
-HOMEPAGE="https://github.com/swaldman/mchange-commons-java"
-SRC_URI="https://github.com/swaldman/${MY_PN}/archive/${MY_P}.zip"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-IUSE="doc source"
-
-CDEPEND="
-	dev-java/log4j:0
-	dev-java/slf4j-api:0
-	dev-java/typesafe-config:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/zip
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}"
-
-JAVA_SRC_DIR="src/main"
-
-JAVA_GENTOO_CLASSPATH="
-	log4j
-	slf4j-api
-	typesafe-config"
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index c20ff3b58904..80a035afc84b 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -25,6 +25,7 @@ DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.2_8.tar.gz 192611208 BLAKE2B ef5e801d3d
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u312b07.tar.gz 102144826 BLAKE2B b351fe3a82d8ef1e77314890a00c2920dbe5621bb524c4d4ed80b2f3a3b10853f91b0488ab42a5b1691ba66aa9de8eb0630b9325c3dc7fe6b071e2a95dad6bed SHA512 1b58c5453c473d798e5c4871212c484518b44038f81b32623668174fc47c4118120f770ebe3a21534b7f9e01c383a75cb558538e1e635f7c290686825b4ea78a
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u322b06.tar.gz 102170434 BLAKE2B 84755d791d6aea0b58de68f7ced3e023d7d5f705c99ece9cb91f77663643681ea22672bb1dae143475959374193b1bea1068c0a0f73df4e748430495993d1c5c SHA512 cda25392c8d51b720fac9022de0d7cfc1f496b9e5295b90ee6082e6787d483eaf32198092072b6fe9cadfec157a93f66290691b3d1476572ba2097ab5e70b33c
 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u312b07.tar.gz 98364180 BLAKE2B 2b7cfffa33e9486637f9274f5a3138d6c1a53afa63d24ecb82aff4c0baa8b765003642c582c0191d0d229754dd9de64ab7cda4d81e9168df3d960baa44a5de9a SHA512 8b7273688a1ee28d0a2f918f2fe02586b8ff9e7962bbf8cd2973001594e627b1eef7a9f1893bf3bd3789fabe0058a916ac2d4d53c72cbd8d586e4e7c3217438e
+DIST OpenJDK8U-jdk_arm_linux_hotspot_8u322b06.tar.gz 98420081 BLAKE2B 77d735d6f07320d226cf575c84f3879d7dafb4fa4ce06c737e7bdaf4f731af323c3ed0bdbd66067200ef350c7b5202c75bdf7cdc2a538c54ef1058be54a9d57f SHA512 b355c813b2b382bb37c2ca34c01a631b6651e0559a864286c04518332c513d1f833f8441bed52ecc1e24074951a2e5149ce60c88fa2490165d43d0058efe073c
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u312b07.tar.gz 100571080 BLAKE2B 3a1c5c7488de740210758a34dcc34517c8d5310a9d17c1d251d0ad6d5e7a619595304479b88c807b5d0cd839f85f9b7c819d0dcc297a738052b337b3e962b457 SHA512 0b530ffd0c41fa71962072c70c0712b71573b9d1b66e9b23f6122b770bfa7cc42d8ca0c87a721bb8481104edd062b79ebc09a728f1977699b242b62cd546146b
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u322b06.tar.gz 100615206 BLAKE2B 8956f1ed38732aa8e9880396dce7c477370d128c1a957ba6d135676140f3e8bf233c6563dbcd2f63c2136454a398c49455a96f77224691ded7843f6cac027d1f SHA512 11975e73e6615bcb686703241b0f1589699edfc76a4de97e7066d4d93826dfb8c07a54b6ea3f8a70d231f98d4033c2fbb7741fbf0df374aa810f6cff8b5cda33
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u312b07.tar.gz 103016010 BLAKE2B 9e7b10497bb46a176016f4df6bfa5fa90905bffaaf9668ca39f30a01cccf78c04d1391aed304493159d5b520879762b7e284befdc11c5444b0edff6b363d9c3c SHA512 20ba919c6b4b2f1253b7a9119193f2ee6c16498ed15296ed5d4588284e635fbc53fa368180c1362cb5c3cc2f2446e96d5a752a96d64382ddf73b062319b1ef47
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild
index ed21aac7c018..2a69b6b5e04c 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild
@@ -41,7 +41,7 @@ SRC_URI="
 DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptium.net"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
 IUSE="alsa cups headless-awt selinux source"
 
 RDEPEND="
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild
index 41d54e45d874..69156e432327 100644
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild
@@ -42,7 +42,7 @@ SRC_URI="
 DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptium.net"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
 IUSE="alsa cups +gentoo-vm headless-awt selinux source"
 
 RDEPEND="
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild
index 3d15d16d36a6..1c0861a84f55 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild
@@ -26,6 +26,7 @@ SLOT="$(ver_cut 1)"
 DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptium.net"
 SRC_URI="
+	$(abi_uri arm)
 	$(abi_uri aarch64 arm64)
 	$(abi_uri ppc64le ppc64)
 	$(abi_uri x64 amd64)
@@ -33,7 +34,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 arm64 ~ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
 
 IUSE="alsa cups examples headless-awt selinux source"
 
diff --git a/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild b/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild
index 1860867bf6bb..b1990f6ea4f8 100644
--- a/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild
@@ -40,7 +40,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 
 IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
 
diff --git a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild
index 8f6a2ebb74a4..501c0e15b4d2 100644
--- a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild
@@ -41,7 +41,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 
 IUSE="alsa big-endian cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
 
diff --git a/dev-java/openjdk/openjdk-8.322_p06.ebuild b/dev-java/openjdk/openjdk-8.322_p06.ebuild
index 939553c1795e..5af7952e09b3 100644
--- a/dev-java/openjdk/openjdk-8.322_p06.ebuild
+++ b/dev-java/openjdk/openjdk-8.322_p06.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://openjdk.java.net"
 SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap selinux source"
 
 COMMON_DEPEND="
diff --git a/dev-java/slf4j-api/Manifest b/dev-java/slf4j-api/Manifest
index eb394e27d31e..9b91652ca75b 100644
--- a/dev-java/slf4j-api/Manifest
+++ b/dev-java/slf4j-api/Manifest
@@ -1,2 +1 @@
-DIST slf4j-1.7.30-sources.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
 DIST slf4j-1.7.32.tar.gz 2277207 BLAKE2B d16c93ddc4667700a868d872a58b64248c8594fafa37e05ed300a71061c58ec2b3f1e0036326ff42ebdd57d5df3576e8ec2d8ae6090439b5d8e6f1fa0c555332 SHA512 512c33cb812058a7419eb717e55ad9a0522e602339f088e7295bb0bfb3cf39972412a74479896c14e8c48124d8c2adc4c4d78735f4747b4fa9742ddac2ae07fa
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild
deleted file mode 100644
index 2acf963a0925..000000000000
--- a/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild
+++ /dev/null
@@ -1,55 +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 slf4j-v_1.7.30/slf4j-api/pom.xml --download-uri https://github.com/qos-ch/slf4j/archive/refs/tags/v_1.7.30.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild slf4j-api-1.7.30.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.slf4j:slf4j-api:1.7.30"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The slf4j API"
-HOMEPAGE="https://www.slf4j.org"
-SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf4j-${PV}-sources.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-BDEPEND="app-arch/zip"
-
-S="${WORKDIR}/slf4j-v_${PV}/${PN}"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-JAVA_TEST_EXCLUDES=(
-	# java.lang.InstantiationException - not run by upstream anyway
-	"org.slf4j.helpers.MultithreadedInitializationTest"
-)
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-
-	# remove org/slf4j/impl/ from the jar file
-	zip -d ${PN}.jar org/slf4j/impl/\* || die "Failed to remove impl files"
-}
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.32.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.32.ebuild
index 40f19bf19cb4..bf1ff2d20242 100644
--- a/dev-java/slf4j-api/slf4j-api-1.7.32.ebuild
+++ b/dev-java/slf4j-api/slf4j-api-1.7.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/slf4j-nop/Manifest b/dev-java/slf4j-nop/Manifest
index eb394e27d31e..9b91652ca75b 100644
--- a/dev-java/slf4j-nop/Manifest
+++ b/dev-java/slf4j-nop/Manifest
@@ -1,2 +1 @@
-DIST slf4j-1.7.30-sources.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
 DIST slf4j-1.7.32.tar.gz 2277207 BLAKE2B d16c93ddc4667700a868d872a58b64248c8594fafa37e05ed300a71061c58ec2b3f1e0036326ff42ebdd57d5df3576e8ec2d8ae6090439b5d8e6f1fa0c555332 SHA512 512c33cb812058a7419eb717e55ad9a0522e602339f088e7295bb0bfb3cf39972412a74479896c14e8c48124d8c2adc4c4d78735f4747b4fa9742ddac2ae07fa
diff --git a/dev-java/slf4j-nop/slf4j-nop-1.7.30.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.7.30.ebuild
deleted file mode 100644
index 2a8cbe6c6f10..000000000000
--- a/dev-java/slf4j-nop/slf4j-nop-1.7.30.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom slf4j-v_1.7.30/slf4j-nop/pom.xml --download-uri https://github.com/qos-ch/slf4j/archive/refs/tags/v_1.7.30.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild slf4j-nop-1.7.30.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.slf4j:slf4j-nop:1.7.30"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="SLF4J NOP Binding"
-HOMEPAGE="https://www.slf4j.org"
-SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf4j-${PV}-sources.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: slf4j-v_${PV}/${PN}/pom.xml
-# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
-
-CDEPEND="
-	>=dev-java/slf4j-api-1.7.30:0
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CDEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}"
-
-S="${WORKDIR}"
-
-JAVA_GENTOO_CLASSPATH="slf4j-api"
-JAVA_SRC_DIR="slf4j-v_${PV}/${PN}/src/main/java"
-JAVA_RESOURCE_DIRS=(
-	"slf4j-v_${PV}/${PN}/src/main/resources"
-)
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="slf4j-v_${PV}/${PN}/src/test/java"
-JAVA_TEST_EXCLUDES=(
-	# java.lang.AssertionError: expected:<0> but was:<5>
-	"org.slf4j.impl.MultithreadedInitializationTest"
-)
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
diff --git a/dev-java/slf4j-nop/slf4j-nop-1.7.32.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.7.32.ebuild
index e480511feede..db043c55fe30 100644
--- a/dev-java/slf4j-nop/slf4j-nop-1.7.32.ebuild
+++ b/dev-java/slf4j-nop/slf4j-nop-1.7.32.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/slf4j-simple/Manifest b/dev-java/slf4j-simple/Manifest
index eb394e27d31e..9b91652ca75b 100644
--- a/dev-java/slf4j-simple/Manifest
+++ b/dev-java/slf4j-simple/Manifest
@@ -1,2 +1 @@
-DIST slf4j-1.7.30-sources.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
 DIST slf4j-1.7.32.tar.gz 2277207 BLAKE2B d16c93ddc4667700a868d872a58b64248c8594fafa37e05ed300a71061c58ec2b3f1e0036326ff42ebdd57d5df3576e8ec2d8ae6090439b5d8e6f1fa0c555332 SHA512 512c33cb812058a7419eb717e55ad9a0522e602339f088e7295bb0bfb3cf39972412a74479896c14e8c48124d8c2adc4c4d78735f4747b4fa9742ddac2ae07fa
diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.30-r1.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.30-r1.ebuild
deleted file mode 100644
index 1cea0263a4b9..000000000000
--- a/dev-java/slf4j-simple/slf4j-simple-1.7.30-r1.ebuild
+++ /dev/null
@@ -1,74 +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 slf4j-v_1.7.30/slf4j-simple/pom.xml --download-uri https://github.com/qos-ch/slf4j/archive/refs/tags/v_1.7.30.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild slf4j-simple-1.7.30.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.slf4j:slf4j-simple:1.7.30"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="SLF4J Simple binding"
-HOMEPAGE="https://www.slf4j.org"
-SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf4j-${PV}-sources.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: slf4j-v_${PV}/${PN}/pom.xml
-# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
-
-CDEPEND="
-	>=dev-java/slf4j-api-1.7.30:0
-"
-
-# Compile dependencies
-# POM: slf4j-v_${PV}/${PN}/pom.xml
-# test? junit:junit:4.12 -> >=dev-java/junit-4.12:4
-# test? org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CDEPEND}
-	test? (
-		>=dev-java/slf4j-api-1.7.30:0
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}
-"
-
-S="${WORKDIR}/slf4j-v_${PV}/${PN}"
-
-JAVA_GENTOO_CLASSPATH="slf4j-api"
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,slf4j-api"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
-	# java.lang.InstantiationException
-	"org.slf4j.helpers.MultithreadedInitializationTest"
-
-	# java.lang.AssertionError: 1284 < 1263+16
-	"org.slf4j.helpers.SimpleLoggerMultithreadedInitializationTest"
-)
-
-src_prepare() {
-	default
-	java-pkg_clean
-	cp "../slf4j-api/src/test/java/org/slf4j/helpers/MultithreadedInitializationTest.java" \
-		"${JAVA_TEST_SRC_DIR}/org/slf4j/helpers/" || die
-	cp "../slf4j-api/src/test/java/org/slf4j/LoggerAccessingThread.java" \
-		"${JAVA_TEST_SRC_DIR}/org/slf4j/" || die
-}
diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.32.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.32.ebuild
index c0eeacfedb10..a98ef1a0d287 100644
--- a/dev-java/slf4j-simple/slf4j-simple-1.7.32.ebuild
+++ b/dev-java/slf4j-simple/slf4j-simple-1.7.32.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/xmlunit/xmlunit-1.6-r1.ebuild b/dev-java/xmlunit/xmlunit-1.6-r1.ebuild
index c285e2891c96..9c340bc65330 100644
--- a/dev-java/xmlunit/xmlunit-1.6-r1.ebuild
+++ b/dev-java/xmlunit/xmlunit-1.6-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://xmlunit.sourceforge.net/"
 
 LICENSE="BSD"
 SLOT="1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 CDEPEND="dev-java/junit:0"
 
diff --git a/dev-java/xmlunit/xmlunit-1.6.ebuild b/dev-java/xmlunit/xmlunit-1.6.ebuild
deleted file mode 100644
index b6e5dc47b97b..000000000000
--- a/dev-java/xmlunit/xmlunit-1.6.ebuild
+++ /dev/null
@@ -1,54 +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 test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="XMLUnit extends JUnit and NUnit to enable unit testing of XML"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-HOMEPAGE="http://xmlunit.sourceforge.net/"
-
-LICENSE="BSD"
-SLOT="1"
-KEYWORDS="amd64 ppc64 x86"
-
-CDEPEND="dev-java/junit:0"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip:0
-	doc? ( app-text/docbook-xsl-stylesheets:0 )
-	test? (
-		dev-java/ant-junit:0
-		dev-java/ant-core:0
-	)
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="junit"
-
-EANT_DOC_TARGET="users-guide-html javadocs"
-EANT_ANT_TASKS="ant-core"
-EANT_EXTRA_ARGS="-Ddb5.xsl=/usr/share/sgml/docbook/xsl-stylesheets"
-
-src_test() {
-	ANT_TASKS="ant-junit ant-core" eant test
-}
-
-src_install() {
-	java-pkg_newjar "build/lib/${P}.jar"
-
-	dodoc README.txt
-
-	if use doc; then
-		java-pkg_dojavadoc build/doc/api
-		dohtml build/doc/userguide/html/*
-	fi
-
-	use source && java-pkg_dosrc src/java/org
-}