net-libs/libsoup-gnome: version-bump: 2.46.0-r1

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

6 files changed, 121 insertions, 554 deletions

diff --git a/net-libs/libsoup-gnome/ChangeLog b/net-libs/libsoup-gnome/ChangeLog
index 02be809..48210f7 100644
--- a/net-libs/libsoup-gnome/ChangeLog
+++ b/net-libs/libsoup-gnome/ChangeLog
@@ -1,6 +1,72 @@
 # ChangeLog for net-libs/libsoup-gnome
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.89 2013/08/29 22:08:34 eva Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.107 2014/04/27 17:46:27 eva Exp $
+
+*libsoup-gnome-2.46.0 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  +libsoup-gnome-2.46.0.ebuild, +files/libsoup-gnome-2.46.0-system-lib.patch:
+  Version bump for Gnome 3.12.
+
+  27 Apr 2014; Pacho Ramos <pacho@gentoo.org>
+  -files/libsoup-gnome-2.38.0-system-lib.patch,
+  -files/libsoup-gnome-2.40.2-system-lib.patch,
+  -files/libsoup-gnome-2.42.2-system-lib.patch, -libsoup-gnome-2.38.1.ebuild,
+  -libsoup-gnome-2.40.3.ebuild, -libsoup-gnome-2.42.3.1.ebuild:
+  drop old
+
+  21 Apr 2014; Agostino Sarubbo <ago@gentoo.org> libsoup-gnome-2.44.2.ebuild:
+  Stable for arm, wrt bug #507568
+
+  19 Apr 2014; Agostino Sarubbo <ago@gentoo.org> libsoup-gnome-2.44.2.ebuild:
+  Stable for sparc, wrt bug #507568
+
+  18 Apr 2014; Agostino Sarubbo <ago@gentoo.org> libsoup-gnome-2.44.2.ebuild:
+  Stable for alpha, wrt bug #507568
+
+  17 Apr 2014; Agostino Sarubbo <ago@gentoo.org> libsoup-gnome-2.44.2.ebuild:
+  Stable for ia64, wrt bug #507568
+
+  16 Apr 2014; Agostino Sarubbo <ago@gentoo.org> libsoup-gnome-2.44.2.ebuild:
+  Stable for ppc64, wrt bug #507568
+
+  14 Apr 2014; Agostino Sarubbo <ago@gentoo.org> libsoup-gnome-2.44.2.ebuild:
+  Stable for ppc, wrt bug #507568
+
+  09 Mar 2014; Pacho Ramos <pacho@gentoo.org> libsoup-gnome-2.44.2.ebuild:
+  x86 stable, bug 499954
+
+  09 Mar 2014; Pacho Ramos <pacho@gentoo.org> libsoup-gnome-2.44.2.ebuild:
+  amd64 stable, bug 499954
+
+  22 Feb 2014; Pacho Ramos <pacho@gentoo.org> libsoup-gnome-2.44.2.ebuild:
+  Fix wrong commit, bug 502160
+
+  22 Feb 2014; Pacho Ramos <pacho@gentoo.org> libsoup-gnome-2.44.2.ebuild:
+  arch stable, bug 888
+
+*libsoup-gnome-2.44.2 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/libsoup-gnome-2.44.2-system-lib.patch, +libsoup-gnome-2.44.2.ebuild:
+  Version bump for Gnome 3.10
+
+  08 Dec 2013; Pacho Ramos <pacho@gentoo.org> libsoup-gnome-2.42.3.1.ebuild:
+  x86 stable, bug #478252
+
+  30 Nov 2013; Pacho Ramos <pacho@gentoo.org> libsoup-gnome-2.42.3.1.ebuild:
+  amd64 stable, bug #478252
+
+  30 Nov 2013; Pacho Ramos <pacho@gentoo.org> -libsoup-gnome-2.42.2.ebuild:
+  Drop old
+
+*libsoup-gnome-2.42.3.1 (15 Nov 2013)
+
+  15 Nov 2013; Pacho Ramos <pacho@gentoo.org> +libsoup-gnome-2.42.3.1.ebuild:
+  Version bump
+
+  17 Oct 2013; Markus Meier <maekke@gentoo.org> libsoup-gnome-2.40.3.ebuild:
+  arm stable, bug #476364
 
 *libsoup-gnome-2.42.2 (29 Aug 2013)
 
