gentoo resync : 10.02.2020

11 files changed, 22 insertions, 152 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 343d69dfebf9..bd22853dc16d 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/authenticator/Manifest b/sys-auth/authenticator/Manifest
index c077add45437..8da45634f003 100644
--- a/sys-auth/authenticator/Manifest
+++ b/sys-auth/authenticator/Manifest
@@ -1,6 +1,6 @@
 AUX authenticator-0.2.4-disable-failing-tests.patch 423 BLAKE2B 02ca693fec700649cc0103f3de458c04e711b42eb4c0207a3c8dfcb747c565bf0afe1e673e8cb689ee568a9c5440d706514c5ea758e8a596687e5b7df336c206 SHA512 6406f5cb916f49abf909dabdd7df2b0096b1b4b300c2e0b8c1097155c1c52e6b54ce9e7ef526829e8e07e00ca8c52a6b30944c65bce37893c91ffab9cb6cae19
 AUX authenticator-0.2.4-support-use-of-gdlib-from-system.patch 638 BLAKE2B 76709f75b2d3cadddbb558938d8ef08d09b6d20f9008f513a44940f3b5847da784c52d382ab058ab91be084e98c1ba63ef450b41aa743a330b920e54cdec327a SHA512 0da21566e5913e99f78c6a7608a7b4a2da568c494dc7515d3d05993ddb8b611b607ef166d57be4ec949ca377848f474614d155068d2550ad6e7220ca46b5264a
 DIST authenticator-0.2.4.tar.gz 142444 BLAKE2B 2df1462452d5aaead51af111359120c8a464058730129fd984dd568c709c58f6940a34b996d3b5435b78bd87b433a29735d3fd8e9629b512915720063b49b1a1 SHA512 16b942d24a1136350f78de92a287dcc6b52e9347cd0b73e8310b87c6c24b7075aebe909fe20d80532f7fa1b54d332b8b62fd2fc7d26ce15888fd47bb686520e2
-EBUILD authenticator-0.2.4.ebuild 1659 BLAKE2B f903aa74bbbef31a5d083599511d5fd34fe541337908815c51c32362f4b36e95f81546c058d145911a07549c1164e589e3b666dc4594b7250a406ae3b89f62e5 SHA512 a4ae8c6713d9048d02b49f1a3cc76e33d79bbf570abdba3463698eb529357072030f1b2fdd4412b1088e46b08fb3db3f6a0127fb034ac62a70bcac64f3462b1a
-EBUILD authenticator-9999.ebuild 1540 BLAKE2B 1d0e21e5bf564ceb31708da71b665adc283d8b511baef1a6c485baed202c1d357db3e8b184844e4f641f995baa3a2893a84749a8ae79d4a7e02bd1d86a237ea8 SHA512 25d0a1a017b39e5ab36690f48993cdd44fcf60a6dc923c855e2148bf529061fcefca85949215ddad8d6906dec8ec59e31df079fc8312978551a17460eaf004bf
+EBUILD authenticator-0.2.4-r1.ebuild 1723 BLAKE2B 27193130b4680db40cbb035691ecd2ee9a66909e58154e72c30481958d8918040a8c76e51ad2daf2d8ba6889425f01999764804f977d56ff5ba86ed23074893c SHA512 075833602036503592f5af544c14204b80998f0224f21a9056d62f9aab2b186fbd609efa8f7d56d00d055be8ff1acd84adeb8091925a102b9ff011daa680382b
+EBUILD authenticator-9999.ebuild 1604 BLAKE2B a78a1ae13e07f1e2801ed1e6f5c666977f44e7d652b8a9152a46e76bb8cb2cdd582943c7983a79ab371aef34228e33641c8967334ea2d44cfd979a1cae8b83bd SHA512 a522d6fcd9ed2ad9e3a6097395c32d0518f1eee5f664e15740fd1114a28f07e003d51406feee5c290c79aac266897cb86106bbcffcf57114e7490225118d04ff
 MISC metadata.xml 544 BLAKE2B fe9f1a1bba9cdf6c48644f526d9b2309773735143467192a007fe8e63e97480aff2bcbf04d442ab9bb61792386b6610a6fe874a52db5dd6dea9f51d0c174ee4b SHA512 112fb3e1bd3a559a4f6f29ae800365a77a5298aa572f089b7d52553851ba85603387c1b09d8a86ce039080520ed6fe473f953c345b6fe553d3ec415a3e6bbfb7
