Switch to EAPI=5, move configuration stuff to src_configure. Fix xps USE flag handling. Be more complete in REQUIRED_USE.

(Portage version: 2.2.0_alpha160/cvs/Linux x86_64, signed Manifest commit with key C6085806)

3 files changed, 202 insertions, 178 deletions

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index 40e57835cb28..f69602848bb0 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.142 2013/01/06 09:15:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.143 2013/01/25 22:35:14 eva Exp $
+
+  25 Jan 2013; Gilles Dartiguelongue <eva@gentoo.org> tracker-0.14.4.ebuild,
+  tracker-9999.ebuild:
+  Switch to EAPI=5, move configuration stuff to src_configure. Fix xps USE flag
+  handling. Be more complete in REQUIRED_USE.
 
   06 Jan 2013; Agostino Sarubbo <ago@gentoo.org> tracker-0.14.4.ebuild:
   Add ~sparc, wrt bug #449220
diff --git a/app-misc/tracker/tracker-0.14.4.ebuild b/app-misc/tracker/tracker-0.14.4.ebuild
index 7c6a293cc065..67449e965c83 100644
--- a/app-misc/tracker/tracker-0.14.4.ebuild
+++ b/app-misc/tracker/tracker-0.14.4.ebuild
@@ -1,8 +1,8 @@
 # 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.7 2013/01/06 09:15:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.4.ebuild,v 1.8 2013/01/25 22:35:14 eva Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.6"
@@ -29,7 +29,12 @@ 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="cue? ( gstreamer )"
+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
@@ -39,15 +44,15 @@ RESTRICT="test"
 # 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:=[threadsafe]
 	>=dev-libs/glib-2.28:2
 	>=dev-libs/gobject-introspection-0.9.5
-	>=dev-libs/icu-4
+	>=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
+	>=media-libs/libpng-1.2:=
+	>=x11-libs/pango-1:=
 	sys-apps/util-linux
 
 	applet? (
@@ -56,8 +61,8 @@ RDEPEND="
 		>=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.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 )
@@ -72,14 +77,12 @@ RDEPEND="
 	gsf? ( >=gnome-extra/libgsf-1.13 )
 	gstreamer? (
 		>=media-libs/gstreamer-0.10.31:0.10
-		upnp-av? ( >=media-libs/gupnp-dlna-0.5 )
-		!upnp-av? ( >=media-libs/gst-plugins-base-0.10.31:0.10 ) )
-	!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
+		>=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 )
+	iso? ( >=sys-libs/libosinfo-0.0.2:= )
 	jpeg? ( virtual/jpeg:0 )
 	laptop? ( >=sys-power/upower-0.9 )
 	mp3? (
@@ -87,8 +90,8 @@ RDEPEND="
 		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/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 )
@@ -96,11 +99,13 @@ RDEPEND="
 		>=mail-client/thunderbird-5.0
 		>=mail-client/thunderbird-bin-5.0 ) )
 	tiff? ( media-libs/tiff )
+	upnp-av? ( >=media-libs/gupnp-dlna-0.5 )
 	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? (  >=x11-libs/qt-gui-4.7.1:4 ) )
@@ -112,7 +117,6 @@ DEPEND="${RDEPEND}
 	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
@@ -154,79 +158,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	if use gstreamer ; then
-		G2CONF="${G2CONF} --enable-generic-media-extractor=gstreamer"
-		if use upnp-av; 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 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 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 libgpxs)"
-	#	$(use_enable strigi libstreamanalyzer)
-
-	DOCS="AUTHORS ChangeLog NEWS README"
-
 	# Fix functional tests scripts
 	find "${S}" -name "*.pyc" -delete
 	python_convert_shebangs -q -r 2 tests utils examples
@@ -248,6 +179,82 @@ src_prepare() {
 	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}"
