Fix some parallel build issues #146214.

Package-Manager: portage-2.1.1_rc1-r3

4 files changed, 65 insertions, 13 deletions

diff --git a/net-ftp/ncftp/ChangeLog b/net-ftp/ncftp/ChangeLog
index 06abb7d83419..ea28a2d4a53c 100644
--- a/net-ftp/ncftp/ChangeLog
+++ b/net-ftp/ncftp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/ncftp
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ChangeLog,v 1.49 2006/09/04 09:25:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ChangeLog,v 1.50 2006/09/04 10:20:55 vapier Exp $
+
+  04 Sep 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/ncftp-3.1.9-build.patch, ncftp-3.1.9.ebuild:
+  Fix some parallel build issues #146214.
 
 *ncftp-3.2.0 (04 Sep 2006)
 
diff --git a/net-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest
index 3cb264c65462..c5d73b2550dd 100644
--- a/net-ftp/ncftp/Manifest
+++ b/net-ftp/ncftp/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX ncftp-3.1.9-build.patch 1187 RMD160 9b0beb94e797145bdea2c54f268ceaa312dea5b8 SHA1 6dde2ad5466252cf74e80b7809b643f18f8877e1 SHA256 4b3aeed9b6c29bd0f103d38a8c3eb482c7c8882917b8e616a27ae5107b926745
+MD5 dca315d28a822cc3cfbf56e7312f1b53 files/ncftp-3.1.9-build.patch 1187
+RMD160 9b0beb94e797145bdea2c54f268ceaa312dea5b8 files/ncftp-3.1.9-build.patch 1187
+SHA256 4b3aeed9b6c29bd0f103d38a8c3eb482c7c8882917b8e616a27ae5107b926745 files/ncftp-3.1.9-build.patch 1187
 AUX ncftp-3.2.0-build.patch 1322 RMD160 4f359d64bb6daf4755430fea7a79d11662018123 SHA1 18e5fadfd1c5158000e575d4557018a5f870ad76 SHA256 f49bcbab6b0eb51d7a4a8077634dd2dee8fcd36d419a335cc13842d54239bd1b
 MD5 3cdc5daa970c26e6d72ed4c011ab3989 files/ncftp-3.2.0-build.patch 1322
 RMD160 4f359d64bb6daf4755430fea7a79d11662018123 files/ncftp-3.2.0-build.patch 1322
@@ -8,18 +12,18 @@ SHA256 f49bcbab6b0eb51d7a4a8077634dd2dee8fcd36d419a335cc13842d54239bd1b files/nc
 DIST ncftp-3.1.9-src.tar.bz2 409722 RMD160 b675d4d89b31480082476e53b970d99b95497249 SHA1 052be99800b740a50b31619ccd65fd4f082a3386 SHA256 b7ae2363f6b7cfb69e64a21c2edf3f9cf6fadc52606510bcc925668f6045c469
 DIST ncftp-3.1.9_editcmd.patch 9594 RMD160 d87f0c76e08ffe3452926c2d6db69490fd1c853a SHA1 a50fd1f144c77644c3eccb0e951d8f07ea482b67 SHA256 99f1213edf9eeb8c53f0560069b3dfcfc3c69123d78ab6f9326be028f7d8a68d
 DIST ncftp-3.2.0-src.tar.bz2 427962 RMD160 391dc307112f018647d3e2b9a8099a236972733c SHA1 708222170df81ed957e4f187213d69ea21e4f7dd SHA256 2ebc7b51af96cb0fa8b703c7cb995bfb46ccf5312e335270d0420e260544c376