diff --git a/net-libs/libsoup-gnome/Manifest b/net-libs/libsoup-gnome/Manifest
index a97720d..5840643 100644
--- a/net-libs/libsoup-gnome/Manifest
+++ b/net-libs/libsoup-gnome/Manifest
@@ -1,7 +1,6 @@
-AUX libsoup-gnome-2.38.0-system-lib.patch 6632 SHA256 6693f3976025c07d5ddfb5c27ebd46df5c92491691fdab7d07d47f1058ac696e SHA512 2434a6515bff745dc615d5a80f3c8c6f555ce55f0bd1748538d4571a97f973e811693aa2b8352f47c40ff6b14374a7a2b8b42b7fb6cb3c117a88353c66105399 WHIRLPOOL a95f9c1699407cbd8c5451e511bab75e8dda8d986cf3960726c30f40c4e76d13990a6e9ceb9a49180c5d02e8973f16993ce01ba46a24cab6a1dba2b0c17f5398
-AUX libsoup-gnome-2.40.2-system-lib.patch 7054 SHA256 6ca82717df71123e0a02405f5a6ad2e5f0eb7c544b4857017d4ab942c0359e96 SHA512 7a7736b46144abf05674aa9050bde932b2b62dd1fc8895758d4d7969455c38c9a26d7ce40b58d19c7053fce2841399fd5088b71bc69012ce554ab30ee576a7a4 WHIRLPOOL 15f8fa8cce1c85f3431320c46bcdbe7127c047868fd012a3ddb1b5f0713c568f4658cd5cfd15d0a6f9892b227b1a075ef5c78b4a648ab8ed4696f63f83556a5a
-AUX libsoup-gnome-2.42.2-system-lib.patch 7088 SHA256 b4a78508fb00a4afc14f682c4d1e1555e1266a46c8360f4935d03ce1aaacc01d SHA512 1e7124aa0ff16e8c183ecfdf8f004e4806050421e43b8a8df492302f00e7e7e3c0b3b3b9343712a51f87fa2113c2dfa38b157f69ea6fb6d2ba8e4186893a8e47 WHIRLPOOL 5b0827b1084fef67f5129e0d74f71ea92e0d129e224feaff22b5ebc936f48c17ee6d42803de25d88eb182d3435eeb8051dfe73f3ef97034f1bee29a65d6f0951
-DIST libsoup-2.42.3.1.tar.xz 740164 SHA256 97a6be94daabd21fcfba7bde4939c44d0f260bb123d7e260fb71551458da6651 SHA512 3d4dabc989f02b11b4f1f4994b0dab2fc069b4997f59bf90e43062fcda1e3b6741b7f25ac5460004916ba7101c853dd2a44345a1d7caaefc6d867ffaa5494f6b WHIRLPOOL 21cd761c98f6176263cf605e6958eea373848b51aedbc21c7528ee4710a0bfa4fdbcac8ee63b46b8f7c9f8b0f858aaadf4b9bcba5f030ba2e52ead3f4164fe0d
-EBUILD libsoup-gnome-2.42.3.1-r1.ebuild 1427 SHA256 f67a8f20aa99da7f1aa91de261d2d5578e91bd9ed6c09e3219ebb6346be42f25 SHA512 85a2a9d7e724dbf3360216287565ef22f119b6c0063231ba6851c810a847821ad96051dc68a8bf7986d5df4a1e28c2e051f791898f4d2d5480dcb1f8c14eb458 WHIRLPOOL 5cb38d225f271955845fca1362c6145c3fb637a9293391dde43b8803ee9ba0bf39bde1dd3faa1cce944e63186af666adcabbb4538aeb2b89fe34868b8a17526c
-MISC ChangeLog 14480 SHA256 49b9699992d816e2d49e380993d3c41571442050c74c168325b51a6ba2f70cfc SHA512 88d88d4493ec2d3ef7632d90866b85e2f7412a3af61612475555206d7a5853940e8efb03c62322d02ed84a10979d43ba62b367685306c065646e38bf70672d2a WHIRLPOOL 12300593f25bce53f69832c0425fbbdce21bfb470b4c7311d05d46939bc30db3a410b11182c7ec7c7b2b714d7c1b4787e60d182b685cc1bf8ff213a60cfbac5d
+AUX libsoup-gnome-2.44.2-system-lib.patch 7077 SHA256 bcd0fab809dafdc4492bc629c68c63427339870b9562c5c124cf5485bd946769 SHA512 508e9c358e2f84415a7c3f2a778be9cc25e3af0568d9883a1712106fbec68b1f78040e4abc711c49c92d2397732028bece0ddd5c6a6f47c6104afbfd8dbc52ea WHIRLPOOL 8c6651d42d39e94d16dc016ed4ed633cc69c6da4ea4652641dfadf8ef7c8ba69c4a65ffa862a5e7e997c725d7805b48c048d2b312ffe6458e40168379a3fc386
+AUX libsoup-gnome-2.46.0-system-lib.patch 7116 SHA256 4cea6b79912fcde4b8362a9ad2f5f4007785d49d6414948e6656195a441ec1f0 SHA512 ba0f13c4eaf20d2e671d996b75ea2dac6316f1ba2545e0a820ce5b47dba8d6eb777981232ad89aa0aaf8c497b010d31d5b46c87da71ea0f188954928f32c7dda WHIRLPOOL 8d7f1a6dc05d7d69e23123dd5392c07a046d2ef98bdf8d1bdd61b95af128776bd2bc9ac4152a3864deee84ba4ebdadfb0b7670aaaa8818662319514f9198b102
+DIST libsoup-2.46.0.tar.xz 1693772 SHA256 fa3d5574c1a2df521242e2ca624a2b3057121798cab9f8f40525aa186a7b15a3 SHA512 a538fbb7c21b2e5d0f53ae917a7ebff21f74490c1ae55222b6dd31932ede5f872da06d544b7ab2e91dbf03682dd53c0fdaf3ba9aed24b3b1f1405f7e65785c0d WHIRLPOOL 3a82f4c4d5fa2543c055b801c6b15cc6faa6db8632de00113a087a0ea8f13e174b3434b58bc97449047be2a7dcc110c0d3604b4f04c874877effda7492c2e4d6
+EBUILD libsoup-gnome-2.46.0-r1.ebuild 1418 SHA256 d42dd54618e91bb34b5e765a9923ffd2c82e690fee2cdff1274e7f7b03005e34 SHA512 191f008141ce0b326cd09adab588e4ff908a6feeab99cfce9d6c6150ddfd90a3cf0d5fd033235df386af60cff1d357f34a81431f4c5ea2a2a4b74258a379d37f WHIRLPOOL 09b497ba48b79c8b6f53e34160dd5aaae3169e45038087f0e647a22ac9a798b1ff237623767f51037ade329a324714b97f91681dffe19a61092d5e857c689113
+MISC ChangeLog 16800 SHA256 578dd02b9419aecccf7c80bf14d6ba2a3c570991ad821b6134b886b6a52846b9 SHA512 28ede4e4a7ec6e83149b2b69e6a223b1741d6735b411c8bcfcf69684ba4eee8717c839e5d24b840208b75e4f707a0af21c113ef67b4bd87bbcce43ead0b457c5 WHIRLPOOL d4945a06b44fc6b6f70be59093a093cbe4ebd6a912ae8af7e05efb03c0488be6fda8290e37f622ecf0385a90abda1b753c97d6b9a288883295a78c1f7d916c17
 MISC metadata.xml 159 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b SHA512 9408846d0f3194f62043b64e325aed9e8cce9a74b556865acf71facc3ad59a092dccbbb3c608ada40b73625eaac93a7bcc976858c6a47426bb8fadb6f830fe2b WHIRLPOOL 4700c8b71899b5acffcc46580315d4d116b478cfa283e0ea0569ab180e46850ce85d73c7370d989e53dd8aecb69ed843d2716bfebd3c5d74a7b5c3d4b94b96bb
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.38.0-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.38.0-system-lib.patch
deleted file mode 100644
index 0c6259a..0000000
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.38.0-system-lib.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-From b39aaca2ec6c551d7646bcb086afb8083492938b Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Tue, 20 Dec 2011 15:42:44 +0200
-Subject: [PATCH] Split support for libsoup-gnome
-
-Original patch by Romain Perier.
----
- Makefile.am         |   12 ++++++++++--
- configure.ac        |   47 +++++++++++++++++++++++++++++------------------
- libsoup/Makefile.am |   48 ++++++++++++++++++++++++++++++++++++++----------
- 3 files changed, 77 insertions(+), 30 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 8b86fb7..7f628f4 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,11 @@
- ## Process this file with automake to produce Makefile.in
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
- 
--SUBDIRS = libsoup tests docs
-+SUBDIRS = libsoup
-+
-+if BUILD_LIBSOUP
-+SUBDIRS += tests docs
-+endif
- 
- EXTRA_DIST =			\
- 	libsoup-2.4.pc.in	\
-@@ -15,7 +19,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
- 
- 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
-diff --git a/configure.ac b/configure.ac
-index eee8636..f9d6e47 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -72,19 +72,33 @@ dnl ***********************
- dnl *** Checks for glib ***
- dnl ***********************
- 
--GLIB_REQUIRED=2.31.7
--AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
--if test "$GLIB_LIBS" = ""; then
--   AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
-+PKG_PROG_PKG_CONFIG
-+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
-+	GLIB_REQUIRED=2.31.7
-+	AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
-+	if test "$GLIB_LIBS" = ""; then
-+	   AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
-+	fi
-+	GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
-+	GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
-+	AC_SUBST(GLIB_MAKEFILE)
-+
-+	PKG_CHECK_MODULES(XML, libxml-2.0)
-+	AC_SUBST(XML_CFLAGS)
-+	AC_SUBST(XML_LIBS)
-+
-+	dnl *******************
-+	dnl *** Misc checks ***
-+	dnl *******************
-+	AC_CHECK_FUNCS(gmtime_r)
-+	AC_CHECK_FUNCS(mmap)
-+	AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
- fi
--GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
--
--GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
--AC_SUBST(GLIB_MAKEFILE)
- 
--PKG_CHECK_MODULES(XML, libxml-2.0)
--AC_SUBST(XML_CFLAGS)
--AC_SUBST(XML_LIBS)
-+AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
- 
- dnl ***********************
- dnl *** Check for Win32 ***
-@@ -103,13 +117,6 @@ esac
- AC_MSG_RESULT([$os_win32])
- AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
- 
--dnl *******************
--dnl *** Misc checks ***
--dnl *******************
--AC_CHECK_FUNCS(gmtime_r)
--AC_CHECK_FUNCS(mmap)
--AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
--
- dnl *********************
- dnl *** GNOME support ***
- dnl *********************
-@@ -134,6 +141,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(SQLITE, sqlite3, :, [AC_MSG_ERROR(dnl
- [Could not find sqlite3 devel files:
- 
-diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
-index aa13eec..ef0c870 100644
---- a/libsoup/Makefile.am
-+++ b/libsoup/Makefile.am
-@@ -6,15 +6,18 @@ if OS_WIN32
- LIBWS2_32 = -lws2_32
- endif
- 
--INCLUDES = 				\
-+INCLUDES =
-+lib_LTLIBRARIES =
-+CLEANFILES =
-+
-+if BUILD_LIBSOUP
-+INCLUDES += 				\
- 	-DG_LOG_DOMAIN=\"libsoup\" 	\
- 	-I$(top_srcdir)			\
- 	$(SOUP_DEBUG_FLAGS)		\
- 	$(SOUP_MAINTAINER_FLAGS)	\
- 	$(GLIB_CFLAGS)			\
--	$(XML_CFLAGS)			\
--	$(SQLITE_CFLAGS)		\
--	$(GNOME_KEYRING_CFLAGS)
-+	$(XML_CFLAGS)
- 
- libsoupincludedir = $(includedir)/libsoup-2.4/libsoup
- 
-@@ -67,7 +70,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
-@@ -152,6 +155,7 @@ libsoup_2_4_la_SOURCES =		\
- 	soup-uri.c			\
- 	soup-value-utils.c		\
- 	soup-xmlrpc.c
-+endif
- 
- if BUILD_LIBSOUP_GNOME
- 
-@@ -165,6 +169,10 @@ endif
- 
- libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
- 
-+INCLUDES += $(LIBSOUP_CFLAGS)		\
-+    $(SQLITE_CFLAGS)			\
-+    $(GNOME_KEYRING_CFLAGS)
-+
- libsoupgnomeinclude_HEADERS =	\
- 	soup-cookie-jar-sqlite.h\
- 	soup-gnome.h		\
-@@ -172,14 +180,24 @@ libsoupgnomeinclude_HEADERS =	\
- 
- lib_LTLIBRARIES += libsoup-gnome-2.4.la
- 
-+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)			\
- 	$(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		\
-@@ -207,6 +225,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
- 
- if HAVE_INTROSPECTION
- 
-+if BUILD_LIBSOUP
-+
- # Core library
- gi_soup_files = \
- 	$(filter-out soup.h soup-enum-types.% soup-marshal.% soup-proxy-resolver.h,\
-@@ -228,20 +248,28 @@ Soup_2_4_gir_FILES = \
- 
- INTROSPECTION_GIRS += Soup-2.4.gir
- 
-+endif
-+
- if BUILD_LIBSOUP_GNOME
- 
-+if BUILD_LIBSOUP
-+SOUP_GIR = Soup-2.4.gir
-+else
-+SOUP_GIR =
-+endif
-+
- # GNOME extensions
- gi_soup_gnome_files = $(filter-out soup-gnome.h,\
- 		          $(libsoupgnomeinclude_HEADERS) \
- 	                  $(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES)))
--SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir
-+SoupGNOME-2.4.gir: libsoup-gnome-2.4.la $(SOUP_GIR)
-+SoupGNOME_2_4_gir_INCLUDES = Soup-2.4
- SoupGNOME_2_4_gir_SCANNERFLAGS =			\
- 	--identifier-prefix=Soup			\
- 	--symbol-prefix=soup				\
--	--c-include "libsoup/soup-gnome.h"		\
--	--include-uninstalled=$(builddir)/Soup-2.4.gir
-+	--c-include "libsoup/soup-gnome.h"
- SoupGNOME_2_4_gir_CFLAGS = $(INCLUDES)
--SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la
-+SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la
- SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files))
- SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
- 
--- 
-1.7.8.4
-
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.40.2-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.40.2-system-lib.patch
deleted file mode 100644
index d236e0c..0000000
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.40.2-system-lib.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-From 41200f48909dbf48fd2c96f305b71797634aca3e Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Tue, 20 Dec 2011 15:42:44 +0200
-Subject: [PATCH] Split support for libsoup-gnome
-
-https://bugzilla.gnome.org/show_bug.cgi?id=595065
-
-Original patch by Romain Perier.
----
- Makefile.am         | 12 ++++++++--
- configure.ac        | 35 +++++++++++++++++++----------
- libsoup/Makefile.am | 63 ++++++++++++++++++++++++++++++++++++++---------------
- 3 files changed, 79 insertions(+), 31 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 18bf80a..046f945 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,11 @@
- ## Process this file with automake to produce Makefile.in
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
- 
--SUBDIRS = libsoup po tests docs
-+SUBDIRS = libsoup
-+
-+if BUILD_LIBSOUP
-+SUBDIRS += po tests docs
-+endif
- 
- EXTRA_DIST =				\
- 	data/effective_tld_names.dat	\
-@@ -16,7 +20,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
- 
- 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
-diff --git a/configure.ac b/configure.ac
-index 95410de..1f00bdd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -71,20 +71,27 @@ LT_INIT([win32-dll])
- 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
-+    GLIB_REQUIRED=2.33.1
-+    AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
-+	if test "$GLIB_LIBS" = ""; then
-+       AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
-+	fi
-+    GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_34"
-+    GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
-+    AC_SUBST(GLIB_MAKEFILE)
- 
--GLIB_REQUIRED=2.33.1
--AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
--if test "$GLIB_LIBS" = ""; then
--   AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
--fi
--GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_34"
--
--GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
--AC_SUBST(GLIB_MAKEFILE)
-+	PKG_CHECK_MODULES(XML, libxml-2.0)
-+	AC_SUBST(XML_CFLAGS)
-+	AC_SUBST(XML_LIBS)
- 
--PKG_CHECK_MODULES(XML, libxml-2.0)
--AC_SUBST(XML_CFLAGS)
--AC_SUBST(XML_LIBS)
-+fi
-+AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
- 
- dnl ***********************
- dnl *** Check for Win32 ***
-@@ -143,6 +150,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(SQLITE, sqlite3, :, [AC_MSG_ERROR(dnl
- [Could not find sqlite3 devel files:
- 
-diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
-index cc99e75..f9b25fc 100644
---- a/libsoup/Makefile.am
-+++ b/libsoup/Makefile.am
-@@ -1,23 +1,26 @@
- ## Process this file with automake to produce Makefile.in
- 
- EXTRA_DIST =
--
-+BUILT_SOURCES =
- include $(GLIB_MAKEFILE)
- 
- if OS_WIN32
- LIBWS2_32 = -lws2_32
- endif
- 
--INCLUDES = 				\
-+INCLUDES =
-+lib_LTLIBRARIES =
-+CLEANFILES =
-+
-+if BUILD_LIBSOUP
-+INCLUDES += 				\
- 	-DG_LOG_DOMAIN=\"libsoup\" 	\
- 	-DLOCALEDIR=\"$(localedir)\"	\
- 	-I$(top_srcdir)			\
- 	$(SOUP_DEBUG_FLAGS)		\
- 	$(SOUP_MAINTAINER_FLAGS)	\
- 	$(GLIB_CFLAGS)			\
--	$(XML_CFLAGS)			\
--	$(SQLITE_CFLAGS)		\
--	$(GNOME_KEYRING_CFLAGS)
-+	$(XML_CFLAGS)
- 
- libsoupincludedir = $(includedir)/libsoup-2.4/libsoup
- 
-@@ -72,7 +75,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
-@@ -173,14 +176,17 @@ libsoup_2_4_la_SOURCES =		\
- 	soup-value-utils.c		\
- 	soup-xmlrpc.c
- 
--# TLD rules
--EXTRA_DIST += tld-parser.py
--
-+BUILT_SOURCES = tld_data.inc
- TLD_DATA_FILE=$(top_srcdir)/data/effective_tld_names.dat
- 
- tld_data.inc: tld-parser.py $(TLD_DATA_FILE)
- 	$(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
- 
-+# TLD rules
-+EXTRA_DIST += tld-parser.py
-+
-+endif
-+
- if BUILD_LIBSOUP_GNOME
- 
- if OS_WIN32
-@@ -193,6 +199,10 @@ endif
- 
- libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
- 
-+INCLUDES += $(LIBSOUP_CFLAGS)		\
-+    $(SQLITE_CFLAGS)			\
-+    $(GNOME_KEYRING_CFLAGS)
-+
- libsoupgnomeinclude_HEADERS =	\
- 	soup-cookie-jar-sqlite.h\
- 	soup-gnome.h		\
-@@ -200,14 +210,24 @@ libsoupgnomeinclude_HEADERS =	\
- 
- lib_LTLIBRARIES += libsoup-gnome-2.4.la
- 
-+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)			\
- 	$(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		\
-@@ -219,9 +239,8 @@ endif
- 
- GLIB_GENERATED = soup-marshal.c soup-marshal.h
- GLIB_GENERATED += soup-enum-types.c soup-enum-types.h
--BUILT_SOURCES = \
--	$(GLIB_GENERATED)   \
--	tld_data.inc
-+BUILT_SOURCES += \
-+	$(GLIB_GENERATED)
- 
- soup_marshal_sources = $(libsoup_2_4_la_SOURCES) $(libsoup_gnome_2_4_la_SOURCES)
- soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS)
-@@ -237,6 +256,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
- 
- if HAVE_INTROSPECTION
- 
-+if BUILD_LIBSOUP
-+
- # Core library
- gi_soup_files = \
- 	$(filter-out soup.h soup-enum-types.% soup-marshal.% soup-proxy-resolver.h,\
-@@ -258,20 +279,28 @@ Soup_2_4_gir_FILES = \
- 
- INTROSPECTION_GIRS += Soup-2.4.gir
- 
-+endif
-+
- if BUILD_LIBSOUP_GNOME
- 
-+if BUILD_LIBSOUP
-+SOUP_GIR = Soup-2.4.gir
-+else
-+SOUP_GIR =
-+endif
-+
- # GNOME extensions
- gi_soup_gnome_files = $(filter-out soup-gnome.h,\
- 		          $(libsoupgnomeinclude_HEADERS) \
- 	                  $(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES)))
--SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir
-+SoupGNOME-2.4.gir: libsoup-gnome-2.4.la $(SOUP_GIR)
-+SoupGNOME_2_4_gir_INCLUDES = Soup-2.4
- SoupGNOME_2_4_gir_SCANNERFLAGS =			\
- 	--identifier-prefix=Soup			\
- 	--symbol-prefix=soup				\
--	--c-include "libsoup/soup-gnome.h"		\
--	--include-uninstalled=$(builddir)/Soup-2.4.gir
-+	--c-include "libsoup/soup-gnome.h"
- SoupGNOME_2_4_gir_CFLAGS = $(INCLUDES)
--SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la
-+SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la
- SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files))
- SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
- 
--- 
-1.7.12
-
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.42.2-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch
index 383cfe4..15f7724 100644
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.42.2-system-lib.patch
+++ b/net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch
@@ -1,4 +1,4 @@
-From 722a7d3935c5b3ec5c28e337247471821ede7c59 Mon Sep 17 00:00:00 2001
+From 63db817bac0382f3f43947b8233bf4585ede0e0b Mon Sep 17 00:00:00 2001
 From: Priit Laes <plaes@plaes.org>
 Date: Tue, 20 Dec 2011 15:42:44 +0200
 Subject: [PATCH] Split support for libsoup-gnome
@@ -8,12 +8,12 @@ https://bugzilla.gnome.org/show_bug.cgi?id=595065
 Original patch by Romain Perier.
 ---
  Makefile.am         | 12 +++++++++--
- configure.ac        | 34 +++++++++++++++++++-----------
+ configure.ac        | 35 ++++++++++++++++++++-----------
  libsoup/Makefile.am | 60 +++++++++++++++++++++++++++++++++++++++--------------
- 3 files changed, 76 insertions(+), 30 deletions(-)
+ 3 files changed, 77 insertions(+), 30 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 66992d9..046f945 100644
+index c8fa95c..fc09778 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1,7 +1,11 @@
@@ -29,7 +29,7 @@ index 66992d9..046f945 100644
  
  EXTRA_DIST =				\
  	data/effective_tld_names.dat	\
-@@ -16,7 +20,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
+@@ -18,7 +22,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
  
  pkgconfigdir = $(libdir)/pkgconfig
  
@@ -43,10 +43,10 @@ index 66992d9..046f945 100644
  if BUILD_LIBSOUP_GNOME
  pkgconfig_DATA += libsoup-gnome-2.4.pc
 diff --git a/configure.ac b/configure.ac
-index 013deae..1c606df 100644
+index 96bb378..0153f10 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -76,20 +76,26 @@ LT_INIT([win32-dll])
+@@ -77,23 +77,30 @@ LT_INIT([win32-dll])
  dnl ***********************
  dnl *** Checks for glib ***
  dnl ***********************
@@ -56,36 +56,40 @@ index 013deae..1c606df 100644
 +   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
-+    GLIB_REQUIRED=2.36.0
++    GLIB_REQUIRED=2.38.0
 +    AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
 +    if test "$GLIB_LIBS" = ""; then
-+        AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
++       AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
 +    fi
-+    GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36"
-+    GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
-+    AC_SUBST(GLIB_MAKEFILE)
++    GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
  
--GLIB_REQUIRED=2.36.0
+-GLIB_REQUIRED=2.38.0
 -AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
 -if test "$GLIB_LIBS" = ""; then
 -   AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
+-fi
+-GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
++    GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
++    AC_SUBST(GLIB_MAKEFILE)
+ 
+-GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
+-AC_SUBST(GLIB_MAKEFILE)
 +    PKG_CHECK_MODULES(XML, libxml-2.0)
 +    AC_SUBST(XML_CFLAGS)
 +    AC_SUBST(XML_LIBS)
- fi
--GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36"
--
--GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
--AC_SUBST(GLIB_MAKEFILE)
--
++fi
++AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
+ 
+ GLIB_TESTS
+ 
 -PKG_CHECK_MODULES(XML, libxml-2.0)
 -AC_SUBST(XML_CFLAGS)
 -AC_SUBST(XML_LIBS)
-+AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
- 
+-
  PKG_CHECK_MODULES(SQLITE, sqlite3)
  AC_SUBST(SQLITE_CFLAGS)
-@@ -138,6 +144,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no)
+ AC_SUBST(SQLITE_LIBS)
+@@ -141,6 +148,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])
@@ -97,7 +101,7 @@ index 013deae..1c606df 100644
  AC_SUBST(HAVE_GNOME)
  
 diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
-index 508bf9c..dc3c5f2 100644
+index 60920bd..26c5616 100644
 --- a/libsoup/Makefile.am
 +++ b/libsoup/Makefile.am
 @@ -1,14 +1,19 @@
@@ -112,17 +116,17 @@ index 508bf9c..dc3c5f2 100644
  LIBWS2_32 = -lws2_32
  endif
  
--INCLUDES = 				\
-+INCLUDES =
+-AM_CPPFLAGS = 				\
++AM_CPPFLAGS =
 +lib_LTLIBRARIES =
 +CLEANFILES =
 +
 +if BUILD_LIBSOUP
-+INCLUDES += 				\
++AM_CPPFLAGS += 				\
  	-DG_LOG_DOMAIN=\"libsoup\" 	\
  	-DLOCALEDIR=\"$(localedir)\"	\
- 	-DSOUP_COMPILATION		\
-@@ -77,7 +82,7 @@ libsoupinclude_HEADERS =	\
+ 	-I$(top_srcdir)			\
+@@ -76,7 +81,7 @@ libsoupinclude_HEADERS =	\
  nodist_libsoupinclude_HEADERS =	\
  	soup-version.h
  
@@ -131,7 +135,7 @@ index 508bf9c..dc3c5f2 100644
  
  libsoup_2_4_la_LDFLAGS =	\
  	-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \
-@@ -187,18 +192,23 @@ libsoup_2_4_la_SOURCES =		\
+@@ -184,18 +189,23 @@ libsoup_2_4_la_SOURCES =		\
  	soup-version.c			\
  	soup-xmlrpc.c
  
@@ -154,12 +158,12 @@ index 508bf9c..dc3c5f2 100644
  
  libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
  
-+INCLUDES += $(LIBSOUP_CFLAGS)
++AM_CPPFLAGS += $(LIBSOUP_CFLAGS)
 +
  libsoupgnomeinclude_HEADERS =	\
  	soup-cookie-jar-sqlite.h\
  	soup-gnome.h		\
-@@ -206,17 +216,26 @@ libsoupgnomeinclude_HEADERS =	\
+@@ -203,17 +213,26 @@ libsoupgnomeinclude_HEADERS =	\
  
  lib_LTLIBRARIES += libsoup-gnome-2.4.la
  
@@ -187,19 +191,19 @@ index 508bf9c..dc3c5f2 100644
  libsoup_gnome_2_4_la_SOURCES =		\
  	soup-cookie-jar-sqlite.c	\
  	soup-gnome-features.c		\
-@@ -229,9 +248,8 @@ endif
+@@ -225,9 +244,8 @@ libsoup_gnome_2_4_la_SOURCES =		\
+ endif
  
- GLIB_GENERATED = soup-marshal.c soup-marshal.h
- GLIB_GENERATED += soup-enum-types.c soup-enum-types.h
+ GLIB_GENERATED = soup-enum-types.c soup-enum-types.h
 -BUILT_SOURCES = \
 -	$(GLIB_GENERATED)   \
 -	tld_data.inc
 +BUILT_SOURCES += \
 +	$(GLIB_GENERATED)
  
- soup_marshal_sources = $(libsoup_2_4_la_SOURCES) $(libsoup_gnome_2_4_la_SOURCES)
  soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS)
