Fix parallel make, bug #210939

Package-Manager: portage-2.1.4.4

4 files changed, 24 insertions, 7 deletions

diff --git a/x11-wm/sawfish/ChangeLog b/x11-wm/sawfish/ChangeLog
index 21633037d752..062d3ca159ba 100644
--- a/x11-wm/sawfish/ChangeLog
+++ b/x11-wm/sawfish/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/sawfish
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.82 2008/02/19 18:52:21 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.83 2008/02/21 18:57:16 truedfx Exp $
+
+  21 Feb 2008; Harald van Dijk <truedfx@gentoo.org>
+  +files/sawfish-1.3.3-parallel-make.patch, sawfish-1.3.3.ebuild:
+  Fix parallel make, bug #210939
 
 *sawfish-1.3.3 (19 Feb 2008)
 
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index 15a5919fb7a3..75ef6787dac2 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -4,21 +4,22 @@ Hash: SHA1
 AUX libtool.patch 798 RMD160 ce31c467c17f0106abee438271f723c888eec641 SHA1 8a0647bdd8db1256464f61e76f2deafd7b546ef3 SHA256 5d2a78d80ce22591c930353be21e359c542d6b241700efac5a38c1c41864c9c2
 AUX sawfish-1.3-shading.patch 1198 RMD160 0edaccf2e826962cf47cbbf875a0b83a9d853fae SHA1 7b024a2791f9c6495746fd46ebc751665016ac16 SHA256 a077e71282a4b5a2cddc7555396e8ba2d84fbe9165269009816a318709b7f94d
 AUX sawfish-1.3-state-below.patch 403 RMD160 2ce7541bd8abafd778f55231a9ca4c52dc112798 SHA1 8c55d8e015905f0d15d790dfd5bfa6b9a68a0bb1 SHA256 0aaca4e9095283ae21be489eb0b8a4af687f907c13db5bcc8c81d2e61cdc941d
+AUX sawfish-1.3.3-parallel-make.patch 285 RMD160 82a87c1941809d57f266568e67e09568ea6f6a3f SHA1 94ab12d982fe219a443ce427e27dee0f591a9a20 SHA256 18e8115f21a1e26cf4a29b70f720182eb64132818e16b167aca515e9629ecd82
 AUX sawfish-configure-warning.patch 664 RMD160 8f3b97f097b0b7fabbe423e6a50a115609e63089 SHA1 64d4e85232e70a6a776ba3c2e4539ab969920869 SHA256 f066854fc4f7f5f2eeea5326823dc5c378149a27061e1fc79c8d077b57625ffc
 AUX sawfish-kde-menus.patch 635 RMD160 f390016c0d7908c6f603f77fc62154a537a024fb SHA1 cec207f6c39219d50cb5a1a5482962ced81389ff SHA256 7d6aa665ca40834897de6bc52ff4b1818e2a3fe522a8f4529d6746e761a59c40
 AUX sawfish-xft-menu-utf8.patch 6130 RMD160 6ae34f6fd972ddaf7057e363ad7a55bbf2717241 SHA1 34f750cffc90561761937bb888f565e86aaf1bbe SHA256 2cc54204aa4027cfe0161394e4e486f58c33fec49fc0f6fea33b95ce8503c271
 DIST sawfish-1.3.20050816.tar.bz2 1145082 RMD160 e15e222baa1f1f52f085f4658abc3d8a37d6c8e8 SHA1 a53222bbbd84557c66644a3767f724952ed9730c SHA256 2b4954f1605e985dba5d71fafd57c4d2914bd7e0b19941c3b937915772fc98f3
 DIST sawfish-1.3.20060816.tar.bz2 1172610 RMD160 a4f02524f398c5de8e09e6148621dd42aca90a7d SHA1 9192dbbf43d785ed2978c3de05236dfced097485 SHA256 81672a37c0e1a27ef14588808bb005c155876c3d4394f1edc251ceaa300d2798
 DIST sawfish-1.3.3.tar.gz 1805122 RMD160 82f11163013c711559fe48e51a85ff9926086faf SHA1 3a77267cc8a2032a5a0810070b2a200fe4961250 SHA256 3040baecd4a521f02067fef5de9e4e03f4eeb95ce2d29dfdabbdca62ccfedb30
