gentoo resync : 28.11.2020

18 files changed, 335 insertions, 263 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index b7bcd10d3c1d..b8b08eea3b00 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index e4c157ea5545..098621f8c829 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -41,7 +41,7 @@ DIST ceph-14.2.15.tar.gz 129254705 BLAKE2B bb30f04ace31c2175c6678a9f252fc31951fd
 DIST ceph-15.2.5.tar.gz 149219528 BLAKE2B 8f2cea9a258b7c530bff72a46d45fabf5364cf919f098c7d77857afa0dfdbcd7c290aa5a0d88cce1d99923588cc303d27c0b85179378ff1c394d9ce0f135a1b1 SHA512 55de068886c48293e92ef95cf8343ae44825fd2bf9c3fa7d47cda92907a47bae79e0af730cd34d0155b0777901d0fd6f9d1f30537c66c54c95098df7368fca2e
 DIST ceph-15.2.6.tar.gz 148124143 BLAKE2B 4132a2c50037839f712a796cf428190b0e450f0f8b6f157b3d983ca596d9e9e521f1f991c66e14455122c927ddaafada387ef780fd438b2506cfe56194177648 SHA512 0bbbbc532fb9f29437c094a86a1e58040f03b679e4d52ea9cc752ecf411c594c8ec37dc5e9f0ee47712d32b93b4e60b0f3fded280867d41c41b8db806b375e4e
 EBUILD ceph-14.2.13.ebuild 10566 BLAKE2B a99171d8aa6339d5c272fbfba934d5d750d8ea93411ff0e505c8b3f654734db1e943061a4c7d543655f5862b5e0bf5318f6e908642174c78ac4adefa9f9f4fef SHA512 03943fe5657614709aca3e4a6d4aa67fe1c23e9e397d020bec9119494dff7336a60e9ec29990ba97def09f2d61844ff1ef94e1b912dcc08dfc4c90a9647c91d8
-EBUILD ceph-14.2.15.ebuild 10607 BLAKE2B 698ecb05d0bc6b605594ce0ebdde60eba95ad22dad9ce85bac3e0759b5bc40e6c176376f8db374c81b860ea0738dcca14071e3bb7f4772805a4fd69a716fa234 SHA512 73235194dee7ad609c1d96a9deafb6a6d0442c8f0c10243eb63ce45755ce1097a97b1e3b21eec883ad8255c11f138844af5958c777288fab9af3df25a4523b0e
+EBUILD ceph-14.2.15.ebuild 10614 BLAKE2B ffd0ae927bf711fae3390de8bdd785b60579961881f8970d920fe655c4b2b860fd06c8c6f672256499142442882763e53381e47d79213d045e0c113dc5836b04 SHA512 eb0c2b70e7334014501efd91156a5806e5073a4a446abba6d041f960dac0feab20b95ea5f6135b5a1406fa294f5b68b626e32ea367a776f9e24a5f236c3a87e4
 EBUILD ceph-15.2.5-r1.ebuild 10820 BLAKE2B 141d965afdb9a09a5ea7d97684223f31f209bcf534f4e6067d526fd8a09f077f860db2915d2f434f21b1778b8c3c505e2ffc70a4415cd39bbad83e369986b5fa SHA512 f15e60946e0e0cc920ac61495010723e7146f12cf49298d074c3f4970b48e32672cf699792c988665a39260007bdcbff7fbfc7908743a0613e12d20e19df9051
-EBUILD ceph-15.2.6-r1.ebuild 10810 BLAKE2B a0dbb1e044a8711b4b30479266ddf484193099facd78d83fe676fb510d0bd4572fef7c1110f094c6e1cb0cbf140dbf00a59b46ea287164316844e057713d4583 SHA512 7513d909cc5f3cd0173d1cf7d01a4daf26ebd8c8807000076d6011ae1789d3172a5f40773086e7d429ed30e571b05c6fc926542a96eade48e741e47149593505
+EBUILD ceph-15.2.6-r1.ebuild 10817 BLAKE2B d808bedf02a00603712902de1feb3e697d83a2b652cdf57278889753d6c177a79ab9adefaa4b3b0dc63f20984d99f25e6f8339c88420397bb464b41a700b84cb SHA512 0201e816306a47ed330cd0df40ca5363a11acfa7ac207d7c09852e007cad33ca530a5a1164cfb6aa4aeed91d7029c909752a8d336396d29e50516d5093f6af8b
 MISC metadata.xml 2044 BLAKE2B f9a309d38c66cfb87071206331a6e2ba88366ed09802e949cb4499f1a0b2ee7a3ceca7df5653d1955c76ad2daf900aeee166265a2ced9c0b393e609f397dd563 SHA512 c051bacbbc9e64f0774714c1f6f8cf99990e1669de0ca1633173d870c03e04827cae993fd5e6846b310d838eead8471d2181a0678693ea43423e08795dfc0a47
