gentoo resync : 28.04.2021

5 files changed, 108 insertions, 54 deletions

diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index d26f6903b243..d9d80b02585a 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,7 +1,8 @@
 AUX jaxen-1.1.4_maven1-build.xml 13148 BLAKE2B c5f6421878e732db00b2d5daede8d93cdf1d349c1dfdbb6f83a607d734dc05f0847ce5f8cc86ec1a2be5855d96dfc1a3128c0811846f4a5c7679dd60ad730c12 SHA512 2f3625a2a14066289b20e1118a87168e6cf1ce252becdccbc6f4eeefac446e528298e1e6af7d1304ff9d1d4ee8c394c2cf67f6799d3062091d53cce7ff5b1e42
 DIST jaxen-1.1.4-src.tar.gz 268493 BLAKE2B ff51cf3b6507f19549ab864fa4cd53d0b2d0c34a21a944d22feed74d58fb71c0273f5b560cc9c02aa50748f672115e77fab24a2d986508841d6a0ba4b8911690 SHA512 11c1c744af030c50579f872d8c8bf437e48ab4a01e6dd34529f2d9039c154533edaa9b5a367a866e2b57f311f1111717be300db8f80423c5492be38e0cffc031
 DIST jaxen-1.1.6.jar 409677 BLAKE2B 55e03939420c103fb5a6d323595ff0cb7653885eb9ba233fd581c5376d2ac90eecde7aa5576f602cdc459cfd9ba9e79c6bb5bfab3ed7805e717a21670a5748ee SHA512 979044fe959493eb6d66fa92b420251cd9c12414051ff6956d5835888a8999d4f337c18646c53806fc19203cef744f53b7597850cd2f695910c90df7a9725b48
+DIST jaxen-1.2.0.tar.gz 282829 BLAKE2B 4d89d4fd3dfd8c4113fe7ecc05597ea9dd743d9c871f320936809016ae8cb3a3d4fb3f935de19463e6c99db1b67eff3545e909b707e81f4c0f114ec0f0e7bb97 SHA512 cecfc62eab1cf6586b28594855bd983679a932dbdc6cbdd07d85a9a9458e78b2e784dfd6287e6e87e4f4443239eefbeac59a7316dae53b818379daaccae56b53
 EBUILD jaxen-1.1.4-r1.ebuild 1082 BLAKE2B 5a63323c265e84a70008b4f44788ab50f0c370906f63d46aecd4e476b23c31aa37162b21d9d6ad950c3e59e758ffd711d204b8d8bf05fe1ee3e4076ec07d5daf SHA512 82a7a8b205958e9e81d28887c747a9731077458f213af8c30551fd9eed78cdcf9cd7e29fe385e3c9513f3421fb222c4aad8f959bc1c59d1e42da38847e3e1f0d
