sys-fs/aufs3: Allow parallel build, patch sent upstream

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

4 files changed, 40 insertions, 12 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 9dd06cee5865..c87f8e317c75 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/aufs3
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.10 2012/04/23 15:47:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.11 2012/04/28 06:59:11 jlec Exp $
+
+  28 Apr 2012; Justin Lecher <jlec@gentoo.org> aufs3-3_p20120402.ebuild,
+  +files/parallel.patch:
+  Allow parallel build, patch sent upstream
 
   23 Apr 2012; Agostino Sarubbo <ago@gentoo.org> aufs3-3_p20120109.ebuild:
   Stable for amd64, wrt bug #407991
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 39f09c933b5d..80a85bba8b4f 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -13,6 +13,7 @@ AUX aufs3-standalone-1.patch 7510 RMD160 d227bb98522a39317f7e573f2667625282978af
 AUX aufs3-standalone-2.patch 7722 RMD160 2199a16b50fa785798dc92a139ca010d75965a6e SHA1 e6a2434c50855e41d899698c0519cfa7c7b3d837 SHA256 eb7f414f2a9f07e09c2c0eae9972b21a51ada5718a17e978aea1f39dd32bb0b3
 AUX aufs3-standalone-3.patch 7671 RMD160 4487131557b3e34cf06bba6642b4aab3e397e611 SHA1 3b91044c58416cd24123ac5d767a66e7e1535559 SHA256 e450fa66ebf041d10db5a594c87f83e47a39e29f6054310d6e56b44e31ad0971
 AUX aufs3-standalone-x-rcN.patch 7675 RMD160 b37485d763562e9a97e0ce8861ee7bfc0bae3e5b SHA1 770303ea353ee43affe46e8bbade825bd861020b SHA256 12c0003bbad1d6c1032fcd52c65baa7a34c5db4b5be4b0510d340397552b22a1
+AUX parallel.patch 725 RMD160 45b54727f87723174884d19adb708f3983afb44f SHA1 15022c8d1570be2281845b7a9abe664f80258728 SHA256 99f93cffb09a0d2ab14fb9cb68fea0f8e87d34d681db642a8a375e045853d8a6
 AUX pax.patch 4821 RMD160 9576b969b6c5d893b40c76e4bb297a34bcbf13e9 SHA1 bd06819d7b01959a8ed5756c78d29255923287c6 SHA256 c82946d79fd3826803aacf5533aa398c8c7e7516a0c8c88a56aa75e27af3c7ad
 DIST aufs3-3_p20110815.tar.xz 391672 RMD160 f99b997401f1d983cb46ceb355445b94e6103c56 SHA1 f1d91e872cc75ee8bb76f6f4a08ddbe3c3a9c6b8 SHA256 e7d71097ba949c9a42b726f0e13ada8bed41f3630a4749f46a0eb7823851e337
 DIST aufs3-3_p20111031.tar.xz 432796 RMD160 1321f3233578ac563d998fac5430b78e0c74eab3 SHA1 18c5244bb3ca28babd09a6350df42bc53a3a8bd0 SHA256 c9d9332fe9fab6c8cdadfa890591ef872cdf68ea1091cbaf60e79cdfb2113355
@@ -29,17 +30,13 @@ EBUILD aufs3-3_p20111205-r1.ebuild 4613 RMD160 0cbca3ae3b89b66f57e97597ffb050e72
 EBUILD aufs3-3_p20120109.ebuild 4608 RMD160 84517649d68cce81de291ee3a4dea959aad4705c SHA1 8c2539eea1d91bd5cbfb99204efd64552bd938d7 SHA256 97a0cbf4548420061f08fe13678bb4e82723833d9d063ca6404fb448ecf15542
 EBUILD aufs3-3_p20120319.ebuild 4486 RMD160 86910cd1b5d7af00f676224cb9309454c7b27165 SHA1 62c2f309d735862bd4c53f6acb086edb75e9da32 SHA256 5b6b41eff4a94ce64866e85c35981992abf768948304e7907efab80961f9b495
 EBUILD aufs3-3_p20120329.ebuild 4486 RMD160 49d3edb3d2f9036859ca4e1d0a944377570b445f SHA1 218d777e311ec20253a14beaa3a16a3c6bc79922 SHA256 803b3700ab3b596488cb57b845411f8b07070f4b02ee600ba76bd38224b30480
