commit: a67c0cba7e23d77c5895467bca45b72b464dc57b Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Tue Jan 24 17:46:49 2023 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sat Mar 4 12:56:26 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a67c0cba
dev-java/jakarta-activation-api: update HOMEPAGE, SRC_URI, upstream metadata Also fix MatchingChksums and ExcessiveLineLength issues Closes: https://bugs.gentoo.org/797289 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/jakarta-activation-api/Manifest | 4 ++-- .../jakarta-activation-api-1.2.2-r1.ebuild | 14 +++++--------- .../jakarta-activation-api-2.1.0-r1.ebuild | 17 ++++------------- dev-java/jakarta-activation-api/metadata.xml | 4 ++-- 4 files changed, 13 insertions(+), 26 deletions(-) diff --git a/dev-java/jakarta-activation-api/Manifest b/dev-java/jakarta-activation-api/Manifest index 5f44c8a13868..d31cf6c64986 100644 --- a/dev-java/jakarta-activation-api/Manifest +++ b/dev-java/jakarta-activation-api/Manifest @@ -1,2 +1,2 @@ -DIST jakarta-activation-2.1.0.tar.gz 118833 BLAKE2B ad4b23405b412eb31ffe6fa9ebb62e5f3d21f721908bec6607d1e236b1aa36a5fbc5d721db879210b99a236a3ead4e6b89854f311b4593f32bc537f0d37638a0 SHA512 6552789b3bc590b241250387e07fd9973f2ba210544baf5e5c272ce9824ddc568dd186d2db2b28d89698b68c6505d8263d8aa5ceedf1a12a2d8fc94d648cc8fa -DIST jakarta-activation-api-1.2.2.tar.gz 123283 BLAKE2B 2d205b0a042790f931d20b30f422690eb4f7b51ffa3e8eb2af0eb1fabbcd3fa9e469e9b68384bd95278c319f97911795473cbc81282b516f30148488da729f4d SHA512 a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4 +DIST jakarta-activation-1.2.2.tar.gz 123311 BLAKE2B 1d33b9980f1843066ce1311dfcc81a897c23fd2667de7bf6ca9590b78e165b3ffe38230d8ccb2598b2e702a126849008421a21f97deceaf0a66ce0e9488ce5ea SHA512 4ea88a32b89a752e1dc8e6cc2a47b978c42e1a6a7103bda87b717cc5845ec6b9cce147362597959d188e02f7328decea620e0b7e425dede546a1d163ede47c10 +DIST jakarta-activation-2.1.0.tar.gz 118866 BLAKE2B 169457c88cb99bbcb712c9c6d2c6979bb48df7a84d5a2f302ceb56d21f4242042eef2408cfdcaccdc3fe76b78d5c417e49010885b7bf0a8955b080647cece175 SHA512 753437cfeb03ad15a66ec6895a992aba453cb4eea84042f31ed50c0b59b1299578bf1a8341d29fdf6bc5619d3a40233bf29b66aa5203ed54f295dc321a3fd6aa diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild index 459fa0f06282..20b19ae30fba 100644 --- a/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild +++ b/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild @@ -1,9 +1,6 @@ -# Copyright 1999-2022 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 jaf-1.2.2/activationapi/pom.xml --download-uri https://github.com/eclipse-ee4j/jaf/archive/refs/tags/1.2.2.tar.gz --slot 1 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-api-1.2.2.ebuild - EAPI=8 JAVA_PKG_IUSE="doc source" @@ -12,8 +9,8 @@ MAVEN_ID="jakarta.activation:jakarta.activation-api:1.2.2" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Jakarta Activation API jar" -HOMEPAGE="https://eclipse-ee4j.github.io/jaf/"; -SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://jakartaee.github.io/jaf-api/"; +SRC_URI="https://github.com/jakartaee/jaf-api/archive/${PV}.tar.gz -> jakarta-activation-${PV}.tar.gz" LICENSE="EPL-1.0" SLOT="1" @@ -25,7 +22,7 @@ BDEPEND="app-arch/zip" DOCS=( ../{CONTRIBUTING,NOTICE,README}.md ) -S="${WORKDIR}/jaf-${PV}/activation" +S="${WORKDIR}/jaf-api-${PV}/activation" JAVA_ENCODING="iso-8859-1" @@ -33,7 +30,7 @@ JAVA_SRC_DIR="src/main/java" JAVA_RESOURCE_DIRS="src/main/resources" src_prepare() { - default + java-pkg-2_src_prepare # these files are not present in the upstream jar find ${JAVA_RESOURCE_DIRS} -name "*.default" -delete || die "Failed to delete *.default files" } @@ -45,7 +42,6 @@ src_compile() { } src_install() { - default # we remove the implementation sources so that they don't land in sources rm -fr ${JAVA_SRC_DIR}/com || "Failed to delete implementation sources" java-pkg-simple_src_install diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0-r1.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0-r1.ebuild index 2b6b9f6729b6..91741f54c08c 100644 --- a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0-r1.ebuild +++ b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0-r1.ebuild @@ -1,9 +1,6 @@ -# Copyright 1999-2022 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://github.com/eclipse-ee4j/jaf/archive/refs/tags/2.0.1.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-2.0.1.ebuild - EAPI=8 JAVA_PKG_IUSE="doc source" @@ -12,8 +9,9 @@ MAVEN_ID="jakarta.activation:jakarta.activation-api:2.1.0" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Jakarta Activation API jar" -HOMEPAGE="https://eclipse-ee4j.github.io/jaf/"; -SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/${PV}.tar.gz -> jakarta-activation-${PV}.tar.gz" +HOMEPAGE="https://jakartaee.github.io/jaf-api/"; +SRC_URI="https://github.com/jakartaee/jaf-api/archive/${PV}.tar.gz -> jakarta-activation-${PV}.tar.gz" +S="${WORKDIR}/jaf-api-${PV}/api" LICENSE="EPL-1.0" SLOT="2" @@ -24,12 +22,5 @@ RDEPEND=">=virtual/jre-1.8:*" DOCS=( ../{CONTRIBUTING,NOTICE,README}.md ) -S="${WORKDIR}/jaf-${PV}/api" - JAVA_SRC_DIR="src/main/java" JAVA_RESOURCE_DIRS="src/main/resources" - -src_install() { - default # https://bugs.gentoo.org/789582 - java-pkg-simple_src_install -} diff --git a/dev-java/jakarta-activation-api/metadata.xml b/dev-java/jakarta-activation-api/metadata.xml index 947a81e39af4..26d86f56dec0 100644 --- a/dev-java/jakarta-activation-api/metadata.xml +++ b/dev-java/jakarta-activation-api/metadata.xml @@ -5,7 +5,7 @@ <email>[email protected]</email> </maintainer> <upstream> - <remote-id type="github">eclipse-ee4j/jaf</remote-id> - <bugs-to>https://github.com/eclipse-ee4j/jaf/issues</bugs-to> + <remote-id type="github">jakartaee/jaf-api</remote-id> + <bugs-to>https://github.com/jakartaee/jaf-api/issues</bugs-to> </upstream> </pkgmetadata>
