gentoo resync : 28.11.2020

7 files changed, 254 insertions, 66 deletions

diff --git a/sys-cluster/spark-bin/Manifest b/sys-cluster/spark-bin/Manifest
index 03167ee57599..5c6c39c1eba1 100644
--- a/sys-cluster/spark-bin/Manifest
+++ b/sys-cluster/spark-bin/Manifest
@@ -1,4 +1,9 @@
-AUX 99spark 26 BLAKE2B c25fe3d379a16c8a51764ea5b4c27d8f34869687c882141f0428d102d921eb65fea8ac253e407fe07fd4cce1232dd513728b1340bc0bcd21bd19ce0aed0c2420 SHA512 6d64d751f1504bea332b16078804abcaf21c8ea9c69f94fef3a8929b6d6cb1107ec899a5dc49770997243cbfda61edbcfa4d505da29220a71f5be38c1008f4f0
-DIST spark-bin-3.0.1.tgz 219929956 BLAKE2B dd53df1e0123feae5b69f97193d1edc647bd4802ab78c54e471ed54b3ae6eee32ace51e379569f4947599d24aba5af63b401c11ef2af6234ffc6ac1afbbe275f SHA512 f4a10baec5b8ff1841f10651cac2c4aa39c162d3029ca180a9749149e6060805b5b5ddf9287b4aa321434810172f8cc0534943ac005531bb48b6622fbe228ddc
-EBUILD spark-bin-3.0.1.ebuild 1344 BLAKE2B 691d774853d5319cd3ec9d8a6a0ef75a50ba22ba8d2d38e7208f6b8cd11835d9c5784d2966e3b67e096b621d08dbc7810cbd64202dfe7fca647ecdd5d0f8d2dc SHA512 cb251928d17d2a75028a7027d9e0a02abd5673178b32905902b372d5bc743a79bf64c0d2e034666df9f5d40d02e046b605bd44cb363e08750e49d5cc385a5d8d
-MISC metadata.xml 499 BLAKE2B 7116e88708f7dafb75197e46237ea5d405bc703feadece0bb65766537f64bd2f7ea2b34cf4a4c94d4f25d74f040b6cf5eb0b0072a20600a9d206087b38f63831 SHA512 273279c1235d9888e5b30073044687584699f7f26fd696f019c5b11545f32095319b6bfe52196ed6846cf74c8ffaa2c7f6c9f3a29749fa3315f18adba917094c
+DIST spark-bin-2.4.3-nohadoop-scala211.tgz 163128705 BLAKE2B 806964eb226aac2b4a63691b2644fc8e8cb6a7574eb4fbd8770a62c7974435b24c19253569c214b0d1a608b4de53eb351d16c4b14d3c83c91326883a795d59a8 SHA512 d1f87d46725e9feb5edf3df0c78daea263ad3e57e1a8a7069766f8e010fd673f0a99af2f69911f1319e9b6f864795e0e5291ee7c0c574434e92a458999374d85
+DIST spark-bin-2.4.3-nohadoop-scala212.tgz 141465231 BLAKE2B e29b534076b981e340833da0b6d93b8f2708a7919abfcd06f057ced6e7bb56f1140fab9d82ca157b4c7bd3aac9004d51fdfc0f8446cd9231e64e26236c2fb793 SHA512 e9651dfad8b6be162f800de987981e1b027d372e4391340589cdc23c7e579a8ec28cb950aa4aad7797ecfc330f0375844cc769a6ad5b35bac36b8cf404805c08
+DIST spark-bin-2.4.7-nohadoop-scala211.tgz 168360525 BLAKE2B 9a8728a1c7450166d4d9635ff1be6a65d57df1832945672e92044e0fc88ef152e7e870d02ec590378ea97a47d4a68568da73e6a1e92f8eaaaa06f495ed9939ad SHA512 ff75e6db3c4ca5cece2a8a26ad7bd8a2c1c46b4f93e8f2922a31e6a8d98274bedc66bef3e469e862d249c5439355ccca83687a20d536a8400f2c058be553df57
+DIST spark-bin-2.4.7-nohadoop-scala212.tgz 146775712 BLAKE2B f0381e6aebeae90990d5ad19d8db923efd01e9b215ddfe34e34a8272942e57fe7ec6a53208146006ba5c4e76f8e44d202e0715f63b559cc8749b523710b92a5f SHA512 708a702af5c754dba0137c88e3c7055d7759593f013798755468638b6fdc583a707aae4c2a4e14648f91c16b963f9bba9f8c44d28341c08c4512590a425f70a8
+DIST spark-bin-3.0.1-nohadoop.tgz 156390722 BLAKE2B 9ac4645759ca0ec6d1501dfa79d149b9cbf49dee1c4b9dcf38f62490d3ad91db01ad61d9d6b1ef4dd7bcb81a868cb58b9251575dded823c8415801d10571afee SHA512 07fc6df224f303ef53189e6082004400d51cd6c2244d1851d90eabbe58404a69ff980bffe147a5259a34190e1e1c974c72d02470d10a783d2d87f43a8da0850b
+EBUILD spark-bin-2.4.3.ebuild 1912 BLAKE2B 32179e648529a5ab5302d036ecfe3ed341bc14a9ab126cba569ca7702057bc99f613c371a2410f0ba66c6f8e40de40938d00e77d6f36135ea81d2604edee12ff SHA512 4e7e377935efa5fea31d48aa15dd9b918ce3794905d74890c44236df20f50bb6b49ee9de23d69953da4d3aa20ccf05150f8c933935c2e4beefd742a4647366b7
+EBUILD spark-bin-2.4.7-r1.ebuild 1912 BLAKE2B 32179e648529a5ab5302d036ecfe3ed341bc14a9ab126cba569ca7702057bc99f613c371a2410f0ba66c6f8e40de40938d00e77d6f36135ea81d2604edee12ff SHA512 4e7e377935efa5fea31d48aa15dd9b918ce3794905d74890c44236df20f50bb6b49ee9de23d69953da4d3aa20ccf05150f8c933935c2e4beefd742a4647366b7
+EBUILD spark-bin-3.0.1-r2.ebuild 1542 BLAKE2B 2e02f5f0951a23703d2519502a29eee109610d68037f8d73369d8b19fc3cb9f2cac783a77e14376f60b7acbd2485a1f0484794f5d846851176f0b697a0045764 SHA512 6ed6a9cfd211f04c9d2bff14f8e27c78b0cba015efde7a173414267b6334eb812bb175a83024e5e454720e77130214ba8e5e1a708639f21851f6c811bf5a629c
+MISC metadata.xml 674 BLAKE2B 8b9d5a6f5266d83bcb2f57738547d35347fb59f0e9d26c6368ef42a49ae92a911243430bfacdaf256012841f07f9a530ee28a59b0bd2a2e30a2511118644cc8b SHA512 a8b9fe7f3ab599508089cddcb3815d393b589c9d533ef51c13e0dc76aaf9a2889a7b2f1201ae03f7a1df38bfb9bf5feb5c1d029db885af6ba8707560b5e54abb
diff --git a/sys-cluster/spark-bin/files/99spark b/sys-cluster/spark-bin/files/99spark
deleted file mode 100644
index 2aa3040328ab..000000000000
--- a/sys-cluster/spark-bin/files/99spark
+++ /dev/null
@@ -1 +0,0 @@
-SPARK_HOME=/usr/lib/spark
diff --git a/sys-cluster/spark-bin/metadata.xml b/sys-cluster/spark-bin/metadata.xml
index 687380a6ed2b..5408c183b068 100644
--- a/sys-cluster/spark-bin/metadata.xml
+++ b/sys-cluster/spark-bin/metadata.xml
@@ -13,4 +13,8 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <use>
+    <flag name="scala211">Install Spark JARs pre-built with Scala 2.11.</flag>
+    <flag name="scala212">Install Spark JARs pre-built with Scala 2.12.</flag>
+  </use>
 </pkgmetadata>
