14 files changed, 205 insertions, 140 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 5b7454e6cd04..10252257868f 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ampi/Manifest b/sys-cluster/ampi/Manifest
index 85b9f0f3c4c9..e15050eca34a 100644
--- a/sys-cluster/ampi/Manifest
+++ b/sys-cluster/ampi/Manifest
@@ -1,3 +1,3 @@
 DIST ampi-0_pre20140616.tar.gz 1127315 BLAKE2B e003f44f74449b40f5cb2c98ca4d0eebd39aa82363c519e86b58cdd11056153d8cf9b196819cb654fcfb9eaa12ef9ca8a819a1c06a1a1f34d599541b5ac6aece SHA512 b6a8790c1686a32546194fa6c3818aa9d2ba08911621d5251e85a4114dad75e350f18560cf0527811c487f804265bc09a4b80faeab5eafbd670e4dfa103fe078
-EBUILD ampi-0_pre20140616.ebuild 516 BLAKE2B 3591b399e0e5e33d1896ede3566790f4de473078fb0ac0e98296a2e8dd83ed7ce803464f381b90ae6bd532b5d02a39d3f83d37bafe00abe89921c68d7644a50b SHA512 77bf3aff6604a79a6027034ef497ea6be1a7de7abb32a17be48164239beeb8ebbd4657f5483f35632810ab04c1afe68c6bb74cf58a2d1968fbc37b9aab11ac56
+EBUILD ampi-0_pre20140616.ebuild 515 BLAKE2B 98e2756ae4ad2d45a4fc1f4a5a784f679c317bbe8a070667d69bbaa3ee8aaa29ca3459959f531880cb7b4a66b2407e57eaf61ae06f5bf191ea98403ddd65a227 SHA512 307290bea862b91024ea843bb05f12ff8e1def1cbf81d0c3124c220ac90eebedb156ae7a31486fdf9d0747b6e8ba3c9b68f55788c59cacd4e2a19b9fcd37ef9a
 MISC metadata.xml 258 BLAKE2B 860964b9257d6437e63725fa62b938b40a4b80018b8bcfa3386f53c1c6c1f5821ae70c7e88646036c5f4994ea6db89dee0242f61d1d360f139a419c54786ffd8 SHA512 74b70b0b8db56c49badc858fa51b04c9839a10381bb8d13480509467f9729df1c7bc199b06398c872e10d29d6d8bea8e7b10ded491f7f1c149c7a9193d6cfa9b
diff --git a/sys-cluster/ampi/ampi-0_pre20140616.ebuild b/sys-cluster/ampi/ampi-0_pre20140616.ebuild
index 8966cb761423..ecc74be35251 100644
--- a/sys-cluster/ampi/ampi-0_pre20140616.ebuild
+++ b/sys-cluster/ampi/ampi-0_pre20140616.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~jauhien/distfiles/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="virtual/mpi"
 DEPEND="${RDEPEND}"
