gentoo resync : 30.09.2018

15 files changed, 101 insertions, 384 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index f38f69713bad..37edb6702896 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 510043d8e417..ad0c9f663285 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -7,7 +7,7 @@ DIST keystone.policy.yaml.sample-14.0.0 38318 BLAKE2B a27e4ea59c99dc91dde9d1cc62
 DIST keystone.policy.yaml.sample-2018.2.9999 38318 BLAKE2B a27e4ea59c99dc91dde9d1cc62340faa4b91e644dc6b8725c2d7de731e44684d8d59571e6470da3ab9fa191087a890a0b417b58b1473038bf39cfc75e5b2bad4 SHA512 95fad079d1fb77d15b9f8e507be8b1e01b493c3f1dd4e992567fe9c905bae01a058e93d59677d472ae47856b13d5cffa213d89e8e267f081a2bad1bf8e1f6036
 EBUILD keystone-12.0.1.ebuild 6280 BLAKE2B ffb752f981b0e72674cd6dac474a9f475123994cc2eba0ea24eed4d01acccdba9f9ec009c38a42e8e4084e0e6a95e03d794ef4b6be0328e3c87e8e0a17f4f5fa SHA512 32b5582c8e4bb24c3799b3716ac9cc62a254ed694e10e2c72ff275b69535639c442f66baa5eecd81fdca0d8007e1c4e2154eeaa00f07c3f169a7b698aec49230
 EBUILD keystone-13.0.1.ebuild 6185 BLAKE2B dc880b6445ed20b3f50e062b338a92576ae8d9d267021550dc817e7d527078715af0521ea8ce910a69c26fd1cee1225e99a7536837ba0a2ceb0e9c01c8b47e15 SHA512 fbc2762108c126f086dbeebb829e0417f54bdccc936c2f72c9667100776b4b94ba4e9c9fca22bc850cb339d54130e3f7b4dc8de936009ab0efb2b92ce9e8c3b3
-EBUILD keystone-14.0.0.ebuild 6750 BLAKE2B 6036789299ec6679527ed0a862310ea34d85540d09c82ac13b5deae92dd55654b669bf46f6cc80a0e88c2abb9137713704290063dc65759abbbea11d5e3c05bb SHA512 c7394c367e842abcef65887f9dc66701352c50dd330f4f0738bf70c35fb6414028369426cfa19dd08b1e520db3c722c918182f256b15398ba9601b32caff33f6
+EBUILD keystone-14.0.0.ebuild 6745 BLAKE2B dfa88d3773cd388b1f01fa03667b80643a3deb4cbfbbb4fa3d1febc3e53cb12a41560e92e9b275224a869b5c2c4c8f6479a0154c3b471827fc94fe506ba85242 SHA512 a194f98e0dc066a70dd4afd55d8f9aab68560087121c55cca2bf12b8bca7dcaffab2984eda0417bd2fe77b084a58d788244a3d58b796f8b17ffc3978c5c01c2f
 EBUILD keystone-2017.2.9999.ebuild 6298 BLAKE2B 0ffe1ffd9ce957b38693ae38470823461b2f88741e679788ab149d545584e12fd244c8f7c648bd3de0dd1903b9b12e029e7583087a3d4a4861dceacc63bbf6b3 SHA512 c1d8594a094dd25bbbb7119d41a9ce32d302b1af7b6ccf7e59fc1ecc7a2f72c99dfd07a40aed8e2338f20511d019592753c4bd491f9e3405557d694f0fbcf9c0
 EBUILD keystone-2018.1.9999.ebuild 6187 BLAKE2B 14d660926e2c4063ede68932eccf12a32a5ca8970d42b858614acb985167b797a9fd47d50ace7b06114f971243886ade20b1c32b5bac237cb36171d2657a8b43 SHA512 ff7fdb04866207596c3923a92b42fdab4bcf9ad1eb6ceb5958d23c0c6fb2eb98c2ca0ce06c92c1c4abfc0f8d561d8021a80acf0ad3c3d486e2223cc5075f8d93
 EBUILD keystone-2018.2.9999.ebuild 6750 BLAKE2B 6036789299ec6679527ed0a862310ea34d85540d09c82ac13b5deae92dd55654b669bf46f6cc80a0e88c2abb9137713704290063dc65759abbbea11d5e3c05bb SHA512 c7394c367e842abcef65887f9dc66701352c50dd330f4f0738bf70c35fb6414028369426cfa19dd08b1e520db3c722c918182f256b15398ba9601b32caff33f6
diff --git a/sys-auth/keystone/keystone-14.0.0.ebuild b/sys-auth/keystone/keystone-14.0.0.ebuild
index 3fe0e204e8f3..d559bbf28df8 100644
--- a/sys-auth/keystone/keystone-14.0.0.ebuild
+++ b/sys-auth/keystone/keystone-14.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.conf.sample -> keystone.conf.sample-${PV}
 	https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.policy.yaml.sample -> keystone.policy.yaml.sample-${PV}
 	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sys-auth/nss-pam-ldapd/Manifest b/sys-auth/nss-pam-ldapd/Manifest