diff --git a/sys-auth/authenticator/authenticator-0.2.4.ebuild b/sys-auth/authenticator/authenticator-0.2.4-r1.ebuild
index 07b119b2a402..8926a63fc2d8 100644
--- a/sys-auth/authenticator/authenticator-0.2.4.ebuild
+++ b/sys-auth/authenticator/authenticator-0.2.4-r1.ebuild
@@ -27,11 +27,13 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	${PYTHON_DEPS}
 	app-crypt/libsecret
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyotp[${PYTHON_USEDEP}]
-	dev-python/python-gnupg[${PYTHON_USEDEP}]
-	dev-python/pyzbar[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyotp[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-gnupg[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyzbar[${PYTHON_MULTI_USEDEP}]
+	')
 	media-libs/gd
 	x11-libs/gtk+:3
 "
diff --git a/sys-auth/authenticator/authenticator-9999.ebuild b/sys-auth/authenticator/authenticator-9999.ebuild
index f3c1fe349d47..2d9e3b62d7b4 100644
--- a/sys-auth/authenticator/authenticator-9999.ebuild
+++ b/sys-auth/authenticator/authenticator-9999.ebuild
@@ -27,11 +27,13 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	${PYTHON_DEPS}
 	app-crypt/libsecret
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyotp[${PYTHON_USEDEP}]
-	dev-python/python-gnupg[${PYTHON_USEDEP}]
-	dev-python/pyzbar[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyotp[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-gnupg[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyzbar[${PYTHON_MULTI_USEDEP}]
+	')
 	media-libs/gd
 	x11-libs/gtk+:3
 "
diff --git a/sys-auth/munge/Manifest b/sys-auth/munge/Manifest
index 310bc06cb107..cd5b5b8c3090 100644
--- a/sys-auth/munge/Manifest
+++ b/sys-auth/munge/Manifest
@@ -1,8 +1,5 @@
 AUX munged.confd 410 BLAKE2B e220ad22fc0367a9ec7766e768aac8907b34edaf5bfb00593e88dc5ce6f47cddae2df0cf1c7dd8a57ec3e644f1e489a5bae538992ce3fef191750e0ef1e7ff6d SHA512 571e9d1862be1e0389e1a45685853a1819f44cd7a89188223099703268f788f3097f8ee4e8abf36f30bb5fe81e7c57a9ec7981867b3528a37e63eb11f5b2e232
 AUX munged.initd 1127 BLAKE2B b0d43fe3f0c0354fc0935a0e3e3e0bf28770e5cba8b900c6bed7cf08cb57b742e71cba7adc7440c8564f6db208f6ef09ab4fe50a4381fb8988b4fed815d71cf3 SHA512 fc49ba42cc2b538fdbbd93f7422359d1410b4124e11afca7db0511da980360be14cf49aee829ed1f5762ad4723c68090088638c36d76b040fcafda063394adf2
-DIST munge-0.5.10.tar.bz2 424285 BLAKE2B 07c6423ba799400e9a99e3f33a7dee61ed35b8caa8b290f7da5ffc1e7fbdc37ad985d10101b9a18ccae4ca4274c44999549f9754b0e782cda98976b5f15e3f30 SHA512 b1b780d205d6cfbadfe6096156840d559c70de5b0023cbd604acfc29e1135036c98a949981d5c022e994c77213ee3d8d70e8fe825b645b030ad1adef92ed9479
 DIST munge-0.5.13.tar.xz 389952 BLAKE2B 67887469dccf0f4e136a3fba12660dd8d0bfbd5d5024582c6be164b7e837959380ee9d09055ea95db2a307b1da75a8e7c643844fceb56b8a35f59ab7b1b811d8 SHA512 2e024c0438f9208379a037daabd1c31f206820ab74a410e2bb69870755e99f9c9fbf60c294c96941008bc43425fbb31dd2374e5f088b7978479e7c65816e9002
-EBUILD munge-0.5.10-r2.ebuild 1245 BLAKE2B 5f7c3cc21e641074c5362d315bda5fdfa3c09a1dac2bdd28146707be9a73c01ef6a77058c641fbda35e0dffa05b5a16ebdc4223264e404d67c518b8b41524602 SHA512 134e3392b097d90a5c81c9a88085352937018c99ebb5fa61d0ebe1958966bef3af76097da779b15ee5486905cf0206fa8b91a948b6953863aa22bab593fef57f
 EBUILD munge-0.5.13-r1.ebuild 1403 BLAKE2B c181ccc54e31820f67fa1f896b54e446127a3212bbdbbcde0cbaff1e334f330e023d297d8b0447cd4940ec0953d4725e40098cb38759130985992957d41b26c1 SHA512 6590d98966c8de71a85aaa3fb8b0ca73de2a025e58ba3fc2d71e1f6590dd0a33a58e68a19813f2668080e186f32786a55355c8d582e9cc5ad057c1c37347c10e
-EBUILD munge-0.5.13.ebuild 1410 BLAKE2B f4d592ea6080411a6c701f26bfe6ef11d6f2bb1a73b4afca3338213688d7c378f39a318eec061f2c1290f6cfdf23690e0e82b2e37e93cd2c23de315b73002c02 SHA512 8ab9f092a3c603784cb163c40ea5e9250ebe6eb384ca407c0f2936f8c0bfcd0824c5d53750493c2d969d2c3c8cac2a660c5e4724ddfa0043ac6a723b3e2cfb9d
 MISC metadata.xml 1059 BLAKE2B 5b0f3f02298161ba2c929463fce32d74fdac822376dc7f9a852df211f6e37f3d53bfe93723b773f2268b5e2ffb58179562ed0ae26194ce024e3ad59915ef901e SHA512 0018c8101643023b01f621e7d5c23cfe6a3946dcb0f6e57ca05c998dc413b8cd1725eec88c5a6bdb5ddf2d6041793879aa04de6d53802f102b12070d0114c59d
diff --git a/sys-auth/munge/munge-0.5.10-r2.ebuild b/sys-auth/munge/munge-0.5.10-r2.ebuild
deleted file mode 100644
index f8a071127fc8..000000000000
--- a/sys-auth/munge/munge-0.5.10-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit user
-
-DESCRIPTION="An authentication service for creating and validating credentials"
-HOMEPAGE="https://code.google.com/p/munge/"
-SRC_URI="https://munge.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="gcrypt"
-
-DEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	gcrypt? ( dev-libs/libgcrypt:0 )
-	!gcrypt? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup munge
-	enewuser munge -1 -1 /var/lib/munge munge
-}
-
-src_configure() {
-	local conf=""
-
-	if use gcrypt; then
-		conf="${conf} --with-crypto-lib=libgcrypt"
-	else
-		conf="${conf} --with-crypto-lib=openssl"
-	fi
-
-	econf ${conf} \
-		--localstatedir=/var
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# 450830
-	if [ -d "${D}"/var/run ]; then
-		rm -rf "${D}"/var/run || die
-	fi
-
-	dodir /etc/munge
-
-	[ -d "${D}"/etc/init.d ] && rm -r "${D}"/etc/init.d
-	[ -d "${D}"/etc/default ] && rm -r "${D}"/etc/default
-	[ -d "${D}"/etc/sysconfig ] && rm -r "${D}"/etc/sysconfig
-
-	newconfd "${FILESDIR}"/${PN}d.confd ${PN}d
-	newinitd "${FILESDIR}"/${PN}d.initd ${PN}d
-}
-
-src_test() {
-	emake check
-}
diff --git a/sys-auth/munge/munge-0.5.13.ebuild b/sys-auth/munge/munge-0.5.13.ebuild
deleted file mode 100644
index 0c9183212423..000000000000
--- a/sys-auth/munge/munge-0.5.13.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools user prefix
-
-DESCRIPTION="An authentication service for creating and validating credentials"
-HOMEPAGE="https://github.com/dun/munge"
-SRC_URI="https://github.com/dun/munge/releases/download/munge-${PV}/munge-${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug gcrypt static-libs"
-
-DEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	gcrypt? ( dev-libs/libgcrypt:0 )
-	!gcrypt? ( dev-libs/openssl:0= )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup munge
-	enewuser munge -1 -1 /var/lib/munge munge
-}
-
-src_prepare() {
-	default
-
-	hprefixify config/x_ac_path_openssl.m4
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-crypto-lib=$(usex gcrypt libgcrypt openssl) \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	local d
-
-	default
-
-	# 450830
-	if [ -d "${ED}"/var/run ]; then
-		rm -rf "${ED}"/var/run || die
-	fi
-
-	dodir /etc/munge
-
-	for d in "init.d" "default" "sysconfig"; do
-		if [ -d "${ED}"/etc/${d} ]; then
-			rm -r "${ED}"/etc/${d} || die
-		fi
-	done
-
-	newconfd "$(prefixify_ro "${FILESDIR}"/${PN}d.confd)" ${PN}d
-	newinitd "$(prefixify_ro "${FILESDIR}"/${PN}d.initd)" ${PN}d
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/sys-auth/ssh-ldap-pubkey/Manifest b/sys-auth/ssh-ldap-pubkey/Manifest
index 39440c690243..351c21831f23 100644
--- a/sys-auth/ssh-ldap-pubkey/Manifest
+++ b/sys-auth/ssh-ldap-pubkey/Manifest
@@ -3,7 +3,7 @@ DIST ssh-ldap-pubkey-1.3.1.tar.gz 15263 BLAKE2B e073093ff5c2e5ebb560d00b4973a0d2
 DIST ssh-ldap-pubkey-1.3.2.tar.gz 15311 BLAKE2B a8119b9808de556184c7f88c86b657d5d342e476b27cf53d92f37b8e9d3db69182b55c62a636bec6624c5d1aa2a90e3a04a22ce5ee8020ada27582b1ac6eefa3 SHA512 8475715151f331017850c094a50bd285574533fa6266341effc83f758ca30af9b9c24b54fce8c3eac5441c5cf18b0d7aa91bb04829b71efc4b8dcacba3642415
 DIST ssh-ldap-pubkey-130478a7532a8d3dfb0c8e3fbeac494908b8ec55.patch 1494 BLAKE2B 3fb89340d8177db79396b13615437aa921ecc2d21b8ca5c918587bb07f9fb53bc8f356c50c57269b1ffe04995033815d7632ff060485d4c29d34dc7805227533 SHA512 dfc137b6fb2bc0aea698b23ea462de2bd00503b9b21f022b77b28d51020758730ea4017b890e298616beb198816489862830d4dda7cae5114572523ad6289472
 DIST ssh-ldap-pubkey-8d718357dfa5a62f919e61cf620a862cae87e833.patch 2215 BLAKE2B abeaa5a364cd98050fd8abb1019cc203b72e96baa4c3704c7aac6cadc07d999defa2333f6ca4f6793dd0e758b08ab198135c65d100f5f91eba6273c07dd20250 SHA512 85136608352fb35ede70eff8522e09167e48eed5c99a87756ea8b3f641de0dc169bf066d0c21a28fc35c41337372803d97bd37ca8bad1dbafb92464086fe3a63
-EBUILD ssh-ldap-pubkey-1.3.0-r2.ebuild 2226 BLAKE2B 0dc9a32a65f30af7350ebc5c4a4540e30d80616f3f4726b1259bce78e8dd723b918b236a5e68e84d6c58973f89f1bb3e45f3ec1851e4022938e3130fee6f9a28 SHA512 9ce4704f40427a955303ab1697a36bfecac9a685d90b6eee27e07b16ea17f8d841baaa8dce5a70a36aa44c32d4ae717fd29af371dc357fa17f3d71e0c5e1374a
-EBUILD ssh-ldap-pubkey-1.3.1.ebuild 1723 BLAKE2B 7df986ff03109ef8d6bc16fe524d4fe7a6cdb0ccd29afefe8a2428372aa5b7852cdf645e1277b79401dd3364c9e999b1d266a667f3b870a8befcae0f761383a6 SHA512 b56c125cdd5cf143008ddfefef779e91ea20fc747f40b822be2df93708205bab0fdd9f09b7a39d5b826db971f604ab78bd37a011b97f9f645fa56c3dda49d7c9
-EBUILD ssh-ldap-pubkey-1.3.2.ebuild 1727 BLAKE2B ca5b0c02415a2a17298aa036010c446c4bd9e2d2e0563b8ca9e21baadaec7875676bc9a11ba8b10a1ac50fb63503f9200a4375b92630019d3d82c992f3879bdd SHA512 a2cb962ee32975e74b42f78e24db71980f0c51b9bc6a26a5a00ea552997e18df1a8e28c33e1a2259af43383ac46f6cd1ee47c4c05baf89df4fc04a598e8e3b35
+EBUILD ssh-ldap-pubkey-1.3.0-r2.ebuild 2216 BLAKE2B 75c57778e75d2d3b25aa57f58031723ead243fa4286c88e49bcefa10df745694192b685d405c4ff5aad5ab2e94296d25f2c6eec2aeb8a6b76a44a31199fa34bc SHA512 ae104e7a5cb040bdcd0b28e40446b59de7ffbf0a74de203fbceb1f575c194b82d1f845013c554c63d5a3fe4522c849caf5a0d83f61e14977fdb20d9848da2eb4
+EBUILD ssh-ldap-pubkey-1.3.1.ebuild 1713 BLAKE2B bf291394cf41bcd03c15ba913136f93d2c17244fb660b06a076b4492d024c2abc5ad2ed85ab81170b58c605f6b81be316d3ac5747059b9b8782b4c098bdd0c2f SHA512 f16fae43a02ff3d70f3213eae49f9370d1f0e2ea9cac5a6c1ed586a559bd896a00c5129439c626188f20eac84dbc84a41094cdade938f493ce035025e395019c
+EBUILD ssh-ldap-pubkey-1.3.2.ebuild 1717 BLAKE2B cce812913992d61faa786b2064737b88626d6b384874117227464c8bde7db8ee2ef12e93590ad4b5b3c78fb53624a22a16c1e2309ce8a2c30e233ef6f771e7e2 SHA512 bfd363e66de54061c74007e68fd0e153114ef13854bb958dc456b6b215cb637b0886e8da8b808a5ab49dc016146915285f23c79d5a96a22e6e90b36ef63f8072
 MISC metadata.xml 523 BLAKE2B 0a9308f1acc865d1150c5d1f7275ab7d213965be821936aadc1e92b6a0ca0f3ba90a8e4b28a1683b182fe1d540991ff032407e641ce0ea4b4f8511a880e74d99 SHA512 f9db947dfb435f981350a30cd8d6d9163b9b5067f610eae87f17c85d6a123a2dd620aa06d1a290ed148321d68c37877662885b07b5af15fce3f13d0afbba67dc
diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r2.ebuild b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r2.ebuild
index 17407783a2d1..d4129f617cbd 100644
--- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r2.ebuild
+++ b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Utility to manage SSH public keys stored in LDAP"
diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.1.ebuild b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.1.ebuild
index f0323772233f..f9b87b29b318 100644
--- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.1.ebuild
+++ b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Utility to manage SSH public keys stored in LDAP"
diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild
index 6aad75f50303..15c6338cb358 100644
--- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild
+++ b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Utility to manage SSH public keys stored in LDAP"