gentoo resync : 07.01.2022

4 files changed, 80 insertions, 8 deletions

diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
index 804c52da40b2..596730d607d9 100644
--- a/dev-java/commons-collections/Manifest
+++ b/dev-java/commons-collections/Manifest
@@ -1,6 +1,8 @@
 AUX commons-collections-3.2.2-fixes.patch 9913 BLAKE2B 0582b3c2e06275ddc75fdaf051ef5fec6cb6c95b3ffae77b08bd093e3b3e7a140e040c20a9be24e06d03a492325db94c21e69a4ae9fcb4e8099ee7bc30059b70 SHA512 88850bd1db483348d5c35c593e79f38de46f362aa124dea91e47940b9eeadef7d9ae9e7d34978d55bc4e51091c34ae862b33ca4710c71ffdc92840c2429b05f1
 DIST commons-collections-3.2.2-src.tar.gz 630693 BLAKE2B a70cebe9526291d5207db7edd7c9b50060413880d41dcb28c01cf05f7e00a9f5e1560012c3c3c763162412282db9512bc2b64a5788f210c5c8866943d912dafb SHA512 2e8ef638f07515b028a3e7e97851fcf1d9023a2c188e211bd1e936f35d3d91c2885adf3b1103ad17dfb7aeea6e7a67ce7826ee346a8a29c1aa7c6b0cf14e9230
+DIST commons-collections-4.4-src.tar.gz 703008 BLAKE2B f4a0e858eb7412bdd431894f923a4731685ceb2463bee002401d8048cc40534f002ec0291aa67297e061a50b624d3de8f64e227f513ab1f3620e38d1d6858255 SHA512 2110e73eda97ca52a886cb708f21d8609a83655861594f3b6eb7a15b777d42eeeefc5d3b28ffc6ecc5e4f0b3fd5407f80019c2ce006f970f55455ef33eee47ee
 DIST commons-collections4-4.1-src.tar.gz 704671 BLAKE2B dea1b630168373013ca937c9b02414b92845fdd9ddf7a22a05c4d7f8d30ff26d73f3a2d399d7a4c026f8ec43a282120fdf3d3cb1042a311c3b490ffed1774e30 SHA512 c5666f41b68c9fdba3731730595616b16f98579c077cf047f421a46729b5a65476a8707125a2c0b0c6c024ca94df8c2633123bd99e705149fcb1afadcd3bf68b
-EBUILD commons-collections-3.2.2.ebuild 1378 BLAKE2B ca87bc67d684eae78f9816803456c1ef52cc0d3571514dba7cf2d8017f9ce72bddd35a0de681b4c33b0db1bb9e37f3e5a85cc4620819c8bcd98a70f308fc38a0 SHA512 ba6ec8a82736e39dfd41681e87e6587edd163be81ea5f80b56a37e529b7d681292627a308373ac8d2330bfd69206dd54fe1c04c34b4e63cd6255bef712042d2b
+EBUILD commons-collections-3.2.2.ebuild 1390 BLAKE2B 5ac882bdfc9217661bb1b0fb6ee29d9098b5106113226d93e38b0c5896c8659e39938f402d3b7c9e560266b8258996162480426be59bbac4ef75728303f0958a SHA512 a1405eaddbcb95664550eb5961581c92292606616181374b8f3c9e9d287d08f20cabbb1e86c07da2907f903c71c1487a6e3ea53c5c4b2731f872591555a21f94
 EBUILD commons-collections-4.1-r1.ebuild 1267 BLAKE2B 9183580e99a30c85c61ad045bde305a5e43ede963c38aa0b33bb7ab052e240291845a3ebdbc9553228ff58d5432122879ebd7b6f4af2e9a2c05666061c85adcd SHA512 2218be50d5e2d00e1a2c1783d46b9ac159c7f72dabffa506d50df8f0ed4e669a908544fb7afaa4b0404867cf931cea14960ce7cc28a769afe6a2c736e71307bf
-MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
+EBUILD commons-collections-4.4.ebuild 2067 BLAKE2B 202afbbdbc645dcec318d99cbb8e8a1db304dc17334e7c37537f44c97c3e8f85b21d646612062fbf83ae375202ffce08facfa1db314dfc3919270f04d2cee2e4 SHA512 c3f36ada36f4547ad4ffa61c6e0e7eba4e43885d81ffd6fb643393f0ba2f6304dec6c20fb62cf8fb2c6e8ceeb1a117b24eeb5b1cc823ae94ec04f1c851122deb
+MISC metadata.xml 388 BLAKE2B 11018df0e1c7417ebbc68b44642701ad88c8add20c233cceafb84c41b56cd7e3d2f0004406ba6286babd78493dda13171c1c3b0a1a7b563289d2c4c58921bda6 SHA512 28a72920d0c97f0caae41ba74a55602e25c953d2c510e0e4d72a8c7482abe7855b587fa85efbc51c9262472b90ae35a88732d33744a101d288ec8afa8fff4ae2
diff --git a/dev-java/commons-collections/commons-collections-3.2.2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2.ebuild
index 6d32a5a18a44..e205323f6cdc 100644
--- a/dev-java/commons-collections/commons-collections-3.2.2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.2.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
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/commons-collections/commons-collections-4.4.ebuild b/dev-java/commons-collections/commons-collections-4.4.ebuild
new file mode 100644
index 000000000000..994cf13e94df
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-4.4.ebuild
@@ -0,0 +1,67 @@
+# 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/collections/source/commons-collections4-4.4-src.tar.gz --slot 4 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild commons-collections-4.4.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.commons:commons-collections4:4.4"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities"
+HOMEPAGE="https://commons.apache.org/proper/commons-collections/"
+SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz -> ${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
+# test? org.apache.commons:commons-lang3:3.9 -> >=dev-java/commons-lang-3.12.0:3.6
+# test? org.easymock:easymock:4.0.2 -> !!!suitable-mavenVersion-not-found!!!
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/easymock:3.2
+		dev-java/commons-lang:3.6
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( {CONTRIBUTING,README}.md {LICENSE,NOTICE,RELEASE-NOTES}.txt )
+HTML_DOCS=( {DEVELOPERS-GUIDE,PROPOSAL}.html )
+
+S="${WORKDIR}/commons-collections4-${PV}-src"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,commons-lang-3.6,easymock-3.2"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_test() {
+	# https://github.com/apache/commons-collections/blob/cab58b3a8093a2f6b84f12783a3fb358747310f7/pom.xml#L542-L550
+	pushd src/test/java || die
+		local TESTS=$(find * -name "*Test.java" ! -name "TestUtils.java"  ! -name "Abstract*.java" ! -name "BulkTest.java")
+		TESTS="${TESTS//.java}"
+		TESTS="${TESTS//\//.}"
+	popd
+
+	JAVA_TEST_RUN_ONLY=( "${TESTS}" )
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/commons-collections/metadata.xml b/dev-java/commons-collections/metadata.xml
index 6ef2d50cf07e..62a57c23950f 100644
--- a/dev-java/commons-collections/metadata.xml
+++ b/dev-java/commons-collections/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 Collections package contains types that extend and augment the Java Collections Framework.
+	</longdescription>
 </pkgmetadata>