fix for #234555 (use_enable kerberos) and #287727 revbump

(Portage version: 2.1.10.65/git/Linux x86_64, unsigned Manifest commit)

6 files changed, 81 insertions, 22 deletions

diff --git a/sys-auth/nss-ldapd/CVS/Entries b/sys-auth/nss-ldapd/CVS/Entries
deleted file mode 100644
index a308191..0000000
--- a/sys-auth/nss-ldapd/CVS/Entries
+++ /dev/null
@@ -1,5 +0,0 @@
-/ChangeLog/1.4/Thu Apr  2 18:50:35 2009//
-/Manifest/1.6/Sat Sep 24 10:32:32 2011//
-/metadata.xml/1.3/Sat Sep 24 10:32:20 2011//
-/nss-ldapd-0.6.7-r1.ebuild/1.1/Thu Apr  2 18:50:35 2009//
-D/files////
diff --git a/sys-auth/nss-ldapd/CVS/Repository b/sys-auth/nss-ldapd/CVS/Repository
deleted file mode 100644
index 9437750..0000000
--- a/sys-auth/nss-ldapd/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-gentoo-x86/sys-auth/nss-ldapd
diff --git a/sys-auth/nss-ldapd/CVS/Root b/sys-auth/nss-ldapd/CVS/Root
deleted file mode 100644
index 9951262..0000000
--- a/sys-auth/nss-ldapd/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-prometheanfire@cvs.gentoo.org:/var/cvsroot
diff --git a/sys-auth/nss-ldapd/Manifest b/sys-auth/nss-ldapd/Manifest
index 7dc92c7..b8b8662 100644
--- a/sys-auth/nss-ldapd/Manifest
+++ b/sys-auth/nss-ldapd/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX nslcd.rc 803 RMD160 d6a0b5f6fc9649041a27e538ab145814506f45e7 SHA1 eaa8374cf59e00384f1f150389627f20a5da57ff SHA256 badab5c2c2322efa8071ade3b78f3d65a1fa018ee214e4d60c707d568a16d6e1
 DIST nss-ldapd-0.6.7.tar.gz 376893 RMD160 e8494ae71a23d1e9f458e4adb5446dc128262398 SHA1 dd984b9c53832cef445411e166f1f8f6117350cb SHA256 322803b7dd29107d3cec961527166c9b3440786f8a0cdb79fc5a23a62fb1c7fe
+DIST nss-pam-ldapd-0.8.10.tar.gz 475884 RMD160 54f5c95f6f4b656943e562062600a44e3153d1bb SHA1 4dd50c0537a13f454625e0325b8c863e5adb48a8 SHA256 673a5e235a40fd9aac74082bc64d2ac2280fc155fb00b21092650d2c963e79cc
 EBUILD nss-ldapd-0.6.7-r1.ebuild 1561 RMD160 e0de5ad8fb76539842e4917623f066d552be2fca SHA1 8094553e57fce2a126c09d1f4cbb4cb84fe42f3c SHA256 d1d328e1687afa791a7019edd1320828e1cd5522b815b89b3221f7b4d2bf8a1d
+EBUILD nss-ldapd-0.8.10.ebuild 1839 RMD160 dff1a4a513ae6fb0e2769a59bd85a4b3bef16c37 SHA1 b5193c5f6bc7afc5df262a97308540b3208d5917 SHA256 526d49250115e31d406afc5cd9f7ea36f02017a1c7c586e468d829920b58a6eb
 MISC ChangeLog 1211 RMD160 dc96c3f3d23eff8205301a224c33cf69ed6af2d8 SHA1 3b6b0824020bac4458f8db504c6fc9019c9c57b3 SHA256 adc8245ed4b049efa8088dd65f300f961003d5d7d7a04aadcd2569ac8b7de928
