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, 175 deletions

diff --git a/dev-libs/totem-pl-parser/ChangeLog b/dev-libs/totem-pl-parser/ChangeLog
index 91e1c5e121a9..398157f24b7a 100644
--- a/dev-libs/totem-pl-parser/ChangeLog
+++ b/dev-libs/totem-pl-parser/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/totem-pl-parser
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/ChangeLog,v 1.134 2013/05/14 19:49:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/ChangeLog,v 1.135 2013/08/30 22:43:01 eva Exp $
+
+  30 Aug 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  -totem-pl-parser-3.4.3-r1.ebuild, -totem-pl-parser-3.4.4.ebuild,
+  totem-pl-parser-3.4.5.ebuild, -files/totem-pl-parser-2.32.3-fix-quvi.patch,
+  -files/totem-pl-parser-3.4.3-no-g_clear_pointer.patch:
+  Depend on libsoup-gnome again, clean up old revisions.
 
 *totem-pl-parser-3.4.5 (14 May 2013)
 
diff --git a/dev-libs/totem-pl-parser/files/totem-pl-parser-2.32.3-fix-quvi.patch b/dev-libs/totem-pl-parser/files/totem-pl-parser-2.32.3-fix-quvi.patch
deleted file mode 100644
index 9ae58e0c995d..000000000000
--- a/dev-libs/totem-pl-parser/files/totem-pl-parser-2.32.3-fix-quvi.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9a1a89ce6af47b8ac3ee7ae0fa3987815e9713a3 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Mon, 21 Feb 2011 19:49:55 +0000
-Subject: build: Fix --enable-quvi option
-
-https://bugzilla.gnome.org/show_bug.cgi?id=642900
----
-diff --git a/configure.in b/configure.in
-index eb53dcb..7227373 100644
---- a/configure.in
-+++ b/configure.in
-@@ -101,12 +101,11 @@ else
-  **************************************************************"
- fi
- 
--enable_quvi=auto
- QUVI=""
--AC_ARG_ENABLE(enable-quvi,
-+AC_ARG_ENABLE(quvi,
- 	      AS_HELP_STRING([--enable-quvi],
- 			     [Enable libquvi support (default is auto).]),
--			     [enable_quvi=$enableval],
-+			     [],
- 			     [enable_quvi=auto])
- if test "x$enable_quvi" != "xno" ; then
- 	PKG_CHECK_MODULES(QUVI,
---
-cgit v0.8.3.4
diff --git a/dev-libs/totem-pl-parser/files/totem-pl-parser-3.4.3-no-g_clear_pointer.patch b/dev-libs/totem-pl-parser/files/totem-pl-parser-3.4.3-no-g_clear_pointer.patch
deleted file mode 100644
index e8f6af70e219..000000000000
--- a/dev-libs/totem-pl-parser/files/totem-pl-parser-3.4.3-no-g_clear_pointer.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/plparse/totem-pl-parser.c b/plparse/totem-pl-parser.c
-index aeaf3ea..dd00037 100644
---- a/plparse/totem-pl-parser.c
-+++ b/plparse/totem-pl-parser.c
-@@ -1835,8 +1835,10 @@ totem_pl_parser_parse_internal (TotemPlParser *parser,
- 
- 	/* Not a directory on http though */
- 	if (g_strcmp0 (mimetype, "inode/directory") == 0 &&
--	    g_file_has_uri_scheme (file, "http"))
--		g_clear_pointer (&mimetype, g_free);
-+	    g_file_has_uri_scheme (file, "http")) {
-+		g_free (mimetype);
-+		mimetype = NULL;
-+	    }
- 
- 	DEBUG(file, g_print ("_get_mime_type_for_name for '%s' returned '%s'\n", uri, mimetype));
- 	if (mimetype == NULL || strcmp (UNKNOWN_TYPE, mimetype) == 0
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.4.3-r1.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.4.3-r1.ebuild
deleted file mode 100644
index ceeb379eb3f3..000000000000
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.4.3-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-3.4.3-r1.ebuild,v 1.3 2012/11/29 03:26:01 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Playlist parsing library"
-HOMEPAGE="http://projects.gnome.org/totem/ http://developer.gnome.org/totem-pl-parser/stable/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="archive crypt +introspection +quvi test"
-
-RDEPEND=">=dev-libs/glib-2.31:2
-	dev-libs/gmime:2.6
-	>=net-libs/libsoup-gnome-2.30:2.4
-	archive? ( >=app-arch/libarchive-2.8.4 )
-	crypt? ( dev-libs/libgcrypt )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	quvi? ( >=media-libs/libquvi-0.2.15 )"
-DEPEND="${RDEPEND}
-	!<media-video/totem-2.21
-	dev-libs/gobject-introspection-common
-	>=dev-util/intltool-0.35
-	dev-util/gtk-doc-am
-	>=gnome-base/gnome-common-3.6
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	test? (
-		gnome-base/gvfs[http]
-		sys-apps/dbus )"
-# eautoreconf needs:
-#	dev-libs/gobject-introspection-common
-#	>=gnome-base/gnome-common-3.6
-
-src_prepare() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable archive libarchive)
-		$(use_enable crypt libgcrypt)
-		$(use_enable quvi)
-		$(use_enable introspection)"
-	DOCS="AUTHORS ChangeLog NEWS"
-
-	# Avoid glib-2.34 dependency for now, bug #435408
-	epatch "${FILESDIR}/${P}-no-g_clear_pointer.patch"
-
-	# build: Use gmime-2.6 (fixed in 'master' (> 3.4.3))
-	epatch "${FILESDIR}/${PN}-2.32.6-gmime26.patch"
-
-	# Disable tests requiring network access, bug #346127
-	sed -e 's:\(g_test_add_func.*/parser/resolution.*\):/*\1*/:' \
-		-e 's:\(g_test_add_func.*/parser/parsing/itms_link.*\):/*\1*/:' \
-		-i plparse/tests/parser.c || die "sed failed"
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_test() {
-	# This is required as told by upstream in bgo#629542
-	GVFS_DISABLE_FUSE=1 dbus-launch emake check || die "emake check failed"
-}
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.4.4.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.4.4.ebuild
deleted file mode 100644
index 5320bf483c7e..000000000000
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.4.4.ebuild
+++ /dev/null
@@ -1,59 +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/totem-pl-parser/totem-pl-parser-3.4.4.ebuild,v 1.3 2013/03/31 18:49:27 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Playlist parsing library"
-HOMEPAGE="http://projects.gnome.org/totem/ http://developer.gnome.org/totem-pl-parser/stable/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="archive crypt +introspection +quvi test"
-
-RDEPEND=">=dev-libs/glib-2.31:2
-	dev-libs/gmime:2.6
-	|| ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.30:2.4 )
-	archive? ( >=app-arch/libarchive-2.8.4 )
-	crypt? ( dev-libs/libgcrypt )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	quvi? ( >=media-libs/libquvi-0.2.15 )"
-DEPEND="${RDEPEND}
-	!<media-video/totem-2.21
-	dev-libs/gobject-introspection-common
-	>=dev-util/intltool-0.35
-	dev-util/gtk-doc-am
-	>=gnome-base/gnome-common-3.6
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	test? (
-		gnome-base/gvfs[http]
-		sys-apps/dbus )"
-# eautoreconf needs:
-#	dev-libs/gobject-introspection-common
-#	>=gnome-base/gnome-common-3.6
-
-src_prepare() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable archive libarchive)
-		$(use_enable crypt libgcrypt)
-		$(use_enable quvi)
-		$(use_enable introspection)"
-
-	# Disable tests requiring network access, bug #346127
-	sed -e 's:\(g_test_add_func.*/parser/resolution.*\):/*\1*/:' \
-		-e 's:\(g_test_add_func.*/parser/parsing/itms_link.*\):/*\1*/:' \
-		-i plparse/tests/parser.c || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_test() {
-	# This is required as told by upstream in bgo#629542
-	GVFS_DISABLE_FUSE=1 dbus-launch emake check || die "emake check failed"
-}
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.4.5.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.4.5.ebuild
index bf5803aebbdd..dc6d36a30ff5 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.4.5.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.4.5.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/totem-pl-parser/totem-pl-parser-3.4.5.ebuild,v 1.1 2013/05/14 19:49:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-3.4.5.ebuild,v 1.2 2013/08/30 22:43:01 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -18,7 +18,7 @@ IUSE="archive crypt +introspection +quvi test"
 RDEPEND="
 	>=dev-libs/glib-2.31:2
 	dev-libs/gmime:2.6
-	|| ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.30:2.4 )
+	>=net-libs/libsoup-gnome-2.30:2.4
 	archive? ( >=app-arch/libarchive-2.8.4 )
 	crypt? ( dev-libs/libgcrypt )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )