Fix install on FreeBSD with -j N

Package-Manager: portage-2.1.3.9

5 files changed, 41 insertions, 16 deletions

diff --git a/dev-util/cvs/ChangeLog b/dev-util/cvs/ChangeLog
index c3b6f1660e28..13865858a52c 100644
--- a/dev-util/cvs/ChangeLog
+++ b/dev-util/cvs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/cvs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/ChangeLog,v 1.122 2007/04/22 13:47:48 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/ChangeLog,v 1.123 2007/09/14 18:19:39 uberlord Exp $
+
+  14 Sep 2007; Roy Marples <uberlord@gentoo.org>
+  +files/cvs-1.12.12-install-sh.patch, cvs-1.12.12-r4.ebuild,
+  cvs-1.12.13-r1.ebuild:
+  Fix install on FreeBSD with -j N
 
   22 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   cvs-1.12.12-r4.ebuild:
diff --git a/dev-util/cvs/Manifest b/dev-util/cvs/Manifest
index 79b2389dac37..f7dc4706f5f0 100644
--- a/dev-util/cvs/Manifest
+++ b/dev-util/cvs/Manifest
@@ -10,6 +10,10 @@ AUX cvs-1.12.12-cvsbug-tmpfix.patch 624 RMD160 c580f653ef9f294676aa4d766decaac50
 MD5 6b8fde892bfbca3d39d848430e5f4012 files/cvs-1.12.12-cvsbug-tmpfix.patch 624
 RMD160 c580f653ef9f294676aa4d766decaac50298b3c5 files/cvs-1.12.12-cvsbug-tmpfix.patch 624
 SHA256 061c26d140e1195200f1cc76217b2e7c2ff7f0c4dcbbb31124b386e8e756938e files/cvs-1.12.12-cvsbug-tmpfix.patch 624
+AUX cvs-1.12.12-install-sh.patch 495 RMD160 f5ada20250b2dea6979feb609077f57462aa0a21 SHA1 a6201f8d4f2343fe20214d0862fe0e710b61a4af SHA256 9c2fc03b42804f8edb3a5a6f9c9e80bd68924f265ce52d196c3b5c759ba42f8a
+MD5 46e07c0cdecda44a088496fbe58673c9 files/cvs-1.12.12-install-sh.patch 495
+RMD160 f5ada20250b2dea6979feb609077f57462aa0a21 files/cvs-1.12.12-install-sh.patch 495
+SHA256 9c2fc03b42804f8edb3a5a6f9c9e80bd68924f265ce52d196c3b5c759ba42f8a files/cvs-1.12.12-install-sh.patch 495
 AUX cvs-1.12.12-openat.patch 761 RMD160 05cfb679777b001633ace65e76f9a7a3d397a71a SHA1 23a3941ce449fb105c7b8cce1147a5d525a7753e SHA256 5b9fc46c2ee46d9136ddfc8d0baaac6087d8cae40fa5521815c3c2e372f25b9f
 MD5 b26ebb506de6b402dd35deb6bb946c36 files/cvs-1.12.12-openat.patch 761
 RMD160 05cfb679777b001633ace65e76f9a7a3d397a71a files/cvs-1.12.12-openat.patch 761
@@ -74,18 +78,18 @@ EBUILD cvs-1.12.12-r3.ebuild 2069 RMD160 7b6f8512ad06cce6548b93cbf704a93c430a1a7
 MD5 055b52a1fdc4483bf0c87746a69265ac cvs-1.12.12-r3.ebuild 2069
 RMD160 7b6f8512ad06cce6548b93cbf704a93c430a1a70 cvs-1.12.12-r3.ebuild 2069
 SHA256 482b7fca761039136f8d133d72b871a5517a923c0f5931c8e40fb2f81209a668 cvs-1.12.12-r3.ebuild 2069
