Fix parallel install problem #180672 by Maarten Billemont.

Package-Manager: portage-2.1.2.9

4 files changed, 48 insertions, 13 deletions

diff --git a/sys-apps/dmapi/ChangeLog b/sys-apps/dmapi/ChangeLog
index 7a13278a6c80..d00e3d83abd7 100644
--- a/sys-apps/dmapi/ChangeLog
+++ b/sys-apps/dmapi/ChangeLog
@@ -1,9 +1,10 @@
 # ChangeLog for sys-apps/dmapi
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/ChangeLog,v 1.46 2007/06/04 23:30:48 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/ChangeLog,v 1.47 2007/06/11 04:54:02 vapier Exp $
 
-  04 Jun 2007; Robin H. Johnson <robbat2@gentoo.org> dmapi-2.2.8.ebuild:
-  Bug #180672, fix parallel install failure.
+  11 Jun 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/dmapi-2.2.8-symlinks.patch, dmapi-2.2.8.ebuild:
+  Fix parallel install problem #180672 by Maarten Billemont.
 
 *dmapi-2.2.8 (31 May 2007)
 
diff --git a/sys-apps/dmapi/Manifest b/sys-apps/dmapi/Manifest
index 5b2d76f98e08..4d7e2b664ed6 100644
--- a/sys-apps/dmapi/Manifest
+++ b/sys-apps/dmapi/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX dmapi-2.2.1-only-symlink-when-needed.patch 836 RMD160 5b36f392f12d2382dd051c9766ae128a71b659ec SHA1 79fefd16a84e51797165fc8438382382156a149b SHA256 fede0dc42499b8903e42ea976d2ebfe8965750a8b2b116433364e657fbc8189d
 MD5 6204834fe8dda5a8e61bb52b8db06673 files/dmapi-2.2.1-only-symlink-when-needed.patch 836
 RMD160 5b36f392f12d2382dd051c9766ae128a71b659ec files/dmapi-2.2.1-only-symlink-when-needed.patch 836
@@ -6,6 +9,10 @@ AUX dmapi-2.2.3-LDFLAGS.patch 611 RMD160 92927ece6c525908542c4a97a4cbb75c3daf54f
 MD5 fd221ded991b5761c2d69503d90a0d3f files/dmapi-2.2.3-LDFLAGS.patch 611
 RMD160 92927ece6c525908542c4a97a4cbb75c3daf54fe files/dmapi-2.2.3-LDFLAGS.patch 611
 SHA256 82989176be09cec7fb1af9843f3d5936a78512910bc1d2d1fdbcdda3a910ad1b files/dmapi-2.2.3-LDFLAGS.patch 611
+AUX dmapi-2.2.8-symlinks.patch 312 RMD160 d36d0b1097efb33b2450a3e2e49b1952ac444da6 SHA1 030e2eb84772b1b0f65e13a7bb4a2f9a46f338e5 SHA256 a69bc3cf6942a43447f495af802a2e1a3c60320f8c666f085cab97a2a5a54149
+MD5 48423eedb435150176f71cda39334214 files/dmapi-2.2.8-symlinks.patch 312
+RMD160 d36d0b1097efb33b2450a3e2e49b1952ac444da6 files/dmapi-2.2.8-symlinks.patch 312
+SHA256 a69bc3cf6942a43447f495af802a2e1a3c60320f8c666f085cab97a2a5a54149 files/dmapi-2.2.8-symlinks.patch 312
 DIST dmapi-2.2.3.src.tar.gz 78451 RMD160 96cd9fa7fd3ab3a45591a71fecb32b057e1a3ef3 SHA1 47e477480258380aaf8a764f4b1626ae46913ec5 SHA256 e34e04e4a8893194bbaebba1122db946ee113fb20dcb8864bd03defb51f7b35f
 DIST dmapi_2.2.5-1.tar.gz 50490 RMD160 0c10b66fe2791ae304e534639c6801b99074b40e SHA1 dc2d268123c765a27495011df204dd20ac80f7c9 SHA256 f689690d39a6532ecb5becf42752b18e910c30fc60d2452643ddf2bcf2a89494
 DIST dmapi_2.2.8-1.tar.gz 81629 RMD160 7e48d0708583efa3e19e8ecdef206923b74bffb0 SHA1 4f238f47cdfec9dca5e6290d642b290cfc9a7d38 SHA256 8a2b900616bb3933697f3094c7cec4ee968e6f5067f8da9ddb29760ac4a457e4
@@ -17,14 +24,14 @@ EBUILD dmapi-2.2.5.ebuild 1157 RMD160 2c5e824a6f9b160ca90f7d913990bb96e75a5987 S
 MD5 8996ba72882e3bd2cd3df4529df6c27d dmapi-2.2.5.ebuild 1157
 RMD160 2c5e824a6f9b160ca90f7d913990bb96e75a5987 dmapi-2.2.5.ebuild 1157
 SHA256 2e81ac3587eaffa89ddd18b36a673e5b0892edea2df8ed82d6cc4a78517e3838 dmapi-2.2.5.ebuild 1157
