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

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

7 files changed, 15 insertions, 187 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/Manifest b/dev-libs/totem-pl-parser/Manifest
index d2bb08b52d61..f159fbbcdb75 100644
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@@ -1,25 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX totem-pl-parser-2.32.3-fix-quvi.patch 786 SHA256 a891cc4bda5a94cbbdde031f0ee05cbb1fdd0f53c09710c366a5a6bc9787257a SHA512 d53e83c68544cabd4b3b6bc39ea3bef591c96e413f574c334704c610d1a5a87eedea59e002ae1aeddcf5a7cc64a9049af316481796a3a60afcbed673538a816b WHIRLPOOL 7220a2386342e755e11d00607026367dd26a6b567c8665fa792c23ea857b37f3448e11e979343d307c894c052c5ebd036fe5cdaaf56a547bf1ef2630b3b7e250
 AUX totem-pl-parser-2.32.6-gmime26.patch 968 SHA256 102e6065f5845f7b493b532951ddc38429d13ad17c60b875cd3d28c4017ef709 SHA512 797a248c8e80978a9bf5b44557d89b6dc4f8766dd76c9a79c27b732d5f5e4330078c0298a1dd9e29c55bbb8affecaa551edcfdf53afdc74e6a005c04be524465 WHIRLPOOL e887d03eb2edc29f522e64b99947e9e1e389896d75261889d1e44e35ae5415218b5e3a4dbc785830c30f6946f71a110c18a17cafb6366223581a89c2fd96dfa7
 AUX totem-pl-parser-2.32.6-quvi-0.4.patch 850 SHA256 0ddded34923431dd356519f57c7d7fcaff44411a8c95b06fb0f32ac43b0198b3 SHA512 e7a075ea6c37fe78304b83c834914ffa895e0b580b268aa689bd4b387eb9276f30dfca94b527f3f5ad9137bb24639d26a4f765e5bd5f5bb905fff967f04e658f WHIRLPOOL e0a13fc24e614acad95be51a00a92ea1f8e92ac69acf2c8428ed26f764823b94b531d05db3e9d73604186792cab6bb1a3b0ddb89bc86735db6af0cb776fce23b
-AUX totem-pl-parser-3.4.3-no-g_clear_pointer.patch 671 SHA256 2fd19abcc9fd4d34e7706713acb08e1f8509183eb7b8ff6b798d710fca3cdf4f SHA512 6452636e1c8f0cb71ff8cfe8b822324cfe96566ff2e03c87e258d5c17637b2d347fc1a7095c0ccf25cb468d79d2f4019e1b0f0ac85394167788c196ecd119b50 WHIRLPOOL a82d68b257b82c0a2cf086409931e143ae3dfdd82e6d4a79b15bc4f9525455e0b2d56b09c1df7a04082d7a103cb9948aab4a2d2e851e1f09ac2007bc4e0a622b
 DIST totem-pl-parser-2.32.6.tar.xz 1438372 SHA256 8e6ccef547f1ad311474a975032d2482e621550ee3d4d22c725cdc6b496e4874 SHA512 25726fd95815955b5f8b6fc35cc906f9dcd3818a17f0113e8fcc3240b4fadbaabfcfe91d463ef2d69062cd19a9b6a665342a14a88d781ab70929ac40add07ac3 WHIRLPOOL 1e924e1ff461aac1259a3cd10cefe8b11dbf59f8a676004f5023abb5da623bed520c07937ea802f619a9a33f47a47f2014cbd5ed5795befe35abc8e1bc8986e9
