commit: 243b8fbe0108952bc9784544c1f1d92fc3d00305 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Mon May 5 06:33:01 2025 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Mon May 5 08:48:41 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=243b8fbe
dev-java/protobuf-java: drop 4.28.3 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/41937 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> dev-java/protobuf-java/Manifest | 1 - dev-java/protobuf-java/protobuf-java-4.28.3.ebuild | 152 --------------------- 2 files changed, 153 deletions(-) diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest index 5a928e3904f5..4596b9d09908 100644 --- a/dev-java/protobuf-java/Manifest +++ b/dev-java/protobuf-java/Manifest @@ -1,4 +1,3 @@ -DIST protobuf-28.3.tar.gz 9256608 BLAKE2B 05162124676abe18300481e9f985fd2cfb09b052d06670a993e79ef02f3daf0d5380b521977ebc2362d4094486151ea285fe1c98a1d2f3799b18a1fa422fdc13 SHA512 a91e175fed7eb01c4240842a5af73a7d3cefccbb10885434bceeb7bc89ab6c56a74912cee290bf46e81d4026f3c9c2b10faad5545816064e215c4bae7908263d DIST protobuf-29.2.tar.gz 9348408 BLAKE2B 847798474bc6a76b9badfdbf605e118dece5e321e81242d7fa1bf5f5d17ee05a3d365ec112dc6d861cade97efff8be1d5d04006a5144f613bdb3ff5eacc63b99 SHA512 aeb21773edc3dd92a6c1ba6ccd721cc8a20d61230a5309c75ee3ef19baa554c228a6d1095f191ccc18f10183b646f3140dfe6526f5812bcaa64b7d5260572643 DIST protobuf-29.3.tar.gz 9348951 BLAKE2B 8d37daac6f0d832e5bff5c56b9be73fce1fe016ca4e905f4c66d8fea20fabbee54a6be2c824f503d40f8492a4ec6280a539c454de9a118b69ebc57f2afe3d965 SHA512 0c776133f5789d21baa8860cb41e7926a162d74810a01722b762a78f93e559494e903fcaa092515bfe2ce057fd065a5dd000b316edb1af32c2ef9dbadf02b4c6 DIST protobuf-29.4.tar.gz 9350942 BLAKE2B fd3b81905e26db2ec3b54eaf30cf250db2894f91d5da73130106f6778f4e2f13b690961eecb8f5b8c23ac72428753611cd9bf719da986083e09ab32160e25314 SHA512 c888cb9961d58b7fb11a3363ff4d2684605cdd79756712f407ffe5f275569bf69b4370f1d2a0e20775646745cddd41a9b510f1c1981be4e969c9acf0dc2ba734 diff --git a/dev-java/protobuf-java/protobuf-java-4.28.3.ebuild b/dev-java/protobuf-java/protobuf-java-4.28.3.ebuild deleted file mode 100644 index 4893d43ca895..000000000000 --- a/dev-java/protobuf-java/protobuf-java-4.28.3.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# 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 4.28.3 from the 28.3 tarball in order to allow sharing the tarball with -# dev-libs/protobuf. -MY_PV4="${PV#4.}" -MY_PV="${MY_PV4/_rc/-rc}" -MY_P="protobuf-${MY_PV}.tar.gz" -TV="1.1.3" -SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${MY_PV}/${MY_P} - test? ( https://repo1.maven.org/maven2/com/google/truth/truth/${TV}/truth-${TV}.jar )" -S="${WORKDIR}/protobuf-${MY_PV}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="system-protoc" - -BDEPEND=" - system-protoc? ( ~dev-libs/protobuf-${MY_PV4}:0[protoc] ) - !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:*" - -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 - cmake_src_prepare - fi - java-pkg-2_src_prepare - - # https://github.com/protocolbuffers/protobuf/blob/v28.3/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" - - # https://github.com/protocolbuffers/protobuf/blob/v28.3/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 - 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() { - JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-${TV}.jar" - - # google/protobuf/java_features.proto: File not found. - cp {java/core/src/main/resources,src}/google/protobuf/java_features.proto || die - - 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" - - # java/core/src/test/java/editions_unittest/TestDelimited.java:2867: - # error: package editions_unittest.MessageImport does not exist - rm java/core/src/test/java/com/google/protobuf/TextFormatTest.java || die - - 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 -}
