Add missing odt2txt dependency, per bug #325435.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

6 files changed, 28 insertions, 18 deletions

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index cc744d8890b6..2ea6cf4ec6af 100644
--- a/app-misc/tracker/ChangeLog
+++ b/app-misc/tracker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/tracker
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.83 2010/11/08 22:17:30 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.84 2010/11/14 16:17:32 eva Exp $
+
+  14 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org> tracker-0.8.17.ebuild,
+  tracker-0.9.27.ebuild, tracker-9999.ebuild, metadata.xml:
+  Add missing odt2txt dependency, per bug #325435.
 
   08 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org> tracker-0.8.17.ebuild,
   tracker-0.9.27.ebuild, tracker-9999.ebuild:
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 0b6c8d56c50e..2b79740ad6fc 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -5,15 +5,15 @@ AUX tracker-0.8.0-strigi.patch 1385 RMD160 69d07b6145de6919cc1550e4722737cf5b960
 AUX tracker-0.8.17-build-with-eds232.patch 807 RMD160 7f681d67da66c66c82171557462e74e095d5f1b5 SHA1 cb56616bd34a0a81a8df6117c2901e6f5d834a0d SHA256 bced568783664b0128903094db05a1f881519754d6fa1588f1050620fb73f989
 DIST tracker-0.8.17.tar.bz2 4959334 RMD160 b33abe9ab955e5e392258657ad3a664ff5cb4cc6 SHA1 460f3d56bd0ed24c5d064a398829f4289a6b081f SHA256 56cf09f41fec1afaf7199e0728f4339b567a7893a51fc2affc5069fa26e2e9d8
 DIST tracker-0.9.27.tar.bz2 7113424 RMD160 b4fb5d4b40150e0941a1eb825cc0c4239fbc2448 SHA1 46e9ec6edfc0c6741baac97c2c22b678ed2d6f47 SHA256 ff1c6377c12c5ac3659bde3becf5211b3a51d8a0596ead266a97458580041b53
-EBUILD tracker-0.8.17.ebuild 5579 RMD160 1426c84015dbca9cc04922c40761c06797a18cda SHA1 d2e426ee74e105a4a01335fd7b9b30ace9c6a94c SHA256 8def2fea15184c64c91bd27fd430f58f8fd6c96e765dea5d3c57ae6667f9724f
-EBUILD tracker-0.9.27.ebuild 6438 RMD160 f61a27f779b0ff26495e2385ff9faaa70add818c SHA1 064c483e4d66723ce7d61656e5d3b68dffa14262 SHA256 85196bbdafe04a3adb482f3f805c30369ae10da37792412ec19b5d397196d4db
-EBUILD tracker-9999.ebuild 5609 RMD160 ad93ae6beb44611cfc221467c73666f058a22ee9 SHA1 29ea3d7bc7b98c19b42bc55aa476fc6a918e7038 SHA256 c376f0be6d2556bcaba162a670eba997a75c555f8bbc0755576d89cdeb3f1267
-MISC ChangeLog 14672 RMD160 0548a9b27f65f5d04e4e5f48b7e4a8257f5b1859 SHA1 3f6ac6dbe9d9366500e55b493d9c4655829397ef SHA256 e2ef142b76755dc945796ea7d82cc071ab9d446f7931d3c1ad1fab78b4d2b80f
-MISC metadata.xml 897 RMD160 fcd2f916787a66dadcdb10e49519a4be7193e0a2 SHA1 1cba5de7ae05d781e49207d3230201e22428433d SHA256 274e68f21d92f3b200e359019d79846967dc2b134e10da824f4091500c57ac3b
+EBUILD tracker-0.8.17.ebuild 5568 RMD160 bbadf105f168ee101a730c71f46afbafb1a492fd SHA1 b3fa73a466acb2e8d1eb5bfe285405144af44490 SHA256 f22d25db6ea38320ac27814e14a93f573dad3747a0c10c0a07362b0f89a771f8
+EBUILD tracker-0.9.27.ebuild 6459 RMD160 03ee4b331dd3a4e2324b04425b1b7c2ab5dbce37 SHA1 c4ca6152ebca82e732addad16c11fe8d7b50b90b SHA256 fdee961f3d94d672e54a002056b89c63f941fa91d44a64aa736c3a4e11f9664c
+EBUILD tracker-9999.ebuild 5630 RMD160 332930aa75b9b66031220204de21b1f30397b33b SHA1 c4480ebc3cad844d7bb094e62f051d89b4bad0d6 SHA256 80ddc9b37c17211d1909ec3706f8516403f9aa2226094514e1d536ad1b2a376e
+MISC ChangeLog 14861 RMD160 a5260ce3600cf9e8159a6bd28346e41e7bf6e823 SHA1 ce13148684695e522b0d519d6944fefdd93908d1 SHA256 6d27e2e76899fc93ead1b7d6388ae7843368c78ad733b77d771bfc8d7700455a
+MISC metadata.xml 909 RMD160 47100344948079430541942d3841bc4cde102800 SHA1 4fb4e473e4cdf507733555623f28af9121f2d9b7 SHA256 b3bc2efef244353c50faf03ca2fa944698bac1b6a6d023a484e46eb5c3ce02a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzYhRkACgkQ1fmVwcYIWAYI2QCfaL43LgC5Eizp6YkQd/9Ab064
-A+oAnjF8ufg7Y2XDQ+MU84inWC1ehKvB
-=/Baw
+iEYEARECAAYFAkzgC6YACgkQ1fmVwcYIWAaCWQCfSXLMWa/fT++l/ZumpZ7dQZ8f
+H3AAoMpZJ9BTQT9OwV4e782s8OjxarVW
+=Bbgn
 -----END PGP SIGNATURE-----
