Version bump for Gnome 3.12.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

11 files changed, 528 insertions, 15 deletions

diff --git a/net-libs/glib-networking/ChangeLog b/net-libs/glib-networking/ChangeLog
index 83f179bfa8a1..36260159ca2c 100644
--- a/net-libs/glib-networking/ChangeLog
+++ b/net-libs/glib-networking/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/glib-networking
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/ChangeLog,v 1.80 2014/04/27 08:15:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/ChangeLog,v 1.81 2014/04/27 17:41:32 eva Exp $
+
+*glib-networking-2.40.1 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  +glib-networking-2.40.1.ebuild,
+  +files/glib-networking-2.40.1-unittests.patch:
+  Version bump for Gnome 3.12.
 
   27 Apr 2014; Pacho Ramos <pacho@gentoo.org> -glib-networking-2.32.3.ebuild,
   -glib-networking-2.34.2.ebuild, -glib-networking-2.36.2.ebuild:
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 4316ff1204c0..2d264f10eda4 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,14 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX glib-networking-2.40.1-unittests.patch 1204 SHA256 7891e3ee3403efb3d22d459a4c8dec1c889be22a3d16e38956dec02c7abb8fe2 SHA512 f307edf6f604ca6fe23374f8c39a57ed600679aa05cd0014c11631823d0315ee4bf996450aef6f18238d0d86e1229b09373ef190da34ac7e10dd32f9f6fa6105 WHIRLPOOL f232dac847d0000c7bedff33ffbc74fe14ac0a3a100111c58f83645890f18564966daf1bad50e82d4361a2fc2282e216668a28e63b91b5bfb52f500ada3b3179
 DIST glib-networking-2.38.2.tar.xz 362524 SHA256 e8e2fe919d3236169c9bfaec807966ec81b844fc28b11bddc9f8256cfa949fc7 SHA512 299649fbb7df0821695b812e7d4f97ccfc8d63231fb3b9f6c8c1b0ea69d03bb1de80b1e6c7ca295837b210bca57620c9cbe2150fe1a36d9238604ad5d2412e33 WHIRLPOOL fb42e5e41245cae54ae32467896fb18d07e06e3ad2cc0bbfc00ec71c9ca8991dc277bceac43175bf5355284db1be7f5d6212abad59f29d2339af9bb1558e9897
+DIST glib-networking-2.40.1.tar.xz 368444 SHA256 9fb3e54d049a480afdb814ff7452e7ab67e5d5f607ade230d7713f19922b5a28 SHA512 5d6485b486e1e51fc4f5ac27b3d7455ecf34989a9204cc372926cb202d532711fa57a76aac9f77ca9ba70acade7453d3831111cc86e24669dea2f8fc3e87c822 WHIRLPOOL 2a60ed6f971595496864e3f8f01970a88c8bb558125371a2dee4ff8eb51435cf7146c4edfe07de6850d5156c1c9bd34e5be74c69154157ed92c74dcda893cd84
 EBUILD glib-networking-2.38.2.ebuild 1400 SHA256 3a60ca4730d58e481458ffe0b2984b1724c332cfd6ace505342e9ff539189293 SHA512 0354851780dd5c2859392999ebbf1c793cb1ed92a49d074517ab6ee7075738e2e153e7048e6618ab56b268093ee849bc2f7d5332b7bb1eada2bdd987dc520b16 WHIRLPOOL e44c026f92058ee6565deb479b5b47bde584abd5e936414901bd86434f508e015d096d5cefa3599ae34672016c8902ffd13d5fd6d55922abb1677aba1718299c
