summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Klimaszewski <steev@gentoo.org>2014-01-04 20:46:23 +0000
committerStephen Klimaszewski <steev@gentoo.org>2014-01-04 20:46:23 +0000
commit23ecc2a2db56901e0596b24bbb43359c3db45b7a (patch)
tree383aefa28911855373d7e451a1f13c9b5ae20faf /x11-libs
parentSnapshot of trunk. (diff)
downloadgentoo-2-23ecc2a2db56901e0596b24bbb43359c3db45b7a.tar.gz
gentoo-2-23ecc2a2db56901e0596b24bbb43359c3db45b7a.tar.bz2
gentoo-2-23ecc2a2db56901e0596b24bbb43359c3db45b7a.zip
Parallel install fails when no gdk-pixbuf is already installed, bug #481372
This was originally applied to 2.28, but also occurs with 2.26. Change approved by pacho2 on irc (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 06F34B01)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/gdk-pixbuf/ChangeLog9
-rw-r--r--x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild7
2 files changed, 11 insertions, 5 deletions
diff --git a/x11-libs/gdk-pixbuf/ChangeLog b/x11-libs/gdk-pixbuf/ChangeLog
index 96746b56cd24..034afbfb406d 100644
--- a/x11-libs/gdk-pixbuf/ChangeLog
+++ b/x11-libs/gdk-pixbuf/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-libs/gdk-pixbuf
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.95 2013/12/23 23:16:00 eva Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.96 2014/01/04 20:46:23 steev Exp $
+
+ 04 Jan 2014; Steev Klimaszewski <steev@gentoo.org> gdk-pixbuf-2.26.5.ebuild:
+ Parallel install fails when no gdk-pixbuf is already installed, bug #481372
+
+ (Change approved by pacho2 on irc)
*gdk-pixbuf-2.30.1 (23 Dec 2013)
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild
index 19c3aabab569..8552c91a0ef8 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild,v 1.10 2013/11/14 05:46:07 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild,v 1.11 2014/01/04 20:46:23 steev Exp $
EAPI="5"
@@ -56,7 +56,8 @@ src_configure() {
}
src_install() {
- default
+ # Parallel install fails when no gdk-pixbuf is already installd, bug #481372
+ MAKEOPTS+=" -j1" default
dodoc AUTHORS NEWS* README*
# New library, remove .la files