diff --git a/app-misc/tracker/metadata.xml b/app-misc/tracker/metadata.xml
index e7bd2e8f727f..531da1dc466c 100644
--- a/app-misc/tracker/metadata.xml
+++ b/app-misc/tracker/metadata.xml
@@ -4,8 +4,8 @@
 <herd>freedesktop</herd>
 <use>
   <flag name='applet'>Build tracker monitor applet</flag>
-  <flag name='gsf'>Enable <pkg>gnome-extra/libgsf</pkg> based data extractor
-  </flag>
+  <flag name='gsf'>Enable <pkg>gnome-extra/libgsf</pkg> based data extractor and
+  for ODT.</flag>
   <flag name="iptc">Enable extraction of IPTC data from pictures</flag>
   <flag name="kmail">Build kmail data miner</flag>
   <flag name="laptop">Make tracker power management aware</flag>
diff --git a/app-misc/tracker/tracker-0.8.17.ebuild b/app-misc/tracker/tracker-0.8.17.ebuild
index 2c6fa204741a..55d87ee26b99 100644
--- a/app-misc/tracker/tracker-0.8.17.ebuild
+++ b/app-misc/tracker/tracker-0.8.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.8.17.ebuild,v 1.4 2010/11/08 22:17:30 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.8.17.ebuild,v 1.5 2010/11/14 16:17:32 eva Exp $
 
 EAPI="2"
 G2CONF_DEBUG="no"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.tracker-project.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~x86"
 # USE="doc" is managed by eclass.
 IUSE="applet doc eds exif flac gnome-keyring gsf gstreamer gtk hal iptc +jpeg kmail laptop mp3 nautilus pdf playlist rss strigi test +tiff +vorbis xine +xml xmp"
 
@@ -40,7 +40,9 @@ RDEPEND="
 	exif? ( >=media-libs/libexif-0.6 )
 	flac? ( >=media-libs/flac-1.2.1 )
 	gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 )
-	gsf? ( >=gnome-extra/libgsf-1.13 )
+	gsf? (
+		app-text/odt2txt
+		>=gnome-extra/libgsf-1.13 )
 	gstreamer? ( >=media-libs/gstreamer-0.10.12 )
 	!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
 	gtk? (
diff --git a/app-misc/tracker/tracker-0.9.27.ebuild b/app-misc/tracker/tracker-0.9.27.ebuild
index 8857fb6aeab9..d973415111fd 100644
--- a/app-misc/tracker/tracker-0.9.27.ebuild
+++ b/app-misc/tracker/tracker-0.9.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.9.27.ebuild,v 1.2 2010/11/08 22:17:30 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.9.27.ebuild,v 1.3 2010/11/14 16:17:32 eva Exp $
 
 EAPI="2"
 G2CONF_DEBUG="no"
@@ -44,7 +44,9 @@ RDEPEND="
 	flac? ( >=media-libs/flac-1.2.1 )
 	gif? ( media-libs/giflib )
 	gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 )
-	gsf? ( >=gnome-extra/libgsf-1.13 )
+	gsf? (
+		app-text/odt2txt
+		>=gnome-extra/libgsf-1.13 )
 	upnp? ( >=media-libs/gupnp-dlna-0.3 )
 	!upnp? (
 		gstreamer? ( >=media-libs/gstreamer-0.10.12 )
diff --git a/app-misc/tracker/tracker-9999.ebuild b/app-misc/tracker/tracker-9999.ebuild
index f4433e457492..cb8ea072bf70 100644
--- a/app-misc/tracker/tracker-9999.ebuild
+++ b/app-misc/tracker/tracker-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.26 2010/11/08 22:17:30 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.27 2010/11/14 16:17:32 eva Exp $
 
 EAPI="2"
 G2CONF_DEBUG="no"
@@ -43,7 +43,9 @@ RDEPEND="
 	flac? ( >=media-libs/flac-1.2.1 )
 	gif? ( media-libs/giflib )
 	gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 )
-	gsf? ( >=gnome-extra/libgsf-1.13 )
+	gsf? (
+		app-text/odt2txt
+		>=gnome-extra/libgsf-1.13 )
 	upnp? ( >=media-libs/gupnp-dlna-0.3 )
 	!upnp? (
 		gstreamer? ( >=media-libs/gstreamer-0.10.12 )