Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-misc/colord: ChangeLog colord-1.2.9.ebuild colord-1.2.8.ebuild colord-1.2.5-r1.ebuild
Date: Sun, 29 Mar 2015 18:19:32
Message-Id: 20150329181924.63C5314CAB@oystercatcher.gentoo.org
1 tetromino 15/03/29 18:19:23
2
3 Modified: ChangeLog colord-1.2.9.ebuild
4 Removed: colord-1.2.8.ebuild colord-1.2.5-r1.ebuild
5 Log:
6 Fix multilib build when USE=-gusb (bug #544968, thanks to Dell'Aica Valentino). Drop old.
7
8 (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)
9
10 Revision Changes Path
11 1.99 x11-misc/colord/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/colord/ChangeLog?rev=1.99&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/colord/ChangeLog?rev=1.99&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/colord/ChangeLog?r1=1.98&r2=1.99
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v
20 retrieving revision 1.98
21 retrieving revision 1.99
22 diff -u -r1.98 -r1.99
23 --- ChangeLog 29 Mar 2015 11:19:57 -0000 1.98
24 +++ ChangeLog 29 Mar 2015 18:19:23 -0000 1.99
25 @@ -1,6 +1,11 @@
26 # ChangeLog for x11-misc/colord
27 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.98 2015/03/29 11:19:57 jer Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.99 2015/03/29 18:19:23 tetromino Exp $
30 +
31 + 29 Mar 2015; Alexandre Rostovtsev <tetromino@g.o>
32 + -colord-1.2.5-r1.ebuild, -colord-1.2.8.ebuild, colord-1.2.9.ebuild:
33 + Fix multilib build when USE=-gusb (bug #544968, thanks to Dell'Aica
34 + Valentino). Drop old.
35
36 29 Mar 2015; Jeroen Roovers <jer@g.o> colord-1.2.9.ebuild:
37 Stable for HPPA (bug #534012).
38
39
40
41 1.5 x11-misc/colord/colord-1.2.9.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/colord/colord-1.2.9.ebuild?rev=1.5&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/colord/colord-1.2.9.ebuild?rev=1.5&content-type=text/plain
45 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/colord/colord-1.2.9.ebuild?r1=1.4&r2=1.5
46
47 Index: colord-1.2.9.ebuild
48 ===================================================================
49 RCS file: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-1.2.9.ebuild,v
50 retrieving revision 1.4
51 retrieving revision 1.5
52 diff -u -r1.4 -r1.5
53 --- colord-1.2.9.ebuild 29 Mar 2015 11:19:57 -0000 1.4
54 +++ colord-1.2.9.ebuild 29 Mar 2015 18:19:23 -0000 1.5
55 @@ -1,6 +1,6 @@
56 # Copyright 1999-2015 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-1.2.9.ebuild,v 1.4 2015/03/29 11:19:57 jer Exp $
59 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-1.2.9.ebuild,v 1.5 2015/03/29 18:19:23 tetromino Exp $
60
61 EAPI="5"
62 GCONF_DEBUG="no"
63 @@ -128,7 +128,7 @@
64 gnome2_src_compile
65 else
66 emake -C lib/colord
67 - emake -C lib/colorhug
68 + use gusb && emake -C lib/colorhug
69 emake -C lib/compat
70 fi
71 }
72 @@ -138,7 +138,7 @@
73 default
74 else
75 emake -C lib/colord check
76 - emake -C lib/colorhug check
77 + use gusb && emake -C lib/colorhug check
78 emake -C lib/compat check
79 fi
80 }
81 @@ -148,7 +148,7 @@
82 gnome2_src_install
83 else
84 gnome2_src_install -C lib/colord
85 - gnome2_src_install -C lib/colorhug
86 + use gusb && gnome2_src_install -C lib/colorhug
87 gnome2_src_install -C lib/compat
88 gnome2_src_install -C contrib/session-helper install-libcolord_includeHEADERS
89 fi