Evolution plugin fundamentally incompatible with evolution-3.6, see bug #436460. Update license. Unify tracker-0.14.2-r1 and -9999 ebuilds as much as possible for ease of maintenance. Update icu patch to upstreamed version. Vala is not needed for 0.14.2 tarball release. Drop old versions.

(Portage version: 2.2.0_alpha132/cvs/Linux x86_64)

10 files changed, 117 insertions, 549 deletions

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index 4d9667ad3dda..752ea32aa6e9 100644
--- a/app-misc/tracker/ChangeLog
+++ b/app-misc/tracker/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-misc/tracker
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.131 2012/09/08 02:07:53 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.132 2012/09/28 04:27:43 tetromino Exp $
+
+  28 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -tracker-0.10.27.ebuild, tracker-0.10.35.ebuild, tracker-0.12.10.ebuild,
+  tracker-0.12.10-r1.ebuild, -tracker-0.14.1.ebuild, tracker-0.14.2.ebuild,
+  tracker-0.14.2-r1.ebuild, files/tracker-0.14.2-icu-no-LC_ALL.patch,
+  tracker-9999.ebuild:
+  Evolution plugin fundamentally incompatible with evolution-3.6, see bug
+  #436460. Update license. Unify tracker-0.14.2-r1 and -9999 ebuilds as much as
+  possible for ease of maintenance. Update icu patch to upstreamed version.
+  Vala is not needed for 0.14.2 tarball release. Drop old versions.
 
   08 Sep 2012; Nirbheek Chauhan <nirbheek@gentoo.org> tracker-0.14.2-r1.ebuild:
   Use either vala-0.14, or vala-0.18
diff --git a/app-misc/tracker/files/tracker-0.14.2-icu-no-LC_ALL.patch b/app-misc/tracker/files/tracker-0.14.2-icu-no-LC_ALL.patch
index 7ecac00c478c..b0615fbc772d 100644
--- a/app-misc/tracker/files/tracker-0.14.2-icu-no-LC_ALL.patch
+++ b/app-misc/tracker/files/tracker-0.14.2-icu-no-LC_ALL.patch
@@ -1,23 +1,20 @@
-From c0f298d3db5202d1e6de7e093923f396116eefc6 Mon Sep 17 00:00:00 2001
+From 48713ba26af38a15a97fc7ebb0828cd287ef2447 Mon Sep 17 00:00:00 2001
 From: Alexandre Rostovtsev <tetromino@gentoo.org>
 Date: Fri, 20 Jul 2012 10:46:33 -0400
-Subject: [PATCH] FTS parser: ICU cannot handle locale descriptions of > 157
- characters
+Subject: [PATCH] libtracker-fts: ICU cannot handle complex locale
+ descriptions
 
-ICU's unicode/uloc.h #defines ULOC_FULLNAME_CAPACITY as 157. If a locale
-description cannot fit in a buffer of size ULOC_FULLNAME_CAPACITY,
-ubrk_open(UBRK_WORD, locale, ...) will fail when attempring to
-canonicalize the locale string.
+ubrk_open expects the name of just a single locale (e.g. "en_US.UTF-8"),
+not the full definition of your various locale variables and their
+values as returned by glibc's setlocale(LC_ALL, NULL).
 
-To avoid this, we must not pass setlocale(LC_ALL, NULL) to ICU since that
-can easily be >200 chars for common locales. Instead, limit ourselves to
-LC_CTYPE, since after all, that's all we need to determine word
-boundaries.
+Instead, limit ourselves to LC_CTYPE, since after all, that's all we
+need to determine word boundaries.
 
-https://bugzilla.gnome.org/show_bug.cgi?id=675660
+Fixes GB#675660.
 ---
- src/libtracker-fts/tracker-parser-libicu.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ src/libtracker-fts/tracker-parser-libicu.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/libtracker-fts/tracker-parser-libicu.c b/src/libtracker-fts/tracker-parser-libicu.c
 index 7388f69..69f75ed 100644
@@ -33,5 +30,5 @@ index 7388f69..69f75ed 100644
  		                       parser->utxt_size,
  		                       &error);
 -- 
-1.7.8.6
+1.7.12
 