-MISC ChangeLog 12050 SHA256 554451f9fe1136f4d5c7326191add414b7272a311b68400eaaad4ebbe874d0be SHA512 43c2c7cbffff9a8f20203d8a1caa1520018cfda2056d399148a9834b0fbd26129b6b97e6dde47de2a1f8d0dc7d0b9d62f7eb6b57fe95fec4834835a0f5da4d5c WHIRLPOOL 4d795374627cc5e709b8d9585d3e5e0f01e7dabf5108f131d97f1b9fad807ff409de50b2b5ffbc5ba737b0f1db0f3e2a079589179464ddae3bbb00122eff5236
+EBUILD glib-networking-2.40.1.ebuild 1523 SHA256 8ca3d86a5f7f4be868bfb24c736f2071e5fa22ca65e753b6557993e8ac56041c SHA512 69a893a9e2619c63a33f491c6d6504f3bb48dd8506bafbee93230a62002c874746476dd7de4660275287d0dcc0e84724f1d10f649d819fc4d85916002f7116c6 WHIRLPOOL eeb550db2216e86d7937ee5b05fee62a6e1778a843a40d586e0fea6d858b28a4a95c8a78cb119ab90d72cd91db6c214d12984f9b0d746a4399303b730d975247
+MISC ChangeLog 12256 SHA256 588d5829ad1863d4d96bf9762ef4a23b3fd7d0e5190cb1323f9849bea9a37cf6 SHA512 1631e14e60ed34e1806075eb3d0b00d2e3a0a2fb20d505af81ba7b13e19575cde4298f6ba50f83f0c0a984efd939f8a1367afbb8e684cc12f7fbbd53947779a6 WHIRLPOOL fd4943dc1df63dcfc11e762b4555a5d88be36f9cc1ba13c50f71f8a4e1de063c249736006c9f82941b56728d14900200f3a4bed49b206e95a8c122f8d35aa9b1
 MISC metadata.xml 395 SHA256 a55b4f7f8a8d4bffa2ec51ee271f2f9360e8bafe955871a253f32c16911a395e SHA512 302a9f2dff08e1925f57d3384875f2397f70998736d8b70f0d46f7f3abe37f6aaad192ae593395333e8f5118043a47dbdd1675dcdb4a6f84500d7d58b1e9af31 WHIRLPOOL 89498cd69c69b219da5cb20c337d2be0187e9db702c8a83b0f7ffcc6a0d1ded8a753a05dc28cd304f5098aa821be8fd8aa774b38818d370c3a56cbec01d8d6a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNcvJQACgkQCaWpQKGI+9Q5rgCfVy7+ssz9ogbVwbCRrqRMsNLf
-AGQAn2llMZrkCbv9zeMOu9pLtSZmy82C
-=s2sY
+iEYEAREIAAYFAlNdQU0ACgkQ1fmVwcYIWAZGOwCggT6chUaKLwwn4RWkouz+qisp
+NH8AnR92dP4+iGqU6aM/qARBupEdEBP0
+=7qRX
 -----END PGP SIGNATURE-----
