gentoo resync : 30.09.2018

3 files changed, 3 insertions, 133 deletions

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
-}