gentoo resync : 05.04.2018

5 files changed, 10 insertions, 9 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index fd426bdd4363..02a82878bb9e 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index 8723387b5d12..4f99342827ca 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -15,7 +15,7 @@ DIST ConsoleKit2-1.2.1.tar.bz2 1182946 BLAKE2B f76f99008c78bd3a318c9187761290729
 DIST consolekit_0.4.6-4.debian.tar.gz 12192 BLAKE2B e88ed907ea3ceecb9ac399618614b1aa5d7eb2c46a706451d78e4ec1598dee5a02d6c5a1b0dd678f6bed4c25277884ec6969a23f8181ef3d8ede94452b6570db SHA512 f7fc5965b1f495d16a8ca167940431bc2569e9bde9e4a356b9c9ed00c2825db61da7b6db3d434d977fff72b3aaef30c455a365b9eba282a887a523753613b58f
 EBUILD consolekit-0.4.6.ebuild 3396 BLAKE2B 6e271acbf554e69a9cf82886db1e30991a703cc859d993784f3aac83fb8c4ff8d9fcdc2b55861a141689a8d12241fbdc6c4279f2b04b9d5cc244d1393329a2db SHA512 2a0acd029eb9db8d3035d0fbdc52e5c0cf6a84779dfd41d7175970b8c4ff8600292302740d375eacf8fa0939714d82c3c602f285abf811fa36e29c3e41eb7e3a
 EBUILD consolekit-1.1.0-r1.ebuild 3238 BLAKE2B 98ff5d64cc793705bc1d8da4b7cc4ed17803de1ae0c9fb4bc9e974ecc500f544e4839b198b905f369ed4b2f7006d7b60f4c058f540bfd11e690780f0349c9ce6 SHA512 d124ec42562ab4bb87e34344dd165a70f5fb0116f016d901dd6f2cfa3123540f72ec1466c0c40406f9b1a7629c4a2854c8905ba24984851cf4acfdcd1a3226b8
-EBUILD consolekit-1.1.2.ebuild 3506 BLAKE2B 7fa5f544b6a719af936a6711efea152d2e9f6417e9c7ff5c553621b7e97dbd1fe296089ee2d0cadd3bbc278f22426230638e149759e06d39c6641ca07b81b13c SHA512 494dfef7daec6b1741d00286b73c2e50517be6611697111e1c454639b2ab92dda8e71085f515d08469170af4a174f302da27a8df5c914c84dcd0733d5a5dd118
+EBUILD consolekit-1.1.2.ebuild 3505 BLAKE2B 94aea3cf4069293d6716cd60ec5d81f77f316acd5bd0a351fb93488db981e1f8cf233ffbc8ae7a1fbaaa3f0ccefa21829a0a2c66d2d961d64851ed543c9c1435 SHA512 f5e7616bff11f00502ca5f6c1a33ba1cdafcf28b4e8f87cc2e3f1f67b8018e6718c610fe3a0908b7caabf903a4131ed611491e0c26c8405cd43bd445b1ae4e60
 EBUILD consolekit-1.2.0.ebuild 3536 BLAKE2B a81c924777247d150bd38a4eeff981cecce3c6f8b49049e09954ac3a7c618cd5aa0bd544ef00d96af5620330d093f7f4c409fa78823a0f79f4534e29958769d0 SHA512 01bb70d8482df358a9a0b67deb9eb347a6c93cca051388e521f056b81fc7c2aebd3eb56055f0f03e59efa583c6f7b94338e5ecb9d789b27d9cf5420c254fec00
 EBUILD consolekit-1.2.1.ebuild 3544 BLAKE2B edd3668f348028412d4ddad3767e32b3c32148be4d58297c8cd1fe3b7b04f57befc0ca8dece505030117ca4287a546601178b8ae4915aac620ec6c3abfde0fcc SHA512 03019491f7e0972f11e0af0f8430bd78537145b52f6ab23e8461fe620fc27d62cebce6781d1f11d0c85246945c71dbe21c86a4c78772eb8057cbbde454f42cda
 EBUILD consolekit-9999.ebuild 3311 BLAKE2B 7210f04e5d06c75375122a984ad04c47043811b83b2ff208e1e3dd2e8d3667a52c9db0fd3f3a82cb1a4dda9c8effa7b49495ee9f9a5bf0e4e89595b9dd73bb1b SHA512 d28c3a5da5ece93cf7e9f22746ffcbd53beee19b9106258c210b4ff937713cff650771cdfd4d2919d4122517f2e534d5e7861d3a8392d4fc4e691e92a25e4b69
diff --git a/sys-auth/consolekit/consolekit-1.1.2.ebuild b/sys-auth/consolekit/consolekit-1.1.2.ebuild
index cbdca3a88c81..d02b3753fbfa 100644
--- a/sys-auth/consolekit/consolekit-1.1.2.ebuild
+++ b/sys-auth/consolekit/consolekit-1.1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="acl cgroups debug doc evdev kernel_linux pam pm-utils policykit selinux test udev"
 
 COMMON_DEPEND=">=dev-libs/glib-2.40:2=[dbus]