diff --git a/sys-cluster/csync2/files/csync2.initd b/sys-cluster/csync2/files/csync2.initd
index d718a4990921..d718a4990921 100644..100755
--- a/sys-cluster/csync2/files/csync2.initd
+++ b/sys-cluster/csync2/files/csync2.initd
diff --git a/sys-cluster/ganglia/files/gmetad.rc-2 b/sys-cluster/ganglia/files/gmetad.rc-2
index 6b1306beec9a..6b1306beec9a 100644..100755
--- a/sys-cluster/ganglia/files/gmetad.rc-2
+++ b/sys-cluster/ganglia/files/gmetad.rc-2
diff --git a/sys-cluster/ganglia/files/gmond.rc-2 b/sys-cluster/ganglia/files/gmond.rc-2
index fb07e19073c0..fb07e19073c0 100644..100755
--- a/sys-cluster/ganglia/files/gmond.rc-2
+++ b/sys-cluster/ganglia/files/gmond.rc-2
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 503cdf073773..46207188aed1 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -10,6 +10,7 @@ DIST glusterfs-7.9.tar.gz 7702149 BLAKE2B e23b5a45a8c2c4f02f0992dfc78bea942a1dcc
 DIST glusterfs-8.3.tar.gz 7829522 BLAKE2B 1ba60f7209db4f1ce21237c3adea94df1b9eae04d15f99eb414bf961ea67aa7e08d01ea47c8793a33afbc0ff6cf63ecb81f78fa1ba74d66e2d4358ef2bdadacc SHA512 7ca9d3d8938eb27a7347461a07457e90d1ee6e8d5417970e38245c819cf09bf2ecf9de3954b75edf5cf14816e1059fb381b95935ae1f973ebd14ee7531322aa9
 DIST glusterfs-8.4.tar.gz 7833014 BLAKE2B c67f510c655465e9fbecaa7f391531543e37a2a84917592e699d88564b24fe55689b95770f385ac5b645069f287d4af974db76a77c0f44ea5d2e88f995b427f7 SHA512 a81394b3584c2e6c27060367b443c0879512054ed9287740bc24308603b9e3c11376179ed6589d5d38441982cd6415e3612f98ae4c97ddf7d5c747b42171d796
 DIST glusterfs-8.5.tar.gz 7873397 BLAKE2B 6ababf15fda216c9a47c05859f7123847d711dd5a12e3ec2c5dcf8475f35830c9a32f7b21ad763ab1be59b06f1d93f83acc0cbb8f7635456a3638be73b162aa4 SHA512 e256141a76deb9a255be31422d76b0c81aad4a7e5b166d2be90a79d340ceb811cbff11f469166ef7582f40f58f47fb056aa05aafd4b35f094bf9c21a5c08f3bb
+DIST glusterfs-8.6.tar.gz 7826147 BLAKE2B 3a8a488c9a8e4b1daf3ed01fa5e52a62cf791349c1169aaf8609252bfb8bc0a0534f9fc23fac27cfab11ac6fb5e3e1d9588b4ec8080b02cf97e679bf2c8fb5c2 SHA512 bb1125e5d6b4d424234bc40786847f217e7a05cecad1462dd91248cf9559569914f04e1f909e829051cb1db4079ecf906440a38af9de2bbf3bcf53ca8fa1f349
 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
@@ -17,6 +18,7 @@ EBUILD glusterfs-7.9-r1.ebuild 5919 BLAKE2B 5aaab652acccfea58034ad71ca937947fa4c
 EBUILD glusterfs-8.3-r1.ebuild 5433 BLAKE2B fef5fa52d039133126eb57fcd3578c487aceabe1776b5d6a5bc9ad07e3a9c1d6a6798c0c130b651a1430a09e67336bf5175f09e0fe811776045c8be4d0870fea SHA512 e850928695ea82b3f3257cd83be5f5d34de8d5dce807c5a86914caf4c796e5fd64be92a60cf5f71d02132e0575961c1d66ee7f735f5d1eab176c1b9139ca0db8
 EBUILD glusterfs-8.4-r1.ebuild 5433 BLAKE2B fef5fa52d039133126eb57fcd3578c487aceabe1776b5d6a5bc9ad07e3a9c1d6a6798c0c130b651a1430a09e67336bf5175f09e0fe811776045c8be4d0870fea SHA512 e850928695ea82b3f3257cd83be5f5d34de8d5dce807c5a86914caf4c796e5fd64be92a60cf5f71d02132e0575961c1d66ee7f735f5d1eab176c1b9139ca0db8
 EBUILD glusterfs-8.5-r1.ebuild 5434 BLAKE2B 7b819c7b98e882752f3c76a4df20d2c197c6d6b2bcdf6419972ce0a4bec33a6af72d9ae62307f87faf79b62980ab0a9d9aaaf221131625c3662c6e8e949881a6 SHA512 03a396e9b1c76ed932e8039945f007f71a137bd9966d598af6a3831a1af6b8e8c6a20b02ead72c896e1d312e221700c5843e507694e4189453e5c029b9986c4a
