Adding metadata

8 files changed, 114 insertions, 4 deletions

diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index b29ac74f149d..4ff9d152af82 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -8,4 +8,4 @@ DIST gradle-bin-7.6.1.zip 165594858 BLAKE2B 623ed41b7e0dfbfa015578c6915ca382cb44
 DIST gradle-bin-8.0.2.zip 167671533 BLAKE2B e5cb4bef61ea89cfbf42c72c14e739f049b4930521dabaeb88fa6e2fffec81d6ee6514b615a6c1732db3bad4539e72ebbbeeb37b2f22a72fd2d2e08f7bf8d1b8 SHA512 70f114e353ec3e114b003e733e21c47fd26d2777363d015872aa9eab73c68b3186f77698aa1d72d4f4eedb2c53b0cd47a98f26ef5f0a9b2c1e42c6c877cca80f
 DIST gradle-bin-8.1.1.zip 168381151 BLAKE2B 334727108ccfd374daaa91c363ebf10d8b13e00c61fe14e097b3baa5bb8bf0d2fdde509ef4ac0d90db1fd075c7552a0f7ba90b67d549e45a3c1cb37d036ae000 SHA512 185a831dc37b946e348f9d98ff88eefaad303cdb385d45a5f65c401dd51d4d0c1225d8d716e7345167e53d41cade2bf3008bbde1d66a18d9a4925a589853b598
 DIST gradle-bin-8.2.1.zip 193042584 BLAKE2B 10381d2601c707c6a391fb515e753d583eec0d7e89213fef690df4259aedbdde0ea8981e474eae5c7b21ff12d621897158271c5e2ee964190bca02bf6882c237 SHA512 a3d05873460c4045e2b43c41e39120b444ad5896c6561104ccf8cca4e58fa95bd512e356faa3a507b0e3c4212548002ff02845791dd42518635f4bc6ae67475b
-DIST gradle-bin-8.2.zip 192887359 BLAKE2B 50fdedd1062410f4d8de3efa0dfef6d8be6f590945c8f93d802ea3328db070c00a9dcb35cba32a6976f904583a5b839e0840125ada995f2b3dc9c05b8c8123d5 SHA512 df86810d6038a924c7e9e70ca8be61b4f0b7b047efaeed4af5693f144488686e7c77874b800789b35ca37114c00bcc6b6f7a293564b32991d72876d32d9cbb1b
+DIST gradle-bin-8.3.zip 200258206 BLAKE2B f9909266e2887971f2f7480dbfe441c040fcd2ae12146bd9393d0836bca48f931124e60a1095d79ba6b172136ebb1734976e28d255aa3f16a22125a2662b80f1 SHA512 c328b597ff0c28b8071c050b6f1e57bf3eccca4d0eaeda0974700fc2d380667aca2e1a7b3548314519e99b7a823ede4c83a5786147a6a002d081920afa9c490b
diff --git a/dev-java/gradle-bin/gradle-bin-8.2.1.ebuild b/dev-java/gradle-bin/gradle-bin-8.2.1.ebuild
index 6fceca3ae5c8..afe46bd7d1c6 100644
--- a/dev-java/gradle-bin/gradle-bin-8.2.1.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-8.2.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.gradle.org/"
 
 LICENSE="Apache-2.0"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="app-eselect/eselect-gradle"
 BDEPEND="app-arch/unzip"
