gentoo resync : 02.02.2022

4 files changed, 156 insertions, 5 deletions

diff --git a/dev-java/commons-digester/Manifest b/dev-java/commons-digester/Manifest
index d930b728fb55..0b82c2810a20 100644
--- a/dev-java/commons-digester/Manifest
+++ b/dev-java/commons-digester/Manifest
@@ -2,8 +2,11 @@ AUX 1.8.1-build.xml-jar-target.patch 1099 BLAKE2B e1ce425c943ebb36dd73447aa7d41c
 AUX commons-digester-2.1-build.xml 12816 BLAKE2B 7309479a61897c3ecc28e6394714c1fb4691035f2f57f64f8dcccfab407a681e4ca2076ddf2cd783ec3bb0b726d38033b63c10444169d029fe39613ab0760c4c SHA512 f42f80e68e8b6d31b07add393e1adc1714278e9e8e6ccab08dfb6a131bdafeab1ae5c5859e81dabc5acff88d2151093d82a3e089293f653bcab307451839c0ef
 DIST commons-digester-1.8.1-src.tar.gz 303266 BLAKE2B 618885c812a9bf40c080bc5736b8b4be4e18fe4d2f732d2a44d39369ae6cf3beb3af0cf500da3d103d7aa8c18b41b84d06907b6fc90f7f10d30840d6cfc83012 SHA512 0a39069662b4792d4856b79b5cedc2b44cb70303a19045d21c233d45ae4dde9e80662bd242a381e759d7cdb5adaf0b9fa6206bb8397b53348fa9eac12e9a4e96
 DIST commons-digester-2.1-src.tar.gz 304060 BLAKE2B 2360f6f8ab77b20ad6b4058e0437aa792bf3886ddec2e09b6db259bc142c070965ce066ef224e92fb91614075631a2af1358ae4b4fc065fe9118e1d2559bb9bb SHA512 6bdb63431ed1e17f5e8ba24951762750a0e59b70c76eabecbf13f5fe6974864825456beed615c8f2c16f9a2f1404f2e56bdbc3ba335656c3661d5f368c708b88
+DIST commons-digester-3.2.tar.gz 324555 BLAKE2B 7b8bdaa70eeafb069e9ecbfe697ab86f5167ae3b9933e8aa306f0080de0ec99d12bd023067678b7b904329178f553fd6d4d98141ab329154a1c27385b33e449f SHA512 6d5ed9a1cc7612244747dcbd5c713349f27d63d1cef39fa368b4e91eaa3b1fe7043ab2fb498a73e8afde8081b8ff26a966e5b87b8b6dc68a3d907e9b25aa7cad
 DIST commons-digester3-3.2-src.tar.gz 324555 BLAKE2B 7b8bdaa70eeafb069e9ecbfe697ab86f5167ae3b9933e8aa306f0080de0ec99d12bd023067678b7b904329178f553fd6d4d98141ab329154a1c27385b33e449f SHA512 6d5ed9a1cc7612244747dcbd5c713349f27d63d1cef39fa368b4e91eaa3b1fe7043ab2fb498a73e8afde8081b8ff26a966e5b87b8b6dc68a3d907e9b25aa7cad
 EBUILD commons-digester-1.8.1-r2.ebuild 1324 BLAKE2B 2cef18509056f371eb658b67e4a9eff75d6eae6e197eaaf8887a674850399d4f58543913e43113e35e9a5dc2da1ad8397b84711713d82158d6a0fe07ad895117 SHA512 0ac87e54cb3e3ecd4872c9df9ea2bc2174ca8a52922582575ec0006e6e484e6e7e3c878525705de4ba42a58d36fe9235f47065d8837c44c905d8b03ce4481a81
 EBUILD commons-digester-2.1-r1.ebuild 1310 BLAKE2B 3e8e5971648240771f5031f90991ee20a5009f42c81ac7cd72f7145331212bf19dba9688ce501081562f08cb01b4bd5510d77ab37638d047d5d6803374e6cc24 SHA512 86db8e1e6fbcc76f64f90f20e14efb30cb29427525147204f6edcb845b90082ba53f0e46f3db4d6a751105c0429da672bbb943b256bafb6a859efb520e63130a