diff --git a/net-libs/glib-networking/files/glib-networking-2.40.1-unittests.patch b/net-libs/glib-networking/files/glib-networking-2.40.1-unittests.patch
new file mode 100644
index 000000000000..4301b84620b7
--- /dev/null
+++ b/net-libs/glib-networking/files/glib-networking-2.40.1-unittests.patch
@@ -0,0 +1,45 @@
+From 8867e6a0b3b84b41b5a61c5194fa1300c5c39d8c Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Fri, 25 Apr 2014 22:59:01 +0200
+Subject: [PATCH] test connection is not PKCS#11 related
+
+Avoids silly test failure:
+
+CCLD     connection
+/usr/lib/gcc/x86_64-pc-linux-gnu/4.8.2/../../../../lib64/Scrt1.o: In
+function `_start':
+(.text+0x20): undefined reference to `main'
+collect2: error: ld returned 1 exit status
+Makefile:897: recipe for target 'connection' failed
+make[4]: *** [connection] Error 1
+---
+ tls/tests/Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tls/tests/Makefile.am b/tls/tests/Makefile.am
+index 6287b9c..009b388 100644
+--- a/tls/tests/Makefile.am
++++ b/tls/tests/Makefile.am
+@@ -15,6 +15,9 @@ test_programs =       \
+ 	connection    \
+ 	$(NULL)
+ 
++connection_SOURCES = connection.c \
++	mock-interaction.c mock-interaction.h
++
+ if HAVE_PKCS11
+ 
+ test_programs +=           \
+@@ -33,9 +36,6 @@ pkcs11_slot_SOURCES = pkcs11-slot.c \
+ 	mock-pkcs11.c mock-pkcs11.h \
+ 	mock-interaction.c mock-interaction.h
+ 
+-connection_SOURCES = connection.c \
+-	mock-interaction.c mock-interaction.h
+-
+ endif
+ 
+ testfiles_data =				\
+-- 
+1.9.0
+
diff --git a/net-libs/glib-networking/glib-networking-2.40.1.ebuild b/net-libs/glib-networking/glib-networking-2.40.1.ebuild
new file mode 100644
index 000000000000..66c41e6bf424
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.40.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.40.1.ebuild,v 1.1 2014/04/27 17:41:32 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 virtualx
+
+DESCRIPTION="Network-related giomodules for glib"
+HOMEPAGE="http://git.gnome.org/browse/glib-networking/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE="+gnome +libproxy smartcard +ssl test"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.39.1:2
+	gnome? ( gnome-base/gsettings-desktop-schemas )
+	libproxy? ( >=net-libs/libproxy-0.4.6-r3:= )
+	smartcard? (
+		>=app-crypt/p11-kit-0.8
+		>=net-libs/gnutls-2.12.8:=[pkcs11] )
+	ssl? (
+		app-misc/ca-certificates
+		>=net-libs/gnutls-2.12.8:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( sys-apps/dbus[X] )
+"
+# eautoreconf needs >=sys-devel/autoconf-2.65:2.5
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-unittests.patch
+	eautoreconf
+	gnome2_src_prepare
+}
+
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
+		$(use_with gnome gnome-proxy) \
+		$(use_with libproxy) \
+		$(use_with smartcard pkcs11) \
+		$(use_with ssl gnutls)
+}
+
+src_test() {
+	Xemake check
+}
diff --git a/net-libs/libsoup-gnome/ChangeLog b/net-libs/libsoup-gnome/ChangeLog
index 78ff504180e7..48210f79d786 100644
--- a/net-libs/libsoup-gnome/ChangeLog
+++ b/net-libs/libsoup-gnome/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libsoup-gnome
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.106 2014/04/27 08:25:17 pacho Exp $
+# $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,
diff --git a/net-libs/libsoup-gnome/Manifest b/net-libs/libsoup-gnome/Manifest
index 3d7f38c83064..2f13277697c6 100644
--- a/net-libs/libsoup-gnome/Manifest
+++ b/net-libs/libsoup-gnome/Manifest
@@ -2,14 +2,17 @@
 Hash: SHA256
 
 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.44.2.tar.xz 748592 SHA256 e7e4b5ab74a6c00fc267c9f5963852d28759ad3154dab6388e2d6e1962d598f3 SHA512 f24c318d11aaf0f98d05a673ab87e17da391f1da9d22c63d32532304473ac77a9cc324978346a42a9a21165abd182c11122a33dd7e5d81c8953ba4b0b8e5ae30 WHIRLPOOL 87f201adf26caca64002943e788cf80b07d0fd95b1917a34b90188ae3f0c514cdf41cd1f1e928b0c1083ec7f89a19d031bef014d02fb4f1d9e399c159e2eec1d
+DIST libsoup-2.46.0.tar.xz 1693772 SHA256 fa3d5574c1a2df521242e2ca624a2b3057121798cab9f8f40525aa186a7b15a3 SHA512 a538fbb7c21b2e5d0f53ae917a7ebff21f74490c1ae55222b6dd31932ede5f872da06d544b7ab2e91dbf03682dd53c0fdaf3ba9aed24b3b1f1405f7e65785c0d WHIRLPOOL 3a82f4c4d5fa2543c055b801c6b15cc6faa6db8632de00113a087a0ea8f13e174b3434b58bc97449047be2a7dcc110c0d3604b4f04c874877effda7492c2e4d6
 EBUILD libsoup-gnome-2.44.2.ebuild 1485 SHA256 2fa1e95ac84587505446661572e6e92a2ba2bf16adfa31e292bdbe99ea403ab5 SHA512 f15eed8a8b33b9a703c483723dadab1e54fffc08cacc552c6117cfb71cc842327604152ce7284720c155fca6311440b1975f9d3b975d3f3b00d34f3779e73824 WHIRLPOOL 4d5410fe4bf43b162f12e45d0a57b86d606de973c9ce5c349769a38df97a67567af09504f4448e05c6146bef74f44ec69ca89abe151fdbff5ef0c574b244aee5
