Version bump. Only a few libs not ported to gdbus.

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

4 files changed, 233 insertions, 10 deletions

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index bd138c3ce3c2..a59491a333aa 100644
--- a/app-misc/tracker/ChangeLog
+++ b/app-misc/tracker/ChangeLog
@@ -1,6 +1,12 @@
 # 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.91 2011/01/15 07:07:18 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.92 2011/01/23 23:06:19 eva Exp $
+
+*tracker-0.9.35 (23 Jan 2011)
+
+  23 Jan 2011; Gilles Dartiguelongue <eva@gentoo.org> +tracker-0.9.35.ebuild,
+  tracker-9999.ebuild:
+  Version bump. Only a few libs not ported to gdbus.
 
   15 Jan 2011; Arun Raghavan <ford_prefect@gentoo.org> tracker-0.9.30.ebuild,
   tracker-0.9.33.ebuild:
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index ab58aec15ee6..cfe6cca0bb49 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX tracker-0.8.0-strigi.patch 1385 RMD160 69d07b6145de6919cc1550e4722737cf5b96051d SHA1 5221ac64d5c21e540bb0bb07bd074b3ad5ce0a27 SHA256 7ae959cd52ac96f6427646089b554e0572727f27d5d4aab1913f795e270a4ccb
 AUX tracker-0.8.17-build-with-eds232.patch 807 RMD160 7f681d67da66c66c82171557462e74e095d5f1b5 SHA1 cb56616bd34a0a81a8df6117c2901e6f5d834a0d SHA256 bced568783664b0128903094db05a1f881519754d6fa1588f1050620fb73f989
 AUX tracker-0.8.17-tests-fixes.patch 2499 RMD160 fb8b749e2addeaa004fd2e6de585357156e2f092 SHA1 a4f193432edc8f64e3505ac407f05a2de7fd73af SHA256 3c00640648e56c722fcca4b6c1016082df992def8d7a95c5a1618453463d4048
@@ -5,9 +8,18 @@ AUX tracker-0.8.17-use-upower.patch 16884 RMD160 a9545a4aa89b6574ccb58d5b9796386
 DIST tracker-0.8.17.tar.bz2 4959334 RMD160 b33abe9ab955e5e392258657ad3a664ff5cb4cc6 SHA1 460f3d56bd0ed24c5d064a398829f4289a6b081f SHA256 56cf09f41fec1afaf7199e0728f4339b567a7893a51fc2affc5069fa26e2e9d8
 DIST tracker-0.9.30.tar.bz2 7287592 RMD160 5d64646c0098cd9966ed7aa5084d3a80af747980 SHA1 272134bf72031695e1ae0608d0f5d69ec3983afc SHA256 d01fc5bee618c76454cfb5bae44a913584ef6c27abc8620599e4327ecc6a462e
 DIST tracker-0.9.33.tar.bz2 7296331 RMD160 9d9765b6e247a798882387437069dfcf631add0e SHA1 c9e538d6a9f5fea3fcd90a200cd5ef83ecbdc560 SHA256 72e53572433d9a32fac9cce66de35b56412a46096a89530284f58ac84387c9f7
+DIST tracker-0.9.35.tar.bz2 7139994 RMD160 aca676b90b39a314a55b2dcabdcaf9055fe0e962 SHA1 4aa0acdf22cbc498942203cd21709a08051d725f SHA256 0234314069aa1f41f128ec2bb3564e69c582ed50814a842397ddbc0099c6442d
 EBUILD tracker-0.8.17.ebuild 5520 RMD160 746d6f052b0dd0c0deeade073dd85512d51c669b SHA1 597e05966f913ab187b7d136f1c66a5d99b540e9 SHA256 5735408dd93338fcb29e794c73863c0865c39ac494149293592c82db84a94095
 EBUILD tracker-0.9.30.ebuild 6457 RMD160 acd5cfa39672a5946ef1800a67e29e44b8173104 SHA1 f9dc93a4d81644a7ee2c8b2727c118f91648478c SHA256 dab8380a821c43c3463721130a3d2c1fd12b9fcfeae717ffb900efc586a5efaa
 EBUILD tracker-0.9.33.ebuild 6213 RMD160 aabeefa9db5c2cf0860e9a6d67a322d2f183c862 SHA1 d7547a4ce1802a7e60df33b823a4d14fbd56c152 SHA256 7005f165601129c9e112a5f8cd07a843f7b5830b9c32aca76fe7e04ac8c6a2b2