+EBUILD commons-digester-2.1-r2.ebuild 1994 BLAKE2B 9cdff6f6e00f6cc706c02d50d7cacca8aa6ad01e929aa78aa2c8521decdef9d45ee87bd053a6749d2e6ffb7b80250b5d98f52213c80b0dc25a28368041ff1d2f SHA512 261a0882d8f16eba2c2a3b42b5c19ce3ccd8e3f7690a5e7c36327b9f11ad628b59c6ab6723e87e492d1ac471e04fcf59d91a5ba5601a1842e478bb97da6831a2
 EBUILD commons-digester-3.2-r2.ebuild 1336 BLAKE2B 4f9b7003b2c7b09cd21d79f0f2fb2e0f970a85c48d502e9921ae2e55883edeb5008630bde20f6428b2d91583527a73b8d9630603a608ea06120797631d909c4b SHA512 4325436fc97d1378b011ab7bde10a6187b8e7e0ef7b305e28d531780bc36225f8838bd5aeb5e7dde2c8da5031e97ff68da4f6932c2bdfa685ba836afe2ea5a75
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
+EBUILD commons-digester-3.2-r3.ebuild 2384 BLAKE2B 26b082902710279cf3b185f928a6a903cee6bec2206fccd1396d81e0ef981d7274388e52eaaf498e223e4537086314da05ceae6832e75935e39cba6af0295845 SHA512 ce7ee2520094c7eeb3b5914f100503f5450ed4c74706cc7634484c7c21971566f8de563812946b5dada35f79f2bcb737b55bff21593252648fea6d0fd2a29d6a
+MISC metadata.xml 482 BLAKE2B 2c8b9ab044dd5e95d9f17fcb0e284c7d8ed87727fa891bc6c15414b8db928346e8af71222bb3e6daec5ce682cfe72c7f315aa55d1dd5d55531554ab7d4ddc863 SHA512 31bd4dd9999a412986ac2dcc5cccffd7dd1f36ce8bf148f93dd35115da003c2663a0f5994a3e2a44ad537c26ee534294c80697f986737c02f434b3646e8f7c40
diff --git a/dev-java/commons-digester/commons-digester-2.1-r2.ebuild b/dev-java/commons-digester/commons-digester-2.1-r2.ebuild
new file mode 100644
index 000000000000..7db4511aecd1
--- /dev/null
+++ b/dev-java/commons-digester/commons-digester-2.1-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 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 mirror://apache/commons/digester/source/commons-digester-2.1-src.tar.gz --slot 2.1 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-digester-2.1-r2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-digester:commons-digester:2.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects"
+HOMEPAGE="https://commons.apache.org/digester/"
+SRC_URI="mirror://apache/commons/digester/source/commons-digester-2.1-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.1"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# commons-beanutils:commons-beanutils:1.8.3 -> >=dev-java/commons-beanutils-1.9.4:1.7
+# commons-logging:commons-logging:1.1.1 -> >=dev-java/commons-logging-1.2:0
+
+CP_DEPEND="
+	>=dev-java/commons-beanutils-1.9.4:1.7
+	>=dev-java/commons-logging-1.2:0
+"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( {LICENSE,NOTICE,RELEASE-NOTES}.txt )
+
+S="${WORKDIR}/commons-digester-${PV}-src"
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_test() {
+	pushd src/test/java || die
+		# Exclusions according to 212,215 pom.xml
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			! -name "Abstract*.java" ! -name "TestBean.java" \
+			! -name "TestRule.java" ! -name "TestRuleSet.java" \
+			-name "*TestCase.java" -o -name "*Test.java")
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	popd
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/commons-digester/commons-digester-3.2-r3.ebuild b/dev-java/commons-digester/commons-digester-3.2-r3.ebuild
new file mode 100644
index 000000000000..45e85fb373f2
--- /dev/null
+++ b/dev-java/commons-digester/commons-digester-3.2-r3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 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 mirror://apache/commons/digester/source/commons-digester3-3.2-src.tar.gz --slot 3.2 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-digester3.2-r3.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.commons:commons-digester3:3.2"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects"
+HOMEPAGE="https://commons.apache.org/digester/"
+SRC_URI="mirror://apache/commons/digester/source/${PN}3-${PV}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.2"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# 1) atomWithNamespaceParse(org.apache.commons.digester3.xmlrules.SetNamespaceURITestCase)
+# java.net.UnknownHostException: commons.apache.org
+PROPERTIES="test_network"
+RESTRICT="test"
+
+# Common dependencies
+# POM: pom.xml
+# cglib:cglib:2.2.2 -> >=dev-java/cglib-3.3.0:3
+# commons-beanutils:commons-beanutils:1.8.3 -> >=dev-java/commons-beanutils-1.9.4:1.7
+# commons-logging:commons-logging:1.1.1 -> >=dev-java/commons-logging-1.2:0
+
+CP_DEPEND="
+	>=dev-java/cglib-3.3.0:3
+	>=dev-java/commons-beanutils-1.9.4:1.7
+	>=dev-java/commons-logging-1.2:0
+"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( {LICENSE,NOTICE,RELEASE-NOTES}.txt )
+
+S="${WORKDIR}/commons-digester3-${PV}-src"
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_test() {
+	pushd src/test/java || die
+		# Exclusions according to 226,229 pom.xml
+		local JAVA_TEST_RUN_ONLY=$(find * -name "*TestCase.java" ! -name "Abstract*.java" ! -name "TestBean.java" ! -name "TestRule.java" ! -name "TestRuleSet.java")
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	popd
+
+	# Testing with java-17 throws too many test failures
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if [[ "${vm_version}" != "17" ]] ; then
+		java-pkg-simple_src_test
+	fi
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/commons-digester/metadata.xml b/dev-java/commons-digester/metadata.xml
index 6021501589e0..080f8a0f0318 100644
--- a/dev-java/commons-digester/metadata.xml
+++ b/dev-java/commons-digester/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		The Apache Commons Digester package lets you configure an XML to Java object mapping module which triggers certain actions called rules whenever a particular pattern of nested XML elements is recognized.
+	</longdescription>
 </pkgmetadata>