[gentoo-commits] proj/gnome:master commit in: app-misc/tracker/

["Alexandre Restovtsev" <tetromino@gmail.com>]

commit:     e54848110f451f4ac2816ea98260763994bae258
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Oct  3 21:41:02 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Oct  3 21:45:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e5484811

app-misc/tracker: put a stake through the foul heart of access violations (#385495)

It looks like (a) overriding AC_PATH_PROG requires a full path (not just
a relative one), and (b) AC_PATH_PROG actually tries to execute the
programs that it finds, so we need to generate the firefox and thunderbird
version wrapper scripts and pass them to configure, even if we are not
building firefox or thunderbird support.
Thanks to Stefan Zwanenburg <stefanhetzwaantje <AT> gmail.com> for reporting
in bug #385495.

---
 app-misc/tracker/tracker-0.12.3-r2.ebuild |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app-misc/tracker/tracker-0.12.3-r2.ebuild b/app-misc/tracker/tracker-0.12.3-r2.ebuild
index c5620f8..a002c8b 100644
--- a/app-misc/tracker/tracker-0.12.3-r2.ebuild
+++ b/app-misc/tracker/tracker-0.12.3-r2.ebuild
@@ -171,6 +171,7 @@ pkg_setup() {
 		$(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)
@@ -191,15 +192,13 @@ pkg_setup() {
 		$(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)
 
-	use firefox-bookmarks && G2CONF="${G2CONF} FIREFOX=./firefox-version.sh"
-	use thunderbird && G2CONF="${G2CONF} THUNDERBIRD=./thunderbird-version.sh"
-
 	DOCS="AUTHORS ChangeLog NEWS README"
 
 	python_set_active_version 2
@@ -214,11 +213,9 @@ src_prepare() {
 	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).
-	use firefox-bookmarks && create_version_script \
-		"www-client/firefox" "Mozilla Firefox" firefox-version.sh
-	use thunderbird && create_version_script \
-		"mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
+	# 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*/:' \