commit:     1251d61263fc00ed7db0003c9412933bf6f9e9ef
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Feb  6 09:19:48 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Feb 12 08:43:25 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1251d612

dev-java/protobuf-java: add 3.25.2

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35276
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/protobuf-java/Manifest                    |   1 +
 dev-java/protobuf-java/protobuf-java-3.25.2.ebuild | 166 +++++++++++++++++++++
 2 files changed, 167 insertions(+)

diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 9911181011f4..bb3385cf9a07 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,4 +1,5 @@
 DIST protobuf-23.0.tar.gz 5039837 BLAKE2B 
63e02590b03fd9206cdfc4a26edeb2fa55dac902f5365c33c9e9340a722f552e4a5c82d1a0b25b84fcb675d5d06b768fd92cf472743d2361295129ae9faa02f3
 SHA512 
46c263fab189fdc310c7310d1a3d9e76472e5d96f16228bc4b946d4211afc64188d563ec70250c11a3dd05d18158b72ccf173567bd59aa45310eff62cd5f194d
 DIST protobuf-23.3.tar.gz 5043803 BLAKE2B 
ee2edee230969555c9ef95069c7b1d6c23c3d1f8ea1b2249fb3e9f6fcf63312c6e10e9da65b80629fb08d5fb08d05a19bb9c752c25b892c1e3fd6f18b9279eb3
 SHA512 
646af367dbc61b42e322cf0b335f360e428b272e2b1f5361b2f17c18d3dc9dddd615e1279436028b1a42275a0beadda37c2c934fc27d6c892131cc8d526d8b3b
 DIST protobuf-25.1.tar.gz 5878124 BLAKE2B 
a0b917e4518b07b221afd01e801e45b5b6fa35c7ccf8c21120d6a63f7174e53cc37d0516b1802d9243f8bb37b72b7f460a36dcbf0fffb09e011b05315c53efc3
 SHA512 
d2fad2188118ced2cd951bdb472d72cc9e9b2158c88eeca652c76332a884b5b5b4b58628f7777272fa693140753823584ea9c7924f1655b1d5a363f59bdf7a4c
+DIST protobuf-25.2.tar.gz 5878387 BLAKE2B 
1ee7a48d3a481f523ff240c79e8cacb39b6a7e2c671279812cbffd5ce9be595034461fba41f03bed363133118c1b92bd14bcfd8c4e46ac6368e6407a23fb02ea
 SHA512 
66f0b177eae0e2e40b8b17c8f411cd9dec5355dcfc145b8a79426e6367babcc28b9a8078bbe4ba2de47a82811a2e1a89d36955d6fa0c8d391cfeada4eb160fdb
 DIST truth-1.1.3.jar 243021 BLAKE2B 
a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3
 SHA512 
f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8

diff --git a/dev-java/protobuf-java/protobuf-java-3.25.2.ebuild 
b/dev-java/protobuf-java/protobuf-java-3.25.2.ebuild
new file mode 100644
index 000000000000..5276064d1543
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.25.2.ebuild
@@ -0,0 +1,166 @@
+# 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 3.25.2 from the 25.2 tarball in order to allow sharing 
the tarball with
+# dev-libs/protobuf.
+MY_PV3="${PV#3.}"
+MY_PV="${MY_PV3/_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_PV3}: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.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/v25.2/java/core/pom.xml#L43-L62
+       PROTOS=(  $(sed \
+               -n 
'/google\/protobuf.*\.proto/s:.*<include>\(.*\)</include>:\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/v25.2/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/v25.2/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/v25.2/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
+}

Reply via email to