gentoo resync : 17.02.2021

41 files changed, 1055 insertions, 268 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index b068b9f2858a..a4fb184fcb23 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 1ada9bc0c169..69d039be5fa3 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,14 +1,11 @@
 AUX cinder.initd 494 BLAKE2B f919de45b8e39b65d355f627fcd71a4c23a7bb550157d25811c1d1f3a84b9f1c1e7c596361ec5d2aab650f1ebf3f0f053e313f2e15be64995d1309a6eafc8a69 SHA512 be3c2e6798b08527487cfd2b1cd66a03d891526a45f52c97a536b15a08d46a4162e3b036dcae86911c7dba25c5d7f02e73a089d4dd720526bf38ecd0f44c59b0
 AUX cinder.sudoersd 86 BLAKE2B 1ea49d3cf3bc134ea0a2d5512c6e258f117187267bfa408fea0d2449a091068e5404812a0e693f226d895ec23766ed73aca36128d6f7b968ae44dc38b8ad948a SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1
-DIST cinder-16.2.0.tar.gz 5484918 BLAKE2B f2259dd21c060280e856c053bece8fd635f289d8100710b177105227a5ce3a4c4e380b49261671294cf85975c9f665646cefe5f9d66d873e1938a7d141156f4e SHA512 586057d49f9c94daaf163dacf979e62d18be7489b43eeedfa7caa4d23a4a6060f455eea7162020319187466f308d0480a3efb047d0b34ce013f1b5c632e30755
 DIST cinder-16.2.1.tar.gz 5531297 BLAKE2B c517515df669e9aafbc1b8d80e8f422bbe6cf55ded044d03fd21142fafdc2e81f5f211c5ce3f39f2fd965f324194635efa7b53aee05113abff8f9d2f6438f3f9 SHA512 37fd7025f4490a35214bf4ac90b5b8ec9d21752ab54295403e6d485e429ffe8172c33e692e5f516156a58358b35da60fc7a8f7f25daa4b0d405db25beadd59b7
 DIST cinder-17.0.1.tar.gz 5815391 BLAKE2B cae43e4668560b9a329e65738533a6c015b42210c45f10d82ab758509f676778503152ba75f0ac862b040b9a489b92cf59f8da83e36e9610696e14c9e0d573c8 SHA512 44cadb33ea22953c05105e336555798b2332b0c77f1e9baedeaef58fe300caa70174a5fa4ad94a515f1bd0c685b15ca639053001d4a5b12ad9cceb385f2a63ba
-DIST cinder.conf.sample-16.2.0 183294 BLAKE2B 5d0f28b9ad200d912c42c34ca030a5ec3660c57db332677e1b66b314a2865187862c83baf78d122fc0af7f73fbf4f0c7f04b9253882d228dcb863bfc88e37e72 SHA512 faf712a3da37af05e642b3c14f98ce8d4e3db5b736b208d7ca8a18be02ac5626c94b4ed314bd0030d5fa3771b325ba0f24ec3a45188d27fd9de79c97b56e2626
 DIST cinder.conf.sample-16.2.1 183294 BLAKE2B 5d0f28b9ad200d912c42c34ca030a5ec3660c57db332677e1b66b314a2865187862c83baf78d122fc0af7f73fbf4f0c7f04b9253882d228dcb863bfc88e37e72 SHA512 faf712a3da37af05e642b3c14f98ce8d4e3db5b736b208d7ca8a18be02ac5626c94b4ed314bd0030d5fa3771b325ba0f24ec3a45188d27fd9de79c97b56e2626
 DIST cinder.conf.sample-17.0.1 186451 BLAKE2B efc75cf3c5e852d411d9c2ed2080eb554a5f81c9b39a2ee9cf44add21842c05ea5b03cc66747da2182d2efc73d83b55323cecd4aa34db99369bf62b5ed1795bc SHA512 ee60a62ec8490a38c995f9c4a9ede8eeec631745bdbc9bc6e1d195370687de5d99aa8754ea017f23e6a9542b987842c7ffd7cf203bfed37f2a7ddbe61a82d517
 DIST cinder.conf.sample-2020.1.9999 183294 BLAKE2B 5d0f28b9ad200d912c42c34ca030a5ec3660c57db332677e1b66b314a2865187862c83baf78d122fc0af7f73fbf4f0c7f04b9253882d228dcb863bfc88e37e72 SHA512 faf712a3da37af05e642b3c14f98ce8d4e3db5b736b208d7ca8a18be02ac5626c94b4ed314bd0030d5fa3771b325ba0f24ec3a45188d27fd9de79c97b56e2626
 DIST cinder.conf.sample-2020.2.9999 186451 BLAKE2B efc75cf3c5e852d411d9c2ed2080eb554a5f81c9b39a2ee9cf44add21842c05ea5b03cc66747da2182d2efc73d83b55323cecd4aa34db99369bf62b5ed1795bc SHA512 ee60a62ec8490a38c995f9c4a9ede8eeec631745bdbc9bc6e1d195370687de5d99aa8754ea017f23e6a9542b987842c7ffd7cf203bfed37f2a7ddbe61a82d517
-EBUILD cinder-16.2.0.ebuild 7626 BLAKE2B 2d2eacf1a1ea90dc0a8f93caca9bc0ed9876862d85b55e9845be979e87c773bdae48c464741d7220f87be0ec9bea9eb69e9af56c2fb5e1d39910abcdd63471e5 SHA512 11019a13e8f7811228e95d3dffba35cce531de79b4abf42701f72e1d217fb5fa2314033d4d39da1b931a1e66eca06d87c1ba652f34d44fadcccba4407cca9aed
 EBUILD cinder-16.2.1.ebuild 7626 BLAKE2B 4ee5a6b8642109db40af87b5d3653184e8754001fa9643d295c83e9eb86664206f57def3861fc601200b9107f17f438371f09d360014728ee2242de124d276d9 SHA512 7c0a7c404aeebede9a635da2c09b492a4bc969a50194eb048c2d0181f03f4d9872652051542d01d1a631c2071135d7dc7cb44fbebf61656dabd99b8cd992f404
 EBUILD cinder-17.0.1.ebuild 6816 BLAKE2B 20bbc45b13c84fd757fcb9a81250f1433d4de7bae16ae2125aafd5a29b4dd476cc0fd0dbdea29d30a8e5cc046972c6e7319f89aba12e8b9fbb0be1d3c0121e6c SHA512 5be7b0f976de53d4830e0056f810ec96e35a4d2cde853514552e0dd87dfe6e4ce9e5b281de4aea36672f5c045b5ab679c557999de59644a15b363b5d0c60947e
 EBUILD cinder-2020.1.9999.ebuild 7628 BLAKE2B 89c1b14ec775f5635cb0a39ed2fe3b37678c2ae57dc968908b62b94296fb022b876c311eeb43898f8b0d96b1cde152799e7606237e8fa123ab8088e67b9247ad SHA512 62b9ea484e242f6a1bfbbc6ccaeba4a1c063300cc868f191c6980f4a8196409831df4acf82a5f89f8bb7dbed5da61381f2c019a225cfa7bf175c13d745305016
