Sync live ebuild with 0.12 series ebuild.

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

3 files changed, 102 insertions, 33 deletions

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index a16730aa9673..bcb7e779fad0 100644
--- a/app-misc/tracker/ChangeLog
+++ b/app-misc/tracker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/tracker
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.117 2011/11/08 21:45:34 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.118 2011/11/08 22:25:58 eva Exp $
+
+  08 Nov 2011; Gilles Dartiguelongue <eva@gentoo.org> tracker-0.12.7.ebuild,
+  tracker-9999.ebuild:
+  Sync live ebuild with 0.12 series ebuild.
 
 *tracker-0.10.35 (08 Nov 2011)
 
diff --git a/app-misc/tracker/tracker-0.12.7.ebuild b/app-misc/tracker/tracker-0.12.7.ebuild
index 4e74783bdfc2..2b511b90c7b9 100644
--- a/app-misc/tracker/tracker-0.12.7.ebuild
+++ b/app-misc/tracker/tracker-0.12.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.7.ebuild,v 1.1 2011/11/02 16:23:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.7.ebuild,v 1.2 2011/11/08 22:25:58 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -158,6 +158,7 @@ pkg_setup() {
 	# nautilus extension is in a separate package, nautilus-tracker-tags
 	G2CONF="${G2CONF}
 		--disable-hal
+		--disable-libcue
 		--enable-tracker-fts
 		--with-enca
 		--with-unicode-support=libicu
diff --git a/app-misc/tracker/tracker-9999.ebuild b/app-misc/tracker/tracker-9999.ebuild
index 8805adf53f1f..fd892a566516 100644
--- a/app-misc/tracker/tracker-9999.ebuild
+++ b/app-misc/tracker/tracker-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 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.46 2011/09/20 22:44:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.47 2011/11/08 22:25:58 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.6"
 
-inherit autotools git-2 gnome2 linux-info python virtualx
+inherit autotools git-2 gnome2 linux-info multilib python versionator virtualx
 
 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="http://www.tracker-project.org/"
@@ -19,14 +19,20 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 # 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"
+IUSE="applet doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +jpeg laptop mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # nautilus qt4 strigi
+
+# 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/dbus-glib-0.82-r1
-	>=dev-libs/glib-2.26:2
+	>=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=]
@@ -36,12 +42,17 @@ RDEPEND="
 	sys-apps/util-linux
 
 	applet? (
-		>=gnome-base/gnome-panel-2.91
+		>=gnome-base/gnome-panel-2.91.6
+		>=x11-libs/gdk-pixbuf-2.12:2
 		>=x11-libs/gtk+-3:3 )
 	eds? (
-		>=mail-client/evolution-2.32
-		>=gnome-extra/evolution-data-server-2.32 )
+		>=mail-client/evolution-2.91.90
+		>=gnome-extra/evolution-data-server-2.91.90 )
+	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 )
@@ -51,23 +62,18 @@ RDEPEND="
 		>=gnome-extra/libgsf-1.13 )
 	gstreamer? (
 		>=media-libs/gstreamer-0.10.31:0.10
-		upnp? ( >=media-libs/gupnp-dlna-0.5 ) )
+		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+-2.18:2 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+		>=x11-libs/gtk+-3:3 )
 	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 )
+		gtk? ( x11-libs/gdk-pixbuf:2 ) )
 	networkmanager? ( >=net-misc/networkmanager-0.8 )
 	pdf? (
 		>=x11-libs/cairo-1
@@ -75,12 +81,16 @@ RDEPEND="
 		>=x11-libs/gtk+-2.12:2 )
 	playlist? ( dev-libs/totem-pl-parser )
 	rss? ( net-libs/libgrss )
-	strigi? ( >=app-misc/strigi-0.7 )
+	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
@@ -98,6 +108,8 @@ DEPEND="${RDEPEND}
 		>=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} )"
 
 function inotify_enabled() {
 	if linux_config_exists; then
@@ -122,7 +134,7 @@ pkg_setup() {
 		if use upnp; then
 			G2CONF="${G2CONF} --with-gstreamer-backend=gupnp-dlna"
 		else
-			G2CONF="${G2CONF} --with-gstreamer-backend=discover"
+			G2CONF="${G2CONF} --with-gstreamer-backend=discoverer"
 		fi
 	elif use xine ; then
 		G2CONF="${G2CONF} --enable-generic-media-extractor=xine"
@@ -130,24 +142,40 @@ 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.12)"
 	fi
 
-	if use mp3 && (use gtk || use qt4); then
-		G2CONF="${G2CONF} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)"
+	# 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
+		--disable-libcue
 		--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 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)
@@ -155,23 +183,24 @@ pkg_setup() {
 		$(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 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"
 
@@ -183,22 +212,57 @@ src_unpack() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# 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
+	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
 
 	gtkdocize || die "gtkdocize failed"
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
+
+	gnome2_src_prepare
 }
 
 src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
 	Xemake check XDG_DATA_HOME="${T}" XDG_CONFIG_HOME="${T}" || die "tests failed"
 }
+
+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 || die
+	fi
+
+	if use thunderbird; then
+		dosym /usr/share/xul-ext/trackerbird \
+			/usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org || die
+	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
+}