gentoo resync : 21.06.2020

3 files changed, 4 insertions, 84 deletions

diff --git a/dev-lang/scala-bin/Manifest b/dev-lang/scala-bin/Manifest
index 9bdfc8454dcb..9578eeb1d178 100644
--- a/dev-lang/scala-bin/Manifest
+++ b/dev-lang/scala-bin/Manifest
@@ -1,5 +1,3 @@
-DIST scala-2.12.4.tgz 19741785 BLAKE2B e782a4ac000ffcebc2faaac077cbb3cc13f8cc56deb9b3a78f1bddd3d0e6fd282d70f10cfef0780e4ab6a13e8d51b0401f84829b7974bd8823aecab54476ab02 SHA512 e6a9e11974d3bacc5f5dcdfdb379bdd1b430b1682141bed688f02f8b49395aff7c55cdb8da3319dff55da7bd7cfe7545e9b26db9558316ac8b3e29f6bb2c6d74
 DIST scala-2.13.1.tgz 19685743 BLAKE2B aaff6db71023f539d08da521ab1ff505a626605d9c298472d0c2e98a9a13d6b8440e89cf5ff4a53b7b9bcc48cbc1e3b55cc253563f54f18c369e13fc8c00a6c2 SHA512 028aa237c471cada1501cd5764b3c384c3f50e9fc327cddd3fa7c79e9cc909d86bf84d5fc28103054600f879a60c546fc45a837cdca54964eb57ec77f9c1613e
-EBUILD scala-bin-2.12.4.ebuild 1482 BLAKE2B 1f08b7ae9966682e14958090b42f5b45efcf1e80593fdc31aaeda09a100b46041a5b2a5d601feb52a829188ada9eef20038207fb028c8ab61adb7a51988bbbad SHA512 95bdf1e5108e90739d464d26c45b3c3a6c8949bbe8c8ae82afef56c583b4ef3e65571d798ca6786bea05ee45d8932471e1789cd4df5cbaa420fafbe8be1a9c37
-EBUILD scala-bin-2.13.1.ebuild 1306 BLAKE2B 9f4e07716d97106c279da5b885866758fc902b3d18af9c7a2d94e70dfee51c804af90aec1e607ef6864504c4665f7cdd874826ae99c716d8c1ad3c4e3dc235d0 SHA512 ff070c4e5702a846f46158b372282592a0946e5ce4aa277005fa4e25698c11e4f6b3937dc126ad4ce8772a8892b944e8747672b7ce1435b56c5389d093ff85ab
+EBUILD scala-bin-2.13.1.ebuild 1307 BLAKE2B 8ebeb4038e8844f3c94e81ba2a72e1b08f9729e3fe8465cdd3e40d0cbf271868fc6b1e83fbbaf1871f3d13ba1483fa4ab0e8bbc3f596e83037c88b3c8303780e SHA512 f5b548e403e2d67e8f7fef0865e1c2a62f790d76e7d6eaa8aad31fecc3f322cdd89e33ebea835bdba1704734175e0066d5b2bf4d4c778f5f570533319ad40297
 MISC metadata.xml 317 BLAKE2B 47b0d918ff9d4f2287fc0c43a022b978a816aa0d96362cf449210cd6b13810ed1352dbe69c5bea8281cdd3f3d03f4dcf714589e414b27abd5cd8c648e3d64994 SHA512 506fab7ebaa9e1caf96f239d6d85978171b98282ebe22a4948f61df62ce05a4c22772d81159cec9a99dd9a127b602e7593615204142e295d88835f9385a64bc8
diff --git a/dev-lang/scala-bin/scala-bin-2.12.4.ebuild b/dev-lang/scala-bin/scala-bin-2.12.4.ebuild
deleted file mode 100644
index a434c4ee6280..000000000000
--- a/dev-lang/scala-bin/scala-bin-2.12.4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2
-
-MY_PN="${PN%-*}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="The Scala Programming Language"
-HOMEPAGE="http://scala.epfl.ch/"
-SRC_URI="http://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="
-	>=virtual/jre-1.6
-	!dev-lang/scala"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	ebegin 'Cleaning .bat files'
-	rm -f bin/*.bat || die
-	eend $?
-
-	ebegin 'Patching SCALA_HOME variable in bin/ directory'
-	local f
-	for f in bin/*; do
-		sed -i -e 's#\(SCALA_HOME\)=.*#\1=/usr/share/scala-bin#' $f || die
-	done
-	eend $?
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	ebegin 'Installing bin scripts'
-	dobin bin/*
-	eend $?
-
-	ebegin 'Installing jar files'
-	cd lib/ || die
-
-	# Unversion those libs.
-	java-pkg_newjar jline-*.jar jline.jar
-	java-pkg_newjar scalap-*.jar scalap.jar
-	java-pkg_newjar scala-parser-combinators_*.jar scala-parser-combinators.jar
-	java-pkg_newjar scala-swing_*.jar scala-swing.jar
-	java-pkg_newjar scala-xml_*.jar scala-xml.jar
-
-	# Install these the usual way.
-	java-pkg_dojar scala-compiler.jar
-	java-pkg_dojar scala-library.jar
-	java-pkg_dojar scala-reflect.jar
-
-	eend $?
-
-	cd ../ || die
-
-	ebegin 'Installing man pages'
-	doman man/man1/*.1
-	eend $?
-
-	if use doc; then
-		ebegin 'Installing documentation'
-		java-pkg_dohtml -r doc/tools
-		eend $?
-	fi
-}
diff --git a/dev-lang/scala-bin/scala-bin-2.13.1.ebuild b/dev-lang/scala-bin/scala-bin-2.13.1.ebuild
index 27531fa3d555..622baa6cd436 100644
--- a/dev-lang/scala-bin/scala-bin-2.13.1.ebuild
+++ b/dev-lang/scala-bin/scala-bin-2.13.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="
@@ -34,7 +34,7 @@ src_prepare() {
 	ebegin 'Patching SCALA_HOME variable in bin/ directory'
 	local f
 	for f in bin/*; do
-		sed -i -e 's#\(SCALA_HOME\)=.*#\1=/usr/share/scala-bin#' $f || die
+		sed -i -e 's#\(SCALA_HOME\)=.*#\1=/usr/share/scala-bin#' "$f" || die
 	done
 	eend $?
 }
@@ -49,6 +49,7 @@ src_install() {
 	eend $?
 
 	ebegin 'Installing jar files'
+
 	cd lib/ || die
 
 	# Unversion those libs.