gentoo resync : 10.09.2021

8 files changed, 161 insertions, 4 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index af4faf8f5e4f..0162c2101ef5 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest
index 3fe463bcc480..6c8d89827211 100644
--- a/sys-cluster/drbd-utils/Manifest
+++ b/sys-cluster/drbd-utils/Manifest
@@ -1,7 +1,7 @@
-AUX drbd-utils-8.0.rc 3073 BLAKE2B 982d8e20bba38259cc9cb37c922a2653e65471cd7fc9a66ace58cfaaee7989b035076dac523484e0b9ba74a89e1a90f06844234aeb703556beaff66fc6564680 SHA512 9cd9de6d41552f080f3d590630ecd1686ea32b9e9db3b78a132e7fb55318a338331c09af5d80ba885d48a001ee3f7a6f791ddd806e834d2a7c72f01a00ec2f6c
+AUX drbd-utils-8.0.rc 3077 BLAKE2B 2f6820c0705d315a5d7b018d1aa77bd7bfb27281c8406682cc19f82af023aab2b0a62d29e43c25204ffb52464c6a2306252c7f532730f10e12ab074eceed02c7 SHA512 efc3ff5566e8eebe033f1d76a183d84d242eaf63d0322579af4cd005eeed0e12f5d4660d778a4fcc83c6a5e457908322853bdd3d9f02573dd415844551662f21
 AUX drbd-utils-9.15.1-run-lock.patch 564 BLAKE2B f09107b53ee522976c40a91a4d6e267f1effb2bf3afadf77b2138af2031c59a88debc40ed06e1fe0d6fafe6773f3bf5358c315081eca3182853bf132632c617f SHA512 62faedab4668d31d86cfb634bde68aaeb7d9329d0e6948d46e2c0a90cf1988b68438ef1b71f9d84a4dd2230f0cef5179be80cf4a5aef22c30f59a0ab2906523c
 AUX drbd-utils-9.15.1-sysmacros.patch 950 BLAKE2B d5a81c0e13715c595ec25ae8e78a8176b46b437e01efa8d3a44d3ad6b143ac6ae723fa7f563b5d930d6b9dd82107ed02b5d67406732e2ff2675e1fe180cba657 SHA512 471877458ac9f8fbfe6c223f35ec51e487dfe0e8448ccbc17aabcfec002e9eeb1a3ab6d3477cce7e9791cab9b9db506519c409eee91bf45069fd35bb8bc81d58
 AUX run-lock.patch 564 BLAKE2B 53062442dcc45c71eedde79e9d09b543ca6b6b48f552a5de95c14e5abc89296f111a11ffe109723de1602aab39dfccdfb016734b4ffceecb0a7bf94aa6ed8cea SHA512 779ad53c9f019b9dcc748177d6017ca06f1b450bf0889307c9660c574c09414964e4c5e4d6f2f3e8fc540ba14a1d489d09991b813af1581b2f6cd4ba491455ab
 DIST drbd-utils-9.15.1.tar.gz 1229196 BLAKE2B c73cb624e4c35f2c5c001b4545c2ad806d3f13471aa25b0941d923020fe01a73405d1ed7c2ab2efe3afee0e59b8e9d401072edb788c57dc338fe3ddb4eebebf3 SHA512 bf9c46335500c0dd7afdc160221acaf8fd053afc453cb26cd76ef085c41580be5a62021ef1f1a57eac9df70d1158a008f489d1a8bb5c3329c5a187f79e4942de
