|| die's to make install to avoid problems like we see in bug #55489.

7 files changed, 27 insertions, 22 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index fe837d1eb0d3..a482e4b6a15e 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.33 2004/07/02 09:41:49 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.34 2004/07/02 10:31:32 eradicator Exp $
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  iptables-1.2.11-r1.ebuild, iptables-1.2.7a-r3.ebuild,
+  iptables-1.2.9-r1.ebuild, iptables-1.2.9-r3.ebuild, iptables-1.2.9.ebuild:
+  || die's to make install to avoid problems like we see in bug #55489.
 
   02 Jul 2004; Lars Weiler <pylon@gentoo.org> iptables-1.2.9-r3.ebuild:
   Stable on ppc as iptables-1.2.7a-r3 does not compile any more.
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 65a8b2190e3b..78a1f4f0a8e3 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -1,10 +1,10 @@
-MD5 ce2adc0af3d7dbfca28a0599c0a08af2 ChangeLog 11795
-MD5 e17c9bfee1f65cb1a80b6ea77ccbed7c iptables-1.2.7a-r3.ebuild 1959
-MD5 15b500a507f8a161618d173a656922fa iptables-1.2.9-r1.ebuild 3496
-MD5 9cd0905c67f2b36d434811cdd13cf14c iptables-1.2.9.ebuild 2777
+MD5 8332dc9005723fb5d42a44c7eb5d643d ChangeLog 12063
+MD5 3dc5f4c2b8833a4b3aa2fe9c426352fd iptables-1.2.7a-r3.ebuild 1972
+MD5 68481d5e196c5e00c0512688625f0410 iptables-1.2.9-r1.ebuild 3516
+MD5 662217b275d0637dec337290c30528db iptables-1.2.9.ebuild 2797
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 fccee733368de1aed12c5a8083c0c66d iptables-1.2.11-r1.ebuild 4635
-MD5 444d3c0adcae8f13ccf03a53ed782c5e iptables-1.2.9-r3.ebuild 4697
+MD5 40a8b7facc92cf4e1fe7992e2bee8041 iptables-1.2.9-r3.ebuild 4716
+MD5 9f4abdf1bed56ddc4081309c2391d36c iptables-1.2.11-r1.ebuild 4655
 MD5 183ec92f9fee7f072d9edb36917b4f9e files/digest-iptables-1.2.7a-r3 68
 MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9 67
 MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9-r1 67
@@ -18,9 +18,9 @@ MD5 521c8e99785dfc3c424a6b7bcdbed140 files/iptables-1.2.9-r1.init 1787
 MD5 f876be872ec78bc824f2503059338d8d files/iptables.confd 382
 MD5 3b47fcf66505ee6154949e600a501e32 files/iptables.init 2091
 MD5 1d34d1326df13874bd2f1997f3ee4d59 files/sparc64_limit_fix.patch.bz2 1227
-MD5 1457a4df1ce1faccfaccc8c7208bc432 files/digest-iptables-1.2.11-r1 68
 MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9-r3 67
 MD5 23c4c7ee1b86cd191e7b17b046289c91 files/iptables-1.2.9-hppa.patch.bz2 278
+MD5 1457a4df1ce1faccfaccc8c7208bc432 files/digest-iptables-1.2.11-r1 68
 MD5 ea3ad4b64a781b66b711cb587d4a718b files/1.2.7a-files/01_all_grsecurity.patch.bz2 1163
 MD5 c4f9d5d795f4ab2c221681e55ebac8dd files/1.2.7a-files/02_all_imq.patch.bz2 2936
 MD5 0b7b54af1ab69e8e10ddcaab93fd62ff files/1.2.7a-files/03_all_mac_fix.patch.bz2 305
diff --git a/net-firewall/iptables/iptables-1.2.11-r1.ebuild b/net-firewall/iptables/iptables-1.2.11-r1.ebuild
index 1a74cfe8fbcb..dcc54d2d13b8 100644
--- a/net-firewall/iptables/iptables-1.2.11-r1.ebuild
+++ b/net-firewall/iptables/iptables-1.2.11-r1.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/net-firewall/iptables/iptables-1.2.11-r1.ebuild,v 1.1 2004/06/28 20:36:52 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.11-r1.ebuild,v 1.2 2004/07/02 10:31:32 eradicator Exp $
 
 inherit eutils flag-o-matic
 
