Update parallel make patch to fix bulding of emu platform.

Package-Manager: portage-2.2.0_alpha154/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 36 insertions, 10 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index ff3eefd66394..a10b58ac2290 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.246 2013/01/13 19:43:16 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.247 2013/01/19 01:51:20 floppym Exp $
+
+  19 Jan 2013; Mike Gilbert <floppym@gentoo.org>
+  files/grub-2.00-parallel-make.patch:
+  Update parallel make patch to fix bulding of emu platform.
 
   13 Jan 2013; Mike Gilbert <floppym@gentoo.org> grub-2.00-r1.ebuild:
   Fix dependency on xz-utils, reported by onox.
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 8274533c06a6..5e29b0c4eb81 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -12,7 +12,7 @@ AUX grub-2.00-config-quoting.patch 3934 SHA256 4f1bc29429a864731edf4a5a5fa53004d
 AUX grub-2.00-freebsd.patch 16465 SHA256 5464dda43bed28634e406a3b182db1d76e70059e0a3b3c276ee91ff27ca78cbd SHA512 d0fecaf83796971ef6f2cd43cab4c89faf1496d4241e249467d7839b366c616e15a8c6961d9224ed0e139d018d5d9f354cf59ddf2ef5e915a4b03e11dbdf568e WHIRLPOOL 963c61923503a57894634f0b3431e8e701a83f6514e5829f0ed91fc3c9011fa39870c319e1cbfee62341f1d37dfd0fdadcd4a028b725bb65d2f06fbedfd31166
 AUX grub-2.00-hardcoded-awk.patch 599 SHA256 438c7357a632c7c9efe406b1d7cbb2524694e68c5783b401d3dd17ae0aba6816 SHA512 f47b742b9fa4c57e36e767ace6e14318678cc429ae88cd275e07d95abbc8d3d01d831058da2f6f91662bfdfc4396aed5417198245534488359a43023459d1a1f WHIRLPOOL 17be198f854466ff8a50c5b7d46eaf7883a4ce8cbe3a89cbc0e62d75ae71e94ce863341c0650b113bbee4415220da38896da73177ab59d2b53d3bde7ec9809ba
 AUX grub-2.00-no-gets.patch 805 SHA256 054d85619905055a0ea0e5f9d27eb8c8596959598ac9a5bae7e82543c19adeaf SHA512 8b89fa40efe232474e7bb03d12542030d40fea1fe0839a9493f6704fbe6de77516b5976841bf652c7236104513f427750efc668248c71ba0ea7f676557e8c9e3 WHIRLPOOL 796a7bc4583829abd1a552f7d16d6cc4f2999707af1ae0b5231fa53e87ce22a265a35a3d0f486fcac2e74dbed5fd54e3a572186cc2ba1a849433adc021a0a65b
-AUX grub-2.00-parallel-make.patch 996 SHA256 351abb76af8469d4ecc35d55917821a2ab2e5bddc0634e6a5df85eeec34800ce SHA512 a97a5cf654c1b17918043fc6fa347f1473d5ce24280b9aedefb078abc1f43a4daacd5fc8889cf1dac46d9cf1bf755736e91745a15ac71ed01069ae76e083bd6a WHIRLPOOL 448aa705f15752071be6319314a733be120b95daeb10eaeefb2f52802f9ead3442c7b0598225c7f2d970db72b9dcfbbeb559bb00d8260dacc12363343b53e297
+AUX grub-2.00-parallel-make.patch 1907 SHA256 7d8eda92eeeeb87001bc44dd1390b96c927c45542af2984c5d80f9ca3a552362 SHA512 cc2c47858ca2fa76b081ca78b6090fe61f0b41d6aad21f07e269dd9f98355b7c148f62659418257c24aa370634060ead2c3a612aae07c6f53e9ba13a25a1d7fc WHIRLPOOL 9b5aad7db3ec5c60151984861690b64e90d6adbeb1dec4257d33873156ae6ce6ded432377520cfb9cbbbbf2f30e69e134d6dbc0007355cfa74521042500d844e
 AUX grub-2.00-tftp-endian.patch 728 SHA256 4806fb14471fe6547cb69e6fab97e66c8245654acbc4738071cf2717368de458 SHA512 8fee95b06b50f8721d7013ecf8fb954e9b1ba83f99790e165ec334dfcd41fe7655f37868069a315acd4af97d3c4466aa36e0ab5a8b767faf862f1d71f88b3252 WHIRLPOOL 53779e4952049f069824eefcaaaa0e46fc9a7036ed0f9b67008e523f618105d760300ffcd315f861de786c63de02b2753d3ed14637b39fd7af47aadd02355695
 AUX grub.conf.gentoo 627 SHA256 914b15af252210a32776196437cd8013e10e57d5780e66877ef3fe9a2b4b9776 SHA512 5ee586c151b025a153867d2854b73e2e18a6af38e9d65069b7114a55af776803ba947b4901b0806e79fa8f36aeac90daad608b9ec2a4a8526301d1beb36e4ef3 WHIRLPOOL fcaef85cd7c2c446c882874cf4ec8a2241d1fc97720973a0a0cd1add259da599d4dae4d0b429ba2dff0307ed2d4598d5939cbc1b11127a0dedb3a54249ec9f81
 AUX grub.default 1254 SHA256 181bdb7433ebcbde635e7058a1febaf0100e4e9c83ea4fd222d7010c375882d8 SHA512 1cdce5d9c606a2cba29ec859df96de9e8c292301ee3f26dff848816cda950088c0660dbd3401eec97b15841a2544116664eeda6cb0be753f6d160a7e62578dbc WHIRLPOOL 03514e95078f4f4d176e85ba3a739105a7cbf58a6c3e2ba4a2c660c48329dcc78b968391ecb2d9821084ba4ddddbe03e41d9d6c36685f1db1d4a1f00a1e5d393
