1 |
steev 14/01/04 20:46:23 |
2 |
|
3 |
Modified: ChangeLog gdk-pixbuf-2.26.5.ebuild |
4 |
Log: |
5 |
Parallel install fails when no gdk-pixbuf is already installed, bug #481372 |
6 |
|
7 |
This was originally applied to 2.28, but also occurs with 2.26. Change approved by pacho2 on irc |
8 |
|
9 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 06F34B01) |
10 |
|
11 |
Revision Changes Path |
12 |
1.96 x11-libs/gdk-pixbuf/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog?rev=1.96&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog?rev=1.96&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog?r1=1.95&r2=1.96 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v |
21 |
retrieving revision 1.95 |
22 |
retrieving revision 1.96 |
23 |
diff -u -r1.95 -r1.96 |
24 |
--- ChangeLog 23 Dec 2013 23:16:00 -0000 1.95 |
25 |
+++ ChangeLog 4 Jan 2014 20:46:23 -0000 1.96 |
26 |
@@ -1,6 +1,11 @@ |
27 |
# ChangeLog for x11-libs/gdk-pixbuf |
28 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.95 2013/12/23 23:16:00 eva Exp $ |
30 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
31 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.96 2014/01/04 20:46:23 steev Exp $ |
32 |
+ |
33 |
+ 04 Jan 2014; Steev Klimaszewski <steev@g.o> gdk-pixbuf-2.26.5.ebuild: |
34 |
+ Parallel install fails when no gdk-pixbuf is already installed, bug #481372 |
35 |
+ |
36 |
+ (Change approved by pacho2 on irc) |
37 |
|
38 |
*gdk-pixbuf-2.30.1 (23 Dec 2013) |
39 |
|
40 |
|
41 |
|
42 |
|
43 |
1.11 x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild?rev=1.11&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild?rev=1.11&content-type=text/plain |
47 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild?r1=1.10&r2=1.11 |
48 |
|
49 |
Index: gdk-pixbuf-2.26.5.ebuild |
50 |
=================================================================== |
51 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild,v |
52 |
retrieving revision 1.10 |
53 |
retrieving revision 1.11 |
54 |
diff -u -r1.10 -r1.11 |
55 |
--- gdk-pixbuf-2.26.5.ebuild 14 Nov 2013 05:46:07 -0000 1.10 |
56 |
+++ gdk-pixbuf-2.26.5.ebuild 4 Jan 2014 20:46:23 -0000 1.11 |
57 |
@@ -1,6 +1,6 @@ |
58 |
-# Copyright 1999-2013 Gentoo Foundation |
59 |
+# Copyright 1999-2014 Gentoo Foundation |
60 |
# Distributed under the terms of the GNU General Public License v2 |
61 |
-# $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 $ |
62 |
+# $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 $ |
63 |
|
64 |
EAPI="5" |
65 |
|
66 |
@@ -56,7 +56,8 @@ |
67 |
} |
68 |
|
69 |
src_install() { |
70 |
- default |
71 |
+ # Parallel install fails when no gdk-pixbuf is already installd, bug #481372 |
72 |
+ MAKEOPTS+=" -j1" default |
73 |
dodoc AUTHORS NEWS* README* |
74 |
|
75 |
# New library, remove .la files |