-@@ -247,6 +265,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
+ soup_enum_types_MKENUMS_C_FLAGS = --fhead "\#define LIBSOUP_USE_UNSTABLE_REQUEST_API"
+@@ -242,6 +260,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
  
  if HAVE_INTROSPECTION
  
@@ -207,8 +211,8 @@ index 508bf9c..dc3c5f2 100644
 +
  # Core library
  gi_soup_files = \
- 	$(filter-out soup.h soup-enum-types.% soup-marshal.% soup-proxy-resolver.h,\
-@@ -268,20 +288,28 @@ Soup_2_4_gir_FILES = \
+ 	$(filter-out soup.h soup-enum-types.% soup-proxy-resolver.h,\
+@@ -263,20 +283,28 @@ Soup_2_4_gir_FILES = \
  
  INTROSPECTION_GIRS += Soup-2.4.gir
  
@@ -235,13 +239,13 @@ index 508bf9c..dc3c5f2 100644
 -	--c-include "libsoup/soup-gnome.h"		\
 -	--include-uninstalled=$(builddir)/Soup-2.4.gir
 +	--c-include "libsoup/soup-gnome.h"
- SoupGNOME_2_4_gir_CFLAGS = $(INCLUDES)
+ SoupGNOME_2_4_gir_CFLAGS = $(AM_CPPFLAGS)
 -SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la
 +SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la
  SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files))
  SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
  
