gentoo auto-resync : 05:03:2023 - 23:52:45

4 files changed, 19 insertions, 34 deletions

diff --git a/dev-java/jakarta-activation/Manifest b/dev-java/jakarta-activation/Manifest
index b56f5689e71c..1c4a33113aef 100644
--- a/dev-java/jakarta-activation/Manifest
+++ b/dev-java/jakarta-activation/Manifest
@@ -1,5 +1,5 @@
-DIST jakarta-activation-1.2.2.tar.gz 123283 BLAKE2B 2d205b0a042790f931d20b30f422690eb4f7b51ffa3e8eb2af0eb1fabbcd3fa9e469e9b68384bd95278c319f97911795473cbc81282b516f30148488da729f4d SHA512 a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4
-DIST jakarta-activation-2.0.1.tar.gz 133807 BLAKE2B 3b793fc767601cc1406482facb0456efd1f784371dff602e71f579a2c74f8e66affed384c8ce3b6aa7c2abfcb5cb0ff5f781ea109829c03f645099fb52016e21 SHA512 51e60d851b9f2027944ab24b248b3c7c19028a504ccf5f92a61495ffa65176df78c63c25e91de4a22d6aa9a1989db274f419f91693a21f052875635b8b21bad1
-EBUILD jakarta-activation-1.2.2-r1.ebuild 1590 BLAKE2B 8f97fe4b0d557e37c4c808af4c7f8bb52895af54c23c0f1f3af447af34c3ec0ac0213dd8cdba588f9f3dab3c1346dd4a84b2a5e3bc676f7d033bc87148e6b497 SHA512 95691423ba5596fa56ad1c18453644f1cd22de91d667d0d88a47fc4c3fb6bb4a34eb009123146984544d75ab49cf9afa68afaf23dbc91b9862eeaca7eb4bc48b
-EBUILD jakarta-activation-2.0.1-r1.ebuild 895 BLAKE2B e28c54f1f86ab0376c0ac5abcc03941c0239868a8bf92bbe4bb6e72498e620626c480085f60961c0b5605935e3668bc154870ce610511779db7f3caae5e6c37e SHA512 229cdd0db6e0691fdcef006d1aeb50ec465b3fd7fc9071f18b7fb49c22b0dede4c98c4eb99454fa936d5ff945ebc91aa024335a405270e507372a5efa6b780fa
-MISC metadata.xml 362 BLAKE2B bfda62be71a4c85153713dd7e8546ce32c783612d2810046280cb9bdb86f3e2187000254c12b040bdb9fd91ac29a7dd910a9d99022fae851402944eebb428b8f SHA512 61b83467d9f5636bbd8c1e4bd4a553de3e36173db5c572d1d499c41615c7a3ffc83a2d8db1e6ee1551602534deba745edfc0394659b61f4dd3c252d84c196c06
+DIST jakarta-activation-1.2.2.tar.gz 123311 BLAKE2B 1d33b9980f1843066ce1311dfcc81a897c23fd2667de7bf6ca9590b78e165b3ffe38230d8ccb2598b2e702a126849008421a21f97deceaf0a66ce0e9488ce5ea SHA512 4ea88a32b89a752e1dc8e6cc2a47b978c42e1a6a7103bda87b717cc5845ec6b9cce147362597959d188e02f7328decea620e0b7e425dede546a1d163ede47c10
+DIST jakarta-activation-2.0.1.tar.gz 133817 BLAKE2B bd74e3df8a2d75c137cd3e25c9689296c4827f626c86455da4e10dd8b743e8ffbd5c502162f4f1f7399c4f1e1f2eab6632e9a69e67f017a7f8f111ea4a2ac836 SHA512 f5672f20588e894e7fb5248da7c69c1c8cebb3053342013f713fd58011a2ef069e9abfff8948613b19fd3404151f950d083aeda77ab6a79baaf673658016bfd6
+EBUILD jakarta-activation-1.2.2-r1.ebuild 1353 BLAKE2B d5bb39b3a1e6ab97363f818d5067d68f3fbe570156adb22729e844fe6f30203e9ad1d26c9dfda7b0645d029d9e31f2e226834ba8e7b21093b02cb7742738060c SHA512 17b17e4134faf4e837605e2f18cbf10c39377544431eea20c712bd788c32aac4938579559c2383d69d789b47ca84c977b2f087b98cda654ff22aecdc8fdc631e
+EBUILD jakarta-activation-2.0.1-r1.ebuild 633 BLAKE2B 0b2b9305738f91907ad666b0670548691b4132950799d0af7c5c0100cc70fae3685e1a69b354177af320ec85922a587bc7394f9be9b33312516f9a27cde9dc62 SHA512 e4cdb98899920ef0c19c59dd76d57afd3b12165c3f23e6ca2516c6648a42f4f7ec66c9a5777069ac83c0a1f07cc22dd409a882c3564a907d57d56245c48e5f3b
+MISC metadata.xml 364 BLAKE2B e6d9974b98d8675d21e9bad7ebe4d05bba1855171526218e8aaa403d0b48ec993689dfd7fdc3bf902b1ab9ad51669998d821b29a39cd3d7bc26e627b4803a027 SHA512 a7e1932872dc0660e85faa6371c9026e7325ef20f83e2a5938586f5a1fc2d28db7738f8897c01888277671f01aae2580d5ed33d88dbdeb5fc1d777349c1fe427
diff --git a/dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild b/dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild
index 0a83f80926ed..1483a29bde02 100644
--- a/dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild
+++ b/dev-java/jakarta-activation/jakarta-activation-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 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-1.2.2.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source"
@@ -12,8 +9,9 @@ MAVEN_ID="com.sun.activation:jakarta.activation:1.2.2"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Jakarta Activation"
-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 -> ${P}.tar.gz"
+S="${WORKDIR}/jaf-api-${PV}/activation"
 
 LICENSE="EPL-1.0"
 SLOT="1"
