dont install nscd init.d script #43076

6 files changed, 28 insertions, 6 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index f652c14b5afc..9f589c9b2556 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,17 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.172 2004/09/27 23:31:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.173 2004/09/29 05:02:34 vapier Exp $
 
 # See the gentoo-src rc-scripts ChangeLog for up-to-date release information:
 # http://www.gentoo.org/cgi-bin/viewcvs.cgi/rc-scripts/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup
 
+  29 Sep 2004; Mike Frysinger <vapier@gentoo.org> baselayout-1.10.3.ebuild,
+  baselayout-1.10.4.ebuild, baselayout-1.11.1.ebuild,
+  baselayout-1.9.4-r3.ebuild, baselayout-1.9.4-r4.ebuild:
+  Dont install the nscd script anymore, let glibc do it #43076.
+
+*baselayout-1.11.1 (29 Sep 2004)
+
   27 Sep 2004; Aron Griffis <agriffis@gentoo.org> -baselayout-1.11.0.ebuild:
   Update to rc-scripts-1.6.1 with dm-crypt fixes (I hope).  Still package.masked
 
diff --git a/sys-apps/baselayout/baselayout-1.10.3.ebuild b/sys-apps/baselayout/baselayout-1.10.3.ebuild
index c219a1d94cd1..7ee535fa33c1 100644
--- a/sys-apps/baselayout/baselayout-1.10.3.ebuild
+++ b/sys-apps/baselayout/baselayout-1.10.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.10.3.ebuild,v 1.4 2004/08/21 00:00:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.10.3.ebuild,v 1.5 2004/09/29 05:02:34 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -31,6 +31,9 @@ DEPEND="virtual/os-headers"
 src_unpack() {
 	unpack ${A}
 
+	# Let glibc handle nscd #43076
+	rm ${S}/init.d/nscd
+
 	# Fix Sparc specific stuff
 	if [[ ${ARCH} == sparc ]]; then
 		sed -i -e 's:KEYMAP="us":KEYMAP="sunkeymap":' ${S}/etc/rc.conf || die
diff --git a/sys-apps/baselayout/baselayout-1.10.4.ebuild b/sys-apps/baselayout/baselayout-1.10.4.ebuild
index 6b0d4c251f4e..ecf3dbe92bc2 100644
--- a/sys-apps/baselayout/baselayout-1.10.4.ebuild
+++ b/sys-apps/baselayout/baselayout-1.10.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.10.4.ebuild,v 1.4 2004/08/21 00:00:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.10.4.ebuild,v 1.5 2004/09/29 05:02:34 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -31,6 +31,9 @@ DEPEND="virtual/os-headers"
 src_unpack() {
 	unpack ${A}
 
+	# Let glibc handle nscd #43076
+	rm ${S}/init.d/nscd
+
 	# Fix Sparc specific stuff
 	if [[ ${ARCH} == sparc ]]; then
 		sed -i -e 's:KEYMAP="us":KEYMAP="sunkeymap":' ${S}/etc/rc.conf || die
diff --git a/sys-apps/baselayout/baselayout-1.11.1.ebuild b/sys-apps/baselayout/baselayout-1.11.1.ebuild
index 2588c1c6315a..3e53e8541cc3 100644
--- a/sys-apps/baselayout/baselayout-1.11.1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.11.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.1.ebuild,v 1.1 2004/09/27 23:31:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.1.ebuild,v 1.2 2004/09/29 05:02:34 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -31,6 +31,9 @@ DEPEND="virtual/os-headers"
 src_unpack() {
 	unpack ${A}
 
+	# Let glibc handle nscd #43076
+	rm ${S}/init.d/nscd
+
 	# Fix Sparc specific stuff
 	if [[ ${ARCH} == sparc ]]; then
 		sed -i -e 's:KEYMAP="us":KEYMAP="sunkeymap":' ${S}/etc/rc.conf || die
diff --git a/sys-apps/baselayout/baselayout-1.9.4-r3.ebuild b/sys-apps/baselayout/baselayout-1.9.4-r3.ebuild
index fc398a52fdc1..efa9f076e4e9 100644
--- a/sys-apps/baselayout/baselayout-1.9.4-r3.ebuild
+++ b/sys-apps/baselayout/baselayout-1.9.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.9.4-r3.ebuild,v 1.3 2004/08/19 19:39:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.9.4-r3.ebuild,v 1.4 2004/09/29 05:02:34 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -36,6 +36,9 @@ DEPEND="virtual/os-headers
 src_unpack() {
 	unpack ${A}
 
+	# Let glibc handle nscd #43076
+	rm ${S}/init.d/nscd
+
 	#
 	# Baselayout setup
 	#
diff --git a/sys-apps/baselayout/baselayout-1.9.4-r4.ebuild b/sys-apps/baselayout/baselayout-1.9.4-r4.ebuild
index f9a825fddcf3..f1d23a66eb31 100644
--- a/sys-apps/baselayout/baselayout-1.9.4-r4.ebuild
+++ b/sys-apps/baselayout/baselayout-1.9.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.9.4-r4.ebuild,v 1.2 2004/08/19 19:39:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.9.4-r4.ebuild,v 1.3 2004/09/29 05:02:34 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -36,6 +36,9 @@ DEPEND="virtual/os-headers
 src_unpack() {
 	unpack ${A}
 
+	# Let glibc handle nscd #43076
+	rm ${S}/init.d/nscd
+
 	#
 	# Baselayout setup
 	#