Revision bump, add systemd service files (bug #545780). Remove old.

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

8 files changed, 47 insertions, 320 deletions

diff --git a/sys-auth/nss-pam-ldapd/ChangeLog b/sys-auth/nss-pam-ldapd/ChangeLog
index 636eb8dbd8ce..51f9e4701c4a 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.20 2015/03/30 19:01:38 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/ChangeLog,v 1.21 2015/04/07 01:04:53 chutzpah Exp $
+
+*nss-pam-ldapd-0.9.5-r1 (07 Apr 2015)
+
+  07 Apr 2015; Patrick McLean <chutzpah@gentoo.org> +files/nslcd-tmpfiles.conf,
+  +files/nslcd.service, +nss-pam-ldapd-0.9.5-r1.ebuild,
+  -nss-pam-ldapd-0.9.4-r1.ebuild, -nss-pam-ldapd-0.9.4-r2.ebuild,
+  -nss-pam-ldapd-0.9.4.ebuild, -nss-pam-ldapd-0.9.5.ebuild, metadata.xml:
+  Revision bump, add systemd service files (bug #545780). Remove old.
 
 *nss-pam-ldapd-0.9.5 (30 Mar 2015)
 
diff --git a/sys-auth/nss-pam-ldapd/files/nslcd-tmpfiles.conf b/sys-auth/nss-pam-ldapd/files/nslcd-tmpfiles.conf
new file mode 100644
index 000000000000..ac4ee0ad8649
--- /dev/null
+++ b/sys-auth/nss-pam-ldapd/files/nslcd-tmpfiles.conf
@@ -0,0 +1 @@
+d /run/nslcd 0755 nslcd nslcd -
diff --git a/sys-auth/nss-pam-ldapd/files/nslcd.service b/sys-auth/nss-pam-ldapd/files/nslcd.service
new file mode 100644
index 000000000000..c7fef0ec7173
--- /dev/null
+++ b/sys-auth/nss-pam-ldapd/files/nslcd.service
@@ -0,0 +1,21 @@
+--- nss-pam-ldapd-0.9.5.ebuild
++++ nss-pam-ldapd-0.9.5.ebuild
+@@ -5,7 +5,7 @@
+ EAPI=5
+ 
+ PYTHON_COMPAT=(python2_7)
+-inherit eutils prefix user python-r1 multilib multilib-minimal
++inherit eutils prefix user python-r1 multilib multilib-minimal systemd
+ 
+ DESCRIPTION="NSS module for name lookups using LDAP"
+ HOMEPAGE="http://arthurdejong.org/nss-pam-ldapd/"
+@@ -94,6 +94,9 @@
+ 			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() {
diff --git a/sys-auth/nss-pam-ldapd/metadata.xml b/sys-auth/nss-pam-ldapd/metadata.xml
index 145349a6b4ff..458c550d203e 100644
--- a/sys-auth/nss-pam-ldapd/metadata.xml
+++ b/sys-auth/nss-pam-ldapd/metadata.xml
@@ -7,20 +7,20 @@
   </maintainer>
   <maintainer>
     <email>chutzpah@gentoo.org</email>
-	<name>Patrick McLean</name>
+    <name>Patrick McLean</name>
   </maintainer>
   <use>
-	<flag name="utils">Install the command-line utilities</flag>
+    <flag name="utils">Install the command-line utilities</flag>
   </use>
   <longdescription lang="en">
-	    Provides a Name Service Switch (NSS) module that allows your LDAP
-		server to provide user account, group, host name, alias, netgroup, and
-		basically any other information that you would normally get from /etc
-		flat files or NIS. It also provides a Pluggable Authentication Module
-		(PAM) to do authentication to an LDAP server.
+    Provides a Name Service Switch (NSS) module that allows your LDAP
+    server to provide user account, group, host name, alias, netgroup, and
+    basically any other information that you would normally get from /etc
+    flat files or NIS. It also provides a Pluggable Authentication Module
+    (PAM) to do authentication to an LDAP server.
 
-		This is implemented using thin NSS and PAM modules which delegate to a
-		dedicated service (nslcd) that queries the LDAP server with persistent
-		connections, authentication, attribute translation, etc.
-	</longdescription>
+    This is implemented using thin NSS and PAM modules which delegate to a
+    dedicated service (nslcd) that queries the LDAP server with persistent
+    connections, authentication, attribute translation, etc.
+  </longdescription>
 </pkgmetadata>
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.4-r1.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.4-r1.ebuild
deleted file mode 100644
index a64537e31fe0..000000000000
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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.4-r1.ebuild,v 1.1 2015/03/09 00:36:52 prometheanfire Exp $
-
-EAPI=5
-
-inherit eutils multilib multilib-minimal prefix 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=""
-IUSE="debug kerberos sasl +pam"
-
-DEPEND="
-	net-nds/openldap[${MULTILIB_USEDEP}]
-	sasl? ( dev-libs/cyrus-sasl[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	pam? ( virtual/pam[${MULTILIB_USEDEP}] )
-	!sys-auth/nss_ldap
-	!sys-auth/pam_ldap"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup nslcd
-	enewuser nslcd -1 -1 -1 nslcd
-}
-
-src_prepare() {
-	# support user patches
-	epatch_user
-}
-
-multilib_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=/run/nslcd/nslcd.pid
-		--with-nslcd-socket=/run/nslcd/socket
-		$(use_enable debug)
-		$(use_enable kerberos)
-		$(use_enable pam)
-		$(use_enable sasl)"
-
-	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
-
-	if use x86-fbsd; then
-		myconf+=" --with-nss-flavour=freebsd"
-	else
-		myconf+=" --with-nss-flavour=glibc"
-	fi
-
-	ECONF_SOURCE=${S} econf ${myconf}
-}
-
-multilib_src_install_all() {
-	# for socket and pid file (not needed bug 452992)
-	#keepdir /run/nslcd
-
-	# init script
-	newinitd "${FILESDIR}"/nslcd-init-r1 nslcd
-
-	# make an example copy
-	insinto /usr/share/nss-pam-ldapd
-	doins nslcd.conf
-
-	fperms o-r /etc/nslcd.conf
-}
-
-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 are upgrading, keep in mind that /etc/nss-ldapd.conf"
-	elog " is now named /etc/nslcd.conf"
-	echo
-}
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.4-r2.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.4-r2.ebuild
deleted file mode 100644
index db7564a92ac8..000000000000
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.4-r2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# 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.4-r2.ebuild,v 1.2 2015/03/11 22:32:36 chutzpah Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python2_7)
-inherit eutils prefix user python-r1 multilib multilib-minimal
-
-DESCRIPTION="NSS module for name lookups using LDAP"
-HOMEPAGE="http://arthurdejong.org/nss-pam-ldapd/"
-SRC_URI="http://arthurdejong.org/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug kerberos +pam sasl test +utils"
-
-COMMON_DEP="
-	net-nds/openldap[${MULTILIB_USEDEP}]
-	sasl? ( dev-libs/cyrus-sasl[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	pam? ( 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}"/${P}-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
-
-	insinto /usr/share/nss-pam-ldapd
-	doins 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
-}
-
-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 are upgrading, keep in mind that /etc/nss-ldapd.conf"
-	elog " is now named /etc/nslcd.conf"
-	echo
-}
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.4.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.4.ebuild
deleted file mode 100644
index ea5a15628bf7..000000000000
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.4.ebuild
+++ /dev/null
@@ -1,92 +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.9.4.ebuild,v 1.1 2014/06/15 03:51:12 prometheanfire Exp $
-
-EAPI=5
-
-inherit eutils 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=""
-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_prepare() {
-	# support user patches
-	epatch_user
-}
-
-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=/run/nslcd/nslcd.pid
-		--with-nslcd-socket=/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() {
-	default
-
-	# for socket and pid file (not needed bug 452992)
-	#keepdir /run/nslcd
-
-	# init script
-	newinitd "${FILESDIR}"/nslcd-init-r1 nslcd
-
-	# make an example copy
-	insinto /usr/share/nss-pam-ldapd
-	doins nslcd.conf
-
-	fperms o-r /etc/nslcd.conf
-}
-
-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 are upgrading, keep in mind that /etc/nss-ldapd.conf"
-	elog " is now named /etc/nslcd.conf"
-	echo
-}
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.5.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.5-r1.ebuild
index 4a1b956d280a..6f13acae2c69 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.5.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.5-r1.ebuild
@@ -1,11 +1,11 @@
 # 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.ebuild,v 1.1 2015/03/30 19:01:38 chutzpah Exp $
+# $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 $
 
 EAPI=5
 
 PYTHON_COMPAT=(python2_7)
-inherit eutils prefix user python-r1 multilib multilib-minimal
+inherit eutils prefix user python-r1 multilib multilib-minimal systemd
 
 DESCRIPTION="NSS module for name lookups using LDAP"
 HOMEPAGE="http://arthurdejong.org/nss-pam-ldapd/"
@@ -94,6 +94,9 @@ multilib_src_install_all() {
 			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() {