gentoo resync : 16.01.2021

4 files changed, 3 insertions, 175 deletions

diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
index eb22c6f2af35..1e1b851a001b 100644
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@@ -1,9 +1,5 @@
 AUX dom4j-2.1.3-xpp3-add-removeAttribute.patch 1847 BLAKE2B 08e1bc056f0982c4fb30782321724137870afd81d1d9158cd6a2179fb50b8c77cec3e5c2e7e2d97072cd60122e7b5ad3b8a8107f7d85e99fda7ab06dd0f276bd SHA512 7c0da264384436bd3565d098059faac6ea0ac3a75d1bd21a22fa51dc9e77027c4acf0efccc0e1cfc7a4bed191e65d25eb4fc4b6fdb10f315202b1c93f0c15be4
-DIST dom4j-1.6.1-java5.patch.bz2 2900 BLAKE2B cdd7dc901f5292af3ef7f0ea200c3d22bbc8c0adc27606da3c8fbadc44625b114c995321723dca331f0b23d5248e1f9177f0def2f4138eebcbd4aaac0495d4dd SHA512 38da606d77b62976366cd089e5194a922e348ec396e7b9af4dceb0a536c47f66e0900cfa59c91df04aade6076630077a8f88c713b9c20224d69316109b293a96
-DIST dom4j-1.6.1.tar.gz 9687211 BLAKE2B 3daa3729ea071aa87c7c1e1e2b91f1635109774dd2bd564a85265a0286f1369373084b945409d9d5213d66a7e14224033d42c58d80125b7982eef8961eb29248 SHA512 95c5a7105a81734f77b4bf27f8bb0af116bf43d8ad5297a0902a6687a54109a87dffe2953cf430d14947cdaa590aa0fdf083b46a91d1d98d48431cfae4459d94
 DIST dom4j-2.1.3.tar.gz 565918 BLAKE2B d6f8c9ae22f84086491ca7e60e5498edda727b219b4fe019da8f62a441dc3cea86ecf0554e32f8e717e21234b8ef8e2905946ab3722462f1fa748ad7e68e9e20 SHA512 8c4d7b4f2dd1b3f806e0d5103101998a094c31e9a4912539dcee32f24b35452c7f0d72c5f4cf55f8a8c9a416fee7284f9bca43ae56b0e66104b2b54fdb49ad96
 DIST jaxen-1.2.0.jar 232455 BLAKE2B 6bd16e8ac34f3af1b9d61218dc6a29862178516cfbb98c6834bf6db846b537e44b48db6ff578b3d67d32c3e2b142e44440a2fdcc6dc06a6ea427b04e6bf1f370 SHA512 cad582fc12d0741e9e6fd7e0cf80a50feb04f5ef42043df96f8a5b78476c77695d8b43836d2241f76b35676ea759921edd25eaeb2c04ec916eb138aa2901ce5f
-EBUILD dom4j-1.6.1-r8.ebuild 1907 BLAKE2B c2802e3270130c27a14cbcd02dfb9228f73e29f39f9866521af5f870396e43a0745836c2279f16b8f4452bed47f2529ac9cb488aa7fe982602affd9ef5fc2f00 SHA512 843e5b3a520ab7ed50fe1ec926b34d5ef114c2dd5d3d7813f12fbd00c018ba791f98294aa300b8042bd6659c31e2e25ee407710c0f9e8a36f79eba7a4e3c603f
-EBUILD dom4j-1.6.1-r9.ebuild 1900 BLAKE2B 314238d8a36167053c0b148c429206b042b5fa14929edd7c92741131596fc24f39e668d165abcb26ea3b5b14363777f725a30893e2395ee57564a875b6cc2306 SHA512 30dab95cdb84bae7a4873be00f1d37f8f412a31f19748a02370071a94407c7d0de1dcdcaaee67aad7d1e024db24218b88d206d373e781b5d2e18154dab051cb1
-EBUILD dom4j-2.1.3.ebuild 2245 BLAKE2B aa4c05813def4d1d4bd051427c2fe9518e619abed07a8078df3b07519f6f1fa61a8987c02e89c9952e58a80568046fd26312d741d1e336bdc9dc1342c57cfc72 SHA512 a9d3be0f1cdbfca6995ad9682f9c0372c29427bb34383a8c15e8b7da829c554913930cdf03a60e312a04835649334247b592f744c8ac652d0df35287573b59f6
+EBUILD dom4j-2.1.3.ebuild 2250 BLAKE2B e49e599471e8bb71cdf607dcde2d8899a55f9a5ba3b1f7a3b2a51562c0379c77a31bea78e15f3d933b2a89a6044270ff0681606f0cd5ef6193460b3d8d28d874 SHA512 fd60f6eab2ce00a1b66a08ee3f20ddb1e490c1fd15bfe15b23eccd914eac01dc31916eaf81fa19854fb3fe116dbd57ec46cac1accd6ba908951bdc4c10bde19d
 MISC metadata.xml 715 BLAKE2B c04caaffea1283ffce1b0057504dc0f1962cdab8c5f17ec933699b1731d75799ce969ee41b75f004d64de46b0be92cc36bd7147d4e06d1f53245a570264be0a8 SHA512 23834e036c2ff56e52bc5f7d2b4eb357dc438fd44245bf30bf2c2946a50b7872f07b2651df2ed4772235cf1457928c71fc1d993c6a7e9229e247fc15a279a456