-MISC ChangeLog 16601 SHA256 5501dcf1e10c1ab2b919ec6ec58168e5f4195e1b52c05584422056908636daec SHA512 52350162da154978ed0f3f56c4aaf5c7004094ba0ffd413a3a9d9568f1b0f9a197623addfac124959448b691e35e9b0623e9b10d46d0536e0093aa4ef3ebaa19 WHIRLPOOL a7e4da2d7c885c7d7db73ef234e881e7dda22b61a98c4fbb46b1d523eb0f9928596d9e81dfab32f17d0f40ed6243daca2554a244076a715952e5a0cace0c1651
+EBUILD libsoup-gnome-2.46.0.ebuild 1492 SHA256 3de4fabb1f942bd506a5b69143374467aff0caf7c0d6de29d9ef40fb8f213646 SHA512 c45a45e1699ac0e2131c37453c7531b7ad8e5a58e99205aa5228dc58232fe4feaeb1f8f3ce4fd89176a5c97685c544dd50fd9e6d8a40e6c44a29f104deecda35 WHIRLPOOL 9503a08869d2d2af9bdcc569d19733b5f80caeb2634d2100877cf6efe9101772fc550fbce031ea00d42680b77471bd915ba87a0bd944d7fb6f017220b6345ba9
+MISC ChangeLog 16800 SHA256 578dd02b9419aecccf7c80bf14d6ba2a3c570991ad821b6134b886b6a52846b9 SHA512 28ede4e4a7ec6e83149b2b69e6a223b1741d6735b411c8bcfcf69684ba4eee8717c839e5d24b840208b75e4f707a0af21c113ef67b4bd87bbcce43ead0b457c5 WHIRLPOOL d4945a06b44fc6b6f70be59093a093cbe4ebd6a912ae8af7e05efb03c0488be6fda8290e37f622ecf0385a90abda1b753c97d6b9a288883295a78c1f7d916c17
 MISC metadata.xml 159 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b SHA512 9408846d0f3194f62043b64e325aed9e8cce9a74b556865acf71facc3ad59a092dccbbb3c608ada40b73625eaac93a7bcc976858c6a47426bb8fadb6f830fe2b WHIRLPOOL 4700c8b71899b5acffcc46580315d4d116b478cfa283e0ea0569ab180e46850ce85d73c7370d989e53dd8aecb69ed843d2716bfebd3c5d74a7b5c3d4b94b96bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNcvu4ACgkQCaWpQKGI+9TAfwCdFLPJFB6BP2aghzF6MJ7SKroT
