gentoo resync : 29.12.2022

3 files changed, 3 insertions, 54 deletions

diff --git a/dev-java/sbt-bin/Manifest b/dev-java/sbt-bin/Manifest
index 78f06600af4a..42f8ae8b269e 100644
--- a/dev-java/sbt-bin/Manifest
+++ b/dev-java/sbt-bin/Manifest
@@ -1,5 +1,3 @@
 DIST sbt-1.3.10.tgz 57609786 BLAKE2B 35285d141d8ad38a8e15cc3dd18947fa34dbe307ce1fbdd267a0902ff7f5757a0ab80d56eb241c8bea79c4a13c270efb65a552a039416a6f571b6cd214739819 SHA512 93832c0eec51422d6db63078c722578cbad21e4611ca868e835471fb988ad225e8abdea47c6dcf6e19117db9598bc75296100d9dc7ba0d605b70adc592efb925
-DIST sbt-1.3.2.tgz 51817549 BLAKE2B ccb362b8cec867c64a04eba48982a9d339250d3ab51afb72fbbb7fe29406c6565d386ab0e02887007922f4134481b4ee764b63eb69300d7aa06dffd43a91a225 SHA512 2402f781962b80a46c63ac3aba0b2bb2b55ae509bb6b591d840385765dbf73cb6e5b40c12e6b95db2d8f4e77caeda32aad5a701a6439bde41ca3166d50f4b9b2
-EBUILD sbt-bin-1.3.10.ebuild 813 BLAKE2B d00c029d68699063403f6b46234abea3cad869a7107f0bfd23ccfc82ef471ed34a81f0e4a50ef8bc961b64b6ba3b4b7dfdd171e1f82b0e332d2f46007dd287cc SHA512 203b4d72770ac17a1544d04e7756e9f3ca8dd0b6b1ac0f7562b99af23e06505871e47edf3557bfdc23f7db945a191a90e2d981a80ec97d7857cfb0dd9853dd92
-EBUILD sbt-bin-1.3.2.ebuild 812 BLAKE2B 5915524b93b06daaf5cbc7aa7e553f206633e5e3ba2088706b10a55572045a824221153051e4d053db1ed2eb123b7b5f0cd01efa20e481df8691849f3af69ea0 SHA512 80dd0c5afd13564fd6b80088ded2854ebd5c1b9c5b8ad3d09bf30ec3410d213b3218eae564fd3f604204b77d4342b27dde60963ff69a0214c636731c09543e42
+EBUILD sbt-bin-1.3.10.ebuild 812 BLAKE2B d6f0207d2ddf3a573bbda5e6bd3e071ba2953945d815a4f3b664bd61555e27f026ce8b7b37936aee758704d4a40f3e943133c50dd1f3e698fc06958186c35d42 SHA512 70d7292450bc03317fd89a1c28e5fecc75eb4252612041ad3a86b32daae2786cab46c7b7d276381e426f20383de048d1cd4854b18943b4926b9551e76ed19f25
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/sbt-bin/sbt-bin-1.3.10.ebuild b/dev-java/sbt-bin/sbt-bin-1.3.10.ebuild
index 493d2abf7d76..68c3ba963b1d 100644
--- a/dev-java/sbt-bin/sbt-bin-1.3.10.ebuild
+++ b/dev-java/sbt-bin/sbt-bin-1.3.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sbt/sbt/releases/download/v${PV}/${PN/-bin}-${PV}.tg
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	>=virtual/jre-1.7
diff --git a/dev-java/sbt-bin/sbt-bin-1.3.2.ebuild b/dev-java/sbt-bin/sbt-bin-1.3.2.ebuild
deleted file mode 100644
index 21e538c44abb..000000000000
--- a/dev-java/sbt-bin/sbt-bin-1.3.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-DESCRIPTION="sbt, a build tool for Scala"
-HOMEPAGE="https://scala-sbt.org"
-SRC_URI="https://github.com/sbt/sbt/releases/download/v${PV}/${PN/-bin}-${PV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	>=virtual/jre-1.7
-	!dev-java/sbt"
-
-src_unpack() {
-	default
-	mv "${WORKDIR}/sbt" "${S}" || die
-}
-
-src_prepare() {
-	default
-	java-pkg_init_paths_
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	local dest="${JAVA_PKG_SHAREPATH}"
-
-	rm -v bin/sbt.bat || die
-	sed -i -e 's#bin/sbt-launch.jar#lib/sbt-launch.jar#g;' \
-		bin/sbt || die
-
-	insinto "${dest}/lib"
-	doins bin/*
-
-	insinto "${dest}"
-	doins -r conf
-
-	fperms 0755 "${dest}/lib/sbt"
-	dosym "${dest}/lib/sbt" /usr/bin/sbt
-}