Restrict nautilus version, bug #363313.

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

6 files changed, 17 insertions, 431 deletions

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index 8e8308effab0..216f671cefb8 100644
--- a/app-misc/tracker/ChangeLog
+++ b/app-misc/tracker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/tracker
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.102 2011/04/11 22:27:21 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.103 2011/04/14 12:28:44 eva Exp $
+
+  14 Apr 2011; Gilles Dartiguelongue <eva@gentoo.org> tracker-0.8.17.ebuild,
+  -tracker-0.10.5.ebuild, -tracker-0.10.6.ebuild, tracker-0.10.8.ebuild:
+  Restrict nautilus version, bug #363313.
 
 *tracker-0.10.8 (11 Apr 2011)
 
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index ccb830186597..6faf05764a98 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -6,21 +6,17 @@ AUX tracker-0.8.17-build-with-eds232.patch 807 RMD160 7f681d67da66c66c8217155746
 AUX tracker-0.8.17-poppler-0.16.patch 1209 RMD160 6ae54087f8d2b3ea864cfaa035e3b1153a749a67 SHA1 a2f7429149ecfa7e45dd58e0a0d37f9385fbefb1 SHA256 8d1ed288fc14655e36ddda9af6d30b5b00572feca08b643951c1b5ac2d4eba1c
 AUX tracker-0.8.17-tests-fixes.patch 2499 RMD160 fb8b749e2addeaa004fd2e6de585357156e2f092 SHA1 a4f193432edc8f64e3505ac407f05a2de7fd73af SHA256 3c00640648e56c722fcca4b6c1016082df992def8d7a95c5a1618453463d4048
 AUX tracker-0.8.17-use-upower.patch 16884 RMD160 a9545a4aa89b6574ccb58d5b9796386eeb62a1ef SHA1 16ad6730798279f9a09459b50e1380bbf16c8e83 SHA256 542432544663f0c1a9c43c08e816f42a95fa31f828e33f6d470cafc60a33a7a1
-DIST tracker-0.10.5.tar.bz2 7867918 RMD160 34dfb68fb0744c78b88c31019afaa0a5adaaca3e SHA1 8e02645adadd4bb8644c4e413712d52ecdc04d5b SHA256 efc8c53cdb192d27c6a92bc11ef4ad5677afaeea7d58be4563e53a0133b54f10
-DIST tracker-0.10.6.tar.bz2 7923439 RMD160 11dca11731cb46a18e013332a4d1e52bbfdd7ec6 SHA1 3a587b9ba5105e30b0fa5caced05c4582253b519 SHA256 065758a4bbc57a18f7c39f8167c41f1a1892596fda5a796d94cb8e56d345bb6b
 DIST tracker-0.10.8.tar.bz2 7927772 RMD160 a97383f0ce352c644fc1c8cd275b7f3e169e03cd SHA1 106a115640f5dcc642ce297359c4624e6c8d8bb6 SHA256 973801f394fb2dc64f32484370d046c0d5e548e4d29ecfb9e6036e425541f0c7
 DIST tracker-0.8.17.tar.bz2 4959334 RMD160 b33abe9ab955e5e392258657ad3a664ff5cb4cc6 SHA1 460f3d56bd0ed24c5d064a398829f4289a6b081f SHA256 56cf09f41fec1afaf7199e0728f4339b567a7893a51fc2affc5069fa26e2e9d8