diff --git a/sys-auth/pam_yubico/Manifest b/sys-auth/pam_yubico/Manifest
index 542b8a758221..6037d900ad5b 100644
--- a/sys-auth/pam_yubico/Manifest
+++ b/sys-auth/pam_yubico/Manifest
@@ -1,5 +1,5 @@
-DIST pam_yubico-2.23.tar.gz 418567 BLAKE2B 9df6a35d7ef314b58912c91ba9ad4ae792f2931fedbf4617572d06a6a0cce5cd2190002e26891a524379b8cc886a3e5e16330a03ac617aa7efc6db58b281c400 SHA512 435a5013ef7d020f8fe6d54614b22a4d3df6295adeb8e1fd26722246d105375b8d19940098b62956a18f439dad82f67e3996a7067af3357fddff380d20fa4728
 DIST pam_yubico-2.24.tar.gz 418419 BLAKE2B 5ae988a3ba3244761d1fcadfc25f67a6c8cefd78d24535f4644ca469a5a1fb274832fb17e76d18376645960f532bf1107e6eb08112b4eacf1c797faf0349b5ca SHA512 3554b40d97ede9d02102a0661e732347a0ab2cb012fa4330cc8227289a03398a7b974ee9d170604dce53ebef1bedade5c7ab9d5657560b0ba8e4c65432c1112c
-EBUILD pam_yubico-2.23.ebuild 896 BLAKE2B 98ad2c0a43b196f7895f94ecc06ca39bc49f79d0396a33accd31f2cc59afbdb7d7a549961cd9c7a7e052979ecbc7995cd9e484b2afe0bb6d29920877844c82b4 SHA512 cfd9f0a2b8c22ca25366b86460cf58535e6dd2f48aa8d1c899efe323643167a66cfda1a1af2a0aded8731855dba45bfaa89f27c4092d70d75d1715a2894a78a6
+DIST pam_yubico-2.25.tar.gz 422192 BLAKE2B 54f27f9a0ff64c529c74415cf4530cdd1c359325beeda4d8ce2b51af4f9b53c69284696de21a5c1e3b4eed5102571e320cf068693fbd43d144ad2c9f40c39b72 SHA512 c561bedd35d3a84cc2129f12e358b77ac425520acf13444c2918cb17c9c4158d29dc5049b2e03dd30a1f04e8568980d80af13a6a0cfd9cc8e70eee8738727d70
 EBUILD pam_yubico-2.24.ebuild 896 BLAKE2B 98ad2c0a43b196f7895f94ecc06ca39bc49f79d0396a33accd31f2cc59afbdb7d7a549961cd9c7a7e052979ecbc7995cd9e484b2afe0bb6d29920877844c82b4 SHA512 cfd9f0a2b8c22ca25366b86460cf58535e6dd2f48aa8d1c899efe323643167a66cfda1a1af2a0aded8731855dba45bfaa89f27c4092d70d75d1715a2894a78a6
+EBUILD pam_yubico-2.25.ebuild 888 BLAKE2B a4b0b2ffed407f1fc702994356cf33b151b683ca03ac886eada37dbfc80f4745617f50cffebf146e963f5f862c42841890a8ca7348bee1c2501159454bccab4d SHA512 52e73f35f1d7991988ceb6e4280ffc44c4834a8ff671495262443d39a870ca1d2246d9338be7530594d00714b30282376450db7aaba76187e7e60ad700d53665
 MISC metadata.xml 339 BLAKE2B 159735b5bd274a1eabce6926405095f5207d01590f7ad054cc96c0b08a508e2815ac442bb3818cea26b8ae11323eda324350719dae75fe274bb30fb63eb14d13 SHA512 f6d6b5fc3be0305b4481ec8b93401bfdbfb094304b89a8c1acefb4ff3b4b341579afd26844abe31dbb08903f72b52e673ae7a65d7c366ed1341381547759c6f8
diff --git a/sys-auth/pam_yubico/pam_yubico-2.23.ebuild b/sys-auth/pam_yubico/pam_yubico-2.25.ebuild
index 17602d4f705a..034bfdfc4539 100644
--- a/sys-auth/pam_yubico/pam_yubico-2.23.ebuild
+++ b/sys-auth/pam_yubico/pam_yubico-2.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,15 +26,16 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	#challenge response could be optional but that seems horribly dangerous to me
-	econf \
-		--with-cr \
-		$(use_with ldap) \
+	local myeconfargs=(
+		--with-cr
 		--with-pam-dir=/$(get_libdir)/security
+		$(use_with ldap)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
 	dodoc doc/*
-	#prune_libtool_files #why doesn't this work?
 	find "${D}" -name '*.la' -delete || die
 }