version bump

(Portage version: 2.1.2_rc4-r7)

13 files changed, 710 insertions, 3 deletions

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index d2befe688382..16dc914d57ef 100644
--- a/app-misc/tracker/ChangeLog
+++ b/app-misc/tracker/ChangeLog
@@ -1,10 +1,26 @@
 # ChangeLog for app-misc/tracker
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.1 2006/11/21 17:48:20 compnerd Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.2 2007/01/11 02:18:51 compnerd Exp $
+
+*tracker-0.5.3 (11 Jan 2007)
+
+  11 Jan 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/tracker-0.5.3-convert-pdf-thumbnailer.patch,
+  +files/tracker-0.5.3-delete-services-missing.patch,
+  +files/tracker-0.5.3-disable-debug.patch,
+  +files/tracker-0.5.3-disable-tests.patch,
+  +files/tracker-0.5.3-imagemagick-5.2.1-needed.patch,
+  +files/tracker-0.5.3-remove-mysql.patch,
+  +files/tracker-0.5.3-requires-libpng.patch,
+  +files/tracker-0.5.3-sqlite-cleanups.patch,
+  +files/tracker-0.5.3-thumbnailer-create-dir.patch,
+  +files/tracker-0.5.3-trackerd-test-compile-fix.patch,
+  +tracker-0.5.3.ebuild:
+  Version bump from upstream, with patches from myself
 
 *tracker-0.5.2 (21 Nov 2006)
 
-  21 Nov 2006; <compnerd@gentoo.org>
+  21 Nov 2006; Saleem Abdulrasool <compnerd@gentoo.org>
   +files/tracker-0.5.2-configure.in.patch, +tracker-0.5.2.ebuild:
   Initial import, patch and ebuild by Saleem Abdulrasool <compnerd@gentoo.org>
 