diff --git a/sys-cluster/spark-bin/spark-bin-2.4.3.ebuild b/sys-cluster/spark-bin/spark-bin-2.4.3.ebuild
new file mode 100644
index 000000000000..99aa5cd404a1
--- /dev/null
+++ b/sys-cluster/spark-bin/spark-bin-2.4.3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2
+
+DESCRIPTION="Lightning-fast unified analytics engine"
+HOMEPAGE="https://spark.apache.org"
+SRC_URI="
+	!scala212? ( scala211? ( mirror://apache/spark/spark-${PV}/spark-${PV}-bin-without-hadoop.tgz -> ${P}-nohadoop-scala211.tgz ) )
+	!scala211? ( scala212? ( mirror://apache/spark/spark-${PV}/spark-${PV}-bin-without-hadoop-scala-2.12.tgz -> ${P}-nohadoop-scala212.tgz ) )
+"
+
+REQUIRED_USE="^^ ( scala211 scala212 )"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64"
+
+IUSE="+scala211 scala212"
+
+RDEPEND="
+	>=virtual/jre-1.8"
+
+DEPEND="
+	>=virtual/jdk-1.8"
+
+DOCS=( LICENSE NOTICE README.md RELEASE )
+
+src_unpack() {
+	unpack ${A}
+	use scala211 && S="${WORKDIR}/spark-${PV}-bin-without-hadoop"
+	use scala212 && S="${WORKDIR}/spark-${PV}-bin-without-hadoop-scala-2.12"
+}
+
+# Nothing to compile here.
+src_compile() { :; }
+
+src_install() {
+	dodir usr/lib/spark-${SLOT}
+	into usr/lib/spark-${SLOT}
+
+	local SPARK_SCRIPTS=(
+		bin/beeline
+		bin/load-spark-env.sh
+		bin/pyspark
+		bin/spark-class
+		bin/spark-shell
+		bin/spark-sql
+		bin/spark-submit
+	)
+
+	local s
+	for s in "${SPARK_SCRIPTS[@]}"; do
+		ebegin "Setting SPARK_HOME to /usr/lib/spark-${SLOT} in $(basename ${s}) script ..."
+		sed -i -e "2iSPARK_HOME=/usr/lib/spark-${SLOT}" "${s}"
+		eend $?
+		dobin "${s}"
+	done
+
+	insinto usr/lib/spark-${SLOT}
+
+	local SPARK_DIRS=( conf jars python sbin yarn )
+
+	local d
+	for d in "${SPARK_DIRS[@]}"; do
+		doins -r "${d}"
+	done
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Spark is now slotted. You have installed Spark ${SLOT}."
+	einfo
+	einfo "Make sure to add /usr/lib/spark-${SLOT}/{bin,sbin} directories"
+	einfo "to your PATH in order to run Spark shell scripts:"
+	einfo
+	einfo "$ export PATH=\$PATH:/usr/lib/spark-${SLOT}/bin"
+	einfo "$ export PATH=\$PATH:/usr/lib/spark-${SLOT}/sbin"
+	einfo
+}
diff --git a/sys-cluster/spark-bin/spark-bin-2.4.7-r1.ebuild b/sys-cluster/spark-bin/spark-bin-2.4.7-r1.ebuild
new file mode 100644
index 000000000000..99aa5cd404a1
--- /dev/null
+++ b/sys-cluster/spark-bin/spark-bin-2.4.7-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2
+
+DESCRIPTION="Lightning-fast unified analytics engine"
+HOMEPAGE="https://spark.apache.org"
+SRC_URI="
+	!scala212? ( scala211? ( mirror://apache/spark/spark-${PV}/spark-${PV}-bin-without-hadoop.tgz -> ${P}-nohadoop-scala211.tgz ) )
+	!scala211? ( scala212? ( mirror://apache/spark/spark-${PV}/spark-${PV}-bin-without-hadoop-scala-2.12.tgz -> ${P}-nohadoop-scala212.tgz ) )
+"
+
+REQUIRED_USE="^^ ( scala211 scala212 )"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64"
+
+IUSE="+scala211 scala212"
+
+RDEPEND="
+	>=virtual/jre-1.8"
+
+DEPEND="
+	>=virtual/jdk-1.8"
+
+DOCS=( LICENSE NOTICE README.md RELEASE )
+
+src_unpack() {
+	unpack ${A}
+	use scala211 && S="${WORKDIR}/spark-${PV}-bin-without-hadoop"
+	use scala212 && S="${WORKDIR}/spark-${PV}-bin-without-hadoop-scala-2.12"
+}
+
+# Nothing to compile here.
+src_compile() { :; }
+
+src_install() {
+	dodir usr/lib/spark-${SLOT}
+	into usr/lib/spark-${SLOT}
+
+	local SPARK_SCRIPTS=(
+		bin/beeline
+		bin/load-spark-env.sh
+		bin/pyspark
+		bin/spark-class
+		bin/spark-shell
+		bin/spark-sql
+		bin/spark-submit
+	)
+
+	local s
+	for s in "${SPARK_SCRIPTS[@]}"; do
+		ebegin "Setting SPARK_HOME to /usr/lib/spark-${SLOT} in $(basename ${s}) script ..."
+		sed -i -e "2iSPARK_HOME=/usr/lib/spark-${SLOT}" "${s}"
+		eend $?
+		dobin "${s}"
+	done
+
+	insinto usr/lib/spark-${SLOT}
+
+	local SPARK_DIRS=( conf jars python sbin yarn )
+
+	local d
+	for d in "${SPARK_DIRS[@]}"; do
+		doins -r "${d}"
+	done
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Spark is now slotted. You have installed Spark ${SLOT}."
+	einfo
+	einfo "Make sure to add /usr/lib/spark-${SLOT}/{bin,sbin} directories"
+	einfo "to your PATH in order to run Spark shell scripts:"
+	einfo
+	einfo "$ export PATH=\$PATH:/usr/lib/spark-${SLOT}/bin"
+	einfo "$ export PATH=\$PATH:/usr/lib/spark-${SLOT}/sbin"
+	einfo
+}
diff --git a/sys-cluster/spark-bin/spark-bin-3.0.1-r2.ebuild b/sys-cluster/spark-bin/spark-bin-3.0.1-r2.ebuild
new file mode 100644
index 000000000000..aa75467add18
--- /dev/null
+++ b/sys-cluster/spark-bin/spark-bin-3.0.1-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2
+
+DESCRIPTION="Lightning-fast unified analytics engine"
+HOMEPAGE="https://spark.apache.org"
+SRC_URI="mirror://apache/spark/spark-${PV}/spark-${PV}-bin-without-hadoop.tgz -> ${P}-nohadoop.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=virtual/jre-1.8"
+
+DEPEND="
+	>=virtual/jdk-1.8"
+
+S="${WORKDIR}/spark-${PV}-bin-without-hadoop"
+
+DOCS=( LICENSE NOTICE README.md RELEASE )
+
+# Nothing to compile here.
+src_compile() { :; }
+
+src_install() {
+	dodir usr/lib/spark-${SLOT}
+	into usr/lib/spark-${SLOT}
+
+	local SPARK_SCRIPTS=(
+		bin/beeline
+		bin/load-spark-env.sh
+		bin/pyspark
+		bin/spark-class
+		bin/spark-shell
+		bin/spark-sql
+		bin/spark-submit
+	)
+
+	local s
+	for s in "${SPARK_SCRIPTS[@]}"; do
+		ebegin "Setting SPARK_HOME to /usr/lib/spark-${SLOT} in $(basename ${s}) script ..."
+		sed -i -e "2iSPARK_HOME=/usr/lib/spark-${SLOT}" "${s}"
+		eend $?
+		dobin "${s}"
+	done
+
+	insinto usr/lib/spark-${SLOT}
+
+	local SPARK_DIRS=( conf jars python sbin yarn )
+
+	local d
+	for d in "${SPARK_DIRS[@]}"; do
+		doins -r "${d}"
+	done
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Spark is now slotted. You have installed Spark ${SLOT}."
+	einfo
+	einfo "Make sure to add /usr/lib/spark-${SLOT}/{bin,sbin} directories"
+	einfo "to your PATH in order to run Spark shell scripts:"
+	einfo
+	einfo "$ export PATH=\$PATH:/usr/lib/spark-${SLOT}/bin"
+	einfo "$ export PATH=\$PATH:/usr/lib/spark-${SLOT}/sbin"
+	einfo
+}
diff --git a/sys-cluster/spark-bin/spark-bin-3.0.1.ebuild b/sys-cluster/spark-bin/spark-bin-3.0.1.ebuild
deleted file mode 100644
index 9c98c787d467..000000000000
--- a/sys-cluster/spark-bin/spark-bin-3.0.1.ebuild
+++ /dev/null
@@ -1,61 +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="Lightning-fast unified analytics engine"
-HOMEPAGE="https://spark.apache.org"
-SRC_URI="mirror://apache/spark/spark-${PV}/spark-${PV}-bin-hadoop2.7.tgz -> ${P}.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-DEPEND="
-	>=virtual/jdk-1.8"
-
-S="${WORKDIR}/spark-${PV}-bin-hadoop2.7"
-
-DOCS=( LICENSE NOTICE README.md RELEASE )
-
-# Nothing to compile here.
-src_compile() { :; }
-
-src_install() {
-	dodir usr/lib/spark
-	into usr/lib/spark
-
-	dobin bin/beeline \
-		bin/find-spark-home \
-		bin/pyspark \
-		bin/spark-class \
-		bin/spark-shell \
-		bin/spark-sql \
-		bin/spark-submit
-
-	insinto usr/lib/spark/bin
-	doins bin/load-spark-env.sh
-
-	insinto usr/lib/spark
-	doins -r conf
-	doins -r jars
-	doins -r python
-	doins -r sbin
-	doins -r yarn
-
-	dosym ../lib/spark/bin/beeline /usr/bin/beeline
-	dosym ../lib/spark/bin/find-spark-home /usr/bin/find-spark-home
-	dosym ../lib/spark/bin/pyspark /usr/bin/pyspark
-	dosym ../lib/spark/bin/spark-class /usr/bin/spark-class
-	dosym ../lib/spark/bin/spark-shell /usr/bin/spark-shell
-	dosym ../lib/spark/bin/spark-sql /usr/bin/spark-sql
-	dosym ../lib/spark/bin/spark-submit /usr/bin/spark-submit
-
-	doenvd "${FILESDIR}"/99spark
-	einstalldocs
-}