summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/Manifest.gzbin56603 -> 56775 bytes
-rw-r--r--dev-java/byte-buddy/Manifest5
-rw-r--r--dev-java/byte-buddy/byte-buddy-1.12.18.ebuild175
-rw-r--r--dev-java/byte-buddy/byte-buddy-1.12.21.ebuild2
-rw-r--r--dev-java/byte-buddy/files/byte-buddy-1.12.18-not-java20.patch52
-rw-r--r--dev-java/mockito/Manifest4
-rw-r--r--dev-java/mockito/mockito-4.11.0.ebuild4
-rw-r--r--dev-java/mockito/mockito-4.8.1.ebuild56
-rw-r--r--dev-java/protobuf-java/Manifest5
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.21.12.ebuild2
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.21.9-r1.ebuild98
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.21.9-r2.ebuild119
-rw-r--r--dev-java/scala-cli-bin/Manifest5
-rw-r--r--dev-java/scala-cli-bin/metadata.xml12
-rw-r--r--dev-java/scala-cli-bin/scala-cli-bin-0.1.20.ebuild65
15 files changed, 89 insertions, 515 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 18da2d5824e0..993e1148a735 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
Binary files differ
diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest
index 8769744fe1e7..d39f403eb502 100644
--- a/dev-java/byte-buddy/Manifest
+++ b/dev-java/byte-buddy/Manifest
@@ -1,6 +1,3 @@
-AUX byte-buddy-1.12.18-not-java20.patch 2497 BLAKE2B e63fa330e65aa9038a0f0f9e732c39114c62df845a6d481300b0fa8cc1a03e5fe9e057838ab945d9de50f0c2b22db14f0f3fdba95073f793e5c6f627e0e9bbe1 SHA512 c856eda61f8ee64245185431f6a0646fda16a5a8d632710e94abdffb7cebaca8e630f52d4027b81154dec7905290d7730c85a2452960ee485df3296c8d305174
-DIST byte-buddy-1.12.18.tar.gz 1924438 BLAKE2B 278ac97d60e62c7d44142a01da94113b29b483bff532f08fca7e345f383a4ddf83cb8c4d0544bce1879bb26909d048a76562cd816c4e9cb06695127ed849f08c SHA512 637e041f97981b85cd13ffecb0de47206b5c99d8b98561561414d8a599f5d53a6e047ba3ad9bc88ca030125221df3ebe49d6eff18a4093f4027d8cbf34a483b0
DIST byte-buddy-1.12.21.tar.gz 1931819 BLAKE2B 6b37b21d5f31c1564a3cc4d30870a7eca3c4c0512815db881a20602dc7ac970145dd9cc2bd6af4f2fdca0ff542b43dc675376c91f7ea7fdf3ea306112eba842b SHA512 9513caa9a5fc0924aea46e8de21ad2ad90320a582ad17be93f6305eb27f98d3af2c3fa09565083b5d97c0d9f0a1b0a9c7105738c4b65616e78bf2e7657c4ee76
-EBUILD byte-buddy-1.12.18.ebuild 5307 BLAKE2B 1f4b9a8266ae9ee4e279f048f565502ee7534b99b24ad72ecdb5c3bbe44b2531fbcba3601a2e30caf4b84e543121a4ad54d12864a687354ef5c97031dd93a772 SHA512 a14dd8ba20210163841caf6c27d63b4df564689876ff7ebb8850e25a0c18fabc0c3227d00ba3bc09d77242869af014cff7a7484d3c9e168cfc31b551c4e2e3c5
-EBUILD byte-buddy-1.12.21.ebuild 4849 BLAKE2B 741b13a0bd55c79a27d422b0c13e046b29fe1b46e848a74e23eeb9a1df86be05f3aeb8f415dae34308d1592a80a7a01855ac5776ac395599641e25354310dfc1 SHA512 09354de223dcbca65cb37ecf3857ab8c9e82cfc076e7560ef26ffaf13d15232ad5cdb7e1e7deb15f5ca69daeb5b6eda8ea55a7d74d67dc97e36c6f8cfe6eddc4
+EBUILD byte-buddy-1.12.21.ebuild 4845 BLAKE2B 1464adfb8d4e25f149a6125e95b2b1befceb4963f66df40d42546fc39874aeb70b93949616afee90098b2b473daa8e53cb7c2047399ff9bbf74902ca00cebe8f SHA512 4c1a8dec6ea9a423b5dd45926322c431347631ec50223cae1a0ba63b9667d361c44dc3118b5a2da4a9c6dbc7a5070b0b6e04adbb2fccf48a429169dbb36b5a19
MISC metadata.xml 440 BLAKE2B ef73e69de33dc6bbea38c81b8744fad5ce4764644d9cc6168d7c0f175856e30c3a577ffc597f25f8caf26bacfd80663b55eddde047a346fcb582d883269233b9 SHA512 b27c92e768c2783c90c8b4693c3265a9533a09abe76b2b3bd54e3865d270eed91414fcd89513bc30feb0243ea21f63d354b907b74eb18e98f899811101a6c956
diff --git a/dev-java/byte-buddy/byte-buddy-1.12.18.ebuild b/dev-java/byte-buddy/byte-buddy-1.12.18.ebuild
deleted file mode 100644
index c535d83e1432..000000000000
--- a/dev-java/byte-buddy/byte-buddy-1.12.18.ebuild
+++ /dev/null
@@ -1,175 +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://github.com/raphw/byte-buddy/archive/byte-buddy-1.12.18.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-1.12.18.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="net.bytebuddy:byte-buddy-agent:1.12.18"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Offers convenience for attaching an agent to the local or a remote VM"
-HOMEPAGE="https://bytebuddy.net"
-SRC_URI="https://github.com/raphw/byte-buddy/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="
- >=virtual/jdk-11:*
- dev-java/asm:9
- dev-java/findbugs-annotations:0
- dev-java/jna:4
- dev-java/jsr305:0
- test? (
- dev-java/mockito:4
- )
-"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-PATCHES=(
- "${FILESDIR}/byte-buddy-1.12.18-not-java20.patch"
-)
-
-S="${WORKDIR}/byte-buddy-${P}"
-
-JAVA_CLASSPATH_EXTRA="
- asm-9
- findbugs-annotations
- jsr305
- jna-4
-"
-
-src_prepare() {
- default
- # https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.18/byte-buddy-agent/pom.xml#L142-L176
- cat > byte-buddy-agent/src/main/java/module-info.java <<-EOF || die
- module net.bytebuddy.agent {
- requires java.instrument;
- requires static jdk.attach;
- requires static com.sun.jna;
- requires static com.sun.jna.platform;
- requires java.base;
- exports net.bytebuddy.agent;
- exports net.bytebuddy.agent.utility.nullability;
- }
- EOF
-
- # adjustment for recent mockito versions
- sed \
- -e 's:verifyZeroInteractions:verifyNoInteractions:g' \
- -i byte-buddy-dep/src/test/java/net/bytebuddy/*.java \
- -i byte-buddy-dep/src/test/java/net/bytebuddy/*/*Test.java \
- -i byte-buddy-dep/src/test/java/net/bytebuddy/*/*/*Test.java \
- -i byte-buddy-dep/src/test/java/net/bytebuddy/*/*/*/*Test.java \
- -i byte-buddy-dep/src/test/java/net/bytebuddy/*/*/*/*/*Test.java \
- || die
-
- # instead of shading byte-buddy-dep we move it into byte-buddy.
- mv byte-buddy{-dep,}/src/main/java || die "cannot move sources"
-
- # https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.18/byte-buddy/pom.xml#L159-L195
- local exports="$( \
- sed -n '/<packages.list.external>/,/<\/packages.list.external/p' \
- byte-buddy/pom.xml \
- | sed -e 's:^:exports :' -e 's:,:;:' \
- | grep -v 'packages.list.external\|shade' | tr -s '[:space:]' \
- )" || die
- cat > byte-buddy/src/main/java/module-info.java <<-EOF || die
- module net.bytebuddy {
- requires static java.instrument;
- requires static java.management;
- requires static jdk.unsupported;
- requires static net.bytebuddy.agent;
- requires static com.sun.jna;
- requires static com.sun.jna.platform;
- requires java.base;
- ${exports}
- }
- EOF
-}
-
-src_compile() {
- einfo "Compiling byte-buddy-agent.jar"
- JAVA_JAR_FILENAME="byte-buddy-agent.jar"
- JAVA_RESOURCE_DIRS="byte-buddy-agent/src/main/resources"
- JAVA_SRC_DIR="byte-buddy-agent/src/main/java"
- java-pkg-simple_src_compile
- JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-agent.jar"
- rm -r target || die
-
- einfo "Compiling byte-buddy.jar"
- JAVA_JAR_FILENAME="byte-buddy.jar"
- JAVA_MAIN_CLASS="net.bytebuddy.build.Plugin\$Engine\$Default"
- JAVA_RESOURCE_DIRS=()
- JAVA_SRC_DIR="byte-buddy/src/main/java"
- java-pkg-simple_src_compile
- JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy.jar"
- rm -r target || die
-
- if use doc; then
- einfo "Compiling javadocs"
- rm byte-buddy-agent/src/main/java/module-info.java || die
- JAVA_SRC_DIR=(
- "byte-buddy-agent/src/main/java"
- "byte-buddy/src/main/java"
- )
- JAVA_JAR_FILENAME="ignoreme.jar"
- java-pkg-simple_src_compile
- fi
-}
-
-src_test() {
- # instead of shading byte-buddy-dep we move it into byte-buddy.
- mv byte-buddy{-dep,}/src/test || die "cannot move tests"
-
- # @Ignore one of 4 tests, https://bugs.gentoo.org/863386
- sed \
- -e '/import org.junit.Test/a import org.junit.Ignore;' \
- -e '/testIgnoreExistingField()/i @Ignore' \
- -i byte-buddy/src/test/java/net/bytebuddy/build/CachedReturnPluginOtherTest.java || die
-
- # @Ignore one of 39 tests, https://bugs.gentoo.org/863386
- sed \
- -e '/import org.junit.Test/a import org.junit.Ignore;' \
- -e '/testNoParameterNameAndModifiers()/i @Ignore' \
- -i byte-buddy/src/test/java/net/bytebuddy/description/method/AbstractMethodDescriptionTest.java || die
-
- JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4"
-
- einfo "Testing byte-buddy-agent"
- # https://github.com/raphw/byte-buddy/issues/1321#issuecomment-1252776459
- JAVA_TEST_EXTRA_ARGS=( -Dnet.bytebuddy.test.jnapath="${EPREFIX}/usr/$(get_libdir)/jna-4/" )
- JAVA_TEST_SRC_DIR="byte-buddy-agent/src/test/java"
- java-pkg-simple_src_test
-
- einfo "Testing byte-buddy"
- JAVA_TEST_RESOURCE_DIRS=( byte-buddy/src/test/{resources,precompiled*} )
- JAVA_TEST_SRC_DIR="byte-buddy/src/test/java"
-
- JAVA_TEST_EXCLUDES=(
- # all tests in this class fail, https://bugs.gentoo.org/863386
- net.bytebuddy.build.CachedReturnPluginTest
- )
- java-pkg-simple_src_test
-}
-
-src_install() {
- java-pkg_dojar "byte-buddy-agent.jar"
- java-pkg_dojar "byte-buddy.jar"
-
- if use doc; then
- java-pkg_dojavadoc target/api
- fi
-
- if use source; then
- java-pkg_dosrc "byte-buddy-agent/src/main/java/*"
- java-pkg_dosrc "byte-buddy/src/main/java/*"
- fi
-}
diff --git a/dev-java/byte-buddy/byte-buddy-1.12.21.ebuild b/dev-java/byte-buddy/byte-buddy-1.12.21.ebuild
index 20f740f2c37c..df9099cd9224 100644
--- a/dev-java/byte-buddy/byte-buddy-1.12.21.ebuild
+++ b/dev-java/byte-buddy/byte-buddy-1.12.21.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/raphw/byte-buddy/archive/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
>=virtual/jdk-11:*
diff --git a/dev-java/byte-buddy/files/byte-buddy-1.12.18-not-java20.patch b/dev-java/byte-buddy/files/byte-buddy-1.12.18-not-java20.patch
deleted file mode 100644
index 73b9bccdab3e..000000000000
--- a/dev-java/byte-buddy/files/byte-buddy-1.12.18-not-java20.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-# We don't have JAVA_V20
---- a/byte-buddy-dep/src/main/java/net/bytebuddy/ClassFileVersion.java
-+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/ClassFileVersion.java
-@@ -140,11 +140,6 @@ public class ClassFileVersion implements Comparable<ClassFileVersion>, Serializa
- */
- public static final ClassFileVersion JAVA_V19 = new ClassFileVersion(Opcodes.V19);
-
-- /**
-- * The class file version of Java 20.
-- */
-- public static final ClassFileVersion JAVA_V20 = new ClassFileVersion(Opcodes.V20);
--
- /**
- * A version locator for the executing JVM.
- */
-@@ -235,8 +230,6 @@ public class ClassFileVersion implements Comparable<ClassFileVersion>, Serializa
- return JAVA_V18;
- } else if (javaVersionString.equals("1.19") || javaVersionString.equals("19")) {
- return JAVA_V19;
-- } else if (javaVersionString.equals("1.20") || javaVersionString.equals("20")) {
-- return JAVA_V20;
- } else {
- if (OpenedClassReader.EXPERIMENTAL) {
- try {
-@@ -300,8 +293,6 @@ public class ClassFileVersion implements Comparable<ClassFileVersion>, Serializa
- return JAVA_V18;
- case 19:
- return JAVA_V19;
-- case 20:
-- return JAVA_V20;
- default:
- if (OpenedClassReader.EXPERIMENTAL && javaVersion > 0) {
- return new ClassFileVersion(BASE_VERSION + javaVersion);
-@@ -317,7 +308,7 @@ public class ClassFileVersion implements Comparable<ClassFileVersion>, Serializa
- * @return The latest officially supported Java version.
- */
- public static ClassFileVersion latest() {
-- return ClassFileVersion.JAVA_V20;
-+ return ClassFileVersion.JAVA_V19;
- }
-
- /**
---- a/byte-buddy-dep/src/test/java/net/bytebuddy/ClassFileVersionKnownVersionsTest.java
-+++ b/byte-buddy-dep/src/test/java/net/bytebuddy/ClassFileVersionKnownVersionsTest.java
-@@ -77,7 +77,6 @@ public class ClassFileVersionKnownVersionsTest {
- {17, 17, Arrays.asList("1.17", "17"), Opcodes.V17, (short) 61, (short) 0, true, true, true},
- {18, 18, Arrays.asList("1.18", "18"), Opcodes.V18, (short) 62, (short) 0, true, true, true},
- {19, 19, Arrays.asList("1.19", "19"), Opcodes.V19, (short) 63, (short) 0, true, true, true},
-- {20, 20, Arrays.asList("1.20", "20"), Opcodes.V20, (short) 64, (short) 0, true, true, true}
- });
- }
-
diff --git a/dev-java/mockito/Manifest b/dev-java/mockito/Manifest
index 5fb85487343a..341c61a86ac2 100644
--- a/dev-java/mockito/Manifest
+++ b/dev-java/mockito/Manifest
@@ -1,7 +1,5 @@
DIST mockito-4.11.0.tar.gz 1050218 BLAKE2B 7f7298e233c9cdb0b475aa201300a1063fd8efc587f3a4de0cb1caedd6f6506a32f8e9b0548fa5898892515ec96625153a1a2ad65fc8070b7dc6c254206fbbfd SHA512 b1de01c8e9b2fc4eef0013af562efeac7e22babdebbd8c7842ecd55071627e11c5e6ab575436990ea70d4ceefb56fc260333278c8d4b833e454956bf89841fc5
-DIST mockito-4.8.1.tar.gz 1045454 BLAKE2B 82efc18afa8efae2495fdd5b0db58ddde8ea5cae9b7dfb554075924e343f5c0290a7f5d63b18c217b33a11c31a13ac40fcd28a752b0deae737c4bd75ea13c044 SHA512 dd2adc2211637daa86f5174e333744c5a1ff29dcccf9866a33933e2ba945d99781d5860c6059e6fa06a649d9a45417ab13066f8c8e896cb753b6e0869f0e2b03
DIST mockito-core-1.9.5-sources.jar 723074 BLAKE2B e553a923542a1a2574ee0cda5979d168cc3e9644dbbc9fceed2301ae1bac150c4e35dbc4432d50e2479efea2a6cd35ec19c62c3598f61709f1f5dc8959cc0155 SHA512 271e626c3b5be9a7d7c82a2f0bf44077aabd51924b0956a88633ace7fe8c134d8cd1f89ce348ce0d15ccce55a50027e303836d2d2f430500317b6136d308d3d4
EBUILD mockito-1.9.5-r3.ebuild 713 BLAKE2B d46334ba15f68eef38b979b4c8bd84ad51fdfd61f2d33f77f3230876802c753a6fdbbb0422edae5de79f931b314c7bfbc63266de9dabbc9327ed7b1a302d517a SHA512 73886d139804085b34e67902a67af34358c7abd1083bbd2e21d6cec7b149d273307312d42351236fe6628e237685c4e1f62bcfc7333e1af32017fb97183e7f34
-EBUILD mockito-4.11.0.ebuild 1241 BLAKE2B dfe98b43b84c7935f5a16d47fa17783e954a40ad2a9f6b32f590c4fc0d15b344de9ad2307b2a56972ec610162cf2099c3aeb0be1c3bd7ff24bca997f0e00d42a SHA512 bbaf5e53a6661d262819b709fbd48a5812d9eb29493ecf57b62b1e3cdf7b8e5c07b7eb6680d7090f1978fa3016b2d0d3857902a6371cbf8a1b0e0c8c275521a3
-EBUILD mockito-4.8.1.ebuild 1262 BLAKE2B 0259b22d77e6797152c0a593366a2b0988bc09e4aad074c25a1905d3cbed45f5665a8be8d0038a3e316c9c974acba1714b29aaf26f3fee8743f389d07172481f SHA512 e79d057471a3daf6912d05d2fe82bc92ccfd34e32113ef1798728911cde926363163aa433bab0afc45d41a27840c3812738cbc9bb19d48e68bf5f9d51c94dfc4
+EBUILD mockito-4.11.0.ebuild 1237 BLAKE2B baf80f24433502cae15d281ca1f2f020c22c3dd82d8a4e0068ceb6f82e0c336b2b6fc65ea77e3eab305c3402d73326886d8a166de38c2b67a5a5c121ff6d1fba SHA512 e23720020cfd5047ae59927a66dc8d2a709b50f47b71035493e06ec1fc2b83dac08bbdacd06fb131d610047e7f55f91cefcff1be28ec8b65f08407b2eb1647a5
MISC metadata.xml 317 BLAKE2B 209b27a429c1fdeca71c1e215f8fc43bfc66c961b1a3ad3dfcda16d5ea1df51e54cea248f4f152966aa1f91059b91c21fb734c6995f8033150dbda5e1813d121 SHA512 1f7be64d432b4004d2bbf1ec2c6776ec8618875356ea0308b8409f322d48bf3440d692732406ddb3fa7a273c9754c4cc5a6f6cd9808348d0ba8beb7159887a5b
diff --git a/dev-java/mockito/mockito-4.11.0.ebuild b/dev-java/mockito/mockito-4.11.0.ebuild
index 1be88cd752ec..1327aa6b7fa7 100644
--- a/dev-java/mockito/mockito-4.11.0.ebuild
+++ b/dev-java/mockito/mockito-4.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/mockito/mockito/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CP_DEPEND="
dev-java/asm:9
diff --git a/dev-java/mockito/mockito-4.8.1.ebuild b/dev-java/mockito/mockito-4.8.1.ebuild
deleted file mode 100644
index 91e98b36fd76..000000000000
--- a/dev-java/mockito/mockito-4.8.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Tests not enabled, wants junit-jupiter.
-# "${S}/settings.gradle.kts"
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.mockito:mockito-core:4.8.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Mockito mock objects library core API and implementation"
-HOMEPAGE="https://github.com/mockito/mockito"
-SRC_URI="https://github.com/mockito/mockito/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CP_DEPEND="
- dev-java/asm:9
- >=dev-java/byte-buddy-1.12.13:0
- dev-java/objenesis:0
-"
-
-DEPEND="
- dev-java/junit:4
- >=dev-java/opentest4j-1.2.0-r1:0
- >=virtual/jdk-1.8:*
- ${CP_DEPEND}
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CP_DEPEND}
-"
-
-S="${WORKDIR}/${P}"
-
-JAVA_CLASSPATH_EXTRA="
- junit-4
- opentest4j
-"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_AUTOMATIC_MODULE_NAME="org.mockito"
-
-src_prepare() {
- default
- # dev-java/byte-buddy is built from byte-buddy-dep without shaded stuff.
- sed \
- -e 's:net.bytebuddy.jar.asm:org.objectweb.asm:' \
- -i src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java \
- -i src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java || die
-}
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:.*<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.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
-}
diff --git a/dev-java/scala-cli-bin/Manifest b/dev-java/scala-cli-bin/Manifest
new file mode 100644
index 000000000000..310a237eb985
--- /dev/null
+++ b/dev-java/scala-cli-bin/Manifest
@@ -0,0 +1,5 @@
+DIST scala-cli-amd64-0.1.20.gz 32520802 BLAKE2B b032e7ed3c5e340e03bbddde6b00289da7f7a7017266cd6f6b1500540a5c81d453180a88e11b3590a26e2188cf2206ac6fa4089b9f85cfce5745a7b15a5b44ee SHA512 a08632992fb9bf811f88b267ef587de673a5f59b5ba0e1d6b49aaf4057328cd738519afeb7f76a96ef569376b3d34dc11f4891729b5cbd900b0d8b348a0f3566
+DIST scala-cli-arm64-0.1.20.gz 32342696 BLAKE2B 54189891dce54d09869e5a0800683cf53e5613bb9ac74c137dbbbbdfea4e06f4a35dad07ec97db81e69a9fd704b1f44bda8b7466bdddaf9fdab07ca0a051d91f SHA512 040d287566f06b4d14a58cd9340ac15d8afa124d536053c0ee13db6d64e463162f7f2556004d593381377cc73b3a9075ee688937de4591fe6aa4a5cfe5121808
+DIST scala-cli-non-native-0.1.20 9239916 BLAKE2B 15d45ecd9b20cb5184626bd518b373e4ba12948b6fd14c11a55923118aa0e690ec0ffadd64c613a206555c3e2fbb580339c8b3cf3b9e039aea04551d5ce4f238 SHA512 1f7c8d22ae94bf79cd6d139ecbf4d73e2009a3ad727404051716e531271e01c31b252174e9b039bfcffa997d6ab9f18f0e30de7834de8f92ddbb0ad140a572e7
+EBUILD scala-cli-bin-0.1.20.ebuild 1612 BLAKE2B 4ea600f7a807c946782925ba0c0e42f27472eb4b9be844f14611defbf12a051bfc6550f69d17b621d5a195373864a76c93507b955ee1a982900f2d2febe474fd SHA512 9d5e7978e7de708104eceffb0044de24720e5f49487107ff5cd0e7502f7bac75017400c4abc3e17e90132fe30b75806d643fccc58f99c9bb50eb70aacf2acd55
+MISC metadata.xml 398 BLAKE2B b9b93abb74284cfbf4adfdf5d78a62dc6d21fa9e33c36d65842aa225b499f2220fed94648e4422eed5ae9f3c93123aeb68965783f3980a6c046168b3cde3657c SHA512 94e42c3c3b2b4d0b0092dce77a564f5e96617ab74aff3fa1ec89344c4d787f06ea8ff3ab6245440c228aa9c7018c96e2e740417dafc1699124f72b0235aed11c
diff --git a/dev-java/scala-cli-bin/metadata.xml b/dev-java/scala-cli-bin/metadata.xml
new file mode 100644
index 000000000000..c4efbfd85748
--- /dev/null
+++ b/dev-java/scala-cli-bin/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type='person'>
+ <email>flow@gentoo.org</email>
+ <name>Florian Schmaus</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">VirtusLab/scala-cli</remote-id>
+ <bugs-to>https://github.com/VirtusLab/scala-cli/issues</bugs-to>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-0.1.20.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-0.1.20.ebuild
new file mode 100644
index 000000000000..c2bab1ad0205
--- /dev/null
+++ b/dev-java/scala-cli-bin/scala-cli-bin-0.1.20.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1
+
+DESCRIPTION="CLI to interact with Scala and Java"
+HOMEPAGE="https://scala-cli.virtuslab.org/"
+SRC_URI="
+ !amd64? ( !arm64? ( https://github.com/VirtusLab/scala-cli/releases/download/v${PV}/scala-cli -> scala-cli-non-native-${PV} ) )
+ amd64? ( https://github.com/VirtusLab/scala-cli/releases/download/v${PV}/scala-cli-x86_64-pc-linux.gz -> scala-cli-amd64-${PV}.gz )
+ arm64? ( https://github.com/VirtusLab/scala-cli/releases/download/v${PV}/scala-cli-aarch64-pc-linux.gz -> scala-cli-arm64-${PV}.gz )
+"
+
+KEYWORDS="~amd64 ~arm64"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+S="${WORKDIR}"
+
+# A JRE is not strictly required if native images of scala-cli are used
+# (amd64, arm64). However we may want a system JRE anways so that the
+# chances are less reduced scala-cli needs to install a local one.
+RDEPEND="
+ >=virtual/jre-11
+ sys-libs/zlib
+"
+
+QA_TEXTRELS="*"
+QA_FLAGS_IGNORED="/usr/bin/scala-cli"
+
+src_prepare() {
+ default
+
+ if use amd64; then
+ mv scala-cli-amd64-${PV} scala-cli || die
+ elif use arm64; then
+ mv scala-cli-arm64-${PV} scala-cli || die
+ else
+ mv scala-cli-non-native-${PV} scala-cli || die
+ fi
+
+ chmod +x scala-cli || die
+}
+
+src_compile() {
+ for shell in bash zsh; do
+ ./scala-cli install-completions \
+ --home "${T}" \
+ --shell ${shell} \
+ --env \
+ --output "${S}" \
+ > ${shell}-completion || die
+ done
+}
+
+src_install() {
+ dobin scala-cli
+
+ newbashcomp bash-completion scala-cli
+
+ insinto /usr/share/zsh/site-functions
+ doins zsh/_scala-cli
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-05 18:32:06 +0000