-EBUILD tracker-0.10.5.ebuild 6072 RMD160 66e93a7ac1e27f20fd9c03b55b3ac5aa8007bb91 SHA1 0d4793aea7dab239d0707350385131ef26893236 SHA256 b2d96cecc7635f4e7e652367f8b8023633ca27999c92ebc9458f28356bfbf877
-EBUILD tracker-0.10.6.ebuild 6077 RMD160 220a6055339115062882ffe88928522678133c36 SHA1 78d049829afe3caec6f9751e9ad3d5cf1c622cbf SHA256 b9a420dc46b3ce4aa8dc4824eb63fa110b227a866eab95747782370dcbc24300
-EBUILD tracker-0.10.8.ebuild 6050 RMD160 836d28ebad6b9f7577d80f37aaf2f06473965326 SHA1 a6758f8a80068981318399ce1e25fcdbd43fad57 SHA256 594d6480927e9cddeed54f729e507633060ea7be6bfbc7d630f98f3c87240372
-EBUILD tracker-0.8.17.ebuild 5557 RMD160 aed3da3f171d63196ad9e8738542b19835a533d6 SHA1 09263cbc56b4d269f381c0bc87759fd076ecd9a7 SHA256 0942750014d4cd78541e9ae4fd3bd33c9955e15fc15f4932d36f35dc7531697f
+EBUILD tracker-0.10.8.ebuild 6082 RMD160 fe00adc0a89f66a2e99d62fff4b962d6269808a9 SHA1 6879af56fdf8796a246215710c995fa635d84a30 SHA256 1ca1230b358fa73b38bef0d1623bd7cf26fcfe2d0046e1bdac8b6f23ed663d6c
+EBUILD tracker-0.8.17.ebuild 5583 RMD160 ee002a17e8fee1108e0d4cd37f2238359196dfbe SHA1 2e4a2310bbc99619d0892fe1c33adfb5ffa53e08 SHA256 3cedb0359f4c1f59db6289ef12ced259d19d56fe5ce72752b0b33a1706d181a5
 EBUILD tracker-9999.ebuild 5864 RMD160 33857b076c80ebc3ba0616624c89ff3e65e62faa SHA1 f71842d4eec5e42a03dce0b258bb96d94059b8e0 SHA256 887b45f33afdd8c9199c2a5286a577be43424f8a20ae66c30241ef1a71ef1d47
-MISC ChangeLog 18516 RMD160 1f49630a9f23154ce7e8f272dce0b88b2fb528e6 SHA1 dd4e3d537e12f2603aec58d9a9277b496741ac05 SHA256 873aca89f709f86462b96e1951f01f112c2b6434599ea44e338fd89225658afc
+MISC ChangeLog 18709 RMD160 08f7c8ff56b87b72773952434499a1895070c9c8 SHA1 84d15bb5eaa4b8c0f6af29305fba7af21cd4a645 SHA256 91a4ed2fc8063b0077c22a81e728a7d86719c1407b2d69cd7fa109bb9d370492
 MISC metadata.xml 1013 RMD160 b5ac62b6e0da498ee44306ca51669a35db7c5caa SHA1 413f36c0c4f6b4504e18d1bfa524b5b75742c444 SHA256 b97c36f30aa204a790dc87b1b167a55b1dec621f686852b75d35e8dcb2f9cbbd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2jgE8ACgkQ1fmVwcYIWAaRdgCgjozbUuVvMqjfK4tJa6MSeE8A
-tVgAoMMgGuXttO/Z+4z/xWX7ghl33say
-=1ll/
+iEYEARECAAYFAk2m6IcACgkQ1fmVwcYIWAbNNACfQSQSUJLSiBMFHR3SsaoEBPHj
+nGwAoIImdtF3hK2HtkNenLU2C5vPBQSb
+=E/jW
 -----END PGP SIGNATURE-----
