Clean up live bits from non-live ebuilds. Raise totem-pl-parser dependency, bug #461220. Use slotted libgrss. Clean up old revision.

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

6 files changed, 43 insertions, 386 deletions

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index 487607ec6876..fea8665b7234 100644
--- a/app-misc/tracker/ChangeLog
+++ b/app-misc/tracker/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/tracker
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.152 2013/04/06 03:06:30 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.153 2013/04/09 21:26:48 eva Exp $
+
+  09 Apr 2013; Gilles Dartiguelongue <eva@gentoo.org> -tracker-0.14.4.ebuild,
+  tracker-0.14.5.ebuild, tracker-0.16.0.ebuild, tracker-9999.ebuild:
+  Clean up live bits from non-live ebuilds. Raise totem-pl-parser dependency,
+  bug #461220. Use slotted libgrss. Clean up old revision.
 
   06 Apr 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
   tracker-0.14.4.ebuild, tracker-0.14.5.ebuild, tracker-0.16.0.ebuild,
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 12cd646b40f2..97c985ea78de 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,23 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST tracker-0.14.4.tar.xz 5946796 SHA256 b818ee42b9007a94b2f8046edc4706bb2036187d5fd304e7ae23e5d2fcf85918 SHA512 e9d6d28276dc7f9930f0e8801fa3b3ea2a30ced0979309418ff5a36d7417ab85fb4d2c246032cad88ea63a4716b301db95a0046bd17eb1849e8a9a7edc464103 WHIRLPOOL 82aebbd0596c931867c65612672af52a510da202c881b2e1fdaa9a07136f8bef2840c2d0a6546ba0e6a53c9e61c973925dbc917ba5d8ec3b385f0656a34b926a
 DIST tracker-0.14.5.tar.xz 6065728 SHA256 cabef75eb18ad35208000dc472bdc20a74269799414527ee6e1c1c1cfb28eec8 SHA512 ab65d5618ef51d23b65e3d6972834e573415dba52e7bb9f20f8f9d4d4aab467b667301e6540083401d91c9e36cb63fdb2259f6dd9e975e9ff60bf1f83245b777 WHIRLPOOL 4c2c5ad9ff0d7a35c5e9c6bc42b354b9967a436cb1a8b2b640ca09e102a428e268bd011e0405a2b331f80df5a69dcd7e0afc693ae4969604ee41088e5da0c25b
 DIST tracker-0.16.0.tar.xz 5921104 SHA256 299c6a180370522d1d794c184aaef8d8222d3f737d564b8e5ca25b8751470c4f SHA512 621b0ab202bfbe6f29d8d75333a8f051b677c14c9c352d09afef92aca7f908b82307ceea4e1e55f14fc0666d8256019ff7e2664737eb34b6ab8c22a742696a40 WHIRLPOOL 245a64d577bccd65798ad90459a027d5f5b9cc344fcff298ed8912562a7391b982b2fb5ba12aa81b9208fab35f6cb769ff27c3b694e1f0d709696f473ee329db
