From cf6efd2b5b68991e97e4c56feaf4d6c845b9e650 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Fri, 21 Jan 2011 09:10:32 +0000 Subject: Fix parallel installation problem, #352321 (Portage version: 2.2.0_alpha18/cvs/Linux x86_64) --- media-fonts/terminus-font/ChangeLog | 6 +++++- media-fonts/terminus-font/terminus-font-4.30.ebuild | 10 +++++----- media-fonts/terminus-font/terminus-font-4.32.ebuild | 8 ++++---- 3 files changed, 14 insertions(+), 10 deletions(-) (limited to 'media-fonts') diff --git a/media-fonts/terminus-font/ChangeLog b/media-fonts/terminus-font/ChangeLog index fb9f7446689b..5d8aa52a0a6b 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.80 2011/01/20 23:47:45 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/ChangeLog,v 1.81 2011/01/21 09:10:32 jlec Exp $ + + 21 Jan 2011; Justin Lecher terminus-font-4.30.ebuild, + terminus-font-4.32.ebuild: + Fix parallel installation problem, #352321 *terminus-font-4.32 (20 Jan 2011) diff --git a/media-fonts/terminus-font/terminus-font-4.30.ebuild b/media-fonts/terminus-font/terminus-font-4.30.ebuild index 5306c2ecee20..c320ad22ab3c 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-2010 Gentoo Foundation +# 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.9 2010/07/07 09:21:36 ssuominen Exp $ +# $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 $ EAPI="3" @@ -87,13 +87,13 @@ src_compile() { src_install() { if use psf; then - emake DESTDIR="${D}" install-psf install-uni install-acm install-ref || die + emake -j1 DESTDIR="${D}" install-psf install-uni install-acm install-ref || die fi if use raw-font-data; then - emake DESTDIR="${D}" install.raw || die + emake -j1 DESTDIR="${D}" install.raw || die fi if use pcf; then - emake DESTDIR="${D}" install-pcf || die + emake -j1 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 8d5de5ffcd4f..842159e78d3d 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.1 2011/01/20 23:47:45 spatz Exp $ +# $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 $ EAPI=3 @@ -68,13 +68,13 @@ src_compile() { src_install() { if use psf; then - emake DESTDIR="${D}" install-psf install-uni install-acm install-ref || die + emake -j1 DESTDIR="${D}" install-psf install-uni install-acm install-ref || die fi if use raw-font-data; then - emake DESTDIR="${D}" install.raw || die + emake -j1 DESTDIR="${D}" install.raw || die fi if use pcf; then - emake DESTDIR="${D}" install-pcf || die + emake -j1 DESTDIR="${D}" install-pcf || die fi font_src_install -- cgit v1.2.3-65-gdbad