Version bump with various crash fixes and performance improvements. The tracker-miner-fs filesystem indexer is now optional. Drop old.

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

5 files changed, 81 insertions, 54 deletions

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index 752ea32aa6e9..39d0707da3b8 100644
--- a/app-misc/tracker/ChangeLog
+++ b/app-misc/tracker/ChangeLog
@@ -1,6 +1,14 @@
 # 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.132 2012/09/28 04:27:43 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.133 2012/10/25 07:56:27 tetromino Exp $
+
+*tracker-0.14.3 (25 Oct 2012)
+
+  25 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -tracker-0.14.2.ebuild, +tracker-0.14.3.ebuild, tracker-9999.ebuild,
+  metadata.xml:
+  Version bump with various crash fixes and performance improvements. The
+  tracker-miner-fs filesystem indexer is now optional. Drop old.
 
   28 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   -tracker-0.10.27.ebuild, tracker-0.10.35.ebuild, tracker-0.12.10.ebuild,
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index a8ad1d6a5e17..a93f498cbe2a 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -11,22 +11,23 @@ AUX tracker-0.8.17-use-upower.patch 16884 SHA256 542432544663f0c1a9c43c08e816f42
 DIST tracker-0.10.35.tar.xz 5754872 SHA256 5f6a32d0b2b0036f4aec74a6d36d889e33ea038a1530161ca4eb9a549cc87fe3 SHA512 9645c6ff6686a94f7ce9a0e7b29b5b8d5300ba1a1706e41ab3ca97bba891855bba9ce3213435373c52fb6821dc21be0816608c0f6796cb984f090c2b35e0b59c WHIRLPOOL 9cfd6d8446c7880499948cd663017161b879b0accd3de31dd3aecf87394315af4cd28d74865dafa67674ffa07cccb7fc1fe95350a36612560f8ef5e7214415dc
 DIST tracker-0.12.10.tar.xz 6220648 SHA256 42722831fdde63cfa07e4f0bb75805425c09b1f1801d3d5280de8be37a357b69 SHA512 53b50847229190e9510e4fc37deadf94f6a478c32b7548a457fe6597433bf7ac9f5bc2470641fe4b665b92c989b1d5b6e9917f7e1903b93c32830f0b2efa8f6f WHIRLPOOL 707b290232a9c3b0b7825628c32130b77afd24915bc18eb77c517b6775d58379f94f4f8efb52bd53637fb66374f426f7a01c47986e951123ff0ff8af874fd870
 DIST tracker-0.14.2.tar.xz 5985464 SHA256 9b59330aa2e9e09feee587ded895e9247f71fc25f46b023d616d9969314bc7f1 SHA512 204749a915e6e9af7057a0de7f8b5c317a56899dd5a9ca05c029ab1a3b47c42e54b3a86eb53c31fa21ad50abebed2b3a4e99008aac6cc23cb3bc9f7faa6504ff WHIRLPOOL 431a2b06e6906269795fd05e10bac912ffcc8d1ee0e5c394e178c5c12197ed6a05ec6ba939cf21946be0a17b84717405ad8b8be3d052b3f82c4d58999308cb07
