From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 14 Feb 2007 15:40:33 +0000 (+0000)
Subject: Fix installing in parallel #166729 by Connor.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=969afae68cbd8c0a80a438c4fcd45a152bec4fd4;p=gentoo.git

Fix installing in parallel #166729 by Connor.
Package-Manager: portage-2.1.2-r9
---

diff --git a/sys-fs/xfsprogs/ChangeLog b/sys-fs/xfsprogs/ChangeLog
index d3202166b05a..aeebe12c0173 100644
--- a/sys-fs/xfsprogs/ChangeLog
+++ b/sys-fs/xfsprogs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/xfsprogs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.62 2007/02/13 11:41:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.63 2007/02/14 15:40:33 vapier Exp $
+
+  14 Feb 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/xfsprogs-2.8.18-symlinks.patch, xfsprogs-2.8.18.ebuild:
+  Fix installing in parallel #166729 by Connor.
 
 *xfsprogs-2.8.18 (13 Feb 2007)
 
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 6323925cfb22..4eaffe8889e2 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -9,20 +9,24 @@ AUX xfsprogs-2.8.11-kern-types.patch 1352 RMD160 258863bc324833ad26939d3982b1038
 MD5 dfa9fe25d343add7538accb8bc95e73b files/xfsprogs-2.8.11-kern-types.patch 1352
 RMD160 258863bc324833ad26939d3982b1038ffcb42492 files/xfsprogs-2.8.11-kern-types.patch 1352
 SHA256 e0d1bcc4fb8ce57b1fb4d6188964bf06457f22172705f3e70ce113b00bb95046 files/xfsprogs-2.8.11-kern-types.patch 1352
+AUX xfsprogs-2.8.18-symlinks.patch 339 RMD160 8e2026b0b5c8be70dfcaba94f53ac9211ac6b1a2 SHA1 d7b9387d71556e18ebd6f65fd3a52bc323162844 SHA256 e1b168babbce2e4e18757827b6f53248408fa299ea345def0fb650b8f79f2d16
+MD5 7ef8391ca33c6276230bb2f66af0ee2c files/xfsprogs-2.8.18-symlinks.patch 339
+RMD160 8e2026b0b5c8be70dfcaba94f53ac9211ac6b1a2 files/xfsprogs-2.8.18-symlinks.patch 339
+SHA256 e1b168babbce2e4e18757827b6f53248408fa299ea345def0fb650b8f79f2d16 files/xfsprogs-2.8.18-symlinks.patch 339
 DIST xfsprogs_2.8.11-1.tar.gz 924389 RMD160 c9e45f617884e4cff56cb809701d9ec442e7115c SHA1 03d0f426848479562f9ce1c5dcb8cb17a150619d SHA256 dc46b4e29fa5250c62fb2617390e30cb336299428544e795fd40ab21e4b4a08f
 DIST xfsprogs_2.8.18-1.tar.gz 979056 RMD160 c8121e9c465dad4444dadff4273e01087afeb237 SHA1 12ed1cbc5784e5df9a8a2a1c7a061ba459647e80 SHA256 17b76af5e54967c2f06b828bacfd2e43c4f056e303e8cfe6613208dabd9a2c46
 EBUILD xfsprogs-2.8.11.ebuild 1827 RMD160 2f367ba9b13001a52497c82027d96938b8f7405b SHA1 cdfff80e564d3be29a75ccd2dcfc1b9de4204d9e SHA256 f28f9cb105ee777269de2019a5ce6f43ea22bcd143dcd57bf60d5ce14ca4c8ce
 MD5 ec2aa3a798dc10b74084117137f1d934 xfsprogs-2.8.11.ebuild 1827
 RMD160 2f367ba9b13001a52497c82027d96938b8f7405b xfsprogs-2.8.11.ebuild 1827
 SHA256 f28f9cb105ee777269de2019a5ce6f43ea22bcd143dcd57bf60d5ce14ca4c8ce xfsprogs-2.8.11.ebuild 1827
