9 files changed, 272 insertions, 168 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index a04828efe268..7221ea38e9a0 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 759340f5e48f..314c07f51ef8 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -12,10 +12,12 @@ DIST glusterfs-8.4.tar.gz 7833014 BLAKE2B c67f510c655465e9fbecaa7f391531543e37a2
 DIST glusterfs-8.5.tar.gz 7873397 BLAKE2B 6ababf15fda216c9a47c05859f7123847d711dd5a12e3ec2c5dcf8475f35830c9a32f7b21ad763ab1be59b06f1d93f83acc0cbb8f7635456a3638be73b162aa4 SHA512 e256141a76deb9a255be31422d76b0c81aad4a7e5b166d2be90a79d340ceb811cbff11f469166ef7582f40f58f47fb056aa05aafd4b35f094bf9c21a5c08f3bb
 DIST glusterfs-9.1.tar.gz 8206207 BLAKE2B dea099eb1d366704010247964c24de404fb09c00a375dde4af30a2af836d3b35689fab91a75268aa01dba45860eb50a6e0572913c059e53fb5799d2302c2f005 SHA512 2c26813f12fed7a0640cc470badc2b83f156b660ef475487a689dca6c3fa407192f4959aeaf7a981969a079cf5d2c7aace85ff818ea6133d5a085d90d226e1da
 DIST glusterfs-9.2.tar.gz 8212980 BLAKE2B 7fb42186c5d309c357f72e3037fc09d8b15f32770d74173dd4779bab91056d1ceb78a4a651fec2018faf1597357576d41593e9d7b04cf9af7f4742301b284b01 SHA512 34a0a1745029e2fad3c8fc6a044b4e4645f8cf11eddc3c8c8e94cce9733449248c577ce6066bc49010a65121d991daf67766393fe513ac694082f0efa1d4ef95
+DIST glusterfs-9.3.tar.gz 8167846 BLAKE2B 119e2c089ef250fafb2b2dfdcf71f40cc25fdda6ac1cbb38a8557a3c206f721227eceadd87b40341e6bf2b32a7cb24996910f45e061f25d193ab2ca4070ddc76 SHA512 0974cf57a6810505f767c490b53201e62bb73ca2fd3c5203d9882dcbe4088c816afb5445ef606d12fb797b1b1fa5e0994f2ea0816577f70e630637668a20f005
 EBUILD glusterfs-7.9-r1.ebuild 5918 BLAKE2B 30a380db21aa976157cffa6da38443b5466ca014e6088915cc7b251671e0d218505938110a10caaab4f68d920920429fc768b7bd4fdc40fa43adbee5e430a1c4 SHA512 d04251b216950f23b5d4a7c95dc62f665da1af04073e9f5a647146411918d377e3152e90023daed81ad6f8e6358b3f43e9901943751ee6ab42baf6903267d1bd
 EBUILD glusterfs-8.3-r1.ebuild 5432 BLAKE2B 82e9ee097997352a86510a7ca3c8a7d450899a6ed96044f7e707fdaa952ad6a6c43fee6e4a557732f3f12dc2173146edbf4ae42d544494e8b659d6edf9146cd5 SHA512 ac49472d7d75eeecc7ee8f005a8d5f5be25eae6458888bb5b083c2e78bb764b31592f058907bdd44da148995900991e0fc0ab2923677c433959f9f2a3d427daf
 EBUILD glusterfs-8.4-r1.ebuild 5432 BLAKE2B 82e9ee097997352a86510a7ca3c8a7d450899a6ed96044f7e707fdaa952ad6a6c43fee6e4a557732f3f12dc2173146edbf4ae42d544494e8b659d6edf9146cd5 SHA512 ac49472d7d75eeecc7ee8f005a8d5f5be25eae6458888bb5b083c2e78bb764b31592f058907bdd44da148995900991e0fc0ab2923677c433959f9f2a3d427daf