diff --git a/sys-cluster/cinder/cinder-16.2.0.ebuild b/sys-cluster/cinder/cinder-16.2.0.ebuild
deleted file mode 100644
index a1258620e5cf..000000000000
--- a/sys-cluster/cinder/cinder-16.2.0.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 eutils linux-info
-
-DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
-HOMEPAGE="https://launchpad.net/cinder"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ussuri/cinder.conf.sample -> cinder.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/cinder.git"
-	EGIT_BRANCH="stable/ussuri"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ussuri/cinder.conf.sample -> cinder.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="${CDEPEND}
-	app-admin/sudo"
-
-#	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]  # do not include, upstream depricated
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.21.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.35.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-6.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.44.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.34.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.15.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.65[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/tabulate-0.8.5[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-vmware-2.35.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
-	iscsi? (
-		tgt? ( sys-block/tgt )
-		sys-block/open-iscsi
-	)
-	lvm? ( sys-fs/lvm2 )
-	memcached? ( net-misc/memcached )
-	app-emulation/qemu
-	sys-fs/sysfsutils
-	acct-user/cinder
-	acct-group/cinder"
-# qemu is needed for image conversion
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES=""
-	if use tcp; then
-		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
-	fi
-	if use rdma; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
-	fi
-	if use infiniband; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
-	fi
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	# only used for docs
-	sed -i '/^sphinx-feature-classification/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
-	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/cinder
-	dodir /etc/cinder/rootwrap.d
-
-	for svc in api scheduler volume; do
-		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
-	done
-
-	insinto /etc/cinder
-	insopts -m0640 -o cinder -g cinder
-	doins "etc/cinder/api-httpd.conf"
-	doins "etc/cinder/logging_sample.conf"
-	doins "etc/cinder/rootwrap.conf"
-	doins "etc/cinder/api-paste.ini"
-	doins "etc/cinder/resource_filters.json"
-	newins "${DISTDIR}/cinder.conf.sample-${PV}" "cinder.conf.sample"
-	insinto /etc/cinder/rootwrap.d
-	doins "etc/cinder/rootwrap.d/volume.filters"
-
-	dodir /var/log/cinder
-	fowners cinder:cinder /var/log/cinder
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/cinder.sudoersd" cinder
-	# stupid python
-	rm -r "${ED}"/usr/etc
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "Cinder needs tgtd to be installed and running to work with iscsi"
-		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
-	fi
-}
diff --git a/sys-cluster/cluster-glue/Manifest b/sys-cluster/cluster-glue/Manifest
index 6d092a0cb1df..ae35b4120f1c 100644
--- a/sys-cluster/cluster-glue/Manifest
+++ b/sys-cluster/cluster-glue/Manifest
@@ -1,7 +1,7 @@
 AUX heartbeat-logd.init 954 BLAKE2B b00280f93cb0a3f3f8f19d3170472e87d705f91113fc7d3fe1d0ecf45cb079673c5777acdc8ed3de63fb64848ce0e33e536f86e7dc74c86eb08e7a32da6e12fa SHA512 ef59ad02a608810750cc0241f4d0eb7584624e419f735e0e69b61c2865b68241e9b90a1d817bb838d744d955d9c67708fb89c36df35b17a0f8ef6243904b32c5
 DIST glue-1.0.11.tar.bz2 466057 BLAKE2B 929c9f803814fb1162d4058e0fb78deb96b6be9b4064dae96ea5653521f5dfb862850ab2c9010530ac652264c5e8e379cb397fc173f720d126540405b264ca5b SHA512 35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413
 DIST glue-1.0.12.tar.bz2 451569 BLAKE2B c074507563e797f105318bfcfab3e73eb1b62eb3037689c2b68f1b98f02b4a2c1da2e0b2931cd28ccc194d9f3b486733f642c6ff071c4f7629062d40c8d39427 SHA512 d5d2f6c426d2bed0d39269338fedfffe840a90ff56b05dff395243d0d8b803593bf35bbce5f7dce376120cd7ddef78400914cb7515b5451c287a1e9e74233122
-EBUILD cluster-glue-1.0.11.ebuild 2114 BLAKE2B ceed47fb890eb36379b44c614c70ed7ad91421d555c4636fa18b1e5aef4e3e845bdf97f068a5165abd67b91f630eeae863a49fcd297c67d888d7070b52a84cb8 SHA512 13170f5134a3b0f1dcc91cffea2f30b1329c8b3f12be60eec862c2f1da491e261b3374772685bbd4f7ad4676c82f528baafc10c132b3db273736d128d5a2b8e5
+EBUILD cluster-glue-1.0.11.ebuild 2085 BLAKE2B 564ceeac29e2beb5570f630171e569c82227f82f559dfa8ce49814881215ebc19b8219bb1af8be36be3e563681963cda2acc002e72716198967b0553a7dc4bf7 SHA512 527882693c8869506c1de7950fb108833302c83dcc44ec26bde198d789b69880f9a8ba037c4ee9123c4390d4387dbcdc01f953dcaeb021856498e341a8815d64
 EBUILD cluster-glue-1.0.12-r1.ebuild 2247 BLAKE2B ca2dbf83463efd2d659ea2dd1ff6bac0c6f2996ad5e05cd11aed6c8999feb93f0f024ce6bba49380d92bcc5e953135d0f87fe2072275d33b25de695614bb816f SHA512 f79078a84869d3bee3c5e6acc1f15c4f11204fec17d42204cb934f4eca7c7081ddb6463e8871f99b297cb8ea3d16e7aa3bbbb87e6ebdd3b34b0cb2c45921c2c0
-EBUILD cluster-glue-1.0.12.ebuild 2132 BLAKE2B 14e678fb6e61d5fe7c15b1047511257924262d9ec3d3b025b42dd7c09a6b027a3798452712763d7ef269f19beee98d9e6d71eafa0ab7fca15e8dc5bdedbdaaac SHA512 b70eb65a9c07e2bc1ac4f3720f59536c5194ae0b9f9a911f0a112b1754317fdf794c0bad290f2a21ed033cd26c1e61e406033b031d0b484371a027a7d0d633fb
+EBUILD cluster-glue-1.0.12.ebuild 2103 BLAKE2B 71068ec025695afa43153b8b7b5e98c0796ac7e306960d951f035c5bc30ee307199fd39b199d4a6863e49930d89e065daa3bedff563f797120f979596cb95d4f SHA512 a1ef1dc934f9ce0b6983d3fbdf0586ed01edf535a2b4e3c60d6e6e8c7e5d813339c497a7aba5d5b759b408660cabb000b01458d9d8f71024c433b702ae15c1ea
 MISC metadata.xml 582 BLAKE2B 5792be1499f85328ff85ec074189187e014c2eadf29b4ddaf4a64c71977ccf5ce91d86f251fe90f3540a7cfab8d52145cd5c085199c6e1099df5dbe801fc4291 SHA512 a2312279ff8e3e47db3d1a560699d76233dae3963cc094aefbbe965af053fe4299e95133d5f40aa69a565c91c21ce9d358020726d3c8c590255dcac72901d7e3
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild
index e7ce0226b21f..bdf6cdef9dd0 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,8 +23,7 @@ RDEPEND="app-arch/bzip2
 	net-misc/curl
 	net-misc/iputils
 	|| ( net-misc/netkit-telnetd net-misc/telnet-bsd )
-	dev-libs/libxml2
-	!<sys-cluster/heartbeat-3.0"
+	dev-libs/libxml2"
 DEPEND="${RDEPEND}
 	doc? (
 		dev-libs/libxslt
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
index 0ca1f1059689..4e18625e1dbf 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,8 +24,7 @@ RDEPEND="app-text/asciidoc
 	net-misc/curl
 	net-misc/iputils
 	|| ( net-misc/netkit-telnetd net-misc/telnet-bsd )
-	dev-libs/libxml2
-	!<sys-cluster/heartbeat-3.0"
+	dev-libs/libxml2"
 DEPEND="${RDEPEND}
 	doc? (
 		dev-libs/libxslt
diff --git a/sys-cluster/crmsh/Manifest b/sys-cluster/crmsh/Manifest
index b26494c5cdbb..685e34fa0066 100644
--- a/sys-cluster/crmsh/Manifest
+++ b/sys-cluster/crmsh/Manifest
@@ -1,3 +1,3 @@
 DIST crmsh-4.2.1.tar.gz 1058921 BLAKE2B 84d1f8685e792d9f453b2d185ccda4e8c2c9566becd85ed8308c014bd18e1479f601f3e89e4a1c3464c0d5bb797d7ddf9ddff479cd8c4c0d2998fd528f8ecbd2 SHA512 df0945f1b977993a0aca89af7c9030bc798aac4397a9d448d47bf68331e8aec83fa6155f2897f3c84573bcdb20fa384a1489b4f1d69fd1a831ece2fdb2b5b321
-EBUILD crmsh-4.2.1.ebuild 902 BLAKE2B c68805358b8d2783a3e74dbaf29ba291703f75a69cc11134cf054f8ed0855329892760e148ec18d3331155079f1ce773e57f75b68ced693218145e30ba4e1b0d SHA512 d4a7099f3ca3517b0f9ef720d61624ef03d481e907d3ab72d1fd0b20e772ee6de9de65c016ce5fc624fad72544bc7a5c2a4a0e6f8e999592af2b8f895ca19f8b
+EBUILD crmsh-4.2.1.ebuild 890 BLAKE2B 2d638b809d513dc1bed18dcc2e527cc819617db512e7252a34e47d6a7b517dc7e1038856bd2479b58431f519a2a0482e4f412d44e0214c7edc96dd16123cb1d0 SHA512 614aa3e4728348e4b7457c9ce05b780e8d7262c9d64606a4c4dcba4502dedfe8ee6409f87fd114c687af8c1555dd733bcfb7d806051a7e22e122a3fab503285e
 MISC metadata.xml 343 BLAKE2B 7ecf74be968150181c3df6d9fd7f56957bbfc760390a428097d0033099120ca9ba1c14e50a4b084af8f60e84447a899e554b8f3933819f16ce5e8c149e787206 SHA512 0830e62f1461e108e47feed29a48d172e63003be6d55e10f647f9a02ef90c0c7b3ad0c1e6a805edef9ebe6b015adfa3b86fbc058d0c9e19188f9e9f8304a5d91
diff --git a/sys-cluster/crmsh/crmsh-4.2.1.ebuild b/sys-cluster/crmsh/crmsh-4.2.1.ebuild
index 312f01a1ed1b..9397c762c646 100644
--- a/sys-cluster/crmsh/crmsh-4.2.1.ebuild
+++ b/sys-cluster/crmsh/crmsh-4.2.1.ebuild
@@ -6,7 +6,6 @@ EAPI=6
 PYTHON_COMPAT=( python3_{7,8,9} )
 
 AUTOTOOLS_AUTORECONF=true
-KEYWORDS=""
 SRC_URI=""
 
 if [[ ${PV} == *9999 ]]; then
diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest
index b9cc7442c122..7b4006c5b6e8 100644
--- a/sys-cluster/drbd-utils/Manifest
+++ b/sys-cluster/drbd-utils/Manifest
@@ -1,6 +1,10 @@
 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 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-8.9.6.tar.gz 788183 BLAKE2B 314c3c647f7fc52f82e94853949185daf4092e8c182c5799773e5d6b3e77995d2068087a10cf33133414c5fba91498a7cd1e5d487887aea03df3e18c0426dcb4 SHA512 cbdeeb7b298bc21de0d2188566362d7a634a72df243403f4bc91d5836c757f15ee86314b1385860aecda5657be5dc6309f2481b0403012bde841dd0618188938
+DIST drbd-utils-9.15.1.tar.gz 1229196 BLAKE2B c73cb624e4c35f2c5c001b4545c2ad806d3f13471aa25b0941d923020fe01a73405d1ed7c2ab2efe3afee0e59b8e9d401072edb788c57dc338fe3ddb4eebebf3 SHA512 bf9c46335500c0dd7afdc160221acaf8fd053afc453cb26cd76ef085c41580be5a62021ef1f1a57eac9df70d1158a008f489d1a8bb5c3329c5a187f79e4942de
 EBUILD drbd-utils-8.9.6-r1.ebuild 2478 BLAKE2B 5155f241126f545397c0ee4aead4dbfb2d291615f1d3e73ae81feacb9c806e25e02a8afbbf93b892c0488ed17801f43d548d671d2d66bbc69c04e758c2752fd3 SHA512 f4dbeeff4969083a531ccc164b14daa682b2f5cf5e375153c29ae1e5e698f15bcf70bf3b8584d5517820fc632bc984324ef74180e1cbb3aae5f67643bb29acef
+EBUILD drbd-utils-9.15.1.ebuild 2621 BLAKE2B 75ba6cb6e8534addbfa3bf762c85cde070c285bececd65ff0b90d0fdfa0c4f3c1c2fd1e3baa1fd0b84af4422e02f6253338606927b565fc99c9215c65f7e7b42 SHA512 780dae9aa2ade0ced6db290ada69aa069593ea718c2a736e1f3065113cee13e2390b99fa7fe75f08c9deb01262325a596f3788e6e232b1996cc9a610ab26c3a7
 MISC metadata.xml 677 BLAKE2B 79183e6930396061e7cf5c881ced8b4e3082a2b0dfdb4520e9de6afd54269b35ba972efd7dd3c3bd67cd103fd7d40693575a9d87b7b437438d5226e6e3453b5e SHA512 b97a7c5bb6ffe6de872f535d595507cd155923c920b9e7836f9a50afa992300b0b27d43805491cbbe6c348ecf99fc24367c375b6416dae73bffb4b6706f4b89a
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild
new file mode 100644
index 000000000000..4b30e2174303
--- /dev/null
+++ b/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 udev
+
+DESCRIPTION="mirror/replicate block-devices across a network-connection"
+SRC_URI="https://www.linbit.com/downloads/drbd/utils/${P}.tar.gz"
+HOMEPAGE="https://www.linbit.com/drbd"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pacemaker +udev xen"
+
+DEPEND="
+	pacemaker? ( sys-cluster/pacemaker )
+	udev? ( virtual/udev )"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/flex"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-run-lock.patch
+	"${FILESDIR}"/${P}-sysmacros.patch
+)
+
+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
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-bashcompletion \
+		--with-distro=gentoo \
+		--with-prebuiltman \
+		--without-rgmanager \
+		$(use_with pacemaker) \
+		$(use_with udev) \
+		$(use_with xen)
+}
+
+src_compile() {
+	# only compile the tools
+	emake OPTFLAGS="${CFLAGS}" tools doc
+}
+
+src_install() {
+	# only install the tools
+	emake DESTDIR="${D}" install-tools install-doc
+
+	# install our own init script
+	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN/-utils/}
+
+	dodoc scripts/drbd.conf.example
+
+	keepdir /var/lib/drbd
+	rm -r "${ED}"/var/run || die
+
+	# https://bugs.gentoo.org/698304
+	dodir lib/drbd
+	local i
+	for i in drbd drbdadm-83 drbdadm-84 drbdsetup-83 drbdsetup-84; do
+		dosym ../../lib64/drbd/"${i}" lib/drbd/"${i}"
+	done
+}
+
+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/files/drbd-utils-9.15.1-run-lock.patch b/sys-cluster/drbd-utils/files/drbd-utils-9.15.1-run-lock.patch
new file mode 100644
index 000000000000..fa31a9b0cb11
--- /dev/null
+++ b/sys-cluster/drbd-utils/files/drbd-utils-9.15.1-run-lock.patch
@@ -0,0 +1,13 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -457,8 +457,8 @@ AH_TEMPLATE(DRBD_LEGACY_84, [Include support for drbd-8.4 kernel code])
+ AH_TEMPLATE(WINDRBD, [Include support for windrbd (do not use this under Linux)])
+ 
+ AC_SUBST(DRBD_LIB_DIR, [$localstatedir/lib/$PACKAGE_TARNAME])
+-AC_SUBST(DRBD_RUN_DIR, [$localstatedir/run/$PACKAGE_TARNAME])
+-AC_SUBST(DRBD_LOCK_DIR, [$localstatedir/lock])
++AC_SUBST(DRBD_RUN_DIR, [/run/$PACKAGE_TARNAME])
++AC_SUBST(DRBD_LOCK_DIR, [/run/lock])
+ AC_SUBST(DRBD_CONFIG_DIR, [$sysconfdir])
+ AC_SUBST(DRBD_BIN_DIR, [$exec_prefix/bin])
+ 
diff --git a/sys-cluster/drbd-utils/files/drbd-utils-9.15.1-sysmacros.patch b/sys-cluster/drbd-utils/files/drbd-utils-9.15.1-sysmacros.patch
new file mode 100644
index 000000000000..961105f2b3ff
--- /dev/null
+++ b/sys-cluster/drbd-utils/files/drbd-utils-9.15.1-sysmacros.patch
@@ -0,0 +1,41 @@
+https://bugs.gentoo.org/616758
+--- a/user/shared/shared_tool.c
++++ b/user/shared/shared_tool.c
+@@ -8,6 +8,7 @@
+ #define _FILE_OFFSET_BITS 64
+ 
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
+ #include <fcntl.h>
+--- a/user/v83/drbdadm_adjust.c
++++ b/user/v83/drbdadm_adjust.c
+@@ -25,6 +25,7 @@
+ #define _GNU_SOURCE
+ 
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+ #include <unistd.h>
+--- a/user/v84/drbdadm_adjust.c
++++ b/user/v84/drbdadm_adjust.c
+@@ -27,6 +27,7 @@
+ #define _FILE_OFFSET_BITS 64
+ 
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+ #include <unistd.h>
+--- a/user/v9/drbdadm_adjust.c
++++ b/user/v9/drbdadm_adjust.c
+@@ -27,6 +27,7 @@
+ #define _FILE_OFFSET_BITS 64
+ 
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+ #include <unistd.h>
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 954c408f4c5e..a463c79ce174 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -11,7 +11,7 @@ DIST glusterfs-7.9.tar.gz 7702149 BLAKE2B e23b5a45a8c2c4f02f0992dfc78bea942a1dcc
 DIST glusterfs-8.3.tar.gz 7829522 BLAKE2B 1ba60f7209db4f1ce21237c3adea94df1b9eae04d15f99eb414bf961ea67aa7e08d01ea47c8793a33afbc0ff6cf63ecb81f78fa1ba74d66e2d4358ef2bdadacc SHA512 7ca9d3d8938eb27a7347461a07457e90d1ee6e8d5417970e38245c819cf09bf2ecf9de3954b75edf5cf14816e1059fb381b95935ae1f973ebd14ee7531322aa9
 DIST glusterfs-9.0.tar.gz 8171193 BLAKE2B f9f9905515607b4877432bde264075f73c4c076ae435a67ab803affc468f5f88d02235419fea6e25db19adecff9b797a41eb5ac63772fe81251c064389f7aca6 SHA512 daa5a7342c067c75668910e8fed17145636e7a576830b4cd68e81d9fceedaab918228b8780ebd5014e2397e0606858af650cd2c52bec0883ccd2126955ad07e7
 EBUILD glusterfs-7.7.ebuild 6021 BLAKE2B 8fa14aca6d875f249394d2e789f24d6117be84fb843571ffe0801de154f9895d498ecec94ca19853d663cc91da8739c7f76d10254c8cf87dff99a59c104f4e97 SHA512 ae62b59e2a86455bded295bc228375278c20a087e4a0d1aa87d30557e5650d66299a8aaa01c4c83c1b12cf75f1f2bb49ebb6cf39610aab8cb3b242866d14d5d9