diff --git a/dev-java/gradle-bin/gradle-bin-8.2.ebuild b/dev-java/gradle-bin/gradle-bin-8.3.ebuild
index 6fceca3ae5c8..6fceca3ae5c8 100644
--- a/dev-java/gradle-bin/gradle-bin-8.2.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-8.3.ebuild
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
new file mode 100644
index 000000000000..135c5a1ae8bf
--- /dev/null
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
@@ -0,0 +1,25 @@
+|Original version of this patch by Ralph Sennhauser <sera@gentoo.org>
+|Updated version for 3.5.25 by tomboy64 <tomboy64@sina.cn>
+|
+|Added in 3.5.4, make false default for Gentoo
+|
+|* Add a new wrapper.java.command.resolve property to control whether or not the
+|  Wrapper tries to resolve any symbolic links in the Java command, specified
+|  with the wrapper.java.command property.  Historically, it has always done so,
+|  but some jvm started applications like run-java-tool on Gentoo will fail if
+|  it is run directly as they have a check to make sure it is launched via a
+|  symbolic link.
+|
+# https://bugs.gentoo.org/878869
+--- a/src/c/wrapper.c.old	2014-07-21 09:12:55.000000000 +0200
++++ b/src/c/wrapper.c	2014-07-21 09:13:22.000000000 +0200
+@@ -4908,7 +4908,7 @@
+     if (!path) {
+         log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_WARN, TEXT("The configured wrapper.java.command could not be found, attempting to launch anyway: %s"), *para);
+     } else {
+-        replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), TRUE);
++        replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), FALSE);
+         if (replacePath == TRUE) {
+             free(*para);
+             *para = malloc((_tcslen(path) + 1) * sizeof(TCHAR));
+
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r1.ebuild
index 261d3bf92668..8fdfe9ac2063 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r1.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
@@ -33,6 +33,10 @@ JAVA_JAR_FILENAME="wrapper.jar"
 JAVA_TEST_SRC_DIR="src/test"
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"
 
+PATCHES=(
+	"${FILESDIR}"/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/dev-java/scala-cli-bin/Manifest b/dev-java/scala-cli-bin/Manifest
index e30121ff63d7..92c26e89820e 100644
--- a/dev-java/scala-cli-bin/Manifest
+++ b/dev-java/scala-cli-bin/Manifest
@@ -1,9 +1,12 @@
 DIST scala-cli-amd64-1.0.0.gz 33061895 BLAKE2B 9261617e7f9ed15ce8294eedcec2c81ad60d72b83663fb97559fa68b3578706637316e0e58966d690e64147743dcdf81e3e1f41d6bb9ebf55414e316370d7ec1 SHA512 6a37fae85faa2965ea816f2a72e89300e66bdd3ef741ba5bff575a8127255866822575b3708d2bd63d89f4a812d368bc7796494c90def8c2498f956e4b229264
 DIST scala-cli-amd64-1.0.1.gz 33066567 BLAKE2B 6f03e9f825b901344de61ddda2df5b899f99ce5c5b7ce64e5db3aa81b5c35808e50f3cae453554dc567fb4e1801ff6accc186480a4a9813005b8564558315ac6 SHA512 a9a51320e160692b49cb41637a89aa1adef89eab6c4cebe19cb7600b9b7fae963f9b9522b6d77a9b2d845ec652ba7533b6090a42b3383725ce56c6e7f32512e7
 DIST scala-cli-amd64-1.0.2.gz 33215510 BLAKE2B 288475cbd346260423188b4db038dd8cce2f5885bf0346e8a74b08cd02a2c44204fec37aaf6207ff6447beb4740df725bae6a0a129682ebedc1028ae5f0ec316 SHA512 ac18b43bd37717b2aab6b1056b727aba40f57eed33d1fc5f1903c3729f0344ed30ed595f2a60bff2c65ee3a6d4439e8ee4bcf95fc38baf059d4a66de9696cded
+DIST scala-cli-amd64-1.0.4.gz 33291617 BLAKE2B bd97626e7e95fb6b2a82fd424673078b89f5f4270087c667193e4de1ceff614076e73b728ba1f0334d5f9d7aa6f52c660487d52bf8fb49a786f7fe4ce18a0428 SHA512 447acafd47041cd173a06b5d113cd30adee76a2c161b2efc98b8ece60082d5b98189fd9b3da1f048061d306343cacb9b67566daa78ce8fe54dc82dd90a1e34bc
 DIST scala-cli-arm64-1.0.0.gz 32902399 BLAKE2B deff1fad9204572aafa8da88cb368d85e0ec39a51d71b00eed0a1933ea713cbeafd1cff3ec882eb32283770f1eb741e32969fa1e75aa46a6b6aab542a5d23447 SHA512 e6020c305d8ed06f8531994483079ee095f0d2bd9a0095ec417929620ee3e6a45507214a6f68756b70518af20d53e64b531793bb940872921302ad4f6566972c
 DIST scala-cli-arm64-1.0.1.gz 32915001 BLAKE2B db6e34f3534c3ffb873000893c0b07df26d91710b6de0075669fbf51a0f238303c77e7953a890eb50eac54087cf2ac77e916d3e1765b7e2b7de1145e0b1d605e SHA512 90a1c550e898b429ab8bc3722a40cb90752d7ee9c41fd61018f58d761704b5cd8b8b6b3381e3f7c3a9b3e7fffabf9b46bfa8cb4336604392b6443c1554f6482f
 DIST scala-cli-arm64-1.0.2.gz 33058672 BLAKE2B a82b18eec6235100cbbd7ff1503283e5ef29ba0798f67b44f69b329aa0f1f525cc910a7b4a923f98c8b113d06bac6e1c5ba963d62204462635ef4eed3d0b7f85 SHA512 b1dc9de26d30336f283202aa23ba1c76baddcea21d4c8c4c0e5114de979c62ba3e2b483302d4f396c84e802497127a36d589dae2826f76e1d02760314f6f0765
+DIST scala-cli-arm64-1.0.4.gz 33185346 BLAKE2B 2b0131a56ed3f67fb5d5f25db6c511dc7d9e9128089e6826fa7d859b1457f03a99e290cc63f185820ea849a857f40d667d5db7a378dabcf545cdcdefded6a577 SHA512 3ff1c025a1035aa6a8550de17e85bc5c483007d5f07f03e0d792d6dc9ed1b18eb26909b3c7195fde12056a3b84ffa69dc53c01ec21b34187c1d7188a0a023aaa
 DIST scala-cli-non-native-1.0.0 9540019 BLAKE2B fd7c920216fbba76be116cac2a2439ee0f983dbb1811e60a7095611b75bd1af86e8597f74dab4e994f3dd73694e2c93b910f9162e0fe8d4c8ada3f0012fb8b35 SHA512 6e09be3adf75f957a787b5cb5031824892d0606742ae12988b008d0fab1c743f2dff7169a547d77795af78679bde051a8f457284f339990bb343807e47005499
 DIST scala-cli-non-native-1.0.1 9554667 BLAKE2B bac0d8b61cf2a14386791dd27cf3ebfbafccfaec5e13aa223d41bfd6ee30c3f1252ba903e2cc0434920633dcfa3c35e67f647f10713956f8fd372899b301562d SHA512 54029ad8ade9fffc8334ffedeaddd604ac75027447b0d7835db318909dc44946dfb039e0dcae4c3da8349922ee9af65d0d7cef389fdae2d11d5cac7d900e7504
 DIST scala-cli-non-native-1.0.2 9633113 BLAKE2B d63fe324533393158ac945c3070843787c844584c3f8bdc141f6106fa22adf244c2ca5e010801c549b0a56ecf500495c754ed9e6186f74359b373c4d776645ff SHA512 c6e6262af236a315960a3d16dfebc7adaf88f830d43e68f89220f2cf250d57d083bd2b9231fd13a0b3adc723ed17200592b55a2a17ccd582b9cc3ceebf52a29b
+DIST scala-cli-non-native-1.0.4 7553232 BLAKE2B 9299b20dddec80d12e738af4b283e816de5bae23262510146cd33a9b175f2a343f52932fbd3254974bd4219d2903f32772409f234423d3a027b6b0f02268e584 SHA512 4e5281ef7f8a886ad79746477d852f485ccad317568a64ee513e691dcd9a9121c2aed51f6170b959f0226fb81efe9aa1f8ecf1d94a84a0b387c349adfb756762
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.0.2.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.0.2.ebuild
index 10fc71222c73..67f4eefef2f4 100644
--- a/dev-java/scala-cli-bin/scala-cli-bin-1.0.2.ebuild
+++ b/dev-java/scala-cli-bin/scala-cli-bin-1.0.2.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 	)
 "
 
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.0.4.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.0.4.ebuild
new file mode 100644
index 000000000000..10fc71222c73
--- /dev/null
+++ b/dev-java/scala-cli-bin/scala-cli-bin-1.0.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1
+
+UPSTREAM_PV=${PV/_/-}
+UPSTREAM_PV=${UPSTREAM_PV/rc/RC}
+
+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${UPSTREAM_PV}/scala-cli
+			-> scala-cli-non-native-${UPSTREAM_PV}
+	) )
+	amd64? (
+		https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-x86_64-pc-linux.gz
+			-> scala-cli-amd64-${UPSTREAM_PV}.gz
+	)
+	arm64? (
+		https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-aarch64-pc-linux.gz
+			-> scala-cli-arm64-${UPSTREAM_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 anyway, and having JRE
+# in RDEPEND reduces the chances that scala-cli needs to install one
+# for the user.
+RDEPEND="
+	>=virtual/jre-11
+	sys-libs/zlib
+"
+BDEPEND="!amd64? ( !arm64? ( >=virtual/jre-11 ) )"
+
+QA_TEXTRELS="*"
+QA_FLAGS_IGNORED="/usr/bin/scala-cli"
+
+src_prepare() {
+	default
+
+	if use amd64; then
+		mv scala-cli-amd64-${UPSTREAM_PV} scala-cli || die
+	elif use arm64; then
+		mv scala-cli-arm64-${UPSTREAM_PV} scala-cli || die
+	else
+		mv scala-cli-non-native-${UPSTREAM_PV} scala-cli || die
+	fi
+
+	chmod +x scala-cli || die
+}
+
+src_compile() {
+	for shell in bash zsh; do
+		./scala-cli install-completions \
+					--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
+}