From df26c7469c1f2af2e643d43e2e32a6c9142e4885 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 11 Jan 2023 11:44:03 +0000 Subject: gentoo auto-resync : 11:01:2023 - 11:44:03 --- dev-java/protobuf-java/Manifest | 4 + .../protobuf-java/protobuf-java-3.21.12.ebuild | 122 +++++++++++++++++++++ .../protobuf-java/protobuf-java-3.21.9-r2.ebuild | 119 ++++++++++++++++++++ 3 files changed, 245 insertions(+) create mode 100644 dev-java/protobuf-java/protobuf-java-3.21.12.ebuild create mode 100644 dev-java/protobuf-java/protobuf-java-3.21.9-r2.ebuild (limited to 'dev-java/protobuf-java') diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest index 2d0655df6891..6fb91ba738fa 100644 --- a/dev-java/protobuf-java/Manifest +++ b/dev-java/protobuf-java/Manifest @@ -1,4 +1,8 @@ +DIST protobuf-21.12.tar.gz 5141166 BLAKE2B 33500612d103afb817062486a741e8e5503f82c42c70054d47d1899e6bb79f3fdde2666cad5b8eff6e1bc539c3b0cdf9f2b125ce7e5d3a459a69e84d67ab535e SHA512 2dc8f552388438268d8b9f7a9e84c6abf1736be3d5031438c789c317410c9f4b5cedd25bf7da6d67b3ba32ca890869f9ddaab2284d6ac0e734a5b135ffbb1346 DIST protobuf-21.9.tar.gz 5110670 BLAKE2B a4f5b7f58e1c5904ca990b100a72992f6f56177b28773f8de8c99e4158391d33cfb8aa8575915887fc9ae4294faf81d4ff6b470bc07b394bfd5885a09ba0fafe SHA512 6954b42d21921e630173b7848c056ab95635627d8eddec960f3db2ddda13eedde00520a9b350722e76e2998649eb8ebe10758e1db938b6a91e38ff3295b1b7c1 +DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8 +EBUILD protobuf-java-3.21.12.ebuild 4454 BLAKE2B ce6a686a8b61122bab004aa3b5fd989413e3300ee84b6e3926fe470c1b8b070ce043c59ba20c40dd66c9a81d07a112ada611e175b69e8a8a6c7b136223f19add SHA512 d3868a7a52d86919898dac49209a643de204cabb36f7dee55634f62fc18e57aafd223bfef967b7d57c6cfa8bd177c09cc1a8c549785ef98c7842b8ae990ded98 EBUILD protobuf-java-3.21.9-r1.ebuild 2998 BLAKE2B ccc295705b54c9d132c5d67a5a949fa3cbc9d0ee330540d9824c5e36dc738e70080fdb66a941f225748df62af934b30c2745f01b06436eb6c3e921c04e6c1dcb SHA512 7d11c96dfa448ae46ebab6ddcc0dc622cd8bbc04090354148eaf2d89f6f9d3f31b7b49eae7506e70dc0f78bde3bf4ddf74cdba214a663d47cdaa1466168b0e72 +EBUILD protobuf-java-3.21.9-r2.ebuild 4309 BLAKE2B 0d836a8bd93a282e57702ae646eff00983d3f1e037a9bd9267e0a3167c632bf254b83339379b77746d5c11564d8db9827a810623df57aa2a893e8c5e1c25c203 SHA512 73b895c8e096ae863dfc56c948649701721690fa13ba51d15cdfc31a14f4034a82653069caa1d77749f1da4e6e637ac6306bd7157c128bb608cded3dbdf8a448 EBUILD protobuf-java-9999.ebuild 3078 BLAKE2B 837383cde2c29c4605564b30a071eeb8240c9a447a03cae8c63526d0c0011146faf0a914fe13c0cfe6952f49fef01c08e928fb7568a1f7930393ae851a87f484 SHA512 4be8eef3afd89a5e0248d4181d0ae7e1fdde18adfa9e7e3e9aa869e174adff77ce066ae346393d201ba585c7dd686b7ee0826ba9f76729f11569717b5655441c MISC metadata.xml 625 BLAKE2B 13394b9a2148b9117ce719954591e79088f845ac1ceb667bbdd2645b989daadcfea09525f9dde68c405e3f1cce5cc1af32de9fb4dff629e4745e13fa92727dd7 SHA512 47f693db57dbde04f419ed65494d81b0a800c9ac49d790c9b794baef34fb1f876da29c5a0662c45aa3c01cecd34af648e196fb76110fcc0066198c59543049b3 diff --git a/dev-java/protobuf-java/protobuf-java-3.21.12.ebuild b/dev-java/protobuf-java/protobuf-java-3.21.12.ebuild new file mode 100644 index 000000000000..7885a6ab21ee --- /dev/null +++ b/dev-java/protobuf-java/protobuf-java-3.21.12.ebuild @@ -0,0 +1,122 @@ +# Copyright 2008-2023 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.21.12" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Google's Protocol Buffers - Java bindings" +HOMEPAGE="https://developers.google.com/protocol-buffers/" +# Currently we bundle the binary version of truth.jar used only for tests, we don't install it. +# And we build artifact 3.21.11 from the 21.11 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 )" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" + +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + dev-java/guava:0 + dev-java/mockito:4 + ) +" +RDEPEND=">=virtual/jre-1.8:*" + +# Once =protobuf-${PV#3.} hits the tree use it +# BDEPEND="~dev-libs/protobuf-${PV#3.}:0" +BDEPEND="dev-libs/protobuf:0" + +S="${WORKDIR}/protobuf-${PV#3.}/java" + +JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf" +JAVA_JAR_FILENAME="protobuf.jar" +JAVA_RESOURCE_DIRS="core/src/main/resources" +JAVA_SRC_DIR="core/src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4" +JAVA_TEST_RESOURCE_DIRS="core/src/test/proto" +JAVA_TEST_SRC_DIR="core/src/test/java" + +src_prepare() { + default + + mkdir "${JAVA_RESOURCE_DIRS}" || die + # https://github.com/protocolbuffers/protobuf/blob/v21.12/java/core/pom.xml#L43-L62 + echo $(sed \ + -n '/google\/protobuf.*\.proto/s:.*\(.*\):-C ../../../../../src \1:p' \ + "${S}/core/pom.xml") > "${T}/core_proto" || die "echo to core_proto failed" + # Copy them from ../src/google/protobuf to JAVA_RESOURCE_DIRS + pushd "${JAVA_RESOURCE_DIRS}" || die + jar cv "@${T}/core_proto" | jar xv + assert"Copying protos failed" + popd || die + + # https://github.com/protocolbuffers/protobuf/blob/v21.12/java/core/generate-sources-build.xml + einfo "Replace variables in generate-sources-build.xml" + sed \ + -e 's:${generated.sources.dir}:core/src/main/java:' \ + -e 's:${protobuf.source.dir}:../src:' \ + -e 's:^.*value="::' -e 's:\"/>::' \ + -e '/project\|echo\|mkdir\|exec/d' \ + -i core/generate-sources-build.xml || die "sed to sources failed" + + einfo "Run protoc to generate sources" + protoc @core/generate-sources-build.xml || die "protoc sources failed" +} + +src_test() { + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar" + + # https://github.com/protocolbuffers/protobuf/blob/v21.12/java/core/generate-test-sources-build.xml + einfo "Replace variables in generate-test-sources-build.xml" + sed \ + -e 's:${generated.testsources.dir}:core/src/test/java:' \ + -e 's:${protobuf.source.dir}:../src:' \ + -e 's:${test.proto.dir}:core/src/test/proto:' \ + -e 's:^.*value="::' -e 's:\"/>::' \ + -e '/project\|mkdir\|exec\|Also generate/d' \ + -i core/generate-test-sources-build.xml || die "sed to test sources failed" + + # Remove second exec from the file. Makes trouble here. We run it separately. + sed '50,54d' -i core/generate-test-sources-build.xml || die "cannot remove lines" + + einfo "Running protoc to generate test-sources" + protoc @core/generate-test-sources-build.xml || die "protoc I failed" + + einfo "Running protoc on previously removed test-sources" + protoc --java_out=lite:core/src/test/java \ + --proto_path=../src \ + --proto_path=core/src/test/proto \ + core/src/test/proto/com/google/protobuf/nested_extension_lite.proto \ + core/src/test/proto/com/google/protobuf/non_nested_extension_lite.proto \ + || die "protoc II failed" + + # Ignore two failing test cases from CodedOutputStreamTest.java + sed \ + -e '/import org.junit.Test/a import org.junit.Ignore;' \ + -e '/testWriteWholeMessage/i @Ignore' \ + -e '/testWriteWholePackedFieldsMessage/i @Ignore' \ + -i core/src/test/java/com/google/protobuf/CodedOutputStreamTest.java || die + + einfo "Running tests" + # Exclude MapInitializationOrderTest and CachedFieldSizeTest + pushd core/src/test/java || die + local JAVA_TEST_RUN_ONLY=$(find * \ + -wholename "**/*Test.java" \ + ! -wholename "**/Abstract*Test.java" \ + ! -name "MapInitializationOrderTest.java" \ + ! -name "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 +} diff --git a/dev-java/protobuf-java/protobuf-java-3.21.9-r2.ebuild b/dev-java/protobuf-java/protobuf-java-3.21.9-r2.ebuild new file mode 100644 index 000000000000..ef157767a703 --- /dev/null +++ b/dev-java/protobuf-java/protobuf-java-3.21.9-r2.ebuild @@ -0,0 +1,119 @@ +# Copyright 2008-2023 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.21.9" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Google's Protocol Buffers - Java bindings" +HOMEPAGE="https://developers.google.com/protocol-buffers/" +# Currently we bundle the binary version of truth.jar used only for tests, we don't install it. +# And we build artifact 3.21.9 from the 21.9 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 )" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" + +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + dev-java/guava:0 + dev-java/mockito:4 + ) +" +RDEPEND=">=virtual/jre-1.8:*" +BDEPEND="~dev-libs/protobuf-${PV#3.}:0" + +S="${WORKDIR}/protobuf-${PV#3.}/java" + +JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf" +JAVA_JAR_FILENAME="protobuf.jar" +JAVA_RESOURCE_DIRS="core/src/main/resources" +JAVA_SRC_DIR="core/src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4" +JAVA_TEST_RESOURCE_DIRS="core/src/test/proto" +JAVA_TEST_SRC_DIR="core/src/test/java" + +src_prepare() { + default + + mkdir "${JAVA_RESOURCE_DIRS}" || die + # https://github.com/protocolbuffers/protobuf/blob/v21.9/java/core/pom.xml#L43-L62 + echo $(sed \ + -n '/google\/protobuf.*\.proto/s:.*\(.*\):-C ../../../../../src \1:p' \ + "${S}/core/pom.xml") > "${T}/core_proto" || die "echo to core_proto failed" + # Copy them from ../src/google/protobuf to JAVA_RESOURCE_DIRS + pushd "${JAVA_RESOURCE_DIRS}" || die + jar cv "@${T}/core_proto" | jar xv + assert "Copying protos failed" + popd || die + + # https://github.com/protocolbuffers/protobuf/blob/v21.9/java/core/generate-sources-build.xml + einfo "Replace variables for code generation " + sed \ + -e 's:${generated.sources.dir}:core/src/main/java:' \ + -e 's:${protobuf.source.dir}:../src:' \ + -e 's:^.*value="::' -e 's:\"/>::' \ + -e '/project\|echo\|mkdir\|exec/d' \ + -i core/generate-sources-build.xml || die "sed to sources failed" + + einfo "Run protoc to generate sources" + protoc @core/generate-sources-build.xml || die "protoc sources failed" +} + +src_test() { + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar" + + # https://github.com/protocolbuffers/protobuf/blob/v21.9/java/core/generate-test-sources-build.xml + einfo "Replace variables for code generation " + sed \ + -e 's:${generated.testsources.dir}:core/src/test/java:' \ + -e 's:${protobuf.source.dir}:../src:' \ + -e 's:${test.proto.dir}:core/src/test/proto:' \ + -e 's:^.*value="::' -e 's:\"/>::' \ + -e '/project\|mkdir\|exec\|Also generate/d' \ + -i core/generate-test-sources-build.xml || die "sed to test sources failed" + + # Remove second exec from the file. Makes trouble here. We run it separately. + sed '50,54d' -i core/generate-test-sources-build.xml || die "cannot remove lines" + + einfo "Running protoc first exec" + protoc @core/generate-test-sources-build.xml || die "protoc I failed" + + einfo "Running protoc second exec" + protoc --java_out=lite:core/src/test/java \ + --proto_path=../src \ + --proto_path=core/src/test/proto \ + core/src/test/proto/com/google/protobuf/nested_extension_lite.proto \ + core/src/test/proto/com/google/protobuf/non_nested_extension_lite.proto \ + || die "protoc II failed" + + # Ignore two failing test cases from CodedOutputStreamTest.java + sed \ + -e '/import org.junit.Test/a import org.junit.Ignore;' \ + -e '/testWriteWholeMessage/i @Ignore' \ + -e '/testWriteWholePackedFieldsMessage/i @Ignore' \ + -i core/src/test/java/com/google/protobuf/CodedOutputStreamTest.java || die + + einfo "Running tests" + # Exclude MapInitializationOrderTest and CachedFieldSizeTest + pushd core/src/test/java || die + local JAVA_TEST_RUN_ONLY=$(find * \ + -wholename "**/*Test.java" \ + ! -wholename "**/Abstract*Test.java" \ + ! -name "MapInitializationOrderTest.java" \ + ! -name "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 +} -- cgit v1.2.3