add an installed file patch, add a patch for encoding for deskbar handler (bug #165881)

Package-Manager: portage-2.1.2-r8

6 files changed, 233 insertions, 5 deletions

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index 30020fb58dbb..eb151fbade60 100644
--- a/app-misc/tracker/ChangeLog
+++ b/app-misc/tracker/ChangeLog
@@ -1,6 +1,13 @@
 # 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.6 2007/01/27 20:07:40 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.7 2007/02/08 16:16:37 compnerd Exp $
+
+*tracker-0.5.4-r1 (08 Feb 2007)
+
+  08 Feb 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/tracker-0.5.4-deskbar-encoding.patch,
+  +files/tracker-0.5.4-deskbar-handler.patch, +tracker-0.5.4-r1.ebuild:
+  Revbump to fix installed files, and tracker-handler encoding (bug #165881)
 
   27 Jan 2007; Saleem Abdulrasool <compnerd@gentoo.org>
   tracker-0.5.4.ebuild:
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 698196e89c4f..56b4e1a9c2c3 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -2,15 +2,27 @@ AUX tracker-0.5.3-convert-pdf-thumbnailer.patch 366 RMD160 23b7ac2c22883c271d075
 MD5 7e360c7d27a8846ce73ac4e72075475f files/tracker-0.5.3-convert-pdf-thumbnailer.patch 366
 RMD160 23b7ac2c22883c271d0751af39aa08b8a1eba8de files/tracker-0.5.3-convert-pdf-thumbnailer.patch 366
 SHA256 54f512506afbdf73b017c2a53e1d13b84ace07ea0001453fbf87ca4c70c16058 files/tracker-0.5.3-convert-pdf-thumbnailer.patch 366
+AUX tracker-0.5.4-deskbar-encoding.patch 504 RMD160 c96859e3c6c1aef4f7c3d61c35cc4953efe58f4d SHA1 1f96bcd97c7570ffc60f1c7205a274fef65e10e3 SHA256 20dc3e50fc0a3aac5db245404bbdb069c114ff678776e28e0529ae01041a8d12
+MD5 860655715e476ba7cbee8bb0aa5f8c44 files/tracker-0.5.4-deskbar-encoding.patch 504
+RMD160 c96859e3c6c1aef4f7c3d61c35cc4953efe58f4d files/tracker-0.5.4-deskbar-encoding.patch 504
+SHA256 20dc3e50fc0a3aac5db245404bbdb069c114ff678776e28e0529ae01041a8d12 files/tracker-0.5.4-deskbar-encoding.patch 504
+AUX tracker-0.5.4-deskbar-handler.patch 1411 RMD160 e6fee8bf122be181f5c18359c682317044530884 SHA1 06de5e6358cb331744d703aca42968f82d359e21 SHA256 0a23fcfcbfc262dcb8464b2408e63d799b96dad497b824037767e1d503a6eaf8
+MD5 7aeda4450683b41a82b896039f773c65 files/tracker-0.5.4-deskbar-handler.patch 1411
+RMD160 e6fee8bf122be181f5c18359c682317044530884 files/tracker-0.5.4-deskbar-handler.patch 1411
+SHA256 0a23fcfcbfc262dcb8464b2408e63d799b96dad497b824037767e1d503a6eaf8 files/tracker-0.5.4-deskbar-handler.patch 1411
 DIST tracker-0.5.4.tar.gz 1381786 RMD160 6e270db773e5119ba8560a25f6e8b68c5980fc0f SHA1 1688b6e936193cdf8dca8ccf01fe03b91b5d3fd5 SHA256 ad214a2692041f423d2150777c233b21cab2d108f849edc513192587ac63c9c2
+EBUILD tracker-0.5.4-r1.ebuild 4000 RMD160 1f7d32744eefba1093a561680a9c1b4f62f898ca SHA1 ff4f80afbc64a11d3051c279e39d214ffd9becd8 SHA256 df9beddf902ea3bef2203fed6341b4b5b2ef758776b6beb6b64c7f4da66e477b
+MD5 f704fb8d8fa049280a9328c974abeb6b tracker-0.5.4-r1.ebuild 4000
+RMD160 1f7d32744eefba1093a561680a9c1b4f62f898ca tracker-0.5.4-r1.ebuild 4000
+SHA256 df9beddf902ea3bef2203fed6341b4b5b2ef758776b6beb6b64c7f4da66e477b tracker-0.5.4-r1.ebuild 4000
 EBUILD tracker-0.5.4.ebuild 3928 RMD160 3e08edef6a3079e3c65beb14d8e6dfec33e93a5a SHA1 9ee0491f05971beda9bc6e64bbffa1dc0426c7c4 SHA256 cdc8ec1d1d8e1225b965094a0c43d240283e5e794d49aeae415650a46e6b84ac
 MD5 daf241599ebfa9bdc6c906728af94650 tracker-0.5.4.ebuild 3928
 RMD160 3e08edef6a3079e3c65beb14d8e6dfec33e93a5a tracker-0.5.4.ebuild 3928
 SHA256 cdc8ec1d1d8e1225b965094a0c43d240283e5e794d49aeae415650a46e6b84ac tracker-0.5.4.ebuild 3928
-MISC ChangeLog 2110 RMD160 194a5bd3cbf6a83248dab2008cb459e8b355accb SHA1 7be3284b716736f580a9ba5fd7bacdd906d966c1 SHA256 567935fe9e6389b04012542714bd98e23471c6a1e1a3f1b95ca42e768829c7fd
-MD5 22bf0361db2e5aa793a88775a3c6ae65 ChangeLog 2110
-RMD160 194a5bd3cbf6a83248dab2008cb459e8b355accb ChangeLog 2110
-SHA256 567935fe9e6389b04012542714bd98e23471c6a1e1a3f1b95ca42e768829c7fd ChangeLog 2110
+MISC ChangeLog 2396 RMD160 90a04f4e2a93a1ac24ea4cd6387373ccc59685c6 SHA1 815a40ccec32dbf216c475fc9c82477a5116158b SHA256 2109c0582cae4ed4207b7028f0724c258b4f77ba669b24afdc86cff13c04fb68
+MD5 981cc1ae0b5cc24850aa42804701f03a ChangeLog 2396
+RMD160 90a04f4e2a93a1ac24ea4cd6387373ccc59685c6 ChangeLog 2396
+SHA256 2109c0582cae4ed4207b7028f0724c258b4f77ba669b24afdc86cff13c04fb68 ChangeLog 2396
 MISC metadata.xml 311 RMD160 868d0eab62db916aa47b7f440a3f4efecc6163b1 SHA1 0e56da7be32af7c553c07179c574cd7837298702 SHA256 774cc71e08a317563fb2700d5aac76af10e3e31ae7c1c58325730bfa0fbb110a
 MD5 def57195a8a8fbc9ff84bded4f4c6772 metadata.xml 311
 RMD160 868d0eab62db916aa47b7f440a3f4efecc6163b1 metadata.xml 311
@@ -18,3 +30,6 @@ SHA256 774cc71e08a317563fb2700d5aac76af10e3e31ae7c1c58325730bfa0fbb110a metadata
 MD5 6923b8fe6c424a51eed8e11a358ee019 files/digest-tracker-0.5.4 244
 RMD160 be95da824cad3c960aa9f86df284fbd4e07c2ec0 files/digest-tracker-0.5.4 244
 SHA256 623f808f83f3c6342904367b1b67380fa9cb7190118bd1504e06c9ab4e76d782 files/digest-tracker-0.5.4 244
+MD5 6923b8fe6c424a51eed8e11a358ee019 files/digest-tracker-0.5.4-r1 244
+RMD160 be95da824cad3c960aa9f86df284fbd4e07c2ec0 files/digest-tracker-0.5.4-r1 244
+SHA256 623f808f83f3c6342904367b1b67380fa9cb7190118bd1504e06c9ab4e76d782 files/digest-tracker-0.5.4-r1 244
diff --git a/app-misc/tracker/files/digest-tracker-0.5.4-r1 b/app-misc/tracker/files/digest-tracker-0.5.4-r1
new file mode 100644
index 000000000000..94b82b9502e4
--- /dev/null
+++ b/app-misc/tracker/files/digest-tracker-0.5.4-r1
@@ -0,0 +1,3 @@
+MD5 724208e1b2d235148499672b44181298 tracker-0.5.4.tar.gz 1381786
+RMD160 6e270db773e5119ba8560a25f6e8b68c5980fc0f tracker-0.5.4.tar.gz 1381786
+SHA256 ad214a2692041f423d2150777c233b21cab2d108f849edc513192587ac63c9c2 tracker-0.5.4.tar.gz 1381786
diff --git a/app-misc/tracker/files/tracker-0.5.4-deskbar-encoding.patch b/app-misc/tracker/files/tracker-0.5.4-deskbar-encoding.patch
new file mode 100644
index 000000000000..e5ee8ccd411f
--- /dev/null
+++ b/app-misc/tracker/files/tracker-0.5.4-deskbar-encoding.patch
@@ -0,0 +1,11 @@
+Index: python/deskbar-handler/tracker-handler.py
+===================================================================
+--- python/deskbar-handler/tracker-handler.py	(revision 461)
++++ python/deskbar-handler/tracker-handler.py	(revision 462)
+@@ -1,4 +1,5 @@
+-
++#!/usr/bin/env python
++# -*- coding: utf-8 -*-
+ #    This handler was originaly created by Mikkel Kamstrup (c) 2006 and updated by Eugenio Cutolo (eulin)
+ #
+ #    This program can be distributed under the terms of the GNU GPL version 2 or later.
diff --git a/app-misc/tracker/files/tracker-0.5.4-deskbar-handler.patch b/app-misc/tracker/files/tracker-0.5.4-deskbar-handler.patch
new file mode 100644
index 000000000000..fb5a27d02540
--- /dev/null
+++ b/app-misc/tracker/files/tracker-0.5.4-deskbar-handler.patch
@@ -0,0 +1,49 @@
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 443)
++++ configure.ac	(working copy)
+@@ -95,6 +95,12 @@
+ # Deskbar Applet Handler
+ ####################################################################
+ 
++AC_ARG_ENABLE([deskbar_applet],
++              AC_HELP_STRING([--enable-deskbar-applet], [Enable support for deskbar applet]),,
++              [enable_deskbar_applet=no])
++
++AM_CONDITIONAL(USING_DESKBAR_APPLET, test "x$enable_deskbar_applet" != "xno")
++
+ AC_ARG_WITH([deskbar_applet_handler_dir],
+             AC_HELP_STRING([--with-deskbar-applet-handler-dir], [Path to Deskbar handler directory]))
+ 
+@@ -104,13 +110,9 @@
+    handler_dir="$with_deskbar_applet_handler_dir"
+ fi
+ 
+-
+-
+ DESKBAR_HANDLER_DIR="$handler_dir"
+ AC_SUBST(DESKBAR_HANDLER_DIR)
+ 
+-
+-
+ ####################################################################
+ # Compiler warning checks
+ ####################################################################
+Index: Makefile.am
+===================================================================
+--- Makefile.am	(revision 443)
++++ Makefile.am	(working copy)
+@@ -5,8 +5,13 @@
+ pkgconfig_DATA = tracker.pc
+ xdgconfig_DATA = trackerd.desktop
+ 
++if USING_DESKBAR_APPLET
+ handlerdir = $(DESKBAR_HANDLER_DIR)
+ handler_DATA =  python/deskbar-handler/tracker-handler.py 
++else
++handlerdir =
++handler_DATA =
++endif
+ 
+ 
+ EXTRA_DIST = \
diff --git a/app-misc/tracker/tracker-0.5.4-r1.ebuild b/app-misc/tracker/tracker-0.5.4-r1.ebuild
new file mode 100644
index 000000000000..a4d9da583218
--- /dev/null
+++ b/app-misc/tracker/tracker-0.5.4-r1.ebuild
@@ -0,0 +1,143 @@
+# 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.4-r1.ebuild,v 1.1 2007/02/08 16:16:37 compnerd Exp $
+
+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/${PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="applet debug fam gnome gsf gstreamer jpeg pdf test xine"
+
+RDEPEND=">=dev-libs/glib-2.12.0
+		 >=x11-libs/pango-1.0.0
+		 >=dev-libs/gmime-2.1.0
+		 >=media-gfx/imagemagick-5.2.1
+		   sys-libs/zlib
+		 || (
+				>=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
+		 applet? ( gnome-extra/deskbar-applet )
+		 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
+				)
+		 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-convert-pdf-thumbnailer.patch
+
+	epatch ${FILESDIR}/${PN}-0.5.4-deskbar-handler.patch
+	epatch ${FILESDIR}/${PN}-0.5.4-deskbar-encoding.patch
+
+	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 applet deskbar-applet) \
+		  $(use_enable debug debug-code) \
+		  $(use_enable gnome gui) \
+		  $(use_enable jpeg exif) \
+		  $(use_enable pdf) \
+		|| die "configure failed"
+
+	emake || die "build failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "install failed"
+	dodoc AUTHORS ChangeLog NEWS README
+}