diff --git a/app-misc/tracker/tracker-9999.ebuild b/app-misc/tracker/tracker-9999.ebuild
index dbce781669ef..efa281cd71a5 100644
--- a/app-misc/tracker/tracker-9999.ebuild
+++ b/app-misc/tracker/tracker-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.55 2012/12/15 19:01:29 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.56 2013/01/25 22:35:14 eva Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.6"
@@ -22,12 +22,19 @@ SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~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" # 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-av +vorbis xine +xml xmp xps" # qt4 strigi
 [[ ${PV} = 9999 ]] || IUSE="${IUSE} nautilus"
-REQUIRED_USE="cue? ( gstreamer )"
+
+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
@@ -37,15 +44,15 @@ RESTRICT="test"
 # 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:=[threadsafe]
 	>=dev-libs/glib-2.28:2
 	>=dev-libs/gobject-introspection-0.9.5
-	>=dev-libs/icu-4
+	>=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
+	>=media-libs/libpng-1.2:=
+	>=x11-libs/pango-1:=
 	sys-apps/util-linux
 
 	applet? (
@@ -54,8 +61,8 @@ RDEPEND="
 		>=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.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 )
@@ -70,14 +77,12 @@ RDEPEND="
 	gsf? ( >=gnome-extra/libgsf-1.13 )
 	gstreamer? (
 		>=media-libs/gstreamer-0.10.31:0.10
-		upnp-av? ( >=media-libs/gupnp-dlna-0.5 )
-		!upnp-av? ( >=media-libs/gst-plugins-base-0.10.31:0.10 ) )
-	!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
+		>=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 )
+	iso? ( >=sys-libs/libosinfo-0.0.2:= )
 	jpeg? ( virtual/jpeg:0 )
 	laptop? ( >=sys-power/upower-0.9 )
 	mp3? (
@@ -85,8 +90,8 @@ RDEPEND="
 		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/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 )
@@ -94,27 +99,30 @@ RDEPEND="
 		>=mail-client/thunderbird-5.0
 		>=mail-client/thunderbird-bin-5.0 ) )
 	tiff? ( media-libs/tiff )
+	upnp-av? ( >=media-libs/gupnp-dlna-0.5 )
 	vorbis? ( >=media-libs/libvorbis-0.22 )
 	xine? ( >=media-libs/xine-lib-1 )
 	xml? ( >=dev-libs/libxml2-2.6 )
-	xmp? ( >=media-libs/exempi-2.1 )"
+	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? (  >=x11-libs/qt-gui-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
-		>=dev-util/gtk-doc-1.8
 		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-am
 	>=dev-util/gtk-doc-1.8
 	$(vala_depend)
 "
@@ -150,23 +158,42 @@ src_unpack() {
 }
 
 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
+
+	if [[ ${PV} = 9999 ]]; then
+		eautoreconf
+		vala_src_prepare
+	fi
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+
 	if use gstreamer ; then
-		G2CONF="${G2CONF} --enable-generic-media-extractor=gstreamer"
+		myconf="${myconf} --enable-generic-media-extractor=gstreamer"
 		if use upnp-av; then
-			G2CONF="${G2CONF} --with-gstreamer-backend=gupnp-dlna"
+			myconf="${myconf} --with-gstreamer-backend=gupnp-dlna"
 		else
-			G2CONF="${G2CONF} --with-gstreamer-backend=discoverer"
+			myconf="${myconf} --with-gstreamer-backend=discoverer"
 		fi
 	elif use xine ; then
-		G2CONF="${G2CONF} --enable-generic-media-extractor=xine"
+		myconf="${myconf} --enable-generic-media-extractor=xine"
 	else
-		G2CONF="${G2CONF} --enable-generic-media-extractor=external"
+		myconf="${myconf} --enable-generic-media-extractor=external"
 	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"
+		#myconf="${myconf} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)"
+		myconf="${myconf} --enable-gdkpixbuf"
 	fi
 
 	# unicode-support: libunistring, libicu or glib ?
@@ -175,67 +202,52 @@ src_prepare() {
 	# 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 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)"
+	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)
-
-	DOCS="AUTHORS ChangeLog NEWS README"
-
-	# 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
-
-	if [[ ${PV} = 9999 ]]; then
-		eautoreconf
-		vala_src_prepare
-	fi
-	gnome2_src_prepare
 }
 
 src_test() {