Version bump with various bugfixes. Make LICENSE more precise. Drop old.

(Portage version: 2.2.0_alpha128/cvs/Linux x86_64)

7 files changed, 36 insertions, 175 deletions

diff --git a/dev-libs/totem-pl-parser/ChangeLog b/dev-libs/totem-pl-parser/ChangeLog
index f50520e2e883..a6fcf2e808cd 100644
--- a/dev-libs/totem-pl-parser/ChangeLog
+++ b/dev-libs/totem-pl-parser/ChangeLog
@@ -1,6 +1,15 @@
 # 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.115 2012/05/21 15:13:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/ChangeLog,v 1.116 2012/09/18 10:14:05 tetromino Exp $
+
+*totem-pl-parser-3.4.3 (18 Sep 2012)
+
+  18 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -totem-pl-parser-2.32.3.ebuild, -totem-pl-parser-2.32.5.ebuild,
+  -totem-pl-parser-2.32.5-r1.ebuild, totem-pl-parser-2.32.6.ebuild,
+  totem-pl-parser-2.32.6-r1.ebuild, totem-pl-parser-3.4.2.ebuild,
+  +totem-pl-parser-3.4.3.ebuild:
+  Version bump with various bugfixes. Make LICENSE more precise. Drop old.
 
   21 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   totem-pl-parser-3.4.2.ebuild:
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.3.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-2.32.3.ebuild
deleted file mode 100644
index 9685dc42e63b..000000000000
--- a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 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.3.ebuild,v 1.11 2011/06/05 11:58:02 eva Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit gnome2 eutils autotools
-
-DESCRIPTION="Playlist parsing library"
-HOMEPAGE="http://projects.gnome.org/totem/"
-SRC_URI="${SRC_URI} mirror://gentoo/introspection-20110205.m4.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc +introspection"
-
-RDEPEND=">=dev-libs/glib-2.24:2
-	dev-libs/gmime:2.4
-	>=net-libs/libsoup-gnome-2.30:2.4
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
-
-# FIXME: quvi support disabled due upstream bug #642906
-#       quvi? ( >=media-libs/quvi-0.2.11 )"
-
-DEPEND="${RDEPEND}
-	!<media-video/totem-2.21
-	>=sys-devel/gettext-0.17
-	>=dev-util/intltool-0.35
-	gnome-base/gnome-common
-	>=dev-util/gtk-doc-am-1.11
-	doc? ( >=dev-util/gtk-doc-1.11 )
-"
-# eautoreconf needs:
-#	>=dev-util/gtk-doc-am-1.11
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-quvi
-		$(use_enable introspection)"
-	DOCS="AUTHORS ChangeLog NEWS"
-}
-
-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"
-
-	# Fix --enable-quvi option
-	epatch "${FILESDIR}/${P}-fix-quvi.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	AT_M4DIR=${WORKDIR} eautoreconf
-}
-
-src_test() {
-	# This is required as told by upstream in bgo#629542
-	dbus-launch emake check || die "emake check failed"
-}
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.5-r1.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-2.32.5-r1.ebuild
deleted file mode 100644
index 14600dd419f0..000000000000
--- a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.5-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2011 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.5-r1.ebuild,v 1.1 2011/08/16 22:28:25 nirbheek Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit gnome2
-
-DESCRIPTION="Playlist parsing library"
-HOMEPAGE="http://projects.gnome.org/totem/"
-
-# eautoreconf needs:
-#SRC_URI="${SRC_URI} mirror://gentoo/introspection-20110205.m4.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="archive doc +introspection +quvi"
-
-RDEPEND=">=dev-libs/glib-2.24:2
-	dev-libs/gmime:2.4
-	>=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 )"
-DEPEND="${RDEPEND}
-	!<media-video/totem-2.21
-	>=sys-devel/gettext-0.17
-	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1.11 )"
-# eautoreconf needs:
-#	>=dev-util/gtk-doc-am-1.11
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable archive libarchive)
-		$(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
-	dbus-launch emake check || die "emake check failed"
-}
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6-r1.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6-r1.ebuild
index 77cebdcca95e..13aa2371b016 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6-r1.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.6 2012/03/25 15:51:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6-r1.ebuild,v 1.7 2012/09/18 10:14:05 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="http://projects.gnome.org/totem/ http://developer.gnome.org/totem-pl-p
 # eautoreconf needs:
 #SRC_URI="${SRC_URI} mirror://gentoo/introspection-20110205.m4.tar.bz2"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 sparc x86 ~x86-fbsd"
 IUSE="archive doc +introspection +quvi"
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.ebuild
index d831c8f55921..cf83d2f0014d 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.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.6 2011/10/30 15:17:14 armin76 Exp $
+# $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 $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="http://projects.gnome.org/totem/ http://developer.gnome.org/totem-pl-p
 # eautoreconf needs:
 #SRC_URI="${SRC_URI} mirror://gentoo/introspection-20110205.m4.tar.bz2"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="archive doc +introspection +quvi"
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
index 2fdb324a069d..ed7b84f03681 100644
--- 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
@@ -1,6 +1,6 @@
 # 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.2 2012/05/21 15:13:33 tetromino Exp $
+# $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"
@@ -11,7 +11,7 @@ inherit gnome2
 DESCRIPTION="Playlist parsing library"
 HOMEPAGE="http://projects.gnome.org/totem/ http://developer.gnome.org/totem-pl-parser/stable/"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~sparc ~x86 ~x86-fbsd"
 IUSE="archive crypt doc +introspection +quvi test"
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.5.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.4.3.ebuild
index 29681c9fbf6a..ea17b40852bb 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.5.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.4.3.ebuild
@@ -1,58 +1,51 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.5.ebuild,v 1.7 2011/10/05 16:57:22 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-3.4.3.ebuild,v 1.1 2012/09/18 10:14:05 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
 
 inherit gnome2
 
 DESCRIPTION="Playlist parsing library"
-HOMEPAGE="http://projects.gnome.org/totem/"
+HOMEPAGE="http://projects.gnome.org/totem/ http://developer.gnome.org/totem-pl-parser/stable/"
 
-# eautoreconf needs:
-#SRC_URI="${SRC_URI} mirror://gentoo/introspection-20110205.m4.tar.bz2"
-
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="archive doc +introspection +quvi"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~sparc ~x86 ~x86-fbsd"
+IUSE="archive crypt doc +introspection +quvi test"
 
-RDEPEND=">=dev-libs/glib-2.24:2
+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/quvi-0.2.15 )"
+	quvi? ( >=media-libs/libquvi-0.2.15 )"
 DEPEND="${RDEPEND}
 	!<media-video/totem-2.21
-	>=sys-devel/gettext-0.17
 	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1.11 )"
+	>=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.11
+#	>=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
 
@@ -64,5 +57,5 @@ src_prepare() {
 
 src_test() {
 	# This is required as told by upstream in bgo#629542
-	dbus-launch emake check || die "emake check failed"
+	GVFS_DISABLE_FUSE=1 dbus-launch emake check || die "emake check failed"
 }