@@ -102,14 +102,14 @@ src_install() {
 		PREFIX= \
 		DESTDIR=${D} \
 		MANDIR=/usr/share/man \
-		install
+		install || die
 	make COPT_FLAGS="${CFLAGS}" ${myconf} \
 		DESTDIR=${D} \
 		PREFIX= \
 		LIBDIR=/usr/lib \
 		MANDIR=/usr/share/man \
 		INCDIR=/usr/include \
-		install-devel
+		install-devel || die
 
 	dodoc COPYING
 	dodir /var/lib/iptables ; keepdir /var/lib/iptables
diff --git a/net-firewall/iptables/iptables-1.2.7a-r3.ebuild b/net-firewall/iptables/iptables-1.2.7a-r3.ebuild
index ec77c69bd6b3..52d6e5830483 100644
--- a/net-firewall/iptables/iptables-1.2.7a-r3.ebuild
+++ b/net-firewall/iptables/iptables-1.2.7a-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/net-firewall/iptables/iptables-1.2.7a-r3.ebuild,v 1.8 2004/06/28 19:00:50 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.7a-r3.ebuild,v 1.9 2004/07/02 10:31:32 eradicator Exp $
 
 inherit eutils
 
@@ -48,7 +48,7 @@ src_compile() {
 src_install() {
 #	dodir /usr/{lib,share/man/man8,sbin}
 
-	make DESTDIR=${D} MANDIR=/usr/share/man install
+	make DESTDIR=${D} MANDIR=/usr/share/man install || die
 
 	dodoc COPYING KNOWN_BUGS
 	dodir /var/lib/iptables ; keepdir /var/lib/iptables
diff --git a/net-firewall/iptables/iptables-1.2.9-r1.ebuild b/net-firewall/iptables/iptables-1.2.9-r1.ebuild
index a4ee2ede9a82..5ca875dbe328 100644
--- a/net-firewall/iptables/iptables-1.2.9-r1.ebuild
+++ b/net-firewall/iptables/iptables-1.2.9-r1.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/net-firewall/iptables/iptables-1.2.9-r1.ebuild,v 1.7 2004/06/28 19:00:50 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.9-r1.ebuild,v 1.8 2004/07/02 10:31:32 eradicator Exp $
 
 inherit eutils flag-o-matic
 
@@ -65,12 +65,12 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} MANDIR=/usr/share/man ${myconf} install
+	make DESTDIR=${D} MANDIR=/usr/share/man ${myconf} install || die
 	make DESTDIR=${D} ${myconf} \
 		LIBDIR=/usr/lib \
 		MANDIR=/usr/share/man \
 		INCDIR=/usr/include \
-		install-devel
+		install-devel || die
 
 	dodoc COPYING
 	dodir /var/lib/iptables ; keepdir /var/lib/iptables
diff --git a/net-firewall/iptables/iptables-1.2.9-r3.ebuild b/net-firewall/iptables/iptables-1.2.9-r3.ebuild
index a0fecfccdf98..e604c7ad7b03 100644
--- a/net-firewall/iptables/iptables-1.2.9-r3.ebuild
+++ b/net-firewall/iptables/iptables-1.2.9-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/net-firewall/iptables/iptables-1.2.9-r3.ebuild,v 1.2 2004/07/02 09:41:49 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.9-r3.ebuild,v 1.3 2004/07/02 10:31:32 eradicator Exp $
 
 inherit eutils flag-o-matic
 
@@ -95,12 +95,12 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} MANDIR=/usr/share/man ${myconf} install
+	make DESTDIR=${D} MANDIR=/usr/share/man ${myconf} install || die
 	make DESTDIR=${D} ${myconf} \
 		LIBDIR=/usr/lib \
 		MANDIR=/usr/share/man \
 		INCDIR=/usr/include \
-		install-devel
+		install-devel || die
 
 	dodoc COPYING
 	dodir /var/lib/iptables ; keepdir /var/lib/iptables
diff --git a/net-firewall/iptables/iptables-1.2.9.ebuild b/net-firewall/iptables/iptables-1.2.9.ebuild
index c90538953e24..0f5fe877962f 100644
--- a/net-firewall/iptables/iptables-1.2.9.ebuild
+++ b/net-firewall/iptables/iptables-1.2.9.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/net-firewall/iptables/iptables-1.2.9.ebuild,v 1.14 2004/06/28 19:00:50 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.9.ebuild,v 1.15 2004/07/02 10:31:32 eradicator Exp $
 
 inherit eutils flag-o-matic
 
@@ -57,12 +57,12 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} MANDIR=/usr/share/man ${myconf} install
+	make DESTDIR=${D} MANDIR=/usr/share/man ${myconf} install || die
 	make DESTDIR=${D} ${myconf} \
 		LIBDIR=/usr/lib \
 		MANDIR=/usr/share/man \
 		INCDIR=/usr/include \
-		install-devel
+		install-devel || die
 
 	dodoc COPYING
 	dodir /var/lib/iptables ; keepdir /var/lib/iptables