diff --git a/app-misc/tracker/tracker-0.10.27.ebuild b/app-misc/tracker/tracker-0.10.27.ebuild
deleted file mode 100644
index f580b359722f..000000000000
--- a/app-misc/tracker/tracker-0.10.27.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.10.27.ebuild,v 1.3 2012/05/03 19:41:31 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="xz"
-PYTHON_DEPEND="2:2.6"
-
-inherit eutils gnome2 linux-info python virtualx
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="http://projects.gnome.org/tracker/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# USE="doc" is managed by eclass.
-IUSE="applet doc eds exif flac flickr gif gnome-keyring gsf gstreamer gtk +introspection 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"
-
-# vala is built with debug by default (see VALAFLAGS)
-RDEPEND="
-	>=app-i18n/enca-1.9
-	>=dev-db/sqlite-3.7[threadsafe]
-	>=dev-libs/dbus-glib-0.82-r1
-	>=dev-libs/glib-2.28: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 )
-	flickr? ( net-libs/rest:0.7 )
-	gif? ( media-libs/giflib )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 )
-	gsf? (
-		app-text/odt2txt
-		>=gnome-extra/libgsf-1.13 )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10.31:0.10
-		upnp? ( >=media-libs/gupnp-dlna-0.5 ) )
-	!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
-	gtk? (
-		>=dev-libs/libgee-0.3:0
-		>=x11-libs/gtk+-2.18:2 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	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-2
-		<gnome-base/nautilus-2.90
-		>=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
-	virtual/pkgconfig
-	applet? ( >=dev-lang/vala-0.12:0.12 )
-	gtk? (
-		app-office/dia
-		>=dev-lang/vala-0.12: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 gstreamer ; then
-		G2CONF="${G2CONF} --enable-generic-media-extractor=gstreamer"
-		if use upnp; then
-			G2CONF="${G2CONF} --with-gstreamer-backend=gupnp-dlna"
-		else
-			G2CONF="${G2CONF} --with-gstreamer-backend=discoverer"
-		fi
-	elif use xine ; then
-		G2CONF="${G2CONF} --enable-generic-media-extractor=xine"
-	else
-		G2CONF="${G2CONF} --enable-generic-media-extractor=external"
-	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}
-		--disable-hal
-		--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 flickr miner-flickr)
-		$(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 introspection)
-		$(use_enable iptc libiptcdata)
-		$(use_enable jpeg libjpeg)
-		$(use_enable laptop upower)
-		$(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"
-}
diff --git a/app-misc/tracker/tracker-0.10.35.ebuild b/app-misc/tracker/tracker-0.10.35.ebuild
index d3e8f0cced20..aef1e5b21a9d 100644
--- a/app-misc/tracker/tracker-0.10.35.ebuild
+++ b/app-misc/tracker/tracker-0.10.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.10.35.ebuild,v 1.3 2012/05/03 19:41:31 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.10.35.ebuild,v 1.4 2012/09/28 04:27:43 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ inherit eutils gnome2 linux-info python virtualx
 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="http://projects.gnome.org/tracker/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # USE="doc" is managed by eclass.
@@ -42,7 +42,9 @@ RDEPEND="
 		>=x11-libs/gtk+-3:3 )
 	eds? (
 		>=mail-client/evolution-2.32
-		>=gnome-extra/evolution-data-server-2.32 )
+		>=gnome-extra/evolution-data-server-2.32
+		<mail-client/evolution-3
+		<gnome-extra/evolution-data-server-3 )
 	exif? ( >=media-libs/libexif-0.6 )
 	flac? ( >=media-libs/flac-1.2.1 )
 	flickr? ( net-libs/rest:0.7 )
diff --git a/app-misc/tracker/tracker-0.12.10-r1.ebuild b/app-misc/tracker/tracker-0.12.10-r1.ebuild
index a0f4baa4d80b..768b80b385cf 100644
--- a/app-misc/tracker/tracker-0.12.10-r1.ebuild
+++ b/app-misc/tracker/tracker-0.12.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.10-r1.ebuild,v 1.1 2012/07/20 15:47:53 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.10-r1.ebuild,v 1.2 2012/09/28 04:27:43 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ inherit eutils gnome2 linux-info multilib python versionator
 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="http://projects.gnome.org/tracker/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # USE="doc" is managed by eclass.