-EBUILD cvs-1.12.12-r4.ebuild 2317 RMD160 ebde5c8e0c76ec95ce29df676fe17d64e5835e7f SHA1 dea8a8c32d4a8464ebc8e2a02a67f351be530e41 SHA256 6c7647580304ec8777c30d8ef7f02cba3a8ce98aafeced7f81a91771a9bc7454
-MD5 4b04ca6f6dccfcb3686cf6c48406a70c cvs-1.12.12-r4.ebuild 2317
-RMD160 ebde5c8e0c76ec95ce29df676fe17d64e5835e7f cvs-1.12.12-r4.ebuild 2317
-SHA256 6c7647580304ec8777c30d8ef7f02cba3a8ce98aafeced7f81a91771a9bc7454 cvs-1.12.12-r4.ebuild 2317
-EBUILD cvs-1.12.13-r1.ebuild 3893 RMD160 f57ac812bae1c8ae4b3313068719a77aa11d4cf9 SHA1 d38f36d7c80b4d9ff814025e57ee47ce61a01057 SHA256 995f74007d08a8efc8c15739aa2182e04a7ec07f379eb5f560fbf9cbdaf188c1
-MD5 75ee5b4f1dcb0f33d553cc5ca8e17d97 cvs-1.12.13-r1.ebuild 3893
-RMD160 f57ac812bae1c8ae4b3313068719a77aa11d4cf9 cvs-1.12.13-r1.ebuild 3893
-SHA256 995f74007d08a8efc8c15739aa2182e04a7ec07f379eb5f560fbf9cbdaf188c1 cvs-1.12.13-r1.ebuild 3893
-MISC ChangeLog 15820 RMD160 6d2a84787c28af1240b5609b89470499cff41551 SHA1 5fe9c810fb603041d90d28d26d8519c02b9e71ca SHA256 4a7e2aef499e14e45593fe191e5cf367acb752f77e761f3b4c68a19f69bf91da
-MD5 b58c31df76fadf5c2520de890f5256d1 ChangeLog 15820
-RMD160 6d2a84787c28af1240b5609b89470499cff41551 ChangeLog 15820
-SHA256 4a7e2aef499e14e45593fe191e5cf367acb752f77e761f3b4c68a19f69bf91da ChangeLog 15820
+EBUILD cvs-1.12.12-r4.ebuild 2369 RMD160 0d070778e1e6a80f30489bfaab5300eac9c02aa1 SHA1 f07e6c7fa02380b88f57f99dcff7b5068aa112f3 SHA256 d6f7c1744b611c557a0205cc4d594da9fdbf09c645757d5b2226008994e3a10c
+MD5 d057fdd513cf1869864e412668394675 cvs-1.12.12-r4.ebuild 2369
+RMD160 0d070778e1e6a80f30489bfaab5300eac9c02aa1 cvs-1.12.12-r4.ebuild 2369
+SHA256 d6f7c1744b611c557a0205cc4d594da9fdbf09c645757d5b2226008994e3a10c cvs-1.12.12-r4.ebuild 2369
+EBUILD cvs-1.12.13-r1.ebuild 3955 RMD160 7f662a63da2d85d14a572b50253200f1aaea2428 SHA1 6d4666dc892b1a9896e20f858a16a4019220c518 SHA256 0c4abad38d11054a88573f8ec78978df2732cc022b26ad5c6c1a9b6fd77768ec
+MD5 42baa639927e701f5692d0c06084f293 cvs-1.12.13-r1.ebuild 3955
+RMD160 7f662a63da2d85d14a572b50253200f1aaea2428 cvs-1.12.13-r1.ebuild 3955
+SHA256 0c4abad38d11054a88573f8ec78978df2732cc022b26ad5c6c1a9b6fd77768ec cvs-1.12.13-r1.ebuild 3955
+MISC ChangeLog 15990 RMD160 266daa32bd5384618e20c750b8e604d87d0b74fd SHA1 a8de43456a7bafbb9584c7b3e650da97f2273a9e SHA256 7c78523bac048257105ff617f27f22e71cd4dbe24b615ced6a49dfc1d8cac26e
+MD5 42d326c2dd39486ae8283db4a047f229 ChangeLog 15990
+RMD160 266daa32bd5384618e20c750b8e604d87d0b74fd ChangeLog 15990
+SHA256 7c78523bac048257105ff617f27f22e71cd4dbe24b615ced6a49dfc1d8cac26e ChangeLog 15990
 MISC metadata.xml 162 RMD160 4860626303bc1113a855a556455d3bdc9f21db79 SHA1 92320acf140a0b265e4e502238e53f194bf89670 SHA256 932a0c3bfb1ea371074cdf017dae98bb229959e68e98d4d19378564db2cfa3d3
 MD5 5013179b1f3eab5b3127de8372c57a1a metadata.xml 162
 RMD160 4860626303bc1113a855a556455d3bdc9f21db79 metadata.xml 162
