commit: 43931ffa93caaa85f53eb145679cc7fde2065800 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Tue Feb 21 09:55:08 2023 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Wed Feb 22 07:36:11 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43931ffa
dev-java/commons-collections: do not inherit java-utils-2.eclass directly - changes EAPI 7 -> 8 - adds verify-sig Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/29696 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/commons-collections/Manifest | 1 + ...ons-3.2.2.ebuild => commons-collections-3.2.2-r1.ebuild} | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest index a70cf6348c0f..7038859c5ae2 100644 --- a/dev-java/commons-collections/Manifest +++ b/dev-java/commons-collections/Manifest @@ -1,2 +1,3 @@ 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 diff --git a/dev-java/commons-collections/commons-collections-3.2.2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2-r1.ebuild similarity index 72% rename from dev-java/commons-collections/commons-collections-3.2.2.ebuild rename to dev-java/commons-collections/commons-collections-3.2.2-r1.ebuild index 3e6fe5ecf537..843a9c53c215 100644 --- a/dev-java/commons-collections/commons-collections-3.2.2.ebuild +++ b/dev-java/commons-collections/commons-collections-3.2.2-r1.ebuild @@ -1,21 +1,21 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="doc source test" MAVEN_ID="commons-collections:commons-collections:3.2.2" -inherit java-pkg-2 java-ant-2 java-utils-2 +inherit java-pkg-2 java-ant-2 verify-sig DESCRIPTION="Jakarta-Commons Collections Component" HOMEPAGE="https://commons.apache.org/collections/"; -SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz" +SRC_URI="https://archive.apache.org/dist/commons/collections/source/commons-collections-${PV}-src.tar.gz + verify-sig? ( https://archive.apache.org/dist/commons/collections/source/commons-collections-${PV}-src.tar.gz.asc )" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="test" RESTRICT="!test? ( test )" DEPEND=" @@ -27,6 +27,9 @@ DEPEND=" RDEPEND=">=virtual/jre-1.8:*" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc" + S="${WORKDIR}/${P}-src" PATCHES=(