+EBUILD glusterfs-8.6.ebuild 5437 BLAKE2B b17aed1e93299d3c250573b471256ef6bb5ae04e28eff157768687c9bde845327ffc2d658497a70755edfe701f67dd5dd53f0a96af4574f324a48a4dac50eb8d SHA512 019608c3f35e3e68f421676909b7e0c9cb378b2c2f5178e2e1dbb48ee52e5212548c1a8353dcaf39cffc03293bfaa4c75ba8bdf5173c3c9bf234939186165421
 EBUILD glusterfs-9.1-r1.ebuild 5458 BLAKE2B a40723b4dcc5b58e363dd1be0fd00cd4f9b7c43f624cc4f89e083811d3bdbef166bd51f16c994f84ec67075f4d3ad47da4a7aff9d9771a2cb4a14356ec487f6c SHA512 26ad8356a77943c141344e1ba05d641398be4301ddb389e13462017a14c54a9c114167c4edd8fd495e636ed61bb0c0dbce1fbf886f60d61f583cf9e2a4e05b15
 EBUILD glusterfs-9.2-r1.ebuild 5458 BLAKE2B f44b0f014e5ae10f939ba1dec4815ca886ca4de737a69a45450089eb082c8d1d8eaf0ab70bcb0d741926c0daccb9faaf276c1e1a035da48d2a590a26707e7f41 SHA512 14ad8f4703bd2ee433a76f6b41e1740afcb7675ed16515845b092ce082619502b5b7305712a8c3531460f94310b4fa891aa22758f2d7b0182cd1b568ca9930bb
 EBUILD glusterfs-9.3.ebuild 5458 BLAKE2B f44b0f014e5ae10f939ba1dec4815ca886ca4de737a69a45450089eb082c8d1d8eaf0ab70bcb0d741926c0daccb9faaf276c1e1a035da48d2a590a26707e7f41 SHA512 14ad8f4703bd2ee433a76f6b41e1740afcb7675ed16515845b092ce082619502b5b7305712a8c3531460f94310b4fa891aa22758f2d7b0182cd1b568ca9930bb