-EBUILD jaxen-1.1.6-r1.ebuild 886 BLAKE2B 9bdcae339d701ba219baa7ba9fea620f6107cbbab7e14baa7533ef14d7b8cb5450af23044cdcb11af32273bf260fd366294a6a5348c957850c657c996e9a6b50 SHA512 2facca63e346083a6842c004d048ca819668668f78dd8444f88a3d6425c785828178a2a482608c4b02395e2340e4405c8a87a78b9643e83fe8f2bdb92ac7c104
-EBUILD jaxen-1.1.6.ebuild 613 BLAKE2B 7f5654f3b927954ff7511664248e6083fa7b3019e1fa893e356175a27fd40d812f8ef0470fbf9c1cff8906e87048b9d808c9d377f8c7e872662339ce821b2690 SHA512 4bb8b4f2c124f9eac8e96ce99cb32d39dd04c46e6e17b7217f8791d417ce8dc87067d611df50967a2caec67265fdb14aac9d0f28a57c4bfe88f941bd860bf91e
-MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
+EBUILD jaxen-1.1.6-r2.ebuild 864 BLAKE2B b13a456435ae9c5bf982e89c6f6bb84ed44d074e26d8efc762de0bd219d31850561455093e9538b53e0982ab9c4041bdc8f87559cb8da22b9420bb8742691fe0 SHA512 507cc60f4c7f85e6f87f9d1c198a75e04cdf6936f541923c7b0ff8606e0f5fbb9a040a52f4339925e70c9e696a0b59ce92356389c2fbd19ee49df15f57209e17
+EBUILD jaxen-1.2.0-r1.ebuild 1919 BLAKE2B 90a69225c4086bf95f16cb8308842f703970cdc0ebd95e354d6868d29172ec6b9af479fa3ef546f1f8432afc807643bcf2de6ea937524fd32ee26a7f10807d8b SHA512 51df4c02d9ff569fb37b2f4629f2ea9b7817fdb3030d303728401c424f0feec73528b328af05e910de5a9b7b1dee7e48cda55e5662a903a0c0272df842ef3990
+MISC metadata.xml 718 BLAKE2B 14654870dfbaef53f3fc46124c5df04970de2699ed0d3f453a1b98603dee6f805fc6018477b08ea82c01617d17969a06233c0cc1e41038dc43c5ae4ffe3d16b8 SHA512 d37502fe1c0e32f28599da74657433561cddb87d15b80c3fe05242cbb0032a7abcb04180890126f89ff5c30b39f9614b1eb255bce7af01ca51eda3807902aafa
diff --git a/dev-java/jaxen/jaxen-1.1.6-r1.ebuild b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
index c364ebdd0230..e8fcb57853e0 100644
--- a/dev-java/jaxen/jaxen-1.1.6-r1.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 
@@ -13,24 +13,15 @@ SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${
 
 LICENSE="JDOM"
 SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-CDEPEND="
-	dev-java/jdom:0
-	dev-java/dom4j:1"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
 
 RDEPEND="
 	${CDEPEND}
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.8:*"
 
 DEPEND="
 	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="
-	jdom
-	dom4j-1
-"
+	>=virtual/jdk-1.8:*"
 
 JAVA_SRC_DIR="org"
 
@@ -41,5 +32,8 @@ src_prepare() {
 	# require jaxen to depend on xom, we end up in a circular dep.
 	# I fear though that removing those classes might bite us somewhere down
 	# the line...
-	rm -rv org/jaxen/xom || die
+	rm -rv org/jaxen/{dom4j,jdom,xom} || die
+
+	# this is now part of jdk
+	rm -rv org/w3c || die
 }
diff --git a/dev-java/jaxen/jaxen-1.1.6.ebuild b/dev-java/jaxen/jaxen-1.1.6.ebuild
deleted file mode 100644
index 77b073b118a4..000000000000
--- a/dev-java/jaxen/jaxen-1.1.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 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
-
-DESCRIPTION="A Java XPath Engine"
-HOMEPAGE="https://github.com/codehaus"
-SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
-
-LICENSE="JDOM"
-SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-CDEPEND="
-	dev-java/dom4j:1
-	dev-java/jdom:0
-	dev-java/xom:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="
-	xom
-	jdom
-	dom4j-1
-"
diff --git a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..3722e883f75b
--- /dev/null
+++ b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jaxen-xpath/jaxen/archive/refs/tags/v1.2.0.tar.gz --slot 1.2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jaxen-1.2.0.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="jaxen:jaxen:1.2.0"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jaxen is a universal XPath engine for Java."
+HOMEPAGE="http://www.cafeconleche.org/jaxen/"
+SRC_URI="https://github.com/${PN}-xpath/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="1.2"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+IUSE="dom4j jdom xom"
+
+# It seems that most tests depend on dom4j, jdom and xom which all depend back on jaxen
+REQUIRED_USE="test? ( dom4j jdom xom )"
+
+# Compile dependencies
+# POM: pom.xml
+# xerces:xercesImpl:2.6.2 -> >=dev-java/xerces-2.12.0:2
+# xml-apis:xml-apis:1.3.02 -> >=dev-java/xml-commons-external-1.4.01:1.4
+# POM: pom.xml
+# test? junit:junit:3.8.2 -> >=dev-java/junit-3.8.2:0
+
+CDEPEND="
+	dom4j? ( dev-java/dom4j:1 )
+	jdom? ( dev-java/jdom:0 )
+	xom? ( dev-java/xom:0 )
+"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}"
+
+DOCS=( "${P}"/{LICENSE.txt,README.md} )
+
+JAVA_SRC_DIR="${P}/src/java/main"
+
+JAVA_TEST_SRC_DIR="${P}/src/java/test"
+JAVA_TEST_GENTOO_CLASSPATH="junit"
+
+src_prepare() {
+	default
+
+	if use dom4j; then
+		JAVA_GENTOO_CLASSPATH+=" dom4j-1"
+	else
+		rm -rv "${JAVA_SRC_DIR}"/org/jaxen/dom4j || die
+	fi
+
+	if use jdom; then
+		JAVA_GENTOO_CLASSPATH+=" jdom"
+	else
+		rm -rv "${JAVA_SRC_DIR}"/org/jaxen/jdom || die
+	fi
+
+	if use xom; then
+		JAVA_GENTOO_CLASSPATH+=" xom"
+	else
+		rm -rv "${JAVA_SRC_DIR}"/org/jaxen/xom || die
+	fi
+}
+
+src_install() {
+	default
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jaxen/metadata.xml b/dev-java/jaxen/metadata.xml
index 952a4b9b605c..e20be5fb7b4e 100644
--- a/dev-java/jaxen/metadata.xml
+++ b/dev-java/jaxen/metadata.xml
@@ -5,4 +5,15 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<use>
+		<flag name="dom4j">Includes org.jaxen.dom4j package</flag>
+		<flag name="jdom">Includes org.jaxen.jdom package</flag>
+		<flag name="xom">Includes org.jaxen.xom package</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">jaxen-xpath/jaxen</remote-id>
+		<doc>https://github.com/jaxen-xpath/jaxen/wiki/Jaxen-Wiki</doc>
+		<bugs-to>https://github.com/jaxen-xpath/jaxen/issues</bugs-to>
+		<changelog>https://github.com/jaxen-xpath/jaxen/wiki/Changelog</changelog>
+	</upstream>
 </pkgmetadata>