Gentoo Archives: gentoo-commits

From: Nirbheek Chauhan <nirbheek@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup/files/, net-libs/libsoup-gnome/, ...
Date: Thu, 02 Jun 2011 15:49:28
Message-Id: 2d5f975f340067a3111b82f30921521b47f29956.nirbheek@gentoo
1 commit: 2d5f975f340067a3111b82f30921521b47f29956
2 Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 2 15:30:52 2011 +0000
4 Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 2 15:30:52 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2d5f975f
7
8 net-libs/libsoup: was moved to tree a while back
9
10 ---
11 .../files/libsoup-gnome-2.34.0-system-lib.patch | 227 --------------------
12 net-libs/libsoup-gnome/libsoup-gnome-2.34.0.ebuild | 57 -----
13 ...p-2.30.1-fix-build-without-gnome-with-doc.patch | 58 -----
14 net-libs/libsoup/libsoup-2.34.0.ebuild | 67 ------
15 4 files changed, 0 insertions(+), 409 deletions(-)
16
17 diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.34.0-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.34.0-system-lib.patch
18 deleted file mode 100644
19 index ff5da04..0000000
20 --- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.34.0-system-lib.patch
21 +++ /dev/null
22 @@ -1,227 +0,0 @@
23 -Split support for libsoup-gnome
24 -
25 -Original patch by Romain Perier.
26 ----
27 ---- configure.ac
28 -+++ configure.ac
29 -@@ -72,15 +72,30 @@
30 - dnl *** Checks for glib ***
31 - dnl ***********************
32 -
33 --AM_PATH_GLIB_2_0(2.27.5,,,gobject gthread gio)
34 --if test "$GLIB_LIBS" = ""; then
35 -- AC_MSG_ERROR(GLIB 2.27.5 or later is required to build libsoup)
36 --fi
37 --GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
38 --
39 --PKG_CHECK_MODULES(XML, libxml-2.0)
40 --AC_SUBST(XML_CFLAGS)
41 --AC_SUBST(XML_LIBS)
42 -+PKG_PROG_PKG_CONFIG
43 -+enable_ssl=no
44 -+AC_ARG_WITH(libsoup-system,
45 -+ AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]),
46 -+ [with_libsoup_system=$withval], [with_libsoup_system=no])
47 -+if test "$with_libsoup_system" = "no"; then
48 -+ AM_PATH_GLIB_2_0(2.27.5,,,gobject gthread gio)
49 -+ if test "$GLIB_LIBS" = ""; then
50 -+ AC_MSG_ERROR(GLIB 2.27.5 or later is required to build libsoup)
51 -+ fi
52 -+ GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
53 -+
54 -+ PKG_CHECK_MODULES(XML, libxml-2.0)
55 -+ AC_SUBST(XML_CFLAGS)
56 -+ AC_SUBST(XML_LIBS)
57 -+
58 -+ dnl *******************
59 -+ dnl *** Misc checks ***
60 -+ dnl *******************
61 -+ AC_CHECK_FUNCS(gmtime_r)
62 -+ AC_CHECK_FUNCS(mmap)
63 -+ AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
64 -+fi
65 -+AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
66 -
67 - dnl ***********************
68 - dnl *** Check for Win32 ***
69 -@@ -99,13 +114,6 @@
70 - AC_MSG_RESULT([$os_win32])
71 - AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
72 -
73 --dnl *******************
74 --dnl *** Misc checks ***
75 --dnl *******************
76 --AC_CHECK_FUNCS(gmtime_r)
77 --AC_CHECK_FUNCS(mmap)
78 --AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
79 --
80 - dnl *********************
81 - dnl *** GNOME support ***
82 - dnl *********************
83 -@@ -130,6 +138,10 @@
84 - if test $with_gnome != no; then
85 - AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled])
86 -
87 -+ if test $with_libsoup_system != no; then
88 -+ PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION)
89 -+ fi
90 -+
91 - PKG_CHECK_MODULES(SQLITE, sqlite3, :, [AC_MSG_ERROR(dnl
92 - [Could not find sqlite3 devel files:
93 -
94 ---- libsoup/Makefile.am
95 -+++ libsoup/Makefile.am
96 -@@ -4,15 +4,18 @@
97 - LIBWS2_32 = -lws2_32
98 - endif
99 -
100 --INCLUDES = \
101 -+INCLUDES =
102 -+lib_LTLIBRARIES =
103 -+CLEANFILES =
104 -+
105 -+if BUILD_LIBSOUP
106 -+INCLUDES += \
107 - -DG_LOG_DOMAIN=\"libsoup\" \
108 - -I$(top_srcdir) \
109 - $(SOUP_DEBUG_FLAGS) \
110 - $(SOUP_MAINTAINER_FLAGS) \
111 - $(GLIB_CFLAGS) \
112 -- $(XML_CFLAGS) \
113 -- $(SQLITE_CFLAGS) \
114 -- $(GNOME_KEYRING_CFLAGS)
115 -+ $(XML_CFLAGS)
116 -
117 - MARSHAL_GENERATED = soup-marshal.c soup-marshal.h
118 - MKENUMS_GENERATED = soup-enum-types.c soup-enum-types.h
119 -@@ -41,7 +44,7 @@
120 -
121 - BUILT_SOURCES = $(MARSHAL_GENERATED) $(MKENUMS_GENERATED)
122 -
123 --CLEANFILES = $(MARSHAL_GENERATED) $(MKENUMS_GENERATED)
124 -+CLEANFILES += $(MARSHAL_GENERATED) $(MKENUMS_GENERATED)
125 -
126 - libsoupincludedir = $(includedir)/libsoup-2.4/libsoup
127 -
128 -@@ -94,7 +97,7 @@
129 - $(soup_headers) \
130 - soup-enum-types.h
131 -
132 --lib_LTLIBRARIES = libsoup-2.4.la
133 -+lib_LTLIBRARIES += libsoup-2.4.la
134 -
135 - libsoup_2_4_la_LDFLAGS = \
136 - -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined
137 -@@ -178,10 +181,16 @@
138 - soup-value-utils.c \
139 - soup-xmlrpc.c
140 -
141 -+endif
142 -+
143 - if BUILD_LIBSOUP_GNOME
144 -
145 - libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
146 -
147 -+INCLUDES += $(LIBSOUP_CFLAGS) \
148 -+ $(SQLITE_CFLAGS) \
149 -+ $(GNOME_KEYRING_CFLAGS)
150 -+
151 - libsoupgnomeinclude_HEADERS = \
152 - soup-cookie-jar-sqlite.h\
153 - soup-gnome.h \
154 -@@ -189,14 +198,24 @@
155 -
156 - lib_LTLIBRARIES += libsoup-gnome-2.4.la
157 -
158 -+if BUILD_LIBSOUP
159 - libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
160 -+else
161 -+libsoup_gnome_2_4_la_LDFLAGS = \
162 -+ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined
163 -+endif
164 -
165 - libsoup_gnome_2_4_la_LIBADD = \
166 -- libsoup-2.4.la \
167 - $(GLIB_LIBS) \
168 - $(SQLITE_LIBS) \
169 - $(GNOME_KEYRING_LIBS)
170 -
171 -+if BUILD_LIBSOUP
172 -+libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la
173 -+else
174 -+libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS)
175 -+endif
176 -+
177 - libsoup_gnome_2_4_la_SOURCES = \
178 - soup-cookie-jar-sqlite.c \
179 - soup-gnome-features.c \
180 -@@ -217,6 +236,8 @@
181 -
182 - if HAVE_INTROSPECTION
183 -
184 -+if BUILD_LIBSOUP
185 -+
186 - # Core library
187 - gi_soup_files = \
188 - $(filter-out soup.h soup-enum-types.% soup-marshal.%,\
189 -@@ -238,20 +259,28 @@
190 -
191 - INTROSPECTION_GIRS += Soup-2.4.gir
192 -
193 -+endif
194 -+
195 - if BUILD_LIBSOUP_GNOME
196 -
197 -+if BUILD_LIBSOUP
198 -+SOUP_GIR = Soup-2.4.gir
199 -+else
200 -+SOUP_GIR =
201 -+endif
202 -+
203 - # GNOME extensions
204 - gi_soup_gnome_files = $(filter-out soup-gnome.h,\
205 - $(libsoupgnomeinclude_HEADERS) \
206 - $(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES)))
207 --SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir
208 -+SoupGNOME-2.4.gir: libsoup-gnome-2.4.la $(SOUP_GIR)
209 -+SoupGNOME_2_4_gir_INCLUDES = Soup-2.4
210 - SoupGNOME_2_4_gir_SCANNERFLAGS = \
211 - --identifier-prefix=Soup \
212 - --symbol-prefix=soup \
213 -- --c-include "libsoup/soup-gnome.h" \
214 -- --include-uninstalled=$(builddir)/Soup-2.4.gir
215 -+ --c-include "libsoup/soup-gnome.h"
216 - SoupGNOME_2_4_gir_CFLAGS = $(INCLUDES)
217 --SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la
218 -+SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la
219 - SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files))
220 - SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
221 -
222 ---- Makefile.am
223 -+++ Makefile.am
224 -@@ -1,7 +1,11 @@
225 - ## Process this file with automake to produce Makefile.in
226 - ACLOCAL_AMFLAGS = -I m4
227 -
228 --SUBDIRS = libsoup tests docs
229 -+SUBDIRS = libsoup
230 -+
231 -+if BUILD_LIBSOUP
232 -+SUBDIRS += tests docs
233 -+endif
234 -
235 - EXTRA_DIST = \
236 - libsoup-2.4.pc.in \
237 -@@ -14,7 +18,11 @@
238 -
239 - pkgconfigdir = $(libdir)/pkgconfig
240 -
241 --pkgconfig_DATA = libsoup-2.4.pc
242 -+pkgconfig_DATA =
243 -+
244 -+if BUILD_LIBSOUP
245 -+pkgconfig_DATA += libsoup-2.4.pc
246 -+endif
247 -
248 - if BUILD_LIBSOUP_GNOME
249 - pkgconfig_DATA += libsoup-gnome-2.4.pc
250
251 diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.34.0.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.34.0.ebuild
252 deleted file mode 100644
253 index e249b66..0000000
254 --- a/net-libs/libsoup-gnome/libsoup-gnome-2.34.0.ebuild
255 +++ /dev/null
256 @@ -1,57 +0,0 @@
257 -# Copyright 1999-2010 Gentoo Foundation
258 -# Distributed under the terms of the GNU General Public License v2
259 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.32.2.ebuild,v 1.1 2010/12/04 16:00:25 pacho Exp $
260 -
261 -EAPI="3"
262 -GCONF_DEBUG="yes"
263 -GNOME2_LA_PUNT="yes"
264 -
265 -inherit autotools eutils gnome2
266 -
267 -MY_PN=${PN/-gnome}
268 -MY_P=${MY_PN}-${PV}
269 -
270 -DESCRIPTION="GNOME plugin for libsoup"
271 -HOMEPAGE="http://live.gnome.org/LibSoup"
272 -SRC_URI="${SRC_URI//-gnome}"
273 -
274 -LICENSE="LGPL-2"
275 -SLOT="2.4"
276 -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-solaris"
277 -IUSE="debug doc +introspection"
278 -
279 -RDEPEND="~net-libs/libsoup-${PV}
280 - || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 )
281 - dev-db/sqlite:3
282 - introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
283 -DEPEND="${RDEPEND}
284 - >=dev-util/pkgconfig-0.9
285 - >=dev-util/gtk-doc-am-1.10
286 - doc? ( >=dev-util/gtk-doc-1.10 )"
287 -
288 -S=${WORKDIR}/${MY_P}
289 -
290 -pkg_setup() {
291 - G2CONF="${G2CONF}
292 - --disable-static
293 - --disable-tls-check
294 - $(use_enable introspection)
295 - --with-libsoup-system
296 - --with-gnome"
297 - DOCS="AUTHORS NEWS README"
298 -}
299 -
300 -src_configure() {
301 - # FIXME: we need addpredict to workaround bug #324779 until
302 - # root cause (bug #249496) is solved
303 - addpredict /usr/share/snmp/mibs/.index
304 - gnome2_src_configure
305 -}
306 -
307 -src_prepare() {
308 - gnome2_src_prepare
309 -
310 - # Use lib present on the system
311 - epatch "${FILESDIR}"/${PN}-2.34.0-system-lib.patch
312 - eautoreconf
313 -}
314
315 diff --git a/net-libs/libsoup/files/libsoup-2.30.1-fix-build-without-gnome-with-doc.patch b/net-libs/libsoup/files/libsoup-2.30.1-fix-build-without-gnome-with-doc.patch
316 deleted file mode 100644
317 index 2b5a39d..0000000
318 --- a/net-libs/libsoup/files/libsoup-2.30.1-fix-build-without-gnome-with-doc.patch
319 +++ /dev/null
320 @@ -1,58 +0,0 @@
321 -From c8ff78e489ccf5becd1ae309222b7977510558e6 Mon Sep 17 00:00:00 2001
322 -From: Priit Laes <plaes@×××××.org>
323 -Date: Thu, 25 Feb 2010 20:59:51 +0200
324 -Subject: [PATCH] Split docs into libsoup and libsoup-gnome.
325 -
326 -Fixes Gentoo Bug 268592, patch adapted from upstream patch.
327 -
328 -Modified to apply to a release tarball (no libsoup-2.4-docs.sgml.in)
329 -Hence, to be applied ONLY when !gnome && doc
330 ----
331 - docs/reference/Makefile.am | 5 ++++-
332 - docs/reference/libsoup-2.4-docs.sgml | 2 ++
333 - 2 files changed, 6 insertions(+), 1 deletions(-)
334 -
335 -diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
336 -index 64d3cf8..8b91b7f 100644
337 ---- a/docs/reference/Makefile.am
338 -+++ b/docs/reference/Makefile.am
339 -@@ -38,6 +38,9 @@ IGNORE_HFILES= soup.h soup-marshal.h soup-enum-types.h \
340 - soup-proxy-resolver.h soup-proxy-resolver-gnome.h \
341 - soup-proxy-resolver-static.h
342 -
343 -+IGNORE_HFILES += soup-cookie-jar-sqlite.h \
344 -+ soup-gnome.h soup-gnome-features.h
345 -+
346 - # Images to copy into HTML directory.
347 - HTML_IMAGES =
348 -
349 -@@ -62,7 +65,7 @@ GTKDOC_CFLAGS = \
350 - $(GNUTLS_CFLAGS) \
351 - $(LIBPROXY_LIBS)
352 -
353 --GTKDOC_LIBS = $(top_builddir)/libsoup/libsoup-gnome-2.4.la
354 -+GTKDOC_LIBS = $(top_builddir)/libsoup/libsoup-2.4.la
355 -
356 - # include common portion ...
357 - include $(top_srcdir)/gtk-doc.make
358 -diff --git a/docs/reference/libsoup-2.4-docs.sgml b/docs/reference/libsoup-2.4-docs.sgml
359 -index 3cb3d11..707e525 100644
360 ---- a/docs/reference/libsoup-2.4-docs.sgml
361 -+++ b/docs/reference/libsoup-2.4-docs.sgml
362 -@@ -52,11 +52,13 @@
363 - <xi:include href="xml/soup-value-utils.xml"/>
364 - </chapter>
365 -
366 -+<!--
367 - <chapter>
368 - <title>GNOME integration</title>
369 - <xi:include href="xml/soup-gnome-features.xml"/>
370 - <xi:include href="xml/soup-cookie-jar-sqlite.xml"/>
371 - </chapter>
372 -+-->
373 -
374 - <chapter>
375 - <title>Low-level Networking API</title>
376 ---
377 -1.7.0
378 -
379
380 diff --git a/net-libs/libsoup/libsoup-2.34.0.ebuild b/net-libs/libsoup/libsoup-2.34.0.ebuild
381 deleted file mode 100644
382 index fda3480..0000000
383 --- a/net-libs/libsoup/libsoup-2.34.0.ebuild
384 +++ /dev/null
385 @@ -1,67 +0,0 @@
386 -# Copyright 1999-2011 Gentoo Foundation
387 -# Distributed under the terms of the GNU General Public License v2
388 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.32.2.ebuild,v 1.1 2010/12/04 15:56:50 pacho Exp $
389 -
390 -EAPI="3"
391 -GCONF_DEBUG="yes"
392 -GNOME2_LA_PUNT="yes"
393 -
394 -inherit autotools eutils gnome2
395 -
396 -DESCRIPTION="An HTTP library implementation in C"
397 -HOMEPAGE="http://live.gnome.org/LibSoup"
398 -
399 -LICENSE="LGPL-2"
400 -SLOT="2.4"
401 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
402 -IUSE="debug doc +introspection ssl test"
403 -
404 -RDEPEND=">=dev-libs/glib-2.27.5:2
405 - >=dev-libs/libxml2-2:2
406 - net-libs/glib-networking[ssl?]
407 - introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
408 -DEPEND="${RDEPEND}
409 - >=dev-util/pkgconfig-0.9
410 - >=dev-util/gtk-doc-am-1.10
411 - doc? ( >=dev-util/gtk-doc-1.10 )"
412 -# test? ( www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
413 -# apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
414 -# apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
415 -# dev-lang/php[apache2,xmlrpc]
416 -# net-misc/curl
417 -# net-libs/glib-networking[ssl])"
418 -
419 -pkg_setup() {
420 - # Set invalid apache module dir until apache tests are ready, bug #326957
421 - DOCS="AUTHORS NEWS README"
422 - G2CONF="${G2CONF}
423 - --disable-static
424 - --disable-tls-check
425 - --without-gnome
426 - --with-apache-module-dir="${T}"
427 - $(use_enable introspection)"
428 -}
429 -
430 -src_configure() {
431 - # FIXME: we need addpredict to workaround bug #324779 until
432 - # root cause (bug #249496) is solved
433 - addpredict /usr/share/snmp/mibs/.index
434 - gnome2_src_configure
435 -}
436 -
437 -src_prepare() {
438 - gnome2_src_prepare
439 -
440 - if ! use test; then
441 - # don't waste time building tests (bug #226271)
442 - sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
443 - || die "sed failed"
444 - fi
445 -
446 - # Patch *must* be applied conditionally (see patch for details)
447 - if use doc; then
448 - # Fix bug 268592 (upstream #573685) (build fails without gnome && doc)
449 - epatch "${FILESDIR}/${PN}-2.30.1-fix-build-without-gnome-with-doc.patch"
450 - eautoreconf
451 - fi
452 -}