gentoo auto-resync : 03:12:2023 - 10:59:05

5 files changed, 121 insertions, 71 deletions

diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
index f25a3bbe3186..319084bccd5a 100644
--- a/dev-java/commons-collections/Manifest
+++ b/dev-java/commons-collections/Manifest
@@ -1,7 +1,9 @@
 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-3.2.2-src.tar.gz.asc 819 BLAKE2B a7d170b03613cddddc284908d95287fc092c01b125c5adffebfc493daf9119e0c9d82fdc7d8ce1865ef45a1e015072f5a09181abcba5b17c9c48d7c6333279da SHA512 c5d33518ed5343b38c10e317f677266858bd9614eff7fdc13a2e0131fe71836c3694f49898843e6978496d7dd2f976b82922230a44cde1eac5f6cdfdb822dcd0
-DIST commons-collections-4.4-src.tar.gz 703008 BLAKE2B f4a0e858eb7412bdd431894f923a4731685ceb2463bee002401d8048cc40534f002ec0291aa67297e061a50b624d3de8f64e227f513ab1f3620e38d1d6858255 SHA512 2110e73eda97ca52a886cb708f21d8609a83655861594f3b6eb7a15b777d42eeeefc5d3b28ffc6ecc5e4f0b3fd5407f80019c2ce006f970f55455ef33eee47ee
+DIST commons-collections4-4.4-src.tar.gz 703008 BLAKE2B f4a0e858eb7412bdd431894f923a4731685ceb2463bee002401d8048cc40534f002ec0291aa67297e061a50b624d3de8f64e227f513ab1f3620e38d1d6858255 SHA512 2110e73eda97ca52a886cb708f21d8609a83655861594f3b6eb7a15b777d42eeeefc5d3b28ffc6ecc5e4f0b3fd5407f80019c2ce006f970f55455ef33eee47ee
+DIST commons-collections4-4.4-src.tar.gz.asc 499 BLAKE2B 8217d8c8714d2c07a66eca22069b40e2d1012881385172bedd29d52f14ae5c6e287ce2f097f1bde77af06677c776e45c3e67dc6c885709f6c97f61155252131c SHA512 533c47ad2cb6b6926ea8e4aaf9072b6c7a0c9d4a6becb31163a33a6cba8a9888534b74701935a0f0e797c10cbc688331d9abefc3d4085edcd9a7d29260f735ae
 EBUILD commons-collections-3.2.2-r1.ebuild 1680 BLAKE2B 73b162c75bfc671068727277bf1154cc248a1adbb3b2d219d82ba99c7e021100936249c71b8e7aeabf51b18d890a546c2c7ad3056de1a8716dc808c3665e20cc SHA512 cda93de7243738595ab5ae447114935f720d8102d0e54e86513a149024c407cc7b5d418a3b75d4bcb4d0d242e3404e746e9708bb2c85f13826b96eba34d538e0
