commit: a13500f9a82de33f49b32d9136be5f9d62698c10 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Mon Jan 12 09:40:05 2026 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Thu Feb 19 19:32:06 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a13500f9
dev-java/protobuf-java: add 4.33.5 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Part-of: https://codeberg.org/gentoo/gentoo/pulls/60 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/protobuf-java/Manifest | 1 + dev-java/protobuf-java/protobuf-java-4.33.5.ebuild | 163 +++++++++++++++++++++ 2 files changed, 164 insertions(+) diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest index d72debe5a3a0..2073b7a05cfa 100644 --- a/dev-java/protobuf-java/Manifest +++ b/dev-java/protobuf-java/Manifest @@ -1,2 +1,3 @@ DIST protobuf-33.0.tar.gz 6872665 BLAKE2B 5d456c000117b590dea5b7e721a8b8d00d9e7067ba2156f082e4959a17fcf8d4f2e306f90335aad97e1a94dfd2491544d67cb29670f0022034fde574140a8066 SHA512 2956270a81631895ab6ed8c3c2a22b353a461b0827ee17a1c569b24374307a8e2525a06db6728140bff759a40e47a1d2a291cfb34293b364fe279f10468f3cb9 DIST protobuf-33.2.tar.gz 6868986 BLAKE2B 82909ba8919b1034619a7ea5bd1525db667294310363c035e535a150dac2e7cd819b6bfbffc5203adfbcc0abf1378168e0b06da417b455bdca63ab7eb5db7dd4 SHA512 6d884194d7e4799a2ff9cb8b9d62fdf302a3a5f90e8d4006918d88b037eb5758ef4d2153abd7dc9d5d526e1e04cc91dd87ed7e06befb573bab1e7d259649bff4 +DIST protobuf-33.5.tar.gz 6888461 BLAKE2B 9c426236a9bb67061a9e2fcf2f4dbc2868ae4ea4734026921c7d1c025788747111c0b7a55c8ad4aabbb7e959da2c43c7f8a2a12c2ba295ce377bedb72c2e1785 SHA512 2ad75c81a76d7311291db51abee41108cebfbb87b3fe4aa421aa5351edc38d0b70f863a1369f37c5be4336ed399cf16791d32688b8077dfd672cfb2d727ba6f9 diff --git a/dev-java/protobuf-java/protobuf-java-4.33.5.ebuild b/dev-java/protobuf-java/protobuf-java-4.33.5.ebuild new file mode 100644 index 000000000000..7e6dcc73b4ac --- /dev/null +++ b/dev-java/protobuf-java/protobuf-java-4.33.5.ebuild @@ -0,0 +1,163 @@ +# Copyright 2008-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit cmake java-pkg-2 java-pkg-simple + +DESCRIPTION="Core Protocol Buffers library" +HOMEPAGE="https://protobuf.dev"; +MY_PV4="${PV#4.}" +MY_PV="${MY_PV4/_rc/-rc}" +MY_P="protobuf-${MY_PV}.tar.gz" +SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${MY_PV}/${MY_P}"; +S="${WORKDIR}/protobuf-${MY_PV}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="system-protoc" + +BDEPEND=" + system-protoc? ( ~dev-libs/protobuf-${MY_PV4}:0[protoc] ) + !system-protoc? ( >=dev-cpp/abseil-cpp-20250512.1:= ) +" + +# restrict virtual/jdk because asm-jdk-bridge-0.0.13 is not ready for java 27. +DEPEND=" + <virtual/jdk-27 + test? ( + >=dev-java/guava-33.5.0:0 + >=dev-java/mockito-4.11.0:4 + >=dev-java/snakeyaml-2.5:0 + >=dev-java/testparameterinjector-1.19:0 + >=dev-java/truth-1.4.5:0 + ) +" + +RDEPEND=">=virtual/jre-1.8:*" + +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,snakeyaml" +JAVA_TEST_RESOURCE_DIRS="java/core/src/main/resources" +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 + cmake_src_prepare + fi + java-pkg-2_src_prepare + + # ${S}/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" + + # ${S}/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 + + # We add some *.proto files to the 'test-sources-build-1' file which + # are needed to avoid compilation errors on related test classes. + cat <<-EOF >> test-sources-build-1 || die "append test-sources-build-1" + src/google/protobuf/edition_unittest.proto + src/google/protobuf/unittest_delimited.proto + src/google/protobuf/unittest_delimited_import.proto + src/google/protobuf/unittest_import_option.proto + java/core/src/test/proto/com/google/protobuf/large_open_enum.proto + java/core/src/test/proto/com/google/protobuf/generator_names_edition2024_defaults.proto + EOF +} + +src_configure() { + local mycmakeargs=( + -Dprotobuf_BUILD_TESTS=OFF + -Dprotobuf_LOCAL_DEPENDENCIES_ONLY=ON + ) + if ! use system-protoc; then + cmake_src_configure + fi +} + +src_compile() { + if ! use system-protoc; then + 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() { + # Note: Annotation processing is enabled because one or more processors were found + # on the class path. A future release of javac may disable annotation processing + # unless at least one processor is specified by name (-processor), or a search + # path is specified (--processor-path, --processor-module-path), or annotation + # processing is enabled explicitly (-proc:only, -proc:full). + JAVA_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only testparameterinjector,truth)" + + # java/core/src/test/java/com/google/protobuf/GeneratorNamesTest.java:33: error: cannot find symbol + # GeneratorNamesPre2024Defaults.getDescriptor(), GeneratorNamesPre2024Defaults.class), + # ^ + # symbol: class GeneratorNamesPre2024Defaults + # location: class FileClassProvider + rm java/core/src/test/java/com/google/protobuf/GeneratorNamesTest.java || die "remove test" + + einfo "Running protoc on first part of generate-test-sources-build.xml" + # java/core/src/test/proto/com/google/protobuf/test_check_utf8.proto:15:1: + # Import "google/protobuf/java_features.proto" was not found or had errors. + cp {java/core/src/main/resources,src}/google/protobuf/java_features.proto || die + 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 'proto2_unittest.CachedFieldSizeTest': + # 1. Test class should have exactly one public constructor + local JAVA_TEST_RUN_ONLY=$(find "${JAVA_TEST_SRC_DIR}" \ + -path "**/*Test.java" \ + ! -path "**/Abstract*Test.java" \ + ! -name "MapInitializationOrderTest.java" \ + ! -name 'CachedFieldSizeTest.java' -printf "%P\n") + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + java-pkg-simple_src_test +}