diff --git a/sys-cluster/ceph/ceph-14.2.15.ebuild b/sys-cluster/ceph/ceph-14.2.15.ebuild
index 2731b083d38b..cd7f6cfa6cbc 100644
--- a/sys-cluster/ceph/ceph-14.2.15.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.15.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~ppc64"
 fi
 
 DESCRIPTION="Ceph distributed filesystem"
diff --git a/sys-cluster/ceph/ceph-15.2.6-r1.ebuild b/sys-cluster/ceph/ceph-15.2.6-r1.ebuild
index fc7c749fbf70..ee2ec4c70131 100644
--- a/sys-cluster/ceph/ceph-15.2.6-r1.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.6-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
 fi
 
 DESCRIPTION="Ceph distributed filesystem"
diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest
index 24cebb05b4cd..b9cc7442c122 100644
--- a/sys-cluster/drbd-utils/Manifest
+++ b/sys-cluster/drbd-utils/Manifest
@@ -1,9 +1,6 @@
 AUX drbd-utils-8.0.rc 3073 BLAKE2B 982d8e20bba38259cc9cb37c922a2653e65471cd7fc9a66ace58cfaaee7989b035076dac523484e0b9ba74a89e1a90f06844234aeb703556beaff66fc6564680 SHA512 9cd9de6d41552f080f3d590630ecd1686ea32b9e9db3b78a132e7fb55318a338331c09af5d80ba885d48a001ee3f7a6f791ddd806e834d2a7c72f01a00ec2f6c
 AUX drbd-utils-8.9.6-sysmacros.patch 1749 BLAKE2B 8d086d294c99f21c369821750b5772319f6cfe687251843cf741ac8c87f958986b2d464558b0dbe275e7a280eec9bc5ab6ce72a781d5c6b9f8d5dc25fac36855 SHA512 574c759a2125f2dbf240ab310cc57425773d75ec5e508693d09f506df704329c8a6e367f5621df5bb43fc1af22e65da1bd7631cb26715147b70c8704ab797d24
 AUX run-lock.patch 564 BLAKE2B 53062442dcc45c71eedde79e9d09b543ca6b6b48f552a5de95c14e5abc89296f111a11ffe109723de1602aab39dfccdfb016734b4ffceecb0a7bf94aa6ed8cea SHA512 779ad53c9f019b9dcc748177d6017ca06f1b450bf0889307c9660c574c09414964e4c5e4d6f2f3e8fc540ba14a1d489d09991b813af1581b2f6cd4ba491455ab
-DIST drbd-utils-8.9.3.tar.gz 768700 BLAKE2B 4d6989e69ecb68b3f4d68b0e807aa911e60511fc91c0ea4e7500d044262348ad00a5517505c9bb912ba392677cb4b6a64405a9821cf59f1200f8eb7b662d89ec SHA512 1b1cb3d1eb7f14f693e8a73b9864257e439e443ce685084c3864da4340113f18355d1e447177956ee0d8edcee35e771442b9f85b89ec5a6eb0ad717738461ca2
 DIST drbd-utils-8.9.6.tar.gz 788183 BLAKE2B 314c3c647f7fc52f82e94853949185daf4092e8c182c5799773e5d6b3e77995d2068087a10cf33133414c5fba91498a7cd1e5d487887aea03df3e18c0426dcb4 SHA512 cbdeeb7b298bc21de0d2188566362d7a634a72df243403f4bc91d5836c757f15ee86314b1385860aecda5657be5dc6309f2481b0403012bde841dd0618188938
-EBUILD drbd-utils-8.9.3.ebuild 2410 BLAKE2B 562b48faffe5e6c4e4e9984a3aea88dbf2d125c3822c361637588b40a01b0917e0a3fb67a4c25dd07001ed5263fde53c51210adf86b62ff63a5a8f5f6cc3818f SHA512 91530010427a1cbc5cc5ae8d6026954b626b21495dfc90c34ae92acead467813f7c7d929d32a3401b01b26cba31199c9ef78ad69d74484d59f924b51faf43928
 EBUILD drbd-utils-8.9.6-r1.ebuild 2478 BLAKE2B 5155f241126f545397c0ee4aead4dbfb2d291615f1d3e73ae81feacb9c806e25e02a8afbbf93b892c0488ed17801f43d548d671d2d66bbc69c04e758c2752fd3 SHA512 f4dbeeff4969083a531ccc164b14daa682b2f5cf5e375153c29ae1e5e698f15bcf70bf3b8584d5517820fc632bc984324ef74180e1cbb3aae5f67643bb29acef
