1 |
jlec 12/11/01 10:32:18 |
2 |
|
3 |
Modified: libchamplain-0.12.3.ebuild ChangeLog |
4 |
libchamplain-0.10.1.ebuild |
5 |
libchamplain-0.8.3.ebuild |
6 |
Log: |
7 |
media-libs/libchamplain: Backport upstream fixes for #440646 |
8 |
|
9 |
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916) |
10 |
|
11 |
Revision Changes Path |
12 |
1.5 media-libs/libchamplain/libchamplain-0.12.3.ebuild |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libchamplain/libchamplain-0.12.3.ebuild?rev=1.5&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libchamplain/libchamplain-0.12.3.ebuild?rev=1.5&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libchamplain/libchamplain-0.12.3.ebuild?r1=1.4&r2=1.5 |
17 |
|
18 |
Index: libchamplain-0.12.3.ebuild |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libchamplain/libchamplain-0.12.3.ebuild,v |
21 |
retrieving revision 1.4 |
22 |
retrieving revision 1.5 |
23 |
diff -u -r1.4 -r1.5 |
24 |
--- libchamplain-0.12.3.ebuild 17 Oct 2012 03:22:36 -0000 1.4 |
25 |
+++ libchamplain-0.12.3.ebuild 1 Nov 2012 10:32:17 -0000 1.5 |
26 |
@@ -1,42 +1,43 @@ |
27 |
# Copyright 1999-2012 Gentoo Foundation |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/libchamplain-0.12.3.ebuild,v 1.4 2012/10/17 03:22:36 phajdan.jr Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/libchamplain-0.12.3.ebuild,v 1.5 2012/11/01 10:32:17 jlec Exp $ |
31 |
|
32 |
-EAPI="4" |
33 |
-GCONF_DEBUG="no" |
34 |
-GNOME2_LA_PUNT="yes" |
35 |
+EAPI=4 |
36 |
|
37 |
-inherit gnome2 |
38 |
+GCONF_DEBUG=no |
39 |
+GNOME2_LA_PUNT=yes |
40 |
+ |
41 |
+inherit eutils gnome2 |
42 |
|
43 |
DESCRIPTION="Clutter based world map renderer" |
44 |
HOMEPAGE="http://projects.gnome.org/libchamplain/" |
45 |
|
46 |
-LICENSE="LGPL-2" |
47 |
SLOT="0.12" |
48 |
+LICENSE="LGPL-2" |
49 |
KEYWORDS="amd64 ~ppc x86" |
50 |
IUSE="debug doc +gtk +introspection vala" |
51 |
|
52 |
REQUIRED_USE="vala? ( introspection )" |
53 |
|
54 |
RDEPEND=" |
55 |
- >=dev-libs/glib-2.16:2 |
56 |
- >=x11-libs/cairo-1.4 |
57 |
- >=media-libs/clutter-1.2:1.0[introspection?] |
58 |
- >=media-libs/memphis-0.2.1:0.2[introspection?] |
59 |
- >=net-libs/libsoup-gnome-2.4.1:2.4 |
60 |
dev-db/sqlite:3 |
61 |
+ dev-libs/glib:2 |
62 |
+ media-libs/clutter:1.0[introspection?] |
63 |
+ media-libs/memphis:0.2[introspection?] |
64 |
+ net-libs/libsoup-gnome:2.4 |
65 |
+ x11-libs/cairo |
66 |
gtk? ( |
67 |
- >=x11-libs/gtk+-2.90:3[introspection?] |
68 |
- >=media-libs/clutter-gtk-0.90:1.0 ) |
69 |
- introspection? ( >=dev-libs/gobject-introspection-0.6.3 )" |
70 |
+ x11-libs/gtk+:3[introspection?] |
71 |
+ media-libs/clutter-gtk:1.0 ) |
72 |
+ introspection? ( dev-libs/gobject-introspection )" |
73 |
DEPEND="${RDEPEND} |
74 |
virtual/pkgconfig |
75 |
- doc? ( >=dev-util/gtk-doc-1.9 ) |
76 |
- vala? ( >=dev-lang/vala-0.14.2-r1:0.14[vapigen] )" |
77 |
+ doc? ( dev-util/gtk-doc ) |
78 |
+ vala? ( dev-lang/vala:0.14[vapigen] )" |
79 |
# segfaults with vala:0.12 |
80 |
# vala-0.14.2-r1 required for bug #402013 |
81 |
|
82 |
-pkg_setup() { |
83 |
+src_prepare() { |
84 |
DOCS="AUTHORS ChangeLog NEWS README" |
85 |
# Vala demos are only built, so just disable them |
86 |
G2CONF="${G2CONF} |
87 |
@@ -49,13 +50,13 @@ |
88 |
$(use_enable gtk) |
89 |
$(use_enable introspection) |
90 |
$(use_enable vala)" |
91 |
-} |
92 |
|
93 |
-src_prepare() { |
94 |
# Fix documentation slotability |
95 |
- sed -e "s/^DOC_MODULE.*/DOC_MODULE = ${PN}-${SLOT}/" \ |
96 |
+ sed \ |
97 |
+ -e "s/^DOC_MODULE.*/DOC_MODULE = ${PN}-${SLOT}/" \ |
98 |
-i docs/reference/Makefile.{am,in} || die "sed (1) failed" |
99 |
- sed -e "s/^DOC_MODULE.*/DOC_MODULE = ${PN}-gtk-${SLOT}/" \ |
100 |
+ sed \ |
101 |
+ -e "s/^DOC_MODULE.*/DOC_MODULE = ${PN}-gtk-${SLOT}/" \ |
102 |
-i docs/reference-gtk/Makefile.{am,in} || die "sed (2) failed" |
103 |
mv "${S}"/docs/reference/${PN}{,-${SLOT}}-docs.sgml || die "mv (1) failed" |
104 |
mv "${S}"/docs/reference-gtk/${PN}-gtk{,-${SLOT}}-docs.sgml || die "mv (2) failed" |
105 |
|
106 |
|
107 |
|
108 |
1.34 media-libs/libchamplain/ChangeLog |
109 |
|
110 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libchamplain/ChangeLog?rev=1.34&view=markup |
111 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libchamplain/ChangeLog?rev=1.34&content-type=text/plain |
112 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libchamplain/ChangeLog?r1=1.33&r2=1.34 |
113 |
|
114 |
Index: ChangeLog |
115 |
=================================================================== |
116 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libchamplain/ChangeLog,v |
117 |
retrieving revision 1.33 |
118 |
retrieving revision 1.34 |
119 |
diff -u -r1.33 -r1.34 |
120 |
--- ChangeLog 18 Oct 2012 17:36:56 -0000 1.33 |
121 |
+++ ChangeLog 1 Nov 2012 10:32:18 -0000 1.34 |
122 |
@@ -1,6 +1,11 @@ |
123 |
# ChangeLog for media-libs/libchamplain |
124 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
125 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/ChangeLog,v 1.33 2012/10/18 17:36:56 jlec Exp $ |
126 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/ChangeLog,v 1.34 2012/11/01 10:32:18 jlec Exp $ |
127 |
+ |
128 |
+ 01 Nov 2012; Justin Lecher <jlec@g.o> libchamplain-0.8.3.ebuild, |
129 |
+ +files/libchamplain-0.8.3-gthread.patch, libchamplain-0.10.1.ebuild, |
130 |
+ libchamplain-0.12.3.ebuild, +files/libchamplain-gthread.patch: |
131 |
+ Backport upstream fixes for #440646 |
132 |
|
133 |
18 Oct 2012; Justin Lecher <jlec@g.o> -libchamplain-0.6.0.ebuild, |
134 |
-libchamplain-0.12.2.ebuild, metadata.xml: |
135 |
|
136 |
|
137 |
|
138 |
1.5 media-libs/libchamplain/libchamplain-0.10.1.ebuild |
139 |
|
140 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libchamplain/libchamplain-0.10.1.ebuild?rev=1.5&view=markup |
141 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libchamplain/libchamplain-0.10.1.ebuild?rev=1.5&content-type=text/plain |
142 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libchamplain/libchamplain-0.10.1.ebuild?r1=1.4&r2=1.5 |
143 |
|
144 |
Index: libchamplain-0.10.1.ebuild |
145 |
=================================================================== |
146 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libchamplain/libchamplain-0.10.1.ebuild,v |
147 |
retrieving revision 1.4 |
148 |
retrieving revision 1.5 |
149 |
diff -u -r1.4 -r1.5 |
150 |
--- libchamplain-0.10.1.ebuild 14 Aug 2012 22:57:01 -0000 1.4 |
151 |
+++ libchamplain-0.10.1.ebuild 1 Nov 2012 10:32:18 -0000 1.5 |
152 |
@@ -1,41 +1,42 @@ |
153 |
# Copyright 1999-2012 Gentoo Foundation |
154 |
# Distributed under the terms of the GNU General Public License v2 |
155 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/libchamplain-0.10.1.ebuild,v 1.4 2012/08/14 22:57:01 tetromino Exp $ |
156 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/libchamplain-0.10.1.ebuild,v 1.5 2012/11/01 10:32:18 jlec Exp $ |
157 |
|
158 |
-EAPI="4" |
159 |
-GCONF_DEBUG="no" |
160 |
-GNOME2_LA_PUNT="yes" |
161 |
-GNOME_TARBALL_SUFFIX="bz2" |
162 |
+EAPI=4 |
163 |
|
164 |
-inherit gnome2 |
165 |
+GCONF_DEBUG=no |
166 |
+GNOME2_LA_PUNT=yes |
167 |
+GNOME_TARBALL_SUFFIX=bz2 |
168 |
+ |
169 |
+inherit eutils gnome2 |
170 |
|
171 |
DESCRIPTION="Clutter based world map renderer" |
172 |
HOMEPAGE="http://projects.gnome.org/libchamplain/" |
173 |
|
174 |
-LICENSE="LGPL-2" |
175 |
SLOT="0.10" |
176 |
+LICENSE="LGPL-2" |
177 |
KEYWORDS="~amd64 ~x86" |
178 |
IUSE="debug doc +gtk +introspection vala" |
179 |
|
180 |
REQUIRED_USE="vala? ( introspection )" |
181 |
|
182 |
RDEPEND=" |
183 |
- >=dev-libs/glib-2.16:2 |
184 |
- >=x11-libs/cairo-1.4 |
185 |
- >=media-libs/clutter-1.2:1.0[introspection?] |
186 |
- >=media-libs/memphis-0.2.1:0.2[introspection?] |
187 |
- >=net-libs/libsoup-gnome-2.4.1:2.4 |
188 |
dev-db/sqlite:3 |
189 |
+ dev-libs/glib:2 |
190 |
+ media-libs/clutter:1.0[introspection?] |
191 |
+ media-libs/memphis:0.2[introspection?] |
192 |
+ net-libs/libsoup-gnome:2.4 |
193 |
+ x11-libs/cairo |
194 |
gtk? ( |
195 |
- >=x11-libs/gtk+-2.90:3[introspection?] |
196 |
- >=media-libs/clutter-gtk-0.90:1.0 ) |
197 |
- introspection? ( >=dev-libs/gobject-introspection-0.6.3 )" |
198 |
+ x11-libs/gtk+:3[introspection?] |
199 |
+ media-libs/clutter-gtk:1.0 ) |
200 |
+ introspection? ( dev-libs/gobject-introspection )" |
201 |
DEPEND="${RDEPEND} |
202 |
virtual/pkgconfig |
203 |
- doc? ( >=dev-util/gtk-doc-1.9 ) |
204 |
+ doc? ( dev-util/gtk-doc ) |
205 |
vala? ( dev-lang/vala:0.14[vapigen] )" |
206 |
|
207 |
-pkg_setup() { |
208 |
+src_prepare() { |
209 |
DOCS="AUTHORS ChangeLog NEWS README" |
210 |
# Vala demos are only built, so just disable them |
211 |
G2CONF="${G2CONF} |
212 |
@@ -49,16 +50,18 @@ |
213 |
$(use_enable gtk) |
214 |
$(use_enable introspection) |
215 |
$(use_enable vala)" |
216 |
-} |
217 |
|
218 |
-src_prepare() { |
219 |
# Fix documentation slotability |
220 |
- sed -e "s/^DOC_MODULE.*/DOC_MODULE = ${PN}-${SLOT}/" \ |
221 |
+ sed \ |
222 |
+ -e "s/^DOC_MODULE.*/DOC_MODULE = ${PN}-${SLOT}/" \ |
223 |
-i docs/reference/Makefile.{am,in} || die "sed (1) failed" |
224 |
- sed -e "s/^DOC_MODULE.*/DOC_MODULE = ${PN}-gtk-${SLOT}/" \ |
225 |
+ sed \ |
226 |
+ -e "s/^DOC_MODULE.*/DOC_MODULE = ${PN}-gtk-${SLOT}/" \ |
227 |
-i docs/reference-gtk/Makefile.{am,in} || die "sed (2) failed" |
228 |
mv "${S}"/docs/reference/${PN}{,-${SLOT}}-docs.sgml || die "mv (1) failed" |
229 |
- mv "${S}"/docs/reference-gtk/${PN}-gtk{,-${SLOT}}-docs.sgml || die "mv (1) failed" |
230 |
+ mv "${S}"/docs/reference-gtk/${PN}-gtk{,-${SLOT}}-docs.sgml || die "mv (2) failed" |
231 |
+ |
232 |
+ epatch "${FILESDIR}"/${PN}-gthread.patch |
233 |
|
234 |
gnome2_src_prepare |
235 |
} |
236 |
|
237 |
|
238 |
|
239 |
1.9 media-libs/libchamplain/libchamplain-0.8.3.ebuild |
240 |
|
241 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libchamplain/libchamplain-0.8.3.ebuild?rev=1.9&view=markup |
242 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libchamplain/libchamplain-0.8.3.ebuild?rev=1.9&content-type=text/plain |
243 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libchamplain/libchamplain-0.8.3.ebuild?r1=1.8&r2=1.9 |
244 |
|
245 |
Index: libchamplain-0.8.3.ebuild |
246 |
=================================================================== |
247 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libchamplain/libchamplain-0.8.3.ebuild,v |
248 |
retrieving revision 1.8 |
249 |
retrieving revision 1.9 |
250 |
diff -u -r1.8 -r1.9 |
251 |
--- libchamplain-0.8.3.ebuild 14 Aug 2012 22:57:01 -0000 1.8 |
252 |
+++ libchamplain-0.8.3.ebuild 1 Nov 2012 10:32:18 -0000 1.9 |
253 |
@@ -1,37 +1,38 @@ |
254 |
# Copyright 1999-2012 Gentoo Foundation |
255 |
# Distributed under the terms of the GNU General Public License v2 |
256 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/libchamplain-0.8.3.ebuild,v 1.8 2012/08/14 22:57:01 tetromino Exp $ |
257 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/libchamplain-0.8.3.ebuild,v 1.9 2012/11/01 10:32:18 jlec Exp $ |
258 |
|
259 |
-EAPI="3" |
260 |
-GCONF_DEBUG="no" |
261 |
+EAPI=3 |
262 |
|
263 |
-inherit gnome2 |
264 |
+GCONF_DEBUG=no |
265 |
+ |
266 |
+inherit eutils gnome2 |
267 |
|
268 |
DESCRIPTION="Clutter based world map renderer" |
269 |
HOMEPAGE="http://projects.gnome.org/libchamplain/" |
270 |
|
271 |
-LICENSE="LGPL-2" |
272 |
SLOT="0.8" |
273 |
+LICENSE="LGPL-2" |
274 |
KEYWORDS="amd64 x86" |
275 |
IUSE="debug doc gtk +introspection" |
276 |
|
277 |
RDEPEND=" |
278 |
+ dev-db/sqlite:3 |
279 |
dev-libs/glib:2 |
280 |
- >=x11-libs/cairo-1.4 |
281 |
- net-libs/libsoup-gnome:2.4 |
282 |
media-libs/clutter:1.0[introspection?] |
283 |
media-libs/memphis:0.2[introspection?] |
284 |
- dev-db/sqlite:3 |
285 |
+ net-libs/libsoup-gnome:2.4 |
286 |
+ x11-libs/cairo |
287 |
gtk? ( |
288 |
x11-libs/gtk+:2[introspection?] |
289 |
media-libs/memphis:0.2[introspection?] |
290 |
- >=media-libs/clutter-gtk-0.10:0.10 )" |
291 |
+ media-libs/clutter-gtk:0.10 )" |
292 |
DEPEND="${RDEPEND} |
293 |
virtual/pkgconfig |
294 |
- doc? ( >=dev-util/gtk-doc-1.9 ) |
295 |
- introspection? ( >=dev-libs/gobject-introspection-0.6.3 )" |
296 |
+ doc? ( dev-util/gtk-doc ) |
297 |
+ introspection? ( dev-libs/gobject-introspection )" |
298 |
|
299 |
-pkg_setup() { |
300 |
+src_prepare() { |
301 |
DOCS="AUTHORS ChangeLog NEWS README" |
302 |
G2CONF="${G2CONF} |
303 |
--disable-static |
304 |
@@ -39,12 +40,13 @@ |
305 |
$(use_enable debug) |
306 |
$(use_enable gtk) |
307 |
$(use_enable introspection)" |
308 |
-} |
309 |
- |
310 |
-src_prepare() { |
311 |
- gnome2_src_prepare |
312 |
|
313 |
# Drop DEPRECATED flags, bug #387335 |
314 |
- sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \ |
315 |
- tidy/Makefile.am tidy/Makefile.in || die |
316 |
+ sed \ |
317 |
+ -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \ |
318 |
+ -i tidy/Makefile.am tidy/Makefile.in || die |
319 |
+ |
320 |
+ epatch "${FILESDIR}"/${P}-gthread.patch |
321 |
+ |
322 |
+ gnome2_src_prepare |
323 |
} |