commit: 851d505cda7d63f09740c3afa44432fba99a09fd Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Sun Feb 4 12:05:53 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sun May 26 08:16:05 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=851d505c
dev-java/httpcore: add verify-sig, update EAPI 7 -> 8 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/35180 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/httpcore/Manifest | 1 + ...ore-4.4.14.ebuild => httpcore-4.4.14-r1.ebuild} | 25 +++++++++------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dev-java/httpcore/Manifest b/dev-java/httpcore/Manifest index 58259b00cd12..719bf090c35f 100644 --- a/dev-java/httpcore/Manifest +++ b/dev-java/httpcore/Manifest @@ -1 +1,2 @@ DIST httpcomponents-core-4.4.14-src.tar.gz 591869 BLAKE2B d6f4900d8781cf7189edb2dfa9c1157b02584e8c66cde02dc261b0e29cdfb971e0323ce4478966b8e125df475ab1014fbee5b4bdf411eb118647f47f95c8f1a7 SHA512 9c713c7ea4e966a35ed391bc2a3aa10a0963cd21978c028dbd0790c9c2a6592385c7b2f135ea2836e6c495d9faea1bdcc65aa994bd5548bc2d84db38d5dbb713 +DIST httpcomponents-core-4.4.14-src.tar.gz.asc 215 BLAKE2B 52aae4a503ff720f87538283c9215b7a8be9d5d2744c5ad6e86c7d44924ba18e8ef8d55af570543c2d52f20ce8a3918266773c274382e2c495087cd3e247232a SHA512 0824d3adecc5d1cbaf19dbb8674fd192b9d04cff9091475e5e55a18f6012ef11c2d0829d643e1003e8e18f9d2f0964ee0402a7b0e2e3f21b34dcb0676e1392e9 diff --git a/dev-java/httpcore/httpcore-4.4.14.ebuild b/dev-java/httpcore/httpcore-4.4.14-r1.ebuild similarity index 62% rename from dev-java/httpcore/httpcore-4.4.14.ebuild rename to dev-java/httpcore/httpcore-4.4.14-r1.ebuild index f243859d5639..f554a2b55b78 100644 --- a/dev-java/httpcore/httpcore-4.4.14.ebuild +++ b/dev-java/httpcore/httpcore-4.4.14-r1.ebuild @@ -1,31 +1,28 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom httpcore/pom.xml --download-uri https://mirror.netcologne.de/apache.org//httpcomponents/httpcore/source/httpcomponents-core-4.4.14-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild httpcomponents-core-4.4.14.ebuild - -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="doc source test" MAVEN_ID="org.apache.httpcomponents:httpcore:4.4.14" JAVA_TESTING_FRAMEWORKS="junit-4" -inherit java-pkg-2 java-pkg-simple +inherit java-pkg-2 java-pkg-simple verify-sig DESCRIPTION="Apache HttpComponents Core (blocking I/O)" -HOMEPAGE="https://hc.apache.org/httpcomponents-core-ga"; -SRC_URI="mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-${PV}-src.tar.gz" +HOMEPAGE="https://hc.apache.org/httpcomponents-core-5.2.x/"; +SRC_URI="https://archive.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-${PV}-src.tar.gz + verify-sig? ( + https://archive.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-${PV}-src.tar.gz.asc + )" +S="${WORKDIR}/httpcore" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" -# Compile dependencies -# POM: httpcore/pom.xml -# test? commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0 -# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4 -# test? org.mockito:mockito-core:1.10.19 -> >=dev-java/mockito-1.9.5:0 - +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/httpcomponents-core.hc.apache.org.asc" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-httpcomponents-httpcore )" DEPEND=">=virtual/jdk-1.8:* test? ( dev-java/commons-logging:0 @@ -36,8 +33,6 @@ RDEPEND=">=virtual/jre-1.8:*" DOCS=( ../{LICENSE,NOTICE,README,RELEASE_NOTES}.txt ) -S="${WORKDIR}/httpcore" - JAVA_SRC_DIR=( "src/main/java" "src/main/java-deprecated"