-EBUILD tracker-0.14.4.ebuild 8935 SHA256 90d15d2fce78420979ea36de4573edcfa186f9070edf1164e47e30a0c782f857 SHA512 95daf34a45677245173bb20114cb32d4c4ffece023f8fefdfa83dfa9cee2e988127ae0e250e61d2b7a526fa9c557eccc9d2f6cd728a8976bee1f2128016a0ccf WHIRLPOOL 6ebba10fe8be5f410782e383e3bff9a9115060852c8ea15fac483d6a2e1497257bfaf57a7d0c47d19645f59b009317c659c38b38ad3a67b7ab807f2931306a62
-EBUILD tracker-0.14.5.ebuild 9561 SHA256 dcb1b4ac0a0d57c9361088096325ada8aa15ef9b56226d309e7318375e0aff07 SHA512 305f8c6c1b943dc95410f4cc00b65ef64f91bb55cc874467d48a497110048970a26dd6f2c4ef1ee1ed29aa44292079d8201c7885b327ad0a6042ebce4cf0c8a1 WHIRLPOOL 52463e6690dcfdc5bb209cb5ecf7270a6fa17728ded907b80ed2b855a7c8a3e6556905cc5499f1e4e45271d356ba9757f45c4f699a471677a5a6e4d41abf0dcd
-EBUILD tracker-0.16.0.ebuild 9038 SHA256 1e77cdbdb680ef97d4918e4812f37f879fdd7b45e289ae693b84222c7fd0839b SHA512 e713a7866b4ed7c508379169a099570ff924790753d03bcc147a77904c31616006652c8bd519cfd9fdd8dea4120def5dd654165ae17af487ae9e35fd48bce31a WHIRLPOOL 324479c343be65bb168a7f47c27f6804912e57f698163dc2ef408c82e94949ba0ae03acbe09e5e69a4dddbba2ff9b4e455ac95dde752fb9e58710f65df7d70d8
-EBUILD tracker-9999.ebuild 8191 SHA256 3a24b893a0d4b3da579d0736cc515af75155e92b1d4c302b9207298ba1b0d91c SHA512 8c42bb7dfa776e56b74e4eacf62dac9f0f47a12cae2710e97724f0543d17366c670ee12a590333dff99c961c2054a608629062eaebfb0308fea732b3ad3fd31f WHIRLPOOL b4c782f75cfa580b4c8405215c9c8488067ac79af10d29e6f55594d392a9d4481815da15ef33f10c8922c97a4e92a7cc713d739467397db7c248531f44e97708
-MISC ChangeLog 28902 SHA256 b98e5001986a242c02da4adb1fa4d62db48430d0e1afc5f1be0d799a5f6fca5d SHA512 d32d291be4065ed1dbe614e02574ee2e547c4776072e88dbbeb17784e0057547e650005320614904eca827efbcc3ba05df02e136cc7c76962b960bf806371ee3 WHIRLPOOL 46b4b02e40ef4044c624c05dbe0f8c92dbbe54856e432d19b2a1737532f8199a2ca791fcedc3b00bfdc218510b3fcc6380cb7804ba3e809fcbd16c3a707df645
+EBUILD tracker-0.14.5.ebuild 8949 SHA256 a4f76ac7ed979e120b3c0ffb6cda195e8131c99acc64022666df4f780ec91c36 SHA512 55be06d87dcd1f730d89e71d199d1669f25b86a4b70552440627c52d420359a396a45350d7697a6acc1acc595d0732da23a1f9afcd0f6b0e6f29f33dc4d19361 WHIRLPOOL b4946b2b891a9cb3bf04ee3fe3a02f0243845bbb20e2fedad310ac9b9f262e701472a803c48e561f7c1549431b5ec1b150300b49d7b61f3fdf40b92682559f89
+EBUILD tracker-0.16.0.ebuild 8659 SHA256 2857f115694caf3dcf3aee49e68945279380e637edd3e5677c0eda9cdf13a638 SHA512 1be6eac7efa5ba1d5c85fc0e31c14d63e00eec56b5d7fa1355d51626f396f0c0a3fcaebe6a1da2304ab769f9c1a614c80efc508ef6abf814a0a2ed811ab7d6e6 WHIRLPOOL 8e86ea2755d4124977bdc57efdb95b1187adb99dd76cddd8252efa1c1994fb7a470908bdac0c6adce126b1b60b28737ef5fa15e6816beb92d363489067f79b11
+EBUILD tracker-9999.ebuild 8221 SHA256 49f1c3c69b4ac33522b5f8a54eb1dcf103f084847d98dabdb9e7d0cce65f4c6d SHA512 1176c893ac8d3abaaa3d711fd0fb5ce9cf1da56490537ae6a7136937a15fa0f60481a8e1694a124567cf5f1dcb7574c08c3ce131b70f15e2c2b8a5d4a9fec30a WHIRLPOOL f72b3074065993e01e314c63a3d4a9f42999a66b8d6b3a57f0d37d1c829eb322683b275b555e24c01b66b64a3dff57622dd5fc846d76089e403d50e1d1ae67c1
+MISC ChangeLog 29181 SHA256 07f3b74fb62fb63988c149e05e0c9d0c2e946c804ec1cb2ab9a8ce5e9c4a78bc SHA512 ded7825c002e8cb27fa726e086261d8a80ba70edee6c2bdaadd53053495ef77ce0feff131e2394a57bb6916dd1389cd348610abf98f7ba1aefd458c4c0b3104c WHIRLPOOL 356ba0dcfece799dd9d3c4336b3118dcc7e35626b6b5a39ca127368b09549e7207a158a9de09d11256281836301cc83a216a69e19ceb220e061e08a013de0450
 MISC metadata.xml 1601 SHA256 b7d9768eb7b4d1c588947299912d742751c1279f2cc1bd88a437b48eb3824554 SHA512 bc9ec7bfed8d73e1dfcadf6c2b2239595c6d06ad6d4f1657b4e405f8ff1e87af82fb122e267426fbed53fd7011699fa551bc66503d9cb58bf96ac1d6da1e9e61 WHIRLPOOL 27982acb9fbb780837c7a598bdffe0e4283bcb30ce72c3fcce069b933955cb5b7f485a75b7f54dbc66e851b4d9843959efcc0555435e27dc4bec7154112eaf56
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRX5E4AAoJEJ0WA1zPCt1hZXoH/jW5YJdQmODCOXG/JAry/sCy
-RpHv2wSsjb0HcUO3EaveWne1i1lSVkSLyloa4pbxFD+vWDscZPBAxrpQvr9e78bj
-0zBX05jEL/8Soh9jqC5t26ULuEBf+fnNMrOXwICebnBgxKwCEq5TZ8Wvrt1/iVDi
-a3nP7rgtnkWp7mbnqFWHT1Xo9S02eGIPmdnlmkMgU4Ebq+8VD/jYn0sM3t9ook8O
-Ky0e89jqQ4u3la7rPbyLVez/qnc9Ffx26g56v02+Xea8qYJMi/kIosK12tbPPIum
-WmfzsUdqpaU2qTuZ+ArR2apm++uBmDRYUZgPiN9e1Dn3Rx0xdts/tPKEg358bTc=
-=+Ve+
+iEYEAREIAAYFAlFkh5kACgkQ1fmVwcYIWAajSgCfeDRLcBBCAt0ov0r2r220VhQP
+v80Ani0QpUYfLlNfpVbl1K2jdReLq3O+
+=NFU/
 -----END PGP SIGNATURE-----