-EBUILD drbd-utils-9.15.1-r1.ebuild 2692 BLAKE2B 5edf2a0685826f55b27eb6d7fba7f5451ee96c34a179cca644144202a44b2e2b824fb97ccdd135b6514822f2ac88d9063f7622fa89d8bc8edf1d033861ba5ae9 SHA512 c671b8ae9954e77f900269771aa830ca841b548dc69ac8017ce6f1d92c3d3585255ca82ec4fc9a7088d60e196a5f59fefdbd805ace3646187c18302c6eae2147
+EBUILD drbd-utils-9.15.1-r2.ebuild 2730 BLAKE2B 8dc9d7d8bf3bbd30aaa02552b0f3c8d5485b2f68f52f38eb2fe4daf5ddbc1ec020cb56ad5ff37bab5dbf889fa8eb32719536a293c74b39324f870474d4d5ead9 SHA512 9e1cf14d6f3e55f252a9fa7bb1bea5f184ee7ca435bc574cf0c28259dfb3a1da1d813db431df57725cf03b36c68c973d388d2beaef058f1ce154a1ca5076e494
 MISC metadata.xml 616 BLAKE2B 8e32a41be277b39c78fa33a8907a62bd4aa5571a358728de67c0e284161cc7a865c4b0f35656d59af1580f1641551623b5bae9d6f37b793985219e531a2c5733 SHA512 97070dfdf6732630859a1d9590ce6893f3bb6f47096ef25820c79b00d236df950a6d0b287d0ee42f2ffaa56d38dfa984bd7a1efa28a391bd2d4b5077409cd61b
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.15.1-r1.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.15.1-r2.ebuild
index f8a1b38d22fc..d080591f8106 100644
--- a/sys-cluster/drbd-utils/drbd-utils-9.15.1-r1.ebuild
+++ b/sys-cluster/drbd-utils/drbd-utils-9.15.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools bash-completion-r1 udev
+inherit autotools bash-completion-r1 tmpfiles udev
 
 DESCRIPTION="mirror/replicate block-devices across a network-connection"
 SRC_URI="https://www.linbit.com/downloads/drbd/utils/${P}.tar.gz"
@@ -93,6 +93,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process drbd.conf
+
 	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"
diff --git a/sys-cluster/drbd-utils/files/drbd-utils-8.0.rc b/sys-cluster/drbd-utils/files/drbd-utils-8.0.rc
index e2ced85b146c..e91e90c28860 100644
--- a/sys-cluster/drbd-utils/files/drbd-utils-8.0.rc
+++ b/sys-cluster/drbd-utils/files/drbd-utils-8.0.rc
@@ -12,7 +12,7 @@ depend() {
 }
 
 DEFAULTFILE="/etc/conf.d/drbd"
-DRBDADM="/sbin/drbdadm"
+DRBDADM="/usr/sbin/drbdadm"
 PROC_DRBD="/proc/drbd"
 MODPROBE="/sbin/modprobe"
 RMMOD="/sbin/rmmod"
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 7faf9b2922e2..784dc5aefe86 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -4,5 +4,7 @@ AUX keepalived.service 293 BLAKE2B e80be18a91569d73e64d12ff74622c866efc03522640f
 AUX keepalived.service-r1 349 BLAKE2B 8ad78799046d586a5f98ebd53b9f449918bea5947a818b88d92135f7269ec583e6c52c90f2e8ed365b8c96b66d019753a7f139b63d0cfd361d924372672a3d50 SHA512 4850d785ff6761c75a7f1a5cbf2d8ad0f96ab46287992123a3a8ae4085d7102fd8bbbbb6104ad35747beb8f04c9e0e3a0aceb95a900bb03f3b5575a9d8814d2e
 AUX keepalived.service.conf 47 BLAKE2B b6e32bf8c8a602186af776d85c6c457aad2408becfd24af4db6db6123946fba2443f51fae3df0d220a4ebf9ae81a02f4bc1ee0d1d1a7a4b050802336c029c87e SHA512 ecf081bd59c57d6be3627ab42183bdebe58f65355c9cfa3e753a9b1fbf64e7731a7b26ec3ef2bf0422c1a6de4eb1d8d84787ca4d3def2d1f12caed9b64b5063a
 DIST keepalived-2.2.2.tar.gz 1159896 BLAKE2B 42ff86b4aa7c0a45a3472102107701262b44b780987ed93f3dde7005f61699c1488fd92fccb75f77ef5dcc83461428bbad79cc59cd4648a824a8bfbe7fbd2c34 SHA512 05bb589c76faa4d3f734ecb1a3e5ac40af006fe5dce962bcd9617f192e59bb5336a911b148c1530fb864333da87c3d42a6fbf7d0ef074f6a53ce5a71db8ec706