diff --git a/app-misc/tracker/files/digest-tracker-0.5.3 b/app-misc/tracker/files/digest-tracker-0.5.3
new file mode 100644
index 000000000000..7269800b174e
--- /dev/null
+++ b/app-misc/tracker/files/digest-tracker-0.5.3
@@ -0,0 +1,3 @@
+MD5 96efc55774cf9dc2850096b8dc8af121 tracker-0.5.3.tar.gz 1345485
+RMD160 b9700bc590c1d20c0c58e2016693b688b10221df tracker-0.5.3.tar.gz 1345485
+SHA256 37f64b160b4ce4c4668494cf8198d6ad5a559c8b11120bb657a8eb132493f88f tracker-0.5.3.tar.gz 1345485
diff --git a/app-misc/tracker/files/tracker-0.5.3-convert-pdf-thumbnailer.patch b/app-misc/tracker/files/tracker-0.5.3-convert-pdf-thumbnailer.patch
new file mode 100644
index 000000000000..6525213a671c
--- /dev/null
+++ b/app-misc/tracker/files/tracker-0.5.3-convert-pdf-thumbnailer.patch
@@ -0,0 +1,10 @@
+Index: thumbnailers/application/pdf_thumbnailer
+===================================================================
+--- thumbnailers/application/pdf_thumbnailer	(revision 375)
++++ thumbnailers/application/pdf_thumbnailer	(working copy)
+@@ -1,4 +1,3 @@
+ #!/bin/sh
+ 
+-nice -n19  evince-thumbnailer  -s $3 "$1" $2
+-
++nice -n19 convert "pdf:$1[0]" -scale $3x$3 "png:$2"
diff --git a/app-misc/tracker/files/tracker-0.5.3-delete-services-missing.patch b/app-misc/tracker/files/tracker-0.5.3-delete-services-missing.patch
new file mode 100644
index 000000000000..26f58f8868d7
--- /dev/null
+++ b/app-misc/tracker/files/tracker-0.5.3-delete-services-missing.patch
@@ -0,0 +1,26 @@
+--- src/trackerd/tracker-db-sqlite.c	2006-12-23 19:16:57.000000000 -0600
++++ src/trackerd/tracker-db-sqlite.c	2007-01-09 14:44:55.000000000 -0600
+@@ -725,9 +725,14 @@ tracker_db_connect_cache (void)
+ 
+ 	if (create_table) {
+ 		tracker_db_exec_no_reply (db_con, "CREATE TABLE Words (WordID Integer primary key AUTOINCREMENT not null, Word Text, WordCount int)");
++		tracker_db_exec_no_reply (db_con, "CREATE TABLE Services (ID Integer primary key AUTOINCREMENT not null, ServiceTypeID Integer default 0, SubType Integer default 0, Path Text not null, Name Text, Mime Text, Size Integer, Enabled Integer default 1, IsDirectory Integer default 0, IsWatchedDirectory Integer default 0, IsLink Integer default 0, IsVfs Integer default 0, AuxilaryID Integer default -1, IndexTime Integer, Offset Integer, unique (Path, Name))");
+ 		tracker_db_exec_no_reply (db_con, "CREATE TABLE ServiceWords (WordID Int, ServiceID int, ServiceType int, score int, primary key (WordID, ServiceID))");
+ 		tracker_db_exec_no_reply (db_con, "CREATE INDEX  WordWord ON Words (Word)");
+ 		tracker_db_exec_no_reply (db_con, "CREATE INDEX  WordWordCount ON Words (WordCount)");
++		tracker_db_exec_no_reply (db_con, "CREATE INDEX  ServiceIndex1 ON Services (ServiceTypeID)");
++		tracker_db_exec_no_reply (db_con, "CREATE INDEX  ServiceIndex2 ON Services (AuxilaryID)");
++		tracker_db_exec_no_reply (db_con, "CREATE INDEX  ServiceIndex3 ON Services (Mime)");
++		tracker_db_exec_no_reply (db_con, "CREATE INDEX  ServiceIndex4 ON Services (Size)");
+ 		tracker_db_exec_no_reply (db_con, "CREATE INDEX  ServiceWordID ON ServiceWords (ServiceID)");
+ 	}
+ 
+@@ -2761,7 +2766,7 @@ tracker_db_delete_directory (DBConnectio
+ 	}
+ 
+ 	if (db_con->user_data) {
+-		tracker_exec_proc (db_con->user_data, "DeleteDirectory9", 1, uri, uri_prefix);
++		tracker_exec_proc (db_con->user_data, "DeleteDirectory9", 2, uri, uri_prefix);
+ 		tracker_exec_proc (db_con->user_data, "DeleteFile10", 1, str_file_id);
+ 	}
+ 
diff --git a/app-misc/tracker/files/tracker-0.5.3-disable-debug.patch b/app-misc/tracker/files/tracker-0.5.3-disable-debug.patch
new file mode 100644
index 000000000000..a4c826803209
--- /dev/null
+++ b/app-misc/tracker/files/tracker-0.5.3-disable-debug.patch
@@ -0,0 +1,18 @@
+Index: configure.in
+===================================================================
+--- configure.in	(revision 373)
++++ configure.in	(working copy)
+@@ -89,10 +89,9 @@
+ ####################################################################
+ 
+ 
+-AC_ARG_ENABLE(debug_code, 
+-	AC_HELP_STRING(
+-		[--enable-debug-code],
+-		[build with debug symbols]),[enable_debug_code=yes],[enable_debug_code=no])
++AC_ARG_ENABLE([debug_code],
++              AC_HELP_STRING([--enable-debug-code], [build with debug symbols]),,
++              [enable_debug_code=yes])
+ 
+ if test "x$enable_debug_code" = "xyes"; then
+ 	CFLAGS="-g $CFLAGS"
diff --git a/app-misc/tracker/files/tracker-0.5.3-disable-tests.patch b/app-misc/tracker/files/tracker-0.5.3-disable-tests.patch
new file mode 100644
index 000000000000..0ac31b24950b
--- /dev/null
+++ b/app-misc/tracker/files/tracker-0.5.3-disable-tests.patch
@@ -0,0 +1,25 @@
+Index: configure.in
+===================================================================
+--- configure.in	(revision 373)
++++ configure.in	(working copy)
+@@ -214,13 +213,13 @@
+ 	AM_CONDITIONAL(USING_GSTREAMER, false)
+ fi
+ 
+-AM_CONDITIONAL(BUILD_TEST, false)
+-AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test],[build test suite]),
+-			 [
+-				AM_CONDITIONAL(BUILD_TEST, true)
+-				AC_DEFINE(BUILD_TEST, [], [Define if we are building test stuff])
+-			 ]
+-	 	)
++###################################################################
++# Tests
++###################################################################
++AC_ARG_ENABLE([test],
++              AC_HELP_STRING([--enable-test], [build test suite]),,
++              [enable_test=false])
++AM_CONDITIONAL(BUILD_TEST, test "x$enable_test" != "xfalse")
+ 
+ ####################################################################
+ # Optional database/indexer component checks
diff --git a/app-misc/tracker/files/tracker-0.5.3-imagemagick-5.2.1-needed.patch b/app-misc/tracker/files/tracker-0.5.3-imagemagick-5.2.1-needed.patch
new file mode 100644
index 000000000000..e668f4557082
--- /dev/null
+++ b/app-misc/tracker/files/tracker-0.5.3-imagemagick-5.2.1-needed.patch
@@ -0,0 +1,31 @@
+--- tracker-0.5.3/configure.in	2006-12-23 19:43:06.000000000 -0600
++++ tracker-0.5.3/configure.in	2007-01-09 22:03:01.000000000 -0600
+@@ -67,6 +67,28 @@
+ AC_SUBST(LIBPNG_CFLAGS)
+ AC_SUBST(LIBPNG_LIBS)
+ 
++# Check for ImageMagick (needed for the image thumbnailers)
++AC_CHECK_PROG([MAGICK_CONFIG], [Magick-config], [Magick-config], "")
++
++if test "x$MAGICK_CONFIG" = "x$MAGICK_CONFIG" ; then
++   AC_MSG_CHECKING([imagemagick >= 5.2.1])
++
++   MAGICK_VERSION=`Magick-config --version`
++   case $MAGICK_VERSION in
++      [[01234]] | [[01234]].* | 5.[[01]]* | 5.2.0* )
++         AC_MSG_RESULT(no($MAGICK_VERSION))
++         AC_MSG_ERROR([*** Version 5.2.1 or higher is required.])
++      ;;
++      *)
++         AC_MSG_RESULT(yes($MAGICK_VERSION))
++      ;;
++   esac
++else
++   AC_MSG_CHECKING([imagemagick >= 5.2.1])
++   AC_MSG_RESULT([no])
++   AC_MSG_ERROR([*** ImageMagick Version 5.2.1 or higher is required.])
++fi
++
+ ####################################################################
+ # Compiler warning checks
+ ####################################################################
diff --git a/app-misc/tracker/files/tracker-0.5.3-remove-mysql.patch b/app-misc/tracker/files/tracker-0.5.3-remove-mysql.patch
new file mode 100644
index 000000000000..f6a22a33294c
--- /dev/null
+++ b/app-misc/tracker/files/tracker-0.5.3-remove-mysql.patch
@@ -0,0 +1,87 @@
+diff -burN tracker-0.5.3/data/Makefile.am tracker-0.5.3-clean/data/Makefile.am
+--- tracker-0.5.3/data/Makefile.am	2006-11-29 18:55:12.000000000 -0600
++++ tracker-0.5.3/data/Makefile.am	2007-01-09 23:47:04.000000000 -0600
+@@ -3,11 +3,8 @@
+ configdir = $(datadir)/tracker
+ 
+ config_DATA =   tracker-introspect.xml \
+-		mysql-tracker.sql \
+ 		sqlite-tracker.sql \
+-		mysql-stored-procs.sql \
+-		sqlite-stored-procs.sql \
+-		mysql-system.sql
++		sqlite-stored-procs.sql
+ 
+ servicedir       = $(prefix)/share/dbus-1/services
+ service_in_files = tracker.service.in
+diff -burN tracker-0.5.3/src/trackerd/Makefile.am tracker-0.5.3-clean/src/trackerd/Makefile.am
+--- tracker-0.5.3/src/trackerd/Makefile.am	2006-12-05 17:28:34.000000000 -0600
++++ tracker-0.5.3/src/trackerd/Makefile.am	2007-01-09 23:48:52.000000000 -0600
+@@ -139,7 +139,6 @@
+ trackerd_LDADD = $(GLIB2_LIBS) 	\
+ 		 $(FAM_LIBS)	\
+ 		 $(DBUS_LIBS)	\
+-		 $(MYSQL_LIBS)	\
+ 		 $(PANGO_LIBS)	\
+ 		 $(GMIME_LIBS)	\
+ 		 $(additional_libs) \
+diff -burN tracker-0.5.3/src/trackerd/tracker-db.h tracker-0.5.3-clean/src/trackerd/tracker-db.h
+--- tracker-0.5.3/src/trackerd/tracker-db.h	2006-12-23 17:26:08.000000000 -0600
++++ tracker-0.5.3/src/trackerd/tracker-db.h	2007-01-09 23:48:39.000000000 -0600
+@@ -31,8 +31,6 @@
+ 
+ #ifdef USING_SQLITE
+ #include "tracker-db-sqlite.h"
+-#else
+-#include "tracker-db-mysql.h"
+ #endif
+ 
+ gboolean	tracker_db_is_file_up_to_date 	(DBConnection *db_con, const char *uri, guint32 *id);
+diff -burN tracker-0.5.3/src/trackerd/tracker-mbox-evolution.h tracker-0.5.3-clean/src/trackerd/tracker-mbox-evolution.h
+--- tracker-0.5.3/src/trackerd/tracker-mbox-evolution.h	2006-12-23 17:26:07.000000000 -0600
++++ tracker-0.5.3/src/trackerd/tracker-mbox-evolution.h	2007-01-09 23:48:16.000000000 -0600
+@@ -32,8 +32,6 @@
+ 
+ #ifdef USING_SQLITE
+ #   include "tracker-db-sqlite.h"
+-#else
+-#   include "tracker-db-mysql.h"
+ #endif
+ 
+ 
+diff -burN tracker-0.5.3/src/trackerd/tracker-mbox.h tracker-0.5.3-clean/src/trackerd/tracker-mbox.h
+--- tracker-0.5.3/src/trackerd/tracker-mbox.h	2006-12-23 17:26:07.000000000 -0600
++++ tracker-0.5.3/src/trackerd/tracker-mbox.h	2007-01-09 23:49:11.000000000 -0600
+@@ -32,8 +32,6 @@
+ 
+ #ifdef USING_SQLITE
+ #   include "tracker-db-sqlite.h"
+-#else
+-#   include "tracker-db-mysql.h"
+ #endif
+ 
+ 
+diff -burN tracker-0.5.3/src/trackerd/tracker-mbox-kmail.h tracker-0.5.3-clean/src/trackerd/tracker-mbox-kmail.h
+--- tracker-0.5.3/src/trackerd/tracker-mbox-kmail.h	2006-12-23 17:26:07.000000000 -0600
++++ tracker-0.5.3/src/trackerd/tracker-mbox-kmail.h	2007-01-09 23:48:02.000000000 -0600
+@@ -31,8 +31,6 @@
+ 
+ #ifdef USING_SQLITE
+ #   include "tracker-db-sqlite.h"
+-#else
+-#   include "tracker-db-mysql.h"
+ #endif
+ 
+ 
+diff -burN tracker-0.5.3/src/trackerd/tracker-mbox-thunderbird.h tracker-0.5.3-clean/src/trackerd/tracker-mbox-thunderbird.h
+--- tracker-0.5.3/src/trackerd/tracker-mbox-thunderbird.h	2006-12-23 17:26:07.000000000 -0600
++++ tracker-0.5.3/src/trackerd/tracker-mbox-thunderbird.h	2007-01-09 23:49:24.000000000 -0600
+@@ -32,8 +32,6 @@
+ 
+ #ifdef USING_SQLITE
+ #   include "tracker-db-sqlite.h"
+-#else
+-#   include "tracker-db-mysql.h"
+ #endif
+ 
+ 
diff --git a/app-misc/tracker/files/tracker-0.5.3-requires-libpng.patch b/app-misc/tracker/files/tracker-0.5.3-requires-libpng.patch
new file mode 100644
index 000000000000..ea9868117db0
--- /dev/null
+++ b/app-misc/tracker/files/tracker-0.5.3-requires-libpng.patch
@@ -0,0 +1,125 @@
+Index: configure.in
+===================================================================
+--- configure.in	(revision 373)
++++ configure.in	(working copy)
+@@ -63,7 +63,7 @@
+ AC_SUBST(DBUS_LIBS)
+ 
+ # Check for libpng 1.2 or higher
+-PKG_CHECK_MODULES(LIBPNG, [libpng >= 1.2])
++PKG_CHECK_MODULES(LIBPNG, [ libpng >= 1.2 ])
+ AC_SUBST(LIBPNG_CFLAGS)
+ AC_SUBST(LIBPNG_LIBS)
+ 
+@@ -435,28 +434,7 @@
+ AM_CONDITIONAL(HAVE_POPPLER_GLIB, test "$have_poppler" = "yes")
+ test "$have_poppler" = "yes" && AC_DEFINE(HAVE_POPPLER, [], [Define if we have poppler])
+ 
+-
+ ##################################################################
+-# check for libpng
+-##################################################################
+-
+-LIBPNG_REQUIRED=1.2
+-
+-AC_ARG_ENABLE(png, AC_HELP_STRING([--disable-png],[Disable PNG data extractor]),,[enable_png=yes])
+-if test "x$enable_png" = "xyes"; then
+-	PKG_CHECK_MODULES(LIBPNG, [
+-		libpng >= $LIBPNG_REQUIRED],
+-		[have_libpng=yes] , [have_libpng=no])
+-	AC_SUBST(LIBPNG_CFLAGS)
+-	AC_SUBST(LIBPNG_LIBS)
+-else
+-	have_libpng="no (disabled)"
+-fi
+-AM_CONDITIONAL(HAVE_LIBPNG, test "$have_libpng" = "yes")
+-test "$have_libpng" = "yes" && AC_DEFINE(HAVE_LIBPNG, [], [Define if we have libpng])
+-
+-
+-##################################################################
+ # check for libexif
+ ##################################################################
+ 
+@@ -562,7 +540,7 @@
+ Metadata extractors:
+ 
+ 	pdf:					$have_poppler
+-	png:					$have_libpng
++	png:					yes
+ 	exif (jpeg):				$have_libexif
+ 	gsf:					$have_libgsf
+ 	video files:				$videos_are_handled ($videos_handler)
+Index: src/tracker-extract/tracker-extract.c
+===================================================================
+--- src/tracker-extract/tracker-extract.c	(revision 373)
++++ src/tracker-extract/tracker-extract.c	(working copy)
+@@ -61,9 +61,7 @@
+ #ifdef HAVE_VORBIS
+ void tracker_extract_vorbis	(gchar *, GHashTable *);
+ #endif
+-#ifdef HAVE_LIBPNG
+ void tracker_extract_png	(gchar *, GHashTable *);
+-#endif
+ #ifdef HAVE_LIBEXIF
+ void tracker_extract_exif	(gchar *, GHashTable *);
+ #endif
+@@ -123,9 +121,7 @@
+ #endif
+   
+      /* Image extractors */
+-#ifdef HAVE_LIBPNG
+ 	{ "image/png",					tracker_extract_png		},
+-#endif
+ #ifdef HAVE_LIBEXIF
+ 	{ "image/jpeg",					tracker_extract_exif		},
+ #endif
+Index: src/tracker-extract/tracker-extract-png.c
+===================================================================
+--- src/tracker-extract/tracker-extract-png.c	(revision 373)
++++ src/tracker-extract/tracker-extract-png.c	(working copy)
+@@ -20,8 +20,6 @@
+ 
+ #include "config.h"
+ 
+-#ifdef HAVE_LIBPNG
+-
+ #include <stdio.h>
+ #include <glib.h>
+ #include <png.h>
+@@ -32,13 +30,13 @@
+ } tagmap[] = {
+ 	{ "Author" , "Image:Creator"},
+ 	{ "Creator" , "Image:Creator"},
+-   	{ "Description" , "Image:Description"},
+-   	{ "Comment", "Image:Comments"},
+-   	{ "Copyright", "File:Copyright"},
+-   	{ "Creation Time", "Image:Date"},
+-   	{ "Title", "Image:Title"},
+-   	{ "Software", "Image:Software"},
+-   	{ "Disclaimer", "File:License"},
++	{ "Description" , "Image:Description"},
++	{ "Comment", "Image:Comments"},
++	{ "Copyright", "File:Copyright"},
++	{ "Creation Time", "Image:Date"},
++	{ "Title", "Image:Title"},
++	{ "Software", "Image:Software"},
++	{ "Disclaimer", "File:License"},
+ 	{ NULL, NULL},
+ };
+ 
+@@ -93,14 +91,10 @@
+ 					}
+ 				}
+ 			}
+-  		}
++		}
+ 
+ 		png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
+ 		
+ 		fclose (png);
+ 	}
+ }
+-
+-#else
+-#warning "Not building PNG metadata extractor."
+-#endif  /* HAVE_LIBPNG */
diff --git a/app-misc/tracker/files/tracker-0.5.3-sqlite-cleanups.patch b/app-misc/tracker/files/tracker-0.5.3-sqlite-cleanups.patch
new file mode 100644
index 000000000000..efc8796e96b6
--- /dev/null
+++ b/app-misc/tracker/files/tracker-0.5.3-sqlite-cleanups.patch
@@ -0,0 +1,134 @@
+diff -burN tracker-0.5.3.no-mysql/configure.in tracker-0.5.3/configure.in
+--- tracker-0.5.3.no-mysql/configure.in	2007-01-09 23:56:45.000000000 -0600
++++ tracker-0.5.3/configure.in	2007-01-10 00:21:44.000000000 -0600
+@@ -223,13 +223,10 @@
+ 	 	)
+ 
+ ####################################################################
+-# Optional database/indexer component checks
++# External SQLite check
+ ####################################################################
+ 
+-
+ SQLITE_REQUIRED=3.2
+-AC_DEFINE(USING_SQLITE, [], [Define if we are using sqlite])
+-AM_CONDITIONAL(USING_SQLITE, true)
+ 
+ AC_ARG_ENABLE(external_sqlite, 
+ 	AC_HELP_STRING(
+@@ -239,16 +236,18 @@
+ 
+ if test "x$enable_external_sqlite" = "xyes"; 
+ then
+-	
+ 	# Check for SQLite3
+ 	PKG_CHECK_MODULES(SQLITE3, [ sqlite3 >= $SQLITE_REQUIRED ])
+ 	AC_SUBST(SQLITE3_CFLAGS)
+ 	AC_SUBST(SQLITE3_LIBS)
++
++	AC_DEFINE(USING_EXTERNAL_SQLITE, [], [Define if we are using sqlite])
+ 	AM_CONDITIONAL(USING_EXTERNAL_SQLITE, true)
+ else
+ 	AM_CONDITIONAL(USING_EXTERNAL_SQLITE, false)
+ fi		
+ 
++
+ ###############################################################################
+ # Check for file monitor backends
+ ###############################################################################
+diff -burN tracker-0.5.3.no-mysql/src/trackerd/Makefile.am tracker-0.5.3/src/trackerd/Makefile.am
+--- tracker-0.5.3.no-mysql/src/trackerd/Makefile.am	2007-01-09 23:56:45.000000000 -0600
++++ tracker-0.5.3/src/trackerd/Makefile.am	2007-01-10 00:20:48.000000000 -0600
+@@ -1,5 +1,5 @@
+ if USING_EXTERNAL_SQLITE
+-additional_flags= $(SQLITE3_CFLAGS)
++additional_flags= $(SQLITE3_CFLAGS) -I/usr/include
+ additional_libs= $(SQLITE3_LIBS)
+ else
+ additional_flags= -I$(top_builddir)/src/sqlite3
+Files tracker-0.5.3.no-mysql/src/trackerd/.Makefile.am.swp and tracker-0.5.3/src/trackerd/.Makefile.am.swp differ
+diff -burN tracker-0.5.3.no-mysql/src/trackerd/tracker-db.h tracker-0.5.3/src/trackerd/tracker-db.h
+--- tracker-0.5.3.no-mysql/src/trackerd/tracker-db.h	2007-01-09 23:56:45.000000000 -0600
++++ tracker-0.5.3/src/trackerd/tracker-db.h	2007-01-10 00:01:50.000000000 -0600
+@@ -29,9 +29,7 @@
+ 
+ #include "config.h"
+ 
+-#ifdef USING_SQLITE
+ #include "tracker-db-sqlite.h"
+-#endif
+ 
+ gboolean	tracker_db_is_file_up_to_date 	(DBConnection *db_con, const char *uri, guint32 *id);
+ FileInfo *	tracker_db_get_file_info	(DBConnection *db_con, FileInfo *info);
+diff -burN tracker-0.5.3.no-mysql/src/trackerd/tracker-db-sqlite.h tracker-0.5.3/src/trackerd/tracker-db-sqlite.h
+--- tracker-0.5.3.no-mysql/src/trackerd/tracker-db-sqlite.h	2007-01-09 23:56:45.000000000 -0600
++++ tracker-0.5.3/src/trackerd/tracker-db-sqlite.h	2007-01-10 00:04:35.000000000 -0600
+@@ -22,7 +22,12 @@
+ #ifndef _TRACKER_SQLITE_DB_H_
+ #define _TRACKER_SQLITE_DB_H_
+ 
++#ifdef USING_EXTERNAL_SQLITE
++#include <sqlite3.h>
++#else
+ #include "../sqlite3/sqlite3.h"
++#endif
++
+ #include <glib.h>
+ 
+ #include "tracker-utils.h"
+diff -burN tracker-0.5.3.no-mysql/src/trackerd/tracker-mbox-evolution.h tracker-0.5.3/src/trackerd/tracker-mbox-evolution.h
+--- tracker-0.5.3.no-mysql/src/trackerd/tracker-mbox-evolution.h	2007-01-09 23:56:45.000000000 -0600
++++ tracker-0.5.3/src/trackerd/tracker-mbox-evolution.h	2007-01-10 00:02:02.000000000 -0600
+@@ -30,9 +30,7 @@
+ 
+ #include "config.h"
+ 
+-#ifdef USING_SQLITE
+-#   include "tracker-db-sqlite.h"
+-#endif
++#include "tracker-db-sqlite.h"
+ 
+ 
+ /*
+diff -burN tracker-0.5.3.no-mysql/src/trackerd/tracker-mbox.h tracker-0.5.3/src/trackerd/tracker-mbox.h
+--- tracker-0.5.3.no-mysql/src/trackerd/tracker-mbox.h	2007-01-09 23:56:45.000000000 -0600
++++ tracker-0.5.3/src/trackerd/tracker-mbox.h	2007-01-10 00:01:29.000000000 -0600
+@@ -30,9 +30,7 @@
+ 
+ #include "config.h"
+ 
+-#ifdef USING_SQLITE
+-#   include "tracker-db-sqlite.h"
+-#endif
++#include "tracker-db-sqlite.h"
+ 
+ 
+ typedef enum {
+diff -burN tracker-0.5.3.no-mysql/src/trackerd/tracker-mbox-kmail.h tracker-0.5.3/src/trackerd/tracker-mbox-kmail.h
+--- tracker-0.5.3.no-mysql/src/trackerd/tracker-mbox-kmail.h	2007-01-09 23:56:45.000000000 -0600
++++ tracker-0.5.3/src/trackerd/tracker-mbox-kmail.h	2007-01-10 00:02:10.000000000 -0600
+@@ -29,9 +29,7 @@
+ 
+ #include "config.h"
+ 
+-#ifdef USING_SQLITE
+-#   include "tracker-db-sqlite.h"
+-#endif
++#include "tracker-db-sqlite.h"
+ 
+ 
+ /*
+diff -burN tracker-0.5.3.no-mysql/src/trackerd/tracker-mbox-thunderbird.h tracker-0.5.3/src/trackerd/tracker-mbox-thunderbird.h
+--- tracker-0.5.3.no-mysql/src/trackerd/tracker-mbox-thunderbird.h	2007-01-09 23:56:45.000000000 -0600
++++ tracker-0.5.3/src/trackerd/tracker-mbox-thunderbird.h	2007-01-10 00:01:43.000000000 -0600
+@@ -30,9 +30,7 @@
+ 
+ #include "config.h"
+ 
+-#ifdef USING_SQLITE
+-#   include "tracker-db-sqlite.h"
+-#endif
++#include "tracker-db-sqlite.h"
+ 
+ 
+ /*
diff --git a/app-misc/tracker/files/tracker-0.5.3-thumbnailer-create-dir.patch b/app-misc/tracker/files/tracker-0.5.3-thumbnailer-create-dir.patch
new file mode 100644
index 000000000000..00771638b7fc
--- /dev/null
+++ b/app-misc/tracker/files/tracker-0.5.3-thumbnailer-create-dir.patch
@@ -0,0 +1,49 @@
+Index: src/tracker-thumbnailer/tracker-thumbnailer.c
+===================================================================
+--- src/tracker-thumbnailer/tracker-thumbnailer.c	(revision 373)
++++ src/tracker-thumbnailer/tracker-thumbnailer.c	(working copy)
+@@ -33,6 +33,34 @@
+ #define LIBDIR "/usr/lib"
+ #endif
+ 
++guint
++create_thumbnails_dir(const gchar * const subdir)
++{
++	gchar *thumbnails_dir = NULL;
++	thumbnails_dir = g_build_filename(g_get_home_dir(), ".thumbnails", NULL);
++
++	/* Ensure that ~/.thumbnails is not a file if it exists */
++	if (g_file_test(thumbnails_dir, G_FILE_TEST_EXISTS) &&
++			!g_file_test(thumbnails_dir, G_FILE_TEST_IS_DIR)) {
++		g_printerr("%s exists but is not a directory.\n", thumbnails_dir);
++		goto error;
++	}
++
++	g_free(thumbnails_dir);
++	thumbnails_dir = g_build_filename(g_get_home_dir(), ".thumbnails", subdir, NULL);
++	if (g_mkdir_with_parents(thumbnails_dir, 00775) == -1) {
++		g_printerr("failed: g_mkdir_with_parents(%s)\n", thumbnails_dir);
++		goto error;
++	}
++
++	g_free(thumbnails_dir);
++	return 0;
++
++error:
++	g_free(thumbnails_dir);
++	return -1;
++}
++
+ /* argv[1] == full path of file to be nailed
+  * argv[2] == mime type of said file
+  * argv[3] == requested size: "normal", "large", "preview"
+@@ -69,6 +97,9 @@
+ 		return EXIT_FAILURE;
+ 	}
+ 
++	if (create_thumbnails_dir(argv[3]) != 0)
++		return EXIT_FAILURE;
++
+ 	/* make sure the actual file exists */
+ 	if (!g_file_test (argv[1], G_FILE_TEST_EXISTS)) {
+ 		g_printerr ("%s does not exist\n", argv[1]);
diff --git a/app-misc/tracker/files/tracker-0.5.3-trackerd-test-compile-fix.patch b/app-misc/tracker/files/tracker-0.5.3-trackerd-test-compile-fix.patch
new file mode 100644
index 000000000000..c5e9293b738d
--- /dev/null
+++ b/app-misc/tracker/files/tracker-0.5.3-trackerd-test-compile-fix.patch
@@ -0,0 +1,25 @@
+--- src/trackerd/Makefile.am.orig	2007-01-09 01:37:22.000000000 -0600
++++ src/trackerd/Makefile.am	2007-01-09 01:37:57.000000000 -0600
+@@ -54,6 +54,10 @@
+ if BUILD_TEST
+ bin_PROGRAMS = trackerd test-tracker-indexer
+ test_tracker_indexer_SOURCES =	tracker-indexer.c test-tracker-indexer.c \
++	depot.c			\
++	depot.h			\
++	curia.c			\
++	curia.h			\
+ 	tracker-utils.c		\
+ 	tracker-utils.h		\
+ 	xdgmime.c		\
+@@ -71,7 +75,10 @@
+ 	xdgmimeparent.c		\
+ 	xdgmimeparent.h			
+ 
+-test_tracker_indexer_LDADD = $(GLIB2_LIBS)
++test_tracker_indexer_LDADD = $(GLIB2_LIBS) \
++		 $(GTHREAD_LIBS) \
++		 -lz	\
++		 $(top_builddir)/src/libstemmer/libstemmer-private.la
+ else
+ bin_PROGRAMS = trackerd 
+ endif
diff --git a/app-misc/tracker/tracker-0.5.3.ebuild b/app-misc/tracker/tracker-0.5.3.ebuild
new file mode 100644
index 000000000000..1bd8e476afe2
--- /dev/null
+++ b/app-misc/tracker/tracker-0.5.3.ebuild
@@ -0,0 +1,158 @@
+# 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.5.3.ebuild,v 1.1 2007/01/11 02:18:51 compnerd Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit autotools eutils flag-o-matic linux-info
+
+DESCRIPTION="A tagging metadata database, search tool and indexer"
+HOMEPAGE="http://www.gnome.org/~jamiemcc/tracker/"
+SRC_URI="http://www.gnome.org/~jamiemcc/tracker/${PF}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="debug fam gnome gsf gstreamer jpeg pdf thumbnailing test xine"
+
+RDEPEND=">=dev-libs/glib-2.12.0
+		 >=x11-libs/pango-1.0.0
+		 >=dev-libs/gmime-2.1.0
+		 || (
+				>=dev-libs/dbus-glib-0.71
+				( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.60 )
+			)
+		 >=dev-db/sqlite-3.2
+		 >=media-libs/libpng-1.2
+		 fam? ( >=app-admin/gamin-0.1.7 )
+		 gnome? (
+					>=x11-libs/gtk+-2.8
+					>=gnome-base/libglade-2.5
+					>=gnome-base/libgnome-2.14
+					>=gnome-base/gnome-vfs-2.10
+					>=gnome-base/libgnomeui-2.14
+					>=gnome-base/gnome-desktop-2.14
+				)
+		 gsf? ( >=gnome-extra/libgsf-1.13 )
+		 gstreamer? ( >=media-libs/gstreamer-0.10 )
+		 jpeg? ( >=media-gfx/exif-0.6 )
+		 pdf?	(
+		 			>=x11-libs/cairo-1.0
+					>=app-text/poppler-bindings-0.5.0
+				)
+		 thumbnailing? ( >=media-gfx/imagemagick-5.2.1 )
+		 xine? ( >=media-libs/xine-lib-1.0 )"
+
+DEPEND="${RDEPEND}
+		>=dev-util/intltool-0.22
+		>=sys-devel/gettext-0.14
+		>=dev-util/pkgconfig-0.20"
+
+function notify_inotify() {
+	ewarn
+	ewarn "You should enable the INOTIFY support in your kernel."
+	ewarn "Check the 'Inotify file change notification support' under the"
+	ewarn "'File systems' option.  It is marked as CONFIG_INOTIFY in the config"
+	ewarn "Also enable 'Inotify support for userland' in under the previous"
+	ewarn "option.  It is marked as CONFIG_INOTIFY_USER in the config."
+	ewarn
+	ebeep 5
+}
+
+function inotify_enabled() {
+	linux_chkconfig_present INOTIFY && linux_chkconfig_present INOTIFY_USER
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if built_with_use 'dev-db/sqlite' 'nothreadsafe' ; 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"
+	fi
+
+	if use thumbnailing ; then
+		if ! built_with_use 'media-gfx/imagemagick' 'png' ; then
+			ewarn "You must build imagemagick with png"
+			die "imagemagick needs png 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"
+		fi
+	fi
+
+	if use fam ; then
+		ebeep 5
+		ewarn "You are selecting to build tracker with FAM support rather than"
+		ewarn "inotify. It is highly recommended that you use inotify over FAM."
+		epause 5
+	else
+		inotify_enabled || notify_inotify
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-0.5.3-requires-libpng.patch
+	epatch ${FILESDIR}/${PN}-0.5.3-disable-tests.patch
+	epatch ${FILESDIR}/${PN}-0.5.3-disable-debug.patch
+	epatch ${FILESDIR}/${PN}-0.5.3-imagemagick-5.2.1-needed.patch
+	epatch ${FILESDIR}/${PN}-0.5.3-trackerd-test-compile-fix.patch
+	epatch ${FILESDIR}/${PN}-0.5.3-delete-services-missing.patch
+	epatch ${FILESDIR}/${PN}-0.5.3-thumbnailer-create-dir.patch
+	epatch ${FILESDIR}/${PN}-0.5.3-remove-mysql.patch
+	epatch ${FILESDIR}/${PN}-0.5.3-sqlite-cleanups.patch
+	epatch ${FILESDIR}/${PN}-0.5.3-convert-pdf-thumbnailer.patch
+
+	rm ${S}/data/mysql-*.sql
+
+	eautoreconf
+}
+
+src_compile() {
+	local myconf="--enable-external-sqlite"
+
+	if use gstreamer ; then
+		myconf="${myconf} --enable-video-extractor=gstreamer"
+	elif use xine ; then
+		myconf="${myconf} --enable-video-extractor=xine"
+	fi
+
+	if use fam ; then
+		myconf="${myconf} --enable-file-monitoring=fam"
+	elif inotify_enabled ; then
+		myconf="${myconf} --enable-file-monitoring=inotify"
+	else
+		myconf="${myconf} --enable-file-monitoring=polling"
+	fi
+
+	econf ${myconf} \
+		  $(use_enable debug debug-code) \
+		  $(use_enable gnome gui) \
+		  $(use_enable jpeg exif) \
+		  $(use_enable pdf) \
+		  $(use_enable test) \
+		|| die "configure failed"
+
+	emake || die "build failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "install failed"
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+pkg_postinst() {
+	einfo "Evince and imagemagick are pure runtime depdencies, and as such, you"
+	einfo "may add or remove them without rebuilding this package."
+}