-EBUILD glusterfs-7.8-r1.ebuild 6048 BLAKE2B bf6f45b09cd270bb0324ca44bd2770237d48406fc2284f09bc7c29f4ed92c5038811e915eb7d9923d3b83ea2dc33582d5b40f012f8e1d0bad3377d5d944e0797 SHA512 c3798461b8ca737291ff59ab20fc67fb1ff5f449b41fb9eb642436c53bdc01dbab381314ab19ee4fd36aaed36b6382e9177ce60a6032593accf32c6fc139c338
+EBUILD glusterfs-7.8-r1.ebuild 6047 BLAKE2B d9774fd4008b3db282ec4552d617d8c5f6f4691ce5c5b6f8d10e2f49367ea8f9b231643993b64d1fdb8cdbeaa6b1eb5d5563ff09bc75611439986bf011641b1e SHA512 1f45d9004d11650333b5e8da161bd964cf63fa48423744f0a50b153bf5dd6523f0516ac107452c86cb048e5ebc7964fd7b577e63c8963dba9057935f0290093a
 EBUILD glusterfs-7.9.ebuild 6061 BLAKE2B 7baec7d360fcb47f0ef5bba76af5dce306a4fc2773d22d871081204a3b03dbcda22de73c4cf66fcfcbbff2ab7ad80e43a84a78c13bd5fa6fe01c0caa681511cc SHA512 40fb1926dd3e3cc2d8bd6b649635e111e8ede10abb65b29732737de837a6280287e42162f6d649b5905078173d2a467cddbda28cbd4cd2095f82bfa7c7f431e7
 EBUILD glusterfs-8.3.ebuild 5575 BLAKE2B 99f344c639b942e9313071560e745048c65a97bd0e97f39c897aa1e6630c87d020a4223d30a39d10c571cf4fb3a36c9c4c09802accea3bd83f854c6de769062b SHA512 befabf6d6aa1d0d73a87ffe59ebac6a6d3ac235104365ee3c4bbacf4e0c3125c671449973a8247241de93e0dd2fa72afd12b86988f1c55ce9a34b304423c97a5
 EBUILD glusterfs-9.0.ebuild 5575 BLAKE2B 99f344c639b942e9313071560e745048c65a97bd0e97f39c897aa1e6630c87d020a4223d30a39d10c571cf4fb3a36c9c4c09802accea3bd83f854c6de769062b SHA512 befabf6d6aa1d0d73a87ffe59ebac6a6d3ac235104365ee3c4bbacf4e0c3125c671449973a8247241de93e0dd2fa72afd12b86988f1c55ce9a34b304423c97a5
diff --git a/sys-cluster/glusterfs/glusterfs-7.8-r1.ebuild b/sys-cluster/glusterfs/glusterfs-7.8-r1.ebuild
index 26dd5ae27072..44c9755c9263 100644
--- a/sys-cluster/glusterfs/glusterfs-7.8-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-7.8-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV#9999} != ${PV} ]]; then
 	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
 else
 	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
