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

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 71 insertions, 71 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/Manifest b/dev-libs/totem-pl-parser/Manifest
index 93d4ccb94431..fd88f1f8e662 100644
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@@ -1,11 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX totem-pl-parser-2.26.1-fix-tests-without-gtk-doc.patch 475 RMD160 1d2442980ab35d5af69182adbdbefcf4468ef17b SHA1 4b1b118e5649b570f12dd46756c83173eb0a11a5 SHA256 f2103a798abc8542f81bd4bdcd19a482e40bb20b1a7031142cf94c880931f87a
-DIST totem-pl-parser-2.22.3.tar.bz2 831247 RMD160 080d5cad1f6abff217ef63a4445ffa66000ae0fe SHA1 65ec8c18384cb40fcbb006c948c9d6fad961b124 SHA256 360b08584f44710bbcb380dfec33ee9bdea351383cbf15a8da1c3041337b8767
-DIST totem-pl-parser-2.24.3.tar.bz2 620727 RMD160 e0ba63d42ae67e58a410b24d8a256f8f056e8ffb SHA1 548dcc389f87b3389234f7a035dff0e4ec899087 SHA256 27aeac92d03d006efde5c461148db3b983582dc66ad835bec5f6a12bbea39a4c
 DIST totem-pl-parser-2.24.4.tar.bz2 621645 RMD160 af92fc1ccd8b51e16eea4d3b33d3dbace7859fc8 SHA1 7c6650fc9ee2190270e80a00a9afe77629c07700 SHA256 e43eefb7d169e54da889d32fe2a82756087c095a4317a469f616082d44286bb6
 DIST totem-pl-parser-2.26.1.tar.bz2 632881 RMD160 05455ac451b621166b2d170a4decb797b5786913 SHA1 d4fdd73903af1955a262b43c2260ad9bc5912e92 SHA256 448cb2b631b1a7b9a627627e7ea27d1bae7cf70496db58ab4467892a4c8c51ce
-EBUILD totem-pl-parser-2.22.3.ebuild 901 RMD160 0d6c19ef8da2d838d59e06e6abdc4c4839817390 SHA1 f155c053fe3f0ca8d91535ed1cb8f8470bd50c29 SHA256 d74faee22d232b87b2d967e1f3555305d67e5e8f45733489e899dd940b9de39a
-EBUILD totem-pl-parser-2.24.3.ebuild 841 RMD160 cf8b4a3703b27e1d0a45c55ba56f470d05f01baf SHA1 236a4257dba19e895c39cfb003f4d5e6adb19a66 SHA256 37b351eff951c74db0d6fb66340644c0c173d10066b39156196eadc620b71088
+DIST totem-pl-parser-2.26.2.tar.bz2 634274 RMD160 f328f0fa8def9993378362072c8828b7cadca0c2 SHA1 18becb89d674b5025dcf7cf35935a7c8d6330283 SHA256 3a6dd0382fe074f23a747b08423fccb23fb38c25b1feddacbd4875d8b8c83743
 EBUILD totem-pl-parser-2.24.4.ebuild 859 RMD160 2f58edd2484d610d4684f10b9539f320d1894444 SHA1 cd3ee35abb59cf6012f16ab8992cd6c0349f6d33 SHA256 e231ca0ae34ba49dfb649d85399757a37e4fdadfcfcd070edfb798cc2dedfcfa
 EBUILD totem-pl-parser-2.26.1.ebuild 1367 RMD160 3388d049bbba8ad9cd69118481ec3afd69311758 SHA1 37e9dfc235330ddd3a474d7d5028bc6badc2dc41 SHA256 7b347b72def38ecf43bafbaf791a4d0292723284569a8f80832cf832c43bfee7
-MISC ChangeLog 4504 RMD160 5778ce3b3846f6724f5116ce25e5bbcfc49680fa SHA1 856e375389b9f138f5c142ab7f4ff4e4145f8b46 SHA256 9e7900f193a7188c7a3f6beecc0ef90387a35f2c0295c94e93a09d93bc5f0089
+EBUILD totem-pl-parser-2.26.2.ebuild 1348 RMD160 7ca8dd8fd042182c0d0a560379f527aeec338433 SHA1 308182c472cac29ae55e4a8e1e8294a75c0695c3 SHA256 e06f3ebfda98c4d2856699cada7313f326e2e9288bbbd8250f1251be6a1541a8
+MISC ChangeLog 4806 RMD160 7f9649b201d117747a3a935f05a09ea92904dd8d SHA1 1195151f01e951f8914319489f4543aa89359e96 SHA256 04f2b4433a417b9eb0d85fc437cee2b8fe5221a8580b368fb88644a5ad6b41a6
 MISC metadata.xml 206 RMD160 61d950942f566dfc272d4f115fa2fb390fbbe301 SHA1 3f059bf106cd99ac3eb9aab89e0708f5fa86ddf9 SHA256 91b15066df76a399233847c54c04eca1d95ab2b73fdef41207dfeb17dbb38193
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoOvfwACgkQ1fmVwcYIWAZ+7ACgxfPB8L4FlPV/YslSXzGUIsXa
+61YAoKyfMjOoHWr4gAldiJic8RNEPcLk
+=BbWs
+-----END PGP SIGNATURE-----
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
+}