Don't add MAKEFLAGS to submakes (bug #178684).

Package-Manager: portage-2.1.4.4

4 files changed, 21 insertions, 4 deletions

diff --git a/net-analyzer/ngrep/ChangeLog b/net-analyzer/ngrep/ChangeLog
index 3bd8f8d74e3b..d507af8a2534 100644
--- a/net-analyzer/ngrep/ChangeLog
+++ b/net-analyzer/ngrep/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/ngrep
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ChangeLog,v 1.43 2008/01/16 20:42:01 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ChangeLog,v 1.44 2008/03/18 23:41:49 jer Exp $
+
+  18 Mar 2008; Jeroen Roovers <jer@gentoo.org>
+  +files/ngrep-1.45-Makefile.in.patch, ngrep-1.45-r1.ebuild:
+  Don't add MAKEFLAGS to submakes (bug #178684).
 
   16 Jan 2008; Fabian Groffen <grobian@gentoo.org> ngrep-1.42.ebuild,
   ngrep-1.43.ebuild, ngrep-1.44.ebuild, ngrep-1.45.ebuild,
diff --git a/net-analyzer/ngrep/Manifest b/net-analyzer/ngrep/Manifest
index 92fac228e33c..06f8c7bab6bd 100644
--- a/net-analyzer/ngrep/Manifest
+++ b/net-analyzer/ngrep/Manifest
@@ -1,4 +1,5 @@
 AUX ngrep-1.42-libpcap-include.patch 6398 RMD160 1c0544ae34fdfac92cb6c5b0cef200c2a949ba41 SHA1 e4bcad415b1b2838a8c7ff05ba87a322692547db SHA256 9039bb16c7be38eccb8fb1cb7982378ea1eaef55256368a9494e520e021a2391
+AUX ngrep-1.45-Makefile.in.patch 395 RMD160 a05ea1cc784ef271d424aa0cbb695f2289f7c4d7 SHA1 f0b89b01e4a6ba60e4256f5c506cda26643dfd66 SHA256 25bc9e8de6d9396220d7c07d662b43121d2f025648c841f6b96ff3dc592b89e9
 AUX ngrep-1.45.patch 911 RMD160 24b2b968bc547f73f2c0d31e711519d8b3627fad SHA1 ba188bd25da03fd43133f03e8d417208f1d3fb03 SHA256 586349b83f9d61a8791be62b26c1ee816b20f5eaf6b8b3671c4833f730dda333
 DIST ngrep-1.42.tar.bz2 527699 RMD160 54ad8e4794d57adb26e209dd381d47d1ed5e468e SHA1 03987bc4f6344ecd0d56313f42f2c254f37ac271 SHA256 fd5a85b48613452fbfc9ce6d6e3fa3f37992731422eb2843235fbf4e02d6f1e9
 DIST ngrep-1.43.tar.bz2 447819 RMD160 6fa4c6f5e55c5021d4c9565677ea77b8f375f7f4 SHA1 879ff987839da8d155c3d529f8e4010c3a9f565e SHA256 0abe74f4ba0f5416cd1543af6eb404e808292a7b2453428adeb1dd484316a53b
@@ -7,7 +8,7 @@ DIST ngrep-1.45.tar.bz2 463361 RMD160 d4b89dfa23f6a7c65d3ccefc846362054a46605f S
 EBUILD ngrep-1.42.ebuild 857 RMD160 a93b1d14917995b099df13e0bd58c9cfab9e77d6 SHA1 2ef8f768bf119f5e8c7a957ab62f6423f53f46ba SHA256 d30fc1615884a38db908d342ccd8789e3527eb78c423d303d2d8a0869ea09d79
 EBUILD ngrep-1.43.ebuild 608 RMD160 e5e5731d07f4a43c322995be1084d89cd494c117 SHA1 142b9af42d82285d5bead684f36596a7929f6bc5 SHA256 92f5a594e486f1853e26b30b4d8fc2d63e3cc8fdd0c6a362a69bc3b850c37253
 EBUILD ngrep-1.44.ebuild 743 RMD160 0fffc657c376c5f4922d441867ba86ca6ce7336d SHA1 143f2e67b593e1aadcdb9d789bb90d1501ac31c1 SHA256 9c30e17d86be54983a608c7f64ad9a610cc9888c32c98eb5492a87973e5c0c84