-EBUILD glusterfs-8.5-r1.ebuild 5438 BLAKE2B 240fa1b843a881dbac772b8efd5a8fc2839f6daa9d25ca2bdb384f5744ad68a8c4fb6eee2745aa848a059c7f8033f6e34c86fa8bdbf21b14ca323e306d73a318 SHA512 9600b3bda87e097149924f702c386b5219d9b0ca5a23d2cae2ee9622d4645c3b90a929dda9f222a4f44474a349d6ca3697d3573c33266091c950b7d7343d07ae
+EBUILD glusterfs-8.5-r1.ebuild 5435 BLAKE2B b6927b8bf21012364e6f3d68f44793caa690c8d6e2efebda13facc3b167c36676ad7a18c0ec33e448d01f8ce0d0f7d5cab083a5bec23df3386c297f4f8e3cc45 SHA512 6770dae5eb113af3ab3f614fce8e3b48f924b6a227053bd42a9f3fbe65bbd2c905826f60345a8e7a9d5ab40215a1736e4da4dd18cd6d7aedd0b0b1163e4a1104
 EBUILD glusterfs-9.1-r1.ebuild 5457 BLAKE2B e9f8b7201eacc9705295a498e0e136742b9cd414f4492e99609d26c3adfa1ea76b62856596a3c30c1349fd25afb19bd502d643ad5cb857b9fab8d6b6db8dbb04 SHA512 746d669c2f0cfb6d996a5128b3c604ab83c39f9a552b26c6e3a7131b564624d25623bb152248e22033046c236efb669c66236c0499f927fe4c098d4eeb14ad66
 EBUILD glusterfs-9.2-r1.ebuild 5458 BLAKE2B f44b0f014e5ae10f939ba1dec4815ca886ca4de737a69a45450089eb082c8d1d8eaf0ab70bcb0d741926c0daccb9faaf276c1e1a035da48d2a590a26707e7f41 SHA512 14ad8f4703bd2ee433a76f6b41e1740afcb7675ed16515845b092ce082619502b5b7305712a8c3531460f94310b4fa891aa22758f2d7b0182cd1b568ca9930bb
+EBUILD glusterfs-9.3.ebuild 5458 BLAKE2B f44b0f014e5ae10f939ba1dec4815ca886ca4de737a69a45450089eb082c8d1d8eaf0ab70bcb0d741926c0daccb9faaf276c1e1a035da48d2a590a26707e7f41 SHA512 14ad8f4703bd2ee433a76f6b41e1740afcb7675ed16515845b092ce082619502b5b7305712a8c3531460f94310b4fa891aa22758f2d7b0182cd1b568ca9930bb
 MISC metadata.xml 1516 BLAKE2B dc32b16a9cc12174d5cf6a82f8d45920392d43545a4ed9be1c6a0ec3bc50b7c51a647b049c1b74971e95a4de949c9205ad168bfc8f074ca4c535d2999b917d3a SHA512 04542d21102f1722d8f82e498f38e91316932d96f0a05eec74180e4ad133b83fd26d58d3591d2906995072c184822d7ed16357d741b7de99a0c7ff7571da6a08
diff --git a/sys-cluster/glusterfs/glusterfs-8.5-r1.ebuild b/sys-cluster/glusterfs/glusterfs-8.5-r1.ebuild
index 18671f3fc19e..4b6e8a174620 100644
--- a/sys-cluster/glusterfs/glusterfs-8.5-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-8.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.
 
 LICENSE="|| ( GPL-2 LGPL-3+ )"
 SLOT="0/${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~x86"
 
 IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs +syslog test +xml"
 