+DIST tracker-0.14.3.tar.xz 6120108 SHA256 7c1ecf3705ecbd2a0278d04277cd1bd8c89d5838913de922fef32321ce67abe4 SHA512 c4c30ffc7879069c5487773e7a905b2b4bff811160318f0c46550ef27fa70b23d481234e62059900f8101e2ce19b3c52ee08f65020d98168c0ec31ca263c8663 WHIRLPOOL e8bf48887c0a6cb43accf399b14d6b6e8221bf261c035572791ef56ff8782d57f675e18b60bc9411f201c0311ab58503f5154fe296235cd262e63b9d338580ad
 EBUILD tracker-0.10.35.ebuild 6148 SHA256 9e2988b14246d27fda9f9e5a75fda42bbc0cdfee20712e972d777e2f8d29a033 SHA512 2cb8a77c9377cafc32b40ce1c95b95a60dfe92b69ab905234d205888575c0be40b4dfcf4c36ce37debf2618b4a294d40ede4487f0491d27148ee7964fbba5e77 WHIRLPOOL c59dc43ff738ab94e79110b388cbfa740cdba0ccef4994ebce39ce855d8484de8eb7844eda449fbc3da3573d8c3622900acf5787b3173f8ff4239e91a82cbac5
 EBUILD tracker-0.12.10-r1.ebuild 8335 SHA256 8d1019da2f9f43236b2ed704b906504acfaf70ec81e548236e81d2e985d3b910 SHA512 302d745d91c12b0585dc49268594153e5ee1b75785ff651fb6dd00ed99df03a431b88560dc6185ca089f3bb4e69841d5a1e1b216c436b2c1f186a07ad65a8991 WHIRLPOOL eacc99b6f659f99a218bcf8af8502b3bdc8c0d24488f35c5e94496c0235502d33eb945a02800a49865dadf3814c6fee15e6b13fbe721f3e4de9bfc0fb96d4d35
 EBUILD tracker-0.12.10.ebuild 8210 SHA256 6b58e40c9d57a28b0bbf0505ddb25859c2bb0256eae19f9b924298c398121b9f SHA512 faffe84091b0117ee1abe1867c5c5bbbea5e70f7afcbb15e5f90eff2a7c81bb3f6beedeaf048a584013f13e2bba12dc0b82201bcc9fe22845ea775e36a7fefae WHIRLPOOL 397fc4ef5abb4fd891324c68c17226070446a59cc420e5f4f665cd556ab7c3607d85733f2a3fbd9fee079e581b10ed8cd2503f4a5c6a89044c651db5e6ae0f07
 EBUILD tracker-0.14.2-r1.ebuild 8654 SHA256 11620fb7b4882e3fc8655cc54e2ceb0d2632eb271a03592881c8007ff560ce42 SHA512 ab37df9f3be919337bdc1f4070d729c2b25c3a8ccc33d09c35c4c3b769313ab95a50f57f10a476278a10decbe490a6e5f36a97190854352e4a334303ca7de5da WHIRLPOOL ad6241c3bb9794da29c7148a6dadb54e15d4b166ff4702f4457408dc2b02eab62fca03655207daca0bbd74acbbcd3caf00259f23f67ffa5c03b88d286daa402a
