Version bump. Port to GDBus.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

4 files changed, 242 insertions, 10 deletions

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index 2ea6cf4ec6af..925242147840 100644
--- a/app-misc/tracker/ChangeLog
+++ b/app-misc/tracker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/tracker
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.84 2010/11/14 16:17:32 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.85 2010/11/14 17:43:22 eva Exp $
+
+*tracker-0.9.28 (14 Nov 2010)
+
+  14 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  +tracker-0.9.28.ebuild, tracker-9999.ebuild:
+  Version bump. Port to GDBus.
 
   14 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org> tracker-0.8.17.ebuild,
   tracker-0.9.27.ebuild, tracker-9999.ebuild, metadata.xml:
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 2b79740ad6fc..9a738a4ca055 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -5,15 +5,17 @@ AUX tracker-0.8.0-strigi.patch 1385 RMD160 69d07b6145de6919cc1550e4722737cf5b960
 AUX tracker-0.8.17-build-with-eds232.patch 807 RMD160 7f681d67da66c66c82171557462e74e095d5f1b5 SHA1 cb56616bd34a0a81a8df6117c2901e6f5d834a0d SHA256 bced568783664b0128903094db05a1f881519754d6fa1588f1050620fb73f989
 DIST tracker-0.8.17.tar.bz2 4959334 RMD160 b33abe9ab955e5e392258657ad3a664ff5cb4cc6 SHA1 460f3d56bd0ed24c5d064a398829f4289a6b081f SHA256 56cf09f41fec1afaf7199e0728f4339b567a7893a51fc2affc5069fa26e2e9d8
 DIST tracker-0.9.27.tar.bz2 7113424 RMD160 b4fb5d4b40150e0941a1eb825cc0c4239fbc2448 SHA1 46e9ec6edfc0c6741baac97c2c22b678ed2d6f47 SHA256 ff1c6377c12c5ac3659bde3becf5211b3a51d8a0596ead266a97458580041b53
+DIST tracker-0.9.28.tar.bz2 6679395 RMD160 1e382c425491455288fe8ce7b5fb30129f080ca1 SHA1 8ec7ead13550866417efa51d60b51b5786e3eda8 SHA256 5c2e9ce850285cc0e836f4ec71e3c7ad8601d0ddf0e4f5afe4368bb177d83814
 EBUILD tracker-0.8.17.ebuild 5568 RMD160 bbadf105f168ee101a730c71f46afbafb1a492fd SHA1 b3fa73a466acb2e8d1eb5bfe285405144af44490 SHA256 f22d25db6ea38320ac27814e14a93f573dad3747a0c10c0a07362b0f89a771f8
 EBUILD tracker-0.9.27.ebuild 6459 RMD160 03ee4b331dd3a4e2324b04425b1b7c2ab5dbce37 SHA1 c4ca6152ebca82e732addad16c11fe8d7b50b90b SHA256 fdee961f3d94d672e54a002056b89c63f941fa91d44a64aa736c3a4e11f9664c
-EBUILD tracker-9999.ebuild 5630 RMD160 332930aa75b9b66031220204de21b1f30397b33b SHA1 c4480ebc3cad844d7bb094e62f051d89b4bad0d6 SHA256 80ddc9b37c17211d1909ec3706f8516403f9aa2226094514e1d536ad1b2a376e
-MISC ChangeLog 14861 RMD160 a5260ce3600cf9e8159a6bd28346e41e7bf6e823 SHA1 ce13148684695e522b0d519d6944fefdd93908d1 SHA256 6d27e2e76899fc93ead1b7d6388ae7843368c78ad733b77d771bfc8d7700455a
+EBUILD tracker-0.9.28.ebuild 6645 RMD160 0a72bd8d60dbbb23eef1d6f9b95ac97fd6a1aa07 SHA1 e2b3499d9a5ae23a6032ec5fd0a305c9286014f0 SHA256 cc2f69a1261f26c72a829f824c754bf101459c551018bf6b6c2de25a5ae6fb19
+EBUILD tracker-9999.ebuild 5840 RMD160 6883e54311a641dfa98125d9b3ce821e33e90a89 SHA1 be36173a9e4feab9167368684028ae17236761d5 SHA256 78b101fe2fdb59772ed644c5691965370c370596437408bd7f876811341528ad
+MISC ChangeLog 15025 RMD160 d99a6476a9474e43937c25a7b7fc99a57de7de4c SHA1 c4ed676dfb8e9e9bcf437d5834424e2f9882a47e SHA256 ba18c2be74959fc87cc4aedbdc4f8d42d8f8abdaf344d73288d0090324797ac8
 MISC metadata.xml 909 RMD160 47100344948079430541942d3841bc4cde102800 SHA1 4fb4e473e4cdf507733555623f28af9121f2d9b7 SHA256 b3bc2efef244353c50faf03ca2fa944698bac1b6a6d023a484e46eb5c3ce02a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzgC6YACgkQ1fmVwcYIWAaCWQCfSXLMWa/fT++l/ZumpZ7dQZ8f
