commit: 7cf6140e2c995857fb215fda001dad8834090d72 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Mon May 27 10:04:15 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Tue Jun 4 16:59:42 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cf6140e
dev-java/httpcomponents-client: add verify-sig, update EAPI 7 -> 8 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/36839 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/httpcomponents-client/Manifest | 1 + ...uild => httpcomponents-client-4.5.13-r2.ebuild} | 29 +++++++--------------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/dev-java/httpcomponents-client/Manifest b/dev-java/httpcomponents-client/Manifest index 9706b591e796..66ff2b793020 100644 --- a/dev-java/httpcomponents-client/Manifest +++ b/dev-java/httpcomponents-client/Manifest @@ -1 +1,2 @@ DIST httpcomponents-client-4.5.13-src.tar.gz 824131 BLAKE2B 1507c81749a92afcf8b170b606761236d71b02d8b8b257d753a0f09abbdc297057df39661e827dee52804a2138de7d201b2a837418cbec21085fd3ffd558b51c SHA512 421e413fb2206fa95b6428ff067cdf2b440d2d3d4503cc3ca9bcf70ccd8ed1b8273ec4fe0703e6a8cd7612940b7ed966d9f163dbfeb8bf699ae2a8b2e0866d05 +DIST httpcomponents-client-4.5.13-src.tar.gz.asc 183 BLAKE2B 76b19170412672c8f4f30bcf96e1512ada5c6217a62ac1937d53c99223d687b363dc276365f2b0b6cd57abfd9d7d3a829e58f9c634081d84f05b558a61806402 SHA512 2af6ec691f0ebe6ceec4ca462e12638c8cfdb238fb4120195db1d9faca255b41119b6ddf34734ae29333256c91e1a0f1805192c0a2f1206093226e56e846cfc9 diff --git a/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild b/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r2.ebuild similarity index 59% rename from dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild rename to dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r2.ebuild index 8f220b157642..2b074d240ff4 100644 --- a/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild +++ b/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r2.ebuild @@ -1,30 +1,26 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom httpcomponents-client-4.5.13/httpclient/pom.xml --download-uri https://github.com/apache/httpcomponents-client/archive/refs/tags/rel/v4.5.13.tar.gz --slot 4 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-httpclient-4.5.13.ebuild - -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.apache.httpcomponents:httpclient:4.5.13" +MAVEN_ID="org.apache.httpcomponents:httpclient:${PV}" JAVA_TESTING_FRAMEWORKS="junit-4" -inherit java-pkg-2 java-pkg-simple +inherit java-pkg-2 java-pkg-simple verify-sig DESCRIPTION="Apache HttpComponents Client" HOMEPAGE="https://hc.apache.org/httpcomponents-client-5.2.x/"; -SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-${PV}-src.tar.gz" +SRC_URI="mirror://apache/httpcomponents/httpclient/source/${P}-src.tar.gz + verify-sig? ( https://downloads.apache.org/httpcomponents/httpclient/source/${P}-src.tar.gz.asc )" +S="${WORKDIR}/httpcomponents-client-${PV}/httpclient" LICENSE="Apache-2.0" SLOT="4" KEYWORDS="amd64 ~arm arm64 ppc64 x86" -# Common dependencies -# POM: httpcomponents-client-${PV}/httpclient/pom.xml -# commons-codec:commons-codec:1.11 -> >=dev-java/commons-codec-1.15:0 -# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0 -# org.apache.httpcomponents:httpcore:4.4.13 -> >=dev-java/httpcore-4.4.14:0 +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/httpcomponents-client.hc.apache.org.asc" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-httpcomponents-client )" CDEPEND=" dev-java/commons-codec:0 @@ -32,11 +28,6 @@ CDEPEND=" dev-java/httpcore:0 " -# Compile dependencies -# POM: httpcomponents-client-${PV}/httpclient/pom.xml -# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4 -# test? org.mockito:mockito-core:1.10.19 -> >=dev-java/mockito-1.9.5:0 - DEPEND="${CDEPEND} >=virtual/jdk-1.8:* test? ( @@ -47,9 +38,7 @@ DEPEND="${CDEPEND} RDEPEND="${CDEPEND} >=virtual/jre-1.8:*" -DOCS=( ../{LICENSE,NOTICE,README,RELEASE_NOTES}.txt ) - -S="${WORKDIR}/httpcomponents-client-${PV}/httpclient" +DOCS=( ../{NOTICE,README,RELEASE_NOTES}.txt ) JAVA_GENTOO_CLASSPATH="commons-codec,commons-logging,httpcore" JAVA_SRC_DIR=(