-DIST totem-pl-parser-3.4.3.tar.xz 1602000 SHA256 ab8beed4dd5d3a5d7ed5dc8b357e94dc03a8553fef6e33c2e7fb63a76e44c42b SHA512 19ecc0aab4ce486cfbe5bd6390467fb1e14279708aaeb831f8626f7350c8b8deaa59157f95f746cfd4ac8d87a496977f558fce605bed4647f877d05dc0b0ebe6 WHIRLPOOL 7b1e654dc96e07d690309662d039cacd71c6ddc9d4856f4819be33024db02ddbd88a3d87e43ee486716f9c58256cd61a701c99d541d996085c1405dc7df15f40
-DIST totem-pl-parser-3.4.4.tar.xz 1607332 SHA256 b821e812da3f3e42d2f831296b4031c60a615d29857781971578ce2c0c807457 SHA512 53e3e8d720acd8f4d17f5504613ec38fc095191172f6ee103d89e7703a1003db040ce35f8e8929fdd7b806d337020720da867ecc6e1f2395e359a91bd3d4dc24 WHIRLPOOL a57ad6620e919031b7065a962c76053a4ac62854facbd477799ceb1fd4846229bb96ac449fca733d413bf38992333a529d0b499c7388a273b6eccff3e6c2264e
 DIST totem-pl-parser-3.4.5.tar.xz 1608140 SHA256 a573e078692b48895cb5b041385b2760d63e2ee496c8d499eccfa942e7c79f89 SHA512 55723306d76554d000b9b957008e295d748d100eb3d442e2645f7d2ac9a64929c6ec0c70186e10dddb30f49b03bd1869b3408b96a5d50bfac52131629b726dbc WHIRLPOOL e009cc339803ba87128f5950e59f0d754a3b58d8a0cb7c18e151d289a760bad346d64e9eb1f8ebc58d2e7162bf9913291b80de0e8ae6f638b25815cba214e7f3
 EBUILD totem-pl-parser-2.32.6-r3.ebuild 1887 SHA256 4b2a1deca09f2fc1e02de25d6f9eaf4e2916d34d549cd05f28a1b9cf5b92fb80 SHA512 d0c2be10117a758c93201d93c7c96869c2d5803f8c378d35dd1960595f02fd335a1ef0d3102d30b7e48a772f7d04f2884528a9e1720730a08ff9f94bef9d9cc4 WHIRLPOOL 453827dfa6a1ddb933906e9061c447df5150511a5e5240872d3e3c9873e1ea78cc512b843697459aaf6e38f2068018ff5bc6f8ab37c4cb5774921c3fff7083d0
 EBUILD totem-pl-parser-2.32.6.ebuild 1846 SHA256 2cdb84d216f49d4b6ddff7518d9e14feef72ba3d189c85e3d3916ea0251e79a0 SHA512 98807687b59a694c5a9461154ce2c206f1a3ae4e8110ae62ac229cfaa14b205c2107975787795bf515e8f98d4d32f93a1994f57e476b6871c7d6156d0e53b12d WHIRLPOOL d4ffcb277fc6100197dd1194d8c8fc5f3c4ff430ef18fa96d34b9002d83d995d057f45d1dff5b1b06790289e7cbc82a652e9f4338313fa7b169889e8558065c4
