Revision bump to use gmime-2.6 instead of old 2.4 slot.

(Portage version: 2.1.11.19/cvs/Linux x86_64)

3 files changed, 15 insertions, 78 deletions

diff --git a/dev-libs/totem-pl-parser/ChangeLog b/dev-libs/totem-pl-parser/ChangeLog
index 8a9750e42bc5..fadd3768239e 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/ChangeLog,v 1.117 2012/09/18 13:22:46 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/ChangeLog,v 1.118 2012/09/22 17:45:37 pacho Exp $
+
+*totem-pl-parser-2.32.6-r2 (22 Sep 2012)
+
+  22 Sep 2012; Pacho Ramos <pacho@gentoo.org> +totem-pl-parser-2.32.6-r2.ebuild,
+  -totem-pl-parser-2.32.6.ebuild, -totem-pl-parser-3.4.2.ebuild:
+  Revision bump to use gmime-2.6 instead of old 2.4 slot.
 
   18 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   totem-pl-parser-3.4.3.ebuild,
@@ -559,4 +565,3 @@
   +totem-pl-parser-2.22.1.ebuild:
   New ebuild for GNOME-2.22. Playlist parsing library splitted out
   of totem.
-
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6-r2.ebuild
index cf83d2f0014d..d06a826a49c5 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6-r2.ebuild
@@ -1,12 +1,12 @@
 # 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-2.32.6.ebuild,v 1.7 2012/09/18 10:14:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6-r2.ebuild,v 1.1 2012/09/22 17:45:37 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="Playlist parsing library"
 HOMEPAGE="http://projects.gnome.org/totem/ http://developer.gnome.org/totem-pl-parser/stable/"
@@ -16,15 +16,15 @@ HOMEPAGE="http://projects.gnome.org/totem/ http://developer.gnome.org/totem-pl-p
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~sparc ~x86 ~x86-fbsd"
 IUSE="archive doc +introspection +quvi"
 
 RDEPEND=">=dev-libs/glib-2.24:2
-	dev-libs/gmime:2.4
+	dev-libs/gmime:2.6
 	>=net-libs/libsoup-gnome-2.30:2.4
 	archive? ( >=app-arch/libarchive-2.8.4 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	quvi? ( >=media-libs/quvi-0.2.15 )"
+	quvi? ( >=media-libs/libquvi-0.2.15 )"
 DEPEND="${RDEPEND}
 	!<media-video/totem-2.21
 	>=sys-devel/gettext-0.17
@@ -54,6 +54,9 @@ pkg_setup() {
 #}
 
 src_prepare() {
+	# bug #386651, https://bugzilla.gnome.org/show_bug.cgi?id=661451
+	epatch "${FILESDIR}/${PN}-2.32.6-quvi-0.4.patch"
+
 	gnome2_src_prepare
 
 	# Disable tests requiring network access, bug #346127
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.4.2.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.4.2.ebuild
deleted file mode 100644
index ed7b84f03681..000000000000
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.4.2.ebuild
+++ /dev/null
@@ -1,71 +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.2.ebuild,v 1.3 2012/09/18 10:14:04 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-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 ~sparc ~x86 ~x86-fbsd"
-IUSE="archive crypt doc +introspection +quvi test"
-
-RDEPEND=">=dev-libs/glib-2.31:2
-	dev-libs/gmime: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-util/intltool-0.35
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.14 )
-	test? (
-		gnome-base/gvfs[http]
-		sys-apps/dbus )"
-# eautoreconf needs:
-#	>=dev-util/gtk-doc-am-1.14
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-maintainer-mode
-		$(use_enable archive libarchive)
-		$(use_enable crypt libgcrypt)
-		$(use_enable quvi)
-		$(use_enable introspection)"
-	DOCS="AUTHORS ChangeLog NEWS"
-}
-
-# eautoreconf needs:
-#src_unpack() {
-#	# If gobject-introspection is installed, we don't need the extra .m4
-#	if has_version "dev-libs/gobject-introspection"; then
-#		unpack ${P}.tar.bz2
-#	else
-#		unpack ${A}
-#	fi
-#}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# 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"
-}
-
-src_test() {
-	# This is required as told by upstream in bgo#629542
-	GVFS_DISABLE_FUSE=1 dbus-launch emake check || die "emake check failed"
-}