5 files changed, 103 insertions, 104 deletions
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index 004f1df8258a..a6b8e25f5dfb 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,6 +1,5 @@
-AUX build-xml-2.patch 1528 BLAKE2B f9ba4714bfe2ad46019c71655128512c639b8dfb54f53ed0e279b4b0d346df6fba33e0f7cafbced54e7b8ac16ed542d2a8cd57bb351ea5db5fa0764da51201a5 SHA512 08c8414a04d849ad8f70519a94ff4a29b7557354903ac38ed1b3e6213a4b996fe235ce36b11b869da13692d0e644ef5afc810dd23736afa9c22cabaf70bd3e8a
-DIST JDOM-2.0.6.tar.gz 8344114 BLAKE2B 0b9a568fe4de1fb9afc5a547d75aa1d3556bf497c76e3d32d1ebd7658634ea02e4fafa3c6261b64d9b803fc6e78ae013fb8a366bcbd5024e8ab0aced83f58e33 SHA512 d585b39159f0887485b2e681609b51113de6bc7c43627c42d7e81eb06ac65c507b43cf3d81c5df4399b1e3abf454c8852264a84567940bc5ba0c358eb9c0c4a1
+DIST JDOM-2.0.6.1.tar.gz 8368301 BLAKE2B b9d5d8e611b9a0505c9576f2c4a2243eddd8a171bbe44d83440edf44154cae80138ddca8a0bceb3124a6825111d30641a28d645507a1bacad6a8cb9ad1dbccdd SHA512 c09b422b0635a478cb70e57e4c35bc7f505f6a2730be813d6e63c053814581e4dc3fdf431b945394c30ab37a8fb83fd103767f8de84d28bef79e95e2c37518e1
 DIST jdom-1.1.3.tar.gz 4233403 BLAKE2B 9e4afacc6f10d2be1d793bd3b9f438f79e8e27f50bcae83eac5054df806c01c211ac493465bcda58ac204e796663ffb8aedf43a177f23c23a69af399243461a0 SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278
 EBUILD jdom-1.1.3-r1.ebuild 1252 BLAKE2B 1f13d6f90843dd28a886d5b8158d33602239d6fe7540655166a7bf8aa6f3201cb9a3700a7a1ea669c04a7aa8a94432ed6b8e6c1df5a3b1ed36243ec1bb3d0f1d SHA512 bf245f0d9e759c1c0ebe8937d980e391480687eb53ba0234e5f7b02f124b4a55b61bf6001d391da7fbb58de4a82d7ec90b9bd63a101d869e1d96c14d43a792a6
