From ebc282ef4dfa408accac685565b8ee5f6faec119 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Feb 2023 09:56:54 +0000 Subject: gentoo auto-resync : 12:02:2023 - 09:56:54 --- dev-java/protobuf-java/Manifest | 5 +- .../protobuf-java/protobuf-java-3.21.12.ebuild | 2 +- .../protobuf-java/protobuf-java-3.21.9-r1.ebuild | 98 ----------------- .../protobuf-java/protobuf-java-3.21.9-r2.ebuild | 119 --------------------- 4 files changed, 2 insertions(+), 222 deletions(-) delete mode 100644 dev-java/protobuf-java/protobuf-java-3.21.9-r1.ebuild delete 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 53ca2eb33446..6bd30d1d21d1 100644 --- a/dev-java/protobuf-java/Manifest +++ b/dev-java/protobuf-java/Manifest @@ -1,7 +1,4 @@ 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 4455 BLAKE2B da8ac403b4db3b9b24b52b797c14e0a0e08a36f10e5dc06a3ef7fe82457e5d0e3df815c701e452257aff7f8ee12d648cfc19c54794d74a53ed7098edb6476012 SHA512 9c0c98c0de93c5d7425c75907bf3c51d968df50fb31cbabeb2733112f76e5341294f2700f7c9cbc9daf006a469448af583c2cbb87ce99e0f5b01d2421d2eaf7d -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-3.21.12.ebuild 4452 BLAKE2B d18bf0098fa38c538fd4852d4dc585040cbbd56ad17fbd02a18b1a4292008cdcf3307dc580ab5a5f3c95e4bb3e9025377bc524959f59df3ebb94f49c189b40f9 SHA512 5494d4060782c81d04f45f5184ac304ab846fd3fa375d0513d1481b7f99c85ebdaf6219ee170256fe7d7828121d3d44b790b23c9250aa4fc8a093d97a9d4773e 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 index c51ed676a58d..d9140d989305 100644 --- a/dev-java/protobuf-java/protobuf-java-3.21.12.ebuild +++ b/dev-java/protobuf-java/protobuf-java-3.21.12.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV#3.}.tar.gz -> LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos" DEPEND=" >=virtual/jdk-1.8:* diff --git a/dev-java/protobuf-java/protobuf-java-3.21.9-r1.ebuild b/dev-java/protobuf-java/protobuf-java-3.21.9-r1.ebuild deleted file mode 100644 index 4929dd830b68..000000000000 --- a/dev-java/protobuf-java/protobuf-java-3.21.9-r1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# 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" -# Tests not enabled, depend on com.google.truth which is not packaged -# https://github.com/protocolbuffers/protobuf/blob/v21.9/java/core/pom.xml#L35-L40 -# JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit edo java-pkg-2 java-pkg-simple - -PARENT_PN="${PN/-java/}" -PARENT_PV="$(ver_cut 2-)" -PARENT_P="${PARENT_PN}-${PARENT_PV}" -PARENT_SUBSLOT="32" - -DESCRIPTION="Google's Protocol Buffers - Java bindings" -HOMEPAGE="https://developers.google.com/protocol-buffers/" -SRC_URI=" - https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz - -> ${PARENT_P}.tar.gz -" - -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:0/${PARENT_SUBSLOT}" - -S="${WORKDIR}/${PARENT_P}/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="../src" -JAVA_TEST_SRC_DIR="core/src/test/java" - -# Same than PATCHES but from repository's root directory, -# please see function `src_prepare` below. -# Simplier for users IMHO. -PARENT_PATCHES=( -) - -# Here for patches within "java/" subdirectory. -PATCHES=( -) - -src_prepare() { - pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die - [[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}" - eapply_user - popd > /dev/null || die - - # Same than default without the eapply_user part, this last is kept - # for the parent directory. - # It looks like function java-pkg-2_src_prepare doesn’t call "default". - [[ -n "${PATCHES[@]}" ]] && eapply "${PATCHES[@]}" - - # Remove bundled jars - java-pkg_clean - - java-pkg-2_src_prepare - - # There is also compiler/plugin, but not in this list because in a subdirectory - core_protos=( any api descriptor duration empty field_mask source_context struct timestamp type wrappers ) - - # Copy resources from ../src/google/protobuf according to - # https://github.com/protocolbuffers/protobuf/blob/v21.9/java/core/pom.xml#L45-L61 - mkdir -p "${JAVA_RESOURCE_DIRS}/google/protobuf/compiler" || die - local core_proto - for core_proto in "${core_protos[@]}"; do - cp "../src/google/protobuf/${core_proto}.proto" \ - "${JAVA_RESOURCE_DIRS}/google/protobuf" \ - || die - done - cp {../src,"${JAVA_RESOURCE_DIRS}"}/google/protobuf/compiler/plugin.proto || die - - # Generate 146 .java files according to - # https://github.com/protocolbuffers/protobuf/blob/v21.9/java/core/generate-sources-build.xml - for core_proto in "${core_protos[@]}" compiler/plugin; do - edo "${BROOT}/usr/bin/protoc" \ - --java_out="${JAVA_SRC_DIR}" -I../src ../src/google/protobuf/"${core_proto}".proto - done -} 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 deleted file mode 100644 index ef157767a703..000000000000 --- a/dev-java/protobuf-java/protobuf-java-3.21.9-r2.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# 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