-EBUILD dmapi-2.2.8.ebuild 1170 RMD160 4ea292205e63a1d1a9e011fc4479b85bdddb03eb SHA1 e13dd0457dec210a6c71decfb33251da1e1cf276 SHA256 932a5e0217531b0c32d8b2d2b49228cf26399b77c288ee0e10c5c1995a5b078f
-MD5 537865a13e17b794985ea00c4ff75e33 dmapi-2.2.8.ebuild 1170
-RMD160 4ea292205e63a1d1a9e011fc4479b85bdddb03eb dmapi-2.2.8.ebuild 1170
-SHA256 932a5e0217531b0c32d8b2d2b49228cf26399b77c288ee0e10c5c1995a5b078f dmapi-2.2.8.ebuild 1170
-MISC ChangeLog 5501 RMD160 08836cf1e7582dcfa634c68d26bd532e82e89eb4 SHA1 e60f6efca38cff9268c3494d0b2da4b400c069d5 SHA256 077646bdd657a8508016104ebd51ac0b405a87ff7b5fc9b9170f42c92399075f
-MD5 4f40aad7dd5b4748779df77a7ef8d239 ChangeLog 5501
-RMD160 08836cf1e7582dcfa634c68d26bd532e82e89eb4 ChangeLog 5501
-SHA256 077646bdd657a8508016104ebd51ac0b405a87ff7b5fc9b9170f42c92399075f ChangeLog 5501
+EBUILD dmapi-2.2.8.ebuild 1222 RMD160 c3cd0ed349e9eab89f079663483daccf29e9c32e SHA1 127256a1c45f4b44d23455a0465679f78c1e975e SHA256 d65164d68f9ce0e7ce3bfb0a2a72754100b558f45a357756e2ecd643da181245
+MD5 c46f3e4ce360d053d4bf916135b3e3eb dmapi-2.2.8.ebuild 1222
+RMD160 c3cd0ed349e9eab89f079663483daccf29e9c32e dmapi-2.2.8.ebuild 1222
+SHA256 d65164d68f9ce0e7ce3bfb0a2a72754100b558f45a357756e2ecd643da181245 dmapi-2.2.8.ebuild 1222
+MISC ChangeLog 5550 RMD160 bad16b2aaf1419bcc5fca099feba419a11762a3e SHA1 2f7392f91bd9422e6b0a5d47e41bc1401c89876e SHA256 fdd5af5a29b74f51d3a83888d20e043a10d8c26086c5c1c18462cdced52e25ab
+MD5 057df6d1d00699c01f582aaa72715b24 ChangeLog 5550
+RMD160 bad16b2aaf1419bcc5fca099feba419a11762a3e ChangeLog 5550
+SHA256 fdd5af5a29b74f51d3a83888d20e043a10d8c26086c5c1c18462cdced52e25ab ChangeLog 5550
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -38,3 +45,10 @@ SHA256 8e98e1cc88d7fec7a5cb325ac23ae4c2b85379ddd6d105353fc3e3df8aa69b3e files/di
 MD5 a9fa63d7ce473726e7550859700cdc01 files/digest-dmapi-2.2.8 238
 RMD160 da6b4ff6ac4222c4a1524e7e7867c3efee1ff552 files/digest-dmapi-2.2.8 238
 SHA256 d78ed103f3d0639a73fba17f7a000df0537b2c3323361e70be70e96567d081c3 files/digest-dmapi-2.2.8 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGbNVw8bi6rjpTunYRAgOYAJwNU2DRD+N7+cRJRJtOCtKihH/6vQCgyLad
+VJaWi1dFvOp3o9XTYhghAcQ=
+=KBrd
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/dmapi/dmapi-2.2.8.ebuild b/sys-apps/dmapi/dmapi-2.2.8.ebuild
index 914f71557869..60878bf2f37f 100644
--- a/sys-apps/dmapi/dmapi-2.2.8.ebuild
+++ b/sys-apps/dmapi/dmapi-2.2.8.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/sys-apps/dmapi/dmapi-2.2.8.ebuild,v 1.2 2007/06/04 23:30:48 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/dmapi-2.2.8.ebuild,v 1.3 2007/06/11 04:54:02 vapier Exp $
 
 inherit eutils toolchain-funcs autotools
 
@@ -20,6 +20,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-2.2.1-only-symlink-when-needed.patch
+	epatch "${FILESDIR}"/${PN}-2.2.8-symlinks.patch #180672
 	sed -i \
 		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
 		include/builddefs.in \
@@ -36,7 +37,7 @@ src_compile() {
 }
 
 src_install() {
-	emake -j1 DIST_ROOT="${D}" install install-dev || die
+	emake DIST_ROOT="${D}" install install-dev || die
 	prepalldocs
 
 	# move shared libs to /
diff --git a/sys-apps/dmapi/files/dmapi-2.2.8-symlinks.patch b/sys-apps/dmapi/files/dmapi-2.2.8-symlinks.patch
new file mode 100644
index 000000000000..bf913248c144
--- /dev/null
+++ b/sys-apps/dmapi/files/dmapi-2.2.8-symlinks.patch
@@ -0,0 +1,19 @@
+Fix installing in parallel
+
+http://bugs.gentoo.org/180672
+
+--- include/Makefile
++++ include/Makefile
+@@ -9,9 +9,9 @@
+ LSRCFILES = builddefs.in buildmacros buildrules dmapi_kern.h
+ LDIRT = xfs
+ 
+-default install :
+-	rm -f xfs
+-	$(LN_S) . xfs
++xfs:
++	$(LN_S) . $@
++default install : xfs
+ 
+ include $(BUILDRULES)
+