From 2ecd7994be1409f2a65bfca700904d2a78fd7bbe Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 26 Oct 2022 03:54:55 +0100 Subject: gentoo auto-resync : 26:10:2022 - 03:54:55 --- dev-java/Manifest.gz | Bin 55531 -> 55538 bytes dev-java/commons-text/Manifest | 2 - dev-java/commons-text/commons-text-1.9.ebuild | 43 --------- dev-java/jakartaee-migration/Manifest | 2 - .../jakartaee-migration-1.0.3.ebuild | 92 ------------------ dev-java/protobuf-java/Manifest | 10 +- dev-java/protobuf-java/metadata.xml | 3 + dev-java/protobuf-java/protobuf-java-3.19.6.ebuild | 102 ++++++++++++++++++++ dev-java/protobuf-java/protobuf-java-3.20.3.ebuild | 102 ++++++++++++++++++++ dev-java/protobuf-java/protobuf-java-3.21.8.ebuild | 102 ++++++++++++++++++++ dev-java/protobuf-java/protobuf-java-9999.ebuild | 103 +++++++++++++++------ 11 files changed, 394 insertions(+), 167 deletions(-) delete mode 100644 dev-java/commons-text/commons-text-1.9.ebuild delete mode 100644 dev-java/jakartaee-migration/jakartaee-migration-1.0.3.ebuild create mode 100644 dev-java/protobuf-java/protobuf-java-3.19.6.ebuild create mode 100644 dev-java/protobuf-java/protobuf-java-3.20.3.ebuild create mode 100644 dev-java/protobuf-java/protobuf-java-3.21.8.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index e7234666cf66..ff86c418db40 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/commons-text/Manifest b/dev-java/commons-text/Manifest index d041000b442f..62add9d90a22 100644 --- a/dev-java/commons-text/Manifest +++ b/dev-java/commons-text/Manifest @@ -1,5 +1,3 @@ DIST commons-text-1.10.0-src.tar.gz 342224 BLAKE2B efed282c9fed7dae5766f7158136a4d7414ba0610e16a52fa2d12ee04e43960d47ec7c62f220c2ab881a13afa8a81cf85e453364e37c67550e15c314122ebf25 SHA512 6bf2dc7dda4429cb1b9ba3a4d383c1d9ffabd5ff35a0adc55216e7cf4c532e51b2b012c9b0f3ea859cd32aef75e05547d892301f34f304a0bfd27c39a28fe04f -DIST commons-text-1.9-sources.tar.gz 312764 BLAKE2B 44b628c418a910ff38b5a1fb3b4c9f14a1f9818afd12540f8c8cf8b1a99fd7abd365e704142bcec901e5e067b303ff44f9c992f8714eae68b94819780a270dd2 SHA512 53f993e79aaa6789d3388aa96b6b2a14cf646b27ff3774524390e511241a85288947cc929519eff61a8734578f25bdf3d9969d84da20c1a749b19d90a55da8ae EBUILD commons-text-1.10.0.ebuild 1944 BLAKE2B 0ad39c8569085b4deadfd703b8d4c0996a5d8a249c2895b253092d5ce66f9292635f2d782582a941b4927622f296044c7c04ce5b2583ec1448a1db6288fceb2d SHA512 6229c7492d11147e33f4311d0497c9e5cc9da0fb9a69f62333c18f2e39d481a7695b0d912d80147aa6a35ee50e760335c61c2659e0f73317c8c95a3b24a76ccd -EBUILD commons-text-1.9.ebuild 1142 BLAKE2B 0beeef324dac52e6201d090bf55e4d1d090d88d82ccf3a6beaa2b7d1cfb7670295cf294c0c071863583f3512dcd4bf38f24e53f94fa972f1f82e14d9262f947d SHA512 658d2fd0186f9dded92492d975f2262f35c2a618a25dd85a6c2e1d82a4663a7f833703675ad1bedebeae4234fbe90269bf28f61d2c1e2d0bc659faa6ab36a6c1 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559 diff --git a/dev-java/commons-text/commons-text-1.9.ebuild b/dev-java/commons-text/commons-text-1.9.ebuild deleted file mode 100644 index 530b720f0f19..000000000000 --- a/dev-java/commons-text/commons-text-1.9.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://downloads.apache.org//commons/text/source/commons-text-1.9-src.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild commons-text-1.9.ebuild - -EAPI=7 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.apache.commons:commons-text:1.9" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Apache Commons Text is a library focused on algorithms working on strings" -HOMEPAGE="https://commons.apache.org/proper/commons-text" -SRC_URI="https://downloads.apache.org//commons/text/source/${P}-src.tar.gz -> ${P}-sources.tar.gz" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ppc64 x86" - -# Common dependencies -# POM: pom.xml -# org.apache.commons:commons-lang3:3.11 -> >=dev-java/commons-lang-3.11:3.6 - -CDEPEND=" - >=dev-java/commons-lang-3.11:3.6 -" - -DEPEND=" - >=virtual/jdk-1.8:* - ${CDEPEND} -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CDEPEND}" - -S="${WORKDIR}/${P}-src" - -JAVA_ENCODING="ISO-8859-1" - -JAVA_GENTOO_CLASSPATH="commons-lang-3.6" -JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest index acb75b553cd2..763ff5455368 100644 --- a/dev-java/jakartaee-migration/Manifest +++ b/dev-java/jakartaee-migration/Manifest @@ -1,5 +1,3 @@ -DIST jakartaee-migration-1.0.3-sources.tar.gz 38243 BLAKE2B e1c05c05dd16ec6d54f0eb3523aed14a3fcbc9c0999b54e7c240c5ebfbb968a8cc3025855485318c19f0e85931ea239f4f08efbd0d042c7ad163c1fe5d3819f9 SHA512 79947fe47d55e4e93a417118e7a41fd79614b3fe3bfad967bfdcc865121c9247f92ecd99231e08abb2187036cdb1dceb85b8f2bc695c5bd2ecbf48a84bdd3b2a DIST jakartaee-migration-1.0.4-sources.tar.gz 38400 BLAKE2B c0c0151adfde56632ad95919a88eedd6a44056e2d29320e63e0dc64c59cf7ba928135f817ddb3c79a96dd7a8418ab92c8fe4aa9f50a51442bb55384349de603f SHA512 a9d49463f44affa1c5f57d9342e7b4dc77a829c904ba2376f87f086c3662f01e05a2b1cfe2dc746e33605a66849f12415ebb2b63eb05c5e476a4eab9ffd39644 -EBUILD jakartaee-migration-1.0.3.ebuild 2945 BLAKE2B da19a875db924748ac6c1ebb6cbf25ff48419a447683be29af3a893764b1a51ebd0258c019f5af292b3b006417c907257004e6431d66269a534b9536b5efee71 SHA512 5f96ce048739dc89191d22756eee6086bcc4da74a61435a999374fa72961bf7bdad8a374b8165575b0929690f1b13abee0dddfd8d90ec85a7ecef8eae4c7cb63 EBUILD jakartaee-migration-1.0.4.ebuild 2979 BLAKE2B 1213e1b55b6822382c81fe9d8643b6ad6c55a5ef1ad204f732fafabec6d914f9b2b04c70ef6ec4af26e9e39026f96a67a64f0f23ff2bf81d2b3c4a43e582a1b8 SHA512 9740c0f632d1c6d9102806bca98eb87ee8728aff425515af033a5c6cb895af7ca500a347a51a943ae52dcfe5f3955bbc7a181b916c399336761f87ac61a2918d MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.3.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.3.ebuild deleted file mode 100644 index f4e644bdec92..000000000000 --- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.3.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://ftp.fau.de/apache/tomcat/jakartaee-migration/v1.0.3/source/jakartaee-migration-1.0.3-src.tar.gz --slot 0 --keywords "~amd64" --ebuild jakartaee-migration-1.0.3.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.3" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9" -HOMEPAGE="https://tomcat.apache.org" -SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64" - -# Common dependencies -# POM: pom.xml -# commons-io:commons-io:2.8.0 -> >=dev-java/commons-io-2.8.0:1 -# org.apache.bcel:bcel:6.5.0 -> >=dev-java/bcel-6.5.0:0 -# org.apache.commons:commons-compress:1.20 -> >=dev-java/commons-compress-1.20:0 - -CDEPEND=" - dev-java/ant-core:0 - dev-java/bcel:0 - >=dev-java/commons-compress-1.20:0 - dev-java/commons-io:1 -" - -# Compile dependencies -# POM: pom.xml -# org.apache.ant:ant:1.10.9 -> !!!groupId-not-found!!! -# POM: pom.xml -# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.1:4 - -DEPEND=" - >=virtual/jdk-1.8:* - ${CDEPEND} -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CDEPEND}" - -S="${WORKDIR}/${P}" - -JAVA_LAUNCHER_FILENAME="${PN}" - -JAVA_GENTOO_CLASSPATH="ant-core,bcel,commons-compress,commons-io-1" -JAVA_SRC_DIR="src/main/java" -JAVA_MAIN_CLASS="org.apache.tomcat.jakartaee.MigrationCLI" -JAVA_RESOURCE_DIRS=( - "src/main/resources" -) - -JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_RESOURCE_DIRS=( - "src/test/resources" -) -JAVA_TEST_EXCLUDES=( - "org.apache.tomcat.jakartaee.TesterConstants" -) - -src_prepare() { - default - sed -i "s/\${project.version}/${PV}/g" src/main/resources/info.properties -} - -src_test() { - # we need to create jar files for the tests the same way as it's done using pom.xml - local implementation_version=$(grep Implementation-Version pom.xml | grep -oE "[0-9]+\.[0-9]+\.[0-9]+") - mkdir -p target/test-classes/META-INF || die - pushd target/test-classes || die - echo "Implementation-Version: ${implementation_version}" > META-INF/MANIFEST.MF - ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name CommonGatewayInterface.java) || die - jar cfm cgi-api.jar META-INF/MANIFEST.MF $(find -name CommonGatewayInterface.class) || die - ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name HelloCGI.java) || die - jar cfm hellocgi.jar META-INF/MANIFEST.MF $(find -name HelloCGI.class) || die - for enc in rsa dsa ec; do - cp hellocgi.jar hellocgi-signed-${enc}.jar || die - jarsigner -keystore "${S}/src/test/resources/keystore.p12" -storepass apache hellocgi-signed-${enc}.jar ${enc} || die - done - popd - - java-pkg-simple_src_test -} diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest index fd3f0cd0bb6f..c699495997ad 100644 --- a/dev-java/protobuf-java/Manifest +++ b/dev-java/protobuf-java/Manifest @@ -1,6 +1,12 @@ +DIST protobuf-21.8.tar.gz 5110670 BLAKE2B 3c1b0c857a86e9586481d63896341d0cb11290dbd710d87a6f7889d34f5f262abe2986a29ed19a730f8fa5df0b5c62d77a4db6aa415a72b239f7483ae8d6380c SHA512 cb17be759311e91172801add1f88fe7a0291b547170c40d2e3303f5c248570dddeade96bd48740edd628215f55269c97475e2f4c4a41c50f1018d525f52036cb DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6 +DIST protobuf-3.19.6.tar.gz 5299501 BLAKE2B 3121f76b95f83c5309ce49ce296b738eff7be9d3a5093c564fbe2339fb5f3729e406f1b44bfcc05feb0d31ab63838bb4f54685017977c73a33b91215a6776072 SHA512 8f92242f2be8e1bbfba41341c87709ad91ad83b8b3e3df88bb430411541d3399295f49291fd52b50e3487b0fce33181cb4d175685fd25aac72adfaee26a612d4 DIST protobuf-3.20.1.tar.gz 5368262 BLAKE2B 1ce1aef2e4c4f3ea4863629cc75d89fe17d0c7ac0c342ac641c787456fd4a12756c2892a27ddadedc94a7201494ec84566638ce33a03cb0c867b04e9eee0edb3 SHA512 fde3eb9f13946887ddfd87df428c5615ad09aaf191e4478b24e98e5e13231feeff4e70b4ca6a2ff7d9b9b2e2c60bc1d5479526edeafa78f9a8ed3bef2e0bacb0 +DIST protobuf-3.20.3.tar.gz 5374320 BLAKE2B fb51f2a0ecf5b83235f5252051f8192ae377bb7a5e030c3f3e9435ccde25919c059830cf476e840fa6c970928a32c0075e213c9d5d4d9e3d3b24732c39a9fbfa SHA512 01d6703bdbe769a1200ee6e4ebcdcb99688ec21f576988c60d82ec36e0822820fb245fcb4ca53293143d53e666d748b5a0c6937bc659fb3cdc4cd9b05ed12a1c EBUILD protobuf-java-3.19.3.ebuild 1451 BLAKE2B c0bad09302e1e52cff018223c055939e2d4335874f2be95e913705368926106c6967b5a98d7f0a392037060c040fd3116210f0d1de567dc17e66bfc252202e4b SHA512 a74e044d91db564a682f8d9b82fa73608fc10f2b0a917b1eb696375f5993e62cf03289a31b7e28aa27cbfdf027bf62160083ff39186d1f8333b52633ba5ed0fb +EBUILD protobuf-java-3.19.6.ebuild 2852 BLAKE2B b131c6753d9af1c5038d449e40476455256905f323cad1eaa9c0378e5b0aaf132e11dec4e2622e5f51edc2952e1ab6de2de25cd0b8d5e5d205b7be9ae3c56a75 SHA512 2b5c46eab2b9b9fa398cdfbb4a2bb12a7f0dcdce4a977b9bc63a955a54283da548f8921231349a89442d7222708afb803335518bafe2ddd6f424e7fe5866dc2a EBUILD protobuf-java-3.20.1.ebuild 1430 BLAKE2B 8625de036d5ed22f587b922cd69620ce7e8dd1a0a30e77bc2154937156c2d1686c2ba27efaa1d55fc68720c420f16b14ba3520175791cefe99a754425d496a0a SHA512 e78e00cb7584d7d909b64feea2dc430819f63558ed124b86cdc2e518106a0e288638db14919286947fb86db15bbc47668398ca0081245a61e8294d56c5963d85 -EBUILD protobuf-java-9999.ebuild 1365 BLAKE2B 6d6876bc2cd65b0e17e4dfdf4de0fe4cde077a3f040ea1318511ff6da9915331a3f0686b132fe893aeda8d31c0f8031f338efef43c9f6e7e92d7ce75c1c8dc5a SHA512 f7c9ac0f8f37fe746aa3a0febd35d176e51600250ef512b2f7f28e17f6225fcd550b9bd708eb5eb5540f841b3e5116d18b011ef6bd75ee1a8e319124157df53c -MISC metadata.xml 548 BLAKE2B 2468487e12d536d67daebf5b7a21cd63a9c4af321a8979132e63d9b8394bf577e347f891326c73bfa6907e82ca355ea0d4ec40a37bb297db0da1e55a62b6ef33 SHA512 c0c2556fbf8821f3a75ed344daa59b4fc355029f96efb8f9784f54c819916adeb46b2c5d8c2e8d405dc58395c2f18b30cda69c6d406948a066bd1d78a55df80b +EBUILD protobuf-java-3.20.3.ebuild 2852 BLAKE2B c214278702be2c18ff5637fcc80171f34b8993a0369e6d01a142c365b53f281a81cdfbe4b834f7a58a1502608fc0a3b672a4c975d73be7a24b999d7ff56bb878 SHA512 ea67fa3fc66d97bcd6e95621c79ba7747a396d48d68689715a23c1dbcd03d71e4e2897a4d7418b49152af94c43f69876ce31b2e866647b037faa1e7dbeeb75e1 +EBUILD protobuf-java-3.21.8.ebuild 2854 BLAKE2B c9ee0042e0550d67b211360f9f37bac37b7ca592f20cc6cf8830279f1d22f91b571e1100e19f3158b757bff969575705bb52f26b8ebb56b753be98fcecbd8c7a SHA512 c60a2a04a9601a3d7afff24de4dafd48121c771c8aa92818f44c0a6a7de468e797d6287787969be546d744b1b8ddaa9e73e3121c115ba25b39fbb988dbb91ff9 +EBUILD protobuf-java-9999.ebuild 2995 BLAKE2B e1538e1a635ba897a9c2f75db235384cb4122c4390ed8bab3a9f46c57f74b1db58ef54e6df65e328df6458067e6b671b3dda4a08226c94e9929388aaa8efe386 SHA512 94b01edfaee931cc4a5944940429e89cf8837f74c25efe026c3ad7fb3a637da21f794b68d7fda90e9bbef58251bab3f3b0271fc4a50ea29c4389578fa3597e16 +MISC metadata.xml 625 BLAKE2B 13394b9a2148b9117ce719954591e79088f845ac1ceb667bbdd2645b989daadcfea09525f9dde68c405e3f1cce5cc1af32de9fb4dff629e4745e13fa92727dd7 SHA512 47f693db57dbde04f419ed65494d81b0a800c9ac49d790c9b794baef34fb1f876da29c5a0662c45aa3c01cecd34af648e196fb76110fcc0066198c59543049b3 diff --git a/dev-java/protobuf-java/metadata.xml b/dev-java/protobuf-java/metadata.xml index 7fc9e27ef82d..5fdb33c1c7c3 100644 --- a/dev-java/protobuf-java/metadata.xml +++ b/dev-java/protobuf-java/metadata.xml @@ -9,6 +9,9 @@ cjk@gentoo.org Cjk + + java@gentoo.org + Soname version number of Protobuf diff --git a/dev-java/protobuf-java/protobuf-java-3.19.6.ebuild b/dev-java/protobuf-java/protobuf-java-3.19.6.ebuild new file mode 100644 index 000000000000..6adff3a717e4 --- /dev/null +++ b/dev-java/protobuf-java/protobuf-java-3.19.6.ebuild @@ -0,0 +1,102 @@ +# Copyright 2008-2022 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:${PN}:${PV}" +# Tests not enabled, depend on com.google.truth which is not packaged +# https://github.com/protocolbuffers/protobuf/blob/v3.19.6/java/core/pom.xml#L35-L40 +# JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +PARENT_PN="${PN/-java/}" +PARENT_PV="${PV}" +PARENT_P="${PARENT_PN}-${PARENT_PV}" + +if [[ "${PV}" == *9999 ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git" + EGIT_SUBMODULES=() + EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}" +else + SRC_URI=" + https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz + -> ${PARENT_P}.tar.gz + " + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" +fi + +DESCRIPTION="Google's Protocol Buffers - Java bindings" +HOMEPAGE=" + https://developers.google.com/protocol-buffers/ +" + +LICENSE="BSD" +SLOT="0/30" + +S="${WORKDIR}/${PARENT_P}/java" + +BDEPEND=" + dev-libs/protobuf:${SLOT} +" +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="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 + + # 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/v3.19.6/java/core/pom.xml#L45-L61 + mkdir -p "${JAVA_RESOURCE_DIRS}/google/protobuf/compiler" || die + cp "../src/google/protobuf/${core_protos[@]}.proto" \ + "${JAVA_RESOURCE_DIRS}/google/protobuf" || die + cp {../src,"${JAVA_RESOURCE_DIRS}"}/google/protobuf/compiler/plugin.proto || die + + # Generate 146 .java files according to + # https://github.com/protocolbuffers/protobuf/blob/v3.19.6/java/core/generate-sources-build.xml + for proto in "${core_protos[@]}" compiler/plugin; do + "${BROOT}/usr/bin/protoc" \ + --java_out="${JAVA_SRC_DIR}" -I../src ../src/google/protobuf/"${proto}".proto || die + done +} diff --git a/dev-java/protobuf-java/protobuf-java-3.20.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.20.3.ebuild new file mode 100644 index 000000000000..2e58b824d118 --- /dev/null +++ b/dev-java/protobuf-java/protobuf-java-3.20.3.ebuild @@ -0,0 +1,102 @@ +# Copyright 2008-2022 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:${PN}:${PV}" +# Tests not enabled, depend on com.google.truth which is not packaged +# https://github.com/protocolbuffers/protobuf/blob/v3.20.3/java/core/pom.xml#L35-L40 +# JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +PARENT_PN="${PN/-java/}" +PARENT_PV="${PV}" +PARENT_P="${PARENT_PN}-${PARENT_PV}" + +if [[ "${PV}" == *9999 ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git" + EGIT_SUBMODULES=() + EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}" +else + SRC_URI=" + https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz + -> ${PARENT_P}.tar.gz + " + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" +fi + +DESCRIPTION="Google's Protocol Buffers - Java bindings" +HOMEPAGE=" + https://developers.google.com/protocol-buffers/ +" + +LICENSE="BSD" +SLOT="0/31" + +S="${WORKDIR}/${PARENT_P}/java" + +BDEPEND=" + dev-libs/protobuf:${SLOT} +" +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="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 + + # 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/v3.20.2/java/core/pom.xml#L45-L61 + mkdir -p "${JAVA_RESOURCE_DIRS}/google/protobuf/compiler" || die + cp "../src/google/protobuf/${core_protos[@]}.proto" \ + "${JAVA_RESOURCE_DIRS}/google/protobuf" || die + cp {../src,"${JAVA_RESOURCE_DIRS}"}/google/protobuf/compiler/plugin.proto || die + + # Generate 146 .java files according to + # https://github.com/protocolbuffers/protobuf/blob/v3.20.3/java/core/generate-sources-build.xml + for proto in "${core_protos[@]}" compiler/plugin; do + "${BROOT}/usr/bin/protoc" \ + --java_out="${JAVA_SRC_DIR}" -I../src ../src/google/protobuf/"${proto}".proto || die + done +} diff --git a/dev-java/protobuf-java/protobuf-java-3.21.8.ebuild b/dev-java/protobuf-java/protobuf-java-3.21.8.ebuild new file mode 100644 index 000000000000..abe81a5bcd1d --- /dev/null +++ b/dev-java/protobuf-java/protobuf-java-3.21.8.ebuild @@ -0,0 +1,102 @@ +# Copyright 2008-2022 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:${PN}:${PV}" +# Tests not enabled, depend on com.google.truth which is not packaged +# https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/pom.xml#L35-L40 +# JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +PARENT_PN="${PN/-java/}" +PARENT_PV="$(ver_cut 2-)" +PARENT_P="${PARENT_PN}-${PARENT_PV}" + +if [[ "${PV}" == *9999 ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git" + EGIT_SUBMODULES=() + EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}" +else + SRC_URI=" + https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz + -> ${PARENT_P}.tar.gz + " + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" +fi + +DESCRIPTION="Google's Protocol Buffers - Java bindings" +HOMEPAGE=" + https://developers.google.com/protocol-buffers/ +" + +LICENSE="BSD" +SLOT="0/32" + +S="${WORKDIR}/${PARENT_P}/java" + +BDEPEND=" + dev-libs/protobuf:${SLOT} +" +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="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 + + # 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.7/java/core/pom.xml#L45-L61 + mkdir -p "${JAVA_RESOURCE_DIRS}/google/protobuf/compiler" || die + cp "../src/google/protobuf/${core_protos[@]}.proto" \ + "${JAVA_RESOURCE_DIRS}/google/protobuf" || die + cp {../src,"${JAVA_RESOURCE_DIRS}"}/google/protobuf/compiler/plugin.proto || die + + # Generate 146 .java files according to + # https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/generate-sources-build.xml + for proto in "${core_protos[@]}" compiler/plugin; do + "${BROOT}/usr/bin/protoc" \ + --java_out="${JAVA_SRC_DIR}" -I../src ../src/google/protobuf/"${proto}".proto || die + done +} diff --git a/dev-java/protobuf-java/protobuf-java-9999.ebuild b/dev-java/protobuf-java/protobuf-java-9999.ebuild index 43fa605b496c..ab4856250e05 100644 --- a/dev-java/protobuf-java/protobuf-java-9999.ebuild +++ b/dev-java/protobuf-java/protobuf-java-9999.ebuild @@ -3,52 +3,103 @@ EAPI=8 -JAVA_PKG_IUSE="doc source" +JAVA_PKG_IUSE="doc source test" +# Version based on value in (java/)core/pom.xml from main branch +# Please update me when new release +# Maybe find a way to automatically change it? +MAVEN_ID="com.google.protobuf:${PN}:3.21.7" +# Tests not enabled, depend on com.google.truth which is not packaged +# https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/pom.xml#L35-L40 +# JAVA_TESTING_FRAMEWORKS="junit-4" inherit java-pkg-2 java-pkg-simple -if [[ "${PV}" == "9999" ]]; then +PARENT_PN="${PN/-java/}" +PARENT_PV="${PV}" +PARENT_P="${PARENT_PN}-${PARENT_PV}" + +if [[ "${PV}" == *9999 ]]; then inherit git-r3 - EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}" - EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf" + EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git" EGIT_SUBMODULES=() + EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}" +else + SRC_URI=" + https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz + -> ${PARENT_P}.tar.gz + " + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" fi DESCRIPTION="Google's Protocol Buffers - Java bindings" -HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf" -if [[ "${PV}" == "9999" ]]; then - SRC_URI="" -else - SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz" -fi -S="${WORKDIR}/protobuf-${PV}/java" +HOMEPAGE=" + https://developers.google.com/protocol-buffers/ +" LICENSE="BSD" -SLOT="0/31" -KEYWORDS="" +SLOT="0/32" + +S="${WORKDIR}/${PARENT_P}/java" -COMMON_DEPEND=">=virtual/jdk-1.8:*" BDEPEND=" - ~dev-libs/protobuf-${PV} - ${COMMON_DEPEND} + dev-libs/protobuf:${SLOT} +" +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + dev-java/guava:0 + dev-java/mockito:4 + ) +" +RDEPEND=" + >=virtual/jre-1.8:* " -DEPEND="${COMMON_DEPEND}" -RDEPEND="${DEPEND}" + +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}/protobuf-${PV}" > /dev/null || die + pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die + [[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}" eapply_user popd > /dev/null || die + # Remove bundled jars + java-pkg_clean + java-pkg-2_src_prepare -} -src_compile() { - "${BROOT}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die - JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile -} + # 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.7/java/core/pom.xml#L45-L61 + mkdir -p "${JAVA_RESOURCE_DIRS}/google/protobuf/compiler" || die + cp "../src/google/protobuf/${core_protos[@]}.proto" \ + "${JAVA_RESOURCE_DIRS}/google/protobuf" || die + cp {../src,"${JAVA_RESOURCE_DIRS}"}/google/protobuf/compiler/plugin.proto || die -src_install() { - JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install + # Generate 146 .java files according to + # https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/generate-sources-build.xml + for proto in "${core_protos[@]}" compiler/plugin; do + "${BROOT}/usr/bin/protoc" \ + --java_out="${JAVA_SRC_DIR}" -I../src ../src/google/protobuf/"${proto}".proto || die + done } -- cgit v1.2.3