diff --git a/sys-cluster/glusterfs/glusterfs-8.6.ebuild b/sys-cluster/glusterfs/glusterfs-8.6.ebuild
new file mode 100644
index 000000000000..6b77e7d8a679
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-8.6.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_{8,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/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/k3s/Manifest b/sys-cluster/k3s/Manifest
index 09c4aa2d3a42..069750aa16ec 100644
--- a/sys-cluster/k3s/Manifest
+++ b/sys-cluster/k3s/Manifest
@@ -2287,7 +2287,7 @@ DIST traefik-1.81.0.tgz 27292 BLAKE2B c15449a4e1485e2deafee8cf3964a05687b036ff2d
 DIST traefik-9.18.2.tgz 17026 BLAKE2B aa356f9b0778f90d53eee29581c9ee0e70fbba30e878c848ecf4a3af5322b854a7b1159f0e3d5d2a7469f00231c111dc0e590ce8292a6e4791e804323e783fcd SHA512 c52608ae34a3cf49688e221d342558588447ff0b618c2c06dc9e8c356425cbaca82e50cc78b77452ca71cb940230da097884cefa2d99aba3b7ac8cbb303765fd
 DIST vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.mod 20 BLAKE2B 9817a2968dcdd45e9e5d40b93cb54e6002d0aa6613f241bd77d448b3173b639f58a88d25899734be39a822473b4aac69ad947878006d5bb266a13f24637b0082 SHA512 b052661c1a3c2599fa350578cde2899166b39b71c65a6414ca7ea33e8d5186e85895ebd948819313781041d06fac3292cb08ad12447060df3860a86402344c24
 DIST vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.zip 27337 BLAKE2B a191bd4ef424697548532023bacc2f1cc67801e456d8ada577946204686c444b53c2bd3fc757f77aa07d8b79b3cd45f01e37b01521d6ebea0c621f87d246861c SHA512 77441a4a14c9b5c266eedde3c9eb6d7499a7a2ca57139071197b71fe2d3d1d1cc63c3eed95673733a2b855f329ccb30dcab568e1d743231eb1238ca0154524e6
-EBUILD k3s-1.19.10-r1.ebuild 88413 BLAKE2B 4fbe855f350744895e70430ff0c01d15bc7985b15626ec0b50a5483a9ff867fac2c4d3b52d0aff9fac2f940b37fd7ac0176274807e19edb40165b0e47719e8f4 SHA512 66f3fbbf969f8b437ce4c016afc25add1409fd87c7ac2dcb67b6f6342f91369857fb4e5dff7a9d20898b240221c428edc61761a5651cdd56e6aee96215179de6
-EBUILD k3s-1.20.6.ebuild 105187 BLAKE2B 7fce1ffaec9e1d1e8423bc968897e9e92cf84de7b00aa7d3fd9a3bf48ac794f80b0b42f1d6aef11a980695d94debdc05242fce10d80ad361214cff21a6bdad44 SHA512 aa5739a63844a74ad1e4469bdd059e12e6dd06d9395877fa8ab19d60167b9cd3338215e2f127827b4fff5021fcd36b9e3ac40ddfd53971714aec6725ed20b290
-EBUILD k3s-1.21.0.ebuild 108792 BLAKE2B eb7d2b7cd9ed04371c51f4a97e81276553792687f8f3d43d52a239656e46f29ed995d212d400d2a256d50e9c921648b263ae0b18920114c006f971c185d6a920 SHA512 10ad678917fd045d85ad88eee79aa429a510972f277be3d99fe2761febe99552eaa160bc29c1e14477c951f1e48bd0805e6930791ffa612cf92c96d5c76e3639
+EBUILD k3s-1.19.10-r1.ebuild 88419 BLAKE2B 57a216b0d88cf1b56e6fd84b0bdaf9d0e230cb952f293e8e8336576ac5708e50d147c6bd4e998f75bacc728c8f39ce4baf6ee6babf2c427b734811e29765acf0 SHA512 97873dfeaae3b100a430a976903bd8bd16b3361fc71f18b484eb7f926bf99f02b4f42d78137e7f2922210783cc08ae4fdf49571276a99c778676bcf3e3532c1c
+EBUILD k3s-1.20.6.ebuild 105193 BLAKE2B ce9f8aeb01c0617515f20476ec96caac710cf7f5ec0c17859e7483aea7bea6feacb6f1c008248d9b3e5e96dd1e7a33b7496c758f0efd5981632dccd14b1ff8e4 SHA512 ad266f48a566db505c1af3df25f8658c57976b2a6c09158ca73e7f40b98489c238eb2e4a4ed0dcda9262e61d61f8559a7af160dfd49cce03b860d4f722f71518
+EBUILD k3s-1.21.0.ebuild 108798 BLAKE2B 0792e76aa6ffda560cd8c5459c655bfce392d50bd6832cc80f6615ae617f4ce79472294a633784f55492bd9feffdfcf059e577b28bbbb3ab3dd2335233b34997 SHA512 fc11699588f41407c7d9ed1072103675b56768ea394b31f443bd7242169aba812e278543687d94292ca224f482c8a2e9b711637b9e548a2b26c0a701c072478d
 MISC metadata.xml 515 BLAKE2B dc5e9d23a7b4d84ec392036cd87975b9117133b3a68eb1a69a38637dfca36f4e721be42dbd1ee0dd73585602800ef49d4255ff736be7cdc97e7f2d07b59af99b SHA512 8ee732afdfd59151faa18dbc68075d0c528113b8ea3f9939d0a83fbf7f06deefe2dee27079b7317ee98ea165e81cf4514f1d305564e21b3e1fc4760d2350fd46
diff --git a/sys-cluster/k3s/k3s-1.19.10-r1.ebuild b/sys-cluster/k3s/k3s-1.19.10-r1.ebuild
index e5942a697cbc..542dd973dd3c 100644
--- a/sys-cluster/k3s/k3s-1.19.10-r1.ebuild
+++ b/sys-cluster/k3s/k3s-1.19.10-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://k3s.io"
 K3S_ROOT_VERSION=0.6.0-rc3
 K3S_TRAEFIK_VERSION=1.81.0
 K3S_CNIPLUGINS_VERSION=0.8.6
-CONFIG_CHECK="~BRIDGE_NETFILTER ~CFS_BANDWIDTH ~CGROUP_DEVICE ~CGROUP_PERF ~CGROUP_PIDS ~IP_VS ~MEMCG ~NETFILTER_XT_MATCH_COMMENT ~OVERLAY_FS ~VLAN ~VXLAN"
+CONFIG_CHECK="~BRIDGE_NETFILTER ~CFS_BANDWIDTH ~CGROUP_DEVICE ~CGROUP_PERF ~CGROUP_PIDS ~IP_VS ~MEMCG ~NETFILTER_XT_MATCH_COMMENT ~OVERLAY_FS ~VLAN_8021Q ~VXLAN"
 
 EGO_SUM=(
 "bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898"
diff --git a/sys-cluster/k3s/k3s-1.20.6.ebuild b/sys-cluster/k3s/k3s-1.20.6.ebuild
index a2e4b10c09af..b4f4388b9dc6 100644
--- a/sys-cluster/k3s/k3s-1.20.6.ebuild
+++ b/sys-cluster/k3s/k3s-1.20.6.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://k3s.io"
 K3S_ROOT_VERSION=0.8.1
 K3S_TRAEFIK_VERSION=1.81.0
 K3S_CNIPLUGINS_VERSION=0.8.6
-CONFIG_CHECK="~BRIDGE_NETFILTER ~CFS_BANDWIDTH ~CGROUP_DEVICE ~CGROUP_PERF ~CGROUP_PIDS ~IP_VS ~MEMCG ~NETFILTER_XT_MATCH_COMMENT ~OVERLAY_FS ~VLAN ~VXLAN"
+CONFIG_CHECK="~BRIDGE_NETFILTER ~CFS_BANDWIDTH ~CGROUP_DEVICE ~CGROUP_PERF ~CGROUP_PIDS ~IP_VS ~MEMCG ~NETFILTER_XT_MATCH_COMMENT ~OVERLAY_FS ~VLAN_8021Q ~VXLAN"
 
 EGO_SUM=(
 "bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898"
diff --git a/sys-cluster/k3s/k3s-1.21.0.ebuild b/sys-cluster/k3s/k3s-1.21.0.ebuild
index f6d024ad125b..c0155abd8c93 100644
--- a/sys-cluster/k3s/k3s-1.21.0.ebuild
+++ b/sys-cluster/k3s/k3s-1.21.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://k3s.io"
 K3S_ROOT_VERSION=0.8.1
 K3S_TRAEFIK_VERSION=9.18.2
 K3S_CNIPLUGINS_VERSION=0.8.6
-CONFIG_CHECK="~BRIDGE_NETFILTER ~CFS_BANDWIDTH ~CGROUP_DEVICE ~CGROUP_PERF ~CGROUP_PIDS ~IP_VS ~MEMCG ~NETFILTER_XT_MATCH_COMMENT ~OVERLAY_FS ~VLAN ~VXLAN"
+CONFIG_CHECK="~BRIDGE_NETFILTER ~CFS_BANDWIDTH ~CGROUP_DEVICE ~CGROUP_PERF ~CGROUP_PIDS ~IP_VS ~MEMCG ~NETFILTER_XT_MATCH_COMMENT ~OVERLAY_FS ~VLAN_8021Q ~VXLAN"
 
 EGO_SUM=(
 "bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898"
diff --git a/sys-cluster/lmod/Manifest b/sys-cluster/lmod/Manifest
index adece50ec85d..337454790715 100644
--- a/sys-cluster/lmod/Manifest
+++ b/sys-cluster/lmod/Manifest
@@ -1,9 +1,7 @@
 AUX 99lmod 22 BLAKE2B 6a470f0e5796f21f10e10161ee1fdb4fb3d794a9261bee9887c9e2d17959f21c8576fb3ada236a3a20a06e5d273d939751c5adbfb1bc6964247c19ad6b930461 SHA512 6aede256db3c633f7e6f7ad7d3a237563237b06ac499874c83e1d55177b0035cc4086bd10bfd7472075d10bc94d2e59c1e91790b7932d48433a34d5a7c304fc7
 AUX lmod-8.4.19-no-libsandbox.patch 374 BLAKE2B f4bf516a737f73cb547bd07933d2839748259bef017b740b2cb3e5e5fbba6909e932d3211edb1ba48fd16545ecfd7f3a2239046f5478bfad68f9d7ccdb296307 SHA512 9b5b5300588dda23efd82f8d55373be6f69289efad42260a721eb68dfc01475a8f18a9bba8eead8fe66724b8a8df0d75a4c6a85d51e0d3011cc1435cb8f148b6
 AUX module.1-8.4.20 7580 BLAKE2B 6b4f8f721178326a4124bb9c907d4dc0e7c1b7251c724af2826aa3f495af4702f0c9a8cbb06847fec5d44f525cd463b4f0ec898a6cd3074d11c3195ede191af5 SHA512 cfc9eb011f5e5fb2a40b9dfe71e6a888f573e17a55d0d34fe529dbb887ff7932e17c0172663c95dfbd00b67f883608921ae7bb19d352b6d9ce8207d13ca13c8b
-DIST lmod-8.4.20.tar.gz 19889342 BLAKE2B aef498ec8dd2b87aca02d66f394418aba4a81d1fec4684750e59d48d06bad16db7a24290920e40290ecba8a4bc65c7dbe5c23be28654db79433f41164fa4aaf6 SHA512 9749e34e7ad75531c87770b73fd20dab16c89c24e1a2d01e58f09f8510ffc8f896dfa7eab9dab26fe4d6d14ba04d331f98e08e92e0943aede9fe5131af038970
 DIST lmod-8.5.6.tar.gz 20986562 BLAKE2B 49a8062f92beb40ce364281f452d221df73ad540f4a510998a909d5733446c45e2cc017901ce5d2384b37a570b8dddcb16d0dc229209137e3a6483e29b97c8bf SHA512 652c678907740c89d6a86f1e403a3e8370e3e4666c03795340b4e70fab8c67a2e705c31fba84f05fd1bf15eb9868808896c73627e87617d2f2c0b5142c48fa97
-EBUILD lmod-8.4.20.ebuild 3343 BLAKE2B 93530c3a728eac023cee887c5f46ead4ab742d33a17bac361dde5db593aaf182362dd4282f078ed421f7d138532b0ee95d84ba9d4114684d0b95dbf08175b5cd SHA512 8186c2ecdb9d4befe1f1725aedeb2b9652ec0607ac88b49e388e6820948bcd6f7eaea9ff140af615b6705d05ea231f037273a48ceda2373ff77dbfda330fd383
 EBUILD lmod-8.5.6.ebuild 3350 BLAKE2B b8b1ed01bb89ae3fb14563f19840e52e8253259e6d26342f25e2fc2318eed3e571d5dffd647202ff338ecb5585d5e11da54b9d161a6e2d2384d92a9d0661afbe SHA512 e136eb34d6dacdd64f4e2e9d22e98353caed254e0f7a49a599fc66eb7a2cd8b555fb1958f4a0d5f2f310d97fe7856c3779264ce623d0dcda07ecc109c01b7819
 EBUILD lmod-9999.ebuild 3343 BLAKE2B 93530c3a728eac023cee887c5f46ead4ab742d33a17bac361dde5db593aaf182362dd4282f078ed421f7d138532b0ee95d84ba9d4114684d0b95dbf08175b5cd SHA512 8186c2ecdb9d4befe1f1725aedeb2b9652ec0607ac88b49e388e6820948bcd6f7eaea9ff140af615b6705d05ea231f037273a48ceda2373ff77dbfda330fd383
 MISC metadata.xml 1082 BLAKE2B e1c5bce422c3443f17bce9f852dbe768d0e36b54da5f65f8190f04b1d16cc824429370317a7f47c9f7859db476154c356f421746d1f0a23ff1a9b4ae96f15852 SHA512 24e13a07d9c620cd06ae54f92ef5c3f21fccd1582b0b6d5657b3fddbc5d29cbd1d7f046e279591d0894d9373ab5fa70f9eca120dda2b48b54369663b04525a19
diff --git a/sys-cluster/lmod/lmod-8.4.20.ebuild b/sys-cluster/lmod/lmod-8.4.20.ebuild
deleted file mode 100644
index b8c9fbcde3bf..000000000000
--- a/sys-cluster/lmod/lmod-8.4.20.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-inherit autotools lua-single
-
-DESCRIPTION="Environment Module System based on Lua"
-HOMEPAGE="https://lmod.readthedocs.io/en/latest https://github.com/TACC/Lmod"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/TACC/Lmod"
-else
-	SRC_URI="https://github.com/TACC/Lmod/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/Lmod-${PV}
-	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+auto-swap +cache duplicate-paths test"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${LUA_DEPS}
-	dev-lang/tcl
-	dev-lang/tk
-	$(lua_gen_cond_dep '
-		>=dev-lua/luafilesystem-1.8.0[${LUA_USEDEP}]
-		dev-lua/luajson[${LUA_USEDEP}]
-		dev-lua/luaposix[${LUA_USEDEP}]
-		dev-lua/lua-term[${LUA_USEDEP}]
-	')
-	virtual/pkgconfig
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}
-	test? (
-		$(lua_gen_cond_dep '
-			dev-util/hermes[${LUA_SINGLE_USEDEP}]
-		')
-		app-shells/tcsh
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-8.4.19-no-libsandbox.patch )
-
-pkg_pretend() {
-	elog "You can control the siteName and syshost settings by"
-	elog "using the variables LMOD_SITENAME and LMOD_SYSHOST, during"
-	elog "build time, which are both set to 'Gentoo' by default."
-	elog "There are a lot of options for this package, especially"
-	elog "for run time behaviour. Remember to use the EXTRA_ECONF variable."
-	elog "To see full list of options visit:"
-	elog "\t https://lmod.readthedocs.io/en/latest/090_configuring_lmod.html"
-}
-
-src_prepare() {
-	default
-	rm -r pkgs/{luafilesystem,term} || die
-	rm -r rt/{ck_mtree_syntax,colorize,end2end,help,ifur,settarg} || die
-	eautoreconf
-}
-
-src_configure() {
-	local LMOD_SITENAME="${LMOD_SITENAME:-Gentoo}"
-	local LMOD_SYSHOST="${LMOD_SYSHOST:-Gentoo}"
-
-	local LUAC="${LUA%/*}/luac${LUA#*lua}"
-
-	local myconf=(
-		--with-tcl
-		--with-fastTCLInterp
-		--with-colorize
-		--with-supportKsh
-		--without-useBuiltinPkgs
-		--with-siteControlPrefix
-		--with-siteName="${LMOD_SITENAME}"
-		--with-syshost="${LMOD_SYSHOST}"
-		--with-lua_include="$(lua_get_include_dir)"
-		--with-lua="${LUA}"
-		--with-luac="${LUAC}"
-		--with-module-root-path="${EPREFIX}/etc/modulefiles"
-		--with-spiderCacheDir="${EPREFIX}/etc/lmod_cache/spider_cache"
-		--with-updateSystemFn="${EPREFIX}/etc/lmod_cache/system.txt"
-		--prefix="${EPREFIX}/usr/share/Lmod"
-		--with-caseIndependentSorting
-		--without-hiddenItalic
-		--with-exportedModuleCmd
-		--with-useDotFiles
-		--without-redirect
-		--with-extendedDefault
-		$(use_with cache cachedLoads)
-		$(use_with duplicate-paths duplicatePaths)
-		$(use_with auto-swap autoSwap)
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-	default
-}
-
-src_test() {
-	local -x PATH="${EPREFIX}/opt/hermes/bin:${PATH}"
-	tm -vvv || die
-	testcleanup || die
-}
-
-src_install() {
-	default
-	newman "${FILESDIR}"/module.1-8.4.20 module.1
-	# not a real man page
-	rm -r "${ED}"/usr/share/Lmod/share/man || die
-	doenvd "${FILESDIR}"/99lmod
-	keepdir /etc/modulefiles
-	keepdir /etc/lmod_cache
-}
-
-pkg_postinst() {
-	if use cache ; then
-		elog "Lmod spider cache has been enabled."
-		elog "Remember to update the spider cache with"
-		elog "/usr/share/Lmod/libexec/update_lmod_system_cache_files \ "
-		elog "\t \$MODULEPATH"
-	fi
-}