+DIST keepalived-2.2.4.tar.gz 1151290 BLAKE2B 835198fb23312e87894e7740427411d974c00f71029b273d8da3e787ef92848127d896b456fb40db8d802b6c7555e6524872f136f868e19c62387a9471e44b0f SHA512 b8b0f3e7092b7b7093a9927259928076ee95ed176dd26b3a5c38e8c0dc7b83468433944905618dbc9e4b73b81b0cd3f16c2db4234ed4fcdf30f4fc0e532f9422
 EBUILD keepalived-2.2.2.ebuild 2143 BLAKE2B d546ec6c395f17c112846ee33a230a755d110bdc08ba33f4e7499e4b5f3d7872f7197e2d7dd8f365daffe3d950463a526fd0c292e89e85db2bd20493485c8348 SHA512 0cc2d2950552d0299afa49d394ae26c9a69d52d1ca7de97f216591f49696ec7592925b534d3d84f7aad02a060ffe429cd7e43bb1d8da8f91889d515a705049af
+EBUILD keepalived-2.2.4.ebuild 1924 BLAKE2B d710011d822862b5eeee8000e6854440339920f65a8a0868fe1302404283a3cc2ca3a75fab07643e24825b84148ff7b41b9d767facaa691d481e3e3fd2e6915a SHA512 a8e6d84be3799ce1699d7ce84860b7068a3894d924a9ac59dce0192cea58a349347138f82a5d4a18135c3a4cef058254395d56ae0e56ccb056e80eac6112ee0e
 MISC metadata.xml 612 BLAKE2B 0ab97817bb6e83b80383a05e33408074e7f9919c051c0582262487405b306693a7a48dafcb9d11c4bda1ecdd99ea4b79d5277e37502a5fc22472bb07ec9a4662 SHA512 0270c60c6750450cca5f5e9a51266a5de888aab07b06d791e77fc4bdbb14d4f13e6b83f9a819ce3183943a6d27c213052225ac8989849f0ffe3aad1afba4297e