diff --git a/sys-cluster/knem/Manifest b/sys-cluster/knem/Manifest
index ceb834aac38e..7f03bdc68766 100644
--- a/sys-cluster/knem/Manifest
+++ b/sys-cluster/knem/Manifest
@@ -1,6 +1,6 @@
 AUX 45-knem.rules 28 BLAKE2B 4f7eb2b4c84bc786998ac8ad610626b6ca3e384777aeecd7bb18fb657ff095f7311670bb388d6e7c5f1da944428d6d088bd65d333d27cf67f3d1d532354aaaf6 SHA512 fc819a12ad7432cbf08450ebc36b469402753d8d363d72a46b71efb916391d320591eac0be9498a37a7bbc5ebe1b2725a2cbf37c7c69ed7d5c6e1ccf9ce0e51b
 AUX knem-1.1.3-setup_timer.patch 1965 BLAKE2B b70774ca235d159c4054a496e23e7e5205f504815878b0045ff80f91f7cda1fb3748d1fde16a6da6c6c67f2d8acfc4310a7e0cfa3ad1d461b89bc73d41af8f10 SHA512 ab87faded049f999638d4092a9758a542836e2c373c43e4f00141f54b8aa38ab2bbd288edf95a67f087b949864e4a00163cf2eff13f2b41a71677b72c4f9eb01
 DIST knem-1.1.3.tar.gz 330109 BLAKE2B 0aa5a2b5cd329e7183800b8b4e6b76297c85325cef218dc0ae27293ffb3aaf8a6896bc237ca745bb8df97a446c2ecc5542b96fc9eb4bbead6a1c9b894dd38f51 SHA512 ab72b3a803898c8de1bb775857da346e16ade285cdf17b9339eef3dc939c5d50ef5b3442e96418e414d64cd3e1e1a922b5e8c74462c5d6866b842ee9749db3eb
-EBUILD knem-1.1.3-r2.ebuild 1665 BLAKE2B 17dea0891e477f24e2a32d135f2b5cfaae8f5403de1901213f7df78e6f64d4562b4cd88ba5200929270336d8f2c357c26edbd9c54f7db7c897f11c28eff7bb8a SHA512 fc25562fbd6c9958ffed7349c1ffbad2b1ff55068e6b8a58d0a9a674a17fafbfcac4c81d98dc75d9b685883b413d7da932b7d5a814d21ade5bb6b40528d0cebe
-EBUILD knem-9999.ebuild 1616 BLAKE2B c4d4ec6ab38f0e0f3d87bb7f5459a9d5c17b20006dc8a55b12143275a4871af8ea47dab45202bcb45a0792b4f6274c47fecc82bddd4b2c4e32021d8d432799e5 SHA512 b55c77c84b6be617f0a5262a20118ce0030089616b0779673308a683ec0ffa0d24970eee578009dfb810f702187f06e2f7cb6b8e382be41a19fa6fb752b5b503
+EBUILD knem-1.1.3-r2.ebuild 1652 BLAKE2B 7a17cbcb0a7d402fe1b7dec93821b33f57e2f85051ea566ce2296182e03699f35c0172fc05ceafba35f8d2db81838a65758bd7ddb9fc9f12ce64af5600f81078 SHA512 1d00d34bafff7cfbbd05d376818464a5708d9cb25ac9754b10af3af14a9b7396e3405402e610509f8a9dd21b4a7c6b2600d79d94232df30133f4c372de79637b
+EBUILD knem-9999.ebuild 1603 BLAKE2B 76fa233a4080f9008965cf4efd9a543ce3a14836835ff254c5d82bd7b85a748a9c8402e3a4e65b0fb478f9f4ec9c701f17e6f2a9be561e4d07cf1eeb0fa7adfb SHA512 402fa67950338e0eeb736df7c7ffedb49ccef06e31fd32975eed227166d786868ef6239745a45c0e4b9241e834579ec400372023c494dbd70b12184d40ead4ce
 MISC metadata.xml 365 BLAKE2B ceba315f0fbd74cfc6ec310a70126108f304deef94ba49cc1a9f8291b9827fdea3e3224cd7a52265d98ec55e240496d943874301e7a51f29eef2d5f03a26842d SHA512 debd6bb734810af46390ed76b73151e5729999aff31956951cf9482e06ae6d08e4d642f9fc27ff99f0947b0b63214dc9ca6514e760d0d93a79bcd9ea79b60743
diff --git a/sys-cluster/knem/knem-1.1.3-r2.ebuild b/sys-cluster/knem/knem-1.1.3-r2.ebuild
index 640b8a3486ab..5eff8ce1fc91 100644
--- a/sys-cluster/knem/knem-1.1.3-r2.ebuild
+++ b/sys-cluster/knem/knem-1.1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,6 @@ HOMEPAGE="http://knem.gforge.inria.fr/"
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gforge.inria.fr/git/knem/knem.git"
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="http://gforge.inria.fr/frs/download.php/37186/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
diff --git a/sys-cluster/knem/knem-9999.ebuild b/sys-cluster/knem/knem-9999.ebuild
index 7863b80cb7e1..e8eb7f915015 100644
--- a/sys-cluster/knem/knem-9999.ebuild
+++ b/sys-cluster/knem/knem-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,6 @@ HOMEPAGE="http://knem.gforge.inria.fr/"
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gforge.inria.fr/git/knem/knem.git"
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="http://runtime.bordeaux.inria.fr/knem/download/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
diff --git a/sys-cluster/legion/Manifest b/sys-cluster/legion/Manifest
index f7aefc1c205d..096f7949eef1 100644
--- a/sys-cluster/legion/Manifest
+++ b/sys-cluster/legion/Manifest
@@ -13,12 +13,12 @@ DIST legion-19.06.0.tar.gz 3245617 BLAKE2B 5f94d423c1ff4e708a7826ead55a4f8f965bb
 EBUILD legion-16.08.0-r1.ebuild 840 BLAKE2B 970bb0a197937a2ebd85a3b914976e37aa87927647087d27e081d89ad3a8cfff85314d87cf6e530828571ccd9c05dc8c25a009f83360b01957ddea727bd918e9 SHA512 0327cd9ed44be69166be223d121c26841a4ef85900b2c9eaad46fd669ef992d8a4524488a033f5cb65e571335b18120a12f95474fc2a9d5b79464a08f4fbf620
 EBUILD legion-16.10.0.ebuild 667 BLAKE2B 8894292d2739d88571f5654b1285a7ce7fbb379d67b1af331c59645ba3f02cb88c42a6122f57a18bec4dadcd2ab556def9cf40f4a027ea340b03d21d55c59390 SHA512 47cc5201d73d73ba116c4acf0c17d62294d1b20885d6dcde61284c5201c5c7307c9322f97f09ee04a4d17072d2e5c455090c27ca70225f50561b75ffcbd1f286
 EBUILD legion-17.02.0.ebuild 722 BLAKE2B b9b29f20d40d2346d471bad5dde3d422c04dc453dd43a3634b5718bedd846201b560e857a8e5f0efc826b2705d7d336be1708a5f0bbaf88456eba6f5d7bb9fc0 SHA512 278f257a529338789ebf129e8d267daa44e12d0f34451bd2be16688c8dad931dcf3179f1b8df704c443f5deb35e6a8b4dac6cbad607de31ed370860f59eb42c1
