Raise glib and gtk-doc-am dependencies. Add missing preserve_old_lib calls. Remove deprecated src_prepare code. Explicit dependency on gmime 2.4 slot. Add introspection USE flag to avoid automagic activation.

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

3 files changed, 36 insertions, 28 deletions

diff --git a/dev-libs/totem-pl-parser/ChangeLog b/dev-libs/totem-pl-parser/ChangeLog
index 4dba6a90f22f..1587de0d4f51 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/ChangeLog,v 1.61 2010/08/14 16:45:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/ChangeLog,v 1.62 2010/08/15 21:43:15 eva Exp $
+
+  15 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  totem-pl-parser-2.30.1.ebuild:
+  Raise glib and gtk-doc-am dependencies. Add missing preserve_old_lib
+  calls. Remove deprecated src_prepare code. Explicit dependency on gmime
+  2.4 slot. Add introspection USE flag to avoid automagic activation.
 
   14 Aug 2010; Raúl Porcel <armin76@gentoo.org>
   totem-pl-parser-2.28.2.ebuild:
diff --git a/dev-libs/totem-pl-parser/Manifest b/dev-libs/totem-pl-parser/Manifest
index a35cae987b18..99f6e9cc3a88 100644
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@@ -1,3 +1,6 @@
+-----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
 AUX totem-pl-parser-2.26.3-no-libcamel-use-gmime.patch 7445 RMD160 3c2dfb186fa372f73664c61664dd4d2c5215a7bc SHA1 3d23514528095480dc6b46384c6a18b4e645c3f8 SHA256 6c1074ec07ddabf1d14e826d606ae25f5aecc594c70fd408a620942b325e0ed2
 DIST totem-pl-parser-2.26.3.tar.bz2 651400 RMD160 d49b38924fcd5e07a1ecf253e5c748513308cd7b SHA1 f2290f3ef3bc4995af9a92139a39e2178d09daa2 SHA256 27bb5bafe5eb9eaf94539e870aea85a43231c82743f89cb6b1ca6766acfde3f3
@@ -7,6 +10,13 @@ DIST totem-pl-parser-2.30.1.tar.bz2 839807 RMD160 8a09a8b769f09420a12709f58b4eb6
 EBUILD totem-pl-parser-2.26.3-r1.ebuild 1475 RMD160 7bf65e2b7f9adda231c2cf474728d81bcc8cafa8 SHA1 0601640ec1048c42cdafa65aa285f78f36a6c48f SHA256 40b07213fe5428477b4453ec231db546b5d92d6138b0a8111b51813790a3d053
 EBUILD totem-pl-parser-2.28.2.ebuild 1192 RMD160 03fbc3d7bddfeeebf3308f3b1f4b9b2c05059fb7 SHA1 3ed69618c08f50a2adc27b266e4c997b2c293e9c SHA256 92415f72211d39de96c764c7b730bfd1315f5cd2c65b6d5ab8db25432b64ad28
 EBUILD totem-pl-parser-2.28.3.ebuild 1182 RMD160 74314dec08eff79b15c966a9ecc077529142f52a SHA1 443cf44952ade0a08f15a0340945ae70d97c9b28 SHA256 010d86ad01081ca84a27a6264678617a75426c6246314b859fca0dc042609d7a
-EBUILD totem-pl-parser-2.30.1.ebuild 1393 RMD160 57d9552faa3e43bbd3a92768bac07d5cf35a07e2 SHA1 ed2834c1d4bde464d5f01aa29abae958d6c87e8d SHA256 bad0d5717270f5d6a622c1151a6be9304ed7f3d6e0d7ae2d81af319204fff519
-MISC ChangeLog 9333 RMD160 ce468bcb27d4a913c629bd53b94eb52b2441ede9 SHA1 2d4472e83e397f8a91a204c373e0db320b5a2d24 SHA256 1a4ecbfb3c383f098c199770b7e137336580ac59562bd3ae0bdddef974165db8
+EBUILD totem-pl-parser-2.30.1.ebuild 1089 RMD160 c26b3bd39bacce30818a7df52476b4d7b94d0b90 SHA1 c6d1195d352ef05c707be47d33e788f06fb9ee14 SHA256 930820f63941d83228a1ae79a4ebc5597637e03995dd4a1ef681e583c20adf64
+MISC ChangeLog 9632 RMD160 fecdd114df5735fe7b69c11db041e195eb576cf5 SHA1 b179d0a4551ee63c56f89015885186c4e7fd99d6 SHA256 e4c6e2a30d4227e2036ceb46a87a328b3ef914d69a7b6cdb1c6345c6c512de47
 MISC metadata.xml 272 RMD160 94ca2c5330dafece28a4cd39f8c53c0926c72b58 SHA1 0594029445efc117f85d07402cacb33f063a8198 SHA256 d6cd612b3d4d224cec4189a81e42dc98ba6fd96ce241908b57491d78f99e6314
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkxoX3kACgkQ1fmVwcYIWAYpnACg3r1khUWpt1hx02Fxz1B+MGaT
+BIQAoLwn+tLvYfoUpFJOG9oMS1CGPYzl
+=Is/+
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-2.30.1.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-2.30.1.ebuild
index 0af0b854740c..6dd96558ab3f 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-2.30.1.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-2.30.1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2010 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.30.1.ebuild,v 1.4 2010/08/01 11:14:39 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-2.30.1.ebuild,v 1.5 2010/08/15 21:43:15 eva Exp $
 
 EAPI="2"
-
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="Playlist parsing library"
 HOMEPAGE="http://www.gnome.org/projects/totem/"
@@ -15,15 +14,14 @@ LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 # TODO: Re-generate doc ?
-# TODO: Introspection
-IUSE="doc test"
+IUSE="doc introspection test"
 
-RDEPEND=">=dev-libs/glib-2.21.6
-	>=dev-libs/gmime-2.4"
+RDEPEND=">=dev-libs/glib-2.24
+	dev-libs/gmime:2.4"
 DEPEND="${RDEPEND}
 	!<media-video/totem-2.21
 	>=dev-util/intltool-0.35
-	dev-util/gtk-doc-am
+	>=dev-util/gtk-doc-am-1.11
 	doc? ( >=dev-util/gtk-doc-1.11 )"
 
 DOCS="AUTHORS ChangeLog NEWS"
@@ -32,21 +30,15 @@ pkg_setup() {
 	G2CONF="${G2CONF} --disable-static $(use_enable introspection)"
 }
 
-src_prepare() {
-	gnome2_src_prepare
-
-	# FIXME: disable some broken tests, report upstream
-	sed -e 's,^\(.*/parser/resolution.*\)$,/*\1*/,' \
-		-e 's,^\(.*/parser/parsability.*\)$,/*\1*/,' \
-		-e 's,^\(.*/parser/parsing/hadess.*\)$,/*\1*/,' \
-		-i plparse/tests/parser.c || die
-
-	# 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
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	emake check || die "emake check failed"
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/libtotem-plparser-mini.so.12
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/libtotem-plparser-mini.so.12
 }