Make the installs more reliable (die on error) and install the nscd.conf file.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 21 insertions, 15 deletions

diff --git a/sys-freebsd/freebsd-usbin/ChangeLog b/sys-freebsd/freebsd-usbin/ChangeLog
index d5537b48f81a..d98e03b2ad34 100644
--- a/sys-freebsd/freebsd-usbin/ChangeLog
+++ b/sys-freebsd/freebsd-usbin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-freebsd/freebsd-usbin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.54 2009/05/18 17:11:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.55 2009/05/18 17:46:39 flameeyes Exp $
+
+  18 May 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  freebsd-usbin-7.1-r2.ebuild:
+  Make the installs more reliable (die on error) and install the nscd.conf
+  file.
 
 *freebsd-usbin-7.1-r2 (18 May 2009)
 
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index 2f8ae7a537c9..ad6d680e608c 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -44,14 +44,14 @@ DIST freebsd-usbin-6.2.tar.bz2 2695872 RMD160 ea6104fcfbf6c0be511a80d0475e5a8f71
 DIST freebsd-usbin-7.1.tar.bz2 2584691 RMD160 cf6adf2f1cc60e667417f647cb99bbc3107c85f6 SHA1 7120dd7e7abed78954889ad4e18e5f8775411621 SHA256 e14cd80187a161153ea5eb6e5441171bf1ca1a8b8e8bdeea7306187c77c52af8
 EBUILD freebsd-usbin-6.2-r1.ebuild 5288 RMD160 35475e8b833bc9189f727ebb51d55e9d104f575c SHA1 5e54a905453ea6ffc8b93546641d8c0237134387 SHA256 a53f8668a31e357fbc607facfea36e5b3d052b45fa3b9b1ce8eadc38889fce49
 EBUILD freebsd-usbin-7.1-r1.ebuild 5262 RMD160 4b7ab729d5f90cbec1adf51c1a12993b0e77787e SHA1 e1f58f6fc70f9e952f0a42c0ea4ec1371894a769 SHA256 73c296f4a0383e95709380276885d5e57f9e221ced27e3ea308ef4bb32ed7bd0
-EBUILD freebsd-usbin-7.1-r2.ebuild 5148 RMD160 1ba7bc4bb576096fe7abaeef2fa7a4f029cae017 SHA1 91122e2b38f6ceabe9516e8a78d6a5c73073ae06 SHA256 76d1c48fc13b47d3ea87d23bee42f53fc291d545b4cfceafad7bf1284d2c7800
+EBUILD freebsd-usbin-7.1-r2.ebuild 5210 RMD160 1a6649d698ac82d5aba5a63a57da2c9daeeecc49 SHA1 3c643366115232802eef62c0baa0f4321942a41f SHA256 2a768e4ad11c414899350bd17eb931de6c75529b99b32445fb52f2e9b38696c7
 EBUILD freebsd-usbin-7.1.ebuild 5251 RMD160 43d09d319641ccec5cf781dc02c76470d30e38b6 SHA1 9c0f0f59abdf64351ae45f043517db2e35fa31c5 SHA256 e1d24b12f4c10cb7f00f06698f46e680d80da9f4b2eaeef038df611a6b0118b3
-MISC ChangeLog 15925 RMD160 3fcd9ea36dbae59077771b81875638c0fddca015 SHA1 58b8a4edffef6a1eaadca7998f8c58390faf50a6 SHA256 4dd34b8b5919f633416075d3baa0282cddedddf7cb456fa602c478cca135ac91
+MISC ChangeLog 16096 RMD160 7b84fabd392af83ce8809b9c4a15bbb2a240b2d3 SHA1 d4691c56e5010316b08e5fc61e867726b58c296a SHA256 831cbc823585bad8a4eea4bf51bcef72fb1c796a9bac08255310397c12b51ebc
 MISC metadata.xml 622 RMD160 40c395c94b61a9c17839c2ee03e1f931315b026b SHA1 73fb91a0bf10dc1f73b845bf1d24f999a78093ba SHA256 91e453a246233781073dd07099e645e31ef48e487ca856f0c489460c230342c8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoRlsQACgkQAiZjviIA2Xgj5QCfXI5HIW4LMk9KnwgkuRPUJrsN
-tpQAoNVyLx81mVUTlMCB18yMZrjaW7H8
-=Yj52
+iEYEARECAAYFAkoRnwsACgkQAiZjviIA2Xj/WQCfegK2pJX6J2VWNSGWIZBO8jAv
+A7QAoN4y5v7HXABpi0q7dcHtmRAQq4di
+=6ZWh
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-7.1-r2.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-7.1-r2.ebuild
index 228f3c845e12..bf553b225b5c 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-7.1-r2.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-7.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-7.1-r2.ebuild,v 1.1 2009/05/18 17:11:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-7.1-r2.ebuild,v 1.2 2009/05/18 17:46:39 flameeyes Exp $
 
 EAPI=2
 
@@ -105,9 +105,10 @@ src_install() {
 
 	# Most of these now come from openrc.
 	for util in nfs rpc.statd rpc.lockd; do
-		newinitd "${FILESDIR}/"${util}.initd ${util}
-		[[ -e "${FILESDIR}"/${util}.confd ]] && \
-			newconfd "${FILESDIR}"/${util}.confd ${util}
+		newinitd "${FILESDIR}/"${util}.initd ${util} || die
+		if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
+			newconfd "${FILESDIR}"/${util}.confd ${util} || die
+		fi
 	done
 
 	for class in daily monthly weekly; do
@@ -121,24 +122,24 @@ EOS
 
 	# Install the pw.conf file to let pw use Gentoo's skel location
 	insinto /etc
-	doins "${FILESDIR}/pw.conf"
+	doins "${FILESDIR}/pw.conf" || die
 
 	cd "${WORKDIR}/etc"
-	doins amd.map apmd.conf syslog.conf newsyslog.conf
+	doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die
 	use usb && doins usbd.conf
 
 	insinto /etc/ppp
-	doins ppp/ppp.conf
+	doins ppp/ppp.conf || die
 
 	if use isdn; then
 		insinto /etc/isdn
-		doins isdn/*
+		doins isdn/* || die
 		rm -f "${D}"/etc/isdn/Makefile
 	fi
 
 	if use bluetooth; then
 		insinto /etc/bluetooth
-		doins bluetooth/*
+		doins bluetooth/* || die
 		rm -f "${D}"/etc/bluetooth/Makefile
 	fi