-EBUILD ncftp-3.1.9.ebuild 972 RMD160 dc75d155ae31085ba38cbfb198e3302a9ffccb9d SHA1 e6ff5fdd872d0ebf7a2a37059f87a2238043b1c2 SHA256 87d3e1b72d800d9367a5bcb756475ea9bf61c2570d0a103c5bd5f04461cc88bb
-MD5 e795ba2cc073728714fcb852faedbb16 ncftp-3.1.9.ebuild 972
-RMD160 dc75d155ae31085ba38cbfb198e3302a9ffccb9d ncftp-3.1.9.ebuild 972
-SHA256 87d3e1b72d800d9367a5bcb756475ea9bf61c2570d0a103c5bd5f04461cc88bb ncftp-3.1.9.ebuild 972
+EBUILD ncftp-3.1.9.ebuild 1015 RMD160 a75515caab6eb0dda9f027beb83b6fa1824827e4 SHA1 0b7d75817d258f59789a761cf6051aa5179c7924 SHA256 0431bcc1454e380c0fb79e4f202e7e76c035411d2e079252cd93e712c811dc7a
+MD5 9acc80a327ad3b8383324fbda8e6b831 ncftp-3.1.9.ebuild 1015
+RMD160 a75515caab6eb0dda9f027beb83b6fa1824827e4 ncftp-3.1.9.ebuild 1015
+SHA256 0431bcc1454e380c0fb79e4f202e7e76c035411d2e079252cd93e712c811dc7a ncftp-3.1.9.ebuild 1015
 EBUILD ncftp-3.2.0.ebuild 831 RMD160 e39ab990e383ca96ec51df605c1057bbb52408df SHA1 4f99f4bc4740c358ff4e3d5c8f6919481ae87174 SHA256 613b8953aaf7d03a07349fddddb73335a8a21f7ff20c5292e9a1a246ed4359b8
 MD5 12f0b2dd110843726a1dd03f2585996a ncftp-3.2.0.ebuild 831
 RMD160 e39ab990e383ca96ec51df605c1057bbb52408df ncftp-3.2.0.ebuild 831
 SHA256 613b8953aaf7d03a07349fddddb73335a8a21f7ff20c5292e9a1a246ed4359b8 ncftp-3.2.0.ebuild 831
-MISC ChangeLog 6333 RMD160 f555d9d6808d757d80fa028ea7467ea6177913f0 SHA1 e910a4c6b942ab8d7cf0e8026bdd1067d7f20ee8 SHA256 f9fa0e6fab5c43e48e9548922bab0d7c69c0df2bc6dbe293e215475d813e86aa
-MD5 0b21351487d63d4abd0cabd68acec67d ChangeLog 6333
-RMD160 f555d9d6808d757d80fa028ea7467ea6177913f0 ChangeLog 6333
-SHA256 f9fa0e6fab5c43e48e9548922bab0d7c69c0df2bc6dbe293e215475d813e86aa ChangeLog 6333
+MISC ChangeLog 6480 RMD160 963afc447f1672b0d40ed363b5c31ae37890e4af SHA1 bc3146fe3f7adbc8c63fbec851fb3ef7feab6525 SHA256 0261160351a6741eab40b60c11ff717f7fc944091ac7336340240f0e08c475e9
+MD5 a1b51c16c2dcbbec7130871323747945 ChangeLog 6480
+RMD160 963afc447f1672b0d40ed363b5c31ae37890e4af ChangeLog 6480
+SHA256 0261160351a6741eab40b60c11ff717f7fc944091ac7336340240f0e08c475e9 ChangeLog 6480
 MISC metadata.xml 715 RMD160 f1e54f4b0b68fbcb9390213c39a278ab9b8ff692 SHA1 ed44ef860a8eab7cd177f7b729353428497d519e SHA256 d8a103b0d2727619f2e4ab345064e045cca7587884cbbc39c4208fd1424cb8da
 MD5 2f4035e2a68bf680d7e936f9f4676b0c metadata.xml 715
 RMD160 f1e54f4b0b68fbcb9390213c39a278ab9b8ff692 metadata.xml 715
