Gentoo Archives: gentoo-commits

From: Patrick McLean <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/nss-pam-ldapd/files/, sys-auth/nss-pam-ldapd/
Date: Mon, 31 Jul 2017 23:01:37
Message-Id: 1501542084.8a051c99a81d14bcf8003868a59c2fe682717fae.chutzpah@gentoo
commit:     8a051c99a81d14bcf8003868a59c2fe682717fae
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 31 23:01:02 2017 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Jul 31 23:01:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a051c99

sys-auth/nss-pam-ldapd: Remove empty s6 init script

Gentoo-Bug: 622416
Package-Manager: Portage-2.3.6, Repoman-2.3.3

 sys-auth/nss-pam-ldapd/files/nslcd-init-s6        | 0
 sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.7.ebuild | 3 +--
 sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.8.ebuild | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/sys-auth/nss-pam-ldapd/files/nslcd-init-s6 b/sys-auth/nss-pam-ldapd/files/nslcd-init-s6
deleted file mode 100644
index e69de29bb2d..00000000000

diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.7.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.7.ebuild
index ddcc9dbe69f..22abd70bba2 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.7.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -80,7 +80,6 @@ multilib_src_install_all() {
 
 	newinitd "${FILESDIR}"/nslcd-init-r1 nslcd
 	newinitd "${FILESDIR}"/nslcd-init-r2 nslcd
-	newinitd "${FILESDIR}"/nslcd-init-s6 nslcd-s6
 	s6_install_service nslcd "${FILESDIR}"/nslcd-run-s6
 
 	insinto /usr/share/nss-pam-ldapd

diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.8.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.8.ebuild
index 760ed21c4fe..edce3791910 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.8.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.8.ebuild
@@ -81,7 +81,6 @@ multilib_src_install_all() {
 
 	newinitd "${FILESDIR}"/nslcd-init-r1 nslcd
 	newinitd "${FILESDIR}"/nslcd-init-r2 nslcd
-	newinitd "${FILESDIR}"/nslcd-init-s6 nslcd-s6
 	s6_install_service nslcd "${FILESDIR}"/nslcd-run-s6
 
 	insinto /usr/share/nss-pam-ldapd