-EBUILD sawfish-1.3.3.ebuild 2632 RMD160 242314c566fffef0d2b9e12d9132e24391ed5fc7 SHA1 eeaca24a99af5c36c4cc15456233df68e27d1948 SHA256 7129893ec1d2ca4c27cdbc4d213747089ee6563f1f4ecef4c0a11d092930d4b6
+EBUILD sawfish-1.3.3.ebuild 2679 RMD160 925568fd5207d57ef8fd8e3810c84c2fd8364058 SHA1 a835634730824409d5368ac919a3e7eb8d9cb3b9 SHA256 2a664d62956e430597d2f325a0a68f4b522a00a0f0cfff62bb5ba086d06b9530
 EBUILD sawfish-1.3_p20050816-r1.ebuild 2833 RMD160 8f28e3c634533e8c6bdbb3f6611c7a9cbaea6d99 SHA1 ad84815e8f40578c9b564a1ff0b7f8d26fb4d09a SHA256 47ff018f25111d45f06b4940d5fe2f8b8fb7e2a0358d120bd80f375431b1bc71
 EBUILD sawfish-1.3_p20060816.ebuild 2952 RMD160 64e7dc34070e1e1923ed02c8cf3655530fb2d858 SHA1 6eba9274407b529cd9756473169a0bfa382bdcc4 SHA256 0886322ecf2eb17036dad306e79b0103293f6f5547cf565dabce35d5e6ccc642
-MISC ChangeLog 13303 RMD160 f88b34a36985bd7910fb91525746eae7d6fed69b SHA1 454c6d2513d20a05e894679da0f5337fd608288e SHA256 2d540c0c78f4cf1c248b7ffab40ea323a04fb8bc7c355d16f525b0effff6cc12
+MISC ChangeLog 13455 RMD160 cc25bb3d9fb049af8221a6bfd305f5ef28594b56 SHA1 78c9994af8b39d9d757ecd3af901ea2580735c61 SHA256 7f2143568e12e046eb43418fe9e94cb58fe7f57c5a2492088d70cb1a93b4974f
 MISC metadata.xml 252 RMD160 e1e9d40a05f958564b97dce796d3575508fb3b2e SHA1 f0acfb091052a67f482b06271d0ff89796dded07 SHA256 0db1ac5dbd8480024e1398a144440c9f0b77d5edf03789905ed31ae1d284aaf2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHuzODwnQyISwouHwRAgfpAKCv7dq1ug30S0r/bMoj5y5z9snJmgCfeawU
-p/ap+A8yeYql2+35Lh8nuyM=
-=h5DI
+iD8DBQFHvdetwnQyISwouHwRAimSAKCHB+6j1qfXFdmW6vB4JTVvQrNu1gCdE/m1
+UboPeINaaXMDmzT5Hovilvw=
+=9je/
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/sawfish/files/sawfish-1.3.3-parallel-make.patch b/x11-wm/sawfish/files/sawfish-1.3.3-parallel-make.patch
new file mode 100644
index 000000000000..7708f9237b39
--- /dev/null
+++ b/x11-wm/sawfish/files/sawfish-1.3.3-parallel-make.patch
@@ -0,0 +1,11 @@
+--- sawfish/src/Makefile.in
++++ sawfish/src/Makefile.in
+@@ -88,7 +88,7 @@
+ 	$(SHELL) $< $(DESTDIR)$(bindir) $(DESTDIR)$(repexecdir)/sawfish \
+ 	  $(foreach x,$(DL_DIRS),$(DESTDIR)$(sawfishexecdir)/$(x))
+ 
+-.libexec :
++.libexec : $(DL_OBJS)
+ 	$(SHELL) $(srcdir)/fake-libexec
+ 
+ clean :
diff --git a/x11-wm/sawfish/sawfish-1.3.3.ebuild b/x11-wm/sawfish/sawfish-1.3.3.ebuild
index 3f933de3f07e..e5edecea6a0e 100644
--- a/x11-wm/sawfish/sawfish-1.3.3.ebuild
+++ b/x11-wm/sawfish/sawfish-1.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3.3.ebuild,v 1.1 2008/02/19 18:52:21 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3.3.ebuild,v 1.2 2008/02/21 18:57:16 truedfx Exp $
 
 # detect cvs snapshots; fex. 1.3_p20040120
 [[ $PV == *_p[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] ]]
@@ -42,6 +42,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/libtool.patch
+	epatch "${FILESDIR}"/${P}-parallel-make.patch
 
 	if (( snapshot )); then
 		eautoreconf