-EBUILD jdom-2.0.6-r5.ebuild 1374 BLAKE2B e317fd9ddda54ad8b1302b2cbdb77b32b8a0be05b0644634b1a00605f5a3b97332735ac6f978d618ef66baca93b684fb357fd97e3f03e7f0ac208467e9513e44 SHA512 64fd4bdb5771f313e2e4a9a8054e092c9f21041fc2c3438e6dff319138533362473f891bfba4f30c6c4dc64db6bc39f6ab42a445a8679bc3d6c25645b62daf16
-MISC metadata.xml 319 BLAKE2B 6c782c87fce5298ecd5e22b1a92556ea712547d51c7bf8df320cc93dc1dee0b38746973bb804dd4fe419c71f1f85b7533d291d60e5426e81175b0ed740d4ca96 SHA512 2852437e9162284cf7ab5cf0738fa79f37b4b15113898a2fd5ef4f68ef3abe564aa85029232a22de261a39672d55d7d3bc471d19d844adb42ee9337b5599c3ec
+EBUILD jdom-2.0.6.1.ebuild 2142 BLAKE2B 1a2adb4054650e2f62173cf6843031da74429b76da6b6390c60e4a873561fd626e572da0e87eed65b9c3d78c6224603b0be8772313db151d55b2190dd9e1ad22 SHA512 8758a72cc650a113ebe7e18155315c183513363aaa1abff4d7ee0d55c181901701ca80625b7b8633ee97057ff111dd850eaf3461800983e972cb082c8caabe55
+MISC metadata.xml 870 BLAKE2B 4f720a44e7f3d2c808e81aeebcdb11963cbdc590d61d9edd4ea5794913096b84ad463726071f66848a26d7a6209c466db4a00253793c08d7fc848fc780da1763 SHA512 516809ec60e2c6763949ddac1cd2cce46a52973c3be148a6153b0941787d4a798699206367ba26e707f1e671a5f851b00281b84b18592b3ece442bc4129aafaf
diff --git a/dev-java/jdom/files/build-xml-2.patch b/dev-java/jdom/files/build-xml-2.patch
deleted file mode 100644
index 420f9eff1993..000000000000
--- a/dev-java/jdom/files/build-xml-2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/build.xml	2015-02-15 02:58:04.000000000 +0000
-+++ b/build.xml	2015-08-27 23:11:09.807800249 +0100
-@@ -267,7 +267,7 @@
- 		</javac>
- 	</target>
- 	
--	<target name="compile" depends="compile.core, compile.junit, compile.contrib, compile.samples"
-+	<target name="compile" depends="compile.core, compile.contrib, compile.samples"
- 	 		description="Compiles all JDOM code (core, samples, junit, contrib)" />
- 
- 	<!-- =================================================================== -->
-@@ -296,7 +296,7 @@
- 	<!-- =================================================================== -->
- 	<!-- Creates the jars                                           -->
- 	<!-- =================================================================== -->
--	<target name="jars" depends="compile, javadoc"
-+	<target name="jars" depends="compile"
- 	    description="Builds the Jars">
- 		<fixcrlf srcdir="." includes="**/*.bat" excludes="build*.*" eol="crlf"/>
- 		<fixcrlf srcdir="." includes="**/*.sh" excludes="build*.*" eol="lf"/>
-@@ -320,6 +320,7 @@
- 			<fileset dir="${contrib.build}" includes="**/*" />
- 			<fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />
- 		</jar>
-+<!--
- 		<jar jarfile="${package}/${jarbase}-junit.jar" >
- 			<fileset dir="${junit.build}" includes="**/*" />
- 			<fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />
-@@ -332,6 +333,7 @@
- 			<fileset dir="${contrib.src}" includes="**/*" />
- 		</jar>
- 	    	    
-+-->
- 	</target>
- 	
- 	<target name="androidtests" depends="jars">
diff --git a/dev-java/jdom/jdom-2.0.6-r5.ebuild b/dev-java/jdom/jdom-2.0.6-r5.ebuild
deleted file mode 100644
index 772c36da6de7..000000000000
--- a/dev-java/jdom/jdom-2.0.6-r5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="JDOM-${PV}"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="https://github.com/hunterhacker/${PN}/archive/${MY_P}.tar.gz"
-HOMEPAGE="http://www.jdom.org"
-
-LICENSE="Apache-1.1"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-java/iso-relax:0
-	dev-java/jaxen:1.2
-	dev-java/xalan:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*
-	test? ( dev-java/ant-junit:0 )"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="jars"
-EANT_TEST_TARGET="junit"
-EANT_GENTOO_CLASSPATH="iso-relax,jaxen-1.2,xalan"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/build-xml-2.patch"
-)
-
-src_prepare() {
-	default
-	java-pkg_clean
-
-	# Remove Android stuff to avoid junit RDEPEND.
-	rm -vr contrib/src/java/org/jdom2/contrib/android || die
-}
-
-src_install() {
-	java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??.jar ${PN}.jar
-	java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??-contrib.jar ${PN}-contrib.jar
-
-	dodoc {CHANGES,COMMITTERS,README,TODO}.txt
-	use doc && java-pkg_dojavadoc build/apidocs
-	use source && java-pkg_dosrc {contrib,core}/src/java/*
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
diff --git a/dev-java/jdom/jdom-2.0.6.1.ebuild b/dev-java/jdom/jdom-2.0.6.1.ebuild
new file mode 100644
index 000000000000..5cbdaa66520d
--- /dev/null
+++ b/dev-java/jdom/jdom-2.0.6.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.jdom:jdom2:2.0.6.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java-based solution for accessing, manipulating, and outputting XML data"
+HOMEPAGE="http://www.jdom.org"
+SRC_URI="https://github.com/hunterhacker/jdom/archive/${PN^^}-${PV}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="2"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# FAILURES!!!
+# Tests run: 1887,  Failures: 23
+RESTRICT="test"
+
+CP_DEPEND="
+	dev-java/iso-relax:0
+	dev-java/jaxen:1.2
+	dev-java/xalan:0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	test? (
+		dev-java/xerces:2
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+S="${WORKDIR}/jdom-JDOM-${PV}"
+
+JAVA_TEST_SRC_DIR="test/src/java"
+JAVA_TEST_RESOURCE_DIRS="test/src/resources"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,xerces-2"
+
+src_prepare() {
+	default
+	java-pkg_clean
+
+	# Remove Android stuff to avoid junit RDEPEND.
+	rm -vr contrib/src/java/org/jdom2/contrib/android || die
+
+	# There are resources in JAVA_TEST_SRC_DIR
+	cp -r test/src/{java,resources}/org || die
+	# Remove .java files from JAVA_TEST_RESOURCE_DIRS
+	find test/src/resources -type f -name '*.java' -exec rm -rf {} + || die "deleting classes failed"
+}
+
+src_compile() {
+	JAVA_SRC_DIR="core/src/java"
+	JAVA_JAR_FILENAME="jdom.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":jdom.jar"
+	rm -rf target || die
+
+	JAVA_SRC_DIR="contrib/src/java"
+	JAVA_RESOURCE_DIRS="contrib/src/resources"
+	JAVA_JAR_FILENAME="jdom-contrib.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":jdom-contrib.jar"
+	rm -rf target || die
+
+	if use doc; then
+		JAVA_SRC_DIR=()
+		JAVA_SRC_DIR=(
+			"core/src/java"
+			"contrib/src/java"
+		)
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg_dojar "jdom.jar"
+	java-pkg_dojar "jdom-contrib.jar"
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+	if use source; then
+		java-pkg_dosrc "core/src/java/*" "contrib/src/java/*"
+	fi
+}
diff --git a/dev-java/jdom/metadata.xml b/dev-java/jdom/metadata.xml
index 129b89aa2cb9..8495676e21fd 100644
--- a/dev-java/jdom/metadata.xml
+++ b/dev-java/jdom/metadata.xml
@@ -8,4 +8,7 @@
 	<upstream>
 		<remote-id type="github">hunterhacker/jdom</remote-id>
 	</upstream>
+	<longdescription>
+		JDOM is a Java-oriented object model which models XML documents.  It provides a Java-centric means of generating and manipulating XML documents. While JDOM interoperates well with existing standards such as the Simple API for XML (SAX) and the Document Object Model (DOM), it is not an abstraction layer or enhancement to those APIs. Rather, it seeks to provide a robust, light-weight means of reading and writing XML data without the complex and memory-consumptive options that current API offerings provide.
+	</longdescription>
 </pkgmetadata>