diff --git a/app-misc/tracker/tracker-0.14.4.ebuild b/app-misc/tracker/tracker-0.14.4.ebuild
deleted file mode 100644
index c82da4c8b117..000000000000
--- a/app-misc/tracker/tracker-0.14.4.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.4.ebuild,v 1.13 2013/04/06 03:06:30 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.6"
-VALA_MIN_API_VERSION="0.14"
-
-[[ ${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}"
-[[ ${PV} = 9999 ]] && SRC_URI=""
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~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 +miner-fs mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp-av +vorbis xine +xml xmp xps" # qt4 strigi
-[[ ${PV} = 9999 ]] || IUSE="${IUSE} nautilus"
-
-REQUIRED_USE="
-	^^ ( gstreamer xine )
-	cue? ( gstreamer )
-	upnp-av? ( gstreamer )
-	!miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
-"
-
-# Test suite highly disfunctional, loops forever
-# putting aside for now
-RESTRICT="test"
-
-# 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.14:=[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:0=
-	>=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:3 )
-	cue? ( media-libs/libcue )
-	eds? (
-		>=mail-client/evolution-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? ( || (
-		>=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
-		>=media-libs/gst-plugins-base-0.10.31:0.10 )
-	gtk? (
-		>=dev-libs/libgee-0.3:0
-		>=x11-libs/gtk+-3: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 )
-	upnp-av? ( >=media-libs/gupnp-dlna-0.5:1.0 )
-	vorbis? ( >=media-libs/libvorbis-0.22 )
-	xine? ( >=media-libs/xine-lib-1 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	xmp? ( >=media-libs/exempi-2.1 )
-	xps? ( app-text/libgxps )
-	!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
-"
-#	strigi? ( >=app-misc/strigi-0.7 )
-#	mp3? ( qt4? (  >=dev-qt/qtgui-4.7.1:4 ) )
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.8
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	gtk? ( >=dev-libs/libgee-0.3 )
-	doc? (
-		app-office/dia
-		media-gfx/graphviz )
-	test? (
-		>=dev-libs/dbus-glib-0.82-r1
-		>=sys-apps/dbus-1.3.1[X] )
-"
-[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
-	>=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
-		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
-
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} = 9999 ]]; then
-		git_src_unpack
-	else
-		gnome2_src_unpack
-	fi
-}
-
-src_prepare() {
-	# Fix functional tests scripts
-	find "${S}" -name "*.pyc" -delete
-	python_convert_shebangs -q -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
-
-	if [[ ${PV} = 9999 ]]; then
-		eautoreconf
-		vala_src_prepare
-	fi
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-
-	if use gstreamer ; then
-		myconf="${myconf} --enable-generic-media-extractor=gstreamer"
-		if use upnp-av; then
-			myconf="${myconf} --with-gstreamer-backend=gupnp-dlna"
-		else
-			myconf="${myconf} --with-gstreamer-backend=discoverer"
-		fi
-	elif use xine ; then
-		myconf="${myconf} --enable-generic-media-extractor=xine"
-	else
-		myconf="${myconf} --enable-generic-media-extractor=external"
-	fi
-
-	# if use mp3 && (use gtk || use qt4); then
-	if use mp3 && use gtk; then
-		#myconf="${myconf} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)"
-		myconf="${myconf} --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
-	gnome2_src_configure \
-		--disable-hal \
-		--disable-libstreamanalyzer \
-		--disable-nautilus-extension \
-		--disable-qt \
-		--enable-guarantee-metadata \
-		--enable-introspection \
-		--enable-tracker-fts \
-		--with-enca \
-		--with-unicode-support=libicu \
-		$(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-needle) \
-		$(use_enable gtk tracker-preferences) \
-		$(use_enable iptc libiptcdata) \
-		$(use_enable iso libosinfo) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable laptop upower) \
-		$(use_enable miner-fs) \
-		$(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 xps libgxps) \
-		${myconf}
-	#	$(use_enable strigi libstreamanalyzer)
-}
-
-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.5.ebuild b/app-misc/tracker/tracker-0.14.5.ebuild
index 7fb1b6e20416..00721efcdd01 100644
--- a/app-misc/tracker/tracker-0.14.5.ebuild
+++ b/app-misc/tracker/tracker-0.14.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.5.ebuild,v 1.5 2013/04/06 03:06:30 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.5.ebuild,v 1.6 2013/04/09 21:26:48 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -8,26 +8,15 @@ GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python2_{6,7} )
 VALA_MIN_API_VERSION="0.14"
 