-EBUILD ngrep-1.45-r1.ebuild 1054 RMD160 63f735c0e3603842e5125ea63036fcc384a29d49 SHA1 7e8fed9b074374a13825f32f84406ee11713b2dd SHA256 e6be2a88fb79a7fe31fcb20626b896f3d93c39fae9fcc28896743012f0d65c28
+EBUILD ngrep-1.45-r1.ebuild 1095 RMD160 f6c2d2af6d4d7aac1e1b9e085b5a70bfd444fc25 SHA1 36dd980eb578b83d84c7b8dc4daf7fd0cb65e20a SHA256 bc1b734668834f61fa12cdd9e5483a5be58bcad2e0664957b2e017a787b8b74c
 EBUILD ngrep-1.45.ebuild 865 RMD160 ff54887823adc58d6034e3027d797183d8383a2f SHA1 fdf1af58a848608b6607548b1a60695892a8fa2e SHA256 d6a0b5fba4cb762417a5b96e57f3701ea40032c0d58616f6e6e6a05657f037c6
-MISC ChangeLog 5381 RMD160 9794855e6bd76c313a9d02818178cecf3d5189d8 SHA1 9394cbc0809071b95b719c21d1f291212ccb9a08 SHA256 ebb38c746256f435336d55a00aad466647f395f8fe9de15afde2d23e266b1a75
+MISC ChangeLog 5535 RMD160 ba0a3b62124a49f65462434743091e30a678b2b4 SHA1 f23fc173aaa7082baeea083930c21ae9b2d37b92 SHA256 0b2fa26483d89cf132e2a4f62982267bd259fd98fddc69ad95a69b2ceca7eb4c
 MISC metadata.xml 501 RMD160 26af8f66fce54937141d226342ed7bb3101a423c SHA1 6e5cda83d6cdeaa782c830c02b12e211acea6102 SHA256 19f8270fac394a4ad440ceaef68850f7b3add04bbaee3e77170de26def82ac0d
diff --git a/net-analyzer/ngrep/files/ngrep-1.45-Makefile.in.patch b/net-analyzer/ngrep/files/ngrep-1.45-Makefile.in.patch
new file mode 100644
index 000000000000..22548545c4c2
--- /dev/null
+++ b/net-analyzer/ngrep/files/ngrep-1.45-Makefile.in.patch
@@ -0,0 +1,11 @@
+--- Makefile.in.	2006-11-28 14:35:37.000000000 +0100
++++ Makefile.in	2008-03-18 23:25:26.000000000 +0100
+@@ -63,7 +63,7 @@
+ 	rm -f config.status config.cache config.log config.h Makefile 
+ 
+ $(REGEX_OBJS): $(REGEX_OBJS:.o=.c) $(REGEX_DIR)/*.h
+-	$(MAKE) $(MAKEFLAGS) -C $(REGEX_DIR) $(notdir $(REGEX_OBJS))
++	$(MAKE) -C $(REGEX_DIR) $(notdir $(REGEX_OBJS))
+ 
+ $(OBJS): Makefile ngrep.c ngrep.h
+ 
diff --git a/net-analyzer/ngrep/ngrep-1.45-r1.ebuild b/net-analyzer/ngrep/ngrep-1.45-r1.ebuild
index 1bdcc93a3935..8abe81fd1bfa 100644
--- a/net-analyzer/ngrep/ngrep-1.45-r1.ebuild
+++ b/net-analyzer/ngrep/ngrep-1.45-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ngrep-1.45-r1.ebuild,v 1.2 2008/01/16 20:42:01 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ngrep-1.45-r1.ebuild,v 1.3 2008/03/18 23:41:49 jer Exp $
 
 inherit eutils autotools
 
@@ -22,6 +22,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${P}.patch
+	epatch "${FILESDIR}"/${P}-Makefile.in.patch
 	eautoreconf
 }