Fix from Kevin Lacquement for building in parallel #185361.

Package-Manager: portage-2.1.3.7

4 files changed, 43 insertions, 14 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 4e5dba042011..03b8bea4bc3d 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.73 2007/06/24 18:11:08 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.74 2007/08/25 17:09:26 vapier Exp $
+
+  25 Aug 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/grub-1.95-build.patch, grub-1.95.ebuild:
+  Fix from Kevin Lacquement for building in parallel #185361.
 
   24 Jun 2007; Piotr Jaroszyński <peper@gentoo.org> grub-1.95.ebuild:
   (QA) Don't use KEYWORDS="-*". bug #160519.
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 0626ed40bb76..1ef6e936861e 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX grub-1.95-build.patch 522 RMD160 eec01af7250a0883604530f321b154c575b14c41 SHA1 6f93b47a212ed0b3fb807bcf96e04792fa196ba1 SHA256 26d45247376f1e42b4197088161146173ea5bee3800282a707b331c49aed6ccf
+MD5 a33affb3d7177b4b9ba783ae8151f925 files/grub-1.95-build.patch 522
+RMD160 eec01af7250a0883604530f321b154c575b14c41 files/grub-1.95-build.patch 522
+SHA256 26d45247376f1e42b4197088161146173ea5bee3800282a707b331c49aed6ccf files/grub-1.95-build.patch 522
 DIST grub-0.92-gentoo-0.2.tar.bz2 21727 RMD160 f420e3352d46fdfb77a1121879382265805bc3ef SHA1 1bb1463067679aab909d1bd96996cfa72556de81 SHA256 f579b49b2d24702905c333ce2b6170a554ce26d0232c65478a21a1fd2eb8b8fe
 DIST grub-0.92.tar.gz 877112 RMD160 97b377a542d415a73c681f2d4c2f57d28e708644 SHA1 15bd5aaa816728583235ab0d5477c1ac32855583 SHA256 197e690faed45bcbf854ab5dc591053d6f6ed1a5b8e5596c4ba27d6f0d50eb37
 DIST grub-0.94-gentoo-0.1.tar.bz2 40585 RMD160 49ddf70f7f1b3c5ac0d72408d5cfcb924df07a4c SHA1 f59333af3d4fc7b8d77c876ef956681f7cc335cb SHA256 6f5ac30e0495917cd062c48568bab582f68f288bb3fe4fb968869fdefcd012e3
@@ -47,14 +51,14 @@ EBUILD grub-0.97.ebuild 4518 RMD160 d03dba427b2b040e2b741776a849c4f030793af2 SHA
 MD5 98aac6dc17a7d909ca1de859ef1394a2 grub-0.97.ebuild 4518
 RMD160 d03dba427b2b040e2b741776a849c4f030793af2 grub-0.97.ebuild 4518
 SHA256 7e8e3cd6a5e43507955850ae5d33aaecfb853d8573e54aca5b75b63de7bf48e6 grub-0.97.ebuild 4518
-EBUILD grub-1.95.ebuild 941 RMD160 baaf5ec214a168d54951740f5dd27c0805290281 SHA1 0f6f5f3534145512f3b7fda9380882e571bbfcae SHA256 0f1aa818ff7489e8afbdc294b35476eae78e2f8c38450eb2f48dde6e84151b42
-MD5 4149035818c5cf3cc8330bbcd2a0a03f grub-1.95.ebuild 941
-RMD160 baaf5ec214a168d54951740f5dd27c0805290281 grub-1.95.ebuild 941
-SHA256 0f1aa818ff7489e8afbdc294b35476eae78e2f8c38450eb2f48dde6e84151b42 grub-1.95.ebuild 941
-MISC ChangeLog 18509 RMD160 6c218673a4b6d42ced1fff59754625806fad66f5 SHA1 408d3f9783cd5431dc9acf759e40cb7ec5da4624 SHA256 e02af613b228f078bfe59762899d87f4934e44fc49f5180fdfeb2ac400e18b60
-MD5 5cb79e980a5f403ac093921628c74611 ChangeLog 18509
-RMD160 6c218673a4b6d42ced1fff59754625806fad66f5 ChangeLog 18509
-SHA256 e02af613b228f078bfe59762899d87f4934e44fc49f5180fdfeb2ac400e18b60 ChangeLog 18509
+EBUILD grub-1.95.ebuild 1031 RMD160 1c23cad81706afa0c26f307728afd0241d4fed4e SHA1 ae977cab016f00866c6e689a9178fe7f58512302 SHA256 42be6335ab4b98d3b35db28f0e984730c7f026c2d54db13f838d4c55db6658f8
+MD5 4fe1f049829bad9f234f332de205bf4a grub-1.95.ebuild 1031
+RMD160 1c23cad81706afa0c26f307728afd0241d4fed4e grub-1.95.ebuild 1031
+SHA256 42be6335ab4b98d3b35db28f0e984730c7f026c2d54db13f838d4c55db6658f8 grub-1.95.ebuild 1031
+MISC ChangeLog 18673 RMD160 6baa914411f119328b3b39f84a3123ec6f894ac7 SHA1 63f92f450f2907fa289ff90c7ee0ed31a35e0b7f SHA256 b1194ba33d166b7ffdcbd091d8235d74af9a584814f75559f2e225c6ebe671ca
+MD5 08c6227eecc49df4198d3ff0da8990bf ChangeLog 18673
+RMD160 6baa914411f119328b3b39f84a3123ec6f894ac7 ChangeLog 18673
+SHA256 b1194ba33d166b7ffdcbd091d8235d74af9a584814f75559f2e225c6ebe671ca ChangeLog 18673
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -87,9 +91,9 @@ MD5 5b751b3561077f157fe7ce25daceaa3f files/digest-grub-1.95 229
 RMD160 85c7f6ef9d260dfe9049ed77c2d473086548e969 files/digest-grub-1.95 229
 SHA256 fe0d1d73c9724dd4653eb68231878133e6d00f1e33bb3f38dc73c249efa02631 files/digest-grub-1.95 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFGfrPAppoStNGKGywRAspcAKC4jy0jP84PaOi1iL0jOSgU5NqYEwCZARYk
-FqyVAC+GGi8uakunULcIHss=
-=B7U3
+iD8DBQFG0GKYp/wUKkr7RBoRAh0rAJwOURR/9RZtRzOTmFaAGz2AtjIjCQCgmaah
+LRpGhbnudg5Jeqr5lZiHmOc=
+=0DeW
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/files/grub-1.95-build.patch b/sys-boot/grub/files/grub-1.95-build.patch
new file mode 100644
index 000000000000..fff11a5cbb07
--- /dev/null
+++ b/sys-boot/grub/files/grub-1.95-build.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/185361
+
+fix building in parallel
+
+--- grub-1.95/conf/i386-pc.mk
++++ grub-1.95/conf/i386-pc.mk
+@@ -739,7 +739,7 @@
+ 	$(CC) -Iutil -I$(srcdir)/util $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_emu_CFLAGS) -MD -c -o $@ $<
+ -include grub_emu-util_console.d
+ 
+-grub_emu-util_grub_emu.o: util/grub-emu.c
++grub_emu-util_grub_emu.o: util/grub-emu.c grub_modules_init.h
+ 	$(CC) -Iutil -I$(srcdir)/util $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_emu_CFLAGS) -MD -c -o $@ $<
+ -include grub_emu-util_grub_emu.d
+ 
diff --git a/sys-boot/grub/grub-1.95.ebuild b/sys-boot/grub/grub-1.95.ebuild
index def487ed4bad..f6f394f1b550 100644
--- a/sys-boot/grub/grub-1.95.ebuild
+++ b/sys-boot/grub/grub-1.95.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.95.ebuild,v 1.2 2007/06/24 18:11:08 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.95.ebuild,v 1.3 2007/08/25 17:09:26 vapier Exp $
 
 inherit mount-boot eutils flag-o-matic toolchain-funcs
 
@@ -18,6 +18,12 @@ DEPEND=">=sys-libs/ncurses-5.2-r5
 	dev-libs/lzo"
 PROVIDE="virtual/bootloader"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build.patch #185361
+}
+
 src_compile() {
 	use amd64 && multilib_toolchain_setup x86
 	use custom-cflags || unset CFLAGS LDFLAGS