-[[ ${PV} = 9999 ]] && inherit autotools git-2
 inherit gnome2 linux-info multilib python-any-r1 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+ LGPL-2.1+"
 SLOT="0/14"
-IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif
-gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop +miner-fs mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp-av +vorbis xine +xml xmp xps" # qt4 strigi
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-	IUSE="${IUSE} doc"
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-	IUSE="${IUSE} nautilus"
-fi
+IUSE="applet cue eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop +miner-fs mp3 nautilus networkmanager pdf playlist rss test thunderbird +tiff upnp-av +vorbis xine +xml xmp xps" # qt4 strigi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 REQUIRED_USE="
 	^^ ( gstreamer xine )
@@ -40,7 +29,7 @@ REQUIRED_USE="
 # glibc-2.12 needed for SCHED_IDLE (see bug #385003)
 RDEPEND="
 	>=app-i18n/enca-1.9
-	>=dev-db/sqlite-3.7.14:=[threadsafe(+)]
+	>=dev-db/sqlite-3.7.14:=[fts3(+),threadsafe(+)]
 	>=dev-libs/glib-2.28:2
 	>=dev-libs/gobject-introspection-0.9.5
 	>=dev-libs/icu-4:=
@@ -89,8 +78,8 @@ RDEPEND="
 		>=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 )
+	playlist? ( >=dev-libs/totem-pl-parser-3 )
+	rss? ( net-libs/libgrss:0 )
 	thunderbird? ( || (
 		>=mail-client/thunderbird-5.0
 		>=mail-client/thunderbird-bin-5.0 ) )
