Bump to 2.26.2. Parsing fixes, clean up old revisions. Add missing gtk-doc-am in case eautoreconf is called.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 58 insertions, 66 deletions

diff --git a/dev-libs/totem-pl-parser/ChangeLog b/dev-libs/totem-pl-parser/ChangeLog
index 7ffc92e405e0..932a26b8ea6b 100644
--- a/dev-libs/totem-pl-parser/ChangeLog
+++ b/dev-libs/totem-pl-parser/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/totem-pl-parser
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/ChangeLog,v 1.29 2009/05/05 15:20:33 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/ChangeLog,v 1.30 2009/05/16 13:21:59 eva Exp $
+
+*totem-pl-parser-2.26.2 (16 May 2009)
+
+  16 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -totem-pl-parser-2.22.3.ebuild, -totem-pl-parser-2.24.3.ebuild,
+  +totem-pl-parser-2.26.2.ebuild:
+  Bump to 2.26.2. Parsing fixes, clean up old revisions. Add missing
+  gtk-doc-am in case eautoreconf is called.
 
   05 May 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
   totem-pl-parser-2.26.1.ebuild:
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-2.22.3.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-2.22.3.ebuild
deleted file mode 100644
index 0d0c7a8985fa..000000000000
--- a/dev-libs/totem-pl-parser/totem-pl-parser-2.22.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2008 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.22.3.ebuild,v 1.8 2008/11/13 19:29:22 ranger Exp $
-
-inherit gnome.org
-
-DESCRIPTION="Playlist parsing library"
-HOMEPAGE="http://www.gnome.org/projects/totem/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc hal"
-
-RDEPEND=">=dev-libs/glib-2.13.4
-		 >=x11-libs/gtk+-2.12
-		 >=gnome-base/gnome-vfs-2.16
-		 >=gnome-extra/evolution-data-server-1.12
-		 hal? ( =sys-apps/hal-0.5* >=sys-apps/dbus-1.0 )"
-DEPEND="${RDEPEND}
-		!<media-video/totem-2.21
-		>=dev-util/intltool-0.35
-		doc? ( dev-util/gtk-doc )"
-
-src_compile() {
-	econf $(use_enable hal) || die "configure failed"
-	emake || die "build failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-}
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-2.24.3.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-2.24.3.ebuild
deleted file mode 100644
index 6d249fbaa4ef..000000000000
--- a/dev-libs/totem-pl-parser/totem-pl-parser-2.24.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2008 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.24.3.ebuild,v 1.1 2008/12/21 15:52:20 eva Exp $
-
-inherit gnome.org
-
-DESCRIPTION="Playlist parsing library"
-HOMEPAGE="http://www.gnome.org/projects/totem/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc hal"
-
-RDEPEND=">=dev-libs/glib-2.16.3
-	>=x11-libs/gtk+-2.12
-	>=gnome-extra/evolution-data-server-1.12
-	hal? (
-		=sys-apps/hal-0.5*
-		>=sys-apps/dbus-1.0 )"
-DEPEND="${RDEPEND}
-	!<media-video/totem-2.21
-	>=dev-util/intltool-0.40
-	doc? ( dev-util/gtk-doc )"
-
-src_compile() {
-	econf $(use_with hal)
-	emake || die "build failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-}
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-2.26.2.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-2.26.2.ebuild
new file mode 100644
index 000000000000..981a4c50b4ae
--- /dev/null
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-2.26.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2009 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.26.2.ebuild,v 1.1 2009/05/16 13:21:59 eva Exp $
+
+EAPI="2"
+
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Playlist parsing library"
+HOMEPAGE="http://www.gnome.org/projects/totem/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc hal test"
+
+RDEPEND=">=dev-libs/glib-2.17.3
+	>=x11-libs/gtk+-2.12
+	>=gnome-extra/evolution-data-server-1.12"
+DEPEND="${RDEPEND}
+	!<media-video/totem-2.21
+	>=dev-util/intltool-0.35
+	dev-util/gtk-doc-am
+	doc? ( >=dev-util/gtk-doc-1.11 )"
+
+DOCS="AUTHORS ChangeLog NEWS"
+G2CONF="${G2CONF} --disable-static"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# FIXME: tarball generated with broken gtk-doc, revisit me.
+	if use doc; then
+		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \
+			-i gtk-doc.make || die "sed 1 failed"
+	else
+		sed "/^TARGET_DIR/i \GTKDOC_REBASE=$(type -P true)" \
+			-i gtk-doc.make || die "sed 2 failed"
+	fi
+
+	# Conditional patching is purely to avoid eautoreconf
+	if use test && ! use doc; then
+		# http://bugzilla.gnome.org/show_bug.cgi?id=577774
+		epatch "${FILESDIR}/${PN}-2.26.1-fix-tests-without-gtk-doc.patch"
+		eautoreconf
+	fi
+}