Fix parallel make (bug #363199).

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

4 files changed, 45 insertions, 7 deletions

diff --git a/net-wireless/aircrack-ng/ChangeLog b/net-wireless/aircrack-ng/ChangeLog
index d4d468d9710f..3bb160048a8f 100644
--- a/net-wireless/aircrack-ng/ChangeLog
+++ b/net-wireless/aircrack-ng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/aircrack-ng
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/ChangeLog,v 1.59 2010/10/17 23:38:42 jer Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/ChangeLog,v 1.60 2012/06/29 14:47:55 flameeyes Exp $
+
+  29 Jun 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/aircrack-ng-1.1-parallelmake.patch, aircrack-ng-1.1.ebuild:
+  Fix parallel make (bug #363199).
 
   17 Oct 2010; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Herds are not the same thing as maintainers.
@@ -260,4 +264,3 @@
   18 Apr 2006; Marcelo Goes <vanquirius@gentoo.org> +metadata.xml,
   +aircrack-ng-0.4.ebuild:
   Initial commit for bug 127210. Thanks to <cygeus at gmail dot com>.
-
diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index ac8e98c2f01a..466a0f6bf3b6 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX aircrack-ng-1.0_rc2-freebsd.patch 3062 RMD160 4aa58a0f661f308444fc59a9c36fc32fe6e5514e SHA1 9fb261f4db2418b21c3327d1eca28e557c83887f SHA256 1376eff217f6577865d1425c85f50fd7eb054a2749ebefb8e11bed1065507a7a
 AUX aircrack-ng-1.0_rc3-respect_LDFLAGS.patch 3124 RMD160 7fdc53adcc92067fe275d8cf178c7ee70e960fff SHA1 9a389fe635dca311a707ce5fc516185645eff81a SHA256 cfcf81b63bd31983ade18a350ceda2ad10b8ad4362a1f9380798a94ab4191d75
 AUX aircrack-ng-1.0_rc4-fix_build.patch 347 RMD160 54c747a9f46804f9380c62beb26e66d459934104 SHA1 12ec12e38d81817caf0c9abbe95e9c21e3cc2092 SHA256 f71f8b670335e352b2165128098e19646ae41a1848aa048aa9b58fbe65651b64
+AUX aircrack-ng-1.1-parallelmake.patch 368 RMD160 faec0ea7b9c4595ce725d47e8f5a422079b32c37 SHA1 879093c5a900b2ff20dd770b1ca3b0740fcffcdc SHA256 c2b9cdcfb52428863fc9a1a2c3feef9266218b3cb4cf44fa37b3df9169f4c1cc
 AUX aircrack-ng-1.1-respect_LDFLAGS.patch 3144 RMD160 322ec5d7592236f30456226de5cf433dde00deef SHA1 b73ef91057609910782fdd1581c0f7f8e8e6d47f SHA256 543d8efee610cd32874abb0ebc7371619526613ed04fa70db35d1caf473efff8
 AUX process-group-leader.c 373 RMD160 2ce7341f5a58d2223590f1edfbcd1230a909024b SHA1 4653e2329b901dbb96f1380b478ea1de63d2a08b SHA256 153666625e942384648dafedbc8f37577fdf6a24060b04237913fd7f693f7bf7
 DIST aircrack-ng-0.9.3.tar.gz 1031441 RMD160 29c7d454da26167fb24e5a0f2b6eeeddc98e697d SHA1 b2f671324d056408b83d32eb1ab6061b7fa87ac5 SHA256 71bca53eae0261d5bdd72e4363f43f5a6e40b2375dc4852a4029a061c789da58
@@ -8,6 +12,17 @@ DIST aircrack-ng-1.0.tar.gz 1506412 RMD160 e8360aabbec1e7e038f86579e1004234f0899
 DIST aircrack-ng-1.1.tar.gz 1453272 RMD160 7d70533b0397e801d4a85c1be3584699364f3d38 SHA1 16eed1a8cf06eb8274ae382150b56589b23adf77 SHA256 b136b549b7d2a2751c21793100075ea43b28de9af4c1969508bb95bcc92224ad
 EBUILD aircrack-ng-0.9.3.ebuild 1331 RMD160 c4ee2d1098341aa83a51756279aa7633be1827af SHA1 0366fdddc409b013078a43d3861391aecc1404e9 SHA256 7c02727963d713fbdc18c8181bfc06a161488909e4777e653882a49ccb6c9958
 EBUILD aircrack-ng-1.0.ebuild 2202 RMD160 3d51fccb9c30d215c542b60f9ec893f7639037cc SHA1 64319e4063361e3003fb2bed14b8b5b3945db389 SHA256 b1ab820335a0cc958782098de56035953420add11453ca0be65f99bfb65d6633
-EBUILD aircrack-ng-1.1.ebuild 2207 RMD160 af72fb14ebe554d84bd835f335004bdf14470b8a SHA1 662f18b08be58fb677f29492e82ff79a269a8fc6 SHA256 b129000c2520ccaff54a6494c54942bfdfbd62f65cd5aaafa7ebc4df21a737ca
-MISC ChangeLog 9018 RMD160 c3261ff56261b98a81bf52411c039fa517a5442e SHA1 e0c92bdc411d0f2604e8b1394a6903ddf9231609 SHA256 56d9737a82381ff89ac325afce9ea3ebd13468dbb22db30ca14523f007c8dd14
+EBUILD aircrack-ng-1.1.ebuild 2254 RMD160 c575aecaaa250a370d4ff190fb35105d5423e04f SHA1 82edea4156d44a39dbfde9142735c1d642d12a21 SHA256 5069e4addd7bbeeadb145048d51b26a5864cb3c98c9c2c3ff903e854c018871b
+MISC ChangeLog 9184 RMD160 ff4eff15f505650e577c793871a1e73fed62f26f SHA1 7cd95ed13d2456f2a4c5cbcf9fd219e6d0d5eeb5 SHA256 2936c70b0e9e693c728856b7225895f849e275d4795887c72fd1b7b0459b9bfa
 MISC metadata.xml 383 RMD160 74a752d78c8ddd0d2604503a10c675c502ce36d5 SHA1 c07bca928304e54206dbb8811c4e2732d3747e55 SHA256 f945252d97eaa6d1eca42f82f90066a93276fea4808fda5fd6e1504b3b950f9d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJP7cAlAAoJEBzRPIrUMBNCUkYH/1Zv8lIIG39t/vTjiNkljLmV
+0z5aX6XB6EO4KwctkGrZD5+rbaUHTB2y1Y3qxae6/KM5jLvzwPAlFotRlQ63/TBR
++Za94ZClqEHLCQnzNg+EUj6vmcsb2TaLcNp94RsiRv1kFJLbqJTjZOS4yXE/88qP
+LABSLwtrzkKa2nsiM2to0AYj+kypxqbFrWdfbJDBKUMPl0YdEJSzXU0Ty+ZF995C
+h+3DyoWdH/XDvb2nYmG9jSKUCJ5+QoWadnQz8BRIkL8dMcbN/B3ZCIWXek2QB+hm
+re8+cZeNQkGxZoeDxUaxyOY72Ug91Y1fO3s7jSCkvTgQo9SSndm+a7ivQfXm5eM=
+=ntDM
+-----END PGP SIGNATURE-----
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.1.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.1.ebuild
index d38ff51bd190..879ab95fbcb4 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.1.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-1.1.ebuild,v 1.1 2010/04/29 21:12:40 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-1.1.ebuild,v 1.2 2012/06/29 14:47:55 flameeyes Exp $
 
 EAPI="3"
 
@@ -36,6 +36,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}/${P}-respect_LDFLAGS.patch"
 	epatch "${FILESDIR}/${PN}-1.0_rc4-fix_build.patch"
+	epatch "${FILESDIR}/${P}-parallelmake.patch"
 }
 
 src_compile() {
diff --git a/net-wireless/aircrack-ng/files/aircrack-ng-1.1-parallelmake.patch b/net-wireless/aircrack-ng/files/aircrack-ng-1.1-parallelmake.patch
new file mode 100644
index 000000000000..eb5774abd949
--- /dev/null
+++ b/net-wireless/aircrack-ng/files/aircrack-ng-1.1-parallelmake.patch
@@ -0,0 +1,19 @@
+Index: aircrack-ng-1.1/src/Makefile
+===================================================================
+--- aircrack-ng-1.1/src/Makefile.orig
++++ aircrack-ng-1.1/src/Makefile
+@@ -114,13 +114,10 @@ else
+ 	endif
+ endif
+ 
+-all: osd userland $(SBINFILES)
++all: userland $(SBINFILES)
+ 
+ userland: $(BINFILES)
+ 
+-osd:
+-	$(MAKE) -C $(OSD)
+-
+ $(LIBOSD):
+ 	$(MAKE) -C $(OSD)
+