-ZpoAnieyM6iamVL41z+0jHeAWGyfKh8a
-=Xof3
+iEYEAREIAAYFAlNdQnQACgkQ1fmVwcYIWAaBKACg3k0opfRHhT2poedjq4vH7J6H
+5WQAoOczysRRA5QB84h81+Nq5yOFYw5Z
+=rAmj
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch
new file mode 100644
index 000000000000..15f7724dd5cd
--- /dev/null
+++ b/net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch
@@ -0,0 +1,258 @@
+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
+
+https://bugzilla.gnome.org/show_bug.cgi?id=595065
+
+Original patch by Romain Perier.
+---
+ Makefile.am         | 12 +++++++++--
+ configure.ac        | 35 ++++++++++++++++++++-----------
+ libsoup/Makefile.am | 60 +++++++++++++++++++++++++++++++++++++++--------------
+ 3 files changed, 77 insertions(+), 30 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index c8fa95c..fc09778 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 examples docs
++SUBDIRS = libsoup
++
++if BUILD_LIBSOUP
++SUBDIRS += po tests docs
++endif
+ 
+ EXTRA_DIST =				\
+ 	data/effective_tld_names.dat	\
+@@ -18,7 +22,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 96bb378..0153f10 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -77,23 +77,30 @@ 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.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_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
++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)
+-
+ PKG_CHECK_MODULES(SQLITE, sqlite3)
+ AC_SUBST(SQLITE_CFLAGS)
+ 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])
++
++	if test $with_libsoup_system != no; then
++		PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION)
++	fi
+ fi
+ AC_SUBST(HAVE_GNOME)
+ 
+diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
+index 60920bd..26c5616 100644
+--- a/libsoup/Makefile.am
++++ b/libsoup/Makefile.am
+@@ -1,14 +1,19 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+ EXTRA_DIST =
+-
++BUILT_SOURCES =
+ include $(GLIB_MAKEFILE)
+ 
+ if OS_WIN32
+ LIBWS2_32 = -lws2_32
+ endif
+ 
+-AM_CPPFLAGS = 				\
++AM_CPPFLAGS =
++lib_LTLIBRARIES =
++CLEANFILES =
++
++if BUILD_LIBSOUP
++AM_CPPFLAGS += 				\
+ 	-DG_LOG_DOMAIN=\"libsoup\" 	\
+ 	-DLOCALEDIR=\"$(localedir)\"	\
+ 	-I$(top_srcdir)			\
+@@ -76,7 +81,7 @@ libsoupinclude_HEADERS =	\
+ nodist_libsoupinclude_HEADERS =	\
+ 	soup-version.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) \
+@@ -184,18 +189,23 @@ libsoup_2_4_la_SOURCES =		\
+ 	soup-version.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
++	$(AM_V_GEN) python $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
++
++# TLD rules
++EXTRA_DIST += tld-parser.py
++
++endif
+ 
+ if BUILD_LIBSOUP_GNOME
+ 
+ libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
+ 
++AM_CPPFLAGS += $(LIBSOUP_CFLAGS)
++
+ libsoupgnomeinclude_HEADERS =	\
+ 	soup-cookie-jar-sqlite.h\
+ 	soup-gnome.h		\
+@@ -203,17 +213,26 @@ 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 \
+ 	-export-symbols $(srcdir)/libsoup-gnome-2.4.sym
++endif
+ 
+ EXTRA_DIST += libsoup-gnome-2.4.sym
+ 
+ libsoup_gnome_2_4_la_LIBADD =		\
+-	libsoup-2.4.la			\
+ 	$(GLIB_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		\
+@@ -225,9 +244,8 @@ libsoup_gnome_2_4_la_SOURCES =		\
+ endif
+ 
+ GLIB_GENERATED = soup-enum-types.c soup-enum-types.h
+-BUILT_SOURCES = \
+-	$(GLIB_GENERATED)   \
+-	tld_data.inc
++BUILT_SOURCES += \
++	$(GLIB_GENERATED)
+ 
+ soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS)
+ soup_enum_types_MKENUMS_C_FLAGS = --fhead "\#define LIBSOUP_USE_UNSTABLE_REQUEST_API"
+@@ -242,6 +260,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
+ 
+ if HAVE_INTROSPECTION
+ 
++if BUILD_LIBSOUP
++
+ # Core library
+ gi_soup_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
+ 
++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 = $(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
+ 
+@@ -290,6 +318,6 @@ gir_DATA = $(INTROSPECTION_GIRS)
+ typelibdir = $(libdir)/girepository-1.0
+ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+ 
+-CLEANFILES = $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
++CLEANFILES += $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
+ 
+ endif
+-- 
+1.9.0
+
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.46.0.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.46.0.ebuild
new file mode 100644
index 000000000000..6d93905a9e29
--- /dev/null
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.46.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 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.46.0.ebuild,v 1.1 2014/04/27 17:46:27 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+MY_PN=${PN/-gnome}
+MY_P=${MY_PN}-${PV}
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="GNOME plugin for libsoup"
+HOMEPAGE="https://wiki.gnome.org/LibSoup"
+SRC_URI="${SRC_URI//-gnome}"
+
+LICENSE="LGPL-2+"
+SLOT="2.4"
+IUSE="debug +introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+	~net-libs/libsoup-${PV}[introspection?]
+	dev-db/sqlite:3=
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	>=net-libs/libsoup-2.42.2-r1
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# Use lib present on the system
+	epatch "${FILESDIR}"/${PN}-2.46.0-system-lib.patch
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# FIXME: we need addpredict to workaround bug #324779 until
+	# root cause (bug #249496) is solved
+	addpredict /usr/share/snmp/mibs/.index
+
+	# Disable apache tests until they are usable on Gentoo, bug #326957
+	gnome2_src_configure \
+		--disable-static \
+		--disable-tls-check \
+		$(use_enable introspection) \
+		--with-libsoup-system \
+		--with-gnome \
+		--without-apache-httpd
+}
diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index b65dde1f962a..e7d4d6232d82 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libsoup
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.330 2014/04/27 08:25:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.331 2014/04/27 17:45:03 eva Exp $
+
+*libsoup-2.46.0 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org> +libsoup-2.46.0.ebuild:
+  Version bump for Gnome 3.12.
 
   27 Apr 2014; Pacho Ramos <pacho@gentoo.org>
   -files/libsoup-2.42.1-ipv6-tests.patch, -libsoup-2.38.1.ebuild,
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 3073729f1041..633ef4446cfb 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -2,13 +2,15 @@
 Hash: SHA256
 
 DIST libsoup-2.44.2.tar.xz 748592 SHA256 e7e4b5ab74a6c00fc267c9f5963852d28759ad3154dab6388e2d6e1962d598f3 SHA512 f24c318d11aaf0f98d05a673ab87e17da391f1da9d22c63d32532304473ac77a9cc324978346a42a9a21165abd182c11122a33dd7e5d81c8953ba4b0b8e5ae30 WHIRLPOOL 87f201adf26caca64002943e788cf80b07d0fd95b1917a34b90188ae3f0c514cdf41cd1f1e928b0c1083ec7f89a19d031bef014d02fb4f1d9e399c159e2eec1d
