Fix parallel make in src_install().

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 77 insertions, 13 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/Manifest b/sci-calculators/units/Manifest
index bb6580a57ffe..c0eb54e5723b 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -2,19 +2,20 @@
 Hash: SHA256
 
 AUX units-2.00-gentoo.patch 899 SHA256 f5f80cdc846bffbe692a950d87b9593b247312ff151ee088b5fca8865535aea9 SHA512 6ddfbd4ba8df2b21061dbe972a821f0fcea61f0caa4e3e701c9822276ae176c02bb9a664dc6b6a7a133908fcc489d60c32f5d1dd62a646dac90cb6e7dfcf3249 WHIRLPOOL adfef712884ca76c0b422b0c4cbb39d9d5cb767699faa99087786c94b639b5531efe2ac4b3cd63fbc94f504959c4dc6c85653c143ac437ad9579fa6023268cb4
+AUX units-2.01-install.patch 2008 SHA256 7487ec8d4d887cae48e6696361a5777b461eec48f1f2d2100b15fc593a578ab1 SHA512 73dfabad8fdbf24798e51f5104c0a68b28b30c53b162c28facd36cc53f5d68afa269decc04d4055475b17b4e5d932f449d174b41aab9546b5e6f2e32e0410203 WHIRLPOOL a3da2bc69feeb54360284e3d1158d68a2e0c29f784348b0e47c953d676c1398e1dd3d221b9800b4a4c5c32d98320bd2606df66e5fd7698385fb9a7e742e263d2
 DIST units-1.88.tar.gz 261519 SHA256 a805707f8f2802c109aef3f32b431ecd9af1fc3de0c5289223e862c673afec0c SHA512 8e5630f6c3223d4c1139cfd905e8c2ede42ede4e5c73f310617b60c3082d2e22f39ddeef2ba7c7fe655b27423f138c8883fca78703d31f5dc3653382c8bac961 WHIRLPOOL c790e7dd785323742331db0b46118b7f48cde085ef910ee05684fbe7335b527006a4c7401986590d50fffd60bed147c59f3d4c074a35bba987e1132da80d9f0e
 DIST units-2.00.tar.gz 653473 SHA256 573c831e428bf47419c5c540dcd4c6669f14154181d0e8812d635ee5bcff7f60 SHA512 0cc366ea7798872a17d4903f8242cd4ce9a08ed11dfea66f15e63b751989762941b1813f249016fc44bbb6ee80799d6f47904d42b4f042d4f8b47077a61ba963 WHIRLPOOL 78e5dfcad8e7dd3a4137b2d35655df292799ee8d3933ec76d6b489bc766c122da35971228b848e8e11af2c96063d30d34cfe27a5bbc25c278fd51feec9d99089
 DIST units-2.01.tar.gz 709368 SHA256 138b12c70bffa0e484fdfe579927412b1ac573e8351c17d8938592f9ba9a88f2 SHA512 ddaa9d8ad84aea963e84379f6d5d6298ec0431c56ba2c805a5fbc3695504279a7ba81609e33bb9d52771ee3ca739570b925d30aa1637dacb5a90d8c8c483fd37 WHIRLPOOL 1c97a5ca7b2e351773eae5850a30680817a5788f8324bd37d2d8632e8a3fcf2a9da7dd59ee0d415bc8617c1e89fcc2a82ac4a51e27f76a1ac8b77321ea035e17
 EBUILD units-1.88-r1.ebuild 691 SHA256 e8a46123ec516f7909931a68e4b5880a764d7586156d46ba54d6d874959e9feb SHA512 0178f16247996a664ee6d71306cbec958ba5cc3bd278ddbbb3649dd58ca67b98b6b3dac85e6dace38458890e446b9acf571ab91ca1f124b36ea8c10cb4a10125 WHIRLPOOL 2ccb7374c639c60f93b83d3467c204d8dc4c493b5ae969b338917705db4f3cbe8740c8a8df01a64e3f93cf23b9d84631cf5fb2e1b2cecbc170bab35f2f8fa2d2
 EBUILD units-1.88.ebuild 721 SHA256 ad29785bbdef28df33e380a4a60a6c0447d94aaed27097ee3a94474ca30c8c29 SHA512 32e670f2ea04362211947e8c053c430f52086527caf914c73dee04bb95ba1f504a54164608c30d3a5e34b05df2c4f9b8f3512f65e379b5e4ffac689c596e551b WHIRLPOOL a7e777bba98f6785e742c220a979c5652f5b47036c2b23b6bb429d720768e784db61cce6dd42ed0cc18613941ec50a3feb42e310fe43b59e9d6c408b628285fd
 EBUILD units-2.00.ebuild 826 SHA256 6979dcaf491863d5982c62828f24237e894f2424bcd6f2581be7c99bbed8a3a0 SHA512 53cdcce286c032cc6216c1c7644f4d3b82d58660f970004340b312333b06f882ab4c3c243907f0afd4754d0a1964b3456a5c8be0882a09ecd7367e1cbee9f2cf WHIRLPOOL a68877693c4fe8fbafe1bb0842d892891f23648594eb4cdcb2d0149efb86be2cef966b4f9782af0eb874b3c8cc6f22105fa900b59a3648341ce5c88a4988ae4c
