multilib for nss-pam-ldapd

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

5 files changed, 18 insertions, 184 deletions

diff --git a/sys-auth/nss-pam-ldapd/ChangeLog b/sys-auth/nss-pam-ldapd/ChangeLog
index b4565e915886..c84fde277e52 100644
--- a/sys-auth/nss-pam-ldapd/ChangeLog
+++ b/sys-auth/nss-pam-ldapd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-auth/nss-pam-ldapd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/ChangeLog,v 1.22 2015/05/09 00:06:24 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/ChangeLog,v 1.23 2015/05/15 18:12:17 prometheanfire Exp $
+
+*nss-pam-ldapd-0.8.14-r2 (15 May 2015)
+
+  15 May 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +nss-pam-ldapd-0.8.14-r2.ebuild, -nss-pam-ldapd-0.8.13.ebuild,
+  -nss-pam-ldapd-0.8.14-r1.ebuild, -nss-pam-ldapd-0.8.14.ebuild,
+  nss-pam-ldapd-0.9.5-r1.ebuild:
+  multilib for nss-pam-ldapd
 
   09 May 2015; Zac Medico <zmedico@gentoo.org> files/nslcd.service:
   Fix systemd service unit content.
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.13.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.13.ebuild
deleted file mode 100644
index e0c891cb98af..000000000000
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.13.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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.13.ebuild,v 1.1 2013/05/06 15:04:35 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
-	--with-pam-seclib-dir=/$(get_libdir)/security
-	--libdir=/$(get_libdir)
-	$(use_enable debug)
-	$(use_enable kerberos)
-	$(use_enable pam)
-	$(use_enable sasl)"
-
-	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 (not needed bug 452992)
-	#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.14-r1.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r2.ebuild
index 62b4f80b4670..6111a4e10849 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r1.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.14-r1.ebuild,v 1.1 2014/05/26 12:36:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r2.ebuild,v 1.1 2015/05/15 18:12:17 prometheanfire Exp $
 
 EAPI=5
 
-inherit multilib user
+inherit multilib-minimal user
 
 DESCRIPTION="NSS module for name lookups using LDAP"
 HOMEPAGE="http://arthurdejong.org/nss-pam-ldapd/"
@@ -29,7 +29,7 @@ pkg_setup() {
 	enewuser nslcd -1 -1 -1 nslcd
 }
 
-src_configure() {
+multilib_src_configure() {
 	# nss libraries always go in /lib on Gentoo
 	myconf="
 		--enable-warnings
@@ -50,10 +50,10 @@ src_configure() {
 		myconf+=" --with-nss-flavour=glibc"
 	fi
 
-	econf ${myconf}
+	ECONF_SOURCE="${S}" econf ${myconf}
 }
 
-src_install() {
+multilib_src_install() {
 	default
 
 	# for socket and pid file (not needed bug 452992)
@@ -64,7 +64,7 @@ src_install() {
 
 	# make an example copy
 	insinto /usr/share/nss-pam-ldapd
-	doins nslcd.conf
+	doins "${WORKDIR}/${P}/nslcd.conf"
 
 	fperms o-r /etc/nslcd.conf
 }
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14.ebuild
deleted file mode 100644
index aba07c0aa159..000000000000
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2014 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.14.ebuild,v 1.1 2014/03/16 18:53:14 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
-	--with-pam-seclib-dir=/$(get_libdir)/security
-	--libdir=/$(get_libdir)
-	$(use_enable debug)
-	$(use_enable kerberos)
-	$(use_enable pam)
-	$(use_enable sasl)"
-
-	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 (not needed bug 452992)
-	#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.9.5-r1.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.5-r1.ebuild
index 6f13acae2c69..0044c38e0582 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.5-r1.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.9.5-r1.ebuild,v 1.1 2015/04/07 01:04:53 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.5-r1.ebuild,v 1.2 2015/05/15 18:12:17 prometheanfire Exp $
 
 EAPI=5
 
@@ -82,7 +82,7 @@ multilib_src_install_all() {
 	newinitd "${FILESDIR}"/nslcd-init-r1 nslcd
 
 	insinto /usr/share/nss-pam-ldapd
-	doins nslcd.conf
+	doins "${WORKDIR}/${P}/nslcd.conf"
 
 	fperms o-r /etc/nslcd.conf