1 |
scarabeus 11/04/29 12:05:19 |
2 |
|
3 |
Modified: metadata.xml ChangeLog cairo-9999.ebuild |
4 |
cairo-1.10.2-r1.ebuild |
5 |
Log: |
6 |
Add optional dependency on glib. Per bug #365159 |
7 |
|
8 |
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.18 x11-libs/cairo/metadata.xml |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/metadata.xml?rev=1.18&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/metadata.xml?rev=1.18&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/metadata.xml?r1=1.17&r2=1.18 |
16 |
|
17 |
Index: metadata.xml |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/metadata.xml,v |
20 |
retrieving revision 1.17 |
21 |
retrieving revision 1.18 |
22 |
diff -u -r1.17 -r1.18 |
23 |
--- metadata.xml 7 Mar 2011 17:22:33 -0000 1.17 |
24 |
+++ metadata.xml 29 Apr 2011 12:05:19 -0000 1.18 |
25 |
@@ -21,6 +21,7 @@ |
26 |
</flag> |
27 |
<flag name='drm'>Use Linux DRM for backend acceleration</flag> |
28 |
<flag name='gallium'>Use Mesa's Gallium backend for acceleration</flag> |
29 |
+ <flag name='glib'>Compile with GLib Object System support</flag> |
30 |
<flag name='openvg'>Use OpenVG for backend acceleration</flag> |
31 |
</use> |
32 |
</pkgmetadata> |
33 |
|
34 |
|
35 |
|
36 |
1.281 x11-libs/cairo/ChangeLog |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.281&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.281&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?r1=1.280&r2=1.281 |
41 |
|
42 |
Index: ChangeLog |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v |
45 |
retrieving revision 1.280 |
46 |
retrieving revision 1.281 |
47 |
diff -u -r1.280 -r1.281 |
48 |
--- ChangeLog 20 Apr 2011 11:21:30 -0000 1.280 |
49 |
+++ ChangeLog 29 Apr 2011 12:05:19 -0000 1.281 |
50 |
@@ -1,6 +1,10 @@ |
51 |
# ChangeLog for x11-libs/cairo |
52 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
53 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.280 2011/04/20 11:21:30 scarabeus Exp $ |
54 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.281 2011/04/29 12:05:19 scarabeus Exp $ |
55 |
+ |
56 |
+ 29 Apr 2011; Tomáš Chvátal <scarabeus@g.o> cairo-1.10.2-r1.ebuild, |
57 |
+ cairo-9999.ebuild, metadata.xml: |
58 |
+ Add optional dependency on glib. Per bug #365159 |
59 |
|
60 |
20 Apr 2011; Tomáš Chvátal <scarabeus@g.o> cairo-9999.ebuild: |
61 |
Migrate live ebuild to git-2 eclass and update to eapi4. |
62 |
|
63 |
|
64 |
|
65 |
1.12 x11-libs/cairo/cairo-9999.ebuild |
66 |
|
67 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.12&view=markup |
68 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.12&content-type=text/plain |
69 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?r1=1.11&r2=1.12 |
70 |
|
71 |
Index: cairo-9999.ebuild |
72 |
=================================================================== |
73 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v |
74 |
retrieving revision 1.11 |
75 |
retrieving revision 1.12 |
76 |
diff -u -r1.11 -r1.12 |
77 |
--- cairo-9999.ebuild 20 Apr 2011 11:21:30 -0000 1.11 |
78 |
+++ cairo-9999.ebuild 29 Apr 2011 12:05:19 -0000 1.12 |
79 |
@@ -1,6 +1,6 @@ |
80 |
# Copyright 1999-2011 Gentoo Foundation |
81 |
# Distributed under the terms of the GNU General Public License v2 |
82 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.11 2011/04/20 11:21:30 scarabeus Exp $ |
83 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.12 2011/04/29 12:05:19 scarabeus Exp $ |
84 |
|
85 |
EAPI=4 |
86 |
|
87 |
@@ -16,7 +16,7 @@ |
88 |
LICENSE="|| ( LGPL-2.1 MPL-1.1 )" |
89 |
SLOT="0" |
90 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
91 |
-IUSE="X aqua debug directfb doc drm gallium opengl openvg qt4 static-libs +svg xcb" |
92 |
+IUSE="X aqua debug directfb doc drm gallium +glib opengl openvg qt4 static-libs +svg xcb" |
93 |
|
94 |
# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it |
95 |
RESTRICT="test" |
96 |
@@ -27,6 +27,7 @@ |
97 |
sys-libs/zlib |
98 |
>=x11-libs/pixman-0.18.4 |
99 |
directfb? ( dev-libs/DirectFB ) |
100 |
+ glib? ( >=dev-libs/glib-2.28.6:2 ) |
101 |
opengl? ( virtual/opengl ) |
102 |
openvg? ( media-libs/mesa[gallium] ) |
103 |
qt4? ( >=x11-libs/qt-gui-4.4:4 ) |
104 |
@@ -114,6 +115,7 @@ |
105 |
$(use_enable aqua quartz-image) \ |
106 |
$(use_enable debug test-surfaces) \ |
107 |
$(use_enable directfb) \ |
108 |
+ $(use_enable glib gobject) \ |
109 |
$(use_enable doc gtk-doc) \ |
110 |
$(use_enable openvg vg) \ |
111 |
$(use_enable opengl gl) \ |
112 |
|
113 |
|
114 |
|
115 |
1.11 x11-libs/cairo/cairo-1.10.2-r1.ebuild |
116 |
|
117 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-1.10.2-r1.ebuild?rev=1.11&view=markup |
118 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-1.10.2-r1.ebuild?rev=1.11&content-type=text/plain |
119 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-1.10.2-r1.ebuild?r1=1.10&r2=1.11 |
120 |
|
121 |
Index: cairo-1.10.2-r1.ebuild |
122 |
=================================================================== |
123 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.2-r1.ebuild,v |
124 |
retrieving revision 1.10 |
125 |
retrieving revision 1.11 |
126 |
diff -u -r1.10 -r1.11 |
127 |
--- cairo-1.10.2-r1.ebuild 10 Apr 2011 10:25:22 -0000 1.10 |
128 |
+++ cairo-1.10.2-r1.ebuild 29 Apr 2011 12:05:19 -0000 1.11 |
129 |
@@ -1,6 +1,6 @@ |
130 |
# Copyright 1999-2011 Gentoo Foundation |
131 |
# Distributed under the terms of the GNU General Public License v2 |
132 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.2-r1.ebuild,v 1.10 2011/04/10 10:25:22 ssuominen Exp $ |
133 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.2-r1.ebuild,v 1.11 2011/04/29 12:05:19 scarabeus Exp $ |
134 |
|
135 |
EAPI=3 |
136 |
|
137 |
@@ -16,7 +16,7 @@ |
138 |
LICENSE="|| ( LGPL-2.1 MPL-1.1 )" |
139 |
SLOT="0" |
140 |
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
141 |
-IUSE="X aqua debug directfb doc drm gallium opengl openvg qt4 static-libs +svg xcb" |
142 |
+IUSE="X aqua debug directfb doc drm gallium +glib opengl openvg qt4 static-libs +svg xcb" |
143 |
|
144 |
# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it |
145 |
RESTRICT="test" |
146 |
@@ -27,6 +27,7 @@ |
147 |
sys-libs/zlib |
148 |
>=x11-libs/pixman-0.18.4 |
149 |
directfb? ( dev-libs/DirectFB ) |
150 |
+ glib? ( dev-libs/glib:2 ) |
151 |
opengl? ( virtual/opengl ) |
152 |
openvg? ( media-libs/mesa[gallium] ) |
153 |
qt4? ( >=x11-libs/qt-gui-4.4:4 ) |
154 |
@@ -128,6 +129,7 @@ |
155 |
$(use_enable aqua quartz-image) \ |
156 |
$(use_enable debug test-surfaces) \ |
157 |
$(use_enable directfb) \ |
158 |
+ $(use_enable glib gobject) \ |
159 |
$(use_enable doc gtk-doc) \ |
160 |
$(use_enable openvg vg) \ |
161 |
$(use_enable opengl gl) \ |