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

(Portage version: 2.2.0_alpha18/cvs/Linux x86_64)

4 files changed, 29 insertions, 9 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/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