Die on failure to install various parts of the package.

(Portage version: 2.1.3.9)

3 files changed, 15 insertions, 11 deletions

diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog
index 089ab7658c78..dec0571e2155 100644
--- a/net-misc/quagga/ChangeLog
+++ b/net-misc/quagga/ChangeLog
@@ -2,7 +2,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Copyright 2003-2004 DataCore GmbH
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.68 2007/09/25 19:14:48 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.69 2007/09/26 05:51:54 mrness Exp $
+
+  26 Sep 2007; Alin Năstac <mrness@gentoo.org> quagga-0.98.6-r3.ebuild,
+  quagga-0.99.9.ebuild:
+  Die on failure to install various parts of the package.
 
   25 Sep 2007; Raúl Porcel <armin76@gentoo.org> quagga-0.98.6-r3.ebuild:
   sparc stable wrt security #192096
diff --git a/net-misc/quagga/quagga-0.98.6-r3.ebuild b/net-misc/quagga/quagga-0.98.6-r3.ebuild
index 8ba2f8f44b8d..53fb1cb9d261 100644
--- a/net-misc/quagga/quagga-0.98.6-r3.ebuild
+++ b/net-misc/quagga/quagga-0.98.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.98.6-r3.ebuild,v 1.7 2007/09/25 19:14:48 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.98.6-r3.ebuild,v 1.8 2007/09/26 05:51:54 mrness Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -25,7 +25,7 @@ RDEPEND="${DEPEND}
 	sys-apps/iproute2"
 
 src_unpack() {
-	unpack ${A} || die "failed to unpack sources"
+	unpack ${A}
 
 	cd "${S}" || die "source dir not found"
 	# Fix security quagga bug 355
@@ -96,7 +96,7 @@ src_install() {
 		exampledir="${D}/etc/quagga/samples" \
 		libdir="${D}/usr/$(get_libdir)/quagga" || die "make install failed"
 
-	keepdir /var/run/quagga || die
+	dodir /var/run/quagga || die "failed to install /var/run/quagga"
 
 	local i MY_SERVICES_LIST="zebra ripd ospfd bgpd"
 	use ipv6 && MY_SERVICES_LIST="${MY_SERVICES_LIST} ripngd ospf6d"
@@ -107,10 +107,10 @@ src_install() {
 
 	if use pam; then
 		insinto /etc/pam.d
-		newins "${FILESDIR}/quagga.pam" quagga
+		newins "${FILESDIR}/quagga.pam" quagga || die "failed to install pam.d file"
 	fi
 
-	newenvd "${FILESDIR}/quagga.env" 99quagga
+	newenvd "${FILESDIR}/quagga.env" 99quagga || die "failed to install env file"
 }
 
 pkg_preinst() {
diff --git a/net-misc/quagga/quagga-0.99.9.ebuild b/net-misc/quagga/quagga-0.99.9.ebuild
index 072efdb2544b..c6a994c5d1f2 100644
--- a/net-misc/quagga/quagga-0.99.9.ebuild
+++ b/net-misc/quagga/quagga-0.99.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.9.ebuild,v 1.1 2007/09/13 18:57:44 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.9.ebuild,v 1.2 2007/09/26 05:51:54 mrness Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -32,7 +32,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack ${A} || die "failed to unpack sources"
+	unpack ${A}
 
 	cd "${S}" || die "source dir not found"
 	epatch "${WORKDIR}/patch/${P}-link-libcap.patch"
@@ -99,7 +99,7 @@ src_install() {
 		exampledir="${D}/etc/quagga/samples" \
 		libdir="${D}/usr/$(get_libdir)/quagga" || die "make install failed"
 
-	keepdir /var/run/quagga
+	dodir /var/run/quagga || die "failed to install /var/run/quagga"
 
 	local i MY_SERVICES_LIST="zebra ripd ospfd bgpd"
 	use ipv6 && MY_SERVICES_LIST="${MY_SERVICES_LIST} ripngd ospf6d"
@@ -110,10 +110,10 @@ src_install() {
 
 	if use pam; then
 		insinto /etc/pam.d
-		newins "${FILESDIR}/quagga.pam" quagga
+		newins "${FILESDIR}/quagga.pam" quagga || die "failed to install pam.d file"
 	fi
 
-	newenvd "${FILESDIR}/quagga.env" 99quagga
+	newenvd "${FILESDIR}/quagga.env" 99quagga || die "failed to install env file"
 }
 
 pkg_preinst() {