7 files changed, 60 insertions, 83 deletions
diff --git a/dev-java/coursier-bin/Manifest b/dev-java/coursier-bin/Manifest
index d8d59c15783b..a8c781924e73 100644
--- a/dev-java/coursier-bin/Manifest
+++ b/dev-java/coursier-bin/Manifest
@@ -1,2 +1,3 @@
 DIST coursier-bin-2.1.5.gz 20679081 BLAKE2B 8ab0d971949b7a5527c82686fab9d62f6dc360ce7ff72bfc4d5a123401e577f17b2392e9a919aebe1c988a477a273d77cd3eb86dcb7b73c0c1a609cccac77eea SHA512 6397f13f82c91079575f58ccbd35e788a2760179cf5c11a986962e3bbe9c669b6e06730a6ff12e0aeb26198df4448e822e927a5d6bd031f67dab8072835979f6
 DIST coursier-bin-2.1.7.gz 20790038 BLAKE2B 6e362ae784fcb7007f0adc58604d72dba33cb37f0726883b69f9f298e38759e3acea0232edac30c7cb34c5b837598e6b2c0947345938bce196f7a326a4aa3f0e SHA512 b6df4d7ad89f735989dfb4bb8cacbdf1559dd5ea4f494b7e72df544bd24a3a208738cf37d1cfd7944bb6aebc0e1b6d32b1bfd48c9f333cf54919a055afd5348e
+DIST coursier-bin-2.1.8.gz 20863902 BLAKE2B 13ce0a1aa6dd2c1272567a76f3a762e31d9d6794e034e033d5d5accd0b6c534702fc62b5cab83070bb1081c7072ad7a04be86c38b4929d75f2d1f050f320820d SHA512 9cc8f13ecd0c166d46aaeeedb9279eb2885a7edac24c5b106ca30968c4c6fc5f47efe3a38e7aa6864dee517a7bc2cfba71fdd32741d295887bdb62594832bb9e
diff --git a/dev-java/coursier-bin/coursier-bin-2.1.8.ebuild b/dev-java/coursier-bin/coursier-bin-2.1.8.ebuild
new file mode 100644
index 000000000000..af4c8329d0bf
--- /dev/null
+++ b/dev-java/coursier-bin/coursier-bin-2.1.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+get_orig_coursier_pv() {
+	local orig_pv=$(ver_rs 3 -)
+	orig_pv=${orig_pv/rc/RC}
+	orig_pv=${orig_pv/pre/M}
+	echo "${orig_pv}"
+}
+
+DESCRIPTION="Java/Scala artifact fetching, bundling and deploying"
+HOMEPAGE="https://get-coursier.io/"
+SRC_URI="https://github.com/coursier/coursier/releases/download/v$(get_orig_coursier_pv)/cs-x86_64-pc-linux.gz -> ${P}.gz"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+S="${WORKDIR}"
+
+RDEPEND=">=virtual/jre-8"
+
+QA_FLAGS_IGNORED="usr/bin/coursier"
+QA_TEXTRELS="usr/bin/coursier"
+
+src_install() {
+	newbin "${P}" coursier
+}
diff --git a/dev-java/mill-bin/Manifest b/dev-java/mill-bin/Manifest
index 958c591e5812..8a7f956466f7 100644
--- a/dev-java/mill-bin/Manifest
+++ b/dev-java/mill-bin/Manifest
@@ -1,2 +1,3 @@
 DIST mill-bin-0.11.4 61557418 BLAKE2B 712ad3df280f38b01a617fbefafad50c9c87af74ef618b8ab4e8fa8c066089087966230e005eaca55d56c1242e6380278a5fb63efc9d2438b9b0d549605dc17e SHA512 601eecf62f9f6651ccd874b02a16ff0f451b1b60861341a61e78e11d813cb1d5a938922f77942282f388b6497c6eadd4d972d1c237cdadb1b8aba3975e29050b
 DIST mill-bin-0.11.5 52760276 BLAKE2B 1583403fba8782d759a5d56513e2d40cd81ffb68d4947b638052cc6108d6d6516f7fc16e9cf516fc7c2c60820d2d6fcb5c15179bcef715c6d75f25c6802fe711 SHA512 673d636fc64fff01289ad642f2f861f6da18d3e652cdd645e3d2487daf1baf4616515e31540a03f67dbc354efff4f48a6881e1ceecfb966eb24d7675abb6dff7