diff --git a/dev-java/dom4j/dom4j-1.6.1-r8.ebuild b/dev-java/dom4j/dom4j-1.6.1-r8.ebuild
deleted file mode 100644
index cc77ae8243da..000000000000
--- a/dev-java/dom4j/dom4j-1.6.1-r8.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="XML Java library"
-HOMEPAGE="https://dom4j.github.io/"
-SRC_URI="
-	mirror://sourceforge/dom4j/${P}.tar.gz
-	mirror://gentoo/${P}-java5.patch.bz2"
-
-LICENSE="dom4j"
-SLOT="1"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-CDEPEND="
-	dev-java/xpp2:0
-	dev-java/xpp3:0
-	dev-java/xsdlib:0
-	dev-java/relaxng-datatype:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-# restricted to jdk 1.8 because it needs javax.xml.bind
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-java/xalan:0
-		dev-java/ant-junit:0
-		dev-java/junitperf:0
-	)
-	virtual/jdk:1.8"
-
-PDEPEND="dev-java/jaxen:1.1"
-
-# Add missing methods to compile on Java 5 #137970
-PATCHES=( "${WORKDIR}/${P}-java5.patch" )
-
-JAVA_RM_FILES=(
-	src/test/org/dom4j/bean/BeansTest.java
-	src/test/org/dom4j/io/StaxTest.java
-	src/test/org/dom4j/rule/RuleTest.java
-	src/test/org/dom4j/ThreadingTest.java
-	src/test/org/dom4j/io/XPP3ReaderTest.java
-)
-
-src_prepare() {
-	default
-
-	# Circular deps with jaxen #212993
-	find -name '*.jar' -! -name jaxen-1.1-beta-6.jar -exec rm -v {} + || die
-
-	rm -v "${JAVA_RM_FILES[@]}" || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-EANT_BUILD_TARGET="clean package"
-EANT_GENTOO_CLASSPATH="relaxng-datatype,xpp2,xpp3,xsdlib"
-EANT_GENTOO_CLASSPATH_EXTRA="lib/jaxen-1.1-beta-6.jar"
-EANT_EXTRA_ARGS="-Dbuild.javadocs=build/doc/api"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junitperf,xalan"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar "build/${PN}.jar"
-	java-pkg_register-dependency jaxen-1.1
-	use doc && java-pkg_dojavadoc build/doc/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/dom4j/dom4j-1.6.1-r9.ebuild b/dev-java/dom4j/dom4j-1.6.1-r9.ebuild
deleted file mode 100644
index 717d7ddf29b2..000000000000
--- a/dev-java/dom4j/dom4j-1.6.1-r9.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="XML Java library"
-HOMEPAGE="https://dom4j.github.io/"
-SRC_URI="
-	mirror://sourceforge/dom4j/${P}.tar.gz
-	mirror://gentoo/${P}-java5.patch.bz2"
-
-LICENSE="dom4j"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-CDEPEND="
-	dev-java/xpp2:0
-	dev-java/xpp3:0
-	dev-java/xsdlib:0
-	dev-java/relaxng-datatype:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-# restricted to jdk 1.8 because it needs javax.xml.bind
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-java/xalan:0
-		dev-java/ant-junit:0
-		dev-java/junitperf:0
-	)
-	virtual/jdk:1.8"
-
-PDEPEND="dev-java/jaxen:1.2"
-
-# Add missing methods to compile on Java 5 #137970
-PATCHES=( "${WORKDIR}/${P}-java5.patch" )
-
-JAVA_RM_FILES=(
-	src/test/org/dom4j/bean/BeansTest.java
-	src/test/org/dom4j/io/StaxTest.java
-	src/test/org/dom4j/rule/RuleTest.java
-	src/test/org/dom4j/ThreadingTest.java
-	src/test/org/dom4j/io/XPP3ReaderTest.java
-)
-
-src_prepare() {
-	default
-
-	# Circular deps with jaxen #212993
-	find -name '*.jar' -! -name jaxen-1.1-beta-6.jar -exec rm -v {} + || die
-
-	rm -v "${JAVA_RM_FILES[@]}" || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-EANT_BUILD_TARGET="clean package"
-EANT_GENTOO_CLASSPATH="relaxng-datatype,xpp2,xpp3,xsdlib"
-EANT_GENTOO_CLASSPATH_EXTRA="lib/jaxen.jar"
-EANT_EXTRA_ARGS="-Dbuild.javadocs=build/doc/api"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junitperf,xalan"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar "build/${PN}.jar"
-	java-pkg_register-dependency jaxen-1.2
-	use doc && java-pkg_dojavadoc build/doc/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/dom4j/dom4j-2.1.3.ebuild b/dev-java/dom4j/dom4j-2.1.3.ebuild
index 9cf6e22f8633..69be8c48e9fc 100644
--- a/dev-java/dom4j/dom4j-2.1.3.ebuild
+++ b/dev-java/dom4j/dom4j-2.1.3.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:
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/version-${PV}.tar.gz -
 
 LICENSE="dom4j"
 SLOT="1"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE="jaxen"
 
 CDEPEND="