Fix parallel make in src_install().

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 71 insertions, 8 deletions

diff --git a/sci-calculators/units/ChangeLog b/sci-calculators/units/ChangeLog
index 8a910464a39e..c90ccdd5f01f 100644
--- a/sci-calculators/units/ChangeLog
+++ b/sci-calculators/units/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-calculators/units
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/units/ChangeLog,v 1.37 2012/11/05 19:33:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/units/ChangeLog,v 1.38 2012/11/05 20:10:01 jer Exp $
+
+  05 Nov 2012; Jeroen Roovers <jer@gentoo.org> units-2.01.ebuild,
+  +files/units-2.01-install.patch:
+  Fix parallel make in src_install().
 
   05 Nov 2012; Jeroen Roovers <jer@gentoo.org> units-2.00.ebuild,
   units-2.01.ebuild:
diff --git a/sci-calculators/units/files/units-2.01-install.patch b/sci-calculators/units/files/units-2.01-install.patch
new file mode 100644
index 000000000000..c48cdbefbabc
--- /dev/null
+++ b/sci-calculators/units/files/units-2.01-install.patch
@@ -0,0 +1,58 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -24,6 +24,7 @@
+ 
+ AC_C_CONST
+ AC_PROG_INSTALL
++AC_PROG_MKDIR_P
+ 
+ dnl Checks for libraries.
+ 
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -31,6 +31,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
++MKDIR_P = @MKDIR_P@
+ MAKEINFO = makeinfo
+ TEXI2DVI = texi2dvi
+ TEXI2PDF = texi2pdf
+@@ -84,24 +85,24 @@
+ 	sed -e "s:outfile = 'currency.units':outfile='@UDAT@currency.units':" units_cur > units_cur_inst
+ 
+ install-support: definitions.units currency.units units_cur_inst
+-	$(srcdir)/mkinstalldirs $(DESTDIR)@UDAT@ $(DESTDIR)$(bindir) 
++	$(MKDIR_P) $(DESTDIR)@UDAT@ $(DESTDIR)$(bindir) 
+ 	$(INSTALL_DATA) $(srcdir)/definitions.units $(DESTDIR)@UDAT@definitions.units
+ 	$(INSTALL_DATA) $(srcdir)/currency.units $(DESTDIR)@UDAT@currency.units
+ 	$(INSTALL_DATA) $(srcdir)/locale.map $(DESTDIR)@UDAT@locale.map
+ 	$(INSTALL_PROGRAM) units_cur_inst $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'`
+ 
+ install: units@EXEEXT@ install-doc install-support
+-	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) 
++	$(MKDIR_P) $(DESTDIR)$(bindir) 
+ 	$(INSTALL_PROGRAM) units@EXEEXT@ $(DESTDIR)$(bindir)/`echo units@EXEEXT@|sed '$(transform)'`
+ 
+ install-strip: units@EXEEXT@ install-doc install-support
+-	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++	$(MKDIR_P) $(DESTDIR)$(bindir)
+ 	$(INSTALL_PROGRAM) -s units@EXEEXT@ $(DESTDIR)$(bindir)/`echo units@EXEEXT@|sed '$(transform)'`
+ 
+ install-doc: install-man install-info
+ 
+ install-man: units.1
+-	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
++	$(MKDIR_P) $(DESTDIR)$(mandir)/man1
+ 	$(INSTALL_DATA) units.1 $(DESTDIR)$(mandir)/man1/`echo units|sed '$(transform)'`.1
+ 
+ units.man: units.texinfo texi2man
+@@ -114,7 +115,7 @@
+ 
+ $(DESTDIR)$(infodir)/units.info: units.info
+ 	$(POST_INSTALL)
+-	$(srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
++	$(MKDIR_P) $(DESTDIR)$(infodir)
+ # There may be a newer info file in . than in srcdir.
+ 	-if test -f units.info; then d=.; \
+ 	    else d=$(srcdir); fi; \
diff --git a/sci-calculators/units/units-2.01.ebuild b/sci-calculators/units/units-2.01.ebuild
index b88950902aeb..6a8da3a4b601 100644
--- a/sci-calculators/units/units-2.01.ebuild
+++ b/sci-calculators/units/units-2.01.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/units/units-2.01.ebuild,v 1.2 2012/11/05 19:33:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/units/units-2.01.ebuild,v 1.3 2012/11/05 20:10:01 jer Exp $
 
 EAPI=4
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="Unit conversion program"
 HOMEPAGE="http://www.gnu.org/software/units/units.html"
@@ -22,12 +22,13 @@ RDEPEND="
 	${DEPEND}
 "
 
+DOCS=( ChangeLog NEWS README )
+
 src_prepare() {
+	# Fix parallel make install
+	epatch "${FILESDIR}"/${P}-install.patch
+	eautoreconf
+
 	# Fix shebang for python2
 	sed -i units_cur -e '1s|$|2|' || die
 }
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	dodoc ChangeLog NEWS README
-}