1 |
commit: 494ec4fabc61060bf9175bf563c4f16b7e01503a |
2 |
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Jul 28 22:09:43 2011 +0000 |
4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
5 |
CommitDate: Thu Jul 28 22:09:43 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=494ec4fa |
7 |
|
8 |
net-libs/libsoup{,-gnome}: add 2.35.4 and live ebuild |
9 |
|
10 |
Add gnome-3.1.x version and live ebuilds for libsoup and libsoup-gnome. |
11 |
|
12 |
--- |
13 |
.../files/libsoup-gnome-2.34.1-system-lib.patch | 229 ++++++++++++++++++++ |
14 |
net-libs/libsoup-gnome/libsoup-gnome-2.35.4.ebuild | 65 ++++++ |
15 |
net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild | 65 ++++++ |
16 |
...p-2.34.2-fix-build-without-gnome-with-doc.patch | 58 +++++ |
17 |
net-libs/libsoup/libsoup-2.35.4.ebuild | 79 +++++++ |
18 |
net-libs/libsoup/libsoup-9999.ebuild | 79 +++++++ |
19 |
6 files changed, 575 insertions(+), 0 deletions(-) |
20 |
|
21 |
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.34.1-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.34.1-system-lib.patch |
22 |
new file mode 100644 |
23 |
index 0000000..ad12542 |
24 |
--- /dev/null |
25 |
+++ b/net-libs/libsoup-gnome/files/libsoup-gnome-2.34.1-system-lib.patch |
26 |
@@ -0,0 +1,229 @@ |
27 |
+Split support for libsoup-gnome |
28 |
+ |
29 |
+Original patch by Romain Perier. |
30 |
+--- |
31 |
+--- configure.ac |
32 |
++++ configure.ac |
33 |
+@@ -72,15 +72,30 @@ |
34 |
+ dnl *** Checks for glib *** |
35 |
+ dnl *********************** |
36 |
+ |
37 |
+-AM_PATH_GLIB_2_0(2.27.5,,,gobject gthread gio) |
38 |
+-if test "$GLIB_LIBS" = ""; then |
39 |
+- AC_MSG_ERROR(GLIB 2.27.5 or later is required to build libsoup) |
40 |
+-fi |
41 |
+-GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES" |
42 |
+- |
43 |
+-PKG_CHECK_MODULES(XML, libxml-2.0) |
44 |
+-AC_SUBST(XML_CFLAGS) |
45 |
+-AC_SUBST(XML_LIBS) |
46 |
++PKG_PROG_PKG_CONFIG |
47 |
++enable_ssl=no |
48 |
++AC_ARG_WITH(libsoup-system, |
49 |
++ AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]), |
50 |
++ [with_libsoup_system=$withval], [with_libsoup_system=no]) |
51 |
++if test "$with_libsoup_system" = "no"; then |
52 |
++ AM_PATH_GLIB_2_0(2.27.5,,,gobject gthread gio) |
53 |
++ if test "$GLIB_LIBS" = ""; then |
54 |
++ AC_MSG_ERROR(GLIB 2.27.5 or later is required to build libsoup) |
55 |
++ fi |
56 |
++ GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES" |
57 |
++ |
58 |
++ PKG_CHECK_MODULES(XML, libxml-2.0) |
59 |
++ AC_SUBST(XML_CFLAGS) |
60 |
++ AC_SUBST(XML_LIBS) |
61 |
++ |
62 |
++ dnl ******************* |
63 |
++ dnl *** Misc checks *** |
64 |
++ dnl ******************* |
65 |
++ AC_CHECK_FUNCS(gmtime_r) |
66 |
++ AC_CHECK_FUNCS(mmap) |
67 |
++ AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket)) |
68 |
++fi |
69 |
++AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no) |
70 |
+ |
71 |
+ dnl *********************** |
72 |
+ dnl *** Check for Win32 *** |
73 |
+@@ -99,13 +114,6 @@ |
74 |
+ AC_MSG_RESULT([$os_win32]) |
75 |
+ AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes]) |
76 |
+ |
77 |
+-dnl ******************* |
78 |
+-dnl *** Misc checks *** |
79 |
+-dnl ******************* |
80 |
+-AC_CHECK_FUNCS(gmtime_r) |
81 |
+-AC_CHECK_FUNCS(mmap) |
82 |
+-AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket)) |
83 |
+- |
84 |
+ dnl ********************* |
85 |
+ dnl *** GNOME support *** |
86 |
+ dnl ********************* |
87 |
+@@ -130,6 +138,10 @@ |
88 |
+ if test $with_gnome != no; then |
89 |
+ AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled]) |
90 |
+ |
91 |
++ if test $with_libsoup_system != no; then |
92 |
++ PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION) |
93 |
++ fi |
94 |
++ |
95 |
+ PKG_CHECK_MODULES(SQLITE, sqlite3, :, [AC_MSG_ERROR(dnl |
96 |
+ [Could not find sqlite3 devel files: |
97 |
+ |
98 |
+--- libsoup/Makefile.am |
99 |
++++ libsoup/Makefile.am |
100 |
+@@ -4,15 +4,18 @@ |
101 |
+ LIBWS2_32 = -lws2_32 |
102 |
+ endif |
103 |
+ |
104 |
+-INCLUDES = \ |
105 |
++INCLUDES = |
106 |
++lib_LTLIBRARIES = |
107 |
++CLEANFILES = |
108 |
++ |
109 |
++if BUILD_LIBSOUP |
110 |
++INCLUDES += \ |
111 |
+ -DG_LOG_DOMAIN=\"libsoup\" \ |
112 |
+ -I$(top_srcdir) \ |
113 |
+ $(SOUP_DEBUG_FLAGS) \ |
114 |
+ $(SOUP_MAINTAINER_FLAGS) \ |
115 |
+ $(GLIB_CFLAGS) \ |
116 |
+- $(XML_CFLAGS) \ |
117 |
+- $(SQLITE_CFLAGS) \ |
118 |
+- $(GNOME_KEYRING_CFLAGS) |
119 |
++ $(XML_CFLAGS) |
120 |
+ |
121 |
+ MARSHAL_GENERATED = soup-marshal.c soup-marshal.h |
122 |
+ MKENUMS_GENERATED = soup-enum-types.c soup-enum-types.h |
123 |
+@@ -41,7 +44,7 @@ |
124 |
+ |
125 |
+ BUILT_SOURCES = $(MARSHAL_GENERATED) $(MKENUMS_GENERATED) |
126 |
+ |
127 |
+-CLEANFILES = $(MARSHAL_GENERATED) $(MKENUMS_GENERATED) |
128 |
++CLEANFILES += $(MARSHAL_GENERATED) $(MKENUMS_GENERATED) |
129 |
+ |
130 |
+ libsoupincludedir = $(includedir)/libsoup-2.4/libsoup |
131 |
+ |
132 |
+@@ -94,7 +97,7 @@ |
133 |
+ $(soup_headers) \ |
134 |
+ soup-enum-types.h |
135 |
+ |
136 |
+-lib_LTLIBRARIES = libsoup-2.4.la |
137 |
++lib_LTLIBRARIES += libsoup-2.4.la |
138 |
+ |
139 |
+ libsoup_2_4_la_LDFLAGS = \ |
140 |
+ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined |
141 |
+@@ -178,6 +181,7 @@ |
142 |
+ soup-uri-private.h \ |
143 |
+ soup-value-utils.c \ |
144 |
+ soup-xmlrpc.c |
145 |
++endif |
146 |
+ |
147 |
+ if BUILD_LIBSOUP_GNOME |
148 |
+ |
149 |
+@@ -191,6 +195,10 @@ |
150 |
+ |
151 |
+ libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup |
152 |
+ |
153 |
++INCLUDES += $(LIBSOUP_CFLAGS) \ |
154 |
++ $(SQLITE_CFLAGS) \ |
155 |
++ $(GNOME_KEYRING_CFLAGS) |
156 |
++ |
157 |
+ libsoupgnomeinclude_HEADERS = \ |
158 |
+ soup-cookie-jar-sqlite.h\ |
159 |
+ soup-gnome.h \ |
160 |
+@@ -198,14 +206,24 @@ |
161 |
+ |
162 |
+ lib_LTLIBRARIES += libsoup-gnome-2.4.la |
163 |
+ |
164 |
++if BUILD_LIBSOUP |
165 |
+ libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS) |
166 |
++else |
167 |
++libsoup_gnome_2_4_la_LDFLAGS = \ |
168 |
++ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined |
169 |
++endif |
170 |
+ |
171 |
+ libsoup_gnome_2_4_la_LIBADD = \ |
172 |
+- libsoup-2.4.la \ |
173 |
+ $(GLIB_LIBS) \ |
174 |
+ $(SQLITE_LIBS) \ |
175 |
+ $(GNOME_KEYRING_LIBS) |
176 |
+ |
177 |
++if BUILD_LIBSOUP |
178 |
++libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la |
179 |
++else |
180 |
++libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS) |
181 |
++endif |
182 |
++ |
183 |
+ libsoup_gnome_2_4_la_SOURCES = \ |
184 |
+ soup-cookie-jar-sqlite.c \ |
185 |
+ soup-gnome-features.c \ |
186 |
+@@ -225,6 +243,8 @@ |
187 |
+ |
188 |
+ if HAVE_INTROSPECTION |
189 |
+ |
190 |
++if BUILD_LIBSOUP |
191 |
++ |
192 |
+ # Core library |
193 |
+ gi_soup_files = \ |
194 |
+ $(filter-out soup.h soup-enum-types.% soup-marshal.%,\ |
195 |
+@@ -246,20 +266,28 @@ |
196 |
+ |
197 |
+ INTROSPECTION_GIRS += Soup-2.4.gir |
198 |
+ |
199 |
++endif |
200 |
++ |
201 |
+ if BUILD_LIBSOUP_GNOME |
202 |
+ |
203 |
++if BUILD_LIBSOUP |
204 |
++SOUP_GIR = Soup-2.4.gir |
205 |
++else |
206 |
++SOUP_GIR = |
207 |
++endif |
208 |
++ |
209 |
+ # GNOME extensions |
210 |
+ gi_soup_gnome_files = $(filter-out soup-gnome.h,\ |
211 |
+ $(libsoupgnomeinclude_HEADERS) \ |
212 |
+ $(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES))) |
213 |
+-SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir |
214 |
++SoupGNOME-2.4.gir: libsoup-gnome-2.4.la $(SOUP_GIR) |
215 |
++SoupGNOME_2_4_gir_INCLUDES = Soup-2.4 |
216 |
+ SoupGNOME_2_4_gir_SCANNERFLAGS = \ |
217 |
+ --identifier-prefix=Soup \ |
218 |
+ --symbol-prefix=soup \ |
219 |
+- --c-include "libsoup/soup-gnome.h" \ |
220 |
+- --include-uninstalled=$(builddir)/Soup-2.4.gir |
221 |
++ --c-include "libsoup/soup-gnome.h" |
222 |
+ SoupGNOME_2_4_gir_CFLAGS = $(INCLUDES) |
223 |
+-SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la |
224 |
++SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la |
225 |
+ SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files)) |
226 |
+ SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4 |
227 |
+ |
228 |
+--- Makefile.am |
229 |
++++ Makefile.am |
230 |
+@@ -1,7 +1,11 @@ |
231 |
+ ## Process this file with automake to produce Makefile.in |
232 |
+ ACLOCAL_AMFLAGS = -I m4 |
233 |
+ |
234 |
+-SUBDIRS = libsoup tests docs |
235 |
++SUBDIRS = libsoup |
236 |
++ |
237 |
++if BUILD_LIBSOUP |
238 |
++SUBDIRS += tests docs |
239 |
++endif |
240 |
+ |
241 |
+ EXTRA_DIST = \ |
242 |
+ libsoup-2.4.pc.in \ |
243 |
+@@ -14,7 +18,11 @@ |
244 |
+ |
245 |
+ pkgconfigdir = $(libdir)/pkgconfig |
246 |
+ |
247 |
+-pkgconfig_DATA = libsoup-2.4.pc |
248 |
++pkgconfig_DATA = |
249 |
++ |
250 |
++if BUILD_LIBSOUP |
251 |
++pkgconfig_DATA += libsoup-2.4.pc |
252 |
++endif |
253 |
+ |
254 |
+ if BUILD_LIBSOUP_GNOME |
255 |
+ pkgconfig_DATA += libsoup-gnome-2.4.pc |
256 |
|
257 |
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.35.4.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.35.4.ebuild |
258 |
new file mode 100644 |
259 |
index 0000000..58ae7ed |
260 |
--- /dev/null |
261 |
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.35.4.ebuild |
262 |
@@ -0,0 +1,65 @@ |
263 |
+# Copyright 1999-2011 Gentoo Foundation |
264 |
+# Distributed under the terms of the GNU General Public License v2 |
265 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.34.2.ebuild,v 1.4 2011/07/15 11:09:36 xarthisius Exp $ |
266 |
+ |
267 |
+EAPI="4" |
268 |
+GCONF_DEBUG="yes" |
269 |
+GNOME2_LA_PUNT="yes" |
270 |
+ |
271 |
+MY_PN=${PN/-gnome} |
272 |
+MY_P=${MY_PN}-${PV} |
273 |
+ |
274 |
+inherit autotools eutils gnome2 |
275 |
+if [[ ${PV} = 9999 ]]; then |
276 |
+ GNOME_LIVE_MODULE=${MY_PN} |
277 |
+ inherit gnome2-live |
278 |
+fi |
279 |
+ |
280 |
+DESCRIPTION="GNOME plugin for libsoup" |
281 |
+HOMEPAGE="http://live.gnome.org/LibSoup" |
282 |
+SRC_URI="${SRC_URI//-gnome}" |
283 |
+ |
284 |
+LICENSE="LGPL-2" |
285 |
+SLOT="2.4" |
286 |
+if [[ ${PV} = 9999 ]]; then |
287 |
+ KEYWORDS="" |
288 |
+else |
289 |
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-solaris" |
290 |
+fi |
291 |
+IUSE="debug doc +introspection" |
292 |
+ |
293 |
+RDEPEND="~net-libs/libsoup-${PV} |
294 |
+ || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) |
295 |
+ dev-db/sqlite:3 |
296 |
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )" |
297 |
+DEPEND="${RDEPEND} |
298 |
+ >=dev-util/pkgconfig-0.9 |
299 |
+ >=dev-util/gtk-doc-am-1.10 |
300 |
+ doc? ( >=dev-util/gtk-doc-1.10 )" |
301 |
+ |
302 |
+S=${WORKDIR}/${MY_P} |
303 |
+ |
304 |
+pkg_setup() { |
305 |
+ G2CONF="${G2CONF} |
306 |
+ --disable-static |
307 |
+ --disable-tls-check |
308 |
+ $(use_enable introspection) |
309 |
+ --with-libsoup-system |
310 |
+ --with-gnome" |
311 |
+ DOCS="AUTHORS NEWS README" |
312 |
+} |
313 |
+ |
314 |
+src_configure() { |
315 |
+ # FIXME: we need addpredict to workaround bug #324779 until |
316 |
+ # root cause (bug #249496) is solved |
317 |
+ addpredict /usr/share/snmp/mibs/.index |
318 |
+ gnome2_src_configure |
319 |
+} |
320 |
+ |
321 |
+src_prepare() { |
322 |
+ gnome2_src_prepare |
323 |
+ |
324 |
+ # Use lib present on the system |
325 |
+ epatch "${FILESDIR}"/${PN}-2.34.1-system-lib.patch |
326 |
+ eautoreconf |
327 |
+} |
328 |
|
329 |
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild |
330 |
new file mode 100644 |
331 |
index 0000000..58ae7ed |
332 |
--- /dev/null |
333 |
+++ b/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild |
334 |
@@ -0,0 +1,65 @@ |
335 |
+# Copyright 1999-2011 Gentoo Foundation |
336 |
+# Distributed under the terms of the GNU General Public License v2 |
337 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.34.2.ebuild,v 1.4 2011/07/15 11:09:36 xarthisius Exp $ |
338 |
+ |
339 |
+EAPI="4" |
340 |
+GCONF_DEBUG="yes" |
341 |
+GNOME2_LA_PUNT="yes" |
342 |
+ |
343 |
+MY_PN=${PN/-gnome} |
344 |
+MY_P=${MY_PN}-${PV} |
345 |
+ |
346 |
+inherit autotools eutils gnome2 |
347 |
+if [[ ${PV} = 9999 ]]; then |
348 |
+ GNOME_LIVE_MODULE=${MY_PN} |
349 |
+ inherit gnome2-live |
350 |
+fi |
351 |
+ |
352 |
+DESCRIPTION="GNOME plugin for libsoup" |
353 |
+HOMEPAGE="http://live.gnome.org/LibSoup" |
354 |
+SRC_URI="${SRC_URI//-gnome}" |
355 |
+ |
356 |
+LICENSE="LGPL-2" |
357 |
+SLOT="2.4" |
358 |
+if [[ ${PV} = 9999 ]]; then |
359 |
+ KEYWORDS="" |
360 |
+else |
361 |
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-solaris" |
362 |
+fi |
363 |
+IUSE="debug doc +introspection" |
364 |
+ |
365 |
+RDEPEND="~net-libs/libsoup-${PV} |
366 |
+ || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) |
367 |
+ dev-db/sqlite:3 |
368 |
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )" |
369 |
+DEPEND="${RDEPEND} |
370 |
+ >=dev-util/pkgconfig-0.9 |
371 |
+ >=dev-util/gtk-doc-am-1.10 |
372 |
+ doc? ( >=dev-util/gtk-doc-1.10 )" |
373 |
+ |
374 |
+S=${WORKDIR}/${MY_P} |
375 |
+ |
376 |
+pkg_setup() { |
377 |
+ G2CONF="${G2CONF} |
378 |
+ --disable-static |
379 |
+ --disable-tls-check |
380 |
+ $(use_enable introspection) |
381 |
+ --with-libsoup-system |
382 |
+ --with-gnome" |
383 |
+ DOCS="AUTHORS NEWS README" |
384 |
+} |
385 |
+ |
386 |
+src_configure() { |
387 |
+ # FIXME: we need addpredict to workaround bug #324779 until |
388 |
+ # root cause (bug #249496) is solved |
389 |
+ addpredict /usr/share/snmp/mibs/.index |
390 |
+ gnome2_src_configure |
391 |
+} |
392 |
+ |
393 |
+src_prepare() { |
394 |
+ gnome2_src_prepare |
395 |
+ |
396 |
+ # Use lib present on the system |
397 |
+ epatch "${FILESDIR}"/${PN}-2.34.1-system-lib.patch |
398 |
+ eautoreconf |
399 |
+} |
400 |
|
401 |
diff --git a/net-libs/libsoup/files/libsoup-2.34.2-fix-build-without-gnome-with-doc.patch b/net-libs/libsoup/files/libsoup-2.34.2-fix-build-without-gnome-with-doc.patch |
402 |
new file mode 100644 |
403 |
index 0000000..574b8be |
404 |
--- /dev/null |
405 |
+++ b/net-libs/libsoup/files/libsoup-2.34.2-fix-build-without-gnome-with-doc.patch |
406 |
@@ -0,0 +1,58 @@ |
407 |
+From 4be4806401133389b2413267bc3f8ac58c1eeaf3 Mon Sep 17 00:00:00 2001 |
408 |
+From: Priit Laes <plaes@×××××.org> |
409 |
+Date: Thu, 25 Feb 2010 20:59:51 +0200 |
410 |
+Subject: [PATCH] Split docs into libsoup and libsoup-gnome. |
411 |
+ |
412 |
+Fixes Gentoo Bug 268592, patch adapted from upstream patch. |
413 |
+ |
414 |
+Modified to apply to a release tarball (no libsoup-2.4-docs.sgml.in) |
415 |
+Hence, to be applied ONLY when !gnome && doc |
416 |
+ |
417 |
+[Alexandre Rostovtsev <tetromino@×××××.com>: adapted patch for libsoup-2.34.2] |
418 |
+--- |
419 |
+ docs/reference/Makefile.am | 4 +++- |
420 |
+ docs/reference/libsoup-2.4-docs.sgml | 2 ++ |
421 |
+ 2 files changed, 5 insertions(+), 1 deletions(-) |
422 |
+ |
423 |
+diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am |
424 |
+index 765d27c..07c92e9 100644 |
425 |
+--- a/docs/reference/Makefile.am |
426 |
++++ b/docs/reference/Makefile.am |
427 |
+@@ -38,6 +38,9 @@ IGNORE_HFILES= soup.h soup-marshal.h soup-enum-types.h \ |
428 |
+ soup-proxy-resolver.h soup-proxy-resolver-gnome.h \ |
429 |
+ soup-proxy-resolver-static.h |
430 |
+ |
431 |
++IGNORE_HFILES += soup-cookie-jar-sqlite.h \ |
432 |
++ soup-gnome.h soup-gnome-features.h |
433 |
++ |
434 |
+ # Images to copy into HTML directory. |
435 |
+ HTML_IMAGES = |
436 |
+ |
437 |
+@@ -63,7 +66,6 @@ GTKDOC_CFLAGS = \ |
438 |
+ |
439 |
+ GTKDOC_LIBS = \ |
440 |
+ $(top_builddir)/libsoup/libsoup-2.4.la \ |
441 |
+- $(top_builddir)/libsoup/libsoup-gnome-2.4.la \ |
442 |
+ $(GLIB_LIBS) |
443 |
+ |
444 |
+ # include common portion ... |
445 |
+diff --git a/docs/reference/libsoup-2.4-docs.sgml b/docs/reference/libsoup-2.4-docs.sgml |
446 |
+index c52208f..7117849 100644 |
447 |
+--- a/docs/reference/libsoup-2.4-docs.sgml |
448 |
++++ b/docs/reference/libsoup-2.4-docs.sgml |
449 |
+@@ -52,11 +52,13 @@ |
450 |
+ <xi:include href="xml/soup-value-utils.xml"/> |
451 |
+ </chapter> |
452 |
+ |
453 |
++<!-- |
454 |
+ <chapter> |
455 |
+ <title>GNOME integration</title> |
456 |
+ <xi:include href="xml/soup-gnome-features.xml"/> |
457 |
+ <xi:include href="xml/soup-cookie-jar-sqlite.xml"/> |
458 |
+ </chapter> |
459 |
++--> |
460 |
+ |
461 |
+ <chapter> |
462 |
+ <title>Low-level Networking API</title> |
463 |
+-- |
464 |
+1.7.5.3 |
465 |
\ No newline at end of file |
466 |
|
467 |
diff --git a/net-libs/libsoup/libsoup-2.35.4.ebuild b/net-libs/libsoup/libsoup-2.35.4.ebuild |
468 |
new file mode 100644 |
469 |
index 0000000..9927f58 |
470 |
--- /dev/null |
471 |
+++ b/net-libs/libsoup/libsoup-2.35.4.ebuild |
472 |
@@ -0,0 +1,79 @@ |
473 |
+# Copyright 1999-2011 Gentoo Foundation |
474 |
+# Distributed under the terms of the GNU General Public License v2 |
475 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.34.2.ebuild,v 1.5 2011/07/15 11:08:46 xarthisius Exp $ |
476 |
+ |
477 |
+EAPI="4" |
478 |
+GCONF_DEBUG="yes" |
479 |
+GNOME2_LA_PUNT="yes" |
480 |
+ |
481 |
+inherit autotools eutils gnome2 |
482 |
+if [[ ${PV} = 9999 ]]; then |
483 |
+ inherit gnome2-live |
484 |
+fi |
485 |
+ |
486 |
+DESCRIPTION="An HTTP library implementation in C" |
487 |
+HOMEPAGE="http://live.gnome.org/LibSoup" |
488 |
+ |
489 |
+LICENSE="LGPL-2" |
490 |
+SLOT="2.4" |
491 |
+if [[ ${PV} = 9999 ]]; then |
492 |
+ KEYWORDS="" |
493 |
+else |
494 |
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" |
495 |
+fi |
496 |
+IUSE="debug doc +introspection ssl test" |
497 |
+ |
498 |
+RDEPEND=">=dev-libs/glib-2.27.5:2 |
499 |
+ >=dev-libs/libxml2-2:2 |
500 |
+ net-libs/glib-networking[ssl?] |
501 |
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )" |
502 |
+DEPEND="${RDEPEND} |
503 |
+ >=dev-util/pkgconfig-0.9 |
504 |
+ >=dev-util/gtk-doc-am-1.10 |
505 |
+ doc? ( >=dev-util/gtk-doc-1.10 )" |
506 |
+# test? ( www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic, |
507 |
+# apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir, |
508 |
+# apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect] |
509 |
+# dev-lang/php[apache2,xmlrpc] |
510 |
+# net-misc/curl |
511 |
+# net-libs/glib-networking[ssl])" |
512 |
+ |
513 |
+pkg_setup() { |
514 |
+ # Set invalid apache module dir until apache tests are ready, bug #326957 |
515 |
+ DOCS="AUTHORS NEWS README" |
516 |
+ G2CONF="${G2CONF} |
517 |
+ --disable-static |
518 |
+ --disable-tls-check |
519 |
+ --without-gnome |
520 |
+ --with-apache-module-dir="${T}" |
521 |
+ $(use_enable introspection)" |
522 |
+} |
523 |
+ |
524 |
+src_configure() { |
525 |
+ # FIXME: we need addpredict to workaround bug #324779 until |
526 |
+ # root cause (bug #249496) is solved |
527 |
+ addpredict /usr/share/snmp/mibs/.index |
528 |
+ gnome2_src_configure |
529 |
+} |
530 |
+ |
531 |
+src_prepare() { |
532 |
+ gnome2_src_prepare |
533 |
+ |
534 |
+ if [[ ${PV} = 9999 ]]; then |
535 |
+ # prevent SOUP_MAINTAINER_FLAGS from getting set |
536 |
+ mv .git .git-bck || die |
537 |
+ fi |
538 |
+ |
539 |
+ if ! use test; then |
540 |
+ # don't waste time building tests (bug #226271) |
541 |
+ sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \ |
542 |
+ || die "sed failed" |
543 |
+ fi |
544 |
+ |
545 |
+ # Patch *must* be applied conditionally (see patch for details) |
546 |
+ if use doc; then |
547 |
+ # Fix bug 268592 (upstream #573685) (build fails without gnome && doc) |
548 |
+ epatch "${FILESDIR}/${PN}-2.34.2-fix-build-without-gnome-with-doc.patch" |
549 |
+ eautoreconf |
550 |
+ fi |
551 |
+} |
552 |
|
553 |
diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-9999.ebuild |
554 |
new file mode 100644 |
555 |
index 0000000..9927f58 |
556 |
--- /dev/null |
557 |
+++ b/net-libs/libsoup/libsoup-9999.ebuild |
558 |
@@ -0,0 +1,79 @@ |
559 |
+# Copyright 1999-2011 Gentoo Foundation |
560 |
+# Distributed under the terms of the GNU General Public License v2 |
561 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.34.2.ebuild,v 1.5 2011/07/15 11:08:46 xarthisius Exp $ |
562 |
+ |
563 |
+EAPI="4" |
564 |
+GCONF_DEBUG="yes" |
565 |
+GNOME2_LA_PUNT="yes" |
566 |
+ |
567 |
+inherit autotools eutils gnome2 |
568 |
+if [[ ${PV} = 9999 ]]; then |
569 |
+ inherit gnome2-live |
570 |
+fi |
571 |
+ |
572 |
+DESCRIPTION="An HTTP library implementation in C" |
573 |
+HOMEPAGE="http://live.gnome.org/LibSoup" |
574 |
+ |
575 |
+LICENSE="LGPL-2" |
576 |
+SLOT="2.4" |
577 |
+if [[ ${PV} = 9999 ]]; then |
578 |
+ KEYWORDS="" |
579 |
+else |
580 |
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" |
581 |
+fi |
582 |
+IUSE="debug doc +introspection ssl test" |
583 |
+ |
584 |
+RDEPEND=">=dev-libs/glib-2.27.5:2 |
585 |
+ >=dev-libs/libxml2-2:2 |
586 |
+ net-libs/glib-networking[ssl?] |
587 |
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )" |
588 |
+DEPEND="${RDEPEND} |
589 |
+ >=dev-util/pkgconfig-0.9 |
590 |
+ >=dev-util/gtk-doc-am-1.10 |
591 |
+ doc? ( >=dev-util/gtk-doc-1.10 )" |
592 |
+# test? ( www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic, |
593 |
+# apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir, |
594 |
+# apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect] |
595 |
+# dev-lang/php[apache2,xmlrpc] |
596 |
+# net-misc/curl |
597 |
+# net-libs/glib-networking[ssl])" |
598 |
+ |
599 |
+pkg_setup() { |
600 |
+ # Set invalid apache module dir until apache tests are ready, bug #326957 |
601 |
+ DOCS="AUTHORS NEWS README" |
602 |
+ G2CONF="${G2CONF} |
603 |
+ --disable-static |
604 |
+ --disable-tls-check |
605 |
+ --without-gnome |
606 |
+ --with-apache-module-dir="${T}" |
607 |
+ $(use_enable introspection)" |
608 |
+} |
609 |
+ |
610 |
+src_configure() { |
611 |
+ # FIXME: we need addpredict to workaround bug #324779 until |
612 |
+ # root cause (bug #249496) is solved |
613 |
+ addpredict /usr/share/snmp/mibs/.index |
614 |
+ gnome2_src_configure |
615 |
+} |
616 |
+ |
617 |
+src_prepare() { |
618 |
+ gnome2_src_prepare |
619 |
+ |
620 |
+ if [[ ${PV} = 9999 ]]; then |
621 |
+ # prevent SOUP_MAINTAINER_FLAGS from getting set |
622 |
+ mv .git .git-bck || die |
623 |
+ fi |
624 |
+ |
625 |
+ if ! use test; then |
626 |
+ # don't waste time building tests (bug #226271) |
627 |
+ sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \ |
628 |
+ || die "sed failed" |
629 |
+ fi |
630 |
+ |
631 |
+ # Patch *must* be applied conditionally (see patch for details) |
632 |
+ if use doc; then |
633 |
+ # Fix bug 268592 (upstream #573685) (build fails without gnome && doc) |
634 |
+ epatch "${FILESDIR}/${PN}-2.34.2-fix-build-without-gnome-with-doc.patch" |
635 |
+ eautoreconf |
636 |
+ fi |
637 |
+} |