Really adding needed patches, thanks Kaleb Elwert and Lars Wendler for reporting.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 228 insertions, 3 deletions

diff --git a/net-libs/libsoup-gnome/ChangeLog b/net-libs/libsoup-gnome/ChangeLog
index 772aca13814f..2ee480aa7cd9 100644
--- a/net-libs/libsoup-gnome/ChangeLog
+++ b/net-libs/libsoup-gnome/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libsoup-gnome
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.24 2010/06/13 15:47:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.25 2010/06/13 18:50:57 pacho Exp $
+
+  13 Jun 2010; Pacho Ramos <pacho@gentoo.org>
+  +files/libsoup-gnome-system-lib.patch:
+  Really adding needed patches, thanks Kaleb Elwert and Lars Wendler for
+  reporting.
 
 *libsoup-gnome-2.30.1 (13 Jun 2010)
 
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch
new file mode 100644
index 000000000000..964b71048d26
--- /dev/null
+++ b/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch
@@ -0,0 +1,220 @@
+From 6ff741f0302bc0eddba20ed4445e68b6e71af594 Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Tue, 23 Feb 2010 08:16:49 +0200
+Subject: [PATCH] Split support for libgnome-soup.
+
+Original patch by Romain Perier.
+---
+ Makefile.am         |   13 ++++++++++---
+ configure.ac        |   49 ++++++++++++++++++++++++++++++++-----------------
+ libsoup/Makefile.am |   36 +++++++++++++++++++++++++++---------
+ 3 files changed, 69 insertions(+), 29 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index b845e29..21529dd 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,12 @@
+ ## Process this file with automake to produce Makefile.in
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-SUBDIRS = libsoup tests docs
++SUBDIRS = libsoup
++
++if BUILD_LIBSOUP
++SUBDIRS += tests docs
++endif
++
+ 
+ EXTRA_DIST =			\
+ 	libsoup-2.4.pc.in	\
+@@ -13,8 +18,10 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ 
+-pkgconfig_DATA = libsoup-2.4.pc
+-
++pkgconfig_DATA=
++if BUILD_LIBSOUP
++pkgconfig_DATA += libsoup-2.4.pc
++endif
+ if BUILD_LIBSOUP_GNOME
+ pkgconfig_DATA += libsoup-gnome-2.4.pc
+ endif
+diff --git a/configure.ac b/configure.ac
+index eb45cfc..a8cd7ed 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -72,6 +72,14 @@ dnl ***********************
+ dnl *** Checks for glib ***
+ dnl ***********************
+ 
++PKG_PROG_PKG_CONFIG
++enable_ssl=no
++AC_ARG_WITH(libsoup-system,
++   AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]),
++   [with_libsoup_system=$withval], [with_libsoup_system=no])
++
++if test "$with_libsoup_system" = "no"; then
++  
+ AM_PATH_GLIB_2_0(2.21.3,,,gobject gthread gio)
+ if test "$GLIB_LIBS" = ""; then
+    AC_MSG_ERROR(GLIB 2.21.3 or later is required to build libsoup)
+@@ -82,23 +90,6 @@ PKG_CHECK_MODULES(XML, libxml-2.0)
+ AC_SUBST(XML_CFLAGS)
+ AC_SUBST(XML_LIBS)
+ 
+-dnl ***********************
+-dnl *** Check for Win32 ***
+-dnl ***********************
+-
+-AC_MSG_CHECKING([for Win32])
+-case "$host" in
+-  *-*-mingw*)
+-    os_win32=yes
+-    CFLAGS="$CFLAGS -D_REENTRANT"
+-    ;;
+-  *)
+-    os_win32=no
+-    ;;
+-esac
+-AC_MSG_RESULT([$os_win32])
+-AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
+-
+ dnl *******************
+ dnl *** Misc checks ***
+ dnl *******************
+@@ -135,8 +126,28 @@ AC_SUBST(LIBGNUTLS_CFLAGS)
+ AC_SUBST(LIBGNUTLS_LIBS)
+ AC_SUBST(SSL_REQUIREMENT)
+ 
++fi
++
+ dnl This is not supposed to be conditional, but...
+ AM_CONDITIONAL(HAVE_SSL, test $enable_ssl != no)
++AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
++
++dnl ***********************
++dnl *** Check for Win32 ***
++dnl ***********************
++
++AC_MSG_CHECKING([for Win32])
++case "$host" in
++  *-*-mingw*)
++    os_win32=yes
++    CFLAGS="$CFLAGS -D_REENTRANT"
++    ;;
++  *)
++    os_win32=no
++    ;;
++esac
++AC_MSG_RESULT([$os_win32])
++AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
+ 
+ 
+ dnl *********************
+@@ -163,6 +174,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no)
+ if test $with_gnome != no; then
+ 	AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled])
+ 
++    if test $with_libsoup_system != no; then
++       PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION)
++    fi
++
+ 	PKG_CHECK_MODULES(LIBPROXY, libproxy-1.0, :, [AC_MSG_ERROR(dnl
+ [Could not find libproxy:
+ 
+diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
+index 284d85f..cfb89b4 100644
+--- a/libsoup/Makefile.am
++++ b/libsoup/Makefile.am
+@@ -4,17 +4,17 @@ if OS_WIN32
+ LIBWS2_32 = -lws2_32
+ endif
+ 
+-INCLUDES = 				\
++INCLUDES =
++lib_LTLIBRARIES = 
++
++if BUILD_LIBSOUP
++INCLUDES +=                \
+ 	-DG_LOG_DOMAIN=\"libsoup\" 	\
+ 	-I$(top_srcdir)			\
+ 	$(SOUP_DEBUG_FLAGS)		\
+ 	$(SOUP_MAINTAINER_FLAGS)	\
+ 	$(GLIB_CFLAGS)			\
+ 	$(XML_CFLAGS)			\
+-	$(GCONF_CFLAGS)			\
+-	$(LIBPROXY_CFLAGS)		\
+-	$(SQLITE_CFLAGS)		\
+-	$(GNOME_KEYRING_CFLAGS)		\
+ 	$(LIBGCRYPT_CFLAGS)		\
+ 	$(LIBGNUTLS_CFLAGS)
+ 
+@@ -91,7 +91,7 @@ libsoupinclude_HEADERS =	\
+ 	$(soup_headers)		\
+ 	soup-enum-types.h
+ 
+-lib_LTLIBRARIES = libsoup-2.4.la
++lib_LTLIBRARIES += libsoup-2.4.la
+ 
+ libsoup_2_4_la_LDFLAGS =	\
+ 	-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined
+@@ -171,10 +171,18 @@ libsoup_2_4_la_SOURCES =		\
+ 	soup-value-utils.c		\
+ 	soup-xmlrpc.c
+ 
++endif
++
+ if BUILD_LIBSOUP_GNOME
+ 
+ libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
+ 
++INCLUDES += $(LIBSOUP_CFLAGS)  \
++    $(GCONF_CFLAGS)     \
++    $(LIBPROXY_CFLAGS)  \
++    $(SQLITE_CFLAGS)    \
++    $(GNOME_KEYRING_CFLAGS)
++
+ libsoupgnomeinclude_HEADERS =	\
+ 	soup-cookie-jar-sqlite.h\
+ 	soup-gnome.h		\
+@@ -182,16 +190,26 @@ libsoupgnomeinclude_HEADERS =	\
+ 
+ lib_LTLIBRARIES += libsoup-gnome-2.4.la
+ 
+-libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
++if BUILD_LIBSOUP
++   libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
++else
++  libsoup_gnome_2_4_la_LDFLAGS =        \
++	-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined
++endif
+ 
+ libsoup_gnome_2_4_la_LIBADD =		\
+-	libsoup-2.4.la			\
+ 	$(GLIB_LIBS)			\
+ 	$(GCONF_LIBS)			\
+ 	$(LIBPROXY_LIBS)		\
+ 	$(SQLITE_LIBS)			\
+ 	$(GNOME_KEYRING_LIBS)
+ 
++if BUILD_LIBSOUP
++  libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la
++else
++  libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS)
++endif
++
+ libsoup_gnome_2_4_la_SOURCES =		\
+ 	soup-cookie-jar-sqlite.c	\
+ 	soup-gnome-features.c		\
+@@ -205,4 +223,4 @@ endif
+ EXTRA_DIST=				\
+ 	soup-marshal.list		\
+ 	soup-enum-types.h.tmpl		\
+-	soup-enum-types.c.tmpl
+\ No newline at end of file
++	soup-enum-types.c.tmpl
+-- 
+1.7.0
+
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.30.1.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.30.1.ebuild
index 7e042df7dfaa..26b4b93e2f9a 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.30.1.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.30.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.30.1.ebuild,v 1.1 2010/06/13 15:47:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.30.1.ebuild,v 1.2 2010/06/13 18:50:57 pacho Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ SRC_URI="${SRC_URI//-gnome}"
 
 LICENSE="LGPL-2"
 SLOT="2.4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-solaris"
 # Do NOT build with --disable-debug/--enable-debug=no - gnome2.eclass takes care of that
 IUSE="debug doc"