+DIST libsoup-2.46.0.tar.xz 1693772 SHA256 fa3d5574c1a2df521242e2ca624a2b3057121798cab9f8f40525aa186a7b15a3 SHA512 a538fbb7c21b2e5d0f53ae917a7ebff21f74490c1ae55222b6dd31932ede5f872da06d544b7ab2e91dbf03682dd53c0fdaf3ba9aed24b3b1f1405f7e65785c0d WHIRLPOOL 3a82f4c4d5fa2543c055b801c6b15cc6faa6db8632de00113a087a0ea8f13e174b3434b58bc97449047be2a7dcc110c0d3604b4f04c874877effda7492c2e4d6
 EBUILD libsoup-2.44.2.ebuild 2084 SHA256 348e77f8610d5dbf9215a97688fd989dde6acf23ef5ea6f7c4e7388b5802d93d SHA512 14f0521b1ee0e882bd6689802761d3e438798ffd6f7dcc57ed5376ff652eb8c736f77255fa2c1e69fff1935517dfb7559522b155d82df5c963ffcb7f510e1d09 WHIRLPOOL 160791901cc08d39dc7fac1e2508d0008175bd5d604899034850feb26e8891ee732e5dfc07388bba60fa6e3667e9895250c1953aa172b984b2a373bf47c82150
