gentoo resync : 28.04.2021

5 files changed, 80 insertions, 13 deletions

diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index 5cf3d071e926..218db5fc84d1 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,6 +1,7 @@
-AUX build-xml-2.patch 1529 BLAKE2B 37aee7dc0ab5b130c16a67b2470e8e3d4052b73c9cc944fc5f1e6cf5b1c8d57d046260829f7a785a0f7b35240318fc9bbcb28fc10b245981dd36957637084fa3 SHA512 210f0fa113a75a0bb2f34b50e3893df69e5b7f02174f7f10ea981cd16371da515a6c8514c2f82045c3a6a64c5a11874b2f81e5ad975270f11eb8c12fa707f563
+AUX build-xml-2.patch 1528 BLAKE2B f9ba4714bfe2ad46019c71655128512c639b8dfb54f53ed0e279b4b0d346df6fba33e0f7cafbced54e7b8ac16ed542d2a8cd57bb351ea5db5fa0764da51201a5 SHA512 08c8414a04d849ad8f70519a94ff4a29b7557354903ac38ed1b3e6213a4b996fe235ce36b11b869da13692d0e644ef5afc810dd23736afa9c22cabaf70bd3e8a
 DIST JDOM-2.0.6.tar.gz 8344114 BLAKE2B 0b9a568fe4de1fb9afc5a547d75aa1d3556bf497c76e3d32d1ebd7658634ea02e4fafa3c6261b64d9b803fc6e78ae013fb8a366bcbd5024e8ab0aced83f58e33 SHA512 d585b39159f0887485b2e681609b51113de6bc7c43627c42d7e81eb06ac65c507b43cf3d81c5df4399b1e3abf454c8852264a84567940bc5ba0c358eb9c0c4a1
 DIST jdom-1.1.3.tar.gz 4233403 BLAKE2B 9e4afacc6f10d2be1d793bd3b9f438f79e8e27f50bcae83eac5054df806c01c211ac493465bcda58ac204e796663ffb8aedf43a177f23c23a69af399243461a0 SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278
-EBUILD jdom-1.1.3.ebuild 1246 BLAKE2B 3ef43cd51122845127dce0d1df9dc6917ed9fddcdc33531ce526cd0ed6084594af4af0bb4ab870e14b44a14b5042277dc2337589b94c6bdb984c7cbc5c7aabff SHA512 5d76371202339ad4de3e1562676b075790c76377642ee3dc0e27c508dfd4389d7c9fb5e40c9449fb7b4e1aea1949d78e7324977a2925ea8dd9ac44cbac0f645d
-EBUILD jdom-2.0.6-r4.ebuild 1394 BLAKE2B 03c11737d5b00aa8f9ae9117e45803121cbcb078042ff939e6b5a60f0612bc64483c5cf5acd115e34b1920785b52c3fa56466823aa43c4b0feeebcb4a6bf6100 SHA512 3bfaf4d330f8d4499f3ebc2bc241fce36b985cb4a883f518d6e2cfc912f3fe6e15ce449ca5c1d2774a95c3049b2a123f66444ef13df2b3f7cc8d2bd77c664ada
+EBUILD jdom-1.1.3-r1.ebuild 1252 BLAKE2B 1f13d6f90843dd28a886d5b8158d33602239d6fe7540655166a7bf8aa6f3201cb9a3700a7a1ea669c04a7aa8a94432ed6b8e6c1df5a3b1ed36243ec1bb3d0f1d SHA512 bf245f0d9e759c1c0ebe8937d980e391480687eb53ba0234e5f7b02f124b4a55b61bf6001d391da7fbb58de4a82d7ec90b9bd63a101d869e1d96c14d43a792a6
+EBUILD jdom-2.0.6-r4.ebuild 1394 BLAKE2B 15121dd00dbe1b5b35ed9848d22bbd97483644869a0662712679cb6addb9d6f27f7914e93d0fc2548ababc37b865561ec92dcc420584fcb16139d6f8b4c444b4 SHA512 e5419858ca9241520c7906818e353f309a8ed9687075ed1c41c597e7e1c2a58570c248f612db420b66d19dfafbf88bd02250cb63f371523d3ce2f4e09d99f2b6
+EBUILD jdom-2.0.6-r5.ebuild 1375 BLAKE2B c45228fb66d7a5c68c820029f1d5a65ad57210f74a2830115b9d5d6d210b86742263cde95ed8f66a5c90788b1a6769f2367be7d3e111d066d89de2314aeecd25 SHA512 ea1527f581d69177aa11b4468d7fa0d47298457d3a6d74d38f6f2ced2171c6bf0868d1d6d345935ecdfbb6ce5657b37c4bffadecfee9e96fdda3f8a7042c6a41
 MISC metadata.xml 318 BLAKE2B cbcc3f9c0ce67aa9619d21197006bffc71f6ae3d0707a5bdd3902a0d51f90724f3ce81e21c80f6a011885cd036f397d2cb679335d05a0e1bf7e4bff3470c9019 SHA512 1587f961d80cba775d94e97a9c41516766d6a502f9b144f401ebcd0ee0b21b2e04220730c03a44986af8bc860a0311acdd6e721d4de201defcbc89599df5803b
diff --git a/dev-java/jdom/files/build-xml-2.patch b/dev-java/jdom/files/build-xml-2.patch
index 2e3cb94ef1d2..420f9eff1993 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-1.1.3.ebuild b/dev-java/jdom/jdom-1.1.3-r1.ebuild
index 7d7440c09783..f176d2284a81 100644
--- a/dev-java/jdom/jdom-1.1.3.ebuild
+++ b/dev-java/jdom/jdom-1.1.3-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 JAVA_PKG_IUSE="doc examples source"
 
 inherit java-pkg-2 java-ant-2
@@ -9,17 +10,18 @@ inherit java-pkg-2 java-ant-2
 DESCRIPTION="Java API to manipulate XML data"
 SRC_URI="http://www.jdom.org/dist/binary/archive/${P}.tar.gz"
 HOMEPAGE="http://www.jdom.org"
+
 LICENSE="JDOM"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE=""
 
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
 
 S="${WORKDIR}/${PN}"
 
-java_prepare() {
+src_prepare() {
+	default
 	java-pkg_clean
 
 	rm -r build/apidocs || die
diff --git a/dev-java/jdom/jdom-2.0.6-r4.ebuild b/dev-java/jdom/jdom-2.0.6-r4.ebuild
index 30bbc1c03e90..8549f9e42e10 100644
--- a/dev-java/jdom/jdom-2.0.6-r4.ebuild
+++ b/dev-java/jdom/jdom-2.0.6-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 MY_P="JDOM-${PV}"
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit epatch 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"
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 000000000000..74fde49b3c18
--- /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
+}