From 59437d191de3ff33f9bfa37f8656d849184fcaf0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 10 Dec 2024 02:01:16 +0000 Subject: gentoo auto-resync : 10:12:2024 - 02:01:16 --- dev-java/cdi-api/Manifest | 2 +- dev-java/cdi-api/cdi-api-4.0.1-r3.ebuild | 106 ------------------------------- dev-java/cdi-api/cdi-api-4.0.1-r4.ebuild | 106 +++++++++++++++++++++++++++++++ 3 files changed, 107 insertions(+), 107 deletions(-) delete mode 100644 dev-java/cdi-api/cdi-api-4.0.1-r3.ebuild create mode 100644 dev-java/cdi-api/cdi-api-4.0.1-r4.ebuild (limited to 'dev-java/cdi-api') diff --git a/dev-java/cdi-api/Manifest b/dev-java/cdi-api/Manifest index 8a8f2c884856..276a1c86f54c 100644 --- a/dev-java/cdi-api/Manifest +++ b/dev-java/cdi-api/Manifest @@ -1,4 +1,4 @@ AUX cdi-api-4.0.1-skip-tests.patch 2530 BLAKE2B 6b4fac604f1b3692ce4150b2e6f29d60a32004dd61a7cd4f12e092bb43e8bed6a1ddc33ad711e0f3025ec95f37a8aba11c305e9df23b3f11e29021baa3808e17 SHA512 0d7d99baea9cbc21e9bc435118f793c6a11d802968b24aed20a65b337b3cebb7d50e37a493084deaa7961c64bfd4f2b96f0750897b0589586b3e89077edf364e DIST cdi-api-4.0.1.tar.gz 280719 BLAKE2B 9c4cf34f1b0c096a3097bed658ba4c13ab6fa655cd8233b82b13a788dd047e1be89bcde69b3c69665c0987c4f62cd5e4596e51f6235c95db5239daf403dea4e9 SHA512 7f3e9ca45e0708b3c998ff6f743975a9995309d1fb93fde64ca8a0fca73e16ea653085ca743c921d52385f0fbcbdab10b45fd8b6e8b27c2e058871febbbeeb1e -EBUILD cdi-api-4.0.1-r3.ebuild 2953 BLAKE2B a97466f63b16de80aaeae1181361481729cb29b5c298aade77d47daffcfcf215aae97cecd9dffa16b30d8305abb01a0c367a12e4dc84ae122481a351f6832a56 SHA512 79c6423834685acd0b29627876077b97433551672f1b5cb4fead504a64fca520c7c4467f945d13e0787bf180e7fe1e33c7fb18419e95c1c90eff4db1a517630a +EBUILD cdi-api-4.0.1-r4.ebuild 2951 BLAKE2B 651497f872362156a6e6a0c3c90b5fee9a4b5859e908912487a24c18747dd7e6cc058084862560b694e544db837d55e39b68dbdb371112178a72923c9966461e SHA512 7afc98c5b5ed7928e5131f54100b6f9a4a60bd657b5e2bc01397cee00274662b486be46abc7f1012416887c77d32a02c7b8f79a780adde099b3db2bc009e837f MISC metadata.xml 295 BLAKE2B 349f4209d0a1dac5a43b3cc197c78aadf3263cfb1e6ddfa39b4ea54bf5b4883a80e800b600720b745a86ee6defe57304736910fc4bb42ee1c1f57f35a3936ea0 SHA512 6f7bf9a1c0e9418a7a0d3cc2baa8f6cbbcf1b4a7abf7f4501d718355d778966b3a16f56bd30c5136d7fb96597d3377e61cbb9a9d840b53fa4da26e00cb3d72e1 diff --git a/dev-java/cdi-api/cdi-api-4.0.1-r3.ebuild b/dev-java/cdi-api/cdi-api-4.0.1-r3.ebuild deleted file mode 100644 index 9662f5535c67..000000000000 --- a/dev-java/cdi-api/cdi-api-4.0.1-r3.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1" -JAVA_TESTING_FRAMEWORKS="testng" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="APIs for CDI (Contexts and Dependency Injection for Java)" -HOMEPAGE="https://projects.eclipse.org/projects/ee4j.cdi" -SRC_URI="https://github.com/jakartaee/cdi/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/cdi-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64" - -EL_API_SLOT="5.0" - -DEPEND=" - dev-java/injection-api:0 - dev-java/jakarta-annotations-api:0 - dev-java/jakarta-el-api:${EL_API_SLOT} - dev-java/jakarta-interceptors:0 - >=virtual/jdk-11:* -" -RDEPEND=">=virtual/jre-11:*" - -DOCS=( CONTRIBUTING.adoc {NOTICE,README}.md ) - -PATCHES=( - # https://bugs.gentoo.org/856412 - # org.jboss.cdi.api.test.se.SeContainerInitializerTest # Tests run: 4, Failures: 1 - # org.jboss.cdi.api.test.CDITest # Tests run: 11, Failures: 5 - "${FILESDIR}/cdi-api-4.0.1-skip-tests.patch" -) - -JAVA_GENTOO_CLASSPATH_EXTRA="cdi-api.jar" # tests need it on classpath -JAVA_TEST_EXCLUDES=( - # Tests run: 1, Failures: 1 - org.jboss.cdi.api.test.privileged.CDIPrivilegedTest -) -JAVA_TEST_EXTRA_ARGS=( -DserviceDir="target/test-classes/META-INF/services" ) -JAVA_TEST_GENTOO_CLASSPATH="injection-api testng" -JAVA_TEST_RESOURCE_DIRS="api/src/test/resources" -JAVA_TEST_SRC_DIR="api/src/test/java" - -src_prepare(){ - default #780585 - java-pkg-2_src_prepare - - # fixing the directory structure to allow multi-mode compilation - mkdir -p src/jakarta.cdi{,.lang.model} || die - cp -r api/src/main/java/* src/jakarta.cdi/ || die - cp -r lang-model/src/main/java/* src/jakarta.cdi.lang.model || die -} - -src_compile() { - mkdir -p target/classes || die - - # getting the modulepath - DEPENDENCIES=( - jakarta-el-api-${EL_API_SLOT} - jakarta-annotations-api - jakarta-interceptors - injection-api - ) - local modulepath - for dependency in ${DEPENDENCIES[@]}; do - modulepath="${modulepath}:$(java-pkg_getjars --build-only ${dependency})" - done - - # Multi-module compilation, https://openjdk.org/projects/jigsaw/quick-start - ejavac -d target/classes \ - --module-version ${PV} \ - --module-path "${modulepath}" \ - --module-source-path ./src $(find src -type f -name '*.java') || die - - if use doc; then - ejavadoc -d target/api \ - --module-path "${modulepath}" \ - --module-source-path ./src $(find src -type f -name '*.java') || die - fi - - # packaging seems possible only per each module (?) - jar cvf cdi-api.jar -C target/classes/jakarta.cdi . || die - jar cvf lang-model.jar -C target/classes/jakarta.cdi.lang.model . || die - - java-pkg_addres cdi-api.jar api/src/main/resources -} - -src_install() { - java-pkg_dojar {cdi-api,lang-model}.jar - - use doc && java-pkg_dojavadoc target/api - - if use source; then - java-pkg_dosrc lang-model/src/main/java/* - java-pkg_dosrc api/src/main/java/* - fi - - einstalldocs -} diff --git a/dev-java/cdi-api/cdi-api-4.0.1-r4.ebuild b/dev-java/cdi-api/cdi-api-4.0.1-r4.ebuild new file mode 100644 index 000000000000..dd3b6ec3dc21 --- /dev/null +++ b/dev-java/cdi-api/cdi-api-4.0.1-r4.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1" +JAVA_TESTING_FRAMEWORKS="testng" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="APIs for CDI (Contexts and Dependency Injection for Java)" +HOMEPAGE="https://projects.eclipse.org/projects/ee4j.cdi" +SRC_URI="https://github.com/jakartaee/cdi/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/cdi-${PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 arm64 ppc64" + +EL_API_SLOT="5.0" + +DEPEND=" + dev-java/injection-api:0 + dev-java/jakarta-annotation-api:0 + dev-java/jakarta-el-api:${EL_API_SLOT} + dev-java/jakarta-interceptors:0 + >=virtual/jdk-11:* +" +RDEPEND=">=virtual/jre-11:*" + +DOCS=( CONTRIBUTING.adoc {NOTICE,README}.md ) + +PATCHES=( + # https://bugs.gentoo.org/856412 + # org.jboss.cdi.api.test.se.SeContainerInitializerTest # Tests run: 4, Failures: 1 + # org.jboss.cdi.api.test.CDITest # Tests run: 11, Failures: 5 + "${FILESDIR}/cdi-api-4.0.1-skip-tests.patch" +) + +JAVA_GENTOO_CLASSPATH_EXTRA="cdi-api.jar" # tests need it on classpath +JAVA_TEST_EXCLUDES=( + # Tests run: 1, Failures: 1 + org.jboss.cdi.api.test.privileged.CDIPrivilegedTest +) +JAVA_TEST_EXTRA_ARGS=( -DserviceDir="target/test-classes/META-INF/services" ) +JAVA_TEST_GENTOO_CLASSPATH="injection-api testng" +JAVA_TEST_RESOURCE_DIRS="api/src/test/resources" +JAVA_TEST_SRC_DIR="api/src/test/java" + +src_prepare(){ + default #780585 + java-pkg-2_src_prepare + + # fixing the directory structure to allow multi-mode compilation + mkdir -p src/jakarta.cdi{,.lang.model} || die + cp -r api/src/main/java/* src/jakarta.cdi/ || die + cp -r lang-model/src/main/java/* src/jakarta.cdi.lang.model || die +} + +src_compile() { + mkdir -p target/classes || die + + # getting the modulepath + DEPENDENCIES=( + jakarta-el-api-${EL_API_SLOT} + jakarta-annotation-api + jakarta-interceptors + injection-api + ) + local modulepath + for dependency in ${DEPENDENCIES[@]}; do + modulepath="${modulepath}:$(java-pkg_getjars --build-only ${dependency})" + done + + # Multi-module compilation, https://openjdk.org/projects/jigsaw/quick-start + ejavac -d target/classes \ + --module-version ${PV} \ + --module-path "${modulepath}" \ + --module-source-path ./src $(find src -type f -name '*.java') || die + + if use doc; then + ejavadoc -d target/api \ + --module-path "${modulepath}" \ + --module-source-path ./src $(find src -type f -name '*.java') || die + fi + + # packaging seems possible only per each module (?) + jar cvf cdi-api.jar -C target/classes/jakarta.cdi . || die + jar cvf lang-model.jar -C target/classes/jakarta.cdi.lang.model . || die + + java-pkg_addres cdi-api.jar api/src/main/resources +} + +src_install() { + java-pkg_dojar {cdi-api,lang-model}.jar + + use doc && java-pkg_dojavadoc target/api + + if use source; then + java-pkg_dosrc lang-model/src/main/java/* + java-pkg_dosrc api/src/main/java/* + fi + + einstalldocs +} -- cgit v1.2.3