-@@ -295,6 +323,6 @@ gir_DATA = $(INTROSPECTION_GIRS)
+@@ -290,6 +318,6 @@ gir_DATA = $(INTROSPECTION_GIRS)
  typelibdir = $(libdir)/girepository-1.0
  typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
  
@@ -250,5 +254,5 @@ index 508bf9c..dc3c5f2 100644
  
  endif
 -- 
-1.8.3.2
+1.9.0
 
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.42.3.1-r1.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.46.0-r1.ebuild
index 3e66691..9631556 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.42.3.1-r1.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.46.0-r1.ebuild
@@ -22,14 +22,14 @@ KEYWORDS="~amd64"
 
 RDEPEND="
 	~net-libs/libsoup-${PV}[introspection?,${MULTILIB_USEDEP}]
-	dev-db/sqlite:3=[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.3:3=[${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5[${MULTILIB_USEDEP}] )
 	>=net-libs/libsoup-2.42.2-r1[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.10
 	>=dev-util/intltool-0.35
-	sys-devel/gettext[${MULTILIB_USEDEP}]
+	>=sys-devel/gettext-0.18.3.2[${MULTILIB_USEDEP}]
 	virtual/pkgconfig
 "
 
@@ -37,7 +37,7 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	# Use lib present on the system
-	epatch "${FILESDIR}"/${PN}-2.42.2-system-lib.patch
+	epatch "${FILESDIR}"/${PN}-2.46.0-system-lib.patch
 	AUTOTOOLS_AUTORECONF=yes gnome2-multilib_src_prepare
 }
 
@@ -48,7 +48,6 @@ src_configure() {
 
 	# Disable apache tests until they are usable on Gentoo, bug #326957
 	gnome2-multilib_src_configure \
-		--disable-more-warnings \
 		--disable-static \
 		--disable-tls-check \
 		$(use_enable introspection) \