@@ -116,12 +105,7 @@ DEPEND="${RDEPEND}
 		>=dev-libs/dbus-glib-0.82-r1
 		>=sys-apps/dbus-1.3.1[X] )
 "
-[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
-	doc? ( media-gfx/graphviz )
-	>=dev-util/gtk-doc-1.8
-	$(vala_depend)
-"
-[[ ${PV} = 9999 ]] || PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-0.14 )"
+PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-0.14 )"
 
 function inotify_enabled() {
 	if linux_config_exists; then
@@ -143,14 +127,6 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
-src_unpack() {
-	if [[ ${PV} = 9999 ]]; then
-		git_src_unpack
-	else
-		gnome2_src_unpack
-	fi
-}
-
 src_prepare() {
 	# Don't run 'firefox --version' or 'thunderbird --version'; it results in
 	# access violations on some setups (bug #385347, #385495).
@@ -176,10 +152,6 @@ src_prepare() {
 	sed -e '\%/steroids/tracker/tracker_sparql_update_async%,+1 d' \
 		-i tests/tracker-steroids/tracker-test.c || die
 
-	if [[ ${PV} = 9999 ]]; then
-		eautoreconf
-		vala_src_prepare
-	fi
 	gnome2_src_prepare
 }
 
@@ -205,10 +177,6 @@ src_configure() {
 		myconf="${myconf} --enable-gdkpixbuf"
 	fi
 
-	if [[ ${PV} = 9999 ]]; then
-		myconf="${myconf} $(use_enable doc gtk-doc)"
-	fi
-
 	# unicode-support: libunistring, libicu or glib ?
 	# According to NEWS, introspection is required
 	# FIXME: disabling streamanalyzer for now since tracker-sparql-builder.h
diff --git a/app-misc/tracker/tracker-0.16.0.ebuild b/app-misc/tracker/tracker-0.16.0.ebuild
index 6bf9c3afbf32..87d53b13b2cc 100644
--- a/app-misc/tracker/tracker-0.16.0.ebuild
+++ b/app-misc/tracker/tracker-0.16.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.16.0.ebuild,v 1.4 2013/04/06 03:06:30 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.16.0.ebuild,v 1.5 2013/04/09 21:26:48 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -15,9 +15,8 @@ HOMEPAGE="http://projects.gnome.org/tracker/"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/16"
-IUSE="cue doc eds elibc_glibc exif firefox-bookmarks flac gif gsf gstreamer gtk iptc +iso +jpeg laptop libsecret +miner-fs mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp-av +vorbis xine +xml xmp xps" # qt4 strigi
+IUSE="cue eds elibc_glibc exif firefox-bookmarks flac gif gsf gstreamer gtk iptc +iso +jpeg laptop libsecret +miner-fs mp3 nautilus networkmanager pdf playlist rss test thunderbird +tiff upnp-av +vorbis xine +xml xmp xps" # qt4 strigi
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="${IUSE} nautilus"
 
 REQUIRED_USE="
 	^^ ( gstreamer xine )
@@ -28,9 +27,10 @@ REQUIRED_USE="
 
 # According to NEWS, introspection is non-optional
 # glibc-2.12 needed for SCHED_IDLE (see bug #385003)
+# sqlite-3.7.16 for FTS4 support
 RDEPEND="
 	>=app-i18n/enca-1.9
-	>=dev-db/sqlite-3.7.14:=[threadsafe(+)]
+	>=dev-db/sqlite-3.7.16:=
 	>=dev-libs/glib-2.35.1:2
 	>=dev-libs/gobject-introspection-0.9.5
 	>=dev-libs/icu-4:=
@@ -74,8 +74,8 @@ RDEPEND="
 		>=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-0.5 )
+	playlist? ( >=dev-libs/totem-pl-parser-3 )
+	rss? ( net-libs/libgrss:0.5 )
 	thunderbird? ( || (
 		>=mail-client/thunderbird-5.0
 		>=mail-client/thunderbird-bin-5.0 ) )
@@ -101,12 +101,7 @@ DEPEND="${RDEPEND}
 		>=dev-libs/dbus-glib-0.82-r1
 		>=sys-apps/dbus-1.3.1[X] )
 "
-[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
-	doc? ( media-gfx/graphviz )
-	>=dev-util/gtk-doc-1.8
-	$(vala_depend)
-"
-[[ ${PV} = 9999 ]] || PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-0.14 )"
+PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-0.16 )"
 
 function inotify_enabled() {
 	if linux_config_exists; then
@@ -128,14 +123,6 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
-src_unpack() {
-	if [[ ${PV} = 9999 ]]; then
-		git_src_unpack
-	else
-		gnome2_src_unpack
-	fi
-}
-
 src_prepare() {
 	# Don't run 'firefox --version' or 'thunderbird --version'; it results in
 	# access violations on some setups (bug #385347, #385495).
@@ -161,10 +148,6 @@ src_prepare() {
 	sed -e '\%/steroids/tracker/tracker_sparql_update_async%,+1 d' \
 		-i tests/tracker-steroids/tracker-test.c || die
 
-	if [[ ${PV} = 9999 ]]; then
-		eautoreconf
-		vala_src_prepare
-	fi
 	gnome2_src_prepare
 }
 
@@ -190,10 +173,6 @@ src_configure() {
 		myconf="${myconf} --enable-gdkpixbuf"
 	fi
 
-	if [[ ${PV} = 9999 ]]; then
-		myconf="${myconf} $(use_enable doc gtk-doc)"
-	fi
-
 	# unicode-support: libunistring, libicu or glib ?
 	# According to NEWS, introspection is required
 	# FIXME: disabling streamanalyzer for now since tracker-sparql-builder.h
diff --git a/app-misc/tracker/tracker-9999.ebuild b/app-misc/tracker/tracker-9999.ebuild
index 3deb48bb9df6..a96be957eb25 100644
--- a/app-misc/tracker/tracker-9999.ebuild
+++ b/app-misc/tracker/tracker-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.61 2013/04/06 03:06:30 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.62 2013/04/09 21:26:48 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -19,7 +19,7 @@ EGIT_REPO_URI="git://git.gnome.org/${PN}
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/16"
-IUSE="cue doc eds elibc_glibc exif firefox-bookmarks flac gif gsf gstreamer gtk iptc +iso +jpeg laptop libsecret +miner-fs mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp-av +vorbis xine +xml xmp xps" # qt4 strigi
+IUSE="cue eds elibc_glibc exif firefox-bookmarks flac gif gsf gstreamer gtk iptc +iso +jpeg laptop libsecret +miner-fs mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp-av +vorbis xine +xml xmp xps" # qt4 strigi
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 	IUSE="${IUSE} doc"
@@ -37,9 +37,10 @@ REQUIRED_USE="
 
 # According to NEWS, introspection is non-optional
 # glibc-2.12 needed for SCHED_IDLE (see bug #385003)
+# sqlite-3.7.16 for FTS4 support
 RDEPEND="
 	>=app-i18n/enca-1.9
-	>=dev-db/sqlite-3.7.14:=[threadsafe(+)]
+	>=dev-db/sqlite-3.7.16:=
 	>=dev-libs/glib-2.35.1:2
 	>=dev-libs/gobject-introspection-0.9.5
 	>=dev-libs/icu-4:=
@@ -83,8 +84,8 @@ RDEPEND="
 		>=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-0.5 )
+	playlist? ( >=dev-libs/totem-pl-parser-3 )
+	rss? ( net-libs/libgrss:0.5 )
 	thunderbird? ( || (
 		>=mail-client/thunderbird-5.0
 		>=mail-client/thunderbird-bin-5.0 ) )
@@ -110,11 +111,16 @@ DEPEND="${RDEPEND}
 		>=dev-libs/dbus-glib-0.82-r1
 		>=sys-apps/dbus-1.3.1[X] )
 "
-[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
-	doc? ( media-gfx/graphviz )
-	>=dev-util/gtk-doc-1.8
-	$(vala_depend)
-"
+
+if [[ ${PV} = 9999 ]]; then
+	DEPEND="${DEPEND}
+		doc? (
+			>=dev-util/gtk-doc-1.8
+			media-gfx/graphviz )
+		$(vala_depend)
+	"
+fi
+
 [[ ${PV} = 9999 ]] || PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-${PV} )"
 
 function inotify_enabled() {