-H3AAoMpZJ9BTQT9OwV4e782s8OjxarVW
-=Bbgn
+iEYEARECAAYFAkzgH8YACgkQ1fmVwcYIWAbB6ACgjHn1aR0+7LeXwKiO6Th06MKq
+VpQAoOcaN1R8XOHpm88Xqxg9EI3eouYY
+=v5Pw
 -----END PGP SIGNATURE-----
diff --git a/app-misc/tracker/tracker-0.9.28.ebuild b/app-misc/tracker/tracker-0.9.28.ebuild
new file mode 100644
index 000000000000..05a7b7b8d0b9
--- /dev/null
+++ b/app-misc/tracker/tracker-0.9.28.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.9.28.ebuild,v 1.1 2010/11/14 17:43:22 eva Exp $
+
+EAPI="2"
+G2CONF_DEBUG="no"
+PYTHON_DEPEND="2"
+
+inherit eutils gnome2 linux-info python
+
+DESCRIPTION="A tagging metadata database, search tool and indexer"
+HOMEPAGE="http://www.tracker-project.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+# USE="doc" is managed by eclass.
+IUSE="applet doc eds exif flac gif gnome-keyring gsf gstreamer gtk hal iptc +jpeg laptop mp3 nautilus networkmanager pdf playlist rss strigi test +tiff upnp +vorbis xine +xml xmp"
+
+# Test suite highly disfunctional, putting aside for now
+RESTRICT="test"
+
+# TODO: rest -> flickr, qt vs. gdk
+# vala is built with debug by default (see VALAFLAGS)
+RDEPEND="
+	>=app-i18n/enca-1.9
+	>=dev-db/sqlite-3.7[threadsafe]
+	>=dev-libs/glib-2.26:2
+	|| (
+		>=media-gfx/imagemagick-5.2.1[png,jpeg=]
+		media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
+	>=media-libs/libpng-1.2
+	>=x11-libs/pango-1
+	sys-apps/util-linux
+
+	applet? (
+		gnome-base/gnome-panel
+		>=x11-libs/gtk+-2.18:2 )
+	eds? (
+		>=mail-client/evolution-2.29.1
+		>=gnome-extra/evolution-data-server-2.29.1 )
+	exif? ( >=media-libs/libexif-0.6 )
+	flac? ( >=media-libs/flac-1.2.1 )
+	gif? ( media-libs/giflib )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 )
+	gsf? (
+		app-text/odt2txt
+		>=gnome-extra/libgsf-1.13 )
+	upnp? ( >=media-libs/gupnp-dlna-0.3 )
+	!upnp? (
+		gstreamer? ( >=media-libs/gstreamer-0.10.12 )
+		!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
+	)
+	gtk? (
+		>=dev-libs/libgee-0.3
+		>=x11-libs/gtk+-2.18 )
+	iptc? ( media-libs/libiptcdata )
+	jpeg? ( virtual/jpeg:0 )
+	laptop? (
+		hal? ( >=sys-apps/hal-0.5 )
+		!hal? ( >=sys-power/upower-0.9 ) )
+	mp3? ( >=media-libs/taglib-1.6 )
+	nautilus? (
+		gnome-base/nautilus
+		>=x11-libs/gtk+-2.18:2 )
+	networkmanager? ( >=net-misc/networkmanager-0.8 )
+	pdf? (
+		>=x11-libs/cairo-1
+		>=app-text/poppler-0.12.3-r3[cairo,utils]
+		>=x11-libs/gtk+-2.12 )
+	playlist? ( dev-libs/totem-pl-parser )
+	rss? ( net-libs/libgrss )
+	strigi? ( >=app-misc/strigi-0.7 )
+	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 )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
+	>=sys-devel/gettext-0.14
+	>=dev-util/pkgconfig-0.20
+	applet? ( >=dev-lang/vala-0.11.1:0.12 )
+	gtk? (
+		>=dev-lang/vala-0.11.1:0.12
+		>=dev-libs/libgee-0.3 )
+	doc? (
+		>=dev-util/gtk-doc-1.8
+		media-gfx/graphviz )
+	test? (
+		>=dev-libs/dbus-glib-0.82-r1
+		>=sys-apps/dbus-1.3.1[X] )
+"
+
+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
+
+	if use upnp ; then
+		G2CONF="${G2CONF} --enable-video-extractor=gupnp-dlna"
+	elif use gstreamer ; then
+		G2CONF="${G2CONF}
+			--enable-video-extractor=gstreamer
+			--enable-gstreamer-tagreadbin"
+		# --enable-gstreamer-helix (real media)
+	elif use xine ; then
+		G2CONF="${G2CONF} --enable-video-extractor=xine"
+	else
+		G2CONF="${G2CONF} --enable-video-extractor=external"
+	fi
+
+	# hal and upower are used for AC power detection
+	if use laptop; then
+		G2CONF="${G2CONF} $(use_enable hal) $(use_enable !hal upower)"
+	else
+		G2CONF="${G2CONF} --disable-hal --disable-upower"
+	fi
+
+	if use applet || use gtk; then
+		G2CONF="${G2CONF} VALAC=$(type -P valac-0.12)"
+	fi
+
+	# unicode-support: libunistring, libicu or glib ?
+	G2CONF="${G2CONF}
+		--disable-functional-tests
+		--enable-tracker-fts
+		--with-enca
+		--with-unicode-support=glib
+		$(use_enable applet tracker-status-icon)
+		$(use_enable applet tracker-search-bar)
+		$(use_enable eds miner-evolution)
+		$(use_enable exif libexif)
+		$(use_enable flac libflac)
+		$(use_enable gnome-keyring)
+		$(use_enable gsf libgsf)
+		$(use_enable gtk tracker-explorer)
+		$(use_enable gtk tracker-preferences)
+		$(use_enable gtk tracker-search-tool)
+		$(use_enable iptc libiptcdata)
+		$(use_enable jpeg libjpeg)
+		$(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 unit-tests)
+		$(use_enable tiff libtiff)
+		$(use_enable vorbis libvorbis)
+		$(use_enable xml libxml2)
+		$(use_enable xmp exempi)"
+		# FIXME: handle gdk vs qt for mp3 thumbnail extract
+		# $(use_enable gtk gdkpixbuf)
+		# FIXME: missing some files ?
+		# $(use_enable test functional-tests)
+
+	DOCS="AUTHORS ChangeLog NEWS README"
+
+	python_set_active_version 2
+}
+
+src_prepare() {
+	# Fix build failures with USE=strigi
+	epatch "${FILESDIR}/${PN}-0.8.0-strigi.patch"
+
+	# 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
+
+	# FIXME: report broken/disabled tests
+	sed -e '/\/libtracker-common\/tracker-dbus\/request-client-lookup/,+1 s:^\(.*\)$:/*\1*/:' \
+		-i tests/libtracker-common/tracker-dbus-test.c || die
+	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
+	sed -e '/\/libtracker-db\/tracker-db-journal\/init-and-shutdown/,+1 s:^\(.*\)$:/*\1*/:' \
+		-i tests/libtracker-data/tracker-db-journal.c || die
+	# Needs to setup a fake system dbus
+	sed -e 's/tracker-test//' \
+		-i tests/libtracker-sparql/Makefile.{am,in} || die
+	sed -e 's/tracker-test-xmp//' \
+		-i tests/libtracker-extract/Makefile.{am,in} || die
+	sed -e 's/tracker-test//' \
+		-i tests/tracker-steroids/Makefile.{am,in} || die
+}
+
+src_test() {
+	export XDG_CONFIG_HOME="${T}"
+	unset DBUS_SESSION_BUS_ADDRESS
+	emake check || die "tests failed"
+}
+
+src_install() {
+	gnome2_src_install
+	# Tracker and none of the plugins it provides needs la files
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/app-misc/tracker/tracker-9999.ebuild b/app-misc/tracker/tracker-9999.ebuild
index cb8ea072bf70..8b5cb92904b0 100644
--- a/app-misc/tracker/tracker-9999.ebuild
+++ b/app-misc/tracker/tracker-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.27 2010/11/14 16:17:32 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.28 2010/11/14 17:43:22 eva Exp $
 
 EAPI="2"
 G2CONF_DEBUG="no"
@@ -20,6 +20,7 @@ KEYWORDS=""
 IUSE="applet doc eds exif flac gif gnome-keyring gsf gstreamer gtk hal iptc +jpeg laptop mp3 nautilus networkmanager pdf playlist rss strigi test +tiff upnp +vorbis xine +xml xmp"
 
 # TODO: rest -> flickr, qt vs. gdk
+# vala is built with debug by default (see VALAFLAGS)
 RDEPEND="
 	>=app-i18n/enca-1.9
 	>=dev-db/sqlite-3.7[threadsafe]
@@ -82,13 +83,16 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.20
 	dev-util/gtk-doc-am
 	>=dev-util/gtk-doc-1.8
-	applet? ( dev-lang/vala )
+	applet? ( >=dev-lang/vala-0.11.1:0.12 )
 	gtk? (
-		dev-lang/vala
+		>=dev-lang/vala-0.11.1:0.12
 		>=dev-libs/libgee-0.3 )
 	doc? (
 		media-gfx/graphviz )
-	test? ( sys-apps/dbus[X] )"
+	test? (
+		>=dev-libs/dbus-glib-0.82-r1
+		>=sys-apps/dbus-1.3.1[X] )
+"
 
 function inotify_enabled() {
 	if linux_config_exists; then
@@ -128,6 +132,10 @@ pkg_setup() {
 		G2CONF="${G2CONF} --disable-hal --disable-upower"
 	fi
 
+	if use applet || use gtk; then
+		G2CONF="${G2CONF} VALAC=$(type -P valac-0.12)"
+	fi
+
 	# unicode-support: libunistring, libicu or glib ?
 	G2CONF="${G2CONF}
 		--enable-tracker-fts