gentoo resync : 24.06.2021

6 files changed, 8 insertions, 9 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 6e56bf96edc1..e01bd79ee453 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ganglia/Manifest b/sys-cluster/ganglia/Manifest
index 17bd9f4e9736..bb1b50a3f80f 100644
--- a/sys-cluster/ganglia/Manifest
+++ b/sys-cluster/ganglia/Manifest
@@ -1,5 +1,5 @@
 AUX gmetad.rc-2 480 BLAKE2B 9ebf71eca6c80aa5f5c776e292cc0ceee58103a30a7aad29e7430f766a58e6c58222113bc12bc7ddc74c4c3f6f5aaccc95ff7470321bbd3ccb87af1e704be7ae SHA512 37678fe9b52ce7c6ef38bcc764189ed26e10410567ac9a8608460ac3eab380c70ac91453ed425ffef8d6e86ff6ef609e0167f5bb04a2aa9318725527d31391fa
 AUX gmond.rc-2 473 BLAKE2B 461d0b481f2138dcab8f7202a880354740b71f91e41ad2152a3465daf8072e6243fcc5f27ee215aa079dad30546e06146c01be71e85f518974cd9c479549ff34 SHA512 bbb5e3c525137aa2072bd46d28473523498895eba70c8dad1209230ea5e7f44ddc09875b5b6065fd5351d89ed0ad574a94fe0debcbe1d3a51e2541715adb4240
 DIST ganglia-3.7.1.tar.gz 1311019 BLAKE2B c70ee163d27af747a0961e6e8115f23512c64e28270f4224121e834c5bb66af27536821d4f9a8d6cc9a8e290d9cd3fcdb01fed7d054ce55d12cb80dd41d9f63d SHA512 1c3519cec0015cc967536a8c72cedd1b1bc268e0e238538756b1f46fd741b56ebaacc6f518c57eb111c30fd2e56372cba4593e4487c9ed68472aa59d24ce66a8
-EBUILD ganglia-3.7.1-r2.ebuild 1909 BLAKE2B e951d29f7e39591004af515ac2393815482ba52b31d906a67fdd28a84e68af2ec33518b54f5cb74634784902d52456bbefba0fdb117fa273f06d02f14d8b0a8e SHA512 588afcf64a706e378f3fdea496004e3e37f09e652d09adec42069fc4056cc62d5e50d778ea51166bd69034ddd93ebf9a2b28641b0ffc8c6940f2258e5dc94ade
+EBUILD ganglia-3.7.1-r3.ebuild 1933 BLAKE2B 418e26ff8818f4311df12268908fc3e6b5fe6085b9d5b815432e372316a50a5af335d0874100e9b3f4a7df56ea559e31d675083f9adf6f189985d1e48ef7733f SHA512 7f911f0c6b47698ca7dc46e92999c8fe3ff19b720e237467e0b563ed046368c4eb26856a82949e09ee2987861fdb8bfe21280991a1c489e42524c53ef82289c9
 MISC metadata.xml 334 BLAKE2B 59027b7d3fbc47f52e3b17ca0e04d3ace7283f7fcdf5ab6328c652fd1a52a32b10a19017794e31e6fdafec51901758e312a0761025edf6aa610629d5099fbf36 SHA512 9b58ae22b5ef2ebe1d7b247b179273a68033ccbc01c78969a2ec10a2a3932432ea4328b91e192b30dcef84381313fff1d26fc0e4d7e4cf70f0a36aa9c3cd8a63
diff --git a/sys-cluster/ganglia/ganglia-3.7.1-r2.ebuild b/sys-cluster/ganglia/ganglia-3.7.1-r3.ebuild
index 1154eb275990..bb07730b6ddb 100644
--- a/sys-cluster/ganglia/ganglia-3.7.1-r2.ebuild
+++ b/sys-cluster/ganglia/ganglia-3.7.1-r3.ebuild
@@ -14,11 +14,12 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="minimal pcre examples"
 
-DEPEND="dev-libs/confuse
+DEPEND="dev-libs/confuse:=
 	dev-libs/expat
-	>=dev-libs/apr-1.0
+	>=dev-libs/apr-1.0:=
 	net-libs/libnsl:0=
 	net-libs/libtirpc:0=
+	virtual/libcrypt:=
 	!dev-db/firebird
 	pcre? ( dev-libs/libpcre )"
 
