Adding metadata

10 files changed, 52 insertions, 256 deletions

diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r3.ebuild
index 172467ec6ed4..120a631bc481 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r2.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r3.ebuild
@@ -33,7 +33,7 @@ RESTRICT="test"
 
 CDEPEND="
 	>=dev-java/ant-1.10.14-r3:0
-	dev-java/ant-ivy:2
+	dev-java/ant-ivy:0
 	dev-java/bcel:0
 	dev-java/commons-httpclient:3
 	dev-java/xerces:2
@@ -54,7 +54,7 @@ RDEPEND="${CDEPEND}
 	>=virtual/jre-1.8:*"
 
 #	JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,!!!groupId-not-found!!!,xerces-2"
-JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant,bcel,ant-ivy-2,xerces-2"
+JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant,bcel,ant-ivy,xerces-2"
 JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
 
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0-r4.ebuild
index 0158c70768f5..32e0a711eb11 100644
--- a/dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0-r4.ebuild
@@ -12,9 +12,10 @@ inherit java-pkg-2 java-pkg-simple java-osgi
 DESCRIPTION="Ivy is a free java based dependency manager"
 HOMEPAGE="https://ant.apache.org/ivy/"
 SRC_URI="https://archive.apache.org/dist/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
+S="${WORKDIR}/apache-ivy-${PV}"
 
 LICENSE="Apache-2.0"
-SLOT="2"
+SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
 
 PROPERTIES="test_network"
@@ -24,7 +25,7 @@ CDEPEND="
 	>=dev-java/ant-1.10.14-r3:0
 	dev-java/bcpg:0
 	dev-java/bcprov:0
-	dev-java/httpcomponents-client
+	dev-java/httpcomponents-client:4
 	dev-java/commons-vfs:2
 	dev-java/httpcore:0
 	dev-java/jakarta-oro:2.0
@@ -45,8 +46,6 @@ RDEPEND="${CDEPEND}
 
 DOCS=( LICENSE NOTICE README.adoc )
 
-S="${WORKDIR}/apache-ivy-${PV}"
-
 JAVA_GENTOO_CLASSPATH="
 	ant
 	bcpg
diff --git a/dev-java/jclasslib/Manifest b/dev-java/jclasslib/Manifest
index 8417d7402607..ae0e87bf4724 100644
--- a/dev-java/jclasslib/Manifest
+++ b/dev-java/jclasslib/Manifest
@@ -1 +1,3 @@
+DIST annotations-24.1.0.jar 30570 BLAKE2B 55120bf8969384048e0fd438fc96dc6769d6974b96e0e492636351c15466401da623341fe526685e51cd63378fa54c6485fa5dca83b2fc853b85ed4a75dc5d7d SHA512 663395a885561cc97eed411c67b496c06ec9a54906185a871de8743bf53e92152f4bc7c2a0118b7f3cfe85cc0a6c408ac6d589839b8d25c851637f85880331f2
 DIST jclasslib-3.1.tar.gz 4630493 BLAKE2B 2dbede05833a6f7ff0f32194ea91aeb071615ee8562541d1b5abc2fc61c3f393bd93f5e444110a6a72df161d488cf21551af8208b1f391951b5ae7002ceb6ef3 SHA512 5c44043eb30ab32110097ef6b52f459bf4d512db71efc79aae99fdb6b9db740a7be1e6a59f6e3a233a3b303933ed90fe482c6b9c81d76de93af6c9724aad41dc