-EBUILD legion-17.05.0.ebuild 879 BLAKE2B b32a747d613a4dc4f7d1a2f060d5246ad096769327efa6cd1bdf2e7bbad156f8645ba06db0d1037f6188e982c1f72f3e758001f49fbb662c3b1a188ec15a3484 SHA512 ceac923ea3dd73b3ab8887556483299c960da91971df3a40b1a240af1f55c68c961b83a5eb7f9ceefdca38fe026b5bee88b76bf555e97d49e2f607c9b953590e
-EBUILD legion-17.08.0.ebuild 950 BLAKE2B b19180bb85ed847f627682b7771b1b3e21f9e4e1a2535269aa8cd9722cfdb931dd0bdeea891a6130572dc09136251e508a50f79fd82fcdb46fead7d9a9b14b60 SHA512 5b92bc6f815fceb413b8425b17fb68fec08f923773f23fcca5f9e4d80a91a73686f9d0ea17cc38f0d519b7159de653f79dd41344ac7f319626af3a90b85701a1
-EBUILD legion-17.10.0.ebuild 950 BLAKE2B b19180bb85ed847f627682b7771b1b3e21f9e4e1a2535269aa8cd9722cfdb931dd0bdeea891a6130572dc09136251e508a50f79fd82fcdb46fead7d9a9b14b60 SHA512 5b92bc6f815fceb413b8425b17fb68fec08f923773f23fcca5f9e4d80a91a73686f9d0ea17cc38f0d519b7159de653f79dd41344ac7f319626af3a90b85701a1
-EBUILD legion-18.02.0.ebuild 950 BLAKE2B b19180bb85ed847f627682b7771b1b3e21f9e4e1a2535269aa8cd9722cfdb931dd0bdeea891a6130572dc09136251e508a50f79fd82fcdb46fead7d9a9b14b60 SHA512 5b92bc6f815fceb413b8425b17fb68fec08f923773f23fcca5f9e4d80a91a73686f9d0ea17cc38f0d519b7159de653f79dd41344ac7f319626af3a90b85701a1
-EBUILD legion-18.05.0.ebuild 953 BLAKE2B 7f73d69563813d024aa9d84adcecb26db7664d31b4c498209c6a708f1f9f30e3374b502431f843eb61c2b66f6523c3aa83e012e9036da56a7252e6734539a0c1 SHA512 eb0e4882a91a7c004ed9aca2d0b27ca5ab8f16bebdab0760bd1bc7d77d652944914f4880a807a4b2942ed4e315c602e968f6a17eef85d9c6ef360dbf26a51590
-EBUILD legion-18.12.0.ebuild 953 BLAKE2B 7f73d69563813d024aa9d84adcecb26db7664d31b4c498209c6a708f1f9f30e3374b502431f843eb61c2b66f6523c3aa83e012e9036da56a7252e6734539a0c1 SHA512 eb0e4882a91a7c004ed9aca2d0b27ca5ab8f16bebdab0760bd1bc7d77d652944914f4880a807a4b2942ed4e315c602e968f6a17eef85d9c6ef360dbf26a51590
-EBUILD legion-19.06.0.ebuild 953 BLAKE2B 7f73d69563813d024aa9d84adcecb26db7664d31b4c498209c6a708f1f9f30e3374b502431f843eb61c2b66f6523c3aa83e012e9036da56a7252e6734539a0c1 SHA512 eb0e4882a91a7c004ed9aca2d0b27ca5ab8f16bebdab0760bd1bc7d77d652944914f4880a807a4b2942ed4e315c602e968f6a17eef85d9c6ef360dbf26a51590
-EBUILD legion-9999.ebuild 953 BLAKE2B 7f73d69563813d024aa9d84adcecb26db7664d31b4c498209c6a708f1f9f30e3374b502431f843eb61c2b66f6523c3aa83e012e9036da56a7252e6734539a0c1 SHA512 eb0e4882a91a7c004ed9aca2d0b27ca5ab8f16bebdab0760bd1bc7d77d652944914f4880a807a4b2942ed4e315c602e968f6a17eef85d9c6ef360dbf26a51590
+EBUILD legion-17.05.0.ebuild 866 BLAKE2B 8167ed7e468765db06a2ea6f0cf4446eb761db620ca0be117c46ce9028372388601b6a9e7904f19477d37ece01b8118d358c3154daf8b55427dd9961013bec73 SHA512 9a4ef92d95739781be72b2ee3171204e585deb41daaedf9e3976c53ea2b3d550225f1cd5be02535a4230caa55a096253d943022e406aafef01206a5375fce9b2
+EBUILD legion-17.08.0.ebuild 937 BLAKE2B a2d39899c659fd5f95c106e07d63bc23b18e532fde9e0d1e336e559e6525fdaf279db61486a595191db34cd75ca647ae46ba2376ff78f49f0fd087eeefd901ec SHA512 1f994d8c4811c310dcf36271a08768d0f24f9f63998124beec682d127982ea3174e664f1b47bfabf80452a98e491cb098b03eac463aefff4fe36871a11a41e49
+EBUILD legion-17.10.0.ebuild 937 BLAKE2B a2d39899c659fd5f95c106e07d63bc23b18e532fde9e0d1e336e559e6525fdaf279db61486a595191db34cd75ca647ae46ba2376ff78f49f0fd087eeefd901ec SHA512 1f994d8c4811c310dcf36271a08768d0f24f9f63998124beec682d127982ea3174e664f1b47bfabf80452a98e491cb098b03eac463aefff4fe36871a11a41e49
+EBUILD legion-18.02.0.ebuild 937 BLAKE2B a2d39899c659fd5f95c106e07d63bc23b18e532fde9e0d1e336e559e6525fdaf279db61486a595191db34cd75ca647ae46ba2376ff78f49f0fd087eeefd901ec SHA512 1f994d8c4811c310dcf36271a08768d0f24f9f63998124beec682d127982ea3174e664f1b47bfabf80452a98e491cb098b03eac463aefff4fe36871a11a41e49
+EBUILD legion-18.05.0.ebuild 940 BLAKE2B 01d77d88967bd2cfc6a10521eccb300413b07e79aed971d937ee58603019250067feea8299e7b8e1df2097e24613613b12cf8e885bb8f2aec65569d85f53baf7 SHA512 4123de994c5ff2c7ba802019a509e7268b8957b222130e35b08406b09ca50db9d24d40ca01fe15b56f7b32eb15ad9bd5a76e2d6934076c5eb9db8e7d085f4277
+EBUILD legion-18.12.0.ebuild 940 BLAKE2B 01d77d88967bd2cfc6a10521eccb300413b07e79aed971d937ee58603019250067feea8299e7b8e1df2097e24613613b12cf8e885bb8f2aec65569d85f53baf7 SHA512 4123de994c5ff2c7ba802019a509e7268b8957b222130e35b08406b09ca50db9d24d40ca01fe15b56f7b32eb15ad9bd5a76e2d6934076c5eb9db8e7d085f4277
+EBUILD legion-19.06.0.ebuild 940 BLAKE2B 01d77d88967bd2cfc6a10521eccb300413b07e79aed971d937ee58603019250067feea8299e7b8e1df2097e24613613b12cf8e885bb8f2aec65569d85f53baf7 SHA512 4123de994c5ff2c7ba802019a509e7268b8957b222130e35b08406b09ca50db9d24d40ca01fe15b56f7b32eb15ad9bd5a76e2d6934076c5eb9db8e7d085f4277
+EBUILD legion-9999.ebuild 940 BLAKE2B 01d77d88967bd2cfc6a10521eccb300413b07e79aed971d937ee58603019250067feea8299e7b8e1df2097e24613613b12cf8e885bb8f2aec65569d85f53baf7 SHA512 4123de994c5ff2c7ba802019a509e7268b8957b222130e35b08406b09ca50db9d24d40ca01fe15b56f7b32eb15ad9bd5a76e2d6934076c5eb9db8e7d085f4277
 MISC metadata.xml 482 BLAKE2B 7e3a7dbb680ebe09062916b1c5205f3f29ecff8ffe003e9b8e6675838fed668e6468f06a6dc26f3a5c307c77105cfb911f01c23f795140f3c5d99c13811aeb1d SHA512 bc28b76e1b0479d70e2db624340097739337c8be35dd16e8ed2ef71444a0a18c579a296c65a0bbc679dd1c8a86f29eb423e9e8cca93da78f9fbea28f537da3d4