-EBUILD totem-pl-parser-3.4.3-r1.ebuild 2042 SHA256 1d84824e00c4fb5fa554cab91198ebf8d020a6ad49fea79c2ceae8604b4d4bf4 SHA512 92a6e5b48051f93e6448bf9e23b6cd9963b7c06d4e7e5778c766cbfc307b710f3801cdac709a54b9de07412aec3ea7303ee5b21237dffbfa0e7838df94971b8d WHIRLPOOL 7289f851efe7c8d5dc98b8fa7715cafad535f016125c68b520eec01b4bc034222fcbd8c5a5d1f3ecfd3dddca20cec50e7cfdaa4e1dbfae4cdc2f949f0b5292ca
-EBUILD totem-pl-parser-3.4.4.ebuild 1780 SHA256 0249ffe8dec69b93dcbf37fa2ec13fe6fbc790a557f301176736b50555940e3d SHA512 1d7aa2b6e722382ec42a231861e978ffab1580de3a46ac7296d9467f7e8ea67387b938ad6ebd8e71f98b7fbab4351f81921669dec53a9f8e9065f4e7b4539af1 WHIRLPOOL 8dc0f398effe1f5f5635517aa750790ac9bcaa1b08cbeef32b9a43f4fc497c20d0fe51390b2757a8d2044df7563c9531907e52e81b0d7ce4937de0743deda575
-EBUILD totem-pl-parser-3.4.5.ebuild 1816 SHA256 6440a15a74dee5cbc9a4a58ab9c7dd2b85f4cad7fc5ea4554114282dd0ef9c47 SHA512 0d5cfdebfbcb45063da65353baa5184b2deaf94b7af3ff254d2f0be13d937d33a0376012d33afce260ca91d80d1b904031748503708f914ed19ba278c2705e74 WHIRLPOOL 14b38709c56cd5dc2ce0f8a7956c33adb70348b455f6a488cc8dd13383bff568f602f3f57a3d5bf1d6477fd62939e46e903cd56da5695ca48b076c0087d6f45f
-MISC ChangeLog 22510 SHA256 a64cebbacfebda8bcd87a83241340ea7829aa1e5775ccad4310324d694ecebec SHA512 1b7d68f03a3aed36498bce323a8390fb7ef40dd448f164f1290d0baa696bbf039222d74e114053c522aca6cc20f43bb73cd7792d7e7ccea1370d2df9e69f3b48 WHIRLPOOL 00bc302fb9a48579bdaf847f8a3bb25e48426ff6ccdb1c8ff33a876d2641557f90a4bc7ced7a64452cd5b8e23fd065f2dbef038a43f4c18a8631a4f4bf091f51
+EBUILD totem-pl-parser-3.4.5.ebuild 1779 SHA256 8315c82ddec68f67b3de5c246a5b33702c68a6701ed3cf2bfef5ef21b96cd033 SHA512 544ade5c013ade7fd9893cb12bcaa2beb7782d9002caf950d153633c2b9bd491dab385861b36bb0a913f6395961ee4671881812b504c299b14103d17610993e7 WHIRLPOOL 23c109aa459908bc4e5af00db2a4938bbe4722e50486b8bac00fccf7aa889c6a777a9b54aab5de1c230c08c674e9f1c48899826eea2adaff00b39140cbf0695c
+MISC ChangeLog 22822 SHA256 b3d281fcbb8c72f651ff9a24c7b07c7b636be819634e2f82ad3275786a469601 SHA512 dd537f2d3da0296c885e1c5725a16077df6d3037352330ebfdb215ecec509b59a9da679c26eeb60a5a4d995a05fc1e46415e1fd2adee8113891bf8bbad086cf1 WHIRLPOOL 7e0ac43dd596756e34afa7210a3d364c65247e4109177757cef5634c5e9f7b08681b1e08cd32fbd1a3afcdb86ec776ac32876778ab603fbede701b608cd89319
 MISC metadata.xml 492 SHA256 43d02e4dc81f8f531e19376c0107031953d50ca59d0c80602f8b8838b482f0e9 SHA512 4d0ff77ed81b37b60aebcf1a35b3f8177bb6478a9832e684240332a8d6c823dbf24b14b4bfcb42b08170e7caae854217bfbdf3d92c841d8728372f51a3336e82 WHIRLPOOL feccdcd78aa9c94bf798e94ffa8931ab8e70ec79c121e03ed2f447bf4fa432a06d73d4ecfc5c6edd3c296a1455764364e62db3e175869fc59d932a0f20bc44e6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlGSlS8ACgkQCaWpQKGI+9Q3BwCfc8D94AJyrMrD3Bsb4FmqXW/X
-Bd8An3XqsUB9SUCG4tJZmk7aenWN8oog
-=Busd
+iEYEAREIAAYFAlIhH/cACgkQ1fmVwcYIWAZu2wCeID5srUMvjDl05kzX16xfBheA
+V5IAoIdC8RFU2Hs/hcytSAgRd8dm1eNF
+=+C+X
 -----END PGP SIGNATURE-----
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 )