index 39bc4eb6975e..d6bb90143c0c 100644
--- a/sys-auth/nss-pam-ldapd/Manifest
+++ b/sys-auth/nss-pam-ldapd/Manifest
@@ -8,10 +8,8 @@ AUX nss-pam-ldapd-0.9.8-pynslcd-module-paths.patch 589 BLAKE2B de9801045f452da7d
 AUX pynslcd.initd 522 BLAKE2B 180d1ffa695a1cb6fccddfdc8719745e0d21ab082caeffbd0a071ce7afbbec6debddbabf9828c056b4aa88cb0f5cd6e84d4207cadf30e3cd8ac2e1946b9e7588 SHA512 2b737990a54b55c04de76fb295c466afbd029e44252372b0ca7a03407d059dfb200c63bfcbf55b1183d8c4f9f90a4f1130d8f5332f4fbde783d92c9ac0ce29b0
 DIST nss-pam-ldapd-0.8.14.tar.gz 508949 BLAKE2B ad8532bf86ef93c62394b91b7c3c035dc1090a70b60ab190ed8af012d533e61fe067b4383388af0d3a53142dbc96da3468d2aa09c2a30f92b9cf56434160c6d6 SHA512 70abb1836b5b3304e583fd3b71f11fee7586e181b26f4630779ec1d90b856da6e4fcc76327c51b20a158aa36708dd12ceb5f543a33c826881f2ad3e092f542c9
 DIST nss-pam-ldapd-0.9.10.tar.gz 749302 BLAKE2B 38cdc0e2a5b971d18412d7a583a265cdc87249342139dd4af9cddc61d17bc3d4d19b43c6705fdabc9dccc5ad4f7dad5ea473f75cde2915e485252fdf9116a1c6 SHA512 be559bc0d60bcf25af94919d456922bee4abb2c0417a8d2daf954d9aa9af2d41cb06a20cef04d9afd61c1316a744331753ee1cb25ef4a9c5411c508193231218
-DIST nss-pam-ldapd-0.9.8.tar.gz 771247 BLAKE2B bef3e5ede2b4747277ee400dfa8be620281e4e2a596acff236008e1f0bf6b79d6e309a4ca4bad852f6b0a8f79888cffcfffe09ddea8fde8e53b8450a894598eb SHA512 f0d24afd4cb5cea8155aa719b598448d3d81a896f7bc431f7d73e0617a7b2aa7e0ceb6de0b50163848c5554d96a3c415226e32a92e64ed91772fec4c64ad135b
 DIST nss-pam-ldapd-0.9.9.tar.gz 772059 BLAKE2B 0c1da79d58f19f0c310c0589ca9f286a73ada025028d1a00df938d40dd1211f4dd5ba694de94a37a3596b64b5f8a511127c359a86a60271eb091082dec69e6bb SHA512 8148467523003da397d03b70bb01e52dbc63b0528540aea1d85f6af2ee8af69300e107617b69608397b210e825a2351cfd61b88c4fa146d2e8e9fb9c5cd358e3
 EBUILD nss-pam-ldapd-0.8.14-r2.ebuild 1999 BLAKE2B 87751b3ceb0c761dca60bba6423b7f1e7fd65f04a788b5041f4c45f602343c543453fb05b2590337317b248e1c55d337fd45e7945428be70587fa1e869aa78eb SHA512 1fcdd8cf9be65a62d6703a947246dce9c78996fa6b5460c987fc1671e87e1713abfcc9c2bcd206f720db76dce20f06f0f5e91f27034f706191242c0caafad747