@@ -60,12 +60,12 @@ EBUILD grub-1.99-r2.ebuild 8413 SHA256 13a1281843b801804a5f2dc491cd21d6ac4d068c5
 EBUILD grub-2.00-r1.ebuild 8822 SHA256 5c93f5ef579f6b711bc43f842ff07b508558604c84597366ea9fd975d6123090 SHA512 51341a08e60b21ca3bf493f23e33ab6fc9738f46bf634f7200f22b58afe3a8b74d941b0152308e3aa6378d483b822d16027ebff3a639e0efd52bbe40f99610a3 WHIRLPOOL abb7f493e834aa6118bcdec46e1867e0f8828f4ce60175c5f5c58437d009a069b5a2d0d5afee198e2b5e20aa9747265e22f991c4557be152bd49a3b7983ae967
 EBUILD grub-2.00_beta6.ebuild 7140 SHA256 8026d9d32d21863e5427cac5b641fbc5f799662437bd9a40daa3f9a377a0de68 SHA512 35b5a7aa5224ba1f0d3dabaeb03d915b86a3c16419f6ef012c8092b198e8bbc054f22e4658930f704402066622b98c67c869f0c9cf5d74637c34ae786b0861fa WHIRLPOOL 54839cae4be956d12f8c62524923e9087f76c5e2c3c7db7cca074084deba71cd870238e514227a73a1131748fac501566afe29866231b68e4bbddbf2b465a71b
 EBUILD grub-9999.ebuild 8605 SHA256 506e79cb8de178641162809a15b2656d771af197cb8bc4dbe83754ac99234cdb SHA512 3dcda4d909ab6f37e9e9db5951d4bad076b42e6a38a5e28431b7e5cd801c2c3e569966a5a16ce6031acec03a05005ac8dee1c5a12305fac88e38c3554afa68b8 WHIRLPOOL da73ca55e91e5e303e5f0254197722a0ff05ef223d5fc70305d6d215ef36879232350734b7c92851608989ae97d4e3c71bedb6e64557f2b93b98ac47655483f2
