commit:     61339492d3f9a6fa30ce39cc97758141df629e6c
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Sep 20 16:23:14 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Sep 21 06:33:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61339492

dev-java/commons-lang: add verify-sig, update EAPI 7 -> 8

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/commons-lang/Manifest                              |  2 ++
 ...ommons-lang-2.6-r2.ebuild => commons-lang-2.6-r3.ebuild} | 12 ++++++++----
 ...ons-lang-3.12.0.ebuild => commons-lang-3.12.0-r1.ebuild} | 13 +++++++++----
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest
index c614da984589..c2019ed786d5 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -1,2 +1,4 @@
 DIST commons-lang-2.6-src.tar.gz 564032 BLAKE2B 
9d72b0426f2146eaa8498a6601edf80dbf45a16ef5ee14cf4ed87130e6d3732d5c713f25f44c10435baa1357f61a271acb88483915968aaf645d1ceaa318c601
 SHA512 
4a30ed153f93fe6616a28974721bdf005d064203ef8a3dd375d6c1176647c0cdbd29cfde2a580e2c8d26bfa4655be6be7025b8ccae94086dcd816676c5cf8e87
+DIST commons-lang-2.6-src.tar.gz.asc 203 BLAKE2B 
6d7763cb5ac31cbd8e56bd5aeb6ca5fc7c3f3196bb0d8548f9e10e94987a5c39e09f84309de01dfb921f55ab693c9f64074e254fbb5a6a395848fdddf16a27ab
 SHA512 
af7cca99519c7aaa58e0068093599b9a85d963dee30520cbf39bc90586042bccdccff0a9aa361418b5a89bfce75fdf81e11a5eee1e393e970c54e8b8dca51ea6
 DIST commons-lang-3.12.0-sources.tar.gz 1072858 BLAKE2B 
d6b7ee9ef165e60f61d8d0dfaaf38919877f2edc6742cd58b2b70d379e807e75d9dc24e19f23db1b174d1797d6ef0af7700d686dd835d7a40bf2b2a91346e215
 SHA512 
80d1b960ae0b02859be329ea60d68cef33f3c7be7ec19752b3c9cfef442adef480878317ce2cfa309a27e662e2c72cab22023eaa3702e27970a1e5d55ca43f57
+DIST commons-lang-3.12.0-sources.tar.gz.asc 488 BLAKE2B 
c844eee961cbbb4870055050343169a0425b4e569209c1950ae2c720b0d4033e888218dda755fed78f6fc162abf7a6204298169916773f434e4128c4a6f85cc4
 SHA512 
3aeaea50cf1bc65bbff38b1d6a2602da623ab9bc08349e46409af3856336efca06a6a6daba5d49b84a718f9bca718e5f2a746c9d83b1853fa9b2db3b83f354cc

diff --git a/dev-java/commons-lang/commons-lang-2.6-r2.ebuild 
b/dev-java/commons-lang/commons-lang-2.6-r3.ebuild
similarity index 67%
rename from dev-java/commons-lang/commons-lang-2.6-r2.ebuild
rename to dev-java/commons-lang/commons-lang-2.6-r3.ebuild
index cdb5a083002e..07f65b4ed8f8 100644
--- a/dev-java/commons-lang/commons-lang-2.6-r2.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.6-r3.ebuild
@@ -1,18 +1,19 @@
-# 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-lang:commons-lang:2.6"
 JAVA_PKG_WANT_SOURCE="1.4"
 JAVA_PKG_WANT_TARGET="1.4"
 
-inherit java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2 verify-sig
 
 DESCRIPTION="Commons components to manipulate core java classes"
 HOMEPAGE="https://commons.apache.org/proper/commons-lang/";
-SRC_URI="mirror://apache/commons/lang/source/${P}-src.tar.gz"
+SRC_URI="mirror://apache/commons/lang/source/${P}-src.tar.gz
+       verify-sig? ( 
https://downloads.apache.org/commons/lang/source/${P}-src.tar.gz.asc  )"
 
 LICENSE="Apache-2.0"
 SLOT="2.1"
@@ -25,6 +26,9 @@ DEPEND="virtual/jdk:1.8
 
 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"
 
 JAVA_ANT_ENCODING="ISO-8859-1"

diff --git a/dev-java/commons-lang/commons-lang-3.12.0.ebuild 
b/dev-java/commons-lang/commons-lang-3.12.0-r1.ebuild
similarity index 64%
rename from dev-java/commons-lang/commons-lang-3.12.0.ebuild
rename to dev-java/commons-lang/commons-lang-3.12.0-r1.ebuild
index 4979efe4b1eb..425b51329074 100644
--- a/dev-java/commons-lang/commons-lang-3.12.0.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.12.0-r1.ebuild
@@ -1,19 +1,21 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 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 
https://mirror.checkdomain.de/apache//commons/lang/source/commons-lang3-3.12.0-src.tar.gz
 --slot 3.6 --keywords "~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x64-solaris" --ebuild commons-lang-3.12.0.ebuild
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 MAVEN_ID="org.apache.commons:commons-lang3:3.12.0"
 
-inherit java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple verify-sig
 
 DESCRIPTION="Commons components to manipulate core java classes"
 HOMEPAGE="https://commons.apache.org/proper/commons-lang/";
-SRC_URI="mirror://apache/commons/lang/source/${PN}3-${PV}-src.tar.gz -> 
${P}-sources.tar.gz"
+SRC_URI="https://archive.apache.org/dist/commons/lang/source/${PN}3-${PV}-src.tar.gz
 -> ${P}-sources.tar.gz
+       verify-sig? ( 
https://archive.apache.org/dist/commons/lang/source/${PN}3-${PV}-src.tar.gz.asc 
-> ${P}-sources.tar.gz.asc )"
+
 LICENSE="Apache-2.0"
 SLOT="3.6"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x64-solaris"
@@ -26,6 +28,9 @@ 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}/${PN}3-${PV}-src"
 
 JAVA_ENCODING="ISO-8859-1"

Reply via email to