Fix parallel make / NFS issue (bug #193208, thanks to DrChandra and Mark Wagner.

Package-Manager: portage-2.1.3.9

4 files changed, 37 insertions, 10 deletions

diff --git a/app-admin/sysstat/ChangeLog b/app-admin/sysstat/ChangeLog
index 06486e5d2eab..87ec542e5639 100644
--- a/app-admin/sysstat/ChangeLog
+++ b/app-admin/sysstat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/sysstat
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/ChangeLog,v 1.69 2007/09/08 17:37:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/ChangeLog,v 1.70 2007/09/22 04:59:14 jer Exp $
+
+  22 Sep 2007; Jeroen Roovers <jer@gentoo.org>
+  +files/sysstat-8.0.0-make.patch, sysstat-8.0.0.ebuild:
+  Fix parallel make / NFS issue (bug #193208, thanks to DrChandra and Mark
+  Wagner.
 
   08 Sep 2007; Jeroen Roovers <jer@gentoo.org>
   -files/sysstat-7.1.4-strip.patch, sysstat-8.0.0.ebuild:
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 15b3497d7ecb..3b6761953fc9 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -6,6 +6,10 @@ AUX sysstat-5.0.5-gcc4.diff 481 RMD160 16a80a6bc69fe1e8578c6402114612976bae2f2d
 MD5 81554c40694987a45295653252dda469 files/sysstat-5.0.5-gcc4.diff 481
 RMD160 16a80a6bc69fe1e8578c6402114612976bae2f2d files/sysstat-5.0.5-gcc4.diff 481
 SHA256 d2b687ae37305cfb1017681d537397264eb0019a6aa7e1e53ca690f7a04a61dc files/sysstat-5.0.5-gcc4.diff 481
+AUX sysstat-8.0.0-make.patch 321 RMD160 5445cb8c20e10531e08d05dcb73ca54e8216f5e3 SHA1 dfabd0dfcbb92211851ab526caa2dfeada6c40cc SHA256 49d0c3fec092268696d813e64fb952a7c921ce5173ed9637f02e524a97f15b2a
+MD5 9543c32c756380872022098cf4a0568d files/sysstat-8.0.0-make.patch 321
+RMD160 5445cb8c20e10531e08d05dcb73ca54e8216f5e3 files/sysstat-8.0.0-make.patch 321
+SHA256 49d0c3fec092268696d813e64fb952a7c921ce5173ed9637f02e524a97f15b2a files/sysstat-8.0.0-make.patch 321
 AUX sysstat.init.d 529 RMD160 d7e9059d390194bfc90a9adae65a974ac1904f50 SHA1 2b922c924a50e1dae23c16b1c97f46bed146d88d SHA256 2b563aef917fd372e33b8c8f47b254cd1102ebe2c59ffbb6952324710346aa0e
 MD5 adcfe119a55686f4c872821c964de96a files/sysstat.init.d 529
 RMD160 d7e9059d390194bfc90a9adae65a974ac1904f50 files/sysstat.init.d 529
@@ -21,14 +25,14 @@ EBUILD sysstat-7.0.4-r2.ebuild 1417 RMD160 b3b6f252c6e5c10e417dd2e75e01cf3a1d464
 MD5 33b3bcdd1d5662fe8a5a8d41fa46a85b sysstat-7.0.4-r2.ebuild 1417
 RMD160 b3b6f252c6e5c10e417dd2e75e01cf3a1d464935 sysstat-7.0.4-r2.ebuild 1417
 SHA256 b16e5b06d181b2bfbaf28d434cac54bf1bcca8558bdeb848c4c0451f6a190b7b sysstat-7.0.4-r2.ebuild 1417
-EBUILD sysstat-8.0.0.ebuild 959 RMD160 bcc5763a6a727a24344f82d5ec98ee7840e3d4d7 SHA1 f0ce8525ede48d68bc72a17db00100eaca50f241 SHA256 36f69a1394be90d5601b4e1bb02b81d23f8d7c58c4668d43155ce3a565bccc93
-MD5 daa617897f6d1ec9287685f545aa9e5a sysstat-8.0.0.ebuild 959
-RMD160 bcc5763a6a727a24344f82d5ec98ee7840e3d4d7 sysstat-8.0.0.ebuild 959
-SHA256 36f69a1394be90d5601b4e1bb02b81d23f8d7c58c4668d43155ce3a565bccc93 sysstat-8.0.0.ebuild 959
-MISC ChangeLog 9116 RMD160 518f5dcc3f93b2bcd4201eea55dd6909d4ae474e SHA1 c0e3f0e04499725d3320a4f899cd8da827e29ac6 SHA256 ec9b6af1cab5cf6f6528ecb634e39f7452d8cd75a72481a3050af33fde595000
-MD5 82daa0f3ef7c8f84ef22d6f365837bc3 ChangeLog 9116
-RMD160 518f5dcc3f93b2bcd4201eea55dd6909d4ae474e ChangeLog 9116
-SHA256 ec9b6af1cab5cf6f6528ecb634e39f7452d8cd75a72481a3050af33fde595000 ChangeLog 9116
+EBUILD sysstat-8.0.0.ebuild 1040 RMD160 f0d676dcf4a69060934386aa09e78f40e83371a1 SHA1 a9f8bb16da04f6ddf9a4b9401cfe09db516796f4 SHA256 8c02c6617481f396cc1a3aab0fd6bc1884504a691b3f14eba83d6b04e4709839
+MD5 5eaea7352fcf8f00e6c79764dadb7f31 sysstat-8.0.0.ebuild 1040
+RMD160 f0d676dcf4a69060934386aa09e78f40e83371a1 sysstat-8.0.0.ebuild 1040
+SHA256 8c02c6617481f396cc1a3aab0fd6bc1884504a691b3f14eba83d6b04e4709839 sysstat-8.0.0.ebuild 1040
+MISC ChangeLog 9306 RMD160 fcae66f49320ccc10afa47d63da0b6ccd7278b4f SHA1 8f8417a6879c01ba2285a9d847d7a193e86b3ce5 SHA256 38230ed424cfaf6b53e85013d0ad1545be8817841c850c379fc231d9b7bb8eb6
+MD5 07d626bb50e69032b1af62134c65c05a ChangeLog 9306
+RMD160 fcae66f49320ccc10afa47d63da0b6ccd7278b4f ChangeLog 9306
+SHA256 38230ed424cfaf6b53e85013d0ad1545be8817841c850c379fc231d9b7bb8eb6 ChangeLog 9306
 MISC metadata.xml 252 RMD160 ed7e3d6637ec96975f17ce5c33628aa482dfd663 SHA1 ddd00321e20f4a53a140eeb56cb01b9fab24d657 SHA256 76fd24f00e95b2892ca60acdce02d8c85dfeff84fc89ca14ffdbc00b82de44b3
 MD5 fbe6e8a03b222b84e9afcf23787c30dc metadata.xml 252
 RMD160 ed7e3d6637ec96975f17ce5c33628aa482dfd663 metadata.xml 252
diff --git a/app-admin/sysstat/files/sysstat-8.0.0-make.patch b/app-admin/sysstat/files/sysstat-8.0.0-make.patch
new file mode 100644
index 000000000000..f419d5827c34
--- /dev/null
+++ b/app-admin/sysstat/files/sysstat-8.0.0-make.patch
@@ -0,0 +1,11 @@
+--- Makefile.in.	2007-08-25 14:28:06.000000000 +0200
++++ Makefile.in	2007-09-22 06:48:59.000000000 +0200
+@@ -132,6 +132,8 @@
+ ioconf.o: ioconf.c ioconf.h common.h sysconfig.h
+ 
+ libsyscom.a: libsyscom.a(common.o ioconf.o)
++	ar rv libsyscom.a common.o
++	ar rv libsyscom.a ioconf.o
+ 
+ libsyssa.a: libsyssa.a(sa_common.o)
+ 
diff --git a/app-admin/sysstat/sysstat-8.0.0.ebuild b/app-admin/sysstat/sysstat-8.0.0.ebuild
index d380ba71e6c9..791b48d3a3bf 100644
--- a/app-admin/sysstat/sysstat-8.0.0.ebuild
+++ b/app-admin/sysstat/sysstat-8.0.0.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/app-admin/sysstat/sysstat-8.0.0.ebuild,v 1.3 2007/09/08 17:37:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-8.0.0.ebuild,v 1.4 2007/09/22 04:59:14 jer Exp $
 
 inherit eutils multilib
 
@@ -17,6 +17,13 @@ RDEPEND="nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-make.patch"
+}
+
 src_compile() {
 	sa_lib_dir=/usr/$(get_libdir)/sa \
 		econf $(use_enable nls) || die "econf failed"