-MISC ChangeLog 43592 SHA256 13745382013fe49ef1570b799dcd21e6f5e3a341a6c41d6544bb320f6e912d7e SHA512 7510c73889c7eeede121215ffe71d8651bda7a5eae1387d4fd44496040459f5c7c06135dee6c24da96be77427a60cb00c4cc7f3e40b44cdc499ff2dada829b37 WHIRLPOOL 6b538f473a4db1376db85ddf72349b70166967c92514dbed86b8eb55184856bfcf826903c1e5d565d2a1ea72edd08cf4ff129d84f2db1e6422e1ba78be62720a
+EBUILD libsoup-2.46.0.ebuild 2200 SHA256 12b5d4ef6b576bbcdbb6559ae932526fffa4258741d6a0327765fd4548b0a1fa SHA512 68c0d0afe663707b221863a7a2ad4aa7495df9ad3775764d62ec267b8552799eb620b2da0b425fe45197345dda50c7cd0e93705bfe8dc4aa28e696d504eb68d9 WHIRLPOOL fb7ab20f9d0e263ab147098f506445da93f3db845582bc751b610c389ece765fb36a3ed017cf1034ed043ad1a73c06e0653d58c8eba03b122fef2f90b3431f3d
+MISC ChangeLog 43731 SHA256 dabfecf3ff59392c1a2992c2db82823ed167e7617dff9a528f0640f2e4b8f6fb SHA512 5c77244a8e67eb1ad9d03561f5860266efc68027d4358bc80ef610f09dce9f2dfcb4abd7d9f3a81b70a696f6dbf10782e0b13c13ab849531edb79edff5126ade WHIRLPOOL f5f76a8c99521c51fc39866566c6be518f97ba2609edc392cae701b0a342f5b888968efa5ce34aebebf1125d0805a5cb214d394c388f851a0e33b65e03cf9f89
 MISC metadata.xml 257 SHA256 ee7dfc9e6af8bfc278c145d407d4a9c39458109886dba15303cc1c4c9d1c3ea2 SHA512 68402e9d9c7f3aea455729538fd16d692acad9a52861fa5088f2d170c9da1080c3c284fad0232ea042b5efd765e4988802778802979b927f90853ab26a01eb32 WHIRLPOOL 6d61388c9de173897cb4cff9bd1cf5799eea1e57383ace5f5e2a93193eaac9567e548c1faed6d0703c011e81ef98fff413e8801dbf27fb1f2e351d95ebc6699e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNcvxgACgkQCaWpQKGI+9RVTACfTgRFTssi9XC013aI9LFMpoLy
-G3YAn285uj7KvI8xYPt0fUvA2ogJuuyA
-=n++F
+iEYEAREIAAYFAlNdQiAACgkQ1fmVwcYIWAZ4GwCguR8r3LaHqAi+nMmOOYxkttnK
+jnQAoOJ3fZmUvHs19+5avCIHgPx+UHw5
+=FJ/q
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libsoup/libsoup-2.46.0.ebuild b/net-libs/libsoup/libsoup-2.46.0.ebuild
new file mode 100644
index 000000000000..64df8cd2ba36
--- /dev/null
+++ b/net-libs/libsoup/libsoup-2.46.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.46.0.ebuild,v 1.1 2014/04/27 17:45:03 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit gnome2 python-any-r1
+
+DESCRIPTION="An HTTP library implementation in C"
+HOMEPAGE="https://wiki.gnome.org/LibSoup"
+
+LICENSE="LGPL-2+"
+SLOT="2.4"
+IUSE="debug +introspection samba ssl test"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/libxml2-2:2
+	dev-db/sqlite:3
+	>=net-libs/glib-networking-2.30.0[ssl?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	samba? ( net-fs/samba )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/intltool-0.35
+	>=dev-util/gtk-doc-am-1.10
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
+#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
+#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
+#		dev-lang/php[apache2,xmlrpc]
+#		net-misc/curl
+#		net-libs/glib-networking[ssl])"
+
+src_prepare() {
+	if ! use test; then
+		# don't waste time building tests (bug #226271)
+		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+			|| die "sed failed"
+	fi
+
+	# FIXME: does not behave as expected
+	sed -e 's|\(g_test_add.*\)|/*\1*/|' \
+		-i tests/socket-test.c || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# FIXME: we need addpredict to workaround bug #324779 until
+	# root cause (bug #249496) is solved
+	addpredict /usr/share/snmp/mibs/.index
+
+	# Disable apache tests until they are usable on Gentoo, bug #326957
+	gnome2_src_configure \
+		--disable-static \
+		--disable-tls-check \
+		--without-gnome \
+		--without-apache-httpd \
+		$(use_enable introspection) \
+		$(use_with samba ntlm-auth '${EPREFIX}'/usr/bin/ntlm_auth)
+}