commit: b042109f90c07be82d2486f5507c3e9c0d294634 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Thu Aug 3 18:29:11 2023 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Fri Aug 4 05:57:59 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b042109f
dev-java/protobuf-java: drop 3.21.12 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/protobuf-java/Manifest | 1 - .../protobuf-java/protobuf-java-3.21.12.ebuild | 122 --------------------- 2 files changed, 123 deletions(-) diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest index 038dff1f6153..7295e78febd3 100644 --- a/dev-java/protobuf-java/Manifest +++ b/dev-java/protobuf-java/Manifest @@ -1,3 +1,2 @@ -DIST protobuf-21.12.tar.gz 5141166 BLAKE2B 33500612d103afb817062486a741e8e5503f82c42c70054d47d1899e6bb79f3fdde2666cad5b8eff6e1bc539c3b0cdf9f2b125ce7e5d3a459a69e84d67ab535e SHA512 2dc8f552388438268d8b9f7a9e84c6abf1736be3d5031438c789c317410c9f4b5cedd25bf7da6d67b3ba32ca890869f9ddaab2284d6ac0e734a5b135ffbb1346 DIST protobuf-23.0.tar.gz 5039837 BLAKE2B 63e02590b03fd9206cdfc4a26edeb2fa55dac902f5365c33c9e9340a722f552e4a5c82d1a0b25b84fcb675d5d06b768fd92cf472743d2361295129ae9faa02f3 SHA512 46c263fab189fdc310c7310d1a3d9e76472e5d96f16228bc4b946d4211afc64188d563ec70250c11a3dd05d18158b72ccf173567bd59aa45310eff62cd5f194d DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8 diff --git a/dev-java/protobuf-java/protobuf-java-3.21.12.ebuild b/dev-java/protobuf-java/protobuf-java-3.21.12.ebuild deleted file mode 100644 index d9140d989305..000000000000 --- a/dev-java/protobuf-java/protobuf-java-3.21.12.ebuild +++ /dev/null @@ -1,122 +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.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:.*<include>\(.*\)</include>:-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 -}