-EBUILD tracker-0.14.2.ebuild 8268 SHA256 4f2e20a8903d38176d243ae014bbcc9b9a4555feaa5c1757f6f280dd549fec01 SHA512 15b642a0f7163929869585d27cdeb56a828e92f47e6e5058d4c6f8ec501188f01a2ea6bf1e49ece0c728ebb8b7a5ab4ebc55517bef10ebea88a9efd58d794367 WHIRLPOOL 853e0b72421956f1eb8e646195cc6ab5e535f7dd2bd27634ada4de8150ddd1b0a348a381c53393c14273c569376470abf82a13206688472d33113b01c2acf5bf
-EBUILD tracker-9999.ebuild 8244 SHA256 b807792911d8c0f35bd99441a267b6e8593b6715a28cbe0269871e56fed7f2b4 SHA512 f5bbb889b9df5d99e01d9d1adefc13f8d9024df87f04b6adca62bf2b69568b8c43bf3cd57c0dcd766e7d4b4cb729f2ab570a60ab88f5a5113b244fd9807390bf WHIRLPOOL f8575123f565a04e6382e2cf0a9f821d24d0e9b6caa9d346728840522ec5b7b5b69f93d1dbbfdffbc6c6825a08fa42b770fb736c11a8cd2c82135cb33458f8d3
-MISC ChangeLog 25148 SHA256 5fff00b0c0626d3f0dca07f8ba408b61680ab9315e449d9af46f6ca216a9c680 SHA512 237aee8df7e80200d7379eee556ef290c1927b7d9daaa3fa2636ad1e8a82e2486fe670f57ca43000d9c866837acbc740a1bf7d0b58b161bdccea388216561ec6 WHIRLPOOL 0ac676dd059f48b3dbc7158ce4772540f01671bbcf7b28d7c94c4eba23d20e250a56c40496462c4bc878bfcc55e90d67a5810ff59ec8db5d0705fa565994f789
-MISC metadata.xml 1621 SHA256 a01929993109e8e5b6c5e3ba8433a99ba4417f41328455823907a860dcb4311e SHA512 26808b5c3decabbbc166a67ee7d3b5f2ea68899684f79a092a74f8b712be1806560db3659671df3ba7ccc490a57bfae728b6e7ac9cfb92765d35bdbb7028b439 WHIRLPOOL bb4df83f2e873334dcf1ce20cce359738291ee102b759863bd770b63fd3ca8cce653700e9a84ec83f18672939a12ba9089d01637fc32edd3799b6f962651dd4c
+EBUILD tracker-0.14.3.ebuild 8559 SHA256 a96d2c26d346272d40728c23adb53d28e908160c43c8e0868b337767634e6705 SHA512 dbbede4d860858b07a76791a6cdeb2516d6cba1eb1b740452a2d8dc2a9dea52b6a60f9e9dbab28823a7e94bed54613f8332f3185d06c88d56d36681aafdb43fa WHIRLPOOL 28749c0be42d05b57782686ad7575d9aac2c2427c92df15a061ed4081858c8b869cb45fae9628074ac206afaf5d37828677d99738b8695e6898377ba2d154446
+EBUILD tracker-9999.ebuild 8281 SHA256 81a3439bb3d36906eecadea57f62430e9670404de94010d279149aa4b8b9b6cf SHA512 f43c8a4b17e321d79df1ca71a225c62fe5d87e5e2e30ffdebe99a4811ce1d82431868888e11688eb6e076e2c17deb0fb9a85eebc72d6136b87be1513668274d5 WHIRLPOOL e84a5a9cb252424a6c7e92caf2a39ace4b47163d9080d3a25cecb6d37a8e9f3bdc2e6e1d56b771d873264d3dd0421155c5c9e865040a310f9c9e910c5fafc581
+MISC ChangeLog 25465 SHA256 b34c09235274dfd643448427f56d4f6d3a05f17dc4e1773347bd129faa189eb3 SHA512 8cbc4169845551b45462929a3e70f344906dafe9b843218fcc2a53d877e7cae584211b65767ecb5e64348390d072f9e6247f1214f481346000b5820308888bbe WHIRLPOOL dc5fe1828597d64e389c9c64312fa470208bc53ff2eda0e254254cda1d4a2d292499bfcc1bbd10575b6766529ad85981d5b17ad95c8fcf51476f4cef9cb53de1
+MISC metadata.xml 1711 SHA256 fe5b4add7a9762b9ad40b7677879fe613996c8b67d92731e9cdf728fb4b0deb8 SHA512 529ef4b823ae0f9fa60bc38e991e510709b4ee8a8d62956633776996b559ce94401ad7e17fd2e356c9ecede0cf6090c8e363bcab5f82088a7dc629f8d715fd8b WHIRLPOOL 63e66c3e77859814d6ec4f28d0bf436a25309d26858c3c082ea59e07917401fb08b28c9e4275d2390fcd718c8662eec9ef0403154b06aecac573d435c88a41a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQZSdGAAoJEJ0WA1zPCt1ha8YH/inG9aX5LfSSm1k2hejf8+mU
-Ocmq/+mDSEoNF2oyDhRQ0+K4oGoKb9BgeTrqO1wyTFZKZq51911NmN57oQEdOd9v
-qve9LVsbzpQPmjOfW1uDXVNqU55PjwxOfOcIanJp1xqmnZxP8n83Es996zUhYoWi
-rRH5e0ZEpD4qlk/idZKz4JxbRmCjkpqSv+FOpwpkxZDHCYE/WRWZRIV84lUA5YE5
-im5n5HqeKqUvKfgXo+WvU8ZGRncEWHacJtssXnUbrps5D7yc7uBLJLWL0+MQphVs
-OE5GpqviiAGuWfGcw7+Sc3zRuhDt7pNjFUoFgto71owBhDVtlo94e68epWEf+hk=
-=vKjR
+iQEcBAEBCAAGBQJQiPCsAAoJEJ0WA1zPCt1h5toH/2laj+H3AvWksoj3vDnOypX0
+p0lv4j4vMHhNUq3q6gwcKJdD5TxElGmC+0JiS8YoAHeA8vto4SYwC3sWXlLZwKJ9
+aujnjXqbsrlPhkQG+KYJusm4FxjM6DvTJ1LGM1tSQ0bNuko6/TZEI35vLgngJh//
+j9FXPHoPcDZQvRA4TGlCum81qj6aH/GRFpS2tiMPW6OwRjCEA223Ifux2Su2s8Np
+7nJnGWc5wDEO2XlbFSwXsJx9UXzwN6JfukECoaXNBGZ1B6g4zZ9SXDmvPRzA01VH
+s25JKa31p0w+3oT10TXMXIWNMboy8ppVvC4KlNVBOusZG088GbY0uwcmglpIlww=
+=boDC
 -----END PGP SIGNATURE-----
