recovering from cvs mistakes

(Portage version: 2.1.10.65/cvs/Linux x86_64)

3 files changed, 8 insertions, 87 deletions

diff --git a/sys-auth/nss-ldapd/ChangeLog b/sys-auth/nss-ldapd/ChangeLog
index 59dff4601198..62d7db9a90a9 100644
--- a/sys-auth/nss-ldapd/ChangeLog
+++ b/sys-auth/nss-ldapd/ChangeLog
@@ -1,6 +1,11 @@
-# ChangeLog for sys-auth/nss-pam-ldapd
+# ChangeLog for sys-auth/nss-ldapd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-ldapd/ChangeLog,v 1.5 2012/07/24 06:34:33 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-ldapd/ChangeLog,v 1.6 2012/07/24 06:58:43 prometheanfire Exp $
+
+  24 Jul 2012; Matthew Thode <prometheanfire@gentoo.org>
+  +nss-ldapd-0.6.7-r1.ebuild, -nss-pam-ldapd-0.6.7-r1.ebuild,
+  -nss-pam-ldapd-0.8.10.ebuild:
+  recovering from cvs mistakes :(
 
 *nss-pam-ldapd-0.8.10 (24 Jul 2012)
 *nss-pam-ldapd-0.6.7-r1 (24 Jul 2012)
diff --git a/sys-auth/nss-ldapd/nss-pam-ldapd-0.6.7-r1.ebuild b/sys-auth/nss-ldapd/nss-ldapd-0.6.7-r1.ebuild
index bcfa2b2f882b..4effdc418835 100644
--- a/sys-auth/nss-ldapd/nss-pam-ldapd-0.6.7-r1.ebuild
+++ b/sys-auth/nss-ldapd/nss-ldapd-0.6.7-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-pam-ldapd-0.6.7-r1.ebuild,v 1.1 2012/07/24 06:34:33 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-ldapd/nss-ldapd-0.6.7-r1.ebuild,v 1.3 2012/07/24 06:58:43 prometheanfire Exp $
 
 inherit multilib
 
diff --git a/sys-auth/nss-ldapd/nss-pam-ldapd-0.8.10.ebuild b/sys-auth/nss-ldapd/nss-pam-ldapd-0.8.10.ebuild
deleted file mode 100644
index c7933d263677..000000000000
--- a/sys-auth/nss-ldapd/nss-pam-ldapd-0.8.10.ebuild
+++ /dev/null
@@ -1,84 +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-ldapd/nss-pam-ldapd-0.8.10.ebuild,v 1.1 2012/07/24 06:34:33 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"
-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
-}