-EBUILD aufs3-3_p20120402.ebuild 4486 RMD160 3477cf6dbdd44ec8bd1f6c75b853c798fd3a085c SHA1 5f0d8927b6b994c59d8bac35dba323666eafd69f SHA256 7da9d211f06e06c207c210a91da2cd6d47e0fe43fc9342ce3dfce7dbc571761a
-MISC ChangeLog 3085 RMD160 16d47353d58f5f729d269aa9c360eb2dd88e3e7e SHA1 941d4820f068eca56f0e42a93cc4c94889f180e2 SHA256 2f0b37b8e65c49acd3cb725ff89658c8ba0ab3657c1e42a42545f24c7c7a76df
+EBUILD aufs3-3_p20120402.ebuild 4524 RMD160 0f3b4a9e3cc9a4b85e689ab273c16a87a9c08cc7 SHA1 d262aaffef644ec046abc3a1ff1f71a8b57902c4 SHA256 9503195e3b11928ff3d19871f6d619dc0e21ec534507d2d41d0dc0287d618f76
+MISC ChangeLog 3229 RMD160 e261b1d337ec4aafadf63de0f9b93fde03a1296b SHA1 c3453ed711356f3f108766d4fc794e3cc58b2689 SHA256 a3aaaeb41928b8a6fde69b3aeea17516428cac1190af8d82927666290e410158
 MISC metadata.xml 758 RMD160 f05821007d4e2f7d58dd9b3c8aac840f85ddb9dc SHA1 988f050899dfed3593cc5d3f65caa02275c4bdb9 SHA256 7107603a0759e5737aa5d9b674155f39b79695c4f582df4976b825be5e7b5536
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPlXmbAAoJEOTDgjZ80txd2McH/i8XeFJgthqqSb7mpEkUbLba
-oMlNLx1g5RXN2aiB9I0RLg++daleHZxtHKnKxLOCeIlxnQ3K4GB92oPsshIrCI1d
-1dgg3nMQZPBBXH4kjTDnZvb401UpBck7N+cvMsBNgec5Pcrfy36hULL965+7xqX/
-gYdhhnbopzezmcFOehdfFAZRf5j3xo8Is5mEPdXha1Iyffa6U0sEz9TdPz6RVfIH
-Ze+m07kj0Uyd0fsPQf6Chp/fxHBCfzQ97YWeq22/GHxi3QiUAzT5/4YxW6wPQzP+
-t5EzPmzujn++yE5BkehMvGOvoOPw+V9k3VRp7jcZAx6ravTXG4CwnjUkCYVSgzs=
-=Enqj
+iEYEAREKAAYFAk+blUQACgkQgAnW8HDreRYmxwCgyzrjqw4WZvuChJy5ZgwJ4WQL
+EwUAoL60hpSV9kxuXtg+MPep4IhU421/
+=nW1V
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20120402.ebuild b/sys-fs/aufs3/aufs3-3_p20120402.ebuild
index 8081ebf32d2d..b29eeb5bb162 100644
--- a/sys-fs/aufs3/aufs3-3_p20120402.ebuild
+++ b/sys-fs/aufs3/aufs3-3_p20120402.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20120402.ebuild,v 1.1 2012/04/02 07:21:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20120402.ebuild,v 1.2 2012/04/28 06:59:11 jlec Exp $
 
 EAPI=4
 
@@ -111,6 +111,8 @@ src_prepare() {
 	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
 	sed -i "s:__user::g" include/linux/aufs_type.h || die
 
+	epatch "${FILESDIR}"/parallel.patch
+
 	cd "${WORKDIR}"/${PN/3}-util
 
 	einfo "Using for utils building branch ${util_branch}"
diff --git a/sys-fs/aufs3/files/parallel.patch b/sys-fs/aufs3/files/parallel.patch
new file mode 100644
index 000000000000..6923ea7ebd37
--- /dev/null
+++ b/sys-fs/aufs3/files/parallel.patch
@@ -0,0 +1,25 @@
+ Makefile |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 9031813..94329c0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -18,7 +18,7 @@ export CONFIG_AUFS_FS
+ EXTRA_CFLAGS := -I${CURDIR}/include
+ EXTRA_CFLAGS += ${AUFS_DEF_CONFIG}
+ 
+-MakeMod = ${MAKE} -C ${KDIR} M=${CURDIR}/fs/aufs EXTRA_CFLAGS="${EXTRA_CFLAGS}"
++MakeMod = -C ${KDIR} M=${CURDIR}/fs/aufs EXTRA_CFLAGS="${EXTRA_CFLAGS}"
+ 
+ all: aufs.ko usr/include/linux/aufs_type.h
+ 
+@@ -39,7 +39,7 @@ aufs.ko: fs/aufs/aufs.ko
+ 
+ fs/aufs/aufs.ko:
+ 	@echo ${EXTRA_CFLAGS}
+-	${MakeMod} modules
++	${MAKE} ${MakeMod} modules
+ 
+ usr/include/linux/aufs_type.h: d = $(shell echo ${CURDIR} | cut -c2-)
+ usr/include/linux/aufs_type.h: