Fix parallel build failures #260005 by Gilles Dartiguelongue.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 43 insertions, 7 deletions

diff --git a/sys-fs/xfsprogs/ChangeLog b/sys-fs/xfsprogs/ChangeLog
index e538874f5ebe..5ccd6644de34 100644
--- a/sys-fs/xfsprogs/ChangeLog
+++ b/sys-fs/xfsprogs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/xfsprogs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.114 2009/02/24 03:49:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.115 2009/02/24 05:11:32 vapier Exp $
+
+  24 Feb 2009; Mike Frysinger <vapier@gentoo.org>
+  +files/xfsprogs-3.0.0-parallel-build.patch, xfsprogs-3.0.0.ebuild:
+  Fix parallel build failures #260005 by Gilles Dartiguelongue.
 
   24 Feb 2009; Mike Frysinger <vapier@gentoo.org> xfsprogs-3.0.0.ebuild:
   Apply blocker as some binaries have moved from xfsdump to xfsprogs #259966
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index b72511b9d85d..774435f5b2e5 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -4,18 +4,19 @@ Hash: SHA1
 AUX xfsprogs-2.10.1-headers.patch 185 RMD160 74ac7ac38b5f5a8b2b303495d85414029a908630 SHA1 13a793d7382273918599066667672a2c75d155bd SHA256 3adf0282b07533e0bec9d4789f650ab5c700d5fb3a937a276d10021014c5011f
 AUX xfsprogs-2.10.1-parallelmake.patch 755 RMD160 cc4a37bc62b9b190982200d0aa34568bc1caaa86 SHA1 f20e87d5094e65193a264ba0cbe628505e9461c8 SHA256 0f973731856e95e645eba9ddea2978c97cab8714242ac1dffa1a569934dc07e2
 AUX xfsprogs-2.8.18-symlinks.patch 339 RMD160 8e2026b0b5c8be70dfcaba94f53ac9211ac6b1a2 SHA1 d7b9387d71556e18ebd6f65fd3a52bc323162844 SHA256 e1b168babbce2e4e18757827b6f53248408fa299ea345def0fb650b8f79f2d16
+AUX xfsprogs-3.0.0-parallel-build.patch 884 RMD160 8421d1817db6fe00562772fd0026c2fc20f76682 SHA1 a2009c0f03baa6717b544c9317511bead0cc0881 SHA256 fde2124871cd690d9da10cbc3e9c28c56ff2c982e448bf8b0864ebe80a9a7925
 DIST xfsprogs-3.0.0.tar.gz 975597 RMD160 2b8d55571340e0aaedbc1e4327f7296ef89a4a3f SHA1 b0054e309ed15972ab7d90096789f1c2cb958b96 SHA256 d7a3e8e6919859c9bb5a6786ecafc3183d2d64ca3935d0cff6fdc66c40503396
 DIST xfsprogs_2.10.1-1.tar.gz 1005228 RMD160 c68bd6eeaca88a94ee0898bef15c1d6b8d624539 SHA1 10cea2e56d202990a621a9b5b80061abab3aeb37 SHA256 2c0b17e594729b5b77d1ca90b4fa7e4a4da751324736fdb3a0c742252f929c0a
 DIST xfsprogs_2.10.2-1.tar.gz 1004686 RMD160 8877f36d16ec236bf826aa3e84a9413bfed3fbdc SHA1 86e5a42a21b0ba78638e16b75d99dadc49e97cce SHA256 220a9911153f9b51d4417188ee751d2ee2e1f112427e52402d05b46f235763cf
 EBUILD xfsprogs-2.10.1.ebuild 1701 RMD160 d22ebed4348bce617bb776f16613bce7efbaf28a SHA1 765fcfc43fc2801595bfc7e01814bca1075e14ae SHA256 2cd933911eea6a6879830d8f818b4db8ed306ae2f63f6333e22cb3dc14a5cd0a
 EBUILD xfsprogs-2.10.2.ebuild 1781 RMD160 cd515a142ab9f62b1ab6a06b75f667ce434ea6ca SHA1 d0067e51a542edf0c9c97123378f707371d1c149 SHA256 1826e5b932b4a5a34707e47af4b1794872e0bf7c6fe8e12f6b1ff85e723c49e1
-EBUILD xfsprogs-3.0.0.ebuild 1269 RMD160 fe86e0cb9c197eecd4f5eb524eb7ec1e148c509a SHA1 ac801b82d837118925ab2caae753d7864aebe53d SHA256 08744967cfeeedbc04a520dd22737bddcce2ca6ebdc9f730ef1e3b7fea58028a
-MISC ChangeLog 17997 RMD160 fd43f5e456308e4510a1b7bf820494d71ef579f4 SHA1 a4f1e3be4c80a3454bd748ebc0409e69405bef71 SHA256 3c065bd167d3eea4b6694bcd15422f25cf5457ec76c8cefed4e33f88e63f28d0
+EBUILD xfsprogs-3.0.0.ebuild 1325 RMD160 2d32d671cc4bd9a1206c658b045646e30958420c SHA1 0cd586c40a4bda93910ec597fae06203bbc53940 SHA256 4bde79cb29ef148f72463c7f355754be5e667c63f8187560e2732b1a55277373
+MISC ChangeLog 18181 RMD160 4229514232ab11ed5f537cfd71aa3dfb7752544a SHA1 96e14dcaa509dcb614a25f2ee2c58f4c9e7f2a44 SHA256 d348f7f255fa98664851c6e43154102089f8fed061843a20cfb21c21d6d6f8ad
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmjblQACgkQn/5bYzqsSmEHTgCfSvbHToNdN2ukX8SE011B1l7l
-8AEAnjWJ9L7Qsw2BjecDvpigFhH3NQTO
-=CC71
+iEYEARECAAYFAkmjgYoACgkQn/5bYzqsSmF+kACeJIlkCQIG/ECr46EeEzTxBLTZ
+HqUAoIFUpOjfEc4WCbZVYSFCGeGIE1nu
+=niET
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/xfsprogs/files/xfsprogs-3.0.0-parallel-build.patch b/sys-fs/xfsprogs/files/xfsprogs-3.0.0-parallel-build.patch
new file mode 100644
index 000000000000..612719b35aa6
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-3.0.0-parallel-build.patch
@@ -0,0 +1,30 @@
+http://bugs.gentoo.org/260005
+
+--- a/Makefile
++++ b/Makefile
+@@ -15,11 +15,11 @@
+ LDIRT = config.log .dep config.status config.cache confdefs.h conftest* \
+ 	Logs/* built .census install.* install-dev.* *.gz
+ 
+-LIB_SUBDIRS = include libxfs libxlog libxcmd libhandle libdisk
++LIB_SUBDIRS = libxfs libxlog libxcmd libhandle libdisk
+ TOOL_SUBDIRS = copy db estimate fsck fsr growfs io logprint mkfs quota \
+ 		mdrestore repair rtcp m4 man doc po debian build
+ 
+-SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS)
++SUBDIRS = include $(LIB_SUBDIRS) $(TOOL_SUBDIRS)
+ 
+ default: include/builddefs include/platform_defs.h
+ ifeq ($(HAVE_BUILDDEFS), no)
+@@ -29,9 +29,10 @@
+ endif
+ 
+ # tool/lib dependencies
+-libxcmd: include
++$(LIB_SUBDIRS) $(TOOL_SUBDIRS): include
+ copy mdrestore: libxfs
+ db logprint: libxfs libxlog
++fsr: libhandle
+ growfs: libxfs libxcmd
+ io: libxcmd libhandle
+ mkfs: libxfs libdisk
diff --git a/sys-fs/xfsprogs/xfsprogs-3.0.0.ebuild b/sys-fs/xfsprogs/xfsprogs-3.0.0.ebuild
index 6baa0b83e69a..5388bdadfb69 100644
--- a/sys-fs/xfsprogs/xfsprogs-3.0.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.0.0.ebuild,v 1.3 2009/02/24 03:49:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.0.0.ebuild,v 1.4 2009/02/24 05:11:32 vapier Exp $
 
 inherit eutils toolchain-funcs autotools
 
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-parallel-build.patch #260005
 	sed -i \
 		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
 		include/builddefs.in \