Version bump for Gnome 3.12.

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

4 files changed, 330 insertions, 5 deletions

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
+}