-EBUILD drbd-utils-8.9.6.ebuild 2422 BLAKE2B d26972f0f86e93b7038a963921c888aa797898f67fbe2f59aead44b3c4e6452b608dc8bb43346de0fa2b25569c5980ec41c44ea2c016c1613ae99658e00a3bfd SHA512 d2c4b3ccc0ebefc7212a9575a4042770764ad922b6fa99bf25b85df3ccd55e477101b0ea2c9a885aa61800b42041aa0c29460223329f88934aecea5debba53b8
 MISC metadata.xml 677 BLAKE2B 79183e6930396061e7cf5c881ced8b4e3082a2b0dfdb4520e9de6afd54269b35ba972efd7dd3c3bd67cd103fd7d40693575a9d87b7b437438d5226e6e3453b5e SHA512 b97a7c5bb6ffe6de872f535d595507cd155923c920b9e7836f9a50afa992300b0b27d43805491cbbe6c348ecf99fc24367c375b6416dae73bffb4b6706f4b89a
diff --git a/sys-cluster/drbd-utils/drbd-utils-8.9.3.ebuild b/sys-cluster/drbd-utils/drbd-utils-8.9.3.ebuild
deleted file mode 100644
index 7bb3129097f5..000000000000
--- a/sys-cluster/drbd-utils/drbd-utils-8.9.3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1 eutils multilib udev versionator
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/${P/_/}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="heartbeat pacemaker +udev xen"
-SLOT="0"
-
-DEPEND="heartbeat? ( sys-cluster/heartbeat )
-	pacemaker? ( sys-cluster/pacemaker )
-	udev? ( virtual/udev )
-	!!sys-cluster/drbd"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P/_/}"
-
-src_prepare() {
-	# respect LDFLAGS, #453442
-	sed -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" \
-		-e "/\$(DESTDIR)\$(localstatedir)\/lock/d" \
-		-i user/*/Makefile.in || die
-
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
-		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
-		-i user/*/Makefile.in || die
-
-	# correct install paths (really correct this time)
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:$(get_bashcompdir):" \
-		scripts/Makefile.in || die
-
-	# don't participate in user survey bug 360483
-	sed -i -e '/usage-count/ s/yes/no/' scripts/global_common.conf || die
-	sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in || die
-
-	epatch "${FILESDIR}"/run-lock.patch
-
-	autoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		--with-bashcompletion \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools
-	dodoc README ChangeLog
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN/-utils/}
-
-	dodoc scripts/drbd.conf.example
-
-	dosym /usr/sbin/drbdadm /sbin/drbdadm
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN/-utils/}.conf.example.bz2 to /etc/${PN/-utils/}.conf"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-	elog "Remember to enable drbd support in kernel."
-}
diff --git a/sys-cluster/drbd-utils/drbd-utils-8.9.6.ebuild b/sys-cluster/drbd-utils/drbd-utils-8.9.6.ebuild
deleted file mode 100644
index d66c244db4a2..000000000000
--- a/sys-cluster/drbd-utils/drbd-utils-8.9.6.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1 eutils multilib udev versionator
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/${P/_/}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="heartbeat pacemaker +udev xen"
-SLOT="0"
-
-DEPEND="heartbeat? ( sys-cluster/heartbeat )
-	pacemaker? ( sys-cluster/pacemaker )
-	udev? ( virtual/udev )
-	!!sys-cluster/drbd"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P/_/}"
-
-src_prepare() {
-	# respect LDFLAGS, #453442
-	sed -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" \
-		-e "/\$(DESTDIR)\$(localstatedir)\/lock/d" \
-		-i user/*/Makefile.in || die
-
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
-		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
-		-i user/*/Makefile.in || die
-
-	# correct install paths (really correct this time)
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:$(get_bashcompdir):" \
-		scripts/Makefile.in || die
-
-	# don't participate in user survey bug 360483
-	sed -i -e '/usage-count/ s/yes/no/' scripts/global_common.conf || die
-	sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in || die
-
-	epatch "${FILESDIR}"/run-lock.patch
-
-	autoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		--with-bashcompletion \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools install-doc
-	dodoc README ChangeLog
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN/-utils/}
-
-	dodoc scripts/drbd.conf.example
-
-	dosym /usr/sbin/drbdadm /sbin/drbdadm
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN/-utils/}.conf.example.bz2 to /etc/${PN/-utils/}.conf"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-	elog "Remember to enable drbd support in kernel."
-}
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index cc91493bcc1d..ee3ea98d23e0 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -23,5 +23,5 @@ EBUILD galera-26.4.2.ebuild 1887 BLAKE2B 3cfcc688d2211a780d74e8c1001abb560c49903
 EBUILD galera-26.4.3.ebuild 1789 BLAKE2B 457e551c47e4711a1c4420aa667a4d949b386bac6942b9c20dfbc577d6158db07b103e542daaff2e71c3233d61a99921ab20d5bf901e7b10a543aeb880af1495 SHA512 78e370cee168728221740f984907f987c5c5f84a889e5ea62406bee503b8bd5638c2d3d1057dbd220f2a195f971fe91696e6f6e72d0f709df1fca3c5567e9660
 EBUILD galera-26.4.4.ebuild 1836 BLAKE2B e2fc171232d64252c1e4647c34d1bde5c37e326042d883515dd43ecd4b6722c23e669a8fd8a720941e75065239db8a6faa838f4727aa95288bdb1b70c09d0c6e SHA512 a8fef312f762fa23558da417d3463c1a9e1e4ce71dedbce4c6d0eb02d9f2fd1ebcda71e4fbd3dfeb0c0778d3a4adb60c954771a537278b7667945ec9fdcf9c94
 EBUILD galera-26.4.5.ebuild 1886 BLAKE2B 4a98c96e37676c0348581a6090338ec97b90915f4599aa3d001d2f866a26450dec5543ce82b818d144d3697ca4ba88f773fa7f9df8d7054310760a2bd5f5a674 SHA512 2b55cb4aa102aa713eb23ee2348b0fc92d82028d30920b6765155e6ff613ef8664e0f72d8c1e830bfd1cb5609c614ad6eaa9a50ec0a5748f101d5a0865408d0e
-EBUILD galera-26.4.6.ebuild 1885 BLAKE2B e3141f734bc6ba80b88c282c648f42e003c977e89be303d495fb114a88c869bd5c2745b2c9df6722402abb4a972518352d4b7f88a4818157f1da918b0693b4e5 SHA512 3be1b09df6441978ca734aa0fe62caea21bb47203ba881dd72569fda16f1bf91cd9c9bba418801f2387cb0fc3b9aff1eb317dcd9cdfc2cb7d54237d035eadef3
+EBUILD galera-26.4.6.ebuild 1884 BLAKE2B 11c0316dc2096c4d0db1ac5a93bacd80f28b200bf72a6f3afa139b6f9368bb57ffcc7d0d0f20d55f0f7fdb103228c9f16557c4eea6ece46d92de1a890f484a57 SHA512 5c31b2332101f7d4ebef37e26cf987588884b179e555b72cc53b29c1f80d1172ddc4f5c7f911940e00367f2b594fcc3a59676c28e85d6eea5162188662de83ba
 MISC metadata.xml 462 BLAKE2B 1b0826bcb2bd93caa5f017b3c530d3bea18daac9f457dc79d6436d21f41b8c33d2979469df870cbc68428ba0110d17013bf9cd82f4f46d9be43bf996f7815e0c SHA512 b99987e53ae976905d3e493b09cbe35161f90b8ebfc88c4a9616b8722b0a0005c2427d509e15fdd7bbb30977266188452b3b6ec7479a943bce3a5922410246e2
diff --git a/sys-cluster/galera/galera-26.4.6.ebuild b/sys-cluster/galera/galera-26.4.6.ebuild
index b459d342ff13..5043129e75d8 100644
--- a/sys-cluster/galera/galera-26.4.6.ebuild
+++ b/sys-cluster/galera/galera-26.4.6.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2 BSD"
 
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="cpu_flags_x86_sse4_2 garbd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 26c361d958f9..58d4cae20f0e 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,3 +1,5 @@
 DIST singularity-3.6.4.tar.gz 6183277 BLAKE2B 9fe9b28828149268506e4db895767528a9397c347905c170e96d8e0d7b9d715e4c5f212bf04a2418689f448e8045e52a16c8cc4e93a8066d4d651f1eeb918e92 SHA512 c12cdc6baba6089576396c4391367451a264d6bfe7dd9a4b582d21ee5bd49aeea79372f3d008a4f2f535af307e0890a8d1a72773bb2c0898872eed8c82e48991
+DIST singularity-3.7.0.tar.gz 6097313 BLAKE2B 2fa8472bea80fec2613d1598d89354c3655eadee2292f0a4921d680300bc5793c5721f9640aeb398eba6cc91540f132b9d9b2afa175e74ac9f53c8847ff21e13 SHA512 25faadd9b1ec4b9751534cf1176f294696c9afde50adbc42f67d86584a5122fc78500e4ac6c502e5d90a66a9b44b9097a4d0231afcc2615b25d95feab8a3c967
 EBUILD singularity-3.6.4.ebuild 1921 BLAKE2B 5ebd469923ae0c46f60db2197c103d9e7177afdda7bec141673e102c0911486cd88697fbddd89e54e23e5871cf0d8e660cce81f72ce6987b0a8465a624404241 SHA512 e875a95330b35d61cd78261400cca0b2610e3e530f4aaebc3f00af0623986ea448f3fc144eff4fd2e8659fcbe56808e00bf9a4a12fbef88dfa6b172e3a96593f
+EBUILD singularity-3.7.0.ebuild 1921 BLAKE2B 5ebd469923ae0c46f60db2197c103d9e7177afdda7bec141673e102c0911486cd88697fbddd89e54e23e5871cf0d8e660cce81f72ce6987b0a8465a624404241 SHA512 e875a95330b35d61cd78261400cca0b2610e3e530f4aaebc3f00af0623986ea448f3fc144eff4fd2e8659fcbe56808e00bf9a4a12fbef88dfa6b172e3a96593f
 MISC metadata.xml 451 BLAKE2B 0cca32721561e4100348cd884b88edad067a426736df27d4be6926525f9dd1315387dbefff84b983e69ab1972a44cd3a3a2c643bae676b413dab3482005d4ceb SHA512 da6f640f7df71bfe98fdabfe8ea69b1929b80b3c23d869dc496515a76d3f76c5d89d38843faf850184ddd7f624dd1e821dd50103f92e81aeb620a4bcd7151609
diff --git a/sys-cluster/singularity/singularity-3.7.0.ebuild b/sys-cluster/singularity/singularity-3.7.0.ebuild
new file mode 100644
index 000000000000..23232305c173
--- /dev/null
+++ b/sys-cluster/singularity/singularity-3.7.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info toolchain-funcs
+
+DESCRIPTION="Application containers for Linux"
+HOMEPAGE="https://sylabs.io"
+SRC_URI="https://github.com/hpcng/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples +network +suid"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+COMMON="sys-libs/libseccomp"
+BDEPEND="virtual/pkgconfig"
+DEPEND="${COMMON}
+	>=dev-lang/go-1.13.0
+	app-crypt/gpgme
+	dev-libs/openssl
+	sys-apps/util-linux
+	sys-fs/cryptsetup"
+RDEPEND="${COMMON}
+	sys-fs/squashfs-tools"
+
+CONFIG_CHECK="~SQUASHFS"
+
+S=${WORKDIR}/${PN}
+
+src_configure() {
+	local myconfargs=(
+		-c "$(tc-getBUILD_CC)" \
+		-x "$(tc-getBUILD_CXX)" \
+		-C "$(tc-getCC)" \
+		-X "$(tc-getCXX)" \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--runstatedir=/run \
+		--localstatedir=/var \
+		$(usex network "" "--without-network") \
+		$(usex suid "" "--without-suid")
+	)
+	./mconfig -v ${myconfargs[@]} || die "Error invoking mconfig"
+}
+
+src_compile() {
+	emake -C builddir
+}
+
+src_install() {
+	emake DESTDIR="${ED}" -C builddir install
+	keepdir /var/singularity/mnt/session
+
+	# As of version 3.5.3 this seems to be very much broken, affecting
+	# commands which have got nothing to do with singularity (example:
+	# completion on 'udisks mount -b /dev/' rejects all files from that
+	# directory other than 'autofs'). Moreover, this should go into
+	# $(get_bashcompdir) (from bash-completion-r1.eclass) rather than /etc.
+	# Hopefully temporary, which is why we delete this at install time
+	# instead of patching build scripts not to generate bash-completion
+	# data in the first place.
+	rm -rf "${ED}"/etc/bash_completion.d || die
+
+	dodoc README.md CONTRIBUTORS.md CONTRIBUTING.md
+	if use examples; then
+		dodoc -r examples
+	fi
+}
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
-}