+DIST jclasslib-4.3.1.tar.gz 1396903 BLAKE2B 2f070186f75e40be7cb7122e34d3a00688691cb9da49b6c161beaff7da3170b8ddf3e805467b7ecfbd820ca4bd0b335dee765d7318d0f487f2242e5f8bf4ae76 SHA512 25e35b39a39eb09fe7730d70abb4f6f500522f755801f80ece9357a1a90429254eb3bf57ea7a6cd638fcac77b0d04a62e0df9336c8184738acc74901ed4516e9
diff --git a/dev-java/jclasslib/jclasslib-4.3.1.ebuild b/dev-java/jclasslib/jclasslib-4.3.1.ebuild
new file mode 100644
index 000000000000..79ad0e367e27
--- /dev/null
+++ b/dev-java/jclasslib/jclasslib-4.3.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java bytecode viewer"
+HOMEPAGE="https://github.com/ingokegel/jclasslib"
+JAV="24.1.0"
+SRC_URI="https://github.com/ingokegel/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://repo1.maven.org/maven2/org/jetbrains/annotations/${JAV}/annotations-${JAV}.jar"
+S="${WORKDIR}/${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_GENTOO_CLASSPATH_EXTRA="lib-compile/i4jruntime.jar"
+JAVA_GENTOO_CLASSPATH_EXTRA+=":${DISTDIR}/annotations-${JAV}.jar"
+JAVA_MAIN_CLASS="org.gjt.jclasslib.browser.BrowserApplication"
+JAVA_RESOURCE_DIRS=( modules/browser/src/main/resources )
+JAVA_SRC_DIR=( modules/{data,browser}/src/main/java )
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dojar lib-compile/i4jruntime.jar
+}
+
+pkg_postinst() {
+	elog "jclasslib uses Firefox by default."
+	elog "Set the BROWSER environment at your discretion."
+}
diff --git a/dev-java/scala-cli-bin/Manifest b/dev-java/scala-cli-bin/Manifest
index 97b63d254284..43d2b697dd11 100644
--- a/dev-java/scala-cli-bin/Manifest
+++ b/dev-java/scala-cli-bin/Manifest
@@ -1,15 +1,6 @@
-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-amd64-1.1.1.gz 33754319 BLAKE2B 91fb5e9b828a2c6c6dd984b421bb101ea1ae03c85d94eda14ba79433d29a88cb2850cb376c212f677c1b8167a0a21b320aeb0e4e63a29e6c8502d76babc1543d SHA512 1e0cd5eee280e208090961e4b6d216d472fef360f13e0f4e28412b9a52883d65c97e3fe70c8ce5cf96e6cd866f14b175454175be9df3bdc5c229fb2f121c925a
-DIST scala-cli-amd64-1.2.1.gz 33851353 BLAKE2B 31c92901f970ec2c0a74cb45d94b98e6d8f282c175cf8deb1a806db4b6d2e9a8b2150bca9fc9e373948e5092bf4bb7d5d1145a133d3b1c234d3cbe383ff9a270 SHA512 169c81bee582c6144501e8bd5436bae0bd3447ed89856a4d4763d13d3083ad26d948729b71bea864986f2c676e50855b8fb036d3a69ed0a316e2c6af0f98ef5f
 DIST scala-cli-amd64-1.2.2.gz 33871512 BLAKE2B ef9328b26afb52ada07739539d560239d6ce2ffd72d1e353ce94d45c7358b6789aa0019804e249584ca497d5d15c96caab12eb31fab5b84a14162c00ca30c181 SHA512 02da0915ee140a129f622f973291c98c7dd7b7f16f5a2a5250ac825e09876b616a315fe5e6af43691f43870fa68234efeff73eadd4f6060d2d90fe937302eae7
-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-arm64-1.1.1.gz 33656505 BLAKE2B b943f370c9375fec5cec3c63628ecd9e416b569ec2d692422f217b2506c104a1c3bb415569581d68c9476bf892b4a087e7b95b2310955dd0f9af52edc90af2e9 SHA512 79836261613bafe4710c1d904ec39e88c1862b3021f7b37ac5004c6079c762e68550522fbb7240e48e7408f844f648ab92c12cb568ebc63bb3e01f1992a7eaf3
-DIST scala-cli-arm64-1.2.1.gz 33769006 BLAKE2B 4bc2c830d17e235a3eba7029bfd018ee4cd12f8ee27a3574b1c2195ab8ad22b79c452a0660fb55f1be99a610be1f4ea38f8e2de622f10277be7f5403b540778a SHA512 90a8f6b4ae2fa90dcdd3c88fdbbd1079db1cbbde80f496da8663223ad79dc4b499b6ae43835067d8fde945d4fb5ed079dec850f688b9d1b62602d186d426f7cb
+DIST scala-cli-amd64-1.4.2.gz 34238180 BLAKE2B 90cb8af5561bf5324e4fef3183b301d15839ac188f8ba7154e65306333d765429243591fc17a33f48e4b8a48c43034782643ba4014bfed3719c5037805c58878 SHA512 12ff3eff0117df6d9ae526203724a8261150fbd5436f61beeda33a5f4292b7a71196e2ee762d4e005f827ac2f104d3c5d2a657abc0a63a2b66e526d18ef2887a
 DIST scala-cli-arm64-1.2.2.gz 33766128 BLAKE2B d5b2d7ab8157f3874b1cfe0b0647ab30f5dd191337e575056eb758d52eda30871c54b20a08a1cda3e28c51afd744b4b8320aee6aef056b39b98f2534184739ba SHA512 004ca188e4ddd01c0e46277fa514b1c9bd061ea26d4318b8daff3ffaae5bb7cc9f4746509401da19774537c7e56f8a5a7da846cd4b5f90c61a3ab1f8d3ed0493
