gentoo resync : 15.06.2021

3 files changed, 82 insertions, 3 deletions

diff --git a/dev-lang/scala-bin/Manifest b/dev-lang/scala-bin/Manifest
index 9578eeb1d178..3d6ca266f475 100644
--- a/dev-lang/scala-bin/Manifest
+++ b/dev-lang/scala-bin/Manifest
@@ -1,3 +1,5 @@
 DIST scala-2.13.1.tgz 19685743 BLAKE2B aaff6db71023f539d08da521ab1ff505a626605d9c298472d0c2e98a9a13d6b8440e89cf5ff4a53b7b9bcc48cbc1e3b55cc253563f54f18c369e13fc8c00a6c2 SHA512 028aa237c471cada1501cd5764b3c384c3f50e9fc327cddd3fa7c79e9cc909d86bf84d5fc28103054600f879a60c546fc45a837cdca54964eb57ec77f9c1613e
-EBUILD scala-bin-2.13.1.ebuild 1307 BLAKE2B 8ebeb4038e8844f3c94e81ba2a72e1b08f9729e3fe8465cdd3e40d0cbf271868fc6b1e83fbbaf1871f3d13ba1483fa4ab0e8bbc3f596e83037c88b3c8303780e SHA512 f5b548e403e2d67e8f7fef0865e1c2a62f790d76e7d6eaa8aad31fecc3f322cdd89e33ebea835bdba1704734175e0066d5b2bf4d4c778f5f570533319ad40297
+DIST scala-2.13.6.tgz 23407489 BLAKE2B b65db49968dcbce2f5586aafaa4cd437156050050f209cce4a7d5edc18dfca3ebb60d2a726b4a26902723f993b78a673909c1139eb67e8eea4f35a4842b33c70 SHA512 445267cd7c1ddb8ef94d2edeb36567318c66429c88fcb183840998dc204a10253df09c33eb4de2f87b68b1a8cd4f557910fa3f061d4316314653eb64e91c0188
+EBUILD scala-bin-2.13.1-r1.ebuild 1314 BLAKE2B faed8c9c4a4d0d480bb91f2568e80518c7f6cb0a99694a1375be3acd96803bc31b72a33acd78751a07754816de621d3f7733ad00462117a8ac09d2b9e6d8e7cb SHA512 a592eb08248a9c1bebf37ec835da2f6259031e81a3d059cfb3cc846be84d8ac1f8dd26b5419e58e5709379840d96d81d44751dfaa0d0c828b855249b0b525989
+EBUILD scala-bin-2.13.6.ebuild 1316 BLAKE2B 35622328871ead249feafb4bfc2064f102e889198b5fbcb9cbb9f8de1327db674e89c394ecfc76ddce4b11adb1e28909996d8d072dd7ef7514d5f7f661fcfaee SHA512 c0a7b0709835be1532f2bb547ec6481cd5d06104cad6383a92c4aa7404cdb83703a40b79d834282e7041e617cf22acdffdb9f90bfc888d07da9aa31ee8ae2b5a
 MISC metadata.xml 317 BLAKE2B 47b0d918ff9d4f2287fc0c43a022b978a816aa0d96362cf449210cd6b13810ed1352dbe69c5bea8281cdd3f3d03f4dcf714589e414b27abd5cd8c648e3d64994 SHA512 506fab7ebaa9e1caf96f239d6d85978171b98282ebe22a4948f61df62ce05a4c22772d81159cec9a99dd9a127b602e7593615204142e295d88835f9385a64bc8
diff --git a/dev-lang/scala-bin/scala-bin-2.13.1.ebuild b/dev-lang/scala-bin/scala-bin-2.13.1-r1.ebuild
index 622baa6cd436..9469077928d2 100644
--- a/dev-lang/scala-bin/scala-bin-2.13.1.ebuild
+++ b/dev-lang/scala-bin/scala-bin-2.13.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ DESCRIPTION="The Scala Programming Language"
 HOMEPAGE="http://scala.epfl.ch/"
 SRC_URI="http://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz"
 
-LICENSE="BSD"
+LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc"
diff --git a/dev-lang/scala-bin/scala-bin-2.13.6.ebuild b/dev-lang/scala-bin/scala-bin-2.13.6.ebuild
new file mode 100644
index 000000000000..cdb8e4a5f113
--- /dev/null
+++ b/dev-lang/scala-bin/scala-bin-2.13.6.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=virtual/jre-1.8
+	!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
+
+	# 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
+}