diff --git a/app-misc/tracker/tracker-0.10.5.ebuild b/app-misc/tracker/tracker-0.10.5.ebuild
deleted file mode 100644
index 49c78f1004c0..000000000000
--- a/app-misc/tracker/tracker-0.10.5.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.10.5.ebuild,v 1.3 2011/04/03 21:13:37 eva Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2:2.6"
-
-inherit eutils gnome2 linux-info python virtualx
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="http://www.tracker-project.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# USE="doc" is managed by eclass.
-IUSE="applet doc eds exif flac gif gnome-keyring gsf gstreamer gtk iptc +jpeg laptop mp3 nautilus networkmanager pdf playlist qt4 rss strigi test +tiff upnp +vorbis xine +xml xmp"
-
-# Test suite highly disfunctional, loops forever
-# putting aside for now
-RESTRICT="test"
-
-# TODO: rest -> flickr
-# vala is built with debug by default (see VALAFLAGS)
-RDEPEND="
-	>=app-i18n/enca-1.9
-	>=dev-db/sqlite-3.7[threadsafe]
-	>=dev-libs/glib-2.26:2
-	>=dev-libs/icu-4
-	|| (
-		>=media-gfx/imagemagick-5.2.1[png,jpeg=]
-		media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
-	>=media-libs/libpng-1.2
-	>=x11-libs/pango-1
-	sys-apps/util-linux
-
-	applet? (
-		>=gnome-base/gnome-panel-2.91
-		>=x11-libs/gtk+-3:3 )
-	eds? (
-		>=mail-client/evolution-2.32
-		>=gnome-extra/evolution-data-server-2.32 )
-	exif? ( >=media-libs/libexif-0.6 )
-	flac? ( >=media-libs/flac-1.2.1 )
-	gif? ( media-libs/giflib )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 )
-	gsf? (
-		app-text/odt2txt
-		>=gnome-extra/libgsf-1.13 )
-	upnp? ( >=media-libs/gupnp-dlna-0.5 )
-	!upnp? (
-		gstreamer? ( >=media-libs/gstreamer-0.10.12 )
-		!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
-	)
-	gtk? (
-		>=dev-libs/libgee-0.3
-		>=x11-libs/gtk+-2.18:2 )
-	iptc? ( media-libs/libiptcdata )
-	jpeg? ( virtual/jpeg:0 )
-	laptop? ( >=sys-power/upower-0.9 )
-	mp3? (
-		>=media-libs/taglib-1.6
-		gtk? ( x11-libs/gdk-pixbuf:2 )
-		qt4? ( >=x11-libs/qt-gui-4.7.1:4 ) )
-	nautilus? (
-		gnome-base/nautilus
-		>=x11-libs/gtk+-2.18:2 )
-	networkmanager? ( >=net-misc/networkmanager-0.8 )
-	pdf? (
-		>=x11-libs/cairo-1
-		>=app-text/poppler-0.16[cairo,utils]
-		>=x11-libs/gtk+-2.12:2 )
-	playlist? ( dev-libs/totem-pl-parser )
-	rss? ( net-libs/libgrss )
-	strigi? ( >=app-misc/strigi-0.7 )
-	tiff? ( media-libs/tiff )
-	vorbis? ( >=media-libs/libvorbis-0.22 )
-	xine? ( >=media-libs/xine-lib-1 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	xmp? ( >=media-libs/exempi-2.1 )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	>=dev-util/pkgconfig-0.20
-	applet? ( >=dev-lang/vala-0.11.4:0.12 )
-	gtk? (
-		app-office/dia
-		>=dev-lang/vala-0.11.4:0.12
-		>=dev-libs/libgee-0.3 )
-	doc? (
-		>=dev-util/gtk-doc-1.8
-		media-gfx/graphviz )
-	test? (
-		>=dev-libs/dbus-glib-0.82-r1
-		>=sys-apps/dbus-1.3.1[X] )
-"
-
-function inotify_enabled() {
-	if linux_config_exists; then
-		if ! linux_chkconfig_present INOTIFY_USER; then
-			ewarn "You should enable the INOTIFY support in your kernel."
-			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
-			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
-			die 'missing CONFIG_INOTIFY'
-		fi
-	else
-		einfo "Could not check for INOTIFY support in your kernel."
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	inotify_enabled
-
-	if use upnp ; then
-		G2CONF="${G2CONF} --enable-video-extractor=gupnp-dlna"
-	elif use gstreamer ; then
-		G2CONF="${G2CONF}
-			--enable-video-extractor=gstreamer
-			--enable-gstreamer-tagreadbin"
-		# --enable-gstreamer-helix (real media)
-	elif use xine ; then
-		G2CONF="${G2CONF} --enable-video-extractor=xine"
-	else
-		G2CONF="${G2CONF} --enable-video-extractor=external"
-	fi
-
-	# upower is used for AC power detection
-	if use laptop; then
-		G2CONF="${G2CONF} --disable-hal --enable-upower"
-	else
-		G2CONF="${G2CONF} --disable-hal --disable-upower"
-	fi
-
-	if use applet || use gtk; then
-		G2CONF="${G2CONF} VALAC=$(type -P valac-0.12)"
-	fi
-
-	if use mp3 && (use gtk || use qt4); then
-		G2CONF="${G2CONF} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)"
-	fi
-
-	# unicode-support: libunistring, libicu or glib ?
-	G2CONF="${G2CONF}
-		--enable-tracker-fts
-		--with-enca
-		--with-unicode-support=libicu
-		--enable-guarantee-metadata
-		$(use_enable applet tracker-search-bar)
-		$(use_enable eds miner-evolution)
-		$(use_enable exif libexif)
-		$(use_enable flac libflac)
-		$(use_enable gnome-keyring)
-		$(use_enable gsf libgsf)
-		$(use_enable gtk tracker-explorer)
-		$(use_enable gtk tracker-preferences)
-		$(use_enable gtk tracker-needle)
-		$(use_enable iptc libiptcdata)
-		$(use_enable jpeg libjpeg)
-		$(use_enable mp3 taglib)
-		$(use_enable nautilus nautilus-extension)
-		$(use_enable networkmanager network-manager)
-		$(use_enable pdf poppler)
-		$(use_enable playlist)
-		$(use_enable rss miner-rss)
-		$(use_enable strigi libstreamanalyzer)
-		$(use_enable test functional-tests)
-		$(use_enable test unit-tests)
-		$(use_enable tiff libtiff)
-		$(use_enable vorbis libvorbis)
-		$(use_enable xml libxml2)
-		$(use_enable xmp exempi)"
-
-	DOCS="AUTHORS ChangeLog NEWS README"
-
-	python_set_active_version 2
-}
-
-src_prepare() {
-	# Fix build failures with USE=strigi
-	epatch "${FILESDIR}/${PN}-0.8.0-strigi.patch"
-
-	# Fix functional tests scripts
-	find "${S}" -name "*.pyc" -delete
-	python_convert_shebangs 2 "${S}"/tests/tracker-writeback/*.py
-	python_convert_shebangs 2 "${S}"/tests/functional-tests/*.py
-	python_convert_shebangs 2 "${S}"/utils/data-generators/cc/{*.py,generate}
-	python_convert_shebangs 2 "${S}"/utils/gtk-sparql/*.py
-	python_convert_shebangs 2 "${S}"/examples/rss-reader/*.py
-
-	# FIXME: report broken tests
-	sed -e '/\/libtracker-miner\/tracker-password-provider\/setting/,+1 s:^\(.*\)$:/*\1*/:' \
-		-e '/\/libtracker-miner\/tracker-password-provider\/getting/,+1 s:^\(.*\)$:/*\1*/:' \
-		-i tests/libtracker-miner/tracker-password-provider-test.c || die
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check XDG_DATA_HOME="${T}" XDG_CONFIG_HOME="${T}" || die "tests failed"
-}
-
-src_install() {
-	gnome2_src_install
-	# Tracker and none of the plugins it provides needs la files
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/app-misc/tracker/tracker-0.10.6.ebuild b/app-misc/tracker/tracker-0.10.6.ebuild
deleted file mode 100644
index 9d0c01b65dae..000000000000
--- a/app-misc/tracker/tracker-0.10.6.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.10.6.ebuild,v 1.1 2011/04/03 21:13:37 eva Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2:2.6"
-
-inherit eutils gnome2 linux-info python virtualx
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="http://www.tracker-project.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# USE="doc" is managed by eclass.
-IUSE="applet doc eds exif flac gif gnome-keyring gsf gstreamer gtk iptc +jpeg laptop mp3 nautilus networkmanager pdf playlist qt4 rss strigi test +tiff upnp +vorbis xine +xml xmp"
-
-# Test suite highly disfunctional, loops forever
-# putting aside for now
-RESTRICT="test"
-
-# TODO: rest -> flickr
-# vala is built with debug by default (see VALAFLAGS)
-RDEPEND="
-	>=app-i18n/enca-1.9
-	>=dev-db/sqlite-3.7[threadsafe]
-	>=dev-libs/glib-2.26:2
-	>=dev-libs/icu-4
-	|| (
-		>=media-gfx/imagemagick-5.2.1[png,jpeg=]
-		media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
-	>=media-libs/libpng-1.2
-	>=x11-libs/pango-1
-	sys-apps/util-linux
-
-	applet? (
-		>=gnome-base/gnome-panel-2.91
-		>=x11-libs/gtk+-3:3 )
-	eds? (
-		>=mail-client/evolution-2.32
-		>=gnome-extra/evolution-data-server-2.32 )
-	exif? ( >=media-libs/libexif-0.6 )
-	flac? ( >=media-libs/flac-1.2.1 )
-	gif? ( media-libs/giflib )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 )
-	gsf? (
-		app-text/odt2txt
-		>=gnome-extra/libgsf-1.13 )
-	upnp? ( >=media-libs/gupnp-dlna-0.5 )
-	!upnp? (
-		gstreamer? ( >=media-libs/gstreamer-0.10.31:0.10 )
-		!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
-	)
-	gtk? (
-		>=dev-libs/libgee-0.3
-		>=x11-libs/gtk+-2.18:2 )
-	iptc? ( media-libs/libiptcdata )
-	jpeg? ( virtual/jpeg:0 )
-	laptop? ( >=sys-power/upower-0.9 )
-	mp3? (
-		>=media-libs/taglib-1.6
-		gtk? ( x11-libs/gdk-pixbuf:2 )
-		qt4? ( >=x11-libs/qt-gui-4.7.1:4 ) )
-	nautilus? (
-		gnome-base/nautilus
-		>=x11-libs/gtk+-2.18:2 )
-	networkmanager? ( >=net-misc/networkmanager-0.8 )
-	pdf? (
-		>=x11-libs/cairo-1
-		>=app-text/poppler-0.16[cairo,utils]
-		>=x11-libs/gtk+-2.12:2 )
-	playlist? ( dev-libs/totem-pl-parser )
-	rss? ( net-libs/libgrss )
-	strigi? ( >=app-misc/strigi-0.7 )
-	tiff? ( media-libs/tiff )
-	vorbis? ( >=media-libs/libvorbis-0.22 )
-	xine? ( >=media-libs/xine-lib-1 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	xmp? ( >=media-libs/exempi-2.1 )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	>=dev-util/pkgconfig-0.20
-	applet? ( >=dev-lang/vala-0.11.4:0.12 )
-	gtk? (
-		app-office/dia
-		>=dev-lang/vala-0.11.4:0.12
-		>=dev-libs/libgee-0.3 )
-	doc? (
-		>=dev-util/gtk-doc-1.8
-		media-gfx/graphviz )
-	test? (
-		>=dev-libs/dbus-glib-0.82-r1
-		>=sys-apps/dbus-1.3.1[X] )
-"
-
-function inotify_enabled() {
-	if linux_config_exists; then
-		if ! linux_chkconfig_present INOTIFY_USER; then
-			ewarn "You should enable the INOTIFY support in your kernel."
-			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
-			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
-			die 'missing CONFIG_INOTIFY'
-		fi
-	else
-		einfo "Could not check for INOTIFY support in your kernel."
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	inotify_enabled
-
-	if use upnp ; then
-		G2CONF="${G2CONF} --enable-video-extractor=gupnp-dlna"
-	elif use gstreamer ; then
-		G2CONF="${G2CONF}
-			--enable-video-extractor=gstreamer
-			--enable-gstreamer-tagreadbin"
-		# --enable-gstreamer-helix (real media)
-	elif use xine ; then
-		G2CONF="${G2CONF} --enable-video-extractor=xine"
-	else
-		G2CONF="${G2CONF} --enable-video-extractor=external"
-	fi
-
-	# upower is used for AC power detection
-	if use laptop; then
-		G2CONF="${G2CONF} --disable-hal --enable-upower"
-	else
-		G2CONF="${G2CONF} --disable-hal --disable-upower"
-	fi
-
-	if use applet || use gtk; then
-		G2CONF="${G2CONF} VALAC=$(type -P valac-0.12)"
-	fi
-
-	if use mp3 && (use gtk || use qt4); then
-		G2CONF="${G2CONF} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)"
-	fi
-
-	# unicode-support: libunistring, libicu or glib ?
-	G2CONF="${G2CONF}
-		--enable-tracker-fts
-		--with-enca
-		--with-unicode-support=libicu
-		--enable-guarantee-metadata
-		$(use_enable applet tracker-search-bar)
-		$(use_enable eds miner-evolution)
-		$(use_enable exif libexif)
-		$(use_enable flac libflac)
-		$(use_enable gnome-keyring)
-		$(use_enable gsf libgsf)
-		$(use_enable gtk tracker-explorer)
-		$(use_enable gtk tracker-preferences)
-		$(use_enable gtk tracker-needle)
-		$(use_enable iptc libiptcdata)
-		$(use_enable jpeg libjpeg)
-		$(use_enable mp3 taglib)
-		$(use_enable nautilus nautilus-extension)
-		$(use_enable networkmanager network-manager)
-		$(use_enable pdf poppler)
-		$(use_enable playlist)
-		$(use_enable rss miner-rss)
-		$(use_enable strigi libstreamanalyzer)
-		$(use_enable test functional-tests)
-		$(use_enable test unit-tests)
-		$(use_enable tiff libtiff)
-		$(use_enable vorbis libvorbis)
-		$(use_enable xml libxml2)
-		$(use_enable xmp exempi)"
-
-	DOCS="AUTHORS ChangeLog NEWS README"
-
-	python_set_active_version 2
-}
-
-src_prepare() {
-	# Fix build failures with USE=strigi
-	epatch "${FILESDIR}/${PN}-0.8.0-strigi.patch"
-
-	# Fix functional tests scripts
-	find "${S}" -name "*.pyc" -delete
-	python_convert_shebangs 2 "${S}"/tests/tracker-writeback/*.py
-	python_convert_shebangs 2 "${S}"/tests/functional-tests/*.py
-	python_convert_shebangs 2 "${S}"/utils/data-generators/cc/{*.py,generate}
-	python_convert_shebangs 2 "${S}"/utils/gtk-sparql/*.py
-	python_convert_shebangs 2 "${S}"/examples/rss-reader/*.py
-
-	# FIXME: report broken tests
-	sed -e '/\/libtracker-miner\/tracker-password-provider\/setting/,+1 s:^\(.*\)$:/*\1*/:' \
-		-e '/\/libtracker-miner\/tracker-password-provider\/getting/,+1 s:^\(.*\)$:/*\1*/:' \
-		-i tests/libtracker-miner/tracker-password-provider-test.c || die
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check XDG_DATA_HOME="${T}" XDG_CONFIG_HOME="${T}" || die "tests failed"
-}
-
-src_install() {
-	gnome2_src_install
-	# Tracker and none of the plugins it provides needs la files
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/app-misc/tracker/tracker-0.10.8.ebuild b/app-misc/tracker/tracker-0.10.8.ebuild
index 5525f27f89e2..cf5ce9d8cf56 100644
--- a/app-misc/tracker/tracker-0.10.8.ebuild
+++ b/app-misc/tracker/tracker-0.10.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.10.8.ebuild,v 1.1 2011/04/11 22:27:21 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.10.8.ebuild,v 1.2 2011/04/14 12:28:44 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -65,7 +65,8 @@ RDEPEND="
 		gtk? ( x11-libs/gdk-pixbuf:2 )
 		qt4? ( >=x11-libs/qt-gui-4.7.1:4 ) )
 	nautilus? (
-		gnome-base/nautilus
+		>=gnome-base/nautilus-2
+		<gnome-base/nautilus-2.90
 		>=x11-libs/gtk+-2.18:2 )
 	networkmanager? ( >=net-misc/networkmanager-0.8 )
 	pdf? (
diff --git a/app-misc/tracker/tracker-0.8.17.ebuild b/app-misc/tracker/tracker-0.8.17.ebuild
index f06be7921f24..fd47212d6c1f 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-2011 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.12 2011/03/27 08:11:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.8.17.ebuild,v 1.13 2011/04/14 12:28:44 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -53,7 +53,8 @@ RDEPEND="
 	laptop? ( >=sys-power/upower-0.9 )
 	mp3? ( >=media-libs/id3lib-3.8.3 )
 	nautilus? (
-		gnome-base/nautilus
+		>=gnome-base/nautilus-2
+		<gnome-base/nautilus-2.90
 		>=x11-libs/gtk+-2.18:2 )
 	pdf? (
 		>=x11-libs/cairo-1