From 8cb247e1e8406a760f04cb613e16e3f70d488229 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Sun, 15 Sep 2024 17:42:53 +0000 Subject: Adding metadata --- dev-java/jctools-core/jctools-core-4.0.5-r1.ebuild | 82 ++++++++++ dev-java/jctools-core/jctools-core-4.0.5.ebuild | 82 ---------- dev-java/jdbc-mysql/Manifest | 2 - dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild | 56 ------- dev-java/protobuf-java/Manifest | 3 - .../protobuf-java-3.26.0-unittest.protos.patch | 23 --- dev-java/protobuf-java/protobuf-java-3.23.3.ebuild | 164 -------------------- dev-java/protobuf-java/protobuf-java-3.23.4.ebuild | 167 --------------------- dev-java/protobuf-java/protobuf-java-4.26.1.ebuild | 158 ------------------- 9 files changed, 82 insertions(+), 655 deletions(-) create mode 100644 dev-java/jctools-core/jctools-core-4.0.5-r1.ebuild delete mode 100644 dev-java/jctools-core/jctools-core-4.0.5.ebuild delete mode 100644 dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild delete mode 100644 dev-java/protobuf-java/files/protobuf-java-3.26.0-unittest.protos.patch delete mode 100644 dev-java/protobuf-java/protobuf-java-3.23.3.ebuild delete mode 100644 dev-java/protobuf-java/protobuf-java-3.23.4.ebuild delete mode 100644 dev-java/protobuf-java/protobuf-java-4.26.1.ebuild (limited to 'dev-java') diff --git a/dev-java/jctools-core/jctools-core-4.0.5-r1.ebuild b/dev-java/jctools-core/jctools-core-4.0.5-r1.ebuild new file mode 100644 index 000000000000..164d974b5ed5 --- /dev/null +++ b/dev-java/jctools-core/jctools-core-4.0.5-r1.ebuild @@ -0,0 +1,82 @@ +# 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="org.jctools:jctools-core:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Java Concurrency Tools Core Library" +HOMEPAGE="https://jctools.github.io/JCTools/" +SRC_URI="https://github.com/JCTools/JCTools/archive/v${PV}.tar.gz -> jctools-${PV}.tar.gz" +S="${WORKDIR}/JCTools-${PV}/jctools-core" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +DEPEND=" + dev-java/osgi-annotation:0 + >=virtual/jdk-11:* + test? ( + dev-java/guava-testlib:0 + dev-java/hamcrest:0 + )" + +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( ../{README,RELEASE-NOTES}.md ) +PATCHES=( "${FILESDIR}/jctools-core-4.0.3-increase-TEST_TIMEOUT.patch" ) + +JAVA_CLASSPATH_EXTRA="osgi-annotation" +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="guava-testlib,hamcrest,junit-4" +JAVA_TEST_SRC_DIR="src/test/java" + +src_compile() { + JAVA_JAR_FILENAME="org.${PN}.jar" + java-pkg-simple_src_compile # creates a legacy jar file without module-info + + jdeps --generate-module-info \ + src/main/java \ + --multi-release 9 \ + "${JAVA_JAR_FILENAME}" || die + + JAVA_JAR_FILENAME="${PN}.jar" + java-pkg-simple_src_compile # creates the final jar file including module-info +} + +src_prepare() { + default #780585 + java-pkg-2_src_prepare +} + +# Using the defaults of java-pkg-simple would skip more than half the number of tests. +src_test() { + # org.jetbrains.kotlinx.lincheck is not yet packaged + rm -r src/test/java/org/jctools/maps/linearizability_test || die + # These tests would fail and are not run by "mvn test". + # "org.jctools.queues.MpqSanityTest" + # "org.jctools.queues.QueueSanityTest" + # "org.jctools.queues.ScQueueRemoveTest" + # "org.jctools.util.TestUtil" + pushd src/test/java || die + local JAVA_TEST_RUN_ONLY=$(find * \ + \( -name "*Test*.java" \ + -o -name "nbsi_tester.java" \ + -o -name "nbhs_tester.java" \)\ + ! -name "MpqSanityTest.java" \ + ! -name "QueueSanityTest.java" \ + ! -name "ScQueueRemoveTest.java" \ + ! -name "TestUtil.java" \ + ) + popd + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + java-pkg-simple_src_test + # OK (8746 tests) +} diff --git a/dev-java/jctools-core/jctools-core-4.0.5.ebuild b/dev-java/jctools-core/jctools-core-4.0.5.ebuild deleted file mode 100644 index 1bd8525e6a44..000000000000 --- a/dev-java/jctools-core/jctools-core-4.0.5.ebuild +++ /dev/null @@ -1,82 +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="org.jctools:jctools-core:${PV}" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Java Concurrency Tools Core Library" -HOMEPAGE="https://jctools.github.io/JCTools/" -SRC_URI="https://github.com/JCTools/JCTools/archive/v${PV}.tar.gz -> jctools-${PV}.tar.gz" -S="${WORKDIR}/JCTools-${PV}/jctools-core" - -LICENSE="Apache-2.0" -SLOT="3" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" - -DEPEND=" - dev-java/osgi-annotation:0 - >=virtual/jdk-11:* - test? ( - dev-java/guava-testlib:0 - dev-java/hamcrest:0 - )" - -RDEPEND=">=virtual/jre-1.8:*" - -DOCS=( ../{README,RELEASE-NOTES}.md ) -PATCHES=( "${FILESDIR}/jctools-core-4.0.3-increase-TEST_TIMEOUT.patch" ) - -JAVA_CLASSPATH_EXTRA="osgi-annotation" -JAVA_SRC_DIR="src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH="guava-testlib,hamcrest,junit-4" -JAVA_TEST_SRC_DIR="src/test/java" - -src_compile() { - JAVA_JAR_FILENAME="org.${PN}.jar" - java-pkg-simple_src_compile # creates a legacy jar file without module-info - - jdeps --generate-module-info \ - src/main/java \ - --multi-release 9 \ - "${JAVA_JAR_FILENAME}" || die - - JAVA_JAR_FILENAME="${PN}.jar" - java-pkg-simple_src_compile # creates the final jar file including module-info -} - -src_prepare() { - default #780585 - java-pkg-2_src_prepare -} - -# Using the defaults of java-pkg-simple would skip more than half the number of tests. -src_test() { - # org.jetbrains.kotlinx.lincheck is not yet packaged - rm -r src/test/java/org/jctools/maps/linearizability_test || die - # These tests would fail and are not run by "mvn test". - # "org.jctools.queues.MpqSanityTest" - # "org.jctools.queues.QueueSanityTest" - # "org.jctools.queues.ScQueueRemoveTest" - # "org.jctools.util.TestUtil" - pushd src/test/java || die - local JAVA_TEST_RUN_ONLY=$(find * \ - \( -name "*Test*.java" \ - -o -name "nbsi_tester.java" \ - -o -name "nbhs_tester.java" \)\ - ! -name "MpqSanityTest.java" \ - ! -name "QueueSanityTest.java" \ - ! -name "ScQueueRemoveTest.java" \ - ! -name "TestUtil.java" \ - ) - popd - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" - java-pkg-simple_src_test - # OK (8746 tests) -} diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest index 27c5a47904df..c58aeca7bde6 100644 --- a/dev-java/jdbc-mysql/Manifest +++ b/dev-java/jdbc-mysql/Manifest @@ -1,4 +1,2 @@ -DIST mysql-connector-j-8.1.0.tar.gz 4241696 BLAKE2B 930257a876b1b512b598ebf8397125145bb9d1a438fe33bb55ca208dddfdd29bd436a365cc35b9128cdee6eee436da688dd53cc3ed6cd04efb22d1f5af731863 SHA512 f8a7c621397f49981dd7d19e880d92ee051015ad011c027380ac85760dc22ce2f4117fd27b8d72325c5e2bc40a1a9c22e9534f7200208916ee62bbf1e5ad0c75 DIST mysql-connector-j-8.3.0.tar.gz 4255433 BLAKE2B b5cd437e4ab87052c0fd8e4da6a2612d4c068193a4fe2d207505b2f42d664a414c8a0f3131f34b471a30bfa6b6bb9e76ad0dd4779abbecb46ea014ab5d06e36d SHA512 0849ff13f4adc4ae2d2b9f64ff192435dd9560763a50c7df117a171ae1d90fc97bc36dc89097472d0a2c182492a45ca14ffcf577a9c54267be79e5b3f147dc41 -DIST oci-java-sdk-common-2.47.0.jar 439209 BLAKE2B b3b28bb0cf4b8dbca37bb34df7bb48029901be5d9f7754a2ccce888a9af4a06b3348cd545d480127f942687b9b0d63336c37b5f95ecb9f96111c9388a4bc6053 SHA512 73e7376c92d47d81e0630e2ad2d510a483068664874ae31622629dad6dc016d746499c2d29682563e5cdee35ddb6e9e59a2e7557d32e1eeec5fb12206f9d1d6e DIST oci-java-sdk-common-3.29.0.jar 453619 BLAKE2B 41a68344a9cf4733c642e3a6e4254f3991f19c13edf57b3c61352b1e6ffdfabfe29cd8dccaa9b128fae618a492fb342007d14ad65b06cd614da572c787cf35ab SHA512 b6def960e114b69d3f34706d5e293f0a05b30c31a1443a92e454631712bb633eaea3795beeeabe4eb1303b8ad42ef2b73d69880b73d360e193f8f1b532bc3430 diff --git a/dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild deleted file mode 100644 index 0cf061e42ec7..000000000000 --- a/dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Tests disabled, see bug #902723 -JAVA_PKG_IUSE="doc source" -MAVEN_ID="com.mysql:mysql-connector-j:8.1.0" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -# Bundling a binary version of oci-java-sdk-common -# https://github.com/oracle/oci-java-sdk/blob/v2.47.0/bmc-common/pom.xml -OSC="2.47.0" - -DESCRIPTION="JDBC Type 4 driver for MySQL" -HOMEPAGE="https://dev.mysql.com/doc/connector-j/en/" -SRC_URI="https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${PV}.tar.gz - https://repo1.maven.org/maven2/com/oracle/oci/sdk/oci-java-sdk-common/${OSC}/oci-java-sdk-common-${OSC}.jar" - -S="${WORKDIR}/mysql-connector-j-${PV}" - -LICENSE="GPL-2-with-MySQL-FLOSS-exception" -SLOT="0" -KEYWORDS="amd64 ~ppc64 ~x86" - -CP_DEPEND=" - dev-java/c3p0:0 - - - -+ - - - - -+ - - - -@@ -19,6 +21,7 @@ - - - -+ - - - diff --git a/dev-java/protobuf-java/protobuf-java-3.23.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.23.3.ebuild deleted file mode 100644 index d9f5c30a30db..000000000000 --- a/dev-java/protobuf-java/protobuf-java-3.23.3.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright 2008-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="com.google.protobuf:protobuf-java:3.23.3" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple cmake - -DESCRIPTION="Core Protocol Buffers library" -HOMEPAGE="https://protobuf.dev" -# Currently we bundle the binary version of truth.jar used only for tests, we don't install it. -# And we build artifact 3.23.3 from the 23.3 tarball in order to allow sharing the tarball with -# dev-libs/protobuf. -SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV#3.}.tar.gz -> protobuf-${PV#3.}.tar.gz - test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )" -S="${WORKDIR}/protobuf-${PV#3.}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="system-protoc" - -BDEPEND=" - system-protoc? ( ~dev-libs/protobuf-${PV#3.}:0 ) - !system-protoc? ( >=dev-cpp/abseil-cpp-20230125.3 ) -" -DEPEND=" - >=virtual/jdk-1.8:* - test? ( - dev-java/guava:0 - dev-java/mockito:4 - ) -" -RDEPEND=">=virtual/jre-1.8:*" - -PATCHES=( - "${FILESDIR}/protobuf-java-3.23.0-unittest_retention.proto.patch" -) - -JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf" -JAVA_JAR_FILENAME="protobuf.jar" -JAVA_RESOURCE_DIRS="java/core/src/main/resources" -JAVA_SRC_DIR="java/core/src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4" -JAVA_TEST_SRC_DIR="java/core/src/test/java" - -run-protoc() { - if use system-protoc; then - protoc $1 - else - "${BUILD_DIR}"/protoc $1 - fi -} - -src_prepare() { - # If the corrsponding version of system-protoc is not available we build protoc locally - if use system-protoc; then - default # apply patches - else - cmake_src_prepare - fi - java-pkg-2_src_prepare - - mkdir "${JAVA_RESOURCE_DIRS}" || die - # https://github.com/protocolbuffers/protobuf/blob/v23.3/java/core/pom.xml#L43-L62 - PROTOS=( $(sed \ - -n '/google\/protobuf.*\.proto/s:.*\(.*\):\1:p' \ - "${S}/java/core/pom.xml") ) || die - pushd src > /dev/null || die - cp --parents -v "${PROTOS[@]}" ../"${JAVA_RESOURCE_DIRS}" || die - popd > /dev/null || die - - # https://github.com/protocolbuffers/protobuf/blob/v23.3/java/core/generate-sources-build.xml - einfo "Replace variables in generate-sources-build.xml" - sed \ - -e 's:${generated.sources.dir}:java/core/src/main/java:' \ - -e 's:${protobuf.source.dir}:src:' \ - -e 's:^.*value="::' -e 's:\"/>::' \ - -e '/project\|echo\|mkdir\|exec/d' \ - -i java/core/generate-sources-build.xml || die "sed to sources failed" - - # https://github.com/protocolbuffers/protobuf/blob/v23.3/java/core/generate-test-sources-build.xml - einfo "Replace variables in generate-test-sources-build.xml" - sed \ - -e 's:${generated.testsources.dir}:java/core/src/test/java:' \ - -e 's:${protobuf.source.dir}:src:' \ - -e 's:${test.proto.dir}:java/core/src/test/proto:' \ - -e 's:^.*value="::' -e 's:\"/>::' \ - -e '/project\|mkdir\|exec\|Also generate/d' \ - -i java/core/generate-test-sources-build.xml || die "sed to test sources failed" - - # Split the file in two parts, one for each run-protoc call - awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \ - java/core/generate-test-sources-build.xml || die -} - -src_configure() { - local mycmakeargs=( - -Dprotobuf_BUILD_TESTS=OFF - -Dprotobuf_ABSL_PROVIDER=package - ) - if use system-protoc; then - : - else - cmake_src_configure - fi -} - -src_compile() { - if use system-protoc; then - : - else - cmake_src_compile - fi - - einfo "Run protoc to generate sources" - run-protoc \ - @java/core/generate-sources-build.xml \ - || die "protoc sources failed" - - java-pkg-simple_src_compile -} - -src_test() { - # https://github.com/protocolbuffers/protobuf/blob/v23.3/java/core/pom.xml#L63-L71 - jar cvf testdata.jar \ - -C src google/protobuf/testdata/golden_message_oneof_implemented \ - -C src google/protobuf/testdata/golden_packed_fields_message || die - - JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar" - - einfo "Running protoc on first part of generate-test-sources-build.xml" - run-protoc @test-sources-build-1 \ - || die "run-protoc test-sources-build-1 failed" - - einfo "Running protoc on second part of generate-test-sources-build.xml" - run-protoc @test-sources-build-2 \ - || die "run-protoc test-sources-build-2 failed" - - einfo "Running tests" - # Invalid test class 'map_test.MapInitializationOrderTest': - # 1. Test class should have exactly one public constructor - # Invalid test class 'protobuf_unittest.CachedFieldSizeTest': - # 1. Test class should have exactly one public constructor - pushd "${JAVA_TEST_SRC_DIR}" || die - local JAVA_TEST_RUN_ONLY=$(find * \ - -path "**/*Test.java" \ - ! -path "**/Abstract*Test.java" \ - ! -name "MapInitializationOrderTest.java" \ - ! -path '*protobuf_unittest/CachedFieldSizeTest.java' - ) - popd - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" - java-pkg-simple_src_test -} - -src_install() { - java-pkg-simple_src_install -} diff --git a/dev-java/protobuf-java/protobuf-java-3.23.4.ebuild b/dev-java/protobuf-java/protobuf-java-3.23.4.ebuild deleted file mode 100644 index 4e75a53cfab4..000000000000 --- a/dev-java/protobuf-java/protobuf-java-3.23.4.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 2008-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="com.google.protobuf:protobuf-java:3.23.3" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple cmake - -DESCRIPTION="Core Protocol Buffers library" -HOMEPAGE="https://protobuf.dev" -# Currently we bundle the binary version of truth.jar used only for tests, we don't install it. -# And we build artifact 3.23.4 from the 23.4 tarball in order to allow sharing the tarball with -# dev-libs/protobuf. -SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV#3.}.tar.gz -> protobuf-${PV#3.}.tar.gz - test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )" -S="${WORKDIR}/protobuf-${PV#3.}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="system-protoc" - -BDEPEND=" - system-protoc? ( ~dev-libs/protobuf-${PV#3.}:0 ) - !system-protoc? ( - >=dev-cpp/abseil-cpp-20230125.3 - \(.*\):\1:p' \ - "${S}/java/core/pom.xml") ) || die - pushd src > /dev/null || die - cp --parents -v "${PROTOS[@]}" ../"${JAVA_RESOURCE_DIRS}" || die - popd > /dev/null || die - - # https://github.com/protocolbuffers/protobuf/blob/v23.4/java/core/generate-sources-build.xml - einfo "Replace variables in generate-sources-build.xml" - sed \ - -e 's:${generated.sources.dir}:java/core/src/main/java:' \ - -e 's:${protobuf.source.dir}:src:' \ - -e 's:^.*value="::' -e 's:\"/>::' \ - -e '/project\|echo\|mkdir\|exec/d' \ - -i java/core/generate-sources-build.xml || die "sed to sources failed" - - # https://github.com/protocolbuffers/protobuf/blob/v23.4/java/core/generate-test-sources-build.xml - einfo "Replace variables in generate-test-sources-build.xml" - sed \ - -e 's:${generated.testsources.dir}:java/core/src/test/java:' \ - -e 's:${protobuf.source.dir}:src:' \ - -e 's:${test.proto.dir}:java/core/src/test/proto:' \ - -e 's:^.*value="::' -e 's:\"/>::' \ - -e '/project\|mkdir\|exec\|Also generate/d' \ - -i java/core/generate-test-sources-build.xml || die "sed to test sources failed" - - # Split the file in two parts, one for each run-protoc call - awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \ - java/core/generate-test-sources-build.xml || die -} - -src_configure() { - local mycmakeargs=( - -Dprotobuf_BUILD_TESTS=OFF - -Dprotobuf_ABSL_PROVIDER=package - ) - if use system-protoc; then - : - else - cmake_src_configure - fi -} - -src_compile() { - if use system-protoc; then - : - else - cmake_src_compile - fi - - einfo "Run protoc to generate sources" - run-protoc \ - @java/core/generate-sources-build.xml \ - || die "protoc sources failed" - - java-pkg-simple_src_compile -} - -src_test() { - # https://github.com/protocolbuffers/protobuf/blob/v23.4/java/core/pom.xml#L63-L71 - jar cvf testdata.jar \ - -C src google/protobuf/testdata/golden_message_oneof_implemented \ - -C src google/protobuf/testdata/golden_packed_fields_message || die - - JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar" - - einfo "Running protoc on first part of generate-test-sources-build.xml" - run-protoc @test-sources-build-1 \ - || die "run-protoc test-sources-build-1 failed" - - einfo "Running protoc on second part of generate-test-sources-build.xml" - run-protoc @test-sources-build-2 \ - || die "run-protoc test-sources-build-2 failed" - - einfo "Running tests" - # Invalid test class 'map_test.MapInitializationOrderTest': - # 1. Test class should have exactly one public constructor - # Invalid test class 'protobuf_unittest.CachedFieldSizeTest': - # 1. Test class should have exactly one public constructor - pushd "${JAVA_TEST_SRC_DIR}" || die - local JAVA_TEST_RUN_ONLY=$(find * \ - -path "**/*Test.java" \ - ! -path "**/Abstract*Test.java" \ - ! -name "MapInitializationOrderTest.java" \ - ! -path '*protobuf_unittest/CachedFieldSizeTest.java' - ) - popd - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" - java-pkg-simple_src_test -} - -src_install() { - java-pkg-simple_src_install -} diff --git a/dev-java/protobuf-java/protobuf-java-4.26.1.ebuild b/dev-java/protobuf-java/protobuf-java-4.26.1.ebuild deleted file mode 100644 index cbf117e3173e..000000000000 --- a/dev-java/protobuf-java/protobuf-java-4.26.1.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 2008-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="com.google.protobuf:protobuf-java:${PV}" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple cmake - -DESCRIPTION="Core Protocol Buffers library" -HOMEPAGE="https://protobuf.dev" -# Currently we bundle the binary version of truth.jar used only for tests, we don't install it. -# And we build artifact 4.26.1 from the 26.1 tarball in order to allow sharing the tarball with -# dev-libs/protobuf. -MY_PV4="${PV#4.}" -MY_PV="${MY_PV4/_rc/-rc}" -SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${MY_PV}.tar.gz - test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )" -S="${WORKDIR}/protobuf-${MY_PV}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="system-protoc" - -BDEPEND=" - system-protoc? ( ~dev-libs/protobuf-${MY_PV4}:0 ) - !system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 ) -" -DEPEND=" - >=virtual/jdk-1.8:* - test? ( - dev-java/guava:0 - dev-java/mockito:4 - ) -" -RDEPEND=">=virtual/jre-1.8:*" - -PATCHES=( - "${FILESDIR}/protobuf-java-3.26.0-unittest.protos.patch" -) - -JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf" -JAVA_JAR_FILENAME="protobuf.jar" -JAVA_RESOURCE_DIRS="java/core/src/main/resources" -JAVA_SRC_DIR="java/core/src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4" -JAVA_TEST_SRC_DIR="java/core/src/test/java" - -run-protoc() { - if use system-protoc; then - protoc $1 - else - "${BUILD_DIR}"/protoc $1 - fi -} - -src_prepare() { - # If the corrsponding version of system-protoc is not available we build protoc locally - if use system-protoc; then - default # apply patches - else - cmake_src_prepare - fi - java-pkg-2_src_prepare - - # https://github.com/protocolbuffers/protobuf/blob/v26.1/java/core/generate-sources-build.xml - einfo "Replace variables in generate-sources-build.xml" - sed \ - -e 's:${generated.sources.dir}:java/core/src/main/java:' \ - -e 's:${protobuf.java_source.dir}:java/core/src/main/resources:' \ - -e 's:${protobuf.source.dir}:src:' \ - -e 's:^.*value="::' -e 's:\"/>::' \ - -e '/project\|echo\|mkdir\|exec/d' \ - -i java/core/generate-sources-build.xml || die "sed to sources failed" - - # https://github.com/protocolbuffers/protobuf/blob/v26.1/java/core/generate-test-sources-build.xml - einfo "Replace variables in generate-test-sources-build.xml" - sed \ - -e 's:${generated.testsources.dir}:java/core/src/test/java:' \ - -e 's:${protobuf.source.dir}:src:' \ - -e 's:${test.proto.dir}:java/core/src/test/proto:' \ - -e 's:^.*value="::' -e 's:\"/>::' \ - -e '/project\|mkdir\|exec\|Also generate/d' \ - -i java/core/generate-test-sources-build.xml || die "sed to test sources failed" - - # Split the file in two parts, one for each run-protoc call - awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \ - java/core/generate-test-sources-build.xml || die -} - -src_configure() { - local mycmakeargs=( - -Dprotobuf_BUILD_TESTS=OFF - -Dprotobuf_ABSL_PROVIDER=package - ) - if use system-protoc; then - : - else - cmake_src_configure - fi -} - -src_compile() { - if use system-protoc; then - : - else - cmake_src_compile - fi - - einfo "Run protoc to generate sources" - run-protoc \ - @java/core/generate-sources-build.xml \ - || die "protoc sources failed" - - java-pkg-simple_src_compile -} - -src_test() { - # https://github.com/protocolbuffers/protobuf/blob/v26.1/java/core/pom.xml#L63-L71 - jar cvf testdata.jar \ - -C src google/protobuf/testdata/golden_message_oneof_implemented \ - -C src google/protobuf/testdata/golden_packed_fields_message || die - - JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar" - - einfo "Running protoc on first part of generate-test-sources-build.xml" - run-protoc @test-sources-build-1 \ - || die "run-protoc test-sources-build-1 failed" - - einfo "Running protoc on second part of generate-test-sources-build.xml" - run-protoc @test-sources-build-2 \ - || die "run-protoc test-sources-build-2 failed" - - einfo "Running tests" - # Invalid test class 'map_test.MapInitializationOrderTest': - # 1. Test class should have exactly one public constructor - # Invalid test class 'protobuf_unittest.CachedFieldSizeTest': - # 1. Test class should have exactly one public constructor - pushd "${JAVA_TEST_SRC_DIR}" || die - local JAVA_TEST_RUN_ONLY=$(find * \ - -path "**/*Test.java" \ - ! -path "**/Abstract*Test.java" \ - ! -name "MapInitializationOrderTest.java" \ - ! -path '*protobuf_unittest/CachedFieldSizeTest.java' - ) - popd - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" - java-pkg-simple_src_test -} - -src_install() { - java-pkg-simple_src_install -} -- cgit v1.3.1