diff --git a/dev-util/cvs/cvs-1.12.12-r4.ebuild b/dev-util/cvs/cvs-1.12.12-r4.ebuild
index 80222f39666f..30d30fb70fec 100644
--- a/dev-util/cvs/cvs-1.12.12-r4.ebuild
+++ b/dev-util/cvs/cvs-1.12.12-r4.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/dev-util/cvs/cvs-1.12.12-r4.ebuild,v 1.14 2007/07/12 01:05:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.12-r4.ebuild,v 1.15 2007/09/14 18:19:39 uberlord Exp $
 
 inherit eutils pam
 
@@ -28,6 +28,8 @@ src_unpack() {
 	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-cvsbug-tmpfix.patch
 	epatch ${FILESDIR}/${P}-openat.patch
 	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-block-requests.patch
+	cd "${S}"
+	epatch ${FILESDIR}/${P}-install-sh.patch
 	elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
 }
 
diff --git a/dev-util/cvs/cvs-1.12.13-r1.ebuild b/dev-util/cvs/cvs-1.12.13-r1.ebuild
index b8464b5905b5..a2c48fa68a33 100644
--- a/dev-util/cvs/cvs-1.12.13-r1.ebuild
+++ b/dev-util/cvs/cvs-1.12.13-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.13-r1.ebuild,v 1.3 2006/10/17 15:08:46 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.13-r1.ebuild,v 1.4 2007/09/14 18:19:39 uberlord Exp $
 
 inherit eutils pam
 
@@ -28,6 +28,8 @@ src_unpack() {
 	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-cvsbug-tmpfix.patch
 	epatch ${FILESDIR}/${P}-openat.patch
 	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${P}-zlib.patch
+	cd "${S}"
+	epatch ${FILESDIR}/${PN}-1.12.12-install-sh.patch
 	# this testcase was not updated
 	#sed -i.orig -e '/unrecognized keyword.*BogusOption/s,98,73,g' \
 	#  ${S}/src/sanity.sh
diff --git a/dev-util/cvs/files/cvs-1.12.12-install-sh.patch b/dev-util/cvs/files/cvs-1.12.12-install-sh.patch
new file mode 100644
index 000000000000..825c0ee6f1c3
--- /dev/null
+++ b/dev-util/cvs/files/cvs-1.12.12-install-sh.patch
@@ -0,0 +1,12 @@
+diff -ur a/build-aux/install-sh b/build-aux/install-sh
+--- a/build-aux/install-sh	2006-03-25 20:04:46 +0000
++++ b/build-aux/install-sh	2007-09-14 10:53:29 +0100
+@@ -246,7 +246,7 @@
+   fi
+ 
+   if test -n "$dir_arg"; then
+-    $doit $mkdircmd "$dst" \
++    { test -d "$dst" || $doit $mkdircmd -p "$dst"; } \
+       && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+       && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+       && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \