fix deps and checks

Package-Manager: portage-2.1.4_rc9

3 files changed, 25 insertions, 19 deletions

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index 8849b25adb84..598ef42c7a5f 100644
--- a/app-misc/tracker/ChangeLog
+++ b/app-misc/tracker/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/tracker
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.34 2007/12/12 05:54:35 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.35 2007/12/13 04:57:04 compnerd Exp $
+
+  13 Dec 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+  tracker-0.6.4.ebuild:
+  Restore sqlite dep as the bug is fixed in the 0.6.4 release. Adjust sqlite
+  useflag accordingly. Fix poppler check to be conditional.
 
 *tracker-0.6.4 (12 Dec 2007)
 
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 9da24d6e5835..ae51d9cfb251 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -20,14 +20,14 @@ EBUILD tracker-0.6.3.ebuild 4344 RMD160 1a8da894071200a7fb6bf2c9ad4fb741a8f58449
 MD5 1df5f0c300d5ddfb54923c667fc64d44 tracker-0.6.3.ebuild 4344
 RMD160 1a8da894071200a7fb6bf2c9ad4fb741a8f58449 tracker-0.6.3.ebuild 4344
 SHA256 cd571db0b4bae9cd56b997335de0533b001b3415dc06b9094ddd29a5ceac760b tracker-0.6.3.ebuild 4344
-EBUILD tracker-0.6.4.ebuild 3965 RMD160 1d3bbdd77b375f77dace8a87560432c2723495e7 SHA1 bdaf0326905dad10e7456609bfd88069862734ad SHA256 ac5e55f5c3d0b700487a603209e0b175b4d0f2e020faa016122227dd43ecdbc9
-MD5 8a5ab413b18b546e15c783c38472da4b tracker-0.6.4.ebuild 3965
-RMD160 1d3bbdd77b375f77dace8a87560432c2723495e7 tracker-0.6.4.ebuild 3965
-SHA256 ac5e55f5c3d0b700487a603209e0b175b4d0f2e020faa016122227dd43ecdbc9 tracker-0.6.4.ebuild 3965
-MISC ChangeLog 6468 RMD160 47f58e184bad405d70552ec1ada8b9e6a7554d7b SHA1 0f6174fd6a700c972b8d4e71f8a95c357067fc24 SHA256 b4c9c2b0b1ed0ceae4bcd123eb60a9567b0f6e1fcf83bde5dfeb4a6ef0ce9822
-MD5 1826612a71af377780e90d16f5f0718b ChangeLog 6468
-RMD160 47f58e184bad405d70552ec1ada8b9e6a7554d7b ChangeLog 6468
-SHA256 b4c9c2b0b1ed0ceae4bcd123eb60a9567b0f6e1fcf83bde5dfeb4a6ef0ce9822 ChangeLog 6468
+EBUILD tracker-0.6.4.ebuild 4068 RMD160 4abbf65f977250ee28f59c20af6707e447186beb SHA1 68b0c1f4572722eb04cff4fa927808375b6ff633 SHA256 f58b546b407a7b1cc73d84db54c479a19a338010b0af767dfdd8e56bb5f3c56d
+MD5 af23973334deecdea04bf90f52069bd7 tracker-0.6.4.ebuild 4068
+RMD160 4abbf65f977250ee28f59c20af6707e447186beb tracker-0.6.4.ebuild 4068
+SHA256 f58b546b407a7b1cc73d84db54c479a19a338010b0af767dfdd8e56bb5f3c56d tracker-0.6.4.ebuild 4068
+MISC ChangeLog 6686 RMD160 e9fdb5a1a9003614ea1d2951154040130dc2a3c0 SHA1 1725758eaf8a07ad91f362e0f7204a168b8f0629 SHA256 639598a10307828a155b36f15a591f4c56360fd879ed894ac175925a9bc79d75
+MD5 7568715988beb69f47c2062e821794e9 ChangeLog 6686
+RMD160 e9fdb5a1a9003614ea1d2951154040130dc2a3c0 ChangeLog 6686
+SHA256 639598a10307828a155b36f15a591f4c56360fd879ed894ac175925a9bc79d75 ChangeLog 6686
 MISC metadata.xml 311 RMD160 868d0eab62db916aa47b7f440a3f4efecc6163b1 SHA1 0e56da7be32af7c553c07179c574cd7837298702 SHA256 774cc71e08a317563fb2700d5aac76af10e3e31ae7c1c58325730bfa0fbb110a
 MD5 def57195a8a8fbc9ff84bded4f4c6772 metadata.xml 311
 RMD160 868d0eab62db916aa47b7f440a3f4efecc6163b1 metadata.xml 311
diff --git a/app-misc/tracker/tracker-0.6.4.ebuild b/app-misc/tracker/tracker-0.6.4.ebuild
index 816d1b128927..525d0ddfc81f 100644
--- a/app-misc/tracker/tracker-0.6.4.ebuild
+++ b/app-misc/tracker/tracker-0.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.6.4.ebuild,v 1.1 2007/12/12 05:54:35 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.6.4.ebuild,v 1.2 2007/12/13 04:57:04 compnerd Exp $
 
 inherit autotools eutils flag-o-matic linux-info
 
@@ -18,13 +18,13 @@ RDEPEND=">=dev-libs/glib-2.12.0
 		 >=dev-libs/gmime-2.1.0
 		 >=media-gfx/imagemagick-5.2.1
 		 >=dev-libs/dbus-glib-0.71
-		  =dev-db/sqlite-3.4*
+		 >=dev-db/sqlite-3.4
 		 >=media-libs/libpng-1.2
 		 >=dev-libs/libxml2-2.6
 		 >=dev-db/qdbm-1.8
 		   sys-libs/zlib
 		 applet? ( >=x11-libs/libnotify-0.4.3 )
-		 deskbar? ( gnome-extra/deskbar-applet )
+		 deskbar? ( >=gnome-extra/deskbar-applet-2.16 )
 		 gnome? (
 					>=x11-libs/gtk+-2.8
 					>=gnome-base/libglade-2.5
@@ -68,14 +68,10 @@ function inotify_enabled() {
 pkg_setup() {
 	linux-info_pkg_setup
 
-	if built_with_use 'dev-db/sqlite' 'nothreadsafe' ; then
+	if built_with_use --missing false 'dev-db/sqlite' 'nothreadsafe' ||
+		! built_with_use --missing true 'dev-db/sqlite' 'threadsafe' ; then
 		eerror "You must build sqlite with threading support"
-		die "dev-db/sqlite built with nothreadsafe"
-	fi
-
-	if ! built_with_use 'app-text/poppler-bindings' 'gtk' ; then
-		ewarn "You must build poppler-bindings with gtk to get support for PDFs"
-		die "poppler-bindings needs gtk support"
+		die "dev-db/sqlite built without thread safety"
 	fi
 
 	if ! built_with_use 'media-gfx/imagemagick' 'png' ; then
@@ -83,6 +79,11 @@ pkg_setup() {
 		die "imagemagick needs png support"
 	fi
 
+	if use pdf && ! built_with_use 'app-text/poppler-bindings' 'gtk' ; then
+		ewarn "You must build poppler-bindings with gtk to get support for PDFs"
+		die "poppler-bindings needs gtk support"
+	fi
+
 	if use jpeg && ! built_with_use 'media-gfx/imagemagick' 'jpeg' ; then
 		ewarn "You must build imagemagick with jpeg to get support for JPEG"
 		die "imagemagick needs jpeg support"