diff --git a/sys-cluster/keepalived/keepalived-2.2.4.ebuild b/sys-cluster/keepalived/keepalived-2.2.4.ebuild
new file mode 100644
index 000000000000..ac5d8315368e
--- /dev/null
+++ b/sys-cluster/keepalived/keepalived-2.2.4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project"
+HOMEPAGE="https://www.keepalived.org/"
+SRC_URI="https://www.keepalived.org/software/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+bfd dbus json regex snmp systemd"
+
+RDEPEND="
+	dev-libs/libnl:=
+	dev-libs/openssl:=
+	dev-libs/popt
+	net-libs/libnfnetlink
+	sys-apps/iproute2
+	regex? ( >=dev-libs/libpcre2-8:= )
+	dbus? (
+		sys-apps/dbus
+		dev-libs/glib:2
+	)
+	json? ( dev-libs/json-c:= )
+	snmp? ( net-analyzer/net-snmp:= )
+	systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-4.4"
+
+DOCS=(
+	README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO
+	doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# keepalived has support to dynamically use some libraries instead of
+	# linking them:
+	#--enable-dynamic-linking \
+	#--enable-libiptc-dynamic \
+	#--enable-libnl-dynamic \
+	#--enable-libxtables-dynamic \
+	econf \
+		--with-init="$(usex systemd systemd custom)" \
+		--with-kernel-dir="${ESYSROOT}"/usr \
+		--enable-vrrp \
+		$(use_enable bfd) \
+		$(use_enable dbus) \
+		$(use_enable json) \
+		$(use_enable regex) \
+		$(use_enable snmp) \
+		$(use_enable snmp snmp-rfc) \
+		$(use_enable systemd)
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/keepalived.init-r1 keepalived
+	newconfd "${FILESDIR}"/keepalived.confd-r1 keepalived
+
+	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+
+	use snmp && dodoc doc/*MIB.txt
+
+	# This was badly named by upstream, it's more HOWTO than anything else.
+	newdoc INSTALL INSTALL+HOWTO
+
+	# Clean up sysvinit files
+	rm -rv "${ED}"/etc/sysconfig || die
+}
diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 9785d9331de0..b4353549742f 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,5 +1,7 @@
 DIST singularity-3.8.0.tar.gz 7892955 BLAKE2B a75c9a5646cf5bfcc906bdda0e72e062787f6694322ca62ff329c63dfad051edc6c751e4e58cf01476a133947d87ad6230ba60e2d7b7da75ba654486a6c8d48c SHA512 b1e3dc673fbf58d8fa13bea4c67114d1abf0f17e86f1958f585795374107f6b18dd854899b4a574dc3e4d8d4abf4177c26e63c7c3436ae1d35c66331f1630272
 DIST singularity-3.8.1.tar.gz 7935330 BLAKE2B 112e04936086b5c068730f8ef52927f4c6c5257b5057828f80946e1a9a5fd83aa657ab55d55c270351835500ca9c0fccc22695cc0c3012d69f411f1b6c5152ab SHA512 7303f82c0ac821f30aab301eb7cb60bc3a56ccef3e21d881f2facc87805ac4b9cf9d776f502766512e91de59863e693189a7509296494fcf028f8453459758a8
+DIST singularity-3.8.3.tar.gz 7948604 BLAKE2B 67c8f4e52faf46a25c1bc16d4f05100f92cfb67b111898bebaeed827bb545f9d44fc3aaae99cbea020ec934c7dd3412b119a3f7f3f003f3e09a5e86dd2816957 SHA512 ede69bfa6602d75f67354afc215a1cf51db769df052662b77a8f1ac88cf580f13683190231452611ba618cda0e63af746dcdf59ab41611a9035bd199f8b50ec5
 EBUILD singularity-3.8.0.ebuild 1900 BLAKE2B a24c10ad485b5359a304caf1c85dcd1529e41d50070f842b9d36f1ef79c76edd51ed44f8bceddeea729038eb299e1a917036fef34f036413255033e3e4c0d3ae SHA512 32764eddc65b36a265c7527852b4b1709dca3f1cc17ad38ea75950fd2972643f0f13238df1e481fe392762ef6755e83707b64037b36f73dd18a923ee0f28058c
 EBUILD singularity-3.8.1.ebuild 1902 BLAKE2B 2eb0b09273480ac09f1ff9fbfc759046253660bba7c049b80890ea91ba78c4cf05b583ec4eb8db40450cdc1e06261fbced9c4f6d22cfe05ded82ec66c9eb4206 SHA512 e9a894fc5313729fa28c4353cf4b0ca298a2aeb9ebeaaa67b03a9aa0cf90e7c8e39fd7effd6f8f50c5f85e1d0ba60be77a2d4f58b881d2ffc75c20f6956f0982
+EBUILD singularity-3.8.3.ebuild 1902 BLAKE2B 4a74b5f864d91a365ed02f1258acde2f9d9eb35eba1d30a15b7d9e588f6f208914a53b1618d0b9ce7578c86b48df16008ae70951201c1ffbf0f08ba493c4b0ba SHA512 efbf3bf5206298278de52089717652b4bd82c994d543a7594854c49473f23726b2836629c67ea23d2e635d8c26fe95512d4b606966883e2e54b6408d7533d742
 MISC metadata.xml 451 BLAKE2B 0cca32721561e4100348cd884b88edad067a426736df27d4be6926525f9dd1315387dbefff84b983e69ab1972a44cd3a3a2c643bae676b413dab3482005d4ceb SHA512 da6f640f7df71bfe98fdabfe8ea69b1929b80b3c23d869dc496515a76d3f76c5d89d38843faf850184ddd7f624dd1e821dd50103f92e81aeb620a4bcd7151609
diff --git a/sys-cluster/singularity/singularity-3.8.3.ebuild b/sys-cluster/singularity/singularity-3.8.3.ebuild
new file mode 100644
index 000000000000..f65b278b7031
--- /dev/null
+++ b/sys-cluster/singularity/singularity-3.8.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+
+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
+}