gentoo auto-resync : 27:09:2024 - 01:25:47

2 files changed, 104 insertions, 0 deletions

diff --git a/dev-java/cdi-api/Manifest b/dev-java/cdi-api/Manifest
index de3997d0aa6f..8fda65c1fd18 100644
--- a/dev-java/cdi-api/Manifest
+++ b/dev-java/cdi-api/Manifest
@@ -1,4 +1,5 @@
 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-r2.ebuild 2679 BLAKE2B 6adaa74cf6952e134cd03fda924c7fc5c97d7e0d271725b690de8df4f7fcc18f5c8c50be5305bcc010dc4009831ac4700376d1e2a785f57a896265beadbfdc6c SHA512 2aff7fa8ee65bedf952b70c1d6ae7163f1039cdd3230ef495553bff446226efd4378f27c3c7e162f887e4f08aa4c956deb726ed5c07fbd7492cccaad2a65b288
+EBUILD cdi-api-4.0.1-r3.ebuild 2933 BLAKE2B c75f8e1bd10f6c749606b045fa5751671ab4329d684cfc5699690027ff115f528c7233fca8e5e166c30e0dc745e52ad17d2d381ca3a1b53f562229ceaeb60377 SHA512 2cc05f03233cc42df70a4e2b3b0ffc32c3a18b79dfc7d01a598c6b371c6f70ac1e09376bcb83393e0450ea38eabc4a5bacfc9002d0837bd6913884119cff6412
 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
new file mode 100644
index 000000000000..dc637e2dc427
--- /dev/null
+++ b/dev-java/cdi-api/cdi-api-4.0.1-r3.ebuild
@@ -0,0 +1,103 @@
+# 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 ~arm ~arm64 ~ppc64 ~x86"
+
+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-simple_src_install
+	java-pkg_dojar "lang-model.jar"
+
+	if use source; then
+		java-pkg_dosrc "lang-model/src/main/java/*"
+		java-pkg_dosrc "api/src/main/java/*"
+	fi
+}