diff --git a/sys-cluster/lmod/Manifest b/sys-cluster/lmod/Manifest
index c43ab802145a..3027188421d0 100644
--- a/sys-cluster/lmod/Manifest
+++ b/sys-cluster/lmod/Manifest
@@ -2,8 +2,8 @@ AUX 99lmod 22 BLAKE2B 6a470f0e5796f21f10e10161ee1fdb4fb3d794a9261bee9887c9e2d179
 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.3.tar.gz 20987187 BLAKE2B 3b0bf30524e7ba1f364650385afabaffce54db3fdcce7710a8d4a0fc3d4b2e852bed00fd8c155790ea3e2fb4aed33883af7edc3418b20cf7890f422962af9eb6 SHA512 41d7eda5aa2a1e9e91db3aa854f1810a5a2fadc9f5118561cec6a33a246870b25244aa3a5106f7a434278a76d4ceac4b8bbeb6d55ba82332615fc43a6e215629
+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.3.ebuild 3448 BLAKE2B 1bae0e3fc8775ba7c8e9f05e56e5362a28a899366ec3443d9cc51c98c83eb38f56b1a356f1258bdbda43b52b34483117fd6f7df523748440b4a6220ae105c2b3 SHA512 9f6aafaa0118aa84d05ec6523b72e5ef7ab20e3babc5c7bf520bd00834b6e8a1550d0360a524f976d91565abb4a1580787b4b29f1b5afd71b881cf1eb44066d1
-EBUILD lmod-9999.ebuild 3326 BLAKE2B 593228c6c7e2d21d7dda637f56ce99eae93bda463f2bc30f3e47f2dbf980a71c85543fd6095b085966ad1a43db6710a0ea09dfebe3824bd4ea1beda613d65c30 SHA512 f9e5d7ba6b9efa892db1470b1c0d2a5cc6986fad945d497d8645f1d54667621d98a9a893dca0de597bb1559ec8fb4cd10f51da10979b87b77a530883ff2ccf4d
+EBUILD lmod-8.5.6.ebuild 3343 BLAKE2B 93530c3a728eac023cee887c5f46ead4ab742d33a17bac361dde5db593aaf182362dd4282f078ed421f7d138532b0ee95d84ba9d4114684d0b95dbf08175b5cd SHA512 8186c2ecdb9d4befe1f1725aedeb2b9652ec0607ac88b49e388e6820948bcd6f7eaea9ff140af615b6705d05ea231f037273a48ceda2373ff77dbfda330fd383
+EBUILD lmod-9999.ebuild 3343 BLAKE2B 93530c3a728eac023cee887c5f46ead4ab742d33a17bac361dde5db593aaf182362dd4282f078ed421f7d138532b0ee95d84ba9d4114684d0b95dbf08175b5cd SHA512 8186c2ecdb9d4befe1f1725aedeb2b9652ec0607ac88b49e388e6820948bcd6f7eaea9ff140af615b6705d05ea231f037273a48ceda2373ff77dbfda330fd383
 MISC metadata.xml 1081 BLAKE2B 0ec2fa6b5885b729065b273c75fe70341b12acc11548b2a9c989853a48c60bd8fd60d377acae6ca42fade5b87f5378a5e5fb2d408cd8665085beac8872b252e8 SHA512 0872338780b16bd7eaa7912862ce34b0ab8e60c765023c3a359587b0e74515fe52b14bed61fdc4929a44ef714c13b21e0914f618197573ef18fb028d474e5b4a
diff --git a/sys-cluster/lmod/lmod-8.5.3.ebuild b/sys-cluster/lmod/lmod-8.5.6.ebuild
index 8564d3f3dae6..b8c9fbcde3bf 100644
--- a/sys-cluster/lmod/lmod-8.5.3.ebuild
+++ b/sys-cluster/lmod/lmod-8.5.6.ebuild
@@ -95,8 +95,6 @@ src_configure() {
 		$(use_with cache cachedLoads)
 		$(use_with duplicate-paths duplicatePaths)
 		$(use_with auto-swap autoSwap)
-		# needed because configure.ac relies on TCL_INCLUDE not being empty
-		PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
 	)
 	econf "${myconf[@]}"
 }
diff --git a/sys-cluster/lmod/lmod-9999.ebuild b/sys-cluster/lmod/lmod-9999.ebuild
index 4cbf6b21b9b0..b8c9fbcde3bf 100644
--- a/sys-cluster/lmod/lmod-9999.ebuild
+++ b/sys-cluster/lmod/lmod-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/TACC/Lmod/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/Lmod-${PV}
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
 fi
 
 LICENSE="MIT"