-EBUILD nss-pam-ldapd-0.9.10.ebuild 4179 BLAKE2B ff0b54041b76153708f1c81e254e98f4b87a4db78602f1a1b5fe5920ac2c7c665657b0df0a6bb9fc26b582949e58dfac294872496c141b6427f7a94db2b49eb6 SHA512 4b3e0a796cad11b52230320befe753949a8b4802ad303c5be857edc5818db4f9fad4eecccea3078c7b33aa8a7f53d66ca70937e93e4ad58e0644772d654f65d7
-EBUILD nss-pam-ldapd-0.9.8.ebuild 3337 BLAKE2B 640ffe29bc87802be8b87da38e86e59ed4f3d0d48fa07d5057ed9af456b7e68fd1448a6e145e8c754329286efa814e1c667641d1c90180c114932f2a7b309fb3 SHA512 13e2e210d0014611d8ccd715c93960bb935c335ea8a064e16de347a965d1ad38e48380530b56d59e02d3132f786728560a87137cf260613d598122ef3485385e
+EBUILD nss-pam-ldapd-0.9.10.ebuild 4174 BLAKE2B 3b330d8a7479b39acd11c1d2687e8d7e90f17a1e22c36d5d41ae2868e7d9fcba6923252f2567812834398018a796f199a7b2999a5eed5d27bbaafd51587ede81 SHA512 73bbd09adff5f991ade3344c4e83c78604174371a583d18f945b6ada4e4b4a7238dfa2d8f9b4d37a8be7c6c1391b88c20d4d7b2897e7ed7d02ad61c02ec317e0
 EBUILD nss-pam-ldapd-0.9.9.ebuild 4177 BLAKE2B a06abfdfe830f26c06aac0b21672634ab91ca89788751c62a2e4a252b02aa41ff944570dd215d49a288030b01055ab3e8b4888cdc7544700f97f1527dbe6fe4a SHA512 9b6654460a1bfa665388c2c2cd2ed2ab14be09bbaa8f480c68c25b1d0720356a2887b73df7761015ff8efff08e1fa26c72f5ebff7738ca4b5cfe12fe95682ae0
 MISC metadata.xml 1169 BLAKE2B 22b5c9adcafb123a6af088ddfcaa1962eaf250ed153020e65afe36a0e6473b1f8c624f770634a91c3a983c74ded1d43535bb4930f13c6470fad681f5a77fcd51 SHA512 ab658f7d791db370920a4eb57da8ead2713b1cabda6f2dccd24478855043802e7c70a07c3aeaa33829b19dc94a4317d8b5ebec07d1caebe07b4fb3bc59b27b4c
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.10.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.10.ebuild
index 397ac40543d5..485ff3752e94 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.10.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://arthurdejong.org/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug kerberos +pam pynslcd sasl test +utils"
 
 COMMON_DEP="
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.8.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.8.ebuild
deleted file mode 100644
index c57719dcc887..000000000000
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.8.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(python2_7)
-inherit eutils prefix user python-r1 multilib multilib-minimal systemd s6
-
-DESCRIPTION="NSS module for name lookups using LDAP"
-HOMEPAGE="https://arthurdejong.org/nss-pam-ldapd/"
-SRC_URI="https://arthurdejong.org/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug kerberos +pam sasl test +utils"
-
-COMMON_DEP="
-	net-nds/openldap[${MULTILIB_USEDEP}]
-	dev-python/python-ldap[${PYTHON_USEDEP}]
-	sasl? ( dev-libs/cyrus-sasl[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	virtual/pam[${MULTILIB_USEDEP}]
-	utils? ( ${PYTHON_DEPS} )
-	!sys-auth/nss_ldap
-	!sys-auth/pam_ldap"
-RDEPEND="${COMMON_DEP}"
-DEPEND="${COMMON_DEP}
-	test? (
-		${PYTHON_DEPS}
-		dev-python/pylint[${PYTHON_USEDEP}]
-	)
-	sys-devel/automake"
-
-REQUIRED_USE="
-	utils? ( ${PYTHON_REQUIRED_USE} )
-	test? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	enewgroup nslcd
-	enewuser nslcd -1 -1 -1 nslcd
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.9.4-disable-py3-only-linters.patch
-	epatch_user
-	use utils && python_setup
-}
-
-multilib_src_configure() {
-	local -a myconf
-
-	myconf=(
-		--disable-utils
-		--enable-warnings
-		--with-ldap-lib=openldap
-		--with-ldap-conf-file=/etc/nslcd.conf
-		--with-nslcd-pidfile=/run/nslcd/nslcd.pid
-		--with-nslcd-socket=/run/nslcd/socket
-		$(usex x86-fbsd '--with-nss-flavour=' '--with-nss-flavour=' 'freebsd' 'glibc')
-		$(use_enable debug)
-		$(use_enable kerberos)
-		$(use_enable pam)
-		$(use_enable sasl)
-	)
-
-	# nss libraries always go in /lib on Gentoo
-	if multilib_is_native_abi ; then
-		myconf+=("--with-pam-seclib-dir=${EPREFIX}/$(get_libdir)/security")
-		myconf+=("--libdir=${EPREFIX}/$(get_libdir)")
-	else
-		myconf+=("--with-pam-seclib-dir=/$(get_libdir)/security")
-		myconf+=("--libdir=/$(get_libdir)")
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install_all() {
-	local script
-
-	newinitd "${FILESDIR}"/nslcd-init-r1 nslcd
-	newinitd "${FILESDIR}"/nslcd-init-r2 nslcd
-	s6_install_service nslcd "${FILESDIR}"/nslcd-run-s6
-
-	insinto /usr/share/nss-pam-ldapd
-	doins "${WORKDIR}/${P}/nslcd.conf"
-
-	fperms o-r /etc/nslcd.conf
-
-	if use utils; then
-		python_moduleinto nslcd
-		python_foreach_impl && python_domodule utils/*.py
-
-		for script in chsh getent; do
-			python_foreach_impl python_newscript utils/${script}.py ${script}.ldap
-		done
-	fi
-
-	systemd_newtmpfilesd "${FILESDIR}"/nslcd-tmpfiles.conf nslcd.conf
-	systemd_dounit "${FILESDIR}"/nslcd.service
-}
-
-multilib_src_test() {
-	python_foreach_impl emake check
-}
-
-pkg_postinst() {
-	echo
-	elog "For this to work you must configure /etc/nslcd.conf"
-	elog "This configuration is similar to pam_ldap's /etc/ldap.conf"
-	echo
-	elog "In order to use nss-pam-ldapd, nslcd needs to be running. You can"
-	elog "start it like this:"
-	elog "  # /etc/init.d/nslcd start"
-	echo
-	elog "You can add it to the default runlevel like so:"
-	elog " # rc-update add nslcd default"
-	elog
-	elog "If you have >=sys-apps/openrc-0.16.3, you can also use s6"
-	elog "to supervise this service."
-	elog "To do this, emerge sys-apps/s6 then add nslcd-s6"
-	elog "default runlevel instead of nslcd."
-	elog
-	elog "If you are upgrading, keep in mind that /etc/nss-ldapd.conf"
-	elog " is now named /etc/nslcd.conf"
-	echo
-}
diff --git a/sys-auth/pam_p11/Manifest b/sys-auth/pam_p11/Manifest
index 8ec3598e6824..8ca7ddf3898a 100644
--- a/sys-auth/pam_p11/Manifest
+++ b/sys-auth/pam_p11/Manifest
@@ -1,4 +1,4 @@
 AUX pam_p11-0.2.0-build.patch 812 BLAKE2B efd9b8f46bff6bfd04d0be9a82998ddb3ef4b53d17130be349b0ed85fd5845e4c4aeff24417e740a3f8534d76bc7598666a9f07836aeeb264bb9d71a05c8ab77 SHA512 ebb3802d4ed4e6e6b2bb863edceb04e02246f5d36a0b7d78ba17295f151c2864a13fd9b161568da614b03c38f81c2157793a4160a90bbb61a9e666c4075807ef
 DIST pam_p11-0.2.0.tar.gz 417550 BLAKE2B e3c5bb32d6c7c84776341796ebdb9850a9561778aee820acb2a6c61112a2a5df5ee7c539cb5974439e565046e944f4710b87c3b51dea61fdb2cd9171daac3a0c SHA512 2cadf6fe880c953554757099741f3cfe992067f251b7e7e977a6dda5f65cbe1f55b1de6d180638997eada0d3b760887091014b99f8ae4b6d31b25af8e555343c
-EBUILD pam_p11-0.2.0.ebuild 687 BLAKE2B f4e4bccf289055750d553f8a6a5a774335f8480c509431d03c6d84f52d22b34120bee259fc4991ea7a0311a60e4aa11f6edee036398f1cf8aed42f558a1044b8 SHA512 b932dbbf8ded7f143a1d25fff1128dfa3c61d3590561b79f4c2f0b5fc18becc55d272cb08b15b9f6246ff6a630bed68b1e6e116857a36b6a88d0b508e59269ed
+EBUILD pam_p11-0.2.0.ebuild 702 BLAKE2B 39251055c04a8225e1942423619dc643cc4b0c2d26bfe4a70350ed9786692a461533b640e1dcf5862e5d64b5939fc61957fa72b4b5141db273210ed9f08895e9 SHA512 439c5c5924fd7dceefa0d59bb276a2a20698dc3ceb9e8e13b710f1c1142f4b4883259e14f0364f14bbeef445f7f88aa329d022b329a55e04a8887f3f61685b14
 MISC metadata.xml 528 BLAKE2B c2ab3c41473490f8c7c3926491d06ddf35554b92cd41ac7abe05f830a2b7c78c97a4ad9d4bcf39e6d1250cb2544ef9bd280e11a96f579ee1552b4748f012f1b8 SHA512 7d3ab0a89f1be52b1937fe300710c23ca4c24c548448b5c7edd5b6817c45a0a184fef8e07d60c0c4f6f9e1ee2fdb843dc6ceb95e5731ce9e9d76f98ae5b7e652
diff --git a/sys-auth/pam_p11/pam_p11-0.2.0.ebuild b/sys-auth/pam_p11/pam_p11-0.2.0.ebuild
index 012b53a32b65..cc81b3a08cbf 100644
--- a/sys-auth/pam_p11/pam_p11-0.2.0.ebuild
+++ b/sys-auth/pam_p11/pam_p11-0.2.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit ltprune pam
+inherit pam
 
 DESCRIPTION="PAM module for authenticating against PKCS#11 tokens"
 HOMEPAGE="https://github.com/opensc/pam_p11/wiki"
@@ -17,8 +17,8 @@ IUSE=""
 RDEPEND="virtual/pam
 		dev-libs/libp11
 		dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${P}-build.patch"
@@ -30,5 +30,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index 99cc148f6245..6196261f53d0 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -2,14 +2,11 @@ AUX pambase-20120417-lastlog-silent.patch 694 BLAKE2B b66b3115869df00dc7c73078a3
 AUX pambase-20120417-systemd-auth.patch 937 BLAKE2B 3bf50f1b05a04154e30299a3685671287e15cdaebe672e25ad23998670a6f443ca8a040b4a5a83ff5efb39ebf12161da8b65f78defbd24b21037d8c3f84388d9 SHA512 0d78a7dd4851bccf95bb3f92c095c4fc4e7fbbc077c1369797aa230e21763ecb6d087c17bc22c93adeaa695305179d54d838f2e4fe25e9ff16c683fb1edbb2bf
 AUX pambase-20120417-systemd.patch 608 BLAKE2B 2eaba084268b4c2844850cc75be62caef64eee20e9971910e7bc1cdabca7ca29b02cd8c33564e26a6218c23867c8527d166889efa1698a7b3730c6987019b7be SHA512 c06d4e35cae11b1156ba32051a4f25a4551857081e9a723f5c0b48758859d7794de94889eb91b19424b49bd4fd5509d34cba943d7a7bbc89f4339a771f29f754
 AUX pambase-20150213-elogind.patch 436 BLAKE2B f8d800b30b1f5f54f40747b256e460dbf10fd629c839088706299ae26bece8e248312dac1153ccb5b5fb25e71bee575d30db0912df0823be988f3cb68bb48e90 SHA512 e5865431fa616335f3732deefec96b11ba5e3f29523182ecbe24bafa80a0fd9b9dc5914b610d7ba485dcf5cd66775d9e668d8ba30f776ce33492b4da75301a1d
+AUX pambase-20150213-gnome-keyring.patch 1357 BLAKE2B 84923095bbff772f75689cd3a6cd6dfb111d51c1850ecae4caf91ee8b648c85091465bf13bd3acf9cce681b8ce02e937059e8e1792873d118ed996b24addb86e SHA512 eebbe9fe7a08de5aa60818747e06058bf9eb9acd9e66e579227da507304c639bc693ce1f3c74b62854b9541f9c1404081eb3d2f454113999a5d064eb646aa5d0
 AUX pambase-20150213-selinux-note.patch 441 BLAKE2B 8457438ff72becbdf8da61143eacd961ad9a58f876e1560fcf3832af9b3cd995b37a1b4881a9b5bd572e9aff5bb89465d9bba8211e22347af7df22d5d9d8ffb4 SHA512 560afa6b9d2ac657f16ef41abf3f9243480c0d6c57ff725be00a936a92a392c1a5f59f787b1b0ddfe05a81da10cb3c1fc8d24ed9560731bbcae1608a5f155fdb
 DIST pambase-20101024.tar.bz2 3201 BLAKE2B 714da8dd0b354cee29ad175a0ed2094fba8f3bfb5839319a515ed133991eb224ae280928177dcb0524f52193f44a68064a2413ae47d380472bc7b5da0b13f1bf SHA512 8d2a89b38d94d2e423a033ea6922c0a0039a0fb64d60c05991d877b4fa893954723fe1c1763f3f67ed6fbc3639282a4ee1d76824f7f29025b6050632a6984b6f
-DIST pambase-20120417.tar.bz2 3361 BLAKE2B 6b2799de56deb59cfc50c807700949072e221c2fe8d66fd6fb0150bb636390de51171c3af0c252c878f25d24d367cf53053aebc3cb392a6c06c86c4aafd06c45 SHA512 7a666eb67f6484e536ecb070402036bcfdd137aced27df3f08b136d06eee5c13a6dc14aa93ea09e94c7f31e5a98db97dbaccd0c46af24b57028247de3a7cd9fe
-DIST pambase-20140313.tar.bz2 3417 BLAKE2B cb18ba77b18e6bf5fc9a902370c4f6db96046f96f38131c33842c01903b683b4c7b69edd3976102fe85bb54fef00f56544a64d0402c0c1cc368ecc6ea30fbefd SHA512 76dd2a70947dac9573d47b81764ebe4f829bfd38d59c007e698a52c70757fa88525f510c14a1f474c58e3d33cb421ff61aa4ed1aae54497456004eff7494bfc8
 DIST pambase-20150213.tar.xz 3480 BLAKE2B 7c59774bb8888fd2c4656264f1d8ea8cdd5ffffff4dc5d03091592726c8bd7775ba1573091c8616aa891298a1fe309b19885b5ec21efb45fe38900b7c959aaf5 SHA512 3b49dd3f06a0942fcced95527f62cbc4ff723c48dc896a0b57ecd19736d2892db974c782be3fe24e8e6e17294869a772ae9ee6118af96dfdc7a3a6561dc3f3e5
-EBUILD pambase-20101024-r2.ebuild 2817 BLAKE2B dad6faa68b9c3ad7dedd32fb09694c7f1152d7e1c47414c2114847dce15390dbdce63e3fd1be621964145726d1f9ef5ac38afe11033ee050f12065a8962984fa SHA512 1d83aca5ef0cb93386446816ce5ed2a59fa5f34085d443e020a33d67fd2b60d3e0cffafa78e198339194c4e7457f68fe282dd06c942a0519d2fb02fa9b8a9fb8
-EBUILD pambase-20120417-r3.ebuild 3444 BLAKE2B 552afa540bff6b5511335e1cf0d16c7cbf7994eb72f556c0b364f148ff80d3425e3a5e111da2ecdd81f275b88d70bf05a5fe3d9ea06cb353a0b3d71286efeec2 SHA512 8595859c116d4c224a3924113b1b1b0202cc0986f75c594615ca98390a6b346b8db7988a9f84625dbd8898464b0b7d093e4b41083fb6d196d0a496fe1f7e3ce9
-EBUILD pambase-20140313.ebuild 2678 BLAKE2B deaeeb1ba61f9cfff35c2c039d2164da97644d700f60857a01229b581ffe4bbe20cd22cd7ed369b1e1ccbd2b116364cf64726080f6af37756d365b782a9a8769 SHA512 54be1a3634acf448879fd2df2f55bc776bb4813fea92e91287e4af284cf8b410960c5c017450390ac98cc6ff633778d8566435261b4a32d8d0936e9863fbadc6
-EBUILD pambase-20150213-r1.ebuild 2870 BLAKE2B fc019fb63dc5c9640a8c61e60a93c9135d37111c795ef8f4bedaf52d2c88eb4dd52755bc403be41350bc5bcb59b80f7df7bf07edb3473bafc91575138e6022ea SHA512 41fcef4146bf9f4944e46126726f12ee3867920aa50f57578b46ee56382677889781ae73ad99ee2ce715ff50b16dd7a84a446e39849a3aba7b63188a0cef1e14
-EBUILD pambase-20150213.ebuild 2801 BLAKE2B 567d050c4cc3262814fcb3ddba6099d9be7f7dedd3a7db9ec67479ce5778e2b724a125a5e27b786b4f02d85100d3e1117b5a0a78c2a23c6ffb27335bde72e0cf SHA512 9a927bb24575b75ae63ffb95c9c9a6fb6bef12654ce356b1fd7fb2d5e01ca638fe8dc7d4613af9505b118569bee14731d96011af80f7845ec146711fd0330aa8
+EBUILD pambase-20101024-r2.ebuild 2725 BLAKE2B 77a4d16cd30dedfa2256fd687cbb4b54555aeb1abf36123d340e9354d6cf67e503b9feb26daf55eb508c87dacc8c7df996510bf65ad32e818e74bc1f0873eb0e SHA512 307ebed59ea5f7fbe48ff343833c4fc6ca54520434452823b21e76c25c5c173738fd8637869e9a9eb9025e1d2b4cd090b7421e0a35333217bae87e450c7eaa1d
+EBUILD pambase-20150213-r1.ebuild 2869 BLAKE2B 4edfad559a57065dba9b243c3e53505e1521be771042a4028516492d3eedd4b6508a03db4c489b96bb3ebf24438aaf04d943a67ffd9b3435169f3899cd06c4ba SHA512 888ca20c747ee47056873f407e13f9675012ac160b5c55dd5128ddf9be31af91996aeddaf5d863d2e38b3c4863bb9325ca247d16b3785396863d7e97d10c06ce
+EBUILD pambase-20150213-r2.ebuild 2820 BLAKE2B bb4a0eaec6c4f55ffab72d933baa772bfb33e141b9fc9f29192c29b86187755fc8e4c3289d295cf39ba03cc5f5c3ecb5a26f37ec15eac261e2bc5ee93ccc23ef SHA512 bdddf98c1d53635536263ad6056c50ec4272a23e22cb2971fa98f6d267f5a4a00873d02e0dfec0e74552786a3b08477f4a0594f0474114fbdd1afc8ff941ad6c
 MISC metadata.xml 4297 BLAKE2B 53d6b14f5e6cf707666441f1bef3c975d43f33387ceb482dd7c41e97b2771466a02efb3db1c881d354bcfff42010e1da47a28579972169e3c7edac33f43f565d SHA512 d717c2916e154630a756f7925794d43d43c5881bc9df53b82b35f86104366902a76f2d9298cf5a8511431084f0103fe91234c5e4172555677bbdc00db0a73a04
diff --git a/sys-auth/pambase/files/pambase-20150213-gnome-keyring.patch b/sys-auth/pambase/files/pambase-20150213-gnome-keyring.patch
new file mode 100644
index 000000000000..57c204e44201
--- /dev/null
+++ b/sys-auth/pambase/files/pambase-20150213-gnome-keyring.patch
@@ -0,0 +1,48 @@
+diff -urN a/passwd.in b/passwd.in
+--- a/passwd.in	2015-02-14 06:57:45.000000000 +0300
++++ b/passwd.in	2018-04-02 12:33:08.304214918 +0300
+@@ -1,6 +1,7 @@
+-auth       sufficient   pam_rootok.so
+-auth       include	system-auth
++auth		sufficient	pam_rootok.so
++auth		include		system-auth
+ 
+-account    include	system-auth
++account		include		system-auth
+ 
+-password   include	system-auth
++password	include		system-auth
++-password	optional	pam_gnome_keyring.so UNIX_AUTHTOK
+diff -urN a/system-login.in b/system-login.in
+--- a/system-login.in	2015-02-14 06:57:45.000000000 +0300
++++ b/system-login.in	2018-04-02 12:33:01.272010095 +0300
+@@ -8,9 +8,6 @@
+ auth		required	pam_nologin.so DEBUG_NOLOGIN
+ #endif
+ auth		include		system-auth
+-#if HAVE_GNOME_KEYRING
+-auth		optional	pam_gnome_keyring.so
+-#endif
+ 
+ #if HAVE_ACCESS
+ account		required	pam_access.so DEBUG
+@@ -27,9 +24,6 @@
+ #endif
+ 
+ password	include		system-auth
+-#if HAVE_GNOME_KEYRING
+-password	optional	pam_gnome_keyring.so
+-#endif
+ 
+ #if HAVE_LOGINUID
+ session         optional        pam_loginuid.so
+@@ -51,9 +45,6 @@
+ # Note: modules that run in the user's context must come after this line.
+ session		required	pam_selinux.so multiple open
+ #endif
+-#if HAVE_GNOME_KEYRING
+-session		optional	pam_gnome_keyring.so auto_start
+-#endif
+ #if HAVE_MOTD
+ session		optional	pam_motd.so motd=/etc/motd
+ #endif
diff --git a/sys-auth/pambase/pambase-20101024-r2.ebuild b/sys-auth/pambase/pambase-20101024-r2.ebuild
index 3f6d40cbdfec..08c9ebacb43b 100644
--- a/sys-auth/pambase/pambase-20101024-r2.ebuild
+++ b/sys-auth/pambase/pambase-20101024-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~flameeyes/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 IUSE="debug +cracklib passwdqc consolekit gnome-keyring selinux mktemp pam_ssh +sha512 pam_krb5 minimal"
 RESTRICT="binchecks"
 
diff --git a/sys-auth/pambase/pambase-20120417-r3.ebuild b/sys-auth/pambase/pambase-20120417-r3.ebuild
deleted file mode 100644
index 422c3d40da1e..000000000000
--- a/sys-auth/pambase/pambase-20120417-r3.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="PAM base configuration files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:PAM"
-SRC_URI="https://dev.gentoo.org/~flameeyes/${PN}/${P}.tar.bz2
-	https://dev.gentoo.org/~phajdan.jr/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="consolekit +cracklib debug gnome-keyring minimal mktemp pam_krb5 pam_ssh passwdqc selinux +sha512 systemd"
-
-RESTRICT=binchecks
-
-MIN_PAM_REQ=1.1.3
-
-RDEPEND="
-	|| (
-		>=sys-libs/pam-${MIN_PAM_REQ}
-		( sys-auth/openpam sys-freebsd/freebsd-pam-modules )
-		)
-	consolekit? ( >=sys-auth/consolekit-0.4.5_p2012[pam] )
-	cracklib? ( >=sys-libs/pam-${MIN_PAM_REQ}[cracklib] )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.32[pam] )
-	mktemp? ( sys-auth/pam_mktemp )
-	pam_krb5? (
-		|| ( >=sys-libs/pam-${MIN_PAM_REQ} sys-auth/openpam )
-		>=sys-auth/pam_krb5-4.3
-		)
-	pam_ssh? ( sys-auth/pam_ssh )
-	passwdqc? ( >=sys-auth/pam_passwdqc-1.0.4 )
-	selinux? ( >=sys-libs/pam-${MIN_PAM_REQ}[selinux] )
-	sha512? ( >=sys-libs/pam-${MIN_PAM_REQ} )
-	systemd? ( >=sys-apps/systemd-44-r1[pam] )
-	!<sys-apps/shadow-4.1.5-r1
-	!<sys-freebsd/freebsd-pam-modules-6.2-r1
-	!<sys-libs/pam-0.99.9.0-r1"
-DEPEND="app-portage/portage-utils"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-systemd.patch
-	epatch "${FILESDIR}"/${P}-lastlog-silent.patch
-	epatch "${FILESDIR}"/${P}-systemd-auth.patch # 485470
-}
-
-src_compile() {
-	local implementation=
-	local linux_pam_version=
-	if has_version sys-libs/pam; then
-		implementation=linux-pam
-		local ver_str=$(qatom `best_version sys-libs/pam` | cut -d ' ' -f 3)
-		linux_pam_version=$(printf "0x%02x%02x%02x" ${ver_str//\./ })
-	elif has_version sys-auth/openpam; then
-		implementation=openpam
-	else
-		die "PAM implementation not identified"
-	fi
-
-	use_var() {
-		local varname=$(echo $1 | tr [a-z] [A-Z])
-		local usename=${2-$(echo $1 | tr [A-Z] [a-z])}
-		local varvalue=$(usex $usename)
-		echo "${varname}=${varvalue}"
-	}
-
-	emake \
-		GIT=true \
-		$(use_var debug) \
-		$(use_var cracklib) \
-		$(use_var passwdqc) \
-		$(use_var consolekit) \
-		$(use_var systemd) \
-		$(use_var GNOME_KEYRING gnome-keyring) \
-		$(use_var selinux) \
-		$(use_var mktemp) \
-		$(use_var PAM_SSH pam_ssh) \
-		$(use_var sha512) \
-		$(use_var KRB5 pam_krb5) \
-		$(use_var minimal) \
-		IMPLEMENTATION=${implementation} \
-		LINUX_PAM_VERSION=${linux_pam_version}
-}
-
-src_test() { :; }
-
-src_install() {
-	emake GIT=true DESTDIR="${ED}" install
-}
-
-pkg_postinst() {
-	if use sha512; then
-		elog "Starting from version 20080801, pambase optionally enables"
-		elog "SHA512-hashed passwords. For this to work, you need sys-libs/pam-1.0.1"
-		elog "built against sys-libs/glibc-2.7 or later."
-		elog "If you don't have support for this, it will automatically fallback"
-		elog "to MD5-hashed passwords, just like before."
-		elog
-		elog "Please note that the change only affects the newly-changed passwords"
-		elog "and that SHA512-hashed passwords will not work on earlier versions"
-		elog "of glibc or Linux-PAM."
-	fi
-
-	if use systemd && use consolekit; then
-		ewarn "You are enabling 2 session trackers, ConsoleKit and systemd-logind"
-		ewarn "at the same time. This is not recommended setup to have, please"
-		ewarn "consider disabling either USE=\"consolekit\" or USE=\"systemd\."
-	fi
-}
diff --git a/sys-auth/pambase/pambase-20140313.ebuild b/sys-auth/pambase/pambase-20140313.ebuild
deleted file mode 100644
index cc0940901457..000000000000
--- a/sys-auth/pambase/pambase-20140313.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="PAM base configuration files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:PAM"
-SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="consolekit +cracklib debug gnome-keyring minimal mktemp pam_krb5 pam_ssh passwdqc selinux +sha512 systemd"
-
-RESTRICT=binchecks
-
-MIN_PAM_REQ=1.1.3
-
-RDEPEND="
-	|| (
-		>=sys-libs/pam-${MIN_PAM_REQ}
-		( sys-auth/openpam sys-freebsd/freebsd-pam-modules )
-		)
-	consolekit? ( >=sys-auth/consolekit-0.4.6[pam] )
-	cracklib? ( >=sys-libs/pam-${MIN_PAM_REQ}[cracklib] )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.32[pam] )
-	mktemp? ( sys-auth/pam_mktemp )
-	pam_krb5? (
-		|| ( >=sys-libs/pam-${MIN_PAM_REQ} sys-auth/openpam )
-		>=sys-auth/pam_krb5-4.3
-		)
-	pam_ssh? ( sys-auth/pam_ssh )
-	passwdqc? ( >=sys-auth/pam_passwdqc-1.0.4 )
-	selinux? ( >=sys-libs/pam-${MIN_PAM_REQ}[selinux] )
-	sha512? ( >=sys-libs/pam-${MIN_PAM_REQ} )
-	systemd? ( >=sys-apps/systemd-204[pam] )
-	!<sys-apps/shadow-4.1.5-r1
-	!<sys-freebsd/freebsd-pam-modules-6.2-r1
-	!<sys-libs/pam-0.99.9.0-r1"
-DEPEND="app-portage/portage-utils"
-
-src_compile() {
-	local implementation=
-	local linux_pam_version=
-	if has_version sys-libs/pam; then
-		implementation=linux-pam
-		local ver_str=$(qatom `best_version sys-libs/pam` | cut -d ' ' -f 3)
-		linux_pam_version=$(printf "0x%02x%02x%02x" ${ver_str//\./ })
-	elif has_version sys-auth/openpam; then
-		implementation=openpam
-	else
-		die "PAM implementation not identified"
-	fi
-
-	use_var() {
-		local varname=$(echo $1 | tr [a-z] [A-Z])
-		local usename=${2-$(echo $1 | tr [A-Z] [a-z])}
-		local varvalue=$(usex $usename)
-		echo "${varname}=${varvalue}"
-	}
-
-	emake \
-		GIT=true \
-		$(use_var debug) \
-		$(use_var cracklib) \
-		$(use_var passwdqc) \
-		$(use_var consolekit) \
-		$(use_var systemd) \
-		$(use_var GNOME_KEYRING gnome-keyring) \
-		$(use_var selinux) \
-		$(use_var mktemp) \
-		$(use_var PAM_SSH pam_ssh) \
-		$(use_var sha512) \
-		$(use_var KRB5 pam_krb5) \
-		$(use_var minimal) \
-		IMPLEMENTATION=${implementation} \
-		LINUX_PAM_VERSION=${linux_pam_version}
-}
-
-src_test() { :; }
-
-src_install() {
-	emake GIT=true DESTDIR="${ED}" install
-}
-
-pkg_postinst() {
-	if use systemd && use consolekit; then
-		ewarn "You are enabling 2 session trackers, ConsoleKit and systemd-logind"
-		ewarn "at the same time. This is not recommended setup to have, please"
-		ewarn "consider disabling either USE=\"consolekit\" or USE=\"systemd\."
-	fi
-}
diff --git a/sys-auth/pambase/pambase-20150213-r1.ebuild b/sys-auth/pambase/pambase-20150213-r1.ebuild
index a17c6ac09b39..3fb8706367b7 100644
--- a/sys-auth/pambase/pambase-20150213-r1.ebuild
+++ b/sys-auth/pambase/pambase-20150213-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 -x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="consolekit +cracklib debug elogind gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh passwdqc securetty selinux +sha512 systemd"
 
 RESTRICT="binchecks"
diff --git a/sys-auth/pambase/pambase-20150213.ebuild b/sys-auth/pambase/pambase-20150213-r2.ebuild
index 8d0468eac7ff..eae82f61e964 100644
--- a/sys-auth/pambase/pambase-20150213.ebuild
+++ b/sys-auth/pambase/pambase-20150213-r2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
 
 DESCRIPTION="PAM base configuration files"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:PAM"
@@ -10,10 +9,10 @@ SRC_URI="https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="consolekit +cracklib debug gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh passwdqc securetty selinux +sha512 systemd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="consolekit +cracklib debug elogind minimal mktemp +nullok pam_krb5 pam_ssh passwdqc securetty selinux +sha512 systemd"
 
-RESTRICT=binchecks
+RESTRICT="binchecks"
 
 MIN_PAM_REQ=1.1.3
 
@@ -22,27 +21,43 @@ RDEPEND="
 		>=sys-libs/pam-${MIN_PAM_REQ}
 		( sys-auth/openpam sys-freebsd/freebsd-pam-modules )
 	)
-	consolekit? ( >=sys-auth/consolekit-0.4.6[pam] )
+	consolekit? ( sys-auth/consolekit[pam] )
 	cracklib? ( sys-libs/pam[cracklib] )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.32[pam] )
+	elogind? ( sys-auth/elogind[pam] )
 	mktemp? ( sys-auth/pam_mktemp )
 	pam_krb5? (
 		|| ( >=sys-libs/pam-${MIN_PAM_REQ} sys-auth/openpam )
-		>=sys-auth/pam_krb5-4.3
+		sys-auth/pam_krb5
 	)
 	pam_ssh? ( sys-auth/pam_ssh )
-	passwdqc? ( >=sys-auth/pam_passwdqc-1.0.4 )
+	passwdqc? ( sys-auth/pam_passwdqc )
 	selinux? ( sys-libs/pam[selinux] )
 	sha512? ( >=sys-libs/pam-${MIN_PAM_REQ} )
-	systemd? ( >=sys-apps/systemd-204[pam] )
-	!<sys-apps/shadow-4.1.5-r1
-	!<sys-freebsd/freebsd-pam-modules-6.2-r1
-	!<sys-libs/pam-0.99.9.0-r1"
-DEPEND="app-portage/portage-utils
-	app-arch/xz-utils"
+	systemd? ( sys-apps/systemd[pam] )
+"
+DEPEND="
+	app-arch/xz-utils
+	app-portage/portage-utils
+"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-selinux-note.patch #540096
+PATCHES=(
+	"${FILESDIR}"/${P}-selinux-note.patch #540096
+	"${FILESDIR}"/${P}-elogind.patch #599498
+	"${FILESDIR}"/${P}-gnome-keyring.patch #652194
+)
+
+pkg_setup() {
+	local stcnt=0
+
+	use consolekit && stcnt=$((stcnt+1))
+	use elogind && stcnt=$((stcnt+1))
+	use systemd && stcnt=$((stcnt+1))
+
+	if [[ ${stcnt} -gt 1 ]] ; then
+		ewarn "You are enabling ${stcnt} session trackers at the same time."
+		ewarn "This is not a recommended setup to have. Please consider enabling"
+		ewarn "only one of USE=\"consolekit\", USE=\"elogind\" or USE=\"systemd\"."
+	fi
 }
 
 src_compile() {
@@ -70,8 +85,8 @@ src_compile() {
 		$(use_var cracklib) \
 		$(use_var passwdqc) \
 		$(use_var consolekit) \
+		$(use_var elogind) \
 		$(use_var systemd) \
-		$(use_var GNOME_KEYRING gnome-keyring) \
 		$(use_var selinux) \
 		$(use_var nullok) \
 		$(use_var mktemp) \
@@ -89,11 +104,3 @@ src_test() { :; }
 src_install() {
 	emake GIT=true DESTDIR="${ED}" install
 }
-
-pkg_postinst() {
-	if use systemd && use consolekit; then
-		ewarn "You are enabling 2 session trackers, ConsoleKit and systemd-logind"
-		ewarn "at the same time. This is not recommended setup to have, please"
-		ewarn "consider disabling either USE=\"consolekit\" or USE=\"systemd\."
-	fi
-}