Depend on libsoup-gnome again, clean up old revisions.

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key C6085806)

6 files changed, 9 insertions, 254 deletions

diff --git a/dev-libs/libgdata/ChangeLog b/dev-libs/libgdata/ChangeLog
index 731526de1558..22eb2a86ca6d 100644
--- a/dev-libs/libgdata/ChangeLog
+++ b/dev-libs/libgdata/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libgdata
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/ChangeLog,v 1.66 2013/08/06 09:34:29 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/ChangeLog,v 1.67 2013/08/30 22:42:28 eva Exp $
+
+  30 Aug 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  -libgdata-0.13.2-r2.ebuild, -libgdata-0.13.3.ebuild, libgdata-0.13.4.ebuild,
+  -files/libgdata-0.13.2-Requires.private.patch,
+  -files/libgdata-0.13.2-libgdata.pc-unused-deps.patch:
+  Depend on libsoup-gnome again, clean up old revisions.
 
   06 Aug 2013; Lars Wendler <polynomial-c@gentoo.org> libgdata-0.13.4.ebuild:
   Non-maintainer commit: Fixed dependency on dev-libs/libsoup (bug #479666).
diff --git a/dev-libs/libgdata/files/libgdata-0.13.2-Requires.private.patch b/dev-libs/libgdata/files/libgdata-0.13.2-Requires.private.patch
deleted file mode 100644
index 9053640bf653..000000000000
--- a/dev-libs/libgdata/files/libgdata-0.13.2-Requires.private.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 4e72579d1bbb302776a42551cbfb560ddd4258b3 Mon Sep 17 00:00:00 2001
-From: Robert Ancell <robert.ancell@canonical.com>
-Date: Fri, 5 Oct 2012 09:15:51 +1300
-Subject: [PATCH] core: Split packages into public and private so the .pc file
- has correct depenencies
-
-https://bugzilla.gnome.org/show_bug.cgi?id=685464
----
- configure.ac   | 12 ++++++++++--
- libgdata.pc.in |  3 ++-
- 2 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2ee881b..76d4898 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -62,7 +62,11 @@ AC_SUBST(GDATA_API_VERSION)
- AC_SUBST(GDATA_API_VERSION_MAJOR)
- AC_SUBST(GDATA_API_VERSION_MINOR)
- 
--GDATA_PACKAGES="glib-2.0 >= $GLIB_REQS libxml-2.0 gthread-2.0 gio-2.0 >= $GIO_REQS libsoup-2.4 >= $SOUP_REQS oauth >= $OAUTH_REQS"
-+GDATA_PACKAGES_PUBLIC="gobject-2.0 glib-2.0 >= $GLIB_REQS gio-2.0 >= $GIO_REQS libxml-2.0 libsoup-2.4 >= $SOUP_REQS"
-+GDATA_PACKAGES_PRIVATE="gthread-2.0 oauth >= $OAUTH_REQS"
-+GDATA_PACKAGES="$GDATA_PACKAGES_PUBLIC $GDATA_PACKAGES_PRIVATE"
-+AC_SUBST([GDATA_PACKAGES_PUBLIC])
-+AC_SUBST([GDATA_PACKAGES_PRIVATE])
- AC_SUBST([GDATA_PACKAGES])
- 
- PKG_CHECK_MODULES(GDATA, [$GDATA_PACKAGES])
-@@ -87,7 +91,11 @@ AC_ARG_ENABLE(gnome, AS_HELP_STRING([--enable-gnome], [Whether to enable GNOME s
- AC_MSG_RESULT($enable_gnome)
- AM_CONDITIONAL([ENABLE_GNOME], [test "x$enable_gnome" = "xyes"])
- 
--GNOME_PACKAGES="libsoup-gnome-2.4 gcr-base-3 libxml-2.0 goa-1.0 >= $GOA_REQS"
-+GNOME_PACKAGES_PUBLIC=""
-+GNOME_PACKAGES_PRIVATE="libsoup-gnome-2.4 gcr-base-3 libxml-2.0 goa-1.0 >= $GOA_REQS"
-+GNOME_PACKAGES="$GNOME_PACKAGES_PUBLIC $GNOME_PACKAGES_PRIVATE"
-+AC_SUBST([GNOME_PACKAGES_PUBLIC])
-+AC_SUBST([GNOME_PACKAGES_PRIVATE])
- AC_SUBST([GNOME_PACKAGES])
- 
- if test "x$enable_gnome" = "xyes"; then
-diff --git a/libgdata.pc.in b/libgdata.pc.in
-index ed1f4a4..cc927a7 100644
---- a/libgdata.pc.in
-+++ b/libgdata.pc.in
-@@ -6,6 +6,7 @@ includedir=@includedir@
- Name: libgdata
- Description: GData client library
- Version: @VERSION@
--Requires: @GDATA_PACKAGES@ @GNOME_PACKAGES@
-+Requires: @GDATA_PACKAGES_PUBLIC@ @GNOME_PACKAGES_PUBLIC@
-+Requires.private: @GDATA_PACKAGES_PRIVATE@ @GNOME_PACKAGES_PRIVATE@
- Libs: -L${libdir} -lgdata
- Cflags: -I${includedir}/libgdata
--- 
-1.8.0.2
-
diff --git a/dev-libs/libgdata/files/libgdata-0.13.2-libgdata.pc-unused-deps.patch b/dev-libs/libgdata/files/libgdata-0.13.2-libgdata.pc-unused-deps.patch
deleted file mode 100644
index 7c1e1b0efb50..000000000000
--- a/dev-libs/libgdata/files/libgdata-0.13.2-libgdata.pc-unused-deps.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 25fca0ba204a99bc4c1c8411067a8b88042d32e1 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 16 Dec 2012 00:34:18 -0500
-Subject: [PATCH] build: Do not add unused gnome dependencies to libgdata.pc
-
-https://bugzilla.gnome.org/show_bug.cgi?id=690281
----
- configure.ac | 17 ++++++++++-------
- 1 file changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 76d4898..b4698c2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -91,17 +91,20 @@ AC_ARG_ENABLE(gnome, AS_HELP_STRING([--enable-gnome], [Whether to enable GNOME s
- AC_MSG_RESULT($enable_gnome)
- AM_CONDITIONAL([ENABLE_GNOME], [test "x$enable_gnome" = "xyes"])
- 
--GNOME_PACKAGES_PUBLIC=""
--GNOME_PACKAGES_PRIVATE="libsoup-gnome-2.4 gcr-base-3 libxml-2.0 goa-1.0 >= $GOA_REQS"
--GNOME_PACKAGES="$GNOME_PACKAGES_PUBLIC $GNOME_PACKAGES_PRIVATE"
--AC_SUBST([GNOME_PACKAGES_PUBLIC])
--AC_SUBST([GNOME_PACKAGES_PRIVATE])
--AC_SUBST([GNOME_PACKAGES])
--
- if test "x$enable_gnome" = "xyes"; then
-+	GNOME_PACKAGES_PUBLIC=""
-+	GNOME_PACKAGES_PRIVATE="libsoup-gnome-2.4 gcr-base-3 libxml-2.0 goa-1.0 >= $GOA_REQS"
-+	GNOME_PACKAGES="$GNOME_PACKAGES_PUBLIC $GNOME_PACKAGES_PRIVATE"
- 	AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled])
- 	PKG_CHECK_MODULES([GNOME], [$GNOME_PACKAGES])
-+else
-+	GNOME_PACKAGES_PUBLIC=""
-+	GNOME_PACKAGES_PRIVATE=""
-+	GNOME_PACKAGES=""
- fi
-+AC_SUBST([GNOME_PACKAGES_PUBLIC])
-+AC_SUBST([GNOME_PACKAGES_PRIVATE])
-+AC_SUBST([GNOME_PACKAGES])
- 
- # Various necessary functions and headers
- AC_CHECK_FUNCS([strchr])
--- 
-1.8.0.2
-
diff --git a/dev-libs/libgdata/libgdata-0.13.2-r2.ebuild b/dev-libs/libgdata/libgdata-0.13.2-r2.ebuild
deleted file mode 100644
index 9c748afe2766..000000000000
--- a/dev-libs/libgdata/libgdata-0.13.2-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/libgdata-0.13.2-r2.ebuild,v 1.6 2013/02/02 22:25:51 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol"
-HOMEPAGE="http://live.gnome.org/libgdata"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/13" # subslot = libgdata soname version
-IUSE="gnome +introspection static-libs"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# gtk+ is needed for gdk
-# configure checks for gtk:3, but only uses it for demos which are not installed
-RDEPEND="
-	>=dev-libs/glib-2.31:2
-	>=dev-libs/libxml2-2:2
-	>=net-libs/liboauth-0.9.4
-	>=net-libs/libsoup-2.37.91:2.4[introspection?]
-	>=x11-libs/gdk-pixbuf-2.14:2
-	gnome? (
-		app-crypt/gcr:=
-		>=net-libs/gnome-online-accounts-3.2
-		>=net-libs/libsoup-gnome-2.37.91:2.4[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.40
-	>=gnome-base/gnome-common-3.6
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	G2CONF="${G2CONF}
-		$(use_enable static-libs static)
-		$(use_enable gnome)
-		$(use_enable introspection)"
-
-	# Two patches to correct deps in libgdata.pc, bug #444270
-	# upstream, in 0.13.3
-	epatch "${FILESDIR}/${P}-Requires.private.patch"
-	# https://bugzilla.gnome.org/show_bug.cgi?id=690281
-	epatch "${FILESDIR}/${PN}-0.13.2-libgdata.pc-unused-deps.patch"
-
-	eautoreconf
-
-	gnome2_src_prepare
-
-	# Disable tests requiring network access, bug #307725
-	sed -e '/^TEST_PROGS = / s:\(.*\):TEST_PROGS = general perf\nOLD_\1:' \
-		-i gdata/tests/Makefile.in || die "network test disable failed"
-}
-
-src_test() {
-	unset ORBIT_SOCKETDIR
-	unset DBUS_SESSION_BUS_ADDRESS
-	dbus-launch emake check || die "emake check failed"
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-	preserve_old_lib /usr/$(get_libdir)/libgdata.so.7
-	preserve_old_lib /usr/$(get_libdir)/libgdata.so.11
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	preserve_old_lib_notify /usr/$(get_libdir)/libgdata.so.7
-	preserve_old_lib_notify /usr/$(get_libdir)/libgdata.so.11
-}
diff --git a/dev-libs/libgdata/libgdata-0.13.3.ebuild b/dev-libs/libgdata/libgdata-0.13.3.ebuild
deleted file mode 100644
index 05ea111e8beb..000000000000
--- a/dev-libs/libgdata/libgdata-0.13.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/libgdata-0.13.3.ebuild,v 1.3 2013/05/08 15:05:42 jer Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-VALA_MIN_API_VERSION="0.20"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol"
-HOMEPAGE="http://live.gnome.org/libgdata"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/13" # subslot = libgdata soname version
-IUSE="gnome +introspection static-libs vala"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-REQUIRED_IUSE="vala? ( introspection )"
-
-# gtk+ is needed for gdk
-# configure checks for gtk:3, but only uses it for demos which are not installed
-RDEPEND="
-	>=dev-libs/glib-2.31:2
-	>=dev-libs/libxml2-2:2
-	>=net-libs/liboauth-0.9.4
-	>=net-libs/libsoup-2.37.91:2.4[introspection?]
-	>=x11-libs/gdk-pixbuf-2.14:2
-	gnome? (
-		app-crypt/gcr:=
-		>=net-libs/gnome-online-accounts-3.2
-		|| (
-			>=net-libs/libsoup-2.42
-			>=net-libs/libsoup-gnome-2.37.91:2.4[introspection?] ) )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.40
-	>=gnome-base/gnome-common-3.6
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	# Disable tests requiring network access, bug #307725
-	sed -e '/^TEST_PROGS = / s:\(.*\):TEST_PROGS = general perf\nOLD_\1:' \
-		-i gdata/tests/Makefile.{am,in} || die "network test disable failed"
-
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	gnome2_src_configure \
-		$(use_enable gnome) \
-		$(use_enable gnome goa) \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		$(use_enable static-libs static)
-}
-
-src_test() {
-	unset ORBIT_SOCKETDIR
-	unset DBUS_SESSION_BUS_ADDRESS
-	dbus-launch emake check || die "emake check failed"
-}
diff --git a/dev-libs/libgdata/libgdata-0.13.4.ebuild b/dev-libs/libgdata/libgdata-0.13.4.ebuild
index f1e32d66b6c5..c01486b19def 100644
--- a/dev-libs/libgdata/libgdata-0.13.4.ebuild
+++ b/dev-libs/libgdata/libgdata-0.13.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/libgdata-0.13.4.ebuild,v 1.2 2013/08/06 09:34:29 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/libgdata-0.13.4.ebuild,v 1.3 2013/08/30 22:42:28 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -29,9 +29,7 @@ RDEPEND="
 	gnome? (
 		app-crypt/gcr:=
 		>=net-libs/gnome-online-accounts-3.2
-		|| (
-			>=net-libs/libsoup-2.42
-			>=net-libs/libsoup-gnome-2.37.91:2.4[introspection?] ) )
+		>=net-libs/libsoup-gnome-2.37.91:2.4[introspection?] )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
 "
 DEPEND="${RDEPEND}