-EBUILD xfsprogs-2.8.18.ebuild 1628 RMD160 b61400d2db25d4e3ffa408cdc33db87e19223c23 SHA1 012b7709dc1183ad0d8b23d0e0726eb365909a54 SHA256 1ac06f7baf402f5ecf0bc799c8417a2cd92465f498a151a8091f4ec182f06f67
-MD5 9ca9f29807266af5fa3d97c3513a4887 xfsprogs-2.8.18.ebuild 1628
-RMD160 b61400d2db25d4e3ffa408cdc33db87e19223c23 xfsprogs-2.8.18.ebuild 1628
-SHA256 1ac06f7baf402f5ecf0bc799c8417a2cd92465f498a151a8091f4ec182f06f67 xfsprogs-2.8.18.ebuild 1628
-MISC ChangeLog 11574 RMD160 bbe628fc3caf275f595076b436583dcb423204b6 SHA1 94e8ae2e607e6cfb22840ffea40c779274cd11e3 SHA256 23cf0638ecde0dfa944373eb467e7a5580c6b1c980277b97b126f21e41a851a0
-MD5 8050c3cc0d09ebc19a97bba539af4196 ChangeLog 11574
-RMD160 bbe628fc3caf275f595076b436583dcb423204b6 ChangeLog 11574
-SHA256 23cf0638ecde0dfa944373eb467e7a5580c6b1c980277b97b126f21e41a851a0 ChangeLog 11574
+EBUILD xfsprogs-2.8.18.ebuild 1685 RMD160 231c32a0700d870514a3bef893e072bdd245462c SHA1 c133e15b25fe3bef8bd78abd580a99e1a99602b1 SHA256 9010e5e4ab6ba1b2a0d893a08230e4a783a56cd610d34fc9bf664a126bd32765
+MD5 747b244316bdf0c4c069aa6acd6c530c xfsprogs-2.8.18.ebuild 1685
+RMD160 231c32a0700d870514a3bef893e072bdd245462c xfsprogs-2.8.18.ebuild 1685
+SHA256 9010e5e4ab6ba1b2a0d893a08230e4a783a56cd610d34fc9bf664a126bd32765 xfsprogs-2.8.18.ebuild 1685
+MISC ChangeLog 11738 RMD160 cebfbd609b906bc8711d3256cf1db688a0912a56 SHA1 7c01d3fb311b9710f34224b787cd23f85f5400d0 SHA256 16672eb10c01b8476c2f4fc18060fada4bea05f452dd0e8d25533f96ffa36965
+MD5 435a175c005c89ef8355aad0facf9dc0 ChangeLog 11738
+RMD160 cebfbd609b906bc8711d3256cf1db688a0912a56 ChangeLog 11738
+SHA256 16672eb10c01b8476c2f4fc18060fada4bea05f452dd0e8d25533f96ffa36965 ChangeLog 11738
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -36,7 +40,7 @@ SHA256 07bc02d7010dde13508f7a9fe6de00da6ed11505dd359e6ec098ac9626553b36 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF0aQM8bi6rjpTunYRAllBAJ9qD21PkbfWqAsToHZlLZFNuful+QCgkCii
-uJg6y2PnGj1+33WfvAzinOI=
-=hmcX
+iD8DBQFF0y2T8bi6rjpTunYRAsGzAKCwyUfwZtG8Bq1WQxMiQEYaqb5xGwCdGEQH
+bzn0kf8ehS+5l2YsMghLetA=
+=4WLc
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/xfsprogs/files/xfsprogs-2.8.18-symlinks.patch b/sys-fs/xfsprogs/files/xfsprogs-2.8.18-symlinks.patch
new file mode 100644
index 000000000000..6e163c8eb125
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-2.8.18-symlinks.patch
@@ -0,0 +1,20 @@
+Fix installing in parallel
+
+http://bugs.gentoo.org/166729
+
+--- include/Makefile
++++ include/Makefile
+@@ -37,10 +37,9 @@
+ LSRCFILES += command.h input.h path.h project.h
+ LDIRT = xfs disk
+ 
+-default install :
+-	rm -f xfs disk
+-	$(LN_S) . xfs
+-	$(LN_S) . disk
++xfs disk:
++	$(LN_S) . $@
++default install : xfs disk
+ 
+ include $(BUILDRULES)
+ 
diff --git a/sys-fs/xfsprogs/xfsprogs-2.8.18.ebuild b/sys-fs/xfsprogs/xfsprogs-2.8.18.ebuild
index 307c945ededc..ddd299fa9371 100644
--- a/sys-fs/xfsprogs/xfsprogs-2.8.18.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-2.8.18.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-2.8.18.ebuild,v 1.1 2007/02/13 11:41:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-2.8.18.ebuild,v 1.2 2007/02/14 15:40:33 vapier Exp $
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 MY_P="${PN}_${PV}-1"
 DESCRIPTION="xfs filesystem utilities"
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-symlinks.patch #166729
 	# Inject our own CFLAGS / docpath
 	sed -i \
 		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \