Do not continue when a sub-make errors (bug #380953).

Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64

4 files changed, 27 insertions, 8 deletions

diff --git a/net-analyzer/argus/ChangeLog b/net-analyzer/argus/ChangeLog
index 8e54d39f7829..8af18649e0dd 100644
--- a/net-analyzer/argus/ChangeLog
+++ b/net-analyzer/argus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/argus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus/ChangeLog,v 1.35 2011/11/15 20:25:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus/ChangeLog,v 1.36 2011/11/15 20:43:45 jer Exp $
+
+  15 Nov 2011; Jeroen Roovers <jer@gentoo.org> argus-3.0.5.6.ebuild,
+  +files/argus-3.0.5-Makefile.patch:
+  Do not continue when a sub-make errors (bug #380953).
 
 *argus-3.0.5.6 (15 Nov 2011)
 
diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest
index 7b80380fbae4..0504cf3b6d28 100644
--- a/net-analyzer/argus/Manifest
+++ b/net-analyzer/argus/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX argus-3.0.3.8-autoconf-2.65.patch 364 RMD160 8eb078c5e3a5a6b96d9dc549f4604766f8183fef SHA1 74b1da23e514739b3d03af92d4231bd1880d67f8 SHA256 fcb51e96c18750e119280451e1955a200ac0e7d5a9d6554fcedac455cc43000f
 AUX argus-3.0.4-disable-tcp-wrappers-automagic.patch 578 RMD160 d8ddda090b6002b7fdc7523e9b81e134899d1b61 SHA1 6bfca8bcb69e01b2744f17e8b16b58a5f3d9bedb SHA256 07cc49603b918cffcea733f834b8c16acf292fa66c123d00f49d347224b7d9ff
+AUX argus-3.0.5-Makefile.patch 274 RMD160 12320a025dd9ffec6500b40208460673ea53f19b SHA1 544e8797ca9e36b9f6d6a7355ee4344db7268b5d SHA256 d1aabaa6f1762def460bb941210027312d85066bd5a73bc7194f27b42365e787
 AUX argus.initd 479 RMD160 7a52b754edf5219dec6049c216c89d24d3058eb2 SHA1 7ec0457ba22e94adf04b4b75283deac73c5a984c SHA256 df066d772f87e4df2ee1250de6ce4e370a5191fead8d22a2dc84593f4368ce88
 DIST argus-3.0.3.8.tar.gz 437154 RMD160 7e1e99d973bc429c577ffcf5cff911b9e989ea0d SHA1 0270f1182126b74989618d19bb8d90ced21279f8 SHA256 16d5a74d9ebd1cabfc5ed032793cfc8f03d5516953220d03cb1aaa25ecf3b27c
 DIST argus-3.0.4.tar.gz 476702 RMD160 8fd85f7a967c0a22e5bea19ea469522d70238fe1 SHA1 b61a84ce8e457b0f5304f4ce8fd3b87a651b85c9 SHA256 ff8582da63ff9fca807505ba7359bc58628b20e827afb93a08f706dd5b86bb52
@@ -17,13 +18,13 @@ EBUILD argus-3.0.5.2.ebuild 1744 RMD160 874da5a9b4abf7d54f623d311a7fb469a132b6c1
 EBUILD argus-3.0.5.3.ebuild 1744 RMD160 50ea4a607ed348a94e700acdfd2657bd1d71ad68 SHA1 7dd5bbd0cbd54bc2d8f9b1ababdc99c9db64555b SHA256 0f257cefe489246a02f6b0b21c4c53580c729e38f087c14a5e78ea2857c6ad7b
 EBUILD argus-3.0.5.4.ebuild 1744 RMD160 55b564b0f89e1e3e044e930ff8093a286899b1af SHA1 fca9a070f89366ed3dc9256a59816a583f726ace SHA256 6da4d6d140abe05bc6855f459f0b77b219319466c1fe62f3e8c4ff657f983905
 EBUILD argus-3.0.5.5.ebuild 1744 RMD160 d0c2f2016a5166bb139b8023cbfe607c8a14778b SHA1 5640557418f56802da1a9cb11ffb0f55fab3d9e7 SHA256 97a30f12903d1d94b3a3747521e0c7b1623470ded84510c1b5181eedde461fae
-EBUILD argus-3.0.5.6.ebuild 1825 RMD160 aa37a745f081b9c89b3c6c95153f0ecbe3306a38 SHA1 ae6f2143352763d7e4b0f76d73918c1f0dd97037 SHA256 1adf30a3c80e339988c42f2b65eb1bce3ea8e6fea3b81c5b2205fef19a44941a
-MISC ChangeLog 4700 RMD160 77693a830670df965c29854fc80cdaed14ba5bb6 SHA1 65ae7d7159290707f7531a745442e8ff7505de29 SHA256 480da5bfc7e593a234d2d63b05bb5b50eed0f34db17d5fa1ffd641902c2f8bdd
+EBUILD argus-3.0.5.6.ebuild 1870 RMD160 7b41006cd42ad6bd57e164d30b14ad35e94172d0 SHA1 878b3cc60435aabdc48a0dbb0eaf1fff3c974313 SHA256 d2e1a3863f2e22db8cbd560d1075efac5df0d971bb11d74921ac1626de8cfd2c
+MISC ChangeLog 4863 RMD160 1f7b9eb8d60cce556389a79c4fa7858867e469e5 SHA1 4cb145b923a41a60cbf5d22f734e509624ccd6b5 SHA256 8079a59b11f2389520a0ec928e9688b462069fe631ffafa1c91ca49fff13f1e4
 MISC metadata.xml 249 RMD160 2d5bfee9070b799f81a90c8976fd4890bed297b2 SHA1 642f6a9d8398574e2ff8a4b564a94167624eac32 SHA256 0ee6ce106355df17fe546546ea6658fc7dd7e6d0fab58aef1b745dac3b4c20da
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7CysAACgkQVWmRsqeSphMc7gCfRyWcNzWjSzUeYs6CY26FBBYy
-3TkAnRUByJryebL8VQtdFqJO9ROMm6by
-=FZir
+iEYEARECAAYFAk7Czw0ACgkQVWmRsqeSphOY8QCfVM8dpRBG8kf6XWFrv9sQGaEW
+/cwAn2funAG9+K1XBpUPh7lAedxwYv2X
+=T+zi
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/argus/argus-3.0.5.6.ebuild b/net-analyzer/argus/argus-3.0.5.6.ebuild
index baf306b85e54..77fbc2f2b685 100644
--- a/net-analyzer/argus/argus-3.0.5.6.ebuild
+++ b/net-analyzer/argus/argus-3.0.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus/argus-3.0.5.6.ebuild,v 1.1 2011/11/15 20:25:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus/argus-3.0.5.6.ebuild,v 1.2 2011/11/15 20:43:45 jer Exp $
 
 EAPI="4"
 
@@ -36,7 +36,8 @@ src_prepare() {
 			-i support/Config/argus.conf || die
 #	sed -e 's:.*="-O.*":true:g' -i acsite.m4 || die
 	epatch \
-		"${FILESDIR}"/${PN}-3.0.4-disable-tcp-wrappers-automagic.patch
+		"${FILESDIR}"/${PN}-3.0.4-disable-tcp-wrappers-automagic.patch \
+		"${FILESDIR}"/${PN}-3.0.5-Makefile.patch
 	eautoreconf
 }
 
diff --git a/net-analyzer/argus/files/argus-3.0.5-Makefile.patch b/net-analyzer/argus/files/argus-3.0.5-Makefile.patch
new file mode 100644
index 000000000000..e4c3e1981c2f
--- /dev/null
+++ b/net-analyzer/argus/files/argus-3.0.5-Makefile.patch
@@ -0,0 +1,13 @@
+Do not continue when a sub-make errors (bug #380953).
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -55,7 +55,7 @@
+ .PHONY: install installdirs all
+ 
+ all: force
+-	@-for d in $(DIRS);\
++	@for d in $(DIRS);\
+ 	do \
+ 		(cd $$d; echo "### Making in" `pwd`;\
+ 			$(MAKE) $(MFLAGS) ;\