commit: 7ae550d3dc325b6b238174f59d3f48c19a770311 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Sat Dec 2 09:01:50 2023 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sun Dec 3 09:05:16 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ae550d3
dev-java/commons-collections: slot 4, max jdk 17 adds verify-sig to slot 4 Bug: https://bugs.gentoo.org/916445 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/commons-collections/Manifest | 3 ++- ...tions-4.4-r1.ebuild => commons-collections-4.4-r2.ebuild} | 12 ++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest index 7038859c5ae2..ce4044f37b42 100644 --- a/dev-java/commons-collections/Manifest +++ b/dev-java/commons-collections/Manifest @@ -1,3 +1,4 @@ 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 diff --git a/dev-java/commons-collections/commons-collections-4.4-r1.ebuild b/dev-java/commons-collections/commons-collections-4.4-r2.ebuild similarity index 82% rename from dev-java/commons-collections/commons-collections-4.4-r1.ebuild rename to dev-java/commons-collections/commons-collections-4.4-r2.ebuild index 5c4b6e0ebaee..cebe177a6358 100644 --- a/dev-java/commons-collections/commons-collections-4.4-r1.ebuild +++ b/dev-java/commons-collections/commons-collections-4.4-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Skeleton command: @@ -10,11 +10,12 @@ 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 +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 -> ${P}-src.tar.gz" +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 )" LICENSE="Apache-2.0" SLOT="4" @@ -26,8 +27,11 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86" # 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!!! +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-1.8:* + <=virtual/jdk-17:* test? ( dev-java/easymock:3.2 dev-java/commons-lang:3.6