diff --git a/sys-cluster/glusterfs/glusterfs-9.3.ebuild b/sys-cluster/glusterfs/glusterfs-9.3.ebuild
new file mode 100644
index 000000000000..8bc22e9cba26
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-9.3.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit autotools elisp-common python-single-r1 tmpfiles
+
+DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
+HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/"
+SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 LGPL-3+ )"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs +syslog test +xml"
+
+REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} xml )
+	ipv6? ( libtirpc )"
+
+# the tests must be run as root
+RESTRICT="test"
+
+# sys-apps/util-linux is required for libuuid
+RDEPEND="
+	acct-group/gluster
+	acct-user/gluster
+	dev-libs/libaio
+	dev-libs/userspace-rcu:=
+	net-libs/rpcsvc-proto
+	sys-apps/util-linux
+	sys-libs/liburing:=
+	sys-libs/readline:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+	fuse? ( >=sys-fs/fuse-2.7.0:0 )
+	georeplication? ( ${PYTHON_DEPS} )
+	xml? ( dev-libs/libxml2 )
+	!elibc_glibc? ( sys-libs/argp-standalone )
+	libtirpc? ( net-libs/libtirpc:= )
+	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
+	dev-libs/openssl:=[-bindist(-)]
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/acl
+	test? ( >=dev-util/cmocka-1.0.1
+		app-benchmarks/dbench
+		dev-vcs/git
+		net-fs/nfs-utils
+		virtual/perl-Test-Harness
+		dev-libs/yajl
+		sys-fs/xfsprogs
+		sys-apps/attr )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
+
+# Maintainer notes:
+# * The build system will always configure & build argp-standalone but it'll never use it
+#   if the argp.h header is found in the system. Which should be the case with
+#   glibc or if argp-standalone is installed.
+
+pkg_setup() {
+	python_setup "python3*"
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# build rpc-transport and xlators only once as shared libs
+	find rpc/rpc-transport xlators -name Makefile.am -exec \
+		sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' {} + || die
+
+	# fix execution permissions
+	chmod +x libglusterfs/src/gen-defaults.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-fusermount \
+		$(use_enable debug) \
+		$(use_enable fuse fuse-client) \
+		$(use_enable georeplication) \
+		$(use_enable static-libs static) \
+		$(use_enable syslog) \
+		$(use_enable test cmocka) \
+		$(use_enable xml xml-output) \
+		$(use libtirpc || echo --without-libtirpc) \
+		$(use ipv6 && echo --with-ipv6-default) \
+		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile extras/glusterfs-mode.el
+}
+
+src_test() {
+	./run-tests.sh || die
+}
+
+src_install() {
+	default
+
+	rm \
+		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
+		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
+		"${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
+
+	if use rsyslog ; then
+		insinto /etc/rsyslog.d
+		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
+	fi
+
+	if use emacs ; then
+		elisp-install ${PN} extras/glusterfs-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
+	insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
+
+	# insert some other tools which might be useful
+	insinto /usr/share/glusterfs/scripts
+	doins \
+		extras/backend-{cleanup,xattr-sanitize}.sh \
+		extras/clear_xattrs.sh \
+		extras/migrate-unify-to-distribute.sh
+
+	# correct permissions on installed scripts
+	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
+	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
+
+	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
+	newinitd "${FILESDIR}/glusterd-r4.initd" glusterd
+	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
+
+	keepdir /var/log/${PN}
+	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
+
+	# QA
+	rm -r "${ED}/var/run/" || die
+	if ! use static-libs; then
+		find "${D}" -type f -name '*.la' -delete || die
+	fi
+
+	python_optimize "${ED}"
+}
+
+pkg_postinst() {
+	tmpfiles_process gluster.conf
+
+	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
+	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
+	elog "  /etc/init.d/glusterd start"
+	echo
+	elog "For static configurations, the glusterfsd startup script can be multiplexed."
+	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
+	elog "separate service.  To create additional instances of the glusterfsd service"
+	elog "simply create a symlink to the glusterfsd startup script."
+	echo
+	elog "Example:"
+	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
+	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
+	elog "You can now treat glusterfsd2 like any other service"
+	echo
+	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
+	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
+	ewarn "run GlusterFS."
+	echo
+	elog "If you are upgrading from a previous version of ${PN}, please read:"
+	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index c53830c8fe28..7faf9b2922e2 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -3,10 +3,6 @@ AUX keepalived.init-r1 539 BLAKE2B 90675bc2863c7a2b704c14807ca39c7cd35e2f9281384
 AUX keepalived.service 293 BLAKE2B e80be18a91569d73e64d12ff74622c866efc03522640f33e1cb89e4d232f39bb65b3d2aa7c093e93a5fbe41937a5ab4fe3a77d6864f335e04dea6bf898d4ba84 SHA512 c9d9c190a7892b3c9535ab51da45893bf6ff6738e64f832f52e22f435e4ef4e014f74dcb63f51b76a624ba39dc4dbd3542ada1971d361fd3da966bb649355ec7
 AUX keepalived.service-r1 349 BLAKE2B 8ad78799046d586a5f98ebd53b9f449918bea5947a818b88d92135f7269ec583e6c52c90f2e8ed365b8c96b66d019753a7f139b63d0cfd361d924372672a3d50 SHA512 4850d785ff6761c75a7f1a5cbf2d8ad0f96ab46287992123a3a8ae4085d7102fd8bbbbb6104ad35747beb8f04c9e0e3a0aceb95a900bb03f3b5575a9d8814d2e
 AUX keepalived.service.conf 47 BLAKE2B b6e32bf8c8a602186af776d85c6c457aad2408becfd24af4db6db6123946fba2443f51fae3df0d220a4ebf9ae81a02f4bc1ee0d1d1a7a4b050802336c029c87e SHA512 ecf081bd59c57d6be3627ab42183bdebe58f65355c9cfa3e753a9b1fbf64e7731a7b26ec3ef2bf0422c1a6de4eb1d8d84787ca4d3def2d1f12caed9b64b5063a
-DIST keepalived-2.0.20.tar.gz 1036063 BLAKE2B 217dee8c6dcb148119822f3c6a0b57482e91a17671a35333d0dccf04a3f7c6606a1c9e0b3f2a3adeab838fd91b7c714a0bf11895fe0c7d90d836d3585620c8e2 SHA512 36bbc4aa0a1045486e608c9f4ed73f4335b871dae88beaed10d86445474c462136885225cd6b61219a36fca2ff43771623bc6d072e406cf684acc2ca8f2a38f6
-DIST keepalived-2.1.5.tar.gz 1081559 BLAKE2B 791de7f24d012d77fbf9573713ab158cd91c08b969982b5d6bb86e5e6ed347281378dd5106a05db2f37fd9ab2eb479c131333b4b8c6983671b18652122fdbe37 SHA512 107d071aa1546023a3eb7c2cba4707ab6fbb10af62984ab41c9358b5e28289f8f277456983fe8649a15a77939734d3af573b8b050500d9eb521b4b0537f97aa6
 DIST keepalived-2.2.2.tar.gz 1159896 BLAKE2B 42ff86b4aa7c0a45a3472102107701262b44b780987ed93f3dde7005f61699c1488fd92fccb75f77ef5dcc83461428bbad79cc59cd4648a824a8bfbe7fbd2c34 SHA512 05bb589c76faa4d3f734ecb1a3e5ac40af006fe5dce962bcd9617f192e59bb5336a911b148c1530fb864333da87c3d42a6fbf7d0ef074f6a53ce5a71db8ec706
-EBUILD keepalived-2.0.20.ebuild 2000 BLAKE2B 78bc40bc66c58f9c339de897dbeb6d45ae93b129f7ddbce9616f464307481394a45691ad258001153f5125f7cc87c6858039653d00308de96a269f5e5166d4f5 SHA512 ce3e6d6f63c3cc65a93950dfee0b64a1782b14c011cf64e2452d36858e8aa42487b15465868bf759f2b3101723ae834dd6bc6e1dda7d524164680a3076d828ca
-EBUILD keepalived-2.1.5.ebuild 2000 BLAKE2B 78bc40bc66c58f9c339de897dbeb6d45ae93b129f7ddbce9616f464307481394a45691ad258001153f5125f7cc87c6858039653d00308de96a269f5e5166d4f5 SHA512 ce3e6d6f63c3cc65a93950dfee0b64a1782b14c011cf64e2452d36858e8aa42487b15465868bf759f2b3101723ae834dd6bc6e1dda7d524164680a3076d828ca
 EBUILD keepalived-2.2.2.ebuild 2143 BLAKE2B d546ec6c395f17c112846ee33a230a755d110bdc08ba33f4e7499e4b5f3d7872f7197e2d7dd8f365daffe3d950463a526fd0c292e89e85db2bd20493485c8348 SHA512 0cc2d2950552d0299afa49d394ae26c9a69d52d1ca7de97f216591f49696ec7592925b534d3d84f7aad02a060ffe429cd7e43bb1d8da8f91889d515a705049af
 MISC metadata.xml 612 BLAKE2B 0ab97817bb6e83b80383a05e33408074e7f9919c051c0582262487405b306693a7a48dafcb9d11c4bda1ecdd99ea4b79d5277e37502a5fc22472bb07ec9a4662 SHA512 0270c60c6750450cca5f5e9a51266a5de888aab07b06d791e77fc4bdbb14d4f13e6b83f9a819ce3183943a6d27c213052225ac8989849f0ffe3aad1afba4297e
diff --git a/sys-cluster/keepalived/keepalived-2.0.20.ebuild b/sys-cluster/keepalived/keepalived-2.0.20.ebuild
deleted file mode 100644
index 5deb4e2046eb..000000000000
--- a/sys-cluster/keepalived/keepalived-2.0.20.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-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 )"
-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 \
-	STRIP=/bin/true \
-	econf \
-		--with-init=custom \
-		--with-kernel-dir=/usr \
-		--enable-sha1 \
-		--enable-vrrp \
-		$(use_enable bfd) \
-		$(use_enable dbus) \
-		$(use_enable json) \
-		$(use_enable regex) \
-		$(use_enable snmp) \
-		$(use_enable snmp snmp-rfc)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/keepalived.init-r1 keepalived
-	newconfd "${FILESDIR}"/keepalived.confd-r1 keepalived
-
-	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
-
-	use snmp && dodoc doc/*MIB.txt
-
-	docinto genhash
-	dodoc genhash/README genhash/AUTHOR genhash/ChangeLog
-	# This was badly named by upstream, it's more HOWTO than anything else.
-	newdoc INSTALL INSTALL+HOWTO
-
-	# Security risk to bundle SSL certs
-	rm -v "${ED}"/etc/keepalived/samples/*.pem || die
-	# Clean up sysvinit files
-	rm -rv "${ED}"/etc/sysconfig || die
-}
diff --git a/sys-cluster/keepalived/keepalived-2.1.5.ebuild b/sys-cluster/keepalived/keepalived-2.1.5.ebuild
deleted file mode 100644
index 5deb4e2046eb..000000000000
--- a/sys-cluster/keepalived/keepalived-2.1.5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-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 )"
-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 \
-	STRIP=/bin/true \
-	econf \
-		--with-init=custom \
-		--with-kernel-dir=/usr \
-		--enable-sha1 \
-		--enable-vrrp \
-		$(use_enable bfd) \
-		$(use_enable dbus) \
-		$(use_enable json) \
-		$(use_enable regex) \
-		$(use_enable snmp) \
-		$(use_enable snmp snmp-rfc)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/keepalived.init-r1 keepalived
-	newconfd "${FILESDIR}"/keepalived.confd-r1 keepalived
-
-	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
-
-	use snmp && dodoc doc/*MIB.txt
-
-	docinto genhash
-	dodoc genhash/README genhash/AUTHOR genhash/ChangeLog
-	# This was badly named by upstream, it's more HOWTO than anything else.
-	newdoc INSTALL INSTALL+HOWTO
-
-	# Security risk to bundle SSL certs
-	rm -v "${ED}"/etc/keepalived/samples/*.pem || die
-	# Clean up sysvinit files
-	rm -rv "${ED}"/etc/sysconfig || die
-}
diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index ad831a1c2115..9785d9331de0 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,3 +1,5 @@
 DIST singularity-3.8.0.tar.gz 7892955 BLAKE2B a75c9a5646cf5bfcc906bdda0e72e062787f6694322ca62ff329c63dfad051edc6c751e4e58cf01476a133947d87ad6230ba60e2d7b7da75ba654486a6c8d48c SHA512 b1e3dc673fbf58d8fa13bea4c67114d1abf0f17e86f1958f585795374107f6b18dd854899b4a574dc3e4d8d4abf4177c26e63c7c3436ae1d35c66331f1630272
+DIST singularity-3.8.1.tar.gz 7935330 BLAKE2B 112e04936086b5c068730f8ef52927f4c6c5257b5057828f80946e1a9a5fd83aa657ab55d55c270351835500ca9c0fccc22695cc0c3012d69f411f1b6c5152ab SHA512 7303f82c0ac821f30aab301eb7cb60bc3a56ccef3e21d881f2facc87805ac4b9cf9d776f502766512e91de59863e693189a7509296494fcf028f8453459758a8
 EBUILD singularity-3.8.0.ebuild 1900 BLAKE2B a24c10ad485b5359a304caf1c85dcd1529e41d50070f842b9d36f1ef79c76edd51ed44f8bceddeea729038eb299e1a917036fef34f036413255033e3e4c0d3ae SHA512 32764eddc65b36a265c7527852b4b1709dca3f1cc17ad38ea75950fd2972643f0f13238df1e481fe392762ef6755e83707b64037b36f73dd18a923ee0f28058c
+EBUILD singularity-3.8.1.ebuild 1902 BLAKE2B 2eb0b09273480ac09f1ff9fbfc759046253660bba7c049b80890ea91ba78c4cf05b583ec4eb8db40450cdc1e06261fbced9c4f6d22cfe05ded82ec66c9eb4206 SHA512 e9a894fc5313729fa28c4353cf4b0ca298a2aeb9ebeaaa67b03a9aa0cf90e7c8e39fd7effd6f8f50c5f85e1d0ba60be77a2d4f58b881d2ffc75c20f6956f0982
 MISC metadata.xml 451 BLAKE2B 0cca32721561e4100348cd884b88edad067a426736df27d4be6926525f9dd1315387dbefff84b983e69ab1972a44cd3a3a2c643bae676b413dab3482005d4ceb SHA512 da6f640f7df71bfe98fdabfe8ea69b1929b80b3c23d869dc496515a76d3f76c5d89d38843faf850184ddd7f624dd1e821dd50103f92e81aeb620a4bcd7151609
diff --git a/sys-cluster/singularity/singularity-3.8.1.ebuild b/sys-cluster/singularity/singularity-3.8.1.ebuild
new file mode 100644
index 000000000000..2c112879880a
--- /dev/null
+++ b/sys-cluster/singularity/singularity-3.8.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 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"
+
+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
+}