-EBUILD tracker-9999.ebuild 5896 RMD160 e53945d90b63947d2c81e12319e6dfa3aacea2e0 SHA1 5a0e090c972ee56175aa325f5b1944bf50be95ab SHA256 c0390d0cde3a2c53c518c473631c12c04e04151623bce70b1101deaf864808d5
-MISC ChangeLog 16343 RMD160 8e663f6f324607e51c964a6e87bfd9c556db56b1 SHA1 cb3f5cd671e76bc6ba8d7459292063ce6edcb623 SHA256 af8de91c9476af589312f51f3647c3533d01adb66e4e0f249bd74c2a5f151085
+EBUILD tracker-0.9.35.ebuild 6124 RMD160 930ef8ef184f9d4a930e0f5d1d8ebdb891169726 SHA1 5c7dc8d69886e4d45ebed2b7dfcbb75eecb77540 SHA256 a178e96d7d4dcfc985b15d3ec515911162301e3ddbc38631415a91222021a0a7
+EBUILD tracker-9999.ebuild 5904 RMD160 e9e16d6ae5c8cdb985e6ca43e4f0395a6c9820b5 SHA1 4ce46a8f0d026ed69176189c35ccbeb66b903b57 SHA256 20440bb1a0c0cba2bc81e3505c7b70df4ffe793e9af9dee47ce44e13a2cc713c
+MISC ChangeLog 16520 RMD160 eb5929c79727be1c18a77b8eebc5654ce047928e SHA1 ec334d00e1ef36b67b0b7bb1bad7fe74d1c9d9d8 SHA256 1491e7f622d8452c67e4747debeac1f75cb4e0e5ff4da2ca9514c52a7ae35f10
 MISC metadata.xml 909 RMD160 47100344948079430541942d3841bc4cde102800 SHA1 4fb4e473e4cdf507733555623f28af9121f2d9b7 SHA256 b3bc2efef244353c50faf03ca2fa944698bac1b6a6d023a484e46eb5c3ce02a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk08tHsACgkQ1fmVwcYIWAYjFgCgg0Jkvb0QljjnaXp2UzviZWbB
+PsoAoJzPBR2qBJVt3cQ3PlNqo13DfD4g
+=Cs77
+-----END PGP SIGNATURE-----
diff --git a/app-misc/tracker/tracker-0.9.35.ebuild b/app-misc/tracker/tracker-0.9.35.ebuild
new file mode 100644
index 000000000000..265f95fc3e6b
--- /dev/null
+++ b/app-misc/tracker/tracker-0.9.35.ebuild
@@ -0,0 +1,205 @@
+# 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.9.35.ebuild,v 1.1 2011/01/23 23:06:19 eva Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+PYTHON_DEPEND="2:2.6"
+
+inherit eutils gnome2 linux-info python virtualx
+
+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, loops forever
+# 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[bonobo] <gnome-base/gnome-panel-2.32 )
+		>=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.5 )
+	!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:2 )
+	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:2 )
+	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.40
+	>=sys-devel/gettext-0.17
+	>=dev-util/pkgconfig-0.20
+	applet? ( >=dev-lang/vala-0.11.4:0.12 )
+	gtk? (
+		app-office/dia
+		>=dev-lang/vala-0.11.4: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}
+		--enable-tracker-fts
+		--with-enca
+		--with-unicode-support=glib
+		--enable-guarantee-metadata
+		$(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-needle)
+		$(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 functional-tests)
+		$(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)
+
+	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 tests
+	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
+}
+
+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
+	# Tracker and none of the plugins it provides needs la files
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/app-misc/tracker/tracker-9999.ebuild b/app-misc/tracker/tracker-9999.ebuild
index 0f9091aefba6..f026d7462f6f 100644
--- a/app-misc/tracker/tracker-9999.ebuild
+++ b/app-misc/tracker/tracker-9999.ebuild
@@ -1,12 +1,12 @@
 # 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.32 2011/01/13 00:17:06 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.33 2011/01/23 23:06:19 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
-PYTHON_DEPEND="2"
+PYTHON_DEPEND="2:2.6"
 
-inherit autotools git gnome2 linux-info python
+inherit autotools git gnome2 linux-info python virtualx
 
 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="http://www.tracker-project.org/"
@@ -45,7 +45,7 @@ RDEPEND="
 	gsf? (
 		app-text/odt2txt
 		>=gnome-extra/libgsf-1.13 )
-	upnp? ( >=media-libs/gupnp-dlna-0.3 )
+	upnp? ( >=media-libs/gupnp-dlna-0.5 )
 	!upnp? (
 		gstreamer? ( >=media-libs/gstreamer-0.10.12 )
 		!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
@@ -81,10 +81,10 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.20
 	dev-util/gtk-doc-am
 	>=dev-util/gtk-doc-1.8
-	applet? ( >=dev-lang/vala-0.11.2:0.12 )
+	applet? ( >=dev-lang/vala-0.11.4:0.12 )
 	gtk? (
 		app-office/dia
-		>=dev-lang/vala-0.11.2:0.12
+		>=dev-lang/vala-0.11.4:0.12
 		>=dev-libs/libgee-0.3 )
 	doc? (
 		media-gfx/graphviz )
@@ -150,7 +150,7 @@ pkg_setup() {
 		$(use_enable gsf libgsf)
 		$(use_enable gtk tracker-explorer)
 		$(use_enable gtk tracker-preferences)
-		$(use_enable gtk tracker-search-tool)
+		$(use_enable gtk tracker-needle)
 		$(use_enable iptc libiptcdata)
 		$(use_enable jpeg libjpeg)
 		$(use_enable mp3 taglib)