Properly fix parallel install (bug #352321 by Tolga Dalman).

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

5 files changed, 37 insertions, 16 deletions

diff --git a/media-fonts/terminus-font/ChangeLog b/media-fonts/terminus-font/ChangeLog
index 5d8aa52a0a6b..1cba65f98bb7 100644
--- a/media-fonts/terminus-font/ChangeLog
+++ b/media-fonts/terminus-font/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/terminus-font
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/ChangeLog,v 1.81 2011/01/21 09:10:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/ChangeLog,v 1.82 2011/01/22 01:32:11 dirtyepic Exp $
+
+  22 Jan 2011; Ryan Hill <dirtyepic@gentoo.org> terminus-font-4.30.ebuild,
+  terminus-font-4.32.ebuild, +files/terminus-font-4.32-parallel-install.patch:
+  Properly fix parallel install (bug #352321 by Tolga Dalman).
 
   21 Jan 2011; Justin Lecher <jlec@gentoo.org> terminus-font-4.30.ebuild,
   terminus-font-4.32.ebuild:
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index d91db084280c..ce75426df947 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX terminus-font-4.32-parallel-install.patch 310 RMD160 c8531c74c222f72cf031abfa98d0502378db6ade SHA1 02fe72c4e8a8cdd16450ae7a064490083e834bb5 SHA256 3ca83cd99f02a348920973796989c15ea52b3c57586887aa23993939a9b4f0c7
 DIST terminus-font-4.30-ao2.diff.gz 4064 RMD160 042b4d1fde790cc9414d20235079f8487c69857e SHA1 15c1c2d0221b302bcbc57c2595dc39c0db9509a7 SHA256 4586eb56533c3fad417b13d64c88bb97a3604f68dac1fc4c90372c9c93cc82ac
 DIST terminus-font-4.30-cm2.diff.gz 1429 RMD160 6ad6d4e981569bc6a3097aafe47c431b7fd5b41b SHA1 50e0f6a13e04bc426921bbf5ff155ede00756a04 SHA256 eae31c02216ea9b586eea121b7ab70ac71a869c8a62551c719ef1fac397db744
 DIST terminus-font-4.30-dv1.diff.gz 1242 RMD160 f3f7b53f7fa5e35f025f2a8ae72f20075542194d SHA1 d0d5dcf08b0725c41bfb3fc98ef17c14591f9387 SHA256 fc2c3a28e1542ec19083c0739c39fa2e914047173cd78e0da824c41ba2315399
@@ -14,14 +15,14 @@ DIST terminus-font-4.30-kx3-ka2.diff.gz 1060 RMD160 ded6be39049d8371531016ea6304
 DIST terminus-font-4.30-kx3.diff.gz 3135 RMD160 0744f53720b1f9196e1122f85dd9f3d5b347b323 SHA1 3dccf0b9bdc37e9ec80de3109d7ecc741ea2edb6 SHA256 6672e498b85614cb6a5d01c3576e0a1511962b2d6d6ae3f55ea2dd53c57bcfcf
 DIST terminus-font-4.30.tar.gz 267236 RMD160 d7835e99012895b15f295fc1d19551c9ed241354 SHA1 472dbdc8ee7fa42ea8f91e41e9f154f23f9453b9 SHA256 ca15718f715f1ca7af827a8ab5543b0c0339b2515f39f8c15f241b2bc1a15a9a
 DIST terminus-font-4.32.tar.gz 278839 RMD160 7b649f6610764763bdb8e44c39c95fe06edd6d93 SHA1 10be9f7f09f642b941acc7f644545e23fbb0494d SHA256 f05a8afb426af080bc94b6ac9846daac2a3f2e2883feaf96a503bb2e5507aea4
-EBUILD terminus-font-4.30.ebuild 3260 RMD160 ee9c8b96af64e27258cce908a2d755970053dc21 SHA1 5ed7283e1fc8238b51e8dc7adaac4b90357e8368 SHA256 7b38a32fefdeb3b5a17bd20477edb5944369b5db8f5aff31e8d04d246baf4c70
-EBUILD terminus-font-4.32.ebuild 2528 RMD160 1e01ecd398ff4bce4a799d54b2fcf205ac9994aa SHA1 68daee5831fe60d3b4e90ba0440d16b7983a67de SHA256 4ee95c585da7ef720c46ea0bb7198d5330c051c63ea569e8a59646135b4e41f0
-MISC ChangeLog 11419 RMD160 c176f5d46dee315a75dfbfae7f8995e789116b7c SHA1 f0ac1a5b38bb1672f03780ad516e59d3c4346872 SHA256 cd4cfdd915810d4fdce85732e22ed4a3ccf65425865add67e541b12a03d267e3
+EBUILD terminus-font-4.30.ebuild 3310 RMD160 5783ec5fd08ce4c57bb8e1bbf054c6aaf614adfd SHA1 85fbc2414567cc562d8de482a5856e3a264cca60 SHA256 ec9a30f8b185503e8a1232ed95ba6bbae7f0e584e9528588f727fc4e67c11812
+EBUILD terminus-font-4.32.ebuild 2572 RMD160 c430d651b370208ad1dd5db336ae6c1350398953 SHA1 21c0e8b157f26bc81af0af70e5c4cc37ada4722b SHA256 3f4354182484cad334f7ce8b9b7602d5deb24255482850501bb2618efa57df80
+MISC ChangeLog 11642 RMD160 09040cfba425a94be1a0482c732ab8b52f2c9de9 SHA1 4d648d7bc18c6c451a09aafee56d02c8d7bfc78b SHA256 a81292db65c6875663dad490606ded4e0ab7c8db72f49c3531a25a74e563f618
 MISC metadata.xml 1210 RMD160 482c71c57abd30d4f39d5a701af80a0f2c14b867 SHA1 4eeceb65135e59a6344daff5696b57eb6537e537 SHA256 52607b7eb4be346a553675b968b3e27e0273f7229856e860ad5d2eb7dd466797
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk05TY4ACgkQgAnW8HDreRaZcgCgsYk3k49ueEJMD/zTocf7V5Ey
-KuAAnjRUEvfM8oUiA5h8iqBMM0yKs3yW
-=ialE
+iEYEARECAAYFAk06NPoACgkQiqiDRvmkBmIy6gCg7t4wh2phxAi58dN7GgdRUAOp
+QswAoNTvg9EStttFhKw32dMY72WI/WyH
+=kJzC
 -----END PGP SIGNATURE-----
diff --git a/media-fonts/terminus-font/files/terminus-font-4.32-parallel-install.patch b/media-fonts/terminus-font/files/terminus-font-4.32-parallel-install.patch
new file mode 100644
index 000000000000..cda6fb318872
--- /dev/null
+++ b/media-fonts/terminus-font/files/terminus-font-4.32-parallel-install.patch
@@ -0,0 +1,12 @@
+diff --git a/Makefile b/Makefile
+index eff66f7..f71b025 100644
+--- a/Makefile
++++ b/Makefile
+@@ -197,6 +197,7 @@ uninstall-psf-512:
+ ref = $(psfdir)/README.terminus
+ 
+ install-ref: README
++	mkdir -p $(DESTDIR)$(psfdir)
+ 	sed -e"/^2\.4/,/^2\.5/p" -n README | grep -v "^2\." > $(DESTDIR)$(ref)
+ 
+ uninstall-ref:
diff --git a/media-fonts/terminus-font/terminus-font-4.30.ebuild b/media-fonts/terminus-font/terminus-font-4.30.ebuild
index c320ad22ab3c..6a46fbba657b 100644
--- a/media-fonts/terminus-font/terminus-font-4.30.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.30.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/media-fonts/terminus-font/terminus-font-4.30.ebuild,v 1.10 2011/01/21 09:10:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.30.ebuild,v 1.11 2011/01/22 01:32:11 dirtyepic Exp $
 
 EAPI="3"
 
@@ -67,6 +67,8 @@ src_prepare() {
 	use ru-g && epatch "${WORKDIR}"/${P}-ge1.diff
 	use quote && epatch "${WORKDIR}"/${P}-gq2.diff
 	use width && epatch "${WORKDIR}"/${P}-cm2.diff
+
+	epatch "${FILESDIR}"/${PN}-4.32-parallel-install.patch
 }
 
 src_configure() {
@@ -87,13 +89,13 @@ src_compile() {
 
 src_install() {
 	if use psf; then
-		emake -j1 DESTDIR="${D}" install-psf install-uni install-acm install-ref || die
+		emake DESTDIR="${D}" install-psf install-uni install-acm install-ref || die
 	fi
 	if use raw-font-data; then
-		emake -j1 DESTDIR="${D}" install.raw || die
+		emake DESTDIR="${D}" install.raw || die
 	fi
 	if use pcf; then
-		emake -j1 DESTDIR="${D}" install-pcf || die
+		emake DESTDIR="${D}" install-pcf || die
 	fi
 
 	font_src_install
diff --git a/media-fonts/terminus-font/terminus-font-4.32.ebuild b/media-fonts/terminus-font/terminus-font-4.32.ebuild
index 842159e78d3d..dce679d54704 100644
--- a/media-fonts/terminus-font/terminus-font-4.32.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.32.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/media-fonts/terminus-font/terminus-font-4.32.ebuild,v 1.2 2011/01/21 09:10:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.32.ebuild,v 1.3 2011/01/22 01:32:11 dirtyepic Exp $
 
 EAPI=3
 
@@ -48,6 +48,8 @@ src_prepare() {
 	use ru-g     && epatch "${S}"/alt/ge1.diff
 	use quote    && epatch "${S}"/alt/gq2.diff
 	use width    && epatch "${S}"/alt/cm2.diff
+
+	epatch "${FILESDIR}"/${P}-parallel-install.patch
 }
 
 src_configure() {
@@ -68,13 +70,13 @@ src_compile() {
 
 src_install() {
 	if use psf; then
-		emake -j1 DESTDIR="${D}" install-psf install-uni install-acm install-ref || die
+		emake DESTDIR="${D}" install-psf install-uni install-acm install-ref || die
 	fi
 	if use raw-font-data; then
-		emake -j1 DESTDIR="${D}" install.raw || die
+		emake DESTDIR="${D}" install.raw || die
 	fi
 	if use pcf; then
-		emake -j1 DESTDIR="${D}" install-pcf || die
+		emake DESTDIR="${D}" install-pcf || die
 	fi
 
 	font_src_install