@@ -28,8 +26,6 @@ BDEPEND="app-arch/zip"
 
 DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
 
-S="${WORKDIR}/jaf-${PV}/activation"
-
 JAVA_ENCODING="iso-8859-1"
 
 JAVA_GENTOO_CLASSPATH="jakarta-activation-api-1"
@@ -37,7 +33,7 @@ JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
 
 src_prepare() {
-	default
+	java-pkg-2_src_prepare
 	find ${JAVA_RESOURCE_DIRS} -name "*.default" -delete || die "Failed to delete *.default files"
 }
 
diff --git a/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild b/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild
index c409f44c8000..7b2fc15669ec 100644
--- a/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild
+++ b/dev-java/jakarta-activation/jakarta-activation-2.0.1-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 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-2.0.1.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source"
@@ -12,24 +9,16 @@ MAVEN_ID="com.sun.activation:jakarta.activation:2.0.1"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Jakarta Activation"
-HOMEPAGE="https://github.com/eclipse-ee4j/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 -> ${P}.tar.gz"
+S="${WORKDIR}/jaf-api-${PV}/activation"
 
 LICENSE="EPL-1.0"
 SLOT="2"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
-DEPEND="
-	>=virtual/jdk-11:*
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/jaf-${PV}/activation"
+DEPEND=">=virtual/jdk-11:* "
+RDEPEND=">=virtual/jre-1.8:* "
 
 JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS=(
-	"src/main/resources"
-)
+JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/jakarta-activation/metadata.xml b/dev-java/jakarta-activation/metadata.xml
index 947a81e39af4..9641aeda8c6f 100644
--- a/dev-java/jakarta-activation/metadata.xml
+++ b/dev-java/jakarta-activation/metadata.xml
@@ -5,7 +5,7 @@
 		<email>java@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">eclipse-ee4j/jaf</remote-id>
-		<bugs-to>https://github.com/eclipse-ee4j/jaf/issues</bugs-to>
+		<bugs-to>https://github.com/jakartaee/jaf-api/issues</bugs-to>
+		<remote-id type="github">jakartaee/jaf-api</remote-id>
 	</upstream>
 </pkgmetadata>