-EBUILD commons-collections-4.4-r1.ebuild 2124 BLAKE2B 41cc425a652be762750ed3ac35c443d63ed985d11bca139d597f8331efbd023b81c21538da33349ddecaf63de3b9d08e4b27d478eee7254e55f300090b282ba9 SHA512 db49866e4991a9ffa8857ca6caebcfc2ffdb8c86b8da1978cf6ef54d632e28ca58b5c4a338dc1963485fd1e2f4301bfe2bac0ba558013c2914e9bdcdf2d1dcc3
-MISC metadata.xml 388 BLAKE2B 11018df0e1c7417ebbc68b44642701ad88c8add20c233cceafb84c41b56cd7e3d2f0004406ba6286babd78493dda13171c1c3b0a1a7b563289d2c4c58921bda6 SHA512 28a72920d0c97f0caae41ba74a55602e25c953d2c510e0e4d72a8c7482abe7855b587fa85efbc51c9262472b90ae35a88732d33744a101d288ec8afa8fff4ae2
+EBUILD commons-collections-3.2.2-r2.ebuild 1397 BLAKE2B 89b8d1996678da40dc467a1c540d939b01bd1205dd11aa8ce7dbb5390ca7639e45323978e853295698b740825c85d091c00c7e69bb923d6aae41e314ec546aaa SHA512 fe80f163b649617a1ec299c8d456075fb26fd0c708cde5a917443eac18eb08ecd3a5cd0775148ceba3adb50b04bdbb73dcb11106f61761eeeddcb428d4073f2e
+EBUILD commons-collections-4.4-r2.ebuild 1844 BLAKE2B 5589b83e39943262eb81a28328a90f648d3249221f31264bf93c774965458ae7ec26b567c9237db84072c6045791f0f505734649ff2354ce835d925a6dae9522 SHA512 3c58e01f6a54c4283fa01523c965499f0b1b9a5dc289ae7c561f100cbbb34db1134e068e81265abd64f365cedb387b1cf887f7d34dd95a44494614c6f3646f89
+MISC metadata.xml 740 BLAKE2B 5d7cab781e51e938df8114dbd693cb885afa82c0310e8c52a5c7a1f0ec9bd4181d96c2d7ff011427cdaa056bb061f1ffcac271e63450b793b1c6c5318a057853 SHA512 49988fc43f1f5d84c60bc35b58b60db3bbd05386b28fd5ff68612d0b7e9cb7282ff723a89b4263ec583d2b3668825a5fc6c85cb1dbee4a9d57fa43f6b21d0c99
diff --git a/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild
new file mode 100644
index 000000000000..d5c0110ad865
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-collections:commons-collections:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Jakarta-Commons Collections Component"
+HOMEPAGE="https://commons.apache.org/collections/"
+SRC_URI="https://archive.apache.org/dist/commons/collections/source/${P}-src.tar.gz
+	verify-sig? ( https://archive.apache.org/dist/commons/collections/source/${P}-src.tar.gz.asc )"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+# broken with jdk:21 - https://bugs.gentoo.org/916445
+DEPEND="
+	<=virtual/jdk-17:*
+	test? ( dev-java/junit:0 )
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {NOTICE,README,RELEASE-NOTES}.txt )
+HTML_DOCS=( {DEVELOPERS-GUIDE,PROPOSAL}.html )
+
+PATCHES=( "${FILESDIR}/${P}-fixes.patch" )
+
+JAVA_SRC_DIR="src/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit"
+JAVA_TEST_SRC_DIR="src/test"
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+}
+
+src_test() {
+	if [[ "${ARCH}" = "ppc" ]]; then
+		einfo "tests are disabled on ppc"
+	else
+		java-pkg-simple_src_test
+	fi
+}
diff --git a/dev-java/commons-collections/commons-collections-4.4-r1.ebuild b/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
deleted file mode 100644
index 5c4b6e0ebaee..000000000000
--- a/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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"
-JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.collections4"
-
-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/commons-collections-4.4-r2.ebuild b/dev-java/commons-collections/commons-collections-4.4-r2.ebuild
new file mode 100644
index 000000000000..059e87b91233
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-4.4-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.commons:commons-collections4:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+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
+	verify-sig? ( https://downloads.apache.org/commons/collections/source/${PN}4-${PV}-src.tar.gz.asc )"
+S="${WORKDIR}/commons-collections4-${PV}-src"
+
+LICENSE="Apache-2.0"
+SLOT="4"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+# broken with jdk:21 - https://bugs.gentoo.org/916445
+DEPEND="
+	<=virtual/jdk-17:*
+	test? (
+		dev-java/easymock:3.2
+		dev-java/commons-lang:3.6
+	)
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,README}.md {NOTICE,RELEASE-NOTES}.txt )
+HTML_DOCS=( {DEVELOPERS-GUIDE,PROPOSAL}.html )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.collections4"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="
+	commons-lang-3.6
+	easymock-3.2
+	junit-4
+"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+	# https://github.com/apache/commons-collections/blob/commons-commons-collections-4.4/pom.xml#L542-L550
+	pushd src/test/java || die
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			-name "*Test.java" \
+			! -name "TestUtils.java" \
+			! -name "Abstract*.java" \
+			! -name "BulkTest.java")
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	popd
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/commons-collections/metadata.xml b/dev-java/commons-collections/metadata.xml
index 62a57c23950f..23e31dd764c3 100644
--- a/dev-java/commons-collections/metadata.xml
+++ b/dev-java/commons-collections/metadata.xml
@@ -5,6 +5,12 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<upstream>
+		<bugs-to>https://issues.apache.org/jira/projects/COLLECTIONS/issues</bugs-to>
+		<changelog>https://commons.apache.org/proper/commons-collections/changes-report.html</changelog>
+		<doc>https://commons.apache.org/proper/commons-collections/userguide.html</doc>
+		<remote-id type="github">apache/commons-collections</remote-id>
+	</upstream>
 	<longdescription>
 		The Apache Commons Collections package contains types that extend and augment the Java Collections Framework.
 	</longdescription>