Prll make fix, #326987

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 56 insertions, 15 deletions

diff --git a/app-editors/mp/ChangeLog b/app-editors/mp/ChangeLog
index e9c6b078b4d3..2101b98d4358 100644
--- a/app-editors/mp/ChangeLog
+++ b/app-editors/mp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/mp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/ChangeLog,v 1.74 2010/07/29 17:46:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/ChangeLog,v 1.75 2010/07/30 09:12:32 jlec Exp $
+
+  30 Jul 2010; Justin Lecher <jlec@gentoo.org> mp-5.1.1.ebuild,
+  +files/mp-5.1.1-prll.patch, mp-5.1.3.ebuild:
+  Prll make fix, #326987
 
   29 Jul 2010; Diego E. Pettenò <flameeyes@gentoo.org> mp-5.1.3.ebuild:
   Use -j1 for build/install (bug #326987).
diff --git a/app-editors/mp/files/mp-5.1.1-prll.patch b/app-editors/mp/files/mp-5.1.1-prll.patch
new file mode 100644
index 000000000000..4c6c9e822763
--- /dev/null
+++ b/app-editors/mp/files/mp-5.1.1-prll.patch
@@ -0,0 +1,39 @@
+diff --git a/makefile.in b/makefile.in
+index b1cef14..e91a0c5 100644
+--- a/makefile.in
++++ b/makefile.in
+@@ -26,10 +26,10 @@ version:
+ 	$(CC) $(CFLAGS) -I. `cat config.cflags` -c $<
+ 
+ $(MPDM)/libmpdm.a:
+-	( cd $(MPDM); $(MAKE) )
++	$(MAKE) -C $(MPDM)
+ 
+ $(MPSL)/libmpsl.a:
+-	( cd $(MPSL); $(MAKE) )
++	$(MAKE) -C $(MPSL)
+ 
+ dep:
+ 	gcc -MM *.c `cat config.cflags` > makefile.depend
+@@ -88,8 +88,8 @@ $(APPNAME).1: doc/mp_man.txt
+ 	grutatxt -m man -t "Minimum Profit" < doc/mp_man.txt > $(APPNAME).1
+ 
+ docs: $(DOCS)
+-	(cd $(MPDM); $(MAKE) docs)
+-	(cd $(MPSL); $(MAKE) docs)
++	$(MAKE) -C $(MPDM) docs
++	$(MAKE) -C $(MPSL) docs
+ 
+ distcopy: distclean docs
+ 	mkdir -p $(DIST_TARGET) ; \
+@@ -134,8 +134,8 @@ install: $(INSTALL_MSG) installdoc install-mo
+ 
+ installdoc:
+ 	./mkinstalldirs $(PREFIX)/share/doc/$(APPNAME)
+-	( cd $(MPDM); $(MAKE) installdoc )
+-	( cd $(MPSL); $(MAKE) installdoc )
++	$(MAKE) -C $(MPDM) installdoc
++	$(MAKE) -C $(MPSL) installdoc
+ 	install -m 644 doc/* $(PREFIX)/share/doc/$(APPNAME)
+ 	install -m 644 $(ADD_DOCS) $(PREFIX)/share/doc/$(APPNAME)
+ 	[ -f doc/mp_index.html ] && install -m 644 doc/mp_index.html $(PREFIX)/share/doc/$(APPNAME)/index.html || true
diff --git a/app-editors/mp/mp-5.1.1.ebuild b/app-editors/mp/mp-5.1.1.ebuild
index e5738276b232..3e47b19df5df 100644
--- a/app-editors/mp/mp-5.1.1.ebuild
+++ b/app-editors/mp/mp-5.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.1.1.ebuild,v 1.7 2010/07/05 16:40:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.1.1.ebuild,v 1.8 2010/07/30 09:12:32 jlec Exp $
 
 EAPI="3"
 
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="gtk ncurses nls pcre iconv"
 
-RDEPEND="ncurses? ( sys-libs/ncurses )
+RDEPEND="
+	ncurses? ( sys-libs/ncurses )
 	gtk? ( >=x11-libs/gtk+-2 >=x11-libs/pango-1.8.0 )
 	!gtk? ( sys-libs/ncurses )
 	nls? ( sys-devel/gettext )
@@ -28,8 +29,9 @@ DEPEND="${RDEPEND}
 	dev-lang/perl"
 
 src_prepare() {
-	# fix force as-needed wrt bug #278086
-	epatch "${FILESDIR}"/${P}-asneeded.patch
+	epatch \
+		"${FILESDIR}"/${P}-asneeded.patch \
+		"${FILESDIR}"/${P}-prll.patch
 }
 
 src_configure() {
@@ -60,7 +62,7 @@ src_configure() {
 src_install() {
 	dodir /usr/bin
 	sh config.sh --prefix="${EPREFIX}/usr"
-	make DESTDIR="${D}" install || die "Install Failed"
+	emake DESTDIR="${D}" install || die "Install Failed"
 	use gtk && dosym mp-5 /usr/bin/gmp
 }
 
diff --git a/app-editors/mp/mp-5.1.3.ebuild b/app-editors/mp/mp-5.1.3.ebuild
index 3dbe53dd35af..0ccc520852db 100644
--- a/app-editors/mp/mp-5.1.3.ebuild
+++ b/app-editors/mp/mp-5.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.1.3.ebuild,v 1.2 2010/07/29 17:46:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.1.3.ebuild,v 1.3 2010/07/30 09:12:32 jlec Exp $
 
 EAPI="3"
 
@@ -29,8 +29,9 @@ DEPEND="${RDEPEND}
 	dev-lang/perl"
 
 src_prepare() {
-	# fix force as-needed wrt bug #278086
-	epatch "${FILESDIR}"/${P}-asneeded.patch
+	epatch \
+		"${FILESDIR}"/${P}-asneeded.patch \
+		"${FILESDIR}"/${PN}-5.1.1-prll.patch
 }
 
 src_configure() {
@@ -62,15 +63,10 @@ src_configure() {
 	sh config.sh ${myconf} || die "Configure failed"
 }
 
-src_compile() {
-	# bug #326987
-	emake -j1 || die "emake failed"
-}
-
 src_install() {
 	dodir /usr/bin
 	sh config.sh --prefix="${EPREFIX}/usr"
-	emake -j1 DESTDIR="${D}" install || die "Install Failed"
+	emake DESTDIR="${D}" install || die "Install Failed"
 #	use gtk && dosym mp-5 /usr/bin/gmp
 }