+DIST mill-bin-0.11.6 52778046 BLAKE2B 5f05b14cafba4e6b40b89572310a2b06ddbf1839a2da0dbdfe73a63606c9b1262fed686f7ffb17dc178072242136a4b334a2ae89b2fdc7274bffee928ff3c5fe SHA512 9f187b00d37f8d0bb97b7cd08c57e59e081c835e25f83e6c65bf2ca425f4325a6c641f7082ef700dac30ab6d4f59da5492136eeab21c898f11a259b89d55e9b8
diff --git a/dev-java/mill-bin/mill-bin-0.11.6.ebuild b/dev-java/mill-bin/mill-bin-0.11.6.ebuild
new file mode 100644
index 000000000000..5b24c097e25e
--- /dev/null
+++ b/dev-java/mill-bin/mill-bin-0.11.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=${PN%-bin}
+
+DESCRIPTION="A Java/Scala build tool"
+HOMEPAGE="https://com-lihaoyi.github.io/mill/"
+SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	newbin "${DISTDIR}"/${P} ${MY_PN}
+}
diff --git a/dev-java/scala-cli-bin/Manifest b/dev-java/scala-cli-bin/Manifest
index eca9b100ba3d..758e3450f50b 100644
--- a/dev-java/scala-cli-bin/Manifest
+++ b/dev-java/scala-cli-bin/Manifest
@@ -1,9 +1,6 @@
-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-amd64-1.1.0.gz 33673708 BLAKE2B 332f5a974949af49914de8fdb3129b0937fbce842616d6fefe16f7aff89baf6be1ba536d0ee6ff9bc1dd2b5ebfa51943bd0c6279ef83b95bd25a337530fa1295 SHA512 ba7ebb321a27e95f786027257c3f50dac1d12e0cc33abde24dc7c5dffb2f57a11c3ea67d92ed487968c49ff9ec3eaf5d1d62065beda5b6fa373d09b9126f4529
-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-arm64-1.1.0.gz 33575885 BLAKE2B ebccbe86044b4708a356060a16f06bb94df01d261ab7dabe8eba8e644c121864cdee99debf95468d936cbff670413ec47e1ef903a9071b267a61c5fe46738c1a SHA512 6a85529be06a8d43d729c5a795bb0dcdb2680bd7ef3de471fee908e91249401262e8322019c640d4eb45d0a15ed0073ff51b24d61846228f46c36bfb48731408
-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
 DIST scala-cli-non-native-1.1.0 7728727 BLAKE2B 05deb93b91029721a21bac729aa9b370e05909e67bbade921e00d09c3a37e851e519188bff73dc614c3f5768834ae56f94623347735e756a6bcb0c4c81c8713c SHA512 13e426915794df757b6eb029d2545316bd9f4b9ba6f58cf59a546227d6997741cf681ce0c5e721e8e95cb9e420702f2d28f004df1780637dc9b39fd3bc4c884a
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
deleted file mode 100644
index 67f4eefef2f4..000000000000
--- a/dev-java/scala-cli-bin/scala-cli-bin-1.0.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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
-}
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.1.0.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.1.0.ebuild
index 10fc71222c73..d73c7e68ad79 100644
--- a/dev-java/scala-cli-bin/scala-cli-bin-1.1.0.ebuild
+++ b/dev-java/scala-cli-bin/scala-cli-bin-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,7 +25,7 @@ SRC_URI="
 	)
 "
 
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 LICENSE="Apache-2.0"
 SLOT="0"