diff --git a/app-misc/tracker/metadata.xml b/app-misc/tracker/metadata.xml
index 0875875c735e..3bb3648266b4 100644
--- a/app-misc/tracker/metadata.xml
+++ b/app-misc/tracker/metadata.xml
@@ -18,6 +18,7 @@
   <flag name="iptc">Enable extraction of IPTC data from pictures</flag>
   <flag name="iso">Enable extraction of metadata from ISO disk images</flag>
   <flag name="laptop">Make tracker power management aware</flag>
+  <flag name="miner-fs">Enable tracker-miner-fs (required for filesystem indexing)</flag>
   <flag name="nautilus">Enable tracker to integrate with
     <pkg>gnome-base/nautilus</pkg> by providing entries in its context menu
   </flag>
diff --git a/app-misc/tracker/tracker-0.14.2.ebuild b/app-misc/tracker/tracker-0.14.3.ebuild
index e7c1743364cc..00a36359f4c9 100644
--- a/app-misc/tracker/tracker-0.14.2.ebuild
+++ b/app-misc/tracker/tracker-0.14.3.ebuild
@@ -1,34 +1,43 @@
 # 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.2 2012/09/28 04:27:43 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.3.ebuild,v 1.1 2012/10/25 07:56:27 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 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"
-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 +miner-fs 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="
 	>=app-i18n/enca-1.9
-	>=dev-db/sqlite-3.7[threadsafe]
+	>=dev-db/sqlite-3.7.14[threadsafe]
 	>=dev-libs/glib-2.28:2
 	>=dev-libs/gobject-introspection-0.9.5
 	>=dev-libs/icu-4
@@ -42,7 +51,7 @@ 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
@@ -66,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 )
@@ -95,10 +104,7 @@ 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 )
+	gtk? ( >=dev-libs/libgee-0.3 )
 	doc? (
 		app-office/dia
 		>=dev-util/gtk-doc-1.8
@@ -107,8 +113,12 @@ DEPEND="${RDEPEND}
 		>=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 )"
+[[ ${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
@@ -125,9 +135,21 @@ function inotify_enabled() {
 
 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() {
 	if use gstreamer ; then
 		G2CONF="${G2CONF} --enable-generic-media-extractor=gstreamer"
 		if use upnp; then
@@ -141,11 +163,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)"
@@ -186,6 +203,7 @@ pkg_setup() {
 		$(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)
@@ -204,11 +222,6 @@ pkg_setup() {
 
 	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
@@ -223,6 +236,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-9999.ebuild b/app-misc/tracker/tracker-9999.ebuild
index cd8a726685a2..57b376497c3a 100644
--- a/app-misc/tracker/tracker-9999.ebuild
+++ b/app-misc/tracker/tracker-9999.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-9999.ebuild,v 1.52 2012/09/28 04:27:43 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.53 2012/10/25 07:56:27 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -25,7 +25,7 @@ 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" # qt4 strigi
+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 +vorbis xine +xml xmp" # qt4 strigi
 [[ ${PV} = 9999 ]] || IUSE="${IUSE} nautilus"
 REQUIRED_USE="cue? ( gstreamer )"
 
@@ -37,7 +37,7 @@ RESTRICT="test"
 # glibc-2.12 needed for SCHED_IDLE (see bug #385003)
 RDEPEND="
 	>=app-i18n/enca-1.9
-	>=dev-db/sqlite-3.7[threadsafe]
+	>=dev-db/sqlite-3.7.14[threadsafe]
 	>=dev-libs/glib-2.28:2
 	>=dev-libs/gobject-introspection-0.9.5
 	>=dev-libs/icu-4
@@ -135,9 +135,21 @@ function inotify_enabled() {
 
 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() {
 	if use gstreamer ; then
 		G2CONF="${G2CONF} --enable-generic-media-extractor=gstreamer"
 		if use upnp; then
@@ -191,6 +203,7 @@ pkg_setup() {
 		$(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)
@@ -209,19 +222,6 @@ pkg_setup() {
 
 	DOCS="AUTHORS ChangeLog NEWS README"
 
-	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 -r 2 tests utils examples