diff --git a/sys-cluster/legion/legion-17.05.0.ebuild b/sys-cluster/legion/legion-17.05.0.ebuild
index e9b172068e97..877107e05d74 100644
--- a/sys-cluster/legion/legion-17.05.0.ebuild
+++ b/sys-cluster/legion/legion-17.05.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,6 @@ HOMEPAGE="https://legion.stanford.edu/"
 if [[ $PV = 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz"
 	KEYWORDS="~amd64"
diff --git a/sys-cluster/legion/legion-17.08.0.ebuild b/sys-cluster/legion/legion-17.08.0.ebuild
index ec4705d91905..53146a74ea42 100644
--- a/sys-cluster/legion/legion-17.08.0.ebuild
+++ b/sys-cluster/legion/legion-17.08.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,6 @@ HOMEPAGE="https://legion.stanford.edu/"
 if [[ $PV = 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz"
 	KEYWORDS="~amd64"
diff --git a/sys-cluster/legion/legion-17.10.0.ebuild b/sys-cluster/legion/legion-17.10.0.ebuild
index ec4705d91905..53146a74ea42 100644
--- a/sys-cluster/legion/legion-17.10.0.ebuild
+++ b/sys-cluster/legion/legion-17.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,6 @@ HOMEPAGE="https://legion.stanford.edu/"
 if [[ $PV = 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz"
 	KEYWORDS="~amd64"
diff --git a/sys-cluster/legion/legion-18.02.0.ebuild b/sys-cluster/legion/legion-18.02.0.ebuild
index ec4705d91905..53146a74ea42 100644
--- a/sys-cluster/legion/legion-18.02.0.ebuild
+++ b/sys-cluster/legion/legion-18.02.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,6 @@ HOMEPAGE="https://legion.stanford.edu/"
 if [[ $PV = 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz"
 	KEYWORDS="~amd64"
diff --git a/sys-cluster/legion/legion-18.05.0.ebuild b/sys-cluster/legion/legion-18.05.0.ebuild
index 645888853571..3ff65e83c9c9 100644
--- a/sys-cluster/legion/legion-18.05.0.ebuild
+++ b/sys-cluster/legion/legion-18.05.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,6 @@ HOMEPAGE="https://legion.stanford.edu/"
 if [[ $PV = 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz"
 	KEYWORDS="~amd64"
diff --git a/sys-cluster/legion/legion-18.12.0.ebuild b/sys-cluster/legion/legion-18.12.0.ebuild
index 645888853571..3ff65e83c9c9 100644
--- a/sys-cluster/legion/legion-18.12.0.ebuild
+++ b/sys-cluster/legion/legion-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,6 @@ HOMEPAGE="https://legion.stanford.edu/"
 if [[ $PV = 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz"
 	KEYWORDS="~amd64"
diff --git a/sys-cluster/legion/legion-19.06.0.ebuild b/sys-cluster/legion/legion-19.06.0.ebuild
index 645888853571..3ff65e83c9c9 100644
--- a/sys-cluster/legion/legion-19.06.0.ebuild
+++ b/sys-cluster/legion/legion-19.06.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,6 @@ HOMEPAGE="https://legion.stanford.edu/"
 if [[ $PV = 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz"
 	KEYWORDS="~amd64"
diff --git a/sys-cluster/legion/legion-9999.ebuild b/sys-cluster/legion/legion-9999.ebuild
index 645888853571..3ff65e83c9c9 100644
--- a/sys-cluster/legion/legion-9999.ebuild
+++ b/sys-cluster/legion/legion-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,6 @@ HOMEPAGE="https://legion.stanford.edu/"
 if [[ $PV = 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz"
 	KEYWORDS="~amd64"
diff --git a/sys-cluster/libquo/Manifest b/sys-cluster/libquo/Manifest
index 7b567736a558..6bcb1d57772b 100644
--- a/sys-cluster/libquo/Manifest
+++ b/sys-cluster/libquo/Manifest
@@ -1,4 +1,4 @@
 DIST libquo-1.2.9.tar.gz 788507 BLAKE2B c6240ea265dfc34fd02b04f5ff9dcfa194c82789d3caa9553eb65ad25e9e883dfd320d4b095693b88778e74cbd11c207bcc9c5c133f03ec5a25e7c633853cd0d SHA512 732a737b9d53ca7b530ae5ecfd79cc9200f86e6a39f4c529975b204631165a178f6bb87228985222bf623f2581ecc29c774e8480ce9ebfcace12e14c49f98e62
-EBUILD libquo-1.2.9.ebuild 761 BLAKE2B d5f80533cb11c1b59de5f3ce6ed283f70b9d4dac57a3621771b7f0f243c3b784382789c428a39965f4fe281ffd4fffbdcf17711dd9ac3b7bc93fd89e3daa4be4 SHA512 a5a4cf054fe2cfe205f27b05f46e65ca013e43f41d989a8396d6b4e11af3d6a34b6cd16b8fec34a0f147cb167643892c7c6cc0dc1220f0580860ecbb7b6fdbeb
-EBUILD libquo-9999.ebuild 810 BLAKE2B 9a29313bcff0e3386d87ec4a2305cb131785ee33e61ed41a041ceb28c12d79589b5c8fac7dece8372cf28560ba9d7689b088472921b9b67bea9b31e8f77007c8 SHA512 4aa475245362096d9229d32767460cdae0c899de6c431d3d8c328c7fd3b7f2822ec65d8c38eeb769b08696b4b03badc2eaea15713b1a7aa40666926b65e38db4
+EBUILD libquo-1.2.9.ebuild 748 BLAKE2B b72c7d2128efa255d527b50bf8f83ef108d7373947d9be889e01abb959f0d6dd82c22b50e2bc8f5f0efe08f85ed17e7cb517a16df8b4542283ff0dc839db0309 SHA512 aa39f78529087c644e05b72c6003530e761c21c83c86ac55dbdd7994e895fac73be0f31735e7687bf286d9e36c139fe62c59cc7169f3908c61f8e31c8c82661e
+EBUILD libquo-9999.ebuild 797 BLAKE2B 3f0cda11e4ed46cea03cef462c99ba5151e26b6869077d1015629e1d67b8665f7194f93ded85dca04dae7c6dba24e8885d0c35ae95c47c889457c49911c7baca SHA512 6c6e659fa9f7595a3750abdaaef7884eb57eb33d26d8a2d57c11636e213c8f273f4d6e80548d8966ed3ff86c0aa804210c9b23c1c37ed5e541247a4bfa9f4829
 MISC metadata.xml 443 BLAKE2B 0473c666449ae5b5d1175a18ad8a014cba768c751a3f77027f227a1d1c59a061b06d0f25609297c3a7291d6fb80ed7a773043f04acc875a7f5d86510f99a54e1 SHA512 24f513273a47dfe443e18a9be97a710d523353daa131ea686de70ec13780d89c64bd7019ad83cf8aec8eeb1c63cd9cd3073cc86cdc27cfd361c5bc9197dba611
diff --git a/sys-cluster/libquo/libquo-1.2.9.ebuild b/sys-cluster/libquo/libquo-1.2.9.ebuild
index dbc29394d12b..9fec47663d07 100644
--- a/sys-cluster/libquo/libquo-1.2.9.ebuild
+++ b/sys-cluster/libquo/libquo-1.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,6 @@ inherit fortran-2
 if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/lanl/${PN}.git"
 	inherit git-r3
-	KEYWORDS=""
 	AUTOTOOLS_AUTORECONF=1
 else
 	SRC_URI="https://lanl.github.io/${PN}/dists/${P}.tar.gz"
diff --git a/sys-cluster/libquo/libquo-9999.ebuild b/sys-cluster/libquo/libquo-9999.ebuild
index cc7b789aa1b7..d63aea6b63ed 100644
--- a/sys-cluster/libquo/libquo-9999.ebuild
+++ b/sys-cluster/libquo/libquo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,6 @@ inherit fortran-2
 if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/lanl/${PN}.git"
 	inherit autotools git-r3
-	KEYWORDS=""
 else
 	SRC_URI="https://lanl.github.io/${PN}/dists/${P}.tar.gz"
 	KEYWORDS="~amd64"
diff --git a/sys-cluster/lmod/Manifest b/sys-cluster/lmod/Manifest
new file mode 100644
index 000000000000..f93e0d274c07
--- /dev/null
+++ b/sys-cluster/lmod/Manifest
@@ -0,0 +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
+EBUILD lmod-8.4.20.ebuild 3461 BLAKE2B 9a910a8259e7bf2717bae198b46b17c60515c3a47c18cb34997cabd9557042ce6efc6a67794e2594dacc0075b0396c2eff12a09f6b567576b834f91d829442e5 SHA512 4e5f23859aa0736850cdee4147b6dec91e104ecf84af99b1397007aedd45998fe392353121043b543923a859a7cefed07eff9b8eb8e1e06824a31f0774318e60
+EBUILD lmod-9999.ebuild 3461 BLAKE2B 9a910a8259e7bf2717bae198b46b17c60515c3a47c18cb34997cabd9557042ce6efc6a67794e2594dacc0075b0396c2eff12a09f6b567576b834f91d829442e5 SHA512 4e5f23859aa0736850cdee4147b6dec91e104ecf84af99b1397007aedd45998fe392353121043b543923a859a7cefed07eff9b8eb8e1e06824a31f0774318e60
+MISC metadata.xml 1067 BLAKE2B f520242500e560deee88ce53601d1dfaa929e8228344ea89f0d08242b58e44b280e9b6b3a396f787d231f5f6062336f770512ca2430d8ff8d64ae10a1198ee67 SHA512 6425f204b774beb6aaed3be55d279eaee61f12ea0ace2a9b083a533b92421704b64eea37fd00575147050636ef16fa07ebaf5df2d96a2101c8821d360c4d24ba
diff --git a/sys-cluster/lmod/files/99lmod b/sys-cluster/lmod/files/99lmod
new file mode 100644
index 000000000000..506b824d5a01
--- /dev/null
+++ b/sys-cluster/lmod/files/99lmod
@@ -0,0 +1 @@
+LMOD_CACHED_LOADS=yes
diff --git a/sys-cluster/lmod/files/lmod-8.4.19-no-libsandbox.patch b/sys-cluster/lmod/files/lmod-8.4.19-no-libsandbox.patch
new file mode 100644
index 000000000000..02248bc45484
--- /dev/null
+++ b/sys-cluster/lmod/files/lmod-8.4.19-no-libsandbox.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index ca75e34c..e9cc49e0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -616,7 +616,7 @@ AC_SUBST(SYS_LD_LIB_PATH)
+ SYS_LD_LIB_PATH=$LD_LIBRARY_PATH
+ 
+ AC_SUBST(SYS_LD_PRELOAD)
+-SYS_LD_PRELOAD=$LD_PRELOAD
++SYS_LD_PRELOAD=$(printf %s\\n $LD_PRELOAD | sed -e "s/libsandbox.so//g")
+ 
+ AC_SUBST(PATH_TO_SRC)
+ SRCDIR=$( cd $srcdir; pwd)
diff --git a/sys-cluster/lmod/files/module.1-8.4.20 b/sys-cluster/lmod/files/module.1-8.4.20
new file mode 100644
index 000000000000..2ec20e04ac85
--- /dev/null
+++ b/sys-cluster/lmod/files/module.1-8.4.20
@@ -0,0 +1,539 @@
+.Dd $Mdocdate: December 6 2020 $
+.Dt MODULE 1
+.Os
+.Sh NAME
+.Nm module
+.Nd lmod environment modules manager
+.Sh SYNOPSIS
+.Nm module
+.Op Ar options
+.Cm sub-command
+.Op Ar args ...
+.Sh DESCRIPTION
+.Nm
+from
+.Sy Lmod
+is a
+.Xr lua 1
+based module system to manage the users' environment under
+Unix systems, specifically designed to easily handle
+the
+.Ev MODULEPATH
+Hierarchical problem.
+Environment Modules provide a convenient way to
+dynamically change the users' environment through modulefiles.
+This includes easily adding or removing directories from the
+.Ev PATH , LD_LIBRARY_PATH , CPATH
+and other environment variables.
+All popular shells are supported, including bash, csh, fish,
+ksh, sh, tcsh, zsh, as well as some scripting languages such
+as tcl, perl and python.
+.Sh OPTIONS
+The following
+.Ar options
+are available:
+.Pp
+.Bl -tag -width Ds -compact
+.It Fl h , \&? , H , -help
+Show the help message.
+.Pp
+.It Fl -check_syntax , -checkSyntax
+Only check the
+.Nm
+command syntax, do not load any modules.
+.Pp
+.It Fl -config
+Report
+.Sy Lmod
+configuration.
+.Pp
+.It Fl -config_json
+Report
+.Sy Lmod
+configuration in json format.
+.Pp
+.It Fl D
+Write program tracing data to stderr.
+.Pp
+.It Fl d , -default
+List default modules only when used with
+.Cm avail .
+.Pp
+.It Fl -debug Ar dbglvl
+.Sy VALUES :
+1, 2, 3.
+.Pp
+Only write trace output with proper debug levels.
+.Pp
+.It Fl -dumpversion
+Dump version in a machine readable way and quit.
+.Pp
+.It Fl -expert
+Work in expert mode.
+.Pp
+.It Fl -force
+Force removal of a sticky module or save an empty collection.
+.Pp
+.It Fl -gitversion
+Dump git version in a machine readable way and quit.
+.Pp
+.It Fl -ignore_cache
+Treat the cache file(s) as out-of-date.
+.Pp
+.It Fl -initial_load
+Loading Lmod for first time in a user shell.
+.Pp
+.It Fl -latest
+Load latest (ignore default).
+.Pp
+.It Fl -mt
+Report Module Table State.
+.Pp
+.It Fl -no_redirect
+Force output of
+.Cm list ,
+.Cm avail
+and
+.Cm spider
+to stderr.
+.Pp
+.It Fl -novice
+Turn off
+.Fl -expert
+and
+.Fl -quiet
+flags.
+.Pp
+.It Fl -nx , -no_extensions
+.Pp
+.It Fl -pin_versions Ar pinVersions
+When doing a restore use the specified version, do not follow defaults.
+.Pp
+.It Fl q , -quiet
+Do not print out warnings.
+.Pp
+.It Fl r , -regexp
+Use regular expression match.
+.Pp
+.It Fl -raw
+Print modulefile in raw output when used with show.
+.Pp
+.It Fl -redirect
+Send the output of
+.Cm list ,
+.Cm avail
+and
+.Cm spider
+to stdout (not stderr).
+.Pp
+.It Fl -regression_testing
+Lmod regression testing.
+.Pp
+.It Fl -show_hidden
+.Cm avail
+and
+.Cm spider
+will report hidden modules.
+.Pp
+.It Fl -spider_timeout Ar timeout
+A timeout for
+.Cm spider .
+.Pp
+.It Fl s , -style Ar availStyle
+.Sy DEFAULT :
+system
+Site controlled avail style.
+.Pp
+.It Fl T , -trace
+.Pp
+.It Fl t , -terse
+Write out in machine readable format for
+.Cm list ,
+.Cm avail ,
+.Cm spider
+and
+.Cm savelist .
+.Pp
+.It Fl -timer
+Report run times.
+.Pp
+.It Fl v , -version
+Print version info and quit.
+.Pp
+.It Fl -w , -width Ar twidth
+Use
+.Ar twidth
+as max term width.
+.El
+.Sh SUB-COMMANDS
+.Ss HELP
+.TS
+tab(@);
+r l l.
+T{
+.Cm help
+T}@@T{
+Print the help message.
+T}
+T{
+.Cm help
+T}@T{
+.Ar module Op Ar moduleX moduleY ...
+T}@T{
+Print help messages from the given modules.
+T}
+.TE
+.Ss LOAD
+.TS
+tab(@);
+r l l.
+T{
+.Cm load , add
+T}@T{
+.Ar module Op Ar moduleX moduleY ...
+T}@T{
+Load the given modules.
+T}
+T{
+.Cm try-load , try-add
+T}@T{
+.Ar module Op Ar moduleX moduleY ...
+T}@T{
+Load the given modules, do not complain if not found.
+T}
+T{
+.Cm del , unload
+T}@T{
+.Ar module Op Ar moduleX moduleY ...
+T}@T{
+Unload the module(s), does not complain if not found.
+T}
+T{
+.Cm swap , sw , switch
+T}@T{
+.Ar moduleX moduleY
+T}@T{
+.Cm unload Ar moduleX
+and
+.Cm load Ar moduleY
+T}
+T{
+.Cm purge
+T}@@T{
+.Cm unload
+all modules
+T}
+T{
+.Cm refresh
+T}@@T{
+Reload aliases from the current list of modules.
+T}
+T{
+.Cm update
+T}@@T{
+Reload all currently loaded modules.
+T}
+.TE
+.Ss SEARCH
+.TS
+tab(@);
+r l l.
+T{
+.Cm list
+T}@@T{
+List all currently loaded modules.
+T}
+T{
+.Cm list
+T}@T{
+.Ar patX Op Ar patY ...
+T}@T{
+List all loaded modules that match any of the given patterns.
+T}
+T{
+.Cm avail , av
+T}@T{
+.Op Ar string
+T}@T{
+List all available modules.
+Restricts to modules containing
+.Ar string
+if it is provided.
+T}
+T{
+.Cm spider
+T}@@T{
+List all possible modules.
+T}
+T{
+.Cm spider
+T}@T{
+.Ar module
+T}@T{
+List all possible versions of that
+.Ar module
+file.
+T}
+T{
+.It Cm spider
+T}@T{
+.Ar string
+T}@T{
+List all modules that contain
+.Ar string .
+T}
+T{
+.Cm spider
+T}@T{
+.Ar name/version
+T}@T{
+Detailed information about that version of the module.
+T}
+T{
+.It Cm whatis
+T}@T{
+.Ar module
+T}@T{
+Print whatis information about the module.
+T}
+T{
+.Cm keyword , key 
+T}@T{
+.Ar string
+T}@T{
+Search all name and
+.Cm whatis
+that contain
+.Ar string .
+T}
+.TE
+.Pp
+All searching commands (
+.Cm spider ,
+.Cm list ,
+.Cm avail ,
+.Cm keyword
+) support regular expressions with the
+.Fl r
+flag.
+.Pp
+For example, to find all modules that start with
+.Sq p
+or
+.Sq P :
+.D1 module -r spider '^p'
+.Pp
+Find all modules that have
+.Dq mpi
+in their name:
+.D1 module -r spider mpi
+.Pp
+Find all modules that end with
+.Dq mpi
+in their name:
+.D1 module -r spider 'mpi$'
+.Ss COLLECTIONS
+.TS
+tab(@);
+r l l.
+T{
+.Cm save , s
+T}@@T{
+Save the current list of modules to a user defined
+.Dq default
+collection.
+T}
+T{
+.Cm save , s
+T}@T{
+.Ar name
+T}@T{
+Save the current list of modules to the
+.Ar name
+collection.
+T}
+T{
+.Cm reset
+T}@@T{
+The same as
+.Cm restore
+.Ar system .
+T}
+T{
+.Cm restore , r
+T}@@T{
+Restore modules from the user's
+.Dq default
+(if defined) or the system default.
+T}
+T{
+.Cm restore , r
+T}@T{
+.Ar name
+T}@T{
+Restore modules from
+.Ar name
+collection.
+T}
+T{
+.Cm restore
+T}@T{
+.Ar system
+T}@T{
+Restore module state to system defaults.
+T}
+T{
+.Cm savelist
+T}@@T{
+List of saved collections.
+T}
+T{
+.Cm describe , mcc
+T}@T{
+.Ar name
+T}@T{
+Describe the contents of the
+.Ar name
+module collection.
+T}
+T{
+.Cm disable
+T}@T{
+.Ar name
+T}@T{
+Disable (i.e. remove) the
+.Ar name
+collection.
+T}
+.TE
+.Ss MISC
+.TS
+tab(@);
+r l l.
+T{
+.Cm is-loaded 
+T}@T{
+.Ar modulefile
+T}@T{
+Return a true status if
+.Ar module
+is loaded.
+T}
+T{
+.Cm is-avail
+T}@T{
+.Ar modulefile
+T}@T{
+Return a true status if
+.Ar module
+can be loaded.
+T}
+T{
+.Cm show
+T}@T{
+.Ar modulefile
+T}@T{
+Show the commands in the
+.Ar module
+file.
+T}
+T{
+.Cm use [-a]
+T}@T{
+.Ar path
+T}@T{
+Prepend or append
+.Ar path
+to
+.Ev MODULEPATH .
+T}
+T{
+.Cm unuse
+T}@T{
+.Ar path
+T}@T{
+Remove
+.Ar path
+from
+.Ev MODULEPATH .
+T}
+T{
+.Cm tablelist
+T}@@T{
+Output list of active modules as a lua table.
+T}
+.TE
+.Ss DEPRECATED
+.TS
+tab(@);
+r l l.
+T{
+.Cm getdefault
+T}@T{
+.Op Ar name
+T}@T{
+Load the
+.Ar name
+collection of modules or the users
+.Dq default
+if no
+.Ar name
+given. Use
+.Cm restore
+Instead.
+T}
+T{
+.Cm setdefault
+T}@T{
+.Op Ar name
+T}@T{
+Save current list of modules to
+.Ar name
+if given, otherwise save as the
+.Dq default
+list for the user. Use
+.Cm save
+instead.
+T}
+.TE
+.Sh ENVIRONMENT
+To print properties and warnings in color, set the
+.Ev LMOD_COLORIZE
+environment variable to
+.Sy YES .
+.Sh SEE ALSO
+.Bd -filled -offset indent
+.TS
+tab(@);
+rb l.
+T{
+Documentation
+T}@T{
+.Lk http://lmod.readthedocs.org
+T}
+T{
+Github
+T}@T{
+.Lk https://github.com/TACC/Lmod
+T}
+T{
+Sourceforge
+T}@T{
+.Lk https://lmod.sf.net
+T}
+T{
+TACC Homepage
+T}@T{
+.Lk https://www.tacc.utexas.edu/research-development/tacc-projects/lmod
+T}
+.TE
+.Ed
+.Pp
+To report a bug please read
+.Lk http://lmod.readthedocs.io/en/latest/075_bug_reporting.html
+.Sh AUTHORS
+Modules based on Lua, written by
+.An Robert McLay Aq Mt mclay@tacc.utexas.edu .
+.Pp
+The man page for Gentoo linux is maintained by the
+.An Gentoo Science Project Aq Mt sci@gentoo.org .
diff --git a/sys-cluster/lmod/lmod-8.4.20.ebuild b/sys-cluster/lmod/lmod-8.4.20.ebuild
new file mode 100644
index 000000000000..f41314789e9a
--- /dev/null
+++ b/sys-cluster/lmod/lmod-8.4.20.ebuild
@@ -0,0 +1,133 @@
+# 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 ~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
+	insinto /etc/profile.d
+	newins "${ED}"/usr/share/Lmod/init/profile lmod.sh
+	newins "${ED}"/usr/share/Lmod/init/profile.fish lmod.fish
+	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
+}
diff --git a/sys-cluster/lmod/lmod-9999.ebuild b/sys-cluster/lmod/lmod-9999.ebuild
new file mode 100644
index 000000000000..f41314789e9a
--- /dev/null
+++ b/sys-cluster/lmod/lmod-9999.ebuild
@@ -0,0 +1,133 @@
+# 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 ~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
+	insinto /etc/profile.d
+	newins "${ED}"/usr/share/Lmod/init/profile lmod.sh
+	newins "${ED}"/usr/share/Lmod/init/profile.fish lmod.fish
+	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
+}
diff --git a/sys-cluster/lmod/metadata.xml b/sys-cluster/lmod/metadata.xml
new file mode 100644
index 000000000000..cee363a19e2e
--- /dev/null
+++ b/sys-cluster/lmod/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@aisha.cc</email>
+		<name>Aisha Tammy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription>
+		Lmod is a lua based program to manage the user environment
+		under Unix systems, specifically designed to easily handle the MODULEPATH
+		Hierarchical problem.  Environment Modules provide a convenient way to
+		dynamically change the users' environment through modulefiles.  This
+		includes easily adding or removing directories to the PATH,
+		LD_LIBRARY_PATH and other environment variables.
+	</longdescription>
+	<use>
+		<flag name="auto-swap">enable auto swapping of compiler</flag>
+		<flag name="cache">enable caching of modules</flag>
+		<flag name="duplicate-paths">allow duplicate entries in path</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">TACC/Lmod</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-cluster/lustre/Manifest b/sys-cluster/lustre/Manifest
index b2bccaf4be34..98712d1ea4e6 100644
--- a/sys-cluster/lustre/Manifest
+++ b/sys-cluster/lustre/Manifest
@@ -2,5 +2,5 @@ AUX lnet.initd 933 BLAKE2B b59c85c589adebc6ff65484546804ba3857a32ce226baab4dca16
 AUX lustre-2.13.0-gcc9.patch 14815 BLAKE2B 11a28292c2c3175e5da2cc0521fe63c5ebc7d3265ee7e23443f755ba8e92f6c3b83f1da71119091e5f706bbf3d90485488db442d16e8b4387479c8cc539ad5e8 SHA512 fcb3de98bcd64f3562444928aa1adc2d935b66a19330a7b8e485e8cd468f8517bb0862b89c468ee243dbf8689675c78fbf565cb371dc6eb95ebd1803bf2a4bf9
 AUX lustre-client.initd 1099 BLAKE2B 89508197c5101e0e382da13720424cf526a6c2503719cab411c3cf03711a8b69bb3e8b043c3555fe3cc01a2ac748234f24b311348941689ded17b708a7c49868 SHA512 b535e81208bed0fadad6e140a6b11ee1786a957f1628a819954de72af02d6794346dda0eb2fdcd8583a9aebd1832e70539d9ca292f2dc34e104f2f61caa8e1f9
 DIST lustre-2.13.0.tar.gz 14598623 BLAKE2B f53b7fa455144f50ed7dd12150b9195fbc6b951a663df2a1a914aeeae79723cc0c0515c0c501fd67769e163b7026a341d679dbddbb590f6c63d1af0498dd44fc SHA512 6da16abc1ecaa6711bf727925ad327164c5b0d9918a7c864be8c3aa36b31b191154139ba718a0f84e4905907c265a0ce2a5394b44f1b85cd90880b3bfcd0d69d
-EBUILD lustre-2.13.0-r1.ebuild 2680 BLAKE2B aa92d737a52872ccceb89f6de77ab59ffb97d1225074c18627ddcff942f0ebe4821e091248042b84abfefb7b1e11d399d2c247c5eaaa8d63505981e2cdb102b9 SHA512 4711f11d0f5afea2449ebed358e4ea68b208a068ea273d86a88c38838b7b55a67ffebff74a77efb4c82c6909dee2b7bd88290e9086e79d0223d90c722746e8c1
+EBUILD lustre-2.13.0-r1.ebuild 2667 BLAKE2B 4f4b38c7fcdad134d4b600a41c8835f9682be27eb2035a8b11c547f6753f8e6dd7d79a916da0483e4808a221f1e2f70f0719ae0d65c24f9495baa4893b376679 SHA512 fd08f39e5f6c98c6069f75163d8853b48ae0a7542c9bd3f21235f19b8fc776d3b9e22c4417d0a2b3f0496574a31ad4e56ae5727ad1611b9f07e6acd8a5389864
 MISC metadata.xml 663 BLAKE2B 4ccb1eeeee19ba10feca23bec9d509dca908ad33e0d84626d9d5923aaaa808460ad5daa8745ff68c76e6c6bf58b7463c3f76794beec4f3ca340c6676f80a5054 SHA512 92ffb9f7db4cdf8988c60cf6af92c87fdac904603c4e8d7eea13d07a8c102dd75394791b80d761833783399f7b88a859c59daddd542d9d728c4cda43aaccd4cc
diff --git a/sys-cluster/lustre/lustre-2.13.0-r1.ebuild b/sys-cluster/lustre/lustre-2.13.0-r1.ebuild
index a14ceb151065..eb00424e5965 100644
--- a/sys-cluster/lustre/lustre-2.13.0-r1.ebuild
+++ b/sys-cluster/lustre/lustre-2.13.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ if [[ $PV = *9999* ]]; then
 	scm="git-r3"
 	SRC_URI=""
 	EGIT_REPO_URI="git://git.whamcloud.com/fs/lustre-release.git"
-	KEYWORDS=""
 	EGIT_BRANCH="master"
 else
 	scm=""
diff --git a/sys-cluster/resource-agents/Manifest b/sys-cluster/resource-agents/Manifest
index ec9058971a39..c0998df1aa63 100644
--- a/sys-cluster/resource-agents/Manifest
+++ b/sys-cluster/resource-agents/Manifest
@@ -3,7 +3,7 @@ AUX 4.6.1-configure.patch 1181 BLAKE2B 51290610cded3c58be968b140716047ca42cfff9e
 DIST resource-agents-3.9.6.tar.gz 617790 BLAKE2B a158743dca379dd4bbc9fe1cf784bca3f7cee1f930e9867734fae86ae8c8b39942b5b9a244f3a3efdbbcdb2cdc3718714062d0e7954645bca5f0eb1a4fd7ca38 SHA512 b4ca8b8cc3e09508847af3f1cf50cef946f374eae4ee7903700ba49ef7a3357b1ceaa26dca0616feaa79fb290713f18939dda42ee92a5a7bca2fab807fc77901
 DIST resource-agents-4.0.1.tar.gz 659123 BLAKE2B 47b976db2db2f82b2f5c300dbaa0e794d16f91425aa7641c18915cc2cc499af00a49d9990085ac069602d1bf6b8cf1ff5b477236254d16d15a0c48c6649a0350 SHA512 9c92bca7775e3c47c6463587fd7eea89f019997cfab0361ef37ee97192604d3b3d0dcd1cb70f774e01689b803dc856af170bd10e86a9d4824597293c264735d5
 DIST resource-agents-4.6.1.tar.gz 799688 BLAKE2B a276dbd17d6b91926f2a040d847e2ca499fe36cf30a0413d2bdffccd3bd8cbe7022ab29244524d5f7f6b91c7513a56b40de5f4bb425e65d4f83710445da91231 SHA512 ccd4a86b5a4da636248badfb81808fa4c96f08dbce9dc8d9322b594cb6028f74b33fd9cacdbee65f49ca05f7dca04671e247f64b767df5cd0b7d19539f52ad5e
-EBUILD resource-agents-3.9.6.ebuild 1419 BLAKE2B da56df1d6c78fd8bba0ef1dd4619d5131533e2de4723bf37c982343a84ac041d8fd0e172dd1fc0a2edc56fe4d9dfc191a8692dc5631de32cceb0efe07e61fa3b SHA512 f0adbbeff42b124538d324d30776692c9ee943c7093930083c4508eca31d6ce6034c07fd01590db6893c42b47ab6ac49c7010d00ba4a75894198eb4546f04a7b
-EBUILD resource-agents-4.0.1.ebuild 1421 BLAKE2B b7baa3be36db62dcf64fb25c1590d122dd6bd9b205183b5ad6fdddf023550451effaa80abe01e99e5d5f767720e13ddf0257aa2f920f9797ac68da80d45e296e SHA512 6eedba5825d444de0dca94e8443290cbda181ab0c1f5cbc8c28f1d53c5e7e31766ffd33e53551e7a40b92556efbbe984c8a4f47f39861315e22ca2aff7cc8638
+EBUILD resource-agents-3.9.6.ebuild 1390 BLAKE2B dedde8c965af03770c6bb1e4431d521d1fed22766bdf374e9408d10ce314bd9632202f6c801e31dcd0a14b1844298f8d6a4cdf89b04f99c426c55a89ea648277 SHA512 f91f99f97722b0392e87198766115fd6cd0286d2875d382bca2a473deffd251c2b90d80474265d6efa40d4e10f9780563a6ede41b9cee0613f9e23a13089cfd3
+EBUILD resource-agents-4.0.1.ebuild 1392 BLAKE2B f1694dbb6f895ac38716136b3e5f1fea42854f11bee61c879064dc593c69b7193c14cca7eead2de5813d81ebdb71b8e9b2e916a2e674c2be70f1336c00b945cd SHA512 3ce411c8377e56a57e65b97575f7b7f33bce7b19f864fb007170dd98ad57146af3d6456d1261dc746de1de4017fd8dc4ed45a2fb3bad82094822298edbf6ab0b
 EBUILD resource-agents-4.6.1.ebuild 1511 BLAKE2B cf2adbca780e8c866be8ce84be7f3e1368ce8438959fc605ea1decfb4d1174268a61f733bbf1a536ba71bd4bde4726f108f9eae3c32eaad73d5184d06ab14b1c SHA512 22dfe693535f3acedd9e012a304d406f0d7311c0a65453fc4c3ba122efeb514abfc967ac4b61ee83a0af0162c03ab0ded0bbaa1226ad17e4a33e7da5bcd8dbc3
 MISC metadata.xml 865 BLAKE2B d90a204c0f8c9785b85951208542e7a61599fd74bfad991fe12d3e9dce6c41bb8f4a4fe6b62ad9afacd8b6933881291272ba3a964d715084368bd9327667eb5e SHA512 954a7cf7c2905824442807d1c0221037321240a60db6400ccad6ea55bd6d0c1822b8e0d5d71537e3cb720e83868d5b56daedd6361571874401d7bc58591b585f
diff --git a/sys-cluster/resource-agents/resource-agents-3.9.6.ebuild b/sys-cluster/resource-agents/resource-agents-3.9.6.ebuild
index d79b827c7178..7e9604e793fe 100644
--- a/sys-cluster/resource-agents/resource-agents-3.9.6.ebuild
+++ b/sys-cluster/resource-agents/resource-agents-3.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,6 @@ IUSE="doc libnet rgmanager"
 
 RDEPEND="sys-apps/iproute2
 	sys-cluster/cluster-glue
-	!<sys-cluster/heartbeat-3.0
 	libnet? ( net-libs/libnet:1.1 )"
 DEPEND="${RDEPEND}
 	doc? (
diff --git a/sys-cluster/resource-agents/resource-agents-4.0.1.ebuild b/sys-cluster/resource-agents/resource-agents-4.0.1.ebuild
index 009b0748efca..f04e090b48d5 100644
--- a/sys-cluster/resource-agents/resource-agents-4.0.1.ebuild
+++ b/sys-cluster/resource-agents/resource-agents-4.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,6 @@ IUSE="doc libnet rgmanager"
 
 RDEPEND="sys-apps/iproute2
 	sys-cluster/cluster-glue
-	!<sys-cluster/heartbeat-3.0
 	libnet? ( net-libs/libnet:1.1 )"
 DEPEND="${RDEPEND}
 	doc? (