out with the old and in with the new for nss-pam-ldapd

(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)

3 files changed, 12 insertions, 90 deletions

diff --git a/sys-auth/nss-pam-ldapd/ChangeLog b/sys-auth/nss-pam-ldapd/ChangeLog
index 54f2dbf1c1cc..5f11bed069e9 100644
--- a/sys-auth/nss-pam-ldapd/ChangeLog
+++ b/sys-auth/nss-pam-ldapd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/nss-pam-ldapd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/ChangeLog,v 1.9 2013/04/17 17:58:01 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/ChangeLog,v 1.10 2013/05/06 15:04:35 prometheanfire Exp $
+
+*nss-pam-ldapd-0.8.13 (06 May 2013)
+
+  06 May 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +nss-pam-ldapd-0.8.13.ebuild, -nss-pam-ldapd-0.8.11-r1.ebuild,
+  -nss-pam-ldapd-0.8.11.ebuild:
+  out with the old and in with the new for nss-pam-ldapd
 
   17 Apr 2013; Tim Harder <radhermit@gentoo.org> nss-pam-ldapd-0.9.0.ebuild:
   Add epatch_user support.
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.11.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.11.ebuild
deleted file mode 100644
index 0c9236378a0b..000000000000
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.11.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.11.ebuild,v 1.1 2012/10/15 05:24:07 prometheanfire Exp $
-
-EAPI=4
-
-inherit multilib user
-
-DESCRIPTION="NSS module for name lookups using LDAP"
-HOMEPAGE="http://arthurdejong.org/nss-pam-ldapd/"
-SRC_URI="http://arthurdejong.org/nss-pam-ldapd/${P}.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
-		!sys-auth/pam_ldap"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup nslcd
-	enewuser nslcd -1 -1 -1 nslcd
-}
-
-src_configure() {
-	# nss libraries always go in /lib on Gentoo
-	myconf="--enable-warnings
-	--with-ldap-lib=openldap
-	--with-ldap-conf-file=/etc/nslcd.conf
-	--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-init nslcd
-
-	# make an example copy
-	insinto /usr/share/nss-pam-ldapd
-	doins nslcd.conf
-
-	fperms o-r /etc/nslcd.conf
-}
-
-pkg_postinst() {
-	elog
-	elog "For this to work you must configure /etc/nslcd.conf"
-	elog "This configuration is similar to pam_ldap's /etc/ldap.conf"
-	elog
-	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"
-	elog
-	elog "You can add it to the default runlevel like so:"
-	elog " # rc-update add nslcd default"
-	elog
-	elog "If you are upgrading, keep in mind that /etc/nss-ldapd.conf"
-	elog " is now named /etc/nslcd.conf"
-	elog
-}
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.11-r1.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.13.ebuild
index 480fb315beb0..e0c891cb98af 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.11-r1.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.11-r1.ebuild,v 1.1 2012/11/07 18:02:07 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.13.ebuild,v 1.1 2013/05/06 15:04:35 prometheanfire Exp $
 
 EAPI=4
 
@@ -56,8 +56,8 @@ src_install() {
 
 	dodoc NEWS ChangeLog AUTHORS README
 
-	# for socket and pid file
-	keepdir /var/run/nslcd
+	# for socket and pid file (not needed bug 452992)
+	#keepdir /var/run/nslcd
 
 	# init script
 	newinitd "${FILESDIR}"/nslcd-init nslcd