[gentoo-commits] repo/gentoo:master commit in: dev-java/cdi-api/, dev-java/jakarta-annotation-api/, dev-java/memoryfilesystem/, ...

[gentoo-commits] repo/gentoo:master commit in: dev-java/cdi-api/, dev-java/jakarta-annotation-api/, dev-java/memoryfilesystem/, ...

[Miroslav Šulc]

commit:     93301183b304c9386d7ec1bcba3df32746c8013e
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Nov 12 08:05:30 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Dec  9 17:28:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93301183

dev-java/*: Rename dev-java/{jakarta-annotations-api → jakarta-annotation-api}

better match with module-info, MAVEN-ID, mvnrepository.com, repology

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

 .../cdi-api/{cdi-api-4.0.1-r3.ebuild => cdi-api-4.0.1-r4.ebuild}   | 4 ++--
 dev-java/jakarta-annotation-api/Manifest                           | 1 +
 .../jakarta-annotation-api-2.1.1.ebuild}                           | 4 +---
 .../metadata.xml                                                   | 0
 dev-java/jakarta-annotations-api/Manifest                          | 1 -
 ...erceptors-2.1.0.ebuild => jakarta-interceptors-2.1.0-r1.ebuild} | 7 +++----
 ...oryfilesystem-2.3.0.ebuild => memoryfilesystem-2.3.0-r1.ebuild} | 5 ++---
 7 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/dev-java/cdi-api/cdi-api-4.0.1-r3.ebuild b/dev-java/cdi-api/cdi-api-4.0.1-r4.ebuild
similarity index 97%
rename from dev-java/cdi-api/cdi-api-4.0.1-r3.ebuild
rename to dev-java/cdi-api/cdi-api-4.0.1-r4.ebuild
index 9662f5535c67..dd3b6ec3dc21 100644
--- a/dev-java/cdi-api/cdi-api-4.0.1-r3.ebuild
+++ b/dev-java/cdi-api/cdi-api-4.0.1-r4.ebuild
@@ -22,7 +22,7 @@ EL_API_SLOT="5.0"
 
 DEPEND="
 	dev-java/injection-api:0
-	dev-java/jakarta-annotations-api:0
+	dev-java/jakarta-annotation-api:0
 	dev-java/jakarta-el-api:${EL_API_SLOT}
 	dev-java/jakarta-interceptors:0
 	>=virtual/jdk-11:*
@@ -64,7 +64,7 @@ src_compile() {
 	# getting the modulepath
 	DEPENDENCIES=(
 		jakarta-el-api-${EL_API_SLOT}
-		jakarta-annotations-api
+		jakarta-annotation-api
 		jakarta-interceptors
 		injection-api
 	)

diff --git a/dev-java/jakarta-annotation-api/Manifest b/dev-java/jakarta-annotation-api/Manifest
new file mode 100644
index 000000000000..3ff27ccdce64
--- /dev/null
+++ b/dev-java/jakarta-annotation-api/Manifest
@@ -0,0 +1 @@
+DIST jakarta-annotation-api-2.1.1.tar.gz 83788 BLAKE2B be9904337199bd8cf9e5748d53b4536b3562446d499992b97c7e413e2e2d9ae0c8ba50d601950a0feec8bce4c4c35093b7b8f87ad60ea407452f502996045e54 SHA512 8a61cb8a9da55efd7c5172aa9a134eae7d94489a66ef749c619a7fc596122fd50f3dda7a954d78f664132c72ce999d2d3ad01b70e1d2cb2072c881327de11d82

diff --git a/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild b/dev-java/jakarta-annotation-api/jakarta-annotation-api-2.1.1.ebuild
similarity index 81%
rename from dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild
rename to dev-java/jakarta-annotation-api/jakarta-annotation-api-2.1.1.ebuild
index 38ac3dfc2baf..8de7b9bc5d1c 100644
--- a/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild
+++ b/dev-java/jakarta-annotation-api/jakarta-annotation-api-2.1.1.ebuild
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Jakarta Annotations API"
 HOMEPAGE="https://projects.eclipse.org/projects/ee4j.ca"
-SRC_URI="https://github.com/jakartaee/common-annotations-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/eclipse-ee4j/common-annotations-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/common-annotations-api-${PV}"
 
 LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
@@ -27,6 +27,4 @@ RDEPEND="
 
 DOCS=( {CONTRIBUTING,NOTICE,README}.md )
 
-S="${WORKDIR}/${P/jakarta/common}"
-
 JAVA_SRC_DIR="api/src/main/java"

diff --git a/dev-java/jakarta-annotations-api/metadata.xml b/dev-java/jakarta-annotation-api/metadata.xml
similarity index 100%
rename from dev-java/jakarta-annotations-api/metadata.xml
rename to dev-java/jakarta-annotation-api/metadata.xml

diff --git a/dev-java/jakarta-annotations-api/Manifest b/dev-java/jakarta-annotations-api/Manifest
deleted file mode 100644
index b27c2a5598e8..000000000000
--- a/dev-java/jakarta-annotations-api/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jakarta-annotations-api-2.1.1.tar.gz 83788 BLAKE2B be9904337199bd8cf9e5748d53b4536b3562446d499992b97c7e413e2e2d9ae0c8ba50d601950a0feec8bce4c4c35093b7b8f87ad60ea407452f502996045e54 SHA512 8a61cb8a9da55efd7c5172aa9a134eae7d94489a66ef749c619a7fc596122fd50f3dda7a954d78f664132c72ce999d2d3ad01b70e1d2cb2072c881327de11d82

diff --git a/dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0.ebuild b/dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0-r1.ebuild
similarity index 91%
rename from dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0.ebuild
rename to dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0-r1.ebuild
index 0f163e5b9ba2..6e96cc616ad1 100644
--- a/dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0.ebuild
+++ b/dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0-r1.ebuild
@@ -14,20 +14,19 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Jakarta Interceptors"
 HOMEPAGE="https://projects.eclipse.org/projects/ee4j.interceptors"
 SRC_URI="https://github.com/jakartaee/interceptors/archive/${PV}-RELEASE.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/interceptors-${PV}-RELEASE"
 
 LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
 SLOT="0"
 KEYWORDS="amd64 arm64 ppc64"
 
 DEPEND="
-	dev-java/jakarta-annotations-api:0
+	dev-java/jakarta-annotation-api:0
 	>=virtual/jdk-11:*
 "
 RDEPEND=">=virtual/jre-1.8:*"
 
 DOCS=( {CONTRIBUTING,NOTICE,README}.md )
 
-S="${WORKDIR}/interceptors-${PV}-RELEASE"
-
-JAVA_CLASSPATH_EXTRA="jakarta-annotations-api"
+JAVA_CLASSPATH_EXTRA="jakarta-annotation-api"
 JAVA_SRC_DIR="api/src/main/java"

diff --git a/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild b/dev-java/memoryfilesystem/memoryfilesystem-2.3.0-r1.ebuild
similarity index 97%
rename from dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild
rename to dev-java/memoryfilesystem/memoryfilesystem-2.3.0-r1.ebuild
index 3b9997332847..2d40f7efbad3 100644
--- a/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild
+++ b/dev-java/memoryfilesystem/memoryfilesystem-2.3.0-r1.ebuild
@@ -11,13 +11,14 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="An in memory implementation of a JSR-203 file system."
 HOMEPAGE="https://github.com/marschall/memoryfilesystem"
 SRC_URI="https://github.com/marschall/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm64 ppc64"
 
 CP_DEPEND="
-	dev-java/jakarta-annotations-api:0
+	dev-java/jakarta-annotation-api:0
 "
 
 DEPEND="
@@ -30,8 +31,6 @@ RDEPEND="
 	${CP_DEPEND}
 "
 
-S="${WORKDIR}/${P}"
-
 JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"