5 files changed, 4 insertions, 72 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 74072e513cf1..705f393768ad 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/scala-cli-bin/Manifest b/dev-java/scala-cli-bin/Manifest
index 678b75b407bf..10097e0124cd 100644
--- a/dev-java/scala-cli-bin/Manifest
+++ b/dev-java/scala-cli-bin/Manifest
@@ -1,13 +1,9 @@
-DIST scala-cli-amd64-0.2.0.gz 32589377 BLAKE2B 1eebcf83a12d4aa0f981895b8ae8d5bea3d17ac02282410aff9c02a961cf305d81ebe19422f0d96c5e8246c51d0702c352d23900e690b774550a9720246c3c08 SHA512 50617a5006b738612f234e7acc5be9d7012cb525b2548286585c11d9ac9bad6f8711a41cb1210b50089709f5765ebacce27151420fa5922cd58496fccb9bc11e
 DIST scala-cli-amd64-0.2.1.gz 32642273 BLAKE2B f30dde2a5408032942e5676b0274473fe0db6ccab9e74830c33fa37a8283438cc848fda15d79f076be1eeb45f0463769acc4f82b2e0fc4a1c0e141c9df40d502 SHA512 773206656b35dea9312f8c8a2db6cd98e1a7c0d03840f661185f276b69dcc1dafe699e1db3cdfb9fd2891fec56cc6ad1cf03e7e53761afd9a1f3596fae31e05c
 DIST scala-cli-amd64-1.0.0-RC1.gz 32431480 BLAKE2B 3ac9aa93a109493288397ca595c7364a79530a601baa2fdd11f6f0e618f9c1fb07068eb05a8242a5fcc00efc213b8225a60b8e2e75ef5dec782280665cad0cc8 SHA512 559fb6caa346e370b93778da5266b8d009cd4335e3a7baeee090c14110dcdf87fb45bee7c00eab50f3df875d88378dcfc0f6ef4a61cf8522918f9d49337e0767
-DIST scala-cli-arm64-0.2.0.gz 32460836 BLAKE2B 742848e3125886ffc49d3972efcc8087967457e9fe6a1fead0c12a263136da0da654e30d97e8d59ac9aa3b016126a969e4e70e2824aba628a685baaa82369fbb SHA512 61a3b3a45c73041d210ba483bc8eac19d4aa518de7342d7e96c2cb24cc2e9b22a4fb2da2e65b6dcf0dde8dc4cbef565c607ee8339090e4efa2161e6c5b13b35f
 DIST scala-cli-arm64-0.2.1.gz 32498301 BLAKE2B 6ffd39f37bbcd33a59855e7226435dfea6ae99bc5cf30d182cd6920636e6b2e9ff627bd028b90f7cfbff4ed1829545697fe839290990d2938a24c64784f7e549 SHA512 b6609cb52bdfd4dffe4060343c652b477b5730c1f3f5f7267a39577c13e894b23982bfe80ae065472103bcbd1573675434e91128d31cbf3c83242f9aa60243b1
 DIST scala-cli-arm64-1.0.0-RC1.gz 32263782 BLAKE2B 4131187460fb9f4236d35ebe2e63913812eba85eb8a862f2f02b681a6914b1a21f1f426e6411cff14f6309d0a7e91e2ff7f61b0336245d178f38747d953473dc SHA512 c43ecaf1638c4aa092d2a823a931ceea77cebd940907a8c781caa7c526411a5c2c50a7468ef6efab816d9d26d6769c0df421abc60f099992b489478e804ec52e
-DIST scala-cli-non-native-0.2.0 9395272 BLAKE2B 02236a18c380037bbf06649d883cc38af2f0bd4c0428838d6f551dd37a937c58e83c1ca6dc41b4052bb4e146b322d59179e2f81fb9261202003bbfdfb1f5de37 SHA512 fada2760148718d52a8b7b196479a4b5baa37275a525c1fbecc3cb039ef7e81952fc73560abd51fda6fc7a82bdb37ae2b502faf7fe43e406ac4cf7010ab617ab
 DIST scala-cli-non-native-0.2.1 9468051 BLAKE2B 9a9b5694261b769fafa3f3747f5e83869324e341f264dbfa463382e217acd5a2c994fb6e67e9e36175d97520938a40add424f5e9a77c62056eec6a828d4ea61a SHA512 547e9786527b7e7d34f4f912a6b9ae0c8f15eca3aa90f11f704283c63e5105363464f1e81f6dbb363fa71fb17e3e48b4db86e70f3b37b5059c40c02cd47382f5
 DIST scala-cli-non-native-1.0.0-RC1 9560878 BLAKE2B a0e8a86f61c5d9baa9dd36fdd2abd974063bab40644cfafd6f93f917c10f3cae2b665a19058641f61f75f11b614415db5d624d1397c061fed299b32059919faf SHA512 9b8c2b0868ed38601c5f992fae425d486ca5ac026fa664a404ba0ef4813ea9351f196a694e111fe2bbf2ccaa17257982feee91a85444d778f6a3d20f6347a438
-EBUILD scala-cli-bin-0.2.0.ebuild 1590 BLAKE2B 1ae7ae92364c3bb587ce45d0f44ad2acb2d8c4a594fb350f360e43e5de104a0cf41d7d62aa2990fe4c96de7a8315b6eb5990e3d6196776a43b6fa7f91d304c92 SHA512 28adcb27fffde8a2a23b6cf061d83b5ee9ec27aa05f1538d011bbc4d21f93f8aa2a5b2acfd9901135486be88283b5df2f4a83cd5a0127828633994537e34fe5a
-EBUILD scala-cli-bin-0.2.1.ebuild 1638 BLAKE2B 3d8bc51c8a8f517c3930d5f0ab6fe8f8c10e3781afb4d31f74ad05e6bbf13e217b4dcd6cd461c520543faaf9774f279aca6cdecd3adb2cf4ccbf66e32897eda0 SHA512 54b43d552ce19d1c7776e0cbb1a1c668eb43390c4d30c3a3604f8b0acce7c67affb8ca06ee99961ea8f7216aeadfbfeea1cb6d23e107d109d6e0485093cd5cae
-EBUILD scala-cli-bin-1.0.0_rc1.ebuild 1816 BLAKE2B ed6b18cea349b65cfe6ea0ac80efe3cf1823b183f9658935a3c1fa1df078492a44a60c499c400f6b09b8c061a180ad1ea361844adf763b4d841a50b832d200ec SHA512 d89acd3d40b0e218ac9af8b392bf4f96b92f594d02e9af8cbbdd7c9bb27c526afba8091e7986b90284f7d7d4b4168be5b9f3fb42bd1103313b1284eafec5c91e
+EBUILD scala-cli-bin-0.2.1.ebuild 1641 BLAKE2B 8f094e68df52f08f595062921dd6c9af50016b3600dec044967edeb4243d454d0584b7ff38becfb746a80155b1e927b934671a72f336cc7eed1e91bf49c4a144 SHA512 f548739c257c342a93ced58358781d809dfa3ddc759a511a01ef17c3a26a658e3863425f59922a7f4636b07b3b7a490bd5d7b66a6fae4fb693f4a2e3ac52e1cf
+EBUILD scala-cli-bin-1.0.0_rc1.ebuild 1819 BLAKE2B 14ca153e13b5c9d2f35f2dd4d01a9247e94969b5532b399abe55de9ec9f7a347f50a8a3dc5ff672cdb2c3ba8a03e716b38f9ed92e0a8d5649e555316e2b1f523 SHA512 ebe443f3b7d520ff4fefa7760437196239a3538aceba4f887ef51eeb65e6f903fa20ef5d0fd42d70a6f33cb9a50c81c86d7e0f542bcc9b78b4669badcffc54ce
 MISC metadata.xml 398 BLAKE2B b9b93abb74284cfbf4adfdf5d78a62dc6d21fa9e33c36d65842aa225b499f2220fed94648e4422eed5ae9f3c93123aeb68965783f3980a6c046168b3cde3657c SHA512 94e42c3c3b2b4d0b0092dce77a564f5e96617ab74aff3fa1ec89344c4d787f06ea8ff3ab6245440c228aa9c7018c96e2e740417dafc1699124f72b0235aed11c
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-0.2.0.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-0.2.0.ebuild
deleted file mode 100644
index 24a8131ddaec..000000000000
--- a/dev-java/scala-cli-bin/scala-cli-bin-0.2.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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 \
-					--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-0.2.1.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-0.2.1.ebuild
index 5309b1060c5e..12d0bf8270fd 100644
--- a/dev-java/scala-cli-bin/scala-cli-bin-0.2.1.ebuild
+++ b/dev-java/scala-cli-bin/scala-cli-bin-0.2.1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	>=virtual/jre-11
 	sys-libs/zlib
 "
-BEPEND="!amd64 ( !arm64 ( >=virtual/jre-11 ) )"
+BDEPEND="!amd64? ( !arm64? ( >=virtual/jre-11 ) )"
 
 QA_TEXTRELS="*"
 QA_FLAGS_IGNORED="/usr/bin/scala-cli"
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.0.0_rc1.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.0.0_rc1.ebuild
index dbd4d61e3c92..10fc71222c73 100644
--- a/dev-java/scala-cli-bin/scala-cli-bin-1.0.0_rc1.ebuild
+++ b/dev-java/scala-cli-bin/scala-cli-bin-1.0.0_rc1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 	>=virtual/jre-11
 	sys-libs/zlib
 "
-BEPEND="!amd64 ( !arm64 ( >=virtual/jre-11 ) )"
+BDEPEND="!amd64? ( !arm64? ( >=virtual/jre-11 ) )"
 
 QA_TEXTRELS="*"
 QA_FLAGS_IGNORED="/usr/bin/scala-cli"