@@ -44,7 +44,9 @@ RDEPEND="
 		>=x11-libs/gtk+-3.0:3 )
 	eds? (
 		>=mail-client/evolution-2.91.90
-		>=gnome-extra/evolution-data-server-2.91.90 )
+		>=gnome-extra/evolution-data-server-2.91.90
+		<mail-client/evolution-3.5.3
+		<gnome-extra/evolution-data-server-3.5.3 )
 	elibc_glibc? ( >=sys-libs/glibc-2.12 )
 	exif? ( >=media-libs/libexif-0.6 )
 	firefox-bookmarks? ( || (
diff --git a/app-misc/tracker/tracker-0.12.10.ebuild b/app-misc/tracker/tracker-0.12.10.ebuild
index f49839313175..e2b4110b32ec 100644
--- a/app-misc/tracker/tracker-0.12.10.ebuild
+++ b/app-misc/tracker/tracker-0.12.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.10.ebuild,v 1.3 2012/05/03 19:41:31 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.10.ebuild,v 1.4 2012/09/28 04:27:43 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ inherit eutils gnome2 linux-info multilib python versionator
 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="http://projects.gnome.org/tracker/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # USE="doc" is managed by eclass.
@@ -44,7 +44,9 @@ RDEPEND="
 		>=x11-libs/gtk+-3.0:3 )
 	eds? (
 		>=mail-client/evolution-2.91.90
-		>=gnome-extra/evolution-data-server-2.91.90 )
+		>=gnome-extra/evolution-data-server-2.91.90
+		<mail-client/evolution-3.5.3
+		<gnome-extra/evolution-data-server-3.5.3 )
 	elibc_glibc? ( >=sys-libs/glibc-2.12 )
 	exif? ( >=media-libs/libexif-0.6 )
 	firefox-bookmarks? ( || (
diff --git a/app-misc/tracker/tracker-0.14.1.ebuild b/app-misc/tracker/tracker-0.14.1.ebuild
deleted file mode 100644
index f9acd5f2d804..000000000000
--- a/app-misc/tracker/tracker-0.14.1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.1.ebuild,v 1.1 2012/05/07 07:42:32 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.6"
-
-inherit eutils gnome2 linux-info multilib python versionator
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="http://projects.gnome.org/tracker/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# USE="doc" is managed by eclass.
-IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop mp3 nautilus networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # qt4 strigi
-REQUIRED_USE="cue? ( gstreamer )"
-
-# Test suite highly disfunctional, loops forever
-# putting aside for now
-RESTRICT="test"
-
-# vala is built with debug by default (see VALAFLAGS)
-# According to NEWS, introspection is non-optional
-# glibc-2.12 needed for SCHED_IDLE (see bug #385003)
-RDEPEND="
-	>=app-i18n/enca-1.9
-	>=dev-db/sqlite-3.7[threadsafe]
-	>=dev-libs/glib-2.28:2
-	>=dev-libs/gobject-introspection-0.9.5
-	>=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.6
-		>=x11-libs/gdk-pixbuf-2.12:2
-		>=x11-libs/gtk+-3.0:3 )
-	cue? ( media-libs/libcue )
-	eds? (
-		>=mail-client/evolution-3.3.5
-		>=gnome-extra/evolution-data-server-3.3.5 )
-	elibc_glibc? ( >=sys-libs/glibc-2.12 )
-	exif? ( >=media-libs/libexif-0.6 )
-	firefox-bookmarks? ( || (
-		>=www-client/firefox-4.0
-		>=www-client/firefox-bin-4.0 ) )
-	flac? ( >=media-libs/flac-1.2.1 )
-	flickr? ( net-libs/rest:0.7 )
-	gif? ( media-libs/giflib )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 )
-	gsf? ( >=gnome-extra/libgsf-1.13 )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10.31:0.10
-		upnp? ( >=media-libs/gupnp-dlna-0.5 )
-		!upnp? ( >=media-libs/gst-plugins-base-0.10.31 ) )
-	!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
-	gtk? (
-		>=dev-libs/libgee-0.3:0
-		>=x11-libs/gtk+-3.0.0:3 )
-	iptc? ( media-libs/libiptcdata )
-	iso? ( >=sys-libs/libosinfo-0.0.2 )
-	jpeg? ( virtual/jpeg:0 )
-	laptop? ( >=sys-power/upower-0.9 )
-	mp3? (
-		>=media-libs/taglib-1.6
-		gtk? ( x11-libs/gdk-pixbuf: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 )
-	thunderbird? ( || (
-		>=mail-client/thunderbird-5.0
-		>=mail-client/thunderbird-bin-5.0 ) )
-	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 )"
-#	strigi? ( >=app-misc/strigi-0.7 )
-#	mp3? ( qt4? (  >=x11-libs/qt-gui-4.7.1:4 ) )
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	applet? ( >=dev-lang/vala-0.13.4:0.14 )
-	gtk? (
-		>=dev-lang/vala-0.13.4:0.14
-		>=dev-libs/libgee-0.3 )
-	doc? (
-		app-office/dia
-		>=dev-util/gtk-doc-1.8
-		media-gfx/graphviz )
-	test? (
-		>=dev-libs/dbus-glib-0.82-r1
-		>=sys-apps/dbus-1.3.1[X] )
-"
-#	strigi? ( >=dev-lang/vala-0.13.4:0.14 )
-PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-0.14 )"
-
-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 gstreamer ; then
-		G2CONF="${G2CONF} --enable-generic-media-extractor=gstreamer"
-		if use upnp; then
-			G2CONF="${G2CONF} --with-gstreamer-backend=gupnp-dlna"
-		else
-			G2CONF="${G2CONF} --with-gstreamer-backend=discoverer"
-		fi
-	elif use xine ; then
-		G2CONF="${G2CONF} --enable-generic-media-extractor=xine"
-	else
-		G2CONF="${G2CONF} --enable-generic-media-extractor=external"
-	fi
-
-	# if use applet || use gtk || use strigi; then
-	if use applet || use gtk; then
-		G2CONF="${G2CONF} VALAC=$(type -P valac-0.14)"
-	fi
-
-	# if use mp3 && (use gtk || use qt4); then
-	if use mp3 && use gtk; then
-		#G2CONF="${G2CONF} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)"
-		G2CONF="${G2CONF} --enable-gdkpixbuf"
-	fi
-
-	# unicode-support: libunistring, libicu or glib ?
-	# According to NEWS, introspection is required
-	# FIXME: disabling streamanalyzer for now since tracker-sparql-builder.h
-	# is not being generated
-	# XXX: disabling qt since tracker-albumart-qt is unstable; bug #385345
-	# nautilus extension is in a separate package, nautilus-tracker-tags
-	G2CONF="${G2CONF}
-		--disable-hal
-		--enable-tracker-fts
-		--with-enca
-		--with-unicode-support=libicu
-		--enable-guarantee-metadata
-		--enable-introspection
-		--disable-libstreamanalyzer
-		--disable-qt
-		--disable-nautilus-extension
-		$(use_enable applet tracker-search-bar)
-		$(use_enable cue libcue)
-		$(use_enable eds miner-evolution)
-		$(use_enable exif libexif)
-		$(use_enable firefox-bookmarks miner-firefox)
-		$(use_with firefox-bookmarks firefox-plugin-dir ${EPREFIX}/usr/$(get_libdir)/firefox/extensions)
-		FIREFOX=${S}/firefox-version.sh
-		$(use_enable flac libflac)
-		$(use_enable flickr miner-flickr)
-		$(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 iso libosinfo)
-		$(use_enable jpeg libjpeg)
-		$(use_enable laptop upower)
-		$(use_enable mp3 taglib)
-		$(use_enable networkmanager network-manager)
-		$(use_enable pdf poppler)
-		$(use_enable playlist)
-		$(use_enable rss miner-rss)
-		$(use_enable test functional-tests)
-		$(use_enable test unit-tests)
-		$(use_enable thunderbird miner-thunderbird)
-		$(use_with thunderbird thunderbird-plugin-dir ${EPREFIX}/usr/$(get_libdir)/thunderbird/extensions)
-		THUNDERBIRD=${S}/thunderbird-version.sh
-		$(use_enable tiff libtiff)
-		$(use_enable vorbis libvorbis)
-		$(use_enable xml libxml2)
-		$(use_enable xmp exempi)"
-	#	$(use_enable strigi libstreamanalyzer)
-
-	DOCS="AUTHORS ChangeLog NEWS README"
-
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Fix functional tests scripts
-	find "${S}" -name "*.pyc" -delete
-	python_convert_shebangs -r 2 tests utils examples
-
-	# Don't run 'firefox --version' or 'thunderbird --version'; it results in
-	# access violations on some setups (bug #385347, #385495).
-	create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
-	create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
-
-	# 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
-
-	gnome2_src_prepare
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check XDG_DATA_HOME="${T}" XDG_CONFIG_HOME="${T}"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Manually symlink extensions for {firefox,thunderbird}-bin
-	if use firefox-bookmarks; then
-		dosym /usr/share/xul-ext/trackerfox \
-			/usr/$(get_libdir)/firefox-bin/extensions/trackerfox@bustany.org
-	fi
-
-	if use thunderbird; then
-		dosym /usr/share/xul-ext/trackerbird \
-			/usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org
-	fi
-}
-
-create_version_script() {
-	# Create script $3 that prints "$2 MAX(VERSION($1), VERSION($1-bin))"
-
-	local v=$(best_version ${1})
-	v=${v#${1}-}
-	local vbin=$(best_version ${1}-bin)
-	vbin=${vbin#${1}-bin-}
-
-	if [[ -z ${v} ]]; then
-		v=${vbin}
-	else
-		version_compare ${v} ${vbin}
-		[[ $? -eq 1 ]] && v=${vbin}
-	fi
-
-	echo -e "#!/bin/sh\necho $2 $v" > "$3" || die
-	chmod +x "$3" || die
-}
diff --git a/app-misc/tracker/tracker-0.14.2-r1.ebuild b/app-misc/tracker/tracker-0.14.2-r1.ebuild
index 59b4f08b771e..838c436ea601 100644
--- a/app-misc/tracker/tracker-0.14.2-r1.ebuild
+++ b/app-misc/tracker/tracker-0.14.2-r1.ebuild
@@ -1,34 +1,40 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.2-r1.ebuild,v 1.2 2012/09/08 02:07:53 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.2-r1.ebuild,v 1.3 2012/09/28 04:27:43 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.6"
+VALA_MIN_API_VERSION="0.14"
 
-inherit eutils gnome2 linux-info multilib python versionator
+[[ ${PV} = 9999 ]] && inherit autotools git-2
+inherit eutils gnome2 linux-info multilib python vala versionator virtualx
 
 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="http://projects.gnome.org/tracker/"
+EGIT_REPO_URI="git://git.gnome.org/${PN}
+	http://git.gnome.org/browse/${PN}"
+[[ ${PV} = 9999 ]] && SRC_URI=""
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
 # USE="doc" is managed by eclass.
-IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop mp3 nautilus networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # qt4 strigi
+IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # qt4 strigi
+[[ ${PV} = 9999 ]] || IUSE="${IUSE} nautilus"
 REQUIRED_USE="cue? ( gstreamer )"
 
 # Test suite highly disfunctional, loops forever
 # putting aside for now
 RESTRICT="test"
 
-# vala is built with debug by default (see VALAFLAGS)
 # According to NEWS, introspection is non-optional
 # glibc-2.12 needed for SCHED_IDLE (see bug #385003)
-VALA_DEP="|| (
-	dev-lang/vala:0.18
-	>=dev-lang/vala-0.13.4:0.14 )"
 RDEPEND="
 	>=app-i18n/enca-1.9
 	>=dev-db/sqlite-3.7[threadsafe]
@@ -45,11 +51,13 @@ RDEPEND="
 	applet? (
 		>=gnome-base/gnome-panel-2.91.6
 		>=x11-libs/gdk-pixbuf-2.12:2
-		>=x11-libs/gtk+-3.0:3 )
+		>=x11-libs/gtk+-3:3 )
 	cue? ( media-libs/libcue )
 	eds? (
 		>=mail-client/evolution-3.3.5
-		>=gnome-extra/evolution-data-server-3.3.5 )
+		>=gnome-extra/evolution-data-server-3.3.5
+		<mail-client/evolution-3.5.3
+		<gnome-extra/evolution-data-server-3.5.3 )
 	elibc_glibc? ( >=sys-libs/glibc-2.12 )
 	exif? ( >=media-libs/libexif-0.6 )
 	firefox-bookmarks? ( || (
@@ -67,7 +75,7 @@ RDEPEND="
 	!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
 	gtk? (
 		>=dev-libs/libgee-0.3:0
-		>=x11-libs/gtk+-3.0.0:3 )
+		>=x11-libs/gtk+-3:3 )
 	iptc? ( media-libs/libiptcdata )
 	iso? ( >=sys-libs/libosinfo-0.0.2 )
 	jpeg? ( virtual/jpeg:0 )
@@ -96,10 +104,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
-	applet? ( ${VALA_DEP} )
-	gtk? (
-		${VALA_DEP}
-		>=dev-libs/libgee-0.3 )
+	gtk? ( >=dev-libs/libgee-0.3 )
 	doc? (
 		app-office/dia
 		>=dev-util/gtk-doc-1.8
@@ -108,8 +113,12 @@ DEPEND="${RDEPEND}
 		>=dev-libs/dbus-glib-0.82-r1
 		>=sys-apps/dbus-1.3.1[X] )
 "
-#	strigi? ( ${VALA_DEP} )
-PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-0.14 )"
+[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/gtk-doc-1.8
+	$(vala_depend)
+"
+[[ ${PV} = 9999 ]] || PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-0.14 )"
 
 function inotify_enabled() {
 	if linux_config_exists; then
@@ -142,15 +151,6 @@ pkg_setup() {
 		G2CONF="${G2CONF} --enable-generic-media-extractor=external"
 	fi
 
-	# if use applet || use gtk || use strigi; then
-	if use applet || use gtk; then
-		if has_version "dev-lang/vala:0.18"; then
-			G2CONF="${G2CONF} VALAC=$(type -P valac-0.18)"
-		else
-			G2CONF="${G2CONF} VALAC=$(type -P valac-0.14)"
-		fi
-	fi
-
 	# if use mp3 && (use gtk || use qt4); then
 	if use mp3 && use gtk; then
 		#G2CONF="${G2CONF} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)"
@@ -213,6 +213,14 @@ pkg_setup() {
 	python_pkg_setup
 }
 
+src_unpack() {
+	if [[ ${PV} = 9999 ]]; then
+		git_src_unpack
+	else
+		gnome2_src_unpack
+	fi
+}
+
 src_prepare() {
 	# bug #426276, https://bugzilla.gnome.org/show_bug.cgi?id=675660
 	epatch "${FILESDIR}/${PN}-0.14.2-icu-no-LC_ALL.patch"
@@ -231,6 +239,10 @@ src_prepare() {
 		-e '/\/libtracker-miner\/tracker-password-provider\/getting/,+1 s:^\(.*\)$:/*\1*/:' \
 		-i tests/libtracker-miner/tracker-password-provider-test.c || die
 
+	if [[ ${PV} = 9999 ]]; then
+		eautoreconf
+		vala_src_prepare
+	fi
 	gnome2_src_prepare
 }
 
diff --git a/app-misc/tracker/tracker-0.14.2.ebuild b/app-misc/tracker/tracker-0.14.2.ebuild
index ca57bdb48ea6..e7c1743364cc 100644
--- a/app-misc/tracker/tracker-0.14.2.ebuild
+++ b/app-misc/tracker/tracker-0.14.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.2.ebuild,v 1.1 2012/07/05 23:35:08 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.2.ebuild,v 1.2 2012/09/28 04:27:43 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ inherit eutils gnome2 linux-info multilib python versionator
 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="http://projects.gnome.org/tracker/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # USE="doc" is managed by eclass.
@@ -46,7 +46,9 @@ RDEPEND="
 	cue? ( media-libs/libcue )
 	eds? (
 		>=mail-client/evolution-3.3.5
-		>=gnome-extra/evolution-data-server-3.3.5 )
+		>=gnome-extra/evolution-data-server-3.3.5
+		<mail-client/evolution-3.5.3
+		<gnome-extra/evolution-data-server-3.5.3 )
 	elibc_glibc? ( >=sys-libs/glibc-2.12 )
 	exif? ( >=media-libs/libexif-0.6 )
 	firefox-bookmarks? ( || (
diff --git a/app-misc/tracker/tracker-9999.ebuild b/app-misc/tracker/tracker-9999.ebuild
index d263b38a0831..cd8a726685a2 100644
--- a/app-misc/tracker/tracker-9999.ebuild
+++ b/app-misc/tracker/tracker-9999.ebuild
@@ -1,32 +1,38 @@
 # Copyright 1999-2012 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.51 2012/05/07 07:42:32 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.52 2012/09/28 04:27:43 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.6"
+VALA_MIN_API_VERSION="0.14"
 
-inherit autotools git-2 gnome2 linux-info multilib python versionator virtualx
+[[ ${PV} = 9999 ]] && inherit autotools git-2
+inherit gnome2 linux-info multilib python vala versionator virtualx
 
 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="http://projects.gnome.org/tracker/"
 EGIT_REPO_URI="git://git.gnome.org/${PN}
 	http://git.gnome.org/browse/${PN}"
-SRC_URI=""
+[[ ${PV} = 9999 ]] && SRC_URI=""
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS=""
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
 # USE="doc" is managed by eclass.
-IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # nautilus qt4 strigi
+IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # qt4 strigi
+[[ ${PV} = 9999 ]] || IUSE="${IUSE} nautilus"
 REQUIRED_USE="cue? ( gstreamer )"
 
 # Test suite highly disfunctional, loops forever
 # putting aside for now
 RESTRICT="test"
 
-# vala is built with debug by default (see VALAFLAGS)
 # According to NEWS, introspection is non-optional
 # glibc-2.12 needed for SCHED_IDLE (see bug #385003)
 RDEPEND="
@@ -49,7 +55,9 @@ RDEPEND="
 	cue? ( media-libs/libcue )
 	eds? (
 		>=mail-client/evolution-3.3.5
-		>=gnome-extra/evolution-data-server-3.3.5 )
+		>=gnome-extra/evolution-data-server-3.3.5
+		<mail-client/evolution-3.5.3
+		<gnome-extra/evolution-data-server-3.5.3 )
 	elibc_glibc? ( >=sys-libs/glibc-2.12 )
 	exif? ( >=media-libs/libexif-0.6 )
 	firefox-bookmarks? ( || (
@@ -96,21 +104,21 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
-	dev-util/gtk-doc-am
-	>=dev-util/gtk-doc-1.8
-	applet? ( >=dev-lang/vala-0.13.4:0.14 )
-	gtk? (
-		app-office/dia
-		>=dev-lang/vala-0.13.4:0.14
-		>=dev-libs/libgee-0.3 )
+	gtk? ( >=dev-libs/libgee-0.3 )
 	doc? (
+		app-office/dia
+		>=dev-util/gtk-doc-1.8
 		media-gfx/graphviz )
 	test? (
 		>=dev-libs/dbus-glib-0.82-r1
 		>=sys-apps/dbus-1.3.1[X] )
 "
-#	strigi? ( >=dev-lang/vala-0.12:0.12 )
-#PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-${PV} )"
+[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/gtk-doc-1.8
+	$(vala_depend)
+"
+[[ ${PV} = 9999 ]] || PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-${PV} )"
 
 function inotify_enabled() {
 	if linux_config_exists; then
@@ -143,11 +151,6 @@ pkg_setup() {
 		G2CONF="${G2CONF} --enable-generic-media-extractor=external"
 	fi
 
-	# if use applet || use gtk || use strigi; then
-	if use applet || use gtk; then
-		G2CONF="${G2CONF} VALAC=$(type -P valac-0.14)"
-	fi
-
 	# if use mp3 && (use gtk || use qt4); then
 	if use mp3 && use gtk; then
 		#G2CONF="${G2CONF} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)"
@@ -207,10 +210,15 @@ pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README"
 
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_unpack() {
-	git_src_unpack
+	if [[ ${PV} = 9999 ]]; then
+		git_src_unpack
+	else
+		gnome2_src_unpack
+	fi
 }
 
 src_prepare() {
@@ -223,10 +231,10 @@ src_prepare() {
 	create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
 	create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
 
-	gtkdocize || die "gtkdocize failed"
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-
+	if [[ ${PV} = 9999 ]]; then
+		eautoreconf
+		vala_src_prepare
+	fi
 	gnome2_src_prepare
 }