-EBUILD units-2.01.ebuild 785 SHA256 aefac42c28abe110aee4f8dec9009389fa55c432af6ca546f03726c4212725df SHA512 c951615a3d433f9c7090c36be150534f7ddf0506e4d7fac5396242bd7ff6a0559961672b7c4a4783491236dd8de086d78335845e870bd3af897d72cbbf49a999 WHIRLPOOL 52c03c62c64eaaf8a806dd2a1bbae7eb097cd03f9122e125beea4d3b0df75918036113b234985c530bc5b7afd64ecbe17c692e39237c320ef6677696ba90a5be
-MISC ChangeLog 6090 SHA256 9675609c490a541ad7686e79bd5a6ac5d25b5e1cb500485e416172d8a36b4dab SHA512 15106c5602b96ff4ff95bab4ed615e1b4e6a28149ef522505a6fd077b59915b79538939bd460b352b7bd05eebe9c1eb477c89026dd6c3885cd66745807f1c7a3 WHIRLPOOL f22ceaeb1c167c30cb19db79a7d56b4e6b374a4d8aa5898ac1c43d7c67aafbcf08d5fc44218c3687a0127c9a445ed6fa3706cfd5cff93ec41f3ce94ddde34884
+EBUILD units-2.01.ebuild 829 SHA256 74d718a52347f1fe2d3f3e1607e7168ccc9380b4e7f5ead0261d816392345159 SHA512 0abd271f5e6642698852ed68bab004879696dfa43d7d73946f33bfabb7292a4e5a2ba0fd8ca56315484972af8d7ffb53d156030a43669e55bff4f5b6f897785a WHIRLPOOL 6607598ca5470af24fca373890612a548686fdea939fbfe543cb4d3cad0e676bd6e9a1b776a0ad23d1e9dae37a88260144dd9003aa66afdc462ad718afa7dc4e
+MISC ChangeLog 6230 SHA256 d2a792412cda0de2819b7d638ceb10d2b44d072d477919032f839a32be380f90 SHA512 44c2edbf6a81c2245bdda808fcb4bd01d77e6c1f29b6f536db453a765a97081b0c290ba93daa4be3e4a472599673981c3a58d4f8266fb08fd426eaf202210c92 WHIRLPOOL b0569e526ccb7ff7e1e745a482a6127cb20f8608817a10833b4cc4ba63e32af9a8263fce1094e8b3badef4fe8375f49d1a43061efb5ed2abc4f2b1ed592a3fcf
 MISC metadata.xml 248 SHA256 58e4ea49619db3881b26ad216ddbeb323a376bf8240a7018c17a13290b1ca961 SHA512 3607743519ddf9b2eae6b2f4e09a33d21473374db82fe797dc013e525f7329c571623201a3283b3335d1ce5dfc2158604ed5e43c015afc42cd22bd74a9350f8f WHIRLPOOL 9625177279ba8a932632d4562090813a9e8b501edd58530b8dad656687a122d6eac179b9eae8c2b47148116d7d753a6063442e3faec2473512ca713218e82b12
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCYFHAACgkQVWmRsqeSphNuZQCfcWOYZ7k9WwZFYZDCVk/FfsZq
-p/0AnjTWNTBtpJ01uHn+Qm8YH1Y7slnX
-=labA
+iEYEAREIAAYFAlCYHRoACgkQVWmRsqeSphMT0wCfQEn0K4NJIu92XzLE2Qkbawoa
+oZoAn2WCIPrxoOmTGqdHRRXJ64QzF6iS
+=mziy
 -----END PGP SIGNATURE-----
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
-}