[gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: src_install.eblit

[Mike Frysinger (vapier)]

vapier      13/04/01 04:22:55

  Modified:             src_install.eblit
  Log:
  Do not install nscd config files when USE=-nscd #463786 by Harris Landgarten.
  
  (Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

Revision  Changes    Path
1.27                 sys-libs/glibc/files/eblits/src_install.eblit

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit?r1=1.26&r2=1.27

Index: src_install.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- src_install.eblit	28 Mar 2013 05:03:16 -0000	1.26
+++ src_install.eblit	1 Apr 2013 04:22:55 -0000	1.27
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.26 2013/03/28 05:03:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.27 2013/04/01 04:22:55 vapier Exp $
 
 toolchain-glibc_src_install() {
 	local GBUILDDIR
@@ -171,13 +171,19 @@
 	insinto /etc
 	doins nscd/nscd.conf posix/gai.conf nss/nsswitch.conf || die
 	doins "${WORKDIR}"/extra/etc/*.conf || die
-	doinitd "${WORKDIR}"/extra/etc/nscd || die
 
-	local nscd_args=(
-		-e "s:@PIDFILE@:$(strings "${D}"/usr/sbin/nscd | grep nscd.pid):"
-	)
-	version_is_at_least 2.16 || nscd_args+=( -e 's: --foreground : :' )
-	sed -i "${nscd_args[@]}" "${D}"/etc/init.d/nscd
+	if ! in_iuse nscd || use nscd ; then
+		doinitd "${WORKDIR}"/extra/etc/nscd || die
+
+		local nscd_args=(
+			-e "s:@PIDFILE@:$(strings "${D}"/usr/sbin/nscd | grep nscd.pid):"
+		)
+		version_is_at_least 2.16 || nscd_args+=( -e 's: --foreground : :' )
+		sed -i "${nscd_args[@]}" "${D}"/etc/init.d/nscd
+	else
+		# Do this since extra/etc/*.conf above might have nscd.conf.
+		rm -f "${D}"/etc/nscd.conf
+	fi
 
 	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
 	doenvd "${T}"/00glibc || die