-MISC metadata.xml 234 RMD160 148f786a516abdedd07dde6bd788c29b44726562 SHA1 df8c25ab607e05444276bb44c5a02a0e2331bbd1 SHA256 1b248180bba128fa7169db80538f0ba5851a72429e76f3a18981dedf499ba706
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk59skEACgkQfXuS5UK5QB1QQQQAg1+Hzx56m4lgnmAC+3iw7bA1
-OsO5ooLbZtj3EIbnVxpjQRLUAHDZRrv+DsYE83odsoj6vlFNAXkXCyafXA9q2Dem
-1MaBcty6pjkLHzzbzeMtoWlmI3zyKmN/R6uij011D9Zj9gWr4ilndTU/AqidmPZX
-auK4+KHeRw5LARF8ozE=
-=nnAP
------END PGP SIGNATURE-----
+MISC metadata.xml 241 RMD160 302a6739b992f56b7d925e6ab9247442b4a701c6 SHA1 2341ebe0fd6da8e34680bd8f3c2fa9569781b565 SHA256 58c2206a9844c7fbfd2ffb5ae2431a552d3d1207dc96aaa94f16ce2c501be545
diff --git a/sys-auth/nss-ldapd/metadata.xml b/sys-auth/nss-ldapd/metadata.xml
index e8b7c34..de55eff 100644
--- a/sys-auth/nss-ldapd/metadata.xml
+++ b/sys-auth/nss-ldapd/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>cardoe@gentoo.org</email>
-		<name>Doug Goldstein</name>
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
 	</maintainer>
 </pkgmetadata>
 
diff --git a/sys-auth/nss-ldapd/nss-ldapd-0.8.10.ebuild b/sys-auth/nss-ldapd/nss-ldapd-0.8.10.ebuild
new file mode 100644
index 0000000..c7d653c
--- /dev/null
+++ b/sys-auth/nss-ldapd/nss-ldapd-0.8.10.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-ldapd/nss-ldapd-0.8.10.ebuild,v 1.1 2012/07/24 05:50:35 prometheanfire Exp $
+
+EAPI=4
+
+inherit multilib
+
+DESCRIPTION="NSS module for name lookups using LDAP"
+HOMEPAGE="http://ch.tudelft.nl/~arthur/nss-ldapd/"
+SRC_URI="http://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="debug kerberos sasl +pam"
+
+DEPEND="net-nds/openldap
+		sasl? ( dev-libs/cyrus-sasl )
+		kerberos? ( virtual/krb5 )
+		pam? ( virtual/pam )
+		!sys-auth/nss_ldap"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	# nss libraries always go in /lib on Gentoo
+	myconf="--enable-warnings
+	--with-ldap-lib=openldap
+	--with-ldap-conf-file=/etc
+	--with-nslcd-pidfile=/var/run/nslcd/nslcd.pid
+	--with-nslcd-socket=/var/run/nslcd/socket
+	--libdir=/$(get_libdir)
+	$(use_enable debug)
+	$(use_enable kerberos)
+	$(use_enable pam)"
+
+	if use x86-fbsd; then
+		myconf+=" --with-nss-flavour=freebsd"
+	else
+		myconf+=" --with-nss-flavour=glibc"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc NEWS ChangeLog AUTHORS README
+
+	# for socket and pid file
+	keepdir /var/run/nslcd
+
+	# init script
+	newinitd "${FILESDIR}"/nslcd.rc nslcd
+
+	# make an example copy
+	insinto /usr/share/nss-ldapd
+	doins nss-ldapd.conf
+
+	fperms o-r /etc/nss-ldapd.conf
+}
+
+pkg_postinst() {
+	elog
+	elog "For this to work you must configure /etc/nss-ldapd.conf"
+	elog "This configuration is similar to pam_ldap's /etc/ldap.conf"
+	elog
+	elog "In order to use nss-ldapd, nslcd needs to be running. You can"
+	elog "start it like this:"
+	elog "  # /etc/init.d/nslcd start"
+	elog
+	elog "You can add it to the default runlevel like so:"
+	elog " # rc-update add nslcd default"
+	elog
+}