Fix parallel make (bug #326987).

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

4 files changed, 25 insertions, 13 deletions

diff --git a/app-editors/mp/ChangeLog b/app-editors/mp/ChangeLog
index a98a7dab06c5..6e3cfadc3dcf 100644
--- a/app-editors/mp/ChangeLog
+++ b/app-editors/mp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/mp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/ChangeLog,v 1.79 2011/06/16 18:28:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/ChangeLog,v 1.80 2011/06/16 18:47:45 jer Exp $
+
+  16 Jun 2011; Jeroen Roovers <jer@gentoo.org> mp-5.2.0.ebuild,
+  +files/mp-5.2.0-make.patch:
+  Fix parallel make (bug #326987).
 
 *mp-5.2.0 (16 Jun 2011)
 
diff --git a/app-editors/mp/Manifest b/app-editors/mp/Manifest
index 59d97a009015..93d176e24946 100644
--- a/app-editors/mp/Manifest
+++ b/app-editors/mp/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX mp-5.1.1-asneeded.patch 7946 RMD160 41cbf06311efdfed99aec9dd6b94bd5fbe89eb85 SHA1 5ae8e4a4b28eb6f09adb4b199d6597db1aeb15a2 SHA256 7c045cf8ae121b819e0866c60dad304f5fed12eb28905b056aa5012fb1dc5140
 AUX mp-5.1.1-prll.patch 1510 RMD160 8f8763c104ca667b12819caf703e313a9c47c71d SHA1 597a59b89f67737e63ac686422390ab042f3b75b SHA256 59654faa1fa385321635b6b82113e4286e3f7f084127ed9323311f268b6e87f0
 AUX mp-5.1.3-asneeded.patch 6953 RMD160 6935d9a0e82b9b12195fc6a30071fd149edf26c9 SHA1 b4299b9e0a0bae33761fd53113e5878b647b3bd8 SHA256 fccb6533b7c23b5691063f245398ad50982a587f09f0c916908fda5baa865c6f
+AUX mp-5.2.0-make.patch 184 RMD160 13d8ad86ac0c2ab166caa426816f3fea9f7c7435 SHA1 247044f6f76e5931c49a3238bbcb179737f112e7 SHA256 e636efb044a546424157a942f5be0c88b4f34a8b24dac48fe66abfff352d31e3
 DIST mp-3.3.18b.tar.gz 295661 RMD160 37b52db182035243504cd49acd4ee5dc2668e744 SHA1 5233b6481e654c8a096412ba9dacc7ae7de5900f SHA256 dabe00cbe8f0cb18a42c46242659265507b73c6862030dd63a22ed26738f9649
 DIST mp-5.1.1.tar.gz 426154 RMD160 7a50eddd997f51baeaafb79d65fc1b0137d274e1 SHA1 75fa481518be29f63ef35b152ab18acb3bd445d2 SHA256 1357a22e11cb2b1a44081cdd43c402489169b6d98aec4f736f2e7fc7be1615ee
 DIST mp-5.1.3.tar.gz 486068 RMD160 f78bfa5986ce3c0e7d5070783ee60a2d03ddea88 SHA1 f05b760b09126fe624703b5d9d4c280803a0c313 SHA256 b9c2773408638eeddfa0eef912cc289b0b92df34ce621dc46eca47a2dc518986
@@ -11,13 +12,13 @@ DIST mp-5.2.0.tar.gz 510970 RMD160 ddc2b42382b36c5c74db364d094fcb19ea551cf6 SHA1
 EBUILD mp-3.3.18b.ebuild 1576 RMD160 b76cc44938e581ecfd38d446452f3a75edeae962 SHA1 999b3f13970927b9be14a12b36ae645d00334aad SHA256 578f68d400e9e5ed5383b08e80944f125b476128252bce9ceb6ea589c0a82bd5
 EBUILD mp-5.1.1.ebuild 1893 RMD160 d72459c01b095c7ca0a9f5aafdc7fd03705f357b SHA1 32b36dbb39a0de4fcc22e9c9a8db5e6cbcd795c3 SHA256 bbabc728d46e9dd303e08771f939fd1d564d950a28c6cb776dae2bf95d31249f
 EBUILD mp-5.1.3.ebuild 2073 RMD160 be38fe5656ba934ad3da1fd54898e9c59f0af119 SHA1 eb973b1a94ef4dfc994f15c220a99bc7359a5204 SHA256 8093d5f590c2119ac7d9975c6f202c8ff7ae654350396ea08ea633a831c0378c
-EBUILD mp-5.2.0.ebuild 2064 RMD160 d89d2c532e9ea6552784f16d6c5eebf5669d4031 SHA1 a47069aa5ddddfad0ee0a1999d6346377b443669 SHA256 f7d40c637423ef0da6a58558f93b46c51c38c31b5af4f2164e797099f1f12f9c
-MISC ChangeLog 9840 RMD160 9f78b5490497b99c9cd580857dc71f947071b28a SHA1 60e4f66b022f9e9915b11eb918fa3cabc61eb972 SHA256 9b8823adaa599a43ef1adc749d86311d36881f4c5966787617466a2a85d5491f
+EBUILD mp-5.2.0.ebuild 2038 RMD160 9a60750fd811dcfe7034af880e0a34caf0d74c67 SHA1 e631ec67602ece91d83fb9000c3fe82fe47f9dd3 SHA256 4657199520eb637fac82a3b43cb2c96d19c37d89fb43c864a27db0c2e1d2cb82
+MISC ChangeLog 9970 RMD160 1715e295d9396f69316aae149b20f9351cb0a394 SHA1 61e82f317b388a516018c22c3e92d38edf0f647e SHA256 3c789fc91bf4e86805c3cd8c9962601f4ffecaf71e605977dd0725e12deb4af0
 MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk36S0QACgkQVWmRsqeSphNT3gCffx/yGiphrMQsoAlq9SBnDNOw
-L08An1AZmXIneJguJrvnFLU5zsGZiEaJ
-=PlpK
+iEYEARECAAYFAk36T9YACgkQVWmRsqeSphNLBACePawRTQY43X6GaD1CU/Iy1rSX
+EkEAmQFG003p/jcMp5A7ds5nky+kkdp5
+=kvG6
 -----END PGP SIGNATURE-----
diff --git a/app-editors/mp/files/mp-5.2.0-make.patch b/app-editors/mp/files/mp-5.2.0-make.patch
new file mode 100644
index 000000000000..af51bc303384
--- /dev/null
+++ b/app-editors/mp/files/mp-5.2.0-make.patch
@@ -0,0 +1,11 @@
+--- a/makefile.in
++++ b/makefile.in
+@@ -29,7 +29,7 @@
+ $(MPDM)/libmpdm.a:
+ 	$(MAKE) -C $(MPDM)
+ 
+-$(MPSL)/libmpsl.a:
++$(MPSL)/libmpsl.a: $(MPDM)/libmpdm.a
+ 	$(MAKE) -C $(MPSL)
+ 
+ dep:
diff --git a/app-editors/mp/mp-5.2.0.ebuild b/app-editors/mp/mp-5.2.0.ebuild
index e940740008b7..4d2fa8744854 100644
--- a/app-editors/mp/mp-5.2.0.ebuild
+++ b/app-editors/mp/mp-5.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.2.0.ebuild,v 1.1 2011/06/16 18:28:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.2.0.ebuild,v 1.2 2011/06/16 18:47:45 jer Exp $
 
 EAPI="3"
 
@@ -29,7 +29,8 @@ DEPEND="${RDEPEND}
 	dev-lang/perl"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.1.1-prll.patch
+	epatch "${FILESDIR}"/${PN}-5.1.1-prll.patch \
+		"${FILESDIR}"/${PN}-5.2.0-make.patch
 }
 
 src_configure() {
@@ -62,11 +63,6 @@ src_configure() {
 	done
 }
 
-src_compile() {
-	# bug #326987
-	emake -j1 || die "emake failed"
-}
-
 src_install() {
 	dodir /usr/bin
 	sh config.sh --prefix="${EPREFIX}/usr"