5 files changed, 85 insertions, 3 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 4533bdf83cca..a9b296212251 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest
index 1f5ee60e7855..3fbdf72de14c 100644
--- a/dev-java/bcel/Manifest
+++ b/dev-java/bcel/Manifest
@@ -1,4 +1,4 @@
 DIST bcel-6.10.0-src.tar.gz 1085294 BLAKE2B d2d3a0824ec45a5f47282a7255915ba0c891d5fc20ee37f4bba3b8ca5e8b61f6bdf47ed8903e60dbb96d253b8df1d79761888227880d44444f8b7fe24dca0853 SHA512 7ea129a048bf510ed15212a17680dfa37fe8c4adcc75504fa9a6ff35ef97d25f267547ad019fe146cd2fea9a3ef0eaca432d4c9cac7570ba5e68897f21c29a14
 DIST bcel-6.10.0-src.tar.gz.asc 488 BLAKE2B c575c3f68f06538dc8d34dccf6dd157824b6ecf8b7a1f0a220fe1828a1546ecfb46699f1374c9dd90bf89d9b311ce48f8d4b9e45818764d5f078817a17573557 SHA512 a19a5a6702c9d8d38733af6d983da6c60dac910f8ef3f4c6daae8e6ebe7bdd0ccc9029bad7af78984979e62cdc63d50e6f3a4ef02f409212fde1479465901863
-EBUILD bcel-6.10.0-r1.ebuild 1460 BLAKE2B e94d48a6405f7dce6909f68dc539d7558974524f44e5ed3b167ecbf610d121b1c4813f745a2f0f67825b57266df22fe06f369d71106193d392bd24f88c7bffda SHA512 f8d2d25967e02ed079f9fe10baab7fcb3608df42e25c59760c4489bf948b000cdb0d1bad9376855b9e18826edfce6a35939522077c0d7b0db218ba1f77aa9cd7
+EBUILD bcel-6.10.0-r2.ebuild 1469 BLAKE2B c6a4377eb8ddc9ef443a5bdb534ffeaa2f1ef5e4adaeddfe6442da407e3b66d050481f286445407b2657407ddbedd3870308cc1e7746ace32712d0d07d1aa08c SHA512 3cea131e8e7824cc0e4658561653bf252fd2f35f2314bb14f041b03f5e03e86666d71d0fefada8cbc26f5e9c76a260372d1dd70c2d6cb9b692f5ee73ec1e5018
 MISC metadata.xml 897 BLAKE2B fdd417f23c2717d0ff95cbf4decc58768b60710baa803f71c956a3fb4c5049fd83b14679f0ebdb95185f3212541706e2b598617e2a61d6399cd254bd66d031a2 SHA512 99ea77ae905471f571c87a43fd9e8621ea169cf2b41bf3025fc2ecf2e4eed0088c6cc6cbc5c5d756f9083b9c6b11c2f8d0cb05090dcef9f69a797f6c887cab57
diff --git a/dev-java/bcel/bcel-6.10.0-r1.ebuild b/dev-java/bcel/bcel-6.10.0-r2.ebuild
index caf9bb70691d..8a75e26ec9bb 100644
--- a/dev-java/bcel/bcel-6.10.0-r1.ebuild
+++ b/dev-java/bcel/bcel-6.10.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-s
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
-CP_DEPEND="dev-java/commons-lang:3.6"
+CP_DEPEND=">=dev-java/commons-lang-3.17.0:3.6"
 DEPEND="${CP_DEPEND}
 	>=virtual/jdk-11:*"
 RDEPEND="${CP_DEPEND}
diff --git a/dev-java/scala-cli-bin/Manifest b/dev-java/scala-cli-bin/Manifest
index 8bbba965cb06..44a0a4ce676f 100644
--- a/dev-java/scala-cli-bin/Manifest
+++ b/dev-java/scala-cli-bin/Manifest
@@ -1,9 +1,13 @@
 DIST scala-cli-amd64-1.5.1.gz 34375992 BLAKE2B 4af5f420df9ef15e4252bc65dc17b3c9df516e784cf5d5e48cc93686c6a068e13b5098c552d8c9155739eb56cecb7e410289025f3281135b9d7d4cfc5e0d5cd5 SHA512 0adcc503fd7de00d0df97c5c31c7fca18e6ce4e6f91b8a07ae4f94107b289f7301513d22ab6ab06f74a956b0ceb648cd487105ab5289c477c52287466e1d6e45
 DIST scala-cli-amd64-1.5.4.gz 34280702 BLAKE2B 9bbfa286a66bfb41dce3222496a302b30f45c021cf2c82a3657c4de786f91ce79b4c551213bbaa4cc3ca34b289c9c440203aeb65093633f79df538881c5cb08e SHA512 bc905499117e24b78c5beca91fb4cf34063c2bb48000b920c085346ae11db15b9c0905ec6846794ac706bd06874130e8981a2f5ff4a47f5f93a1238e530e3709
+DIST scala-cli-amd64-1.6.1.gz 35539155 BLAKE2B 1d14e282f15cebc9c06de5ea5f0921b1d447bf1a04c68c95c85be722c7e9f58317c9d3853720535f1870908acb31adaf02052c25bb87f8d1c9bb4120b8f49dfb SHA512 2fa202fa026db619e454e863b4e9a3d32cffc0d6c2921892bcfdb3c05a5dab7821778f9472e9163149d7180c0e032761a05fcf8cabe0af28bd887c3af9d256e8
 DIST scala-cli-arm64-1.5.1.gz 34284162 BLAKE2B 1db3c49d52a47ab276600d6e29179a920256ba56262cac0368dd8e8ddfd6f1b570a5124b64bc4005a7212801ad8615997a3f91f807e878a989e1359d053ea10e SHA512 026cfde5c108df8d91acf3394a53dfb49a962cd6ac1a1be78c4601afa4823d410205ad147bb8830b17923d209a0333d75b50dede1a00208081f64928e4198364
 DIST scala-cli-arm64-1.5.4.gz 34215069 BLAKE2B 0e54f4580a5c28c8992ca48ed96e5d31104016320060c2e56c1687267211b03401ed3f5486138f80abe5349bd218bf86966c9f57d44240aa6a2416e7af52f797 SHA512 ad90eb6436f1d82d9625cce250fc5c8d614dab9d9918dd8243993a5df6648f91f4969df96ead50774cf9712d22f161a5852ba47746f89b27f8225850f3f3395d
+DIST scala-cli-arm64-1.6.1.gz 35436163 BLAKE2B 25a51bdbf394ec54230180c27e7835b2855d7694ca05e630464da442bfe0c25bf54afce96ff7bfc59dbb11d3e6e74d83cb79582cb76596eaf23e3acd6804cf18 SHA512 91eec12f9347517da2f3bc4d971cbd36f3edb03148cb815f5140df17069e3ecdc9879b10497e9e77a607b4f0a7530384c5aab82bdaef0c25f2d1e49190b1e2c2
 DIST scala-cli-non-native-1.5.1 8105280 BLAKE2B 2957eeda0c27f6c91de9cb36f103d5f9bfdcff5110e8c5b51c6067c756c1592f6e5e94f59b9471260bcd50369f50874ca6901466e4bc2e654e51c3666763620e SHA512 600b66c8db534f6e04c8a3ada969b998bb5923e9ec2322dc1919032c4221bfb3c259dda7abdf7f862d9693d4658fedef607d6a85094d1e6c6ed7f4655d9a8146
 DIST scala-cli-non-native-1.5.4 8122943 BLAKE2B 10e3ef02dcdc72e3d3ca0de693242d82ea18fc6358c955a71be77a0086bd6f67ec7ceddabb1746a00f125a55a0bad2800d54dfc0d94fc53cbd6ffb8ae185f604 SHA512 f0068a4b7f338b5fd59020270a2fb7bc15773bee3fb12a52311ef3b587e2ceb7f3cbe81480d2198e68f3bb1997f2861ddd90f89a7c7bc0c153d4f541075fa6c3
+DIST scala-cli-non-native-1.6.1 8213824 BLAKE2B 9c9ab64d9d92b4d0a8a1d4c61c2c5e467506becc39a3108a0adb374ae1efe437e6ea9e081c9dd52b7b9b26536bea44baccda7cf0f92853f58803de48246e4ea4 SHA512 8ef63305a15a2f34cb7c331c4fa3f8741d4086c7f2a9149460883027d4f98d13de802a6b2da236a2a5eb928e97c4ef7d3fc2d45fb33e2a982bcf7ece568f791a
 EBUILD scala-cli-bin-1.5.1.ebuild 1818 BLAKE2B a4d6474f97c3b2d541aa34cbfb38ed46b2f7fcf5c7c846cbc267bc4166a8253461b5492efd40774ef66561547b09d331a4d65e4b43ab367e7d30ed0edf1005b8 SHA512 fa372922a0f21402badac4d0c796097fdef48b0db43e56a4a31d7131b794d25c32301acfdb333821c9ea5ecdd9a6e206632037f76d7f7aff9d892e8ece25dcca
 EBUILD scala-cli-bin-1.5.4.ebuild 1819 BLAKE2B a6c864c6973d3c525f92f9039b403f3e1d8046ec261da70a039c11bf33f434fd14804f931389284a4eb2ac35fa62e403314c2101def1bf384c6bb45aadff38f6 SHA512 5e4f083d624c7dd239f89136673b41c09404af2a63d83374f964bcac2204c9252d12863a4674daf357b59fafad4cdee2c25d34ce0f5d06bd30d124648f525359
+EBUILD scala-cli-bin-1.6.1.ebuild 1819 BLAKE2B a6c864c6973d3c525f92f9039b403f3e1d8046ec261da70a039c11bf33f434fd14804f931389284a4eb2ac35fa62e403314c2101def1bf384c6bb45aadff38f6 SHA512 5e4f083d624c7dd239f89136673b41c09404af2a63d83374f964bcac2204c9252d12863a4674daf357b59fafad4cdee2c25d34ce0f5d06bd30d124648f525359
 MISC metadata.xml 471 BLAKE2B 651dc485aacabfc581d9f5d5ab1cf524601b38fd2024113fbd8986090131e6c458db3c2d9649e9876df74f0e7471cdc66c8f1307ed71baa18508754143c10411 SHA512 6906a09bc65b6d1887a9a17d9be2e7afc990ea017439cad751fcfee806df0c456006473141b69f52b5373227cfd6e2f66e7750903d4bd9736f40d6c93cbede4e
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.6.1.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.6.1.ebuild
new file mode 100644
index 000000000000..8265419c2174
--- /dev/null
+++ b/dev-java/scala-cli-bin/scala-cli-bin-1.6.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2025 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
+	)
+"
+
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+# 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
+}