-MISC ChangeLog 47714 SHA256 4a822c4f6a72eff56d8f672879ca5fe51df1dc439823b7694b782c29a0b9454e SHA512 7271488b967dded82e797220951dc110931ac841cf79ee6ee7af874ab14ed593c1ebce79e201f36f973b20bf7dd4ef0bf241ca2e202852cee240823362f25e88 WHIRLPOOL 5d708112b0da59559ef89bff0d95caf796a65d909dfd49e8aad12a31c0d045ada1862a98d8da4f0e4dd0561c89ed485363a221aa75a8553fb7aeba5be4d24003
+MISC ChangeLog 47864 SHA256 a7595d6214b5733352e6ce9178cdb6759b7fcd8e84ac0c77cd5aa4855f72f14b SHA512 a51fd80128eb40eee5706908e597b18b57d6f2912dd1110b0edf06b0b34fbf0cdef6c29391b217c80277ede9455e25e28fa635559111581a17b6ffc310dbc9fc WHIRLPOOL 4320be6b53f545d4e576c5da15514cd7f159954bdadc4b09e4fba04f02ea0e2654e202dc9f478678af8d6a73d4c59aac52fbac2f26d9bb6b188c1d30e052e8ed
 MISC metadata.xml 673 SHA256 e14e5e46b726a3645b85217a2afbd5b04adb54990c7db837e01a50a8322d81b9 SHA512 9df3d519f0aa3e53304c956638acb927224f3ca83ba1959f089852ee7c822ca3cae99d3da0efcbfeedd99dbe630aa0b39d6f9b61d0cad8e72c155f7253c7d8cc WHIRLPOOL ed7bc1f5c8f84ef6fb18143163f239d9f47e8fd88c3fd521f625b2191349d7520bf4c6a7e6c7e3eef73a0af43faa6814e591c983cc29298bf88e7c42df3c69d2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlDzDlkACgkQC77qH+pIQ6TemwD/YCbCSCoSaimS0Nbofvg2Lz4Q
-T79BjQuOQrjaz4HPSKwA/RNGamytH7IViPeWWX0UTOaPu9vux7VsxLkm4QtO4wtr
-=tAuo
+iF4EAREIAAYFAlD5/BoACgkQC77qH+pIQ6R+hwEAxXEHLbfUrESG8HrpUP1jFKT0
+rUuO/hHJCUVCcIMdQBgA/3V3N6WR+WxyMziHf71PtsFwNNnaa4A5jEX5cFbnjKww
+=HOiN
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/files/grub-2.00-parallel-make.patch b/sys-boot/grub/files/grub-2.00-parallel-make.patch
index 8af8b36d8ff7..03d634bb6406 100644
--- a/sys-boot/grub/files/grub-2.00-parallel-make.patch
+++ b/sys-boot/grub/files/grub-2.00-parallel-make.patch
@@ -1,16 +1,38 @@
 Fix parallel make problems.
-Upstream changesets 4547, 4552.
+Upstream changesets 4547, 4552, 4578.
 --- gentpl.py
 +++ gentpl.py
-@@ -487,7 +487,7 @@
- def manpage():
+@@ -484,10 +484,10 @@
+ def installdir(default="bin"):
+     return "[+ IF installdir +][+ installdir +][+ ELSE +]" + default + "[+ ENDIF +]"
+ 
+-def manpage():
++def manpage(adddeps):
      r  = "if COND_MAN_PAGES\n"
      r += gvar_add("man_MANS", "[+ name +].[+ mansection +]\n")
 -    r += rule("[+ name +].[+ mansection +]", "[+ name +]", """
-+    r += rule("[+ name +].[+ mansection +]", "[+ name +] grub-mkconfig_lib", """
++    r += rule("[+ name +].[+ mansection +]", "[+ name +] " + adddeps, """
  chmod a+x [+ name +]
  PATH=$(builddir):$$PATH pkgdatadir=$(builddir) $(HELP2MAN) --section=[+ mansection +] -i $(top_srcdir)/docs/man/[+ name +].h2m -o $@ [+ name +]
  """)
+@@ -503,7 +503,7 @@
+     r += gvar_add("TESTS", "[+ name +]")
+     r += "[+ ELSE +]"
+     r += var_add(installdir() + "_PROGRAMS", "[+ name +]")
+-    r += "[+ IF mansection +]" + manpage() + "[+ ENDIF +]"
++    r += "[+ IF mansection +]" + manpage("") + "[+ ENDIF +]"
+     r += "[+ ENDIF +]"
+ 
+     r += var_set(cname() + "_SOURCES", platform_sources(platform))
+@@ -532,7 +532,7 @@
+     r += gvar_add ("TESTS", "[+ name +]")
+     r += "[+ ELSE +]"
+     r += var_add(installdir() + "_SCRIPTS", "[+ name +]")
+-    r += "[+ IF mansection +]" + manpage() + "[+ ENDIF +]"
++    r += "[+ IF mansection +]" + manpage("grub-mkconfig_lib") + "[+ ENDIF +]"
+     r += "[+ ENDIF +]"
+ 
+     r += rule("[+ name +]", platform_sources(platform) + " $(top_builddir)/config.status", """
 --- grub-core/Makefile.am
 +++ grub-core/Makefile.am
 @@ -63,7 +63,7 @@