-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
-DIST scala-cli-non-native-1.1.1 7779964 BLAKE2B 08849ce4a6fbf1e6eb2e4fafd2e29522e535c0795d6f1acbcd25ec4523d14dcae4a746f3729786db8f62a3770e6fdbd78a76477b182b32945454ac19a2f8217c SHA512 61c2a1a325f83e19102cd2f5d6b89d37b9914d64f86da6218258f064a6a8e5ab927d28b278363316446611e2cbdc8e4687616ea2b001da00ecbafb4207eabeb2
-DIST scala-cli-non-native-1.2.1 7836408 BLAKE2B a7c191020a65a4420ef7cc9d8fe5f9c6d1548c1cfb14dea94c0d9a798f608c038083bb678bd1a4fbdc9bd3de58f02a11e970cfebec4ac755f7f12af21eeb4dbc SHA512 d889ad3fa96953423fc1d948b6e260f55ffc4234d6e9da05299afe0a6cbc2b66c42a7a65113f887d1bf41a699679d09e02aed6686150551d1e1171d7c1c7331b
+DIST scala-cli-arm64-1.4.2.gz 34142373 BLAKE2B d7c2d87503e0c8916902e293d5d16e59b7ec80c942b72307667a0e8c16635e4d2e9839bf20a4284a1ffaf2eef001db4801bdc62afe9600babd1abd915783ba09 SHA512 10dcc3991d4e9951d688f907da38683701f8ff4784e86dcd1fd7441c79f70bdfef7d8022d98e247914800312b4eb37670a99059f77c045fd66f6d34e92179e5c
 DIST scala-cli-non-native-1.2.2 7837019 BLAKE2B 799ed83805ba767b687cf9a041a3e23f008e20e3ca55b8c52a9361c0b2465141abb7c17ca7dca59c9307af5a5a07a0cfe0d8035eea14a2adf2580913d67d6a10 SHA512 40aa43ee601c52238989a81884b6acc7a023599abb561bed1c9d31dff6053eff0f3477097a228bc30aab4df22d81b10fbbb64b5557d3067b4715c821c4eacb3e
+DIST scala-cli-non-native-1.4.2 8004132 BLAKE2B 5254d25395080a26598bb4445c2200100b1c511e928774d5d52f5174b43d3fd9cd2b58ae97033a25e45495273bbf0717abccccbe84c5d4a8bb70a3c9f42f5b7e SHA512 002d052ec4b2409ede4da6cfda86ff638534d702a934d679aac0d18dab4c6c69ac8d9d8e67a8e9a410af8c8d0c19f1c864247b0d790e6f040976f4fb3dcabfe5
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
deleted file mode 100644
index 67f4eefef2f4..000000000000
--- a/dev-java/scala-cli-bin/scala-cli-bin-1.0.4.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
deleted file mode 100644
index d73c7e68ad79..000000000000
--- a/dev-java/scala-cli-bin/scala-cli-bin-1.1.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2024 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.1.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.1.1.ebuild
deleted file mode 100644
index dc0659cfd5ec..000000000000
--- a/dev-java/scala-cli-bin/scala-cli-bin-1.1.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2024 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.2.2.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.2.2.ebuild
index dc0659cfd5ec..d73c7e68ad79 100644
--- a/dev-java/scala-cli-bin/scala-cli-bin-1.2.2.ebuild
+++ b/dev-java/scala-cli-bin/scala-cli-bin-1.2.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.2.1.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.4.2.ebuild
index dc0659cfd5ec..e89ddb52ce30 100644
--- a/dev-java/scala-cli-bin/scala-cli-bin-1.2.1.ebuild
+++ b/dev-java/scala-cli-bin/scala-cli-bin-1.4.2.ebuild
@@ -25,11 +25,11 @@ SRC_URI="
 	)
 "
 
-KEYWORDS="~amd64 ~arm64"
+S="${WORKDIR}"
+
 LICENSE="Apache-2.0"
 SLOT="0"
-
-S="${WORKDIR}"
+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