[gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/files/, dev-java/jdom/

[Miroslav Šulc]

commit:     50a56a0bf3dd898b5f7c9fea5ce16d8b7bc893b2
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Apr 17 15:18:48 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Apr 18 13:44:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50a56a0b

dev-java/jdom: eapi7, min java 1.8

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20427
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/jdom/files/build-xml-2.patch |  4 +--
 dev-java/jdom/jdom-2.0.6-r5.ebuild    | 64 +++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/dev-java/jdom/files/build-xml-2.patch b/dev-java/jdom/files/build-xml-2.patch
index 2e3cb94ef1d..420f9eff199 100644
--- a/dev-java/jdom/files/build-xml-2.patch
+++ b/dev-java/jdom/files/build-xml-2.patch
@@ -1,5 +1,5 @@
---- build.xml.orig	2015-02-15 02:58:04.000000000 +0000
-+++ build.xml	2015-08-27 23:11:09.807800249 +0100
+--- 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>

diff --git a/dev-java/jdom/jdom-2.0.6-r5.ebuild b/dev-java/jdom/jdom-2.0.6-r5.ebuild
new file mode 100644
index 00000000000..b1c14083879
--- /dev/null
+++ b/dev-java/jdom/jdom-2.0.6-r5.ebuild
@@ -0,0 +1,64 @@
+# 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
+}