@@ -33,7 +37,7 @@ SHA256 4dbb3d2512abbae54236bfa781d697972ef328d886a321ce3e9982d314f8c2c9 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE+/HWamhnQswr0vIRAom0AKCmbwVld6XH8bw+988Z2vvAiFJq3QCfTaz9
-1nLH1JE7FLEn6Cmm5L0OE0U=
-=cgIJ
+iD8DBQFE+/40amhnQswr0vIRAquWAJ9XC1zi8OZrLwPZ/4XkjJj+qnDjhACffgX/
+X4vrAZPcLt7Cn9ZdDsZ3lXg=
+=7ARA
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/ncftp/files/ncftp-3.1.9-build.patch b/net-ftp/ncftp/files/ncftp-3.1.9-build.patch
new file mode 100644
index 000000000000..d6d45b9ab0dc
--- /dev/null
+++ b/net-ftp/ncftp/files/ncftp-3.1.9-build.patch
@@ -0,0 +1,43 @@
+Fix parallel build bugs
+
+http://bugs.gentoo.org/146214
+
+--- sio/Makefile.in
++++ sio/Makefile.in
+@@ -179,6 +179,7 @@
+ SClose.o: SClose.c $(SYSHDRS_DEP)
+ SConnect.o: SConnect.c $(SYSHDRS_DEP)
+ SConnectByName.o: SConnectByName.c $(SYSHDRS_DEP)
++SError.o: SError.c $(SYSHDRS_DEP)
+ SNew.o: SNew.c $(SYSHDRS_DEP)
+ SRead.o: SRead.c $(SYSHDRS_DEP)
+ SReadline.o: SReadline.c $(SYSHDRS_DEP)
+--- sio/pch.mk.gcc-gch
++++ sio/pch.mk.gcc-gch
+@@ -1,5 +1,6 @@
+ syshdrs.h.gch: syshdrs.h sio.h usio.h
+-	$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) syshdrs.h
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) syshdrs.h -o .tmp.$@
++	mv -f .tmp.$@ $@
+ 
+ PCH=syshdrs.h.gch
+ SYSHDRS_DEP=syshdrs.h.gch
+--- libncftp/Makefile.in
++++ libncftp/Makefile.in
+@@ -353,3 +353,6 @@
+ 
+ u_unmdtm.o: u_unmdtm.c $(SYSHDRS_DEP)
+ u_unmdtm.so: u_unmdtm.c $(SYSHDRS_DEP)
++
++u_feat.o: u_feat.c $(SYSHDRS_DEP)
++u_feat.so: u_feat.c $(SYSHDRS_DEP)
+--- libncftp/pch.mk.gcc-gch
++++ libncftp/pch.mk.gcc-gch
+@@ -1,5 +1,6 @@
+ syshdrs.h.gch: syshdrs.h ncftp.h ncftp_errno.h util.h ftp.h
+-	$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) syshdrs.h
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) syshdrs.h -o .tmp.$@
++	mv -f .tmp.$@ $@
+ 
+ PCH=syshdrs.h.gch
+ SYSHDRS_DEP=syshdrs.h.gch
diff --git a/net-ftp/ncftp/ncftp-3.1.9.ebuild b/net-ftp/ncftp/ncftp-3.1.9.ebuild
index 604b2ed46d26..7ffa3e76b858 100644
--- a/net-ftp/ncftp/ncftp-3.1.9.ebuild
+++ b/net-ftp/ncftp/ncftp-3.1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ncftp-3.1.9.ebuild,v 1.11 2006/07/20 18:55:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ncftp-3.1.9.ebuild,v 1.12 2006/09/04 10:20:55 vapier Exp $
 
 inherit eutils
 
@@ -23,6 +23,7 @@ src_unpack() {
 	cd "${S}"
 #	use ipv6 && epatch ${DISTDIR}/${IPV6_P}.diff.gz
 	epatch "${DISTDIR}"/ncftp-${PV}_editcmd.patch